Fix monster color resetting when it respawns

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / monsters / monster / shambler.qc

diff --git a/qcsrc/server/monsters/monster/shambler.qc b/qcsrc/server/monsters/monster/shambler.qc
index 8b8a9a7e298b73f7d048b95d32b3cd8ffcef71fb..2ec7f6d6f6c8d63da33934abd85bc7b83a7451bb 100644 (file)
--- a/qcsrc/server/monsters/monster/shambler.qc
+++ b/qcsrc/server/monsters/monster/shambler.qc
@@ -1,6 +1,6 @@
 // size
-const vector SHAMBLER_MIN = '-32 -32 -24';
-const vector SHAMBLER_MAX = '32 32 50';
+const vector SHAMBLER_MIN = '-41 -41 -31';
+const vector SHAMBLER_MAX = '41 41 65';
 
 // model
 string SHAMBLER_MODEL = "models/monsters/shambler.mdl";
@@ -79,18 +79,6 @@ void shambler_swing_right ()
        }
 }
 
-void sham_melee ()
-{
-       local float chance = random();
-
-       if (chance > 0.6)
-               shambler_delayedsmash();
-       else if (chance > 0.3)
-               shambler_swing_right ();
-       else
-               shambler_swing_left ();
-}
-
 void CastLightning ()
 {
        self.monster_delayedattack = func_null;
@@ -115,18 +103,35 @@ void CastLightning ()
        WarpZone_TrailParticles(world, particleeffectnum("TE_TEI_G3"), org, v);
 }
 
-void shambler_magic ()
+float shambler_attack(float attack_type)
 {
-       monsters_setframe(shambler_anim_magic);
-       self.attack_finished_single = time + 1.1;
-       self.monster_delayedattack = CastLightning;
-       self.delay = time + 0.6;
-}
+       switch(attack_type)
+       {
+               case MONSTER_ATTACK_MELEE:
+               {
+                       float chance = random();
+
+                       if(chance > 0.6)
+                               shambler_delayedsmash();
+                       else if(chance > 0.3)
+                               shambler_swing_right();
+                       else
+                               shambler_swing_left();
+                       
+                       return TRUE;
+               }
+               case MONSTER_ATTACK_RANGED:
+               {
+                       monsters_setframe(shambler_anim_magic);
+                       self.attack_finished_single = time + 1.1;
+                       self.monster_delayedattack = CastLightning;
+                       self.delay = time + 0.6;
+                       
+                       return TRUE;
+               }
+       }
        
-float sham_lightning ()
-{
-       shambler_magic();
-       return TRUE;
+       return FALSE;
 }
 
 void shambler_die ()
@@ -148,9 +153,7 @@ void shambler_spawn ()
 
        self.damageforcescale   = 0.003;
        self.classname                  = "monster_shambler";
-       self.attack_melee               = sham_melee;
-       self.checkattack                = GenericCheckAttack;
-       self.attack_ranged              = sham_lightning;
+       self.monster_attackfunc = shambler_attack;
        self.nextthink                  = time + random() * 0.5 + 0.1;
        self.think                              = shambler_think;
        self.weapon                             = WEP_NEX;