Merge branches 'TimePath/weaponsys' and 'Mario/modpack'

[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 7c46a1da15f087bf1cbf15e001bbb5f84978dafc..f4f29d9fbc1d62427f00a89a8cf6dcb2fb5d4fee 100644 (file)
--- a/qcsrc/common/monsters/monster/shambler.qc
+++ b/qcsrc/common/monsters/monster/shambler.qc
@@ -1,15 +1,19 @@
-#ifdef REGISTER_MONSTER
-REGISTER_MONSTER(
+#ifndef MENUQC
+bool m_shambler(int);
+#endif
+REGISTER_MONSTER_SIMPLE(
 /* MON_##id   */ SHAMBLER,
-/* function   */ m_shambler,
 /* spawnflags */ MONSTER_SIZE_BROKEN | MON_FLAG_SUPERMONSTER | MON_FLAG_MELEE | MON_FLAG_RANGED,
 /* mins,maxs  */ '-41 -41 -31', '41 41 65',
 /* model      */ "shambler.mdl",
 /* netname    */ "shambler",
 /* fullname   */ _("Shambler")
-);
+) {
+#ifndef MENUQC
+       this.monster_func = m_shambler;
+#endif
+}
 
-#else
 #ifdef SVQC
 float autocvar_g_monster_shambler_health;
 float autocvar_g_monster_shambler_attack_smash_damage;
@@ -39,7 +43,7 @@ const float shambler_anim_death               = 8;
 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);
+       Send_Effect("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);
@@ -51,7 +55,7 @@ void shambler_smash()
 void shambler_swing()
 {
        float r = (random() < 0.5);
-       monster_melee(self.enemy, (autocvar_g_monster_shambler_attack_claw_damage), ((r) ? shambler_anim_swingr : shambler_anim_swingl), self.attack_range, 0.8, DEATH_MONSTER_SHAMBLER_CLAW, TRUE);
+       monster_melee(self.enemy, (autocvar_g_monster_shambler_attack_claw_damage), ((r) ? shambler_anim_swingr : shambler_anim_swingl), self.attack_range, 0.8, DEATH_MONSTER_SHAMBLER_CLAW, true);
        if(r)
        {
                defer(0.5, shambler_swing);
@@ -64,7 +68,7 @@ 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);
+       Send_Effect("electro_impact", '0 0 0', '0 0 0', 1);
 
        self.event_damage = func_null;
        self.takedamage = DAMAGE_NO;
@@ -86,7 +90,7 @@ void shambler_lightning_explode()
        self.nextthink = time + 0.2;
 }
 
-void shambler_lightning_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
+void shambler_lightning_damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
 {
        if (self.health <= 0)
                return;
@@ -127,7 +131,7 @@ void shambler_lightning()
        gren = spawn ();
        gren.owner = gren.realowner = self;
        gren.classname = "grenade";
-       gren.bot_dodge = TRUE;
+       gren.bot_dodge = true;
        gren.bot_dodgerating = (autocvar_g_monster_shambler_attack_lightning_damage);
        gren.movetype = MOVETYPE_BOUNCE;
        PROJECTILE_MAKETRIGGER(gren);
@@ -146,14 +150,14 @@ void shambler_lightning()
        gren.health = 50;
        gren.damageforcescale = 0;
        gren.event_damage = shambler_lightning_damage;
-       gren.damagedbycontents = TRUE;
+       gren.damagedbycontents = true;
        gren.missile_flags = MIF_SPLASH | MIF_ARC;
-       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);
+       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;
 
-       CSQCProjectile(gren, TRUE, PROJECTILE_SHAMBLER_LIGHTNING, TRUE);
+       CSQCProjectile(gren, true, PROJECTILE_SHAMBLER_LIGHTNING, true);
 }
 
 float shambler_attack(float attack_type)
@@ -163,7 +167,7 @@ float shambler_attack(float attack_type)
                case MONSTER_ATTACK_MELEE:
                {
                        shambler_swing();
-                       return TRUE;
+                       return true;
                }
                case MONSTER_ATTACK_RANGED:
                {
@@ -175,7 +179,7 @@ float shambler_attack(float attack_type)
                                defer(0.7, shambler_smash);
                                self.attack_finished_single = time + 1.1;
                                self.shambler_lastattack = time + 3;
-                               return TRUE;
+                               return true;
                        }
                        else if(random() <= 0.1) // small chance, don't want this spammed
                        {
@@ -183,21 +187,21 @@ float shambler_attack(float attack_type)
                                self.attack_finished_single = time + 1.1;
                                self.shambler_lastattack = time + 3;
                                defer(0.6, shambler_lightning);
-                               return TRUE;
+                               return true;
                        }
 
-                       return FALSE;
+                       return false;
                }
        }
 
-       return FALSE;
+       return false;
 }
 
 void spawnfunc_monster_shambler()
 {
        self.classname = "monster_shambler";
 
-       if(!monster_initialize(MON_SHAMBLER)) { remove(self); return; }
+       if(!monster_initialize(MON_SHAMBLER.monsterid)) { remove(self); return; }
 }
 
 float m_shambler(float req)
@@ -207,12 +211,12 @@ float m_shambler(float req)
                case MR_THINK:
                {
                        monster_move((autocvar_g_monster_shambler_speed_run), (autocvar_g_monster_shambler_speed_walk), (autocvar_g_monster_shambler_speed_stop), shambler_anim_run, shambler_anim_walk, shambler_anim_stand);
-                       return TRUE;
+                       return true;
                }
                case MR_DEATH:
                {
                        self.frame = shambler_anim_death;
-                       return TRUE;
+                       return true;
                }
                case MR_SETUP:
                {
@@ -222,18 +226,18 @@ float m_shambler(float req)
                        self.monster_loot = spawnfunc_item_health_mega;
                        self.monster_attackfunc = shambler_attack;
                        self.frame = shambler_anim_stand;
-                       self.weapon = WEP_VORTEX;
+                       self.weapon = WEP_VORTEX.m_id;
 
-                       return TRUE;
+                       return true;
                }
                case MR_PRECACHE:
                {
                        precache_model("models/monsters/shambler.mdl");
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // SVQC
@@ -244,12 +248,11 @@ float m_shambler(float req)
        {
                case MR_PRECACHE:
                {
-                       return TRUE;
+                       return true;
                }
        }
 
-       return TRUE;
+       return true;
 }
 
 #endif // CSQC
-#endif // REGISTER_MONSTER