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 cea6f94bea0735a70c6fb26c874acfe6ed7b8f0a..2ec7f6d6f6c8d63da33934abd85bc7b83a7451bb 100644 (file)
--- a/qcsrc/server/monsters/monster/shambler.qc
+++ b/qcsrc/server/monsters/monster/shambler.qc
@@ -1,13 +1,10 @@
-#ifndef MENUQC
 // size
-const vector SHAMBLER_MIN = '-32 -32 -24';
-const vector SHAMBLER_MAX = '32 32 64';
+const vector SHAMBLER_MIN = '-41 -41 -31';
+const vector SHAMBLER_MAX = '41 41 65';
 
 // model
 string SHAMBLER_MODEL = "models/monsters/shambler.mdl";
 
-#endif
-
 #ifdef SVQC
 // cvars
 float autocvar_g_monster_shambler;
@@ -39,66 +36,47 @@ void shambler_think ()
 
 void shambler_smash ()
 {
-       float bigdmg = autocvar_g_monster_shambler_damage * self.scale;
-       
-       self.think = shambler_think;
-       self.attack_finished_single = time + 0.4;
-       self.nextthink = self.attack_finished_single;
-
-       if (!self.enemy)
-               return;
-
-       if (vlen(self.enemy.origin - self.origin) > 100 * self.scale)
-               return;
+       self.monster_delayedattack = func_null;
+       self.delay = -1;
        
-       Damage(self.enemy, self, self, bigdmg * monster_skill, DEATH_MONSTER_SHAMBLER_SMASH, self.enemy.origin, normalize(self.enemy.origin - self.origin));
+       monster_melee(self.enemy, autocvar_g_monster_shambler_damage, 0.3, DEATH_MONSTER_SHAMBLER_SMASH, TRUE);
 }
 
 void shambler_delayedsmash ()
 {
        monsters_setframe(shambler_anim_smash);
-       self.think = shambler_smash;
-       self.nextthink = time + 0.7;
-}
-
-void ShamClaw (float side)
-{
-       monster_melee(self.enemy, autocvar_g_monster_shambler_attack_claw_damage, 0.3, DEATH_MONSTER_SHAMBLER_CLAW, TRUE);
+       self.monster_delayedattack = shambler_smash;
+       self.delay = time + 0.7;
+       self.attack_finished_single = time + 1.1;
 }
 
 void() shambler_swing_right;
 void shambler_swing_left ()
 {
        monsters_setframe(shambler_anim_swingl);
-       ShamClaw(250);
+       monster_melee(self.enemy, autocvar_g_monster_shambler_attack_claw_damage, 0.3, DEATH_MONSTER_SHAMBLER_CLAW, TRUE);
        self.attack_finished_single = time + 0.8;
-       self.nextthink = self.attack_finished_single;
-       self.think = shambler_think;
+       self.delay = -1;
+       self.monster_delayedattack = func_null;
        if(random() < 0.5)
-               self.think = shambler_swing_right;
+       {
+               self.monster_delayedattack = shambler_swing_right;
+               self.delay = time + 0.5;
+       }
 }
 
 void shambler_swing_right ()
 {
        monsters_setframe(shambler_anim_swingr);
-       ShamClaw(-250);
+       monster_melee(self.enemy, autocvar_g_monster_shambler_attack_claw_damage, 0.3, DEATH_MONSTER_SHAMBLER_CLAW, TRUE);
        self.attack_finished_single = time + 0.8;
-       self.nextthink = self.attack_finished_single;
-       self.think = shambler_think;
+       self.monster_delayedattack = func_null;
+       self.delay = -1;
        if(random() < 0.5)
-               self.think = shambler_swing_left;
-}
-
-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 ();
+       {
+               self.monster_delayedattack = shambler_swing_left;
+               self.delay = time + 0.5;
+       }
 }
 
 void CastLightning ()
@@ -111,7 +89,7 @@ void CastLightning ()
 
        self.effects |= EF_MUZZLEFLASH;
 
-       org = self.origin + '0 0 40' * self.scale;
+       org = self.origin + '0 0 40';
 
        dir = self.enemy.origin + '0 0 16' - org;
        dir = normalize (dir);
@@ -125,26 +103,44 @@ 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 ()
 {
        Monster_CheckDropCvars ("shambler");
        
-       self.think = Monster_Fade;
-       self.nextthink = time + 5;
+       self.think = monster_dead_think;
+       self.nextthink = time + self.ticrate;
+       self.ltime = time + 5;
        monsters_setframe(shambler_anim_death);
        
        monster_hook_death(); // for post-death mods
@@ -153,20 +149,19 @@ void shambler_die ()
 void shambler_spawn ()
 {
        if not(self.health)
-               self.health = autocvar_g_monster_shambler_health * self.scale;
+               self.health = autocvar_g_monster_shambler_health;
 
        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.sprite_height              = 70;
        self.weapon                             = WEP_NEX;
        
        monsters_setframe(shambler_anim_stand);
        
+       monster_setupsounds("shambler");
+       
        monster_hook_spawn(); // for post-spawn mods
 }
 
@@ -190,11 +185,6 @@ void spawnfunc_monster_shambler ()
                remove(self);
                return;
        }
-       
-       precache_model ("progs/beam.mdl");
-       precache_model ("models/weapons/g_nex.md3");
-       
-       precache_sound ("weapons/lgbeam_fire.wav");
 }
 
 #endif // SVQC