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 b7cd36fe5ecd6b59a8cd89200c4e7e0ff2aca447..015d0abf2c79d6119df4a96ee8bda25e03629232 100644 (file)
--- a/qcsrc/common/monsters/monster/bruiser.qc
+++ b/qcsrc/common/monsters/monster/bruiser.qc
@@ -12,6 +12,7 @@ REGISTER_MONSTER(
 #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) 
 
@@ -74,7 +75,16 @@ float m_bruiser(float req)
        {
                case MR_THINK:
                {
-                       monster_move(MON_CVAR(bruiser, speed_run), MON_CVAR(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: