From: Mario <mario.mario@y7mail.com>
Date: Thu, 4 Apr 2013 23:48:56 +0000 (+1100)
Subject: Remove monster_score
X-Git-Tag: xonotic-v0.8.0~241^2^2~432
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=44a0572f9dbdf9ede0808baa43384160ff8daef9;p=xonotic%2Fxonotic-data.pk3dir.git

Remove monster_score
---

diff --git a/qcsrc/server/mutators/gamemode_rts.qc b/qcsrc/server/mutators/gamemode_rts.qc
index 89fbb38e4..9b1477478 100644
--- a/qcsrc/server/mutators/gamemode_rts.qc
+++ b/qcsrc/server/mutators/gamemode_rts.qc
@@ -32,17 +32,6 @@ void rts_waypoint_think()
 	}
 }
 
-void Monster_LevelUp(entity e)
-{
-	if(self.level >= 5)
-		return; // max level is 5 for now
-	e.speed += 0.25;
-	e.max_health += 20;
-	e.health = e.max_health;
-	e.level += 1;
-	WaypointSprite_UpdateHealth(e.sprite, e.health);
-}
-
 MUTATOR_HOOKFUNCTION(rts_PlayerSpawn)
 {
 	if(self.rts_viewangle)
@@ -298,13 +287,6 @@ MUTATOR_HOOKFUNCTION(rts_MonsterDies)
 		PlayerScore_Add(frag_attacker.owner, SP_SCORE, 5);
 		PlayerScore_Add(frag_attacker.owner, SP_KILLS, 1);
 	}
-		
-	if(frag_attacker.flags & FL_MONSTER)
-	{
-		frag_attacker.monster_score += 5;
-		if(frag_attacker.monster_score == 25)
-			Monster_LevelUp(frag_attacker);
-	}
 	
 	for(e = world; (e = findentity(e, goalentity, self)); )
 	{
@@ -352,7 +334,7 @@ MUTATOR_HOOKFUNCTION(rts_PlayerDamage)
 		frag_damage = 0; // no team damage
 		
 	if((frag_target.flags & FL_MONSTER) && frag_damage > 0)
-		frag_target.heal_delay = time + 2; // reset delay whenever hurt
+		frag_target.heal_delay = time + 2; // pause healing
 		
 	return FALSE;
 }
diff --git a/qcsrc/server/mutators/gamemode_rts.qh b/qcsrc/server/mutators/gamemode_rts.qh
index c08a5c175..b1831593c 100644
--- a/qcsrc/server/mutators/gamemode_rts.qh
+++ b/qcsrc/server/mutators/gamemode_rts.qh
@@ -2,6 +2,5 @@
 .float selected;
 .float last_click;
 .float heal_delay;
-.float monster_score;
 .float level;
 .float rts_viewangle;
\ No newline at end of file