]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Use start_health for mage player health checks
authorMario <mario.mario@y7mail.com>
Tue, 23 Apr 2013 11:11:33 +0000 (21:11 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 23 Apr 2013 11:11:33 +0000 (21:11 +1000)
qcsrc/server/monsters/monster/shalrath.qc

index 4806da59572d4bc153432177c76a0c792ba7d1da..1ba434a3571401109696c385d6c04db343ed315f 100644 (file)
@@ -54,7 +54,7 @@ void shalrath_think ()
                if not(IsDifferentTeam(head, self))
                if(head.health > 0)
                if(vlen(head.origin - self.origin) < autocvar_g_monster_shalrath_heal_range)
-               if((!g_minstagib && head.health < autocvar_g_balance_health_regenstable) || (g_minstagib && head.ammo_cells < start_ammo_cells))
+               if((!g_minstagib && head.health < start_health) || (g_minstagib && head.ammo_cells < start_ammo_cells))
                {
                        friend_needshelp = TRUE;
                        break; // found 1 player near us who is low on health
@@ -321,7 +321,7 @@ void shalrath_heal()
                {
                        if(IS_PLAYER(head))
                        {
-                               if((g_minstagib && head.ammo_cells < start_ammo_cells) || head.health < g_pickup_healthmedium_max)
+                               if((g_minstagib && head.ammo_cells < start_ammo_cells) || head.health < start_health)
                                        pointparticles(particleeffectnum(((g_minstagib) ? "ammoregen_fx" : "healing_fx")), head.origin, '0 0 0', 1);
                                if(g_minstagib)
                                        head.ammo_cells = bound(0, head.ammo_cells + 1, start_ammo_cells);