Replace monsters config with a modified dumped config

[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 56bca63dac97cc60d0d6275c05471c95267b628d..387c98f00438e6fb867f01c9d593eeed62fc0721 100644 (file)
--- a/qcsrc/common/monsters/monster/shambler.qc
+++ b/qcsrc/common/monsters/monster/shambler.qc
@@ -2,22 +2,27 @@
 REGISTER_MONSTER(
 /* MON_##id   */ SHAMBLER,
 /* function   */ m_shambler,
+/* spawnflags */ MONSTER_SIZE_BROKEN,
 /* mins,maxs  */ '-41 -41 -31', '41 41 65',
 /* model      */ "shambler.mdl",
 /* netname    */ "shambler",
 /* fullname   */ _("Shambler")
 );
 
+#define SHAMBLER_SETTINGS(monster) \
+       MON_ADD_CVAR(monster, health) \
+       MON_ADD_CVAR(monster, attack_smash_damage) \
+       MON_ADD_CVAR(monster, attack_claw_damage) \
+       MON_ADD_CVAR(monster, attack_lightning_damage) \
+       MON_ADD_CVAR(monster, speed_stop) \
+       MON_ADD_CVAR(monster, speed_run) \
+       MON_ADD_CVAR(monster, speed_walk) 
+
+#ifdef SVQC
+SHAMBLER_SETTINGS(shambler)
+#endif // SVQC
 #else
 #ifdef SVQC
-float autocvar_g_monster_shambler;
-float autocvar_g_monster_shambler_health;
-float autocvar_g_monster_shambler_damage;
-float autocvar_g_monster_shambler_attack_lightning_damage;
-float autocvar_g_monster_shambler_attack_claw_damage;
-float autocvar_g_monster_shambler_speed_walk;
-float autocvar_g_monster_shambler_speed_run;
-
 const float shambler_anim_stand        = 0;
 const float shambler_anim_walk                 = 1;
 const float shambler_anim_run          = 2;
@@ -30,7 +35,7 @@ const float shambler_anim_death       = 8;
 
 void shambler_smash()
 {
-       monster_melee(self.enemy, autocvar_g_monster_shambler_damage, 0.3, DEATH_MONSTER_SHAMBLER_SMASH, TRUE);
+       monster_melee(self.enemy, MON_CVAR(shambler, attack_smash_damage), 0.3, DEATH_MONSTER_SHAMBLER_SMASH, TRUE);
 }
 
 void shambler_delayedsmash()
@@ -44,7 +49,7 @@ void shambler_swing()
 {
        float r = (random() < 0.5);
        monsters_setframe((r) ? shambler_anim_swingr : shambler_anim_swingl);
-       monster_melee(self.enemy, autocvar_g_monster_shambler_attack_claw_damage, 0.3, DEATH_MONSTER_SHAMBLER_CLAW, TRUE);
+       monster_melee(self.enemy, MON_CVAR(shambler, attack_claw_damage), 0.3, DEATH_MONSTER_SHAMBLER_CLAW, TRUE);
        self.attack_finished_single = time + 0.8;
        if(r)
                defer(0.5, shambler_swing);
@@ -64,7 +69,7 @@ void CastLightning()
 
        traceline (org, self.origin + dir * 1000, TRUE, self);
                
-       FireRailgunBullet (org, org + dir * 1000, autocvar_g_monster_shambler_attack_lightning_damage * monster_skill, 0, 0, 0, 0, 0, DEATH_MONSTER_SHAMBLER_ZAP);
+       FireRailgunBullet (org, org + dir * 1000, MON_CVAR(shambler, attack_lightning_damage) * monster_skill, 0, 0, 0, 0, 0, DEATH_MONSTER_SHAMBLER_ZAP);
        
        // teamcolor / hit beam effect
        //v = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos);
@@ -103,8 +108,6 @@ float shambler_attack(float attack_type)
 
 void spawnfunc_monster_shambler()
 {
-       if not(autocvar_g_monster_shambler) { remove(self); return; }
-       
        self.classname = "monster_shambler";
        
        self.monster_spawnfunc = spawnfunc_monster_shambler;
@@ -112,7 +115,7 @@ void spawnfunc_monster_shambler()
        if(Monster_CheckAppearFlags(self))
                return;
        
-       if not(monster_initialize(MON_SHAMBLER, FALSE, MONSTER_SIZE_BROKEN)) { remove(self); return; }
+       if not(monster_initialize(MON_SHAMBLER, FALSE)) { remove(self); return; }
 }
 
 float m_shambler(float req)
@@ -121,7 +124,7 @@ float m_shambler(float req)
        {
                case MR_THINK:
                {
-                       monster_move(autocvar_g_monster_shambler_speed_run, autocvar_g_monster_shambler_speed_walk, 300, shambler_anim_run, shambler_anim_walk, shambler_anim_stand);
+                       monster_move(MON_CVAR(shambler, speed_run), MON_CVAR(shambler, speed_walk), MON_CVAR(shambler, speed_stop), shambler_anim_run, shambler_anim_walk, shambler_anim_stand);
                        return TRUE;
                }
                case MR_DEATH:
@@ -131,7 +134,7 @@ float m_shambler(float req)
                }
                case MR_SETUP:
                {
-                       if not(self.health) self.health = autocvar_g_monster_shambler_health;
+                       if not(self.health) self.health = MON_CVAR(shambler, health);
                                
                        self.monster_attackfunc = shambler_attack;
                        monsters_setframe(shambler_anim_stand);
@@ -144,6 +147,11 @@ float m_shambler(float req)
                        // nothing
                        return TRUE;
                }
+               case MR_CONFIG:
+               {
+                       MON_CONFIG_SETTINGS(SHAMBLER_SETTINGS(shambler))
+                       return TRUE;
+               }
        }
        
        return TRUE;