nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-17 10:55:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(Scripts/AlteracValley): Mini bosses should evade with boss (#10544)" (#10975)

Browse Source 
This reverts commit 348b374487.
This commit is contained in:
Nefertumm
2022-03-11 06:23:48 -03:00
committed by GitHub
parent fa55eab6b5
commit a775ddcb5b
4 changed files with 3 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
View File

@@ -15,7 +15,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#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.

49
src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
View File

@@ -15,7 +15,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#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())

49
src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
View File

@@ -15,7 +15,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#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())