Experimental: Bruiser will wait for its pet (closest cerberus) to attack before charg...

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

diff --git a/qcsrc/common/monsters/monster/bruiser.qc b/qcsrc/common/monsters/monster/bruiser.qc
index fe16f9216597b5a3c84646248e7ce01283c15a79..015d0abf2c79d6119df4a96ee8bda25e03629232 100644 (file)
--- a/qcsrc/common/monsters/monster/bruiser.qc
+++ b/qcsrc/common/monsters/monster/bruiser.qc
@@ -9,14 +9,18 @@ REGISTER_MONSTER(
 /* fullname   */ _("Bruiser")
 );
 
+#define BRUISER_SETTINGS(monster) \
+       MON_ADD_CVAR(monster, health) \
+       MON_ADD_CVAR(monster, attack_melee_damage) \
+       MON_ADD_CVAR(monster, speed_stop) \
+       MON_ADD_CVAR(monster, speed_run) \
+       MON_ADD_CVAR(monster, speed_walk) 
+
+#ifdef SVQC
+BRUISER_SETTINGS(bruiser)
+#endif // SVQC
 #else
 #ifdef SVQC
-float autocvar_g_monster_bruiser;
-float autocvar_g_monster_bruiser_health;
-float autocvar_g_monster_bruiser_melee_damage;
-float autocvar_g_monster_bruiser_speed_walk;
-float autocvar_g_monster_bruiser_speed_run;
-
 const float bruiser_anim_stand                 = 0;
 const float bruiser_anim_run           = 1;
 const float bruiser_anim_runattack     = 2;
@@ -39,7 +43,7 @@ float bruiser_attack(float attack_type)
                        monsters_setframe((len < 50) ? bruiser_anim_attack : bruiser_anim_runattack);
                        self.attack_finished_single = time + 1.25;
                        
-                       monster_melee(self.enemy, autocvar_g_monster_bruiser_melee_damage, 0.3, DEATH_MONSTER_BRUISER, FALSE);
+                       monster_melee(self.enemy, MON_CVAR(bruiser, attack_melee_damage), 0.3, DEATH_MONSTER_BRUISER, FALSE);
                        
                        return TRUE;
                }
@@ -55,8 +59,6 @@ float bruiser_attack(float attack_type)
 
 void spawnfunc_monster_bruiser()
 {
-       if not(autocvar_g_monster_bruiser) { remove(self); return; }
-       
        self.classname = "monster_bruiser";
        
        self.monster_spawnfunc = spawnfunc_monster_bruiser;
@@ -73,7 +75,16 @@ float m_bruiser(float req)
        {
                case MR_THINK:
                {
-                       monster_move(autocvar_g_monster_bruiser_speed_run, autocvar_g_monster_bruiser_speed_walk, 50, bruiser_anim_run, bruiser_anim_walk, bruiser_anim_stand);
+                       entity pet = world;
+                       pet = findentity(pet, monster_owner, self);
+                       float rspeed = MON_CVAR(bruiser, speed_run);
+                       
+                       if(pet)
+                       if(self.enemy)
+                       if(vlen(self.enemy.origin - pet.origin) < vlen(self.enemy.origin - self.origin))
+                               rspeed = 0;
+                               
+                       monster_move(rspeed, MON_CVAR(bruiser, speed_walk), MON_CVAR(bruiser, speed_stop), bruiser_anim_run, bruiser_anim_walk, bruiser_anim_stand);
                        return TRUE;
                }
                case MR_DEATH:
@@ -83,7 +94,7 @@ float m_bruiser(float req)
                }
                case MR_SETUP:
                {
-                       if not(self.health) self.health = autocvar_g_monster_bruiser_health;
+                       if not(self.health) self.health = MON_CVAR(bruiser, health);
                                
                        self.monster_attackfunc = bruiser_attack;
                        monsters_setframe(bruiser_anim_stand);
@@ -95,6 +106,11 @@ float m_bruiser(float req)
                        // nothing
                        return TRUE;
                }
+               case MR_CONFIG:
+               {
+                       MON_CONFIG_SETTINGS(BRUISER_SETTINGS(bruiser))
+                       return TRUE;
+               }
        }
        
        return TRUE;