From a775ddcb5b935be3358644be27df282fc29a9936 Mon Sep 17 00:00:00 2001 From: Nefertumm Date: Fri, 11 Mar 2022 06:23:48 -0300 Subject: [PATCH] Revert "fix(Scripts/AlteracValley): Mini bosses should evade with boss (#10544)" (#10975) This reverts commit 348b3744876f42a98f26b8f0a27c4c2ed98fc3da. --- .../game/Battlegrounds/Zones/BattlegroundAV.h | 5 +- .../AlteracValley/alterac_valley.cpp | 46 ----------------- .../AlteracValley/boss_drekthar.cpp | 49 +------------------ .../AlteracValley/boss_vanndar.cpp | 49 +------------------ 4 files changed, 3 insertions(+), 146 deletions(-) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h index faef47175..b04cc8301 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h @@ -662,10 +662,7 @@ enum BG_AV_CreaturePlace AV_CPLACE_TRIGGER18 = 319, AV_CPLACE_TRIGGER19 = 320, - AV_CPLACE_MAX = 321, - - AV_CPLACE_A_BOSS = 381, - AV_CPLACE_H_BOSS = 445 + AV_CPLACE_MAX = 321 }; //x, y, z, o diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp index 566467618..ee428aeab 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp @@ -15,7 +15,6 @@ * with this program. If not, see . */ -#include "BattlegroundAV.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" @@ -59,11 +58,6 @@ enum Events EVENT_CHECK_RESET = 6 }; -enum Factions -{ - FACTION_AV_ALLIANCE = 1534 -}; - struct SpellPair { uint32 npcEntry; @@ -110,46 +104,6 @@ public: Reset(); } - void AttackStart(Unit* victim) override - { - ScriptedAI::AttackStart(victim); - - // Boss should attack as well - if (BattlegroundMap* bgMap = me->GetMap()->ToBattlegroundMap()) - { - if (Battleground* bg = bgMap->GetBG()) - { - if (Creature* mainBoss = bg->GetBGCreature((me->GetFaction() == FACTION_AV_ALLIANCE ? AV_CPLACE_A_BOSS : AV_CPLACE_H_BOSS))) - { - if (mainBoss->IsAIEnabled && !mainBoss->IsInCombat()) - { - mainBoss->AI()->AttackStart(victim); - } - } - } - } - } - - void EnterEvadeMode() override - { - ScriptedAI::EnterEvadeMode(); - - // Evade boss - if (BattlegroundMap* bgMap = me->GetMap()->ToBattlegroundMap()) - { - if (Battleground* bg = bgMap->GetBG()) - { - if (Creature* mainBoss = bg->GetBGCreature((me->GetFaction() == FACTION_AV_ALLIANCE ? AV_CPLACE_A_BOSS : AV_CPLACE_H_BOSS))) - { - if (mainBoss->IsAIEnabled && !mainBoss->IsInEvadeMode()) - { - mainBoss->AI()->EnterEvadeMode(); - } - } - } - } - } - void UpdateAI(uint32 diff) override { // I have a feeling this isn't blizzlike, but owell, I'm only passing by and cleaning up. diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp index 2ca4a38d3..f9a1019a3 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -15,7 +15,6 @@ * with this program. If not, see . */ -#include "BattlegroundAV.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" @@ -65,7 +64,7 @@ public: YellTimer = urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS); //20 to 30 seconds } - void EnterCombat(Unit* /*victim*/) override + void EnterCombat(Unit* /*who*/) override { Talk(YELL_AGGRO); } @@ -76,52 +75,6 @@ public: Talk(YELL_RESPAWN); } - void AttackStart(Unit* victim) override - { - ScriptedAI::AttackStart(victim); - - // Mini bosses should attack as well - if (BattlegroundMap* bgMap = me->GetMap()->ToBattlegroundMap()) - { - if (Battleground* bg = bgMap->GetBG()) - { - for (uint8 i = AV_CPLACE_H_MARSHAL_ICE; i <= AV_CPLACE_H_MARSHAL_WTOWER; ++i) - { - if (Creature* marshall = bg->GetBGCreature(i)) - { - if (marshall->IsAIEnabled && !marshall->IsInCombat()) - { - marshall->AI()->AttackStart(victim); - } - } - } - } - } - } - - void EnterEvadeMode() override - { - ScriptedAI::EnterEvadeMode(); - - // Evade mini bosses - if (BattlegroundMap* bgMap = me->GetMap()->ToBattlegroundMap()) - { - if (Battleground* bg = bgMap->GetBG()) - { - for (uint8 i = AV_CPLACE_H_MARSHAL_ICE; i <= AV_CPLACE_H_MARSHAL_WTOWER; ++i) - { - if (Creature* marshall = bg->GetBGCreature(i)) - { - if (marshall->IsAIEnabled && !marshall->IsInEvadeMode()) - { - marshall->AI()->EnterEvadeMode(); - } - } - } - } - } - } - void UpdateAI(uint32 diff) override { if (!UpdateVictim()) diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp index eb1f0a435..f28d7d202 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp @@ -15,7 +15,6 @@ * with this program. If not, see . */ -#include "BattlegroundAV.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" @@ -60,57 +59,11 @@ public: YellTimer = urand(20 * IN_MILLISECONDS, 30 * IN_MILLISECONDS); } - void EnterCombat(Unit* /*victim*/) override + void EnterCombat(Unit* /*who*/) override { Talk(YELL_AGGRO); } - void AttackStart(Unit* victim) override - { - ScriptedAI::AttackStart(victim); - - // Mini bosses should attack as well - if (BattlegroundMap* bgMap = me->GetMap()->ToBattlegroundMap()) - { - if (Battleground* bg = bgMap->GetBG()) - { - for (uint8 i = AV_CPLACE_A_MARSHAL_SOUTH; i <= AV_CPLACE_A_MARSHAL_STONE; ++i) - { - if (Creature* marshall = bg->GetBGCreature(i)) - { - if (marshall->IsAIEnabled && !marshall->IsInCombat()) - { - marshall->AI()->AttackStart(victim); - } - } - } - } - } - } - - void EnterEvadeMode() override - { - ScriptedAI::EnterEvadeMode(); - - // Evade mini bosses - if (BattlegroundMap* bgMap = me->GetMap()->ToBattlegroundMap()) - { - if (Battleground* bg = bgMap->GetBG()) - { - for (uint8 i = AV_CPLACE_A_MARSHAL_SOUTH; i <= AV_CPLACE_A_MARSHAL_STONE; ++i) - { - if (Creature* marshall = bg->GetBGCreature(i)) - { - if (marshall->IsAIEnabled && !marshall->IsInEvadeMode()) - { - marshall->AI()->EnterEvadeMode(); - } - } - } - } - } - } - void UpdateAI(uint32 diff) override { if (!UpdateVictim())