Merge branch 'master' into samual/weapons

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

diff --git a/qcsrc/common/monsters/monster/shambler.qc b/qcsrc/common/monsters/monster/shambler.qc
index e1515c3365a5b24271f5b7b355bf8a362f45a9ba..7c46a1da15f087bf1cbf15e001bbb5f84978dafc 100644 (file)
--- a/qcsrc/common/monsters/monster/shambler.qc
+++ b/qcsrc/common/monsters/monster/shambler.qc
@@ -24,15 +24,15 @@ float autocvar_g_monster_shambler_speed_stop;
 float autocvar_g_monster_shambler_speed_run;
 float autocvar_g_monster_shambler_speed_walk;
 
-const float shambler_anim_stand        = 0;
-const float shambler_anim_walk                 = 1;
-const float shambler_anim_run          = 2;
-const float shambler_anim_smash        = 3;
-const float shambler_anim_swingr       = 4;
-const float shambler_anim_swingl       = 5;
-const float shambler_anim_magic        = 6;
-const float shambler_anim_pain                 = 7;
-const float shambler_anim_death        = 8;
+const float shambler_anim_stand                = 0;
+const float shambler_anim_walk         = 1;
+const float shambler_anim_run          = 2;
+const float shambler_anim_smash                = 3;
+const float shambler_anim_swingr       = 4;
+const float shambler_anim_swingl       = 5;
+const float shambler_anim_magic                = 6;
+const float shambler_anim_pain         = 7;
+const float shambler_anim_death                = 8;
 
 .float shambler_lastattack; // delay attacks separately
 
@@ -41,9 +41,9 @@ void shambler_smash()
        makevectors(self.angles);
        pointparticles(particleeffectnum("explosion_medium"), (self.origin + (v_forward * 150)) - ('0 0 1' * self.maxs_z), '0 0 0', 1);
        sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_NORM);
-       
+
        tracebox(self.origin + v_forward * 50, self.mins * 0.5, self.maxs * 0.5, self.origin + v_forward * 500, MOVE_NORMAL, self);
-       
+
        if(trace_ent.takedamage)
                Damage(trace_ent, self, self, (autocvar_g_monster_shambler_attack_smash_damage) * Monster_SkillModifier(), DEATH_MONSTER_SHAMBLER_SMASH, trace_ent.origin, normalize(trace_ent.origin - self.origin));
 }
@@ -62,7 +62,7 @@ void shambler_swing()
 void shambler_lightning_explode()
 {
        entity head;
-       
+
        sound(self, CH_SHOTS, "weapons/electro_impact.wav", VOL_BASE, ATTEN_NORM);
        pointparticles(particleeffectnum("electro_impact"), '0 0 0', '0 0 0', 1);
 
@@ -74,8 +74,8 @@ void shambler_lightning_explode()
        if(self.movetype == MOVETYPE_NONE)
                self.velocity = self.oldvelocity;
 
-       RadiusDamage (self, self.realowner, (autocvar_g_monster_shambler_attack_lightning_damage), (autocvar_g_monster_shambler_attack_lightning_damage), (autocvar_g_monster_shambler_attack_lightning_radius), world, (autocvar_g_monster_shambler_attack_lightning_force), self.projectiledeathtype, other);
-       
+       RadiusDamage (self, self.realowner, (autocvar_g_monster_shambler_attack_lightning_damage), (autocvar_g_monster_shambler_attack_lightning_damage), (autocvar_g_monster_shambler_attack_lightning_radius), world, world, (autocvar_g_monster_shambler_attack_lightning_force), self.projectiledeathtype, other);
+
        for(head = findradius(self.origin, (autocvar_g_monster_shambler_attack_lightning_radius_zap)); head; head = head.chain) if(head != self.realowner) if(head.takedamage)
        {
                te_csqc_lightningarc(self.origin, head.origin);
@@ -90,12 +90,12 @@ void shambler_lightning_damage(entity inflictor, entity attacker, float damage,
 {
        if (self.health <= 0)
                return;
-               
+
        if (!W_CheckProjectileDamage(inflictor.realowner, self.realowner, deathtype, -1)) // no exceptions
                return; // g_projectiles_damage says to halt
-               
+
        self.health = self.health - damage;
-       
+
        if (self.health <= 0)
                W_PrepareExplosionByDamage(attacker, self.use);
 }
@@ -103,7 +103,7 @@ void shambler_lightning_damage(entity inflictor, entity attacker, float damage,
 void shambler_lightning_touch()
 {
        PROJECTILE_TOUCH;
-       
+
        self.use ();
 }
 
@@ -121,7 +121,7 @@ void shambler_lightning_think()
 void shambler_lightning()
 {
        entity gren;
-       
+
        monster_makevectors(self.enemy);
 
        gren = spawn ();
@@ -148,7 +148,7 @@ void shambler_lightning()
        gren.event_damage = shambler_lightning_damage;
        gren.damagedbycontents = TRUE;
        gren.missile_flags = MIF_SPLASH | MIF_ARC;
-       W_SetupProjectileVelocityEx(gren, v_forward, v_up, (autocvar_g_monster_shambler_attack_lightning_speed), (autocvar_g_monster_shambler_attack_lightning_speed_up), 0, 0, FALSE);
+       W_SetupProjVelocity_Explicit(gren, v_forward, v_up, (autocvar_g_monster_shambler_attack_lightning_speed), (autocvar_g_monster_shambler_attack_lightning_speed_up), 0, 0, FALSE);
 
        gren.angles = vectoangles (gren.velocity);
        gren.flags = FL_PROJECTILE;
@@ -168,6 +168,7 @@ float shambler_attack(float attack_type)
                case MONSTER_ATTACK_RANGED:
                {
                        if(time >= self.shambler_lastattack) // shambler doesn't attack much
+                       if(self.flags & FL_ONGROUND)
                        if(random() <= 0.5 && vlen(self.enemy.origin - self.origin) <= 500)
                        {
                                self.frame = shambler_anim_smash;
@@ -184,24 +185,19 @@ float shambler_attack(float attack_type)
                                defer(0.6, shambler_lightning);
                                return TRUE;
                        }
-                       
+
                        return FALSE;
                }
        }
-       
+
        return FALSE;
 }
 
 void spawnfunc_monster_shambler()
 {
        self.classname = "monster_shambler";
-       
-       self.monster_spawnfunc = spawnfunc_monster_shambler;
-       
-       if(Monster_CheckAppearFlags(self))
-               return;
-       
-       if not(monster_initialize(MON_SHAMBLER, FALSE)) { remove(self); return; }
+
+       if(!monster_initialize(MON_SHAMBLER)) { remove(self); return; }
 }
 
 float m_shambler(float req)
@@ -220,23 +216,23 @@ float m_shambler(float req)
                }
                case MR_SETUP:
                {
-                       if not(self.health) self.health = (autocvar_g_monster_shambler_health);
-                       if not(self.attack_range) self.attack_range = 150;
-                       
+                       if(!self.health) self.health = (autocvar_g_monster_shambler_health);
+                       if(!self.attack_range) self.attack_range = 150;
+
                        self.monster_loot = spawnfunc_item_health_mega;
                        self.monster_attackfunc = shambler_attack;
                        self.frame = shambler_anim_stand;
-                       self.weapon = WEP_NEX;
-                       
+                       self.weapon = WEP_VORTEX;
+
                        return TRUE;
                }
                case MR_PRECACHE:
                {
-                       precache_model ("models/monsters/shambler.mdl");
+                       precache_model("models/monsters/shambler.mdl");
                        return TRUE;
                }
        }
-       
+
        return TRUE;
 }
 
@@ -248,11 +244,10 @@ float m_shambler(float req)
        {
                case MR_PRECACHE:
                {
-                       precache_model ("models/monsters/shambler.mdl");
                        return TRUE;
                }
        }
-       
+
        return TRUE;
 }