From: Mario <mario.mario@y7mail.com>
Date: Wed, 5 Jun 2013 19:11:08 +0000 (+1000)
Subject: Lower mage health
X-Git-Tag: xonotic-v0.8.0~241^2^2~196
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=73e90bd5f0e080767b8ae2f969bdf0519e71ba54;p=xonotic%2Fxonotic-data.pk3dir.git

Lower mage health
---

diff --git a/monsters.cfg b/monsters.cfg
index 16b9c1084..d39732507 100644
--- a/monsters.cfg
+++ b/monsters.cfg
@@ -144,7 +144,7 @@ set g_monster_stingray_speed_run 70 "Stingray run speed"
 
 // Mage
 set g_monster_mage 1 "Enable Mages"
-set g_monster_mage_health 400 "Mage health"
+set g_monster_mage_health 200 "Mage health"
 set g_monster_mage_drop health "Mage drops this item on death"
 set g_monster_mage_drop_size medium "Size of the item Mages drop. Possible values are: small, medium, large"
 set g_monster_mage_speed 50 "Mage move speed"
diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index 1a8cbb199..184181f81 100644
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -580,7 +580,10 @@ void monster_move(float runspeed, float walkspeed, float stopspeed, float manim_
 		
 	if(time >= self.last_trace)
 	if not(monster_isvalidtarget(self.enemy, self))
-		self.enemy = world; // check enemy each think frame?
+		self.enemy = world;
+		
+	if(self.enemy && self.enemy.health < 1)
+		self.enemy = world; // enough!
 		
 	if not(self.enemy)
 	{