sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(Core/Maps): AreaBoundary (#10525)

Browse Source 
* cherry-picked commit (https://github.com/TrinityCore/TrinityCore/commit/2da458c56d024aac04468ce2af454a83ad790bf6)
This commit is contained in:
IntelligentQuantum
2022-04-15 16:40:41 +04:30
committed by GitHub
parent c1747f2fbf
commit ab4ee71762
169 changed files with 918 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
+3 -3
View File
@@ -130,9 +130,9 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
// Evade boss
if (BattlegroundMap* bgMap = me->GetMap()->ToBattlegroundMap())
@@ -199,7 +199,7 @@ public:
Position const& _homePosition = me->GetHomePosition();
if (me->GetDistance2d(_homePosition.GetPositionX(), _homePosition.GetPositionY()) > 50.0f)
{
EnterEvadeMode();
ScriptedAI::EnterEvadeMode();
return;
}
events.ScheduleEvent(EVENT_CHECK_RESET, 5000);
src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
+3 -3
View File
@@ -99,9 +99,9 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
// Evade mini bosses
if (BattlegroundMap* bgMap = me->GetMap()->ToBattlegroundMap())
@@ -167,7 +167,7 @@ public:
{
if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
{
EnterEvadeMode();
ScriptedAI::EnterEvadeMode();
Talk(YELL_EVADE);
}
ResetTimer = 5 * IN_MILLISECONDS;
src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp
+3 -3
View File
@@ -88,9 +88,9 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
// Evade mini bosses
if (BattlegroundMap* bgMap = me->GetMap()->ToBattlegroundMap())
@@ -149,7 +149,7 @@ public:
{
if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 50)
{
EnterEvadeMode();
ScriptedAI::EnterEvadeMode();
Talk(YELL_EVADE);
}
ResetTimer = 5 * IN_MILLISECONDS;
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
+1 -1
View File
@@ -225,7 +225,7 @@ public:
me->GetMotionMaster()->MoveFollow(summoner, 0.f, 0.f);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
if (Creature* flamelasher = ObjectAccessor::GetCreature(*me, _flamelasherGUID))
{
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
+1 -1
View File
@@ -200,7 +200,7 @@ public:
_events.ScheduleEvent(EVENT_SPELL_SUMMON_VOIDWALKERS, 1000);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
me->RemoveAllAuras();
me->DeleteThreatList();
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp
+2 -2
View File
@@ -76,10 +76,10 @@ public:
events.ScheduleEvent(EVENT_KNOCK_AWAY, urand(12000, 18000));
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
instance->SetBossState(DATA_WARCHIEF_REND_BLACKHAND, FAIL);
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
}
void IsSummonedBy(Unit* /*summoner*/) override
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
+2 -2
View File
@@ -164,11 +164,11 @@ public:
events.ScheduleEvent(EVENT_MORTAL_STRIKE, urand(17000, 19000));
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
instance->SetBossState(DATA_WARCHIEF_REND_BLACKHAND, FAIL);
instance->SetBossState(DATA_GYTH, FAIL);
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
me->DespawnOrUnsummon();
}
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+4 -4
View File
@@ -63,10 +63,10 @@ MinionData const minionData[] =
DoorData const doorData[] =
{
{ GO_GYTH_EXIT_DOOR, DATA_WARCHIEF_REND_BLACKHAND, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ GO_DRAKKISATH_DOOR_1, DATA_GENERAL_DRAKKISATH, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ GO_DRAKKISATH_DOOR_2, DATA_GENERAL_DRAKKISATH, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE } // END
{ GO_GYTH_EXIT_DOOR, DATA_WARCHIEF_REND_BLACKHAND, DOOR_TYPE_PASSAGE },
{ GO_DRAKKISATH_DOOR_1, DATA_GENERAL_DRAKKISATH, DOOR_TYPE_PASSAGE },
{ GO_DRAKKISATH_DOOR_2, DATA_GENERAL_DRAKKISATH, DOOR_TYPE_PASSAGE },
{ 0, 0, DOOR_TYPE_ROOM, } // END
};
class instance_blackrock_spire : public InstanceMapScript
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
+10 -10
View File
@@ -31,16 +31,16 @@
DoorData const doorData[] =
{
{ GO_PORTCULLIS_RAZORGORE, DATA_RAZORGORE_THE_UNTAMED, DOOR_TYPE_PASSAGE, BOUNDARY_NONE}, // ID 175946 || GUID 7230
{ GO_PORTCULLIS_RAZORGORE_ROOM, DATA_RAZORGORE_THE_UNTAMED, DOOR_TYPE_ROOM, BOUNDARY_NONE}, // ID 176964 || GUID 75158
{ GO_PORTCULLIS_VAELASTRASZ, DATA_VAELASTRAZ_THE_CORRUPT, DOOR_TYPE_PASSAGE, BOUNDARY_NONE}, // ID 175185 || GUID 7229
{ GO_PORTCULLIS_BROODLORD, DATA_BROODLORD_LASHLAYER, DOOR_TYPE_PASSAGE, BOUNDARY_NONE}, // ID 179365 || GUID 75159
{ GO_PORTCULLIS_THREEDRAGONS, DATA_FIREMAW, DOOR_TYPE_PASSAGE, BOUNDARY_NONE}, // ID 179115 || GUID 75165
{ GO_PORTCULLIS_THREEDRAGONS, DATA_EBONROC, DOOR_TYPE_PASSAGE, BOUNDARY_NONE}, // ID 179115 || GUID 75165
{ GO_PORTCULLIS_THREEDRAGONS, DATA_FLAMEGOR, DOOR_TYPE_PASSAGE, BOUNDARY_NONE}, // ID 179115 || GUID 75165
{ GO_PORTCULLIS_CHROMAGGUS, DATA_CHROMAGGUS, DOOR_TYPE_PASSAGE, BOUNDARY_NONE}, // ID 179116 || GUID 75161
{ GO_PORTCULLIS_NEFARIAN, DATA_NEFARIAN, DOOR_TYPE_ROOM, BOUNDARY_NONE}, // ID 179117 || GUID 75164
{ 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE} // END
{ GO_PORTCULLIS_RAZORGORE, DATA_RAZORGORE_THE_UNTAMED, DOOR_TYPE_PASSAGE }, // ID 175946 || GUID 7230
{ GO_PORTCULLIS_RAZORGORE_ROOM, DATA_RAZORGORE_THE_UNTAMED, DOOR_TYPE_ROOM, }, // ID 176964 || GUID 75158
{ GO_PORTCULLIS_VAELASTRASZ, DATA_VAELASTRAZ_THE_CORRUPT, DOOR_TYPE_PASSAGE }, // ID 175185 || GUID 7229
{ GO_PORTCULLIS_BROODLORD, DATA_BROODLORD_LASHLAYER, DOOR_TYPE_PASSAGE }, // ID 179365 || GUID 75159
{ GO_PORTCULLIS_THREEDRAGONS, DATA_FIREMAW, DOOR_TYPE_PASSAGE }, // ID 179115 || GUID 75165
{ GO_PORTCULLIS_THREEDRAGONS, DATA_EBONROC, DOOR_TYPE_PASSAGE }, // ID 179115 || GUID 75165
{ GO_PORTCULLIS_THREEDRAGONS, DATA_FLAMEGOR, DOOR_TYPE_PASSAGE }, // ID 179115 || GUID 75165
{ GO_PORTCULLIS_CHROMAGGUS, DATA_CHROMAGGUS, DOOR_TYPE_PASSAGE }, // ID 179116 || GUID 75161
{ GO_PORTCULLIS_NEFARIAN, DATA_NEFARIAN, DOOR_TYPE_ROOM }, // ID 179117 || GUID 75164
{ 0, 0, DOOR_TYPE_ROOM } // END
};
ObjectData const creatureData[] =
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp
+2 -2
View File
@@ -232,7 +232,7 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (!me->getThreatMgr().getThreatList().empty())
{
@@ -245,7 +245,7 @@ public:
}
else
{
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
}
}
src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
-1
View File
@@ -185,7 +185,6 @@ public:
if (me->IsVisible())
DoMeleeAttackIfReady();
EnterEvadeIfOutOfCombatArea();
}
bool CheckEvadeIfOutOfCombatArea() const override
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+3 -3
View File
@@ -194,7 +194,7 @@ public:
case EVENT_CHECK_DIST:
if (me->GetDistance(me->GetHomePosition()) > 75.0f)
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
events.ScheduleEvent(EVENT_CHECK_DIST, 5000);
@@ -325,7 +325,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
summons.Summon(summon);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (Creature* delrissa = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_DELRISSA)))
if (!delrissa->IsAlive())
@@ -333,7 +333,7 @@ struct boss_priestess_lackey_commonAI : public ScriptedAI
delrissa->Respawn();
return;
}
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void EnterCombat(Unit* who) override
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+1 -1
View File
@@ -240,7 +240,7 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
me->DeleteThreatList();
me->CombatStop(false);
src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp
+1 -1
View File
@@ -100,7 +100,7 @@ public:
instance->SetData(DATA_KIRTONOS_THE_HERALD, DONE);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
instance->SetData(DATA_KIRTONOS_THE_HERALD, FAIL);
me->DespawnOrUnsummon(1);
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+6 -6
View File
@@ -111,15 +111,15 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
if (Creature* alythess = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_GRAND_WARLOCK_ALYTHESS)))
{
if (!alythess->IsAlive())
alythess->Respawn(true);
else if (!alythess->IsInEvadeMode())
alythess->AI()->EnterEvadeMode();
alythess->AI()->EnterEvadeMode(why);
}
}
@@ -259,15 +259,15 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
if (Creature* scorlash = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_LADY_SACROLASH)))
{
if (!scorlash->IsAlive())
scorlash->Respawn(true);
else if (!scorlash->IsInEvadeMode())
scorlash->AI()->EnterEvadeMode();
scorlash->AI()->EnterEvadeMode(why);
}
}
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+2 -2
View File
@@ -308,11 +308,11 @@ public:
events.Reset();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (me->GetReactState() == REACT_PASSIVE)
return;
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void AttackStart(Unit* who) override
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+2 -2
View File
@@ -176,12 +176,12 @@ public:
me->SetReactState(REACT_PASSIVE);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (InstanceScript* instance = me->GetInstanceScript())
if (Creature* muru = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_MURU)))
if (!muru->IsInEvadeMode())
muru->AI()->EnterEvadeMode();
muru->AI()->EnterEvadeMode(why);
me->DespawnOrUnsummon();
}
src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+7 -7
View File
@@ -22,13 +22,13 @@
DoorData const doorData[] =
{
{ GO_FIRE_BARRIER, DATA_FELMYST_DOORS, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ GO_MURUS_GATE_1, DATA_MURU, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ GO_MURUS_GATE_2, DATA_MURU, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ GO_BOSS_COLLISION_1, DATA_KALECGOS, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ GO_BOSS_COLLISION_2, DATA_KALECGOS, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ GO_FORCE_FIELD, DATA_KALECGOS, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE } // END
{ GO_FIRE_BARRIER, DATA_FELMYST_DOORS, DOOR_TYPE_PASSAGE },
{ GO_MURUS_GATE_1, DATA_MURU, DOOR_TYPE_ROOM },
{ GO_MURUS_GATE_2, DATA_MURU, DOOR_TYPE_PASSAGE },
{ GO_BOSS_COLLISION_1, DATA_KALECGOS, DOOR_TYPE_ROOM },
{ GO_BOSS_COLLISION_2, DATA_KALECGOS, DOOR_TYPE_ROOM },
{ GO_FORCE_FIELD, DATA_KALECGOS, DOOR_TYPE_ROOM },
{ 0, 0, DOOR_TYPE_ROOM } // END
};
class instance_sunwell_plateau : public InstanceMapScript
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
-2
View File
@@ -402,8 +402,6 @@ public:
else HatcherTimer -= diff;
}
EnterEvadeIfOutOfCombatArea();
DoMeleeAttackIfReady();
if (FireBreathTimer <= diff)
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+2 -2
View File
@@ -150,9 +150,9 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
if (GameObject* object = ObjectAccessor::GetGameObject(*me, instance->GetGuidData(GO_GONG_OF_BETHEKK)))
object->RemoveGameObjectFlag(GO_FLAG_NOT_SELECTABLE);
me->DespawnOrUnsummon(4000);
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+2 -2
View File
@@ -28,8 +28,8 @@ EndScriptData */
DoorData const doorData[] =
{
{ GO_FORCEFIELD, DATA_ARLOKK, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE } // END
{ GO_FORCEFIELD, DATA_ARLOKK, DOOR_TYPE_ROOM },
{ 0, 0, DOOR_TYPE_ROOM } // END
};
class instance_zulgurub : public InstanceMapScript
src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp
+5 -5
View File
@@ -215,7 +215,7 @@ public:
{
damage = 0;
me->setActive(false);
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
}
}
@@ -243,7 +243,7 @@ public:
break;
}
me->setActive(false);
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
case EVENT_SUMMON_SOLDIERS:
for (uint8 i = 0; i < SUNWELL_DEFENDER_NUM; ++i)
@@ -393,7 +393,7 @@ public:
case EVENT_DISAPPEAR:
me->SetVisible(false);
me->setActive(false);
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
break;
case EVENT_SET_FACING:
me->SetFacingTo(2.45f);
@@ -425,11 +425,11 @@ public:
events.ScheduleEvent(EVENT_SET_FACING, 0);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (me->isActiveObject())
return;
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void SetData(uint32 type, uint32 id) override
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
+2 -2
View File
@@ -155,7 +155,7 @@ public:
MarzonGUID.Clear();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
me->DisappearAndDie();
@@ -317,7 +317,7 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
me->DisappearAndDie();
src/server/scripts/EasternKingdoms/zone_undercity.cpp
+2 -2
View File
@@ -1011,7 +1011,7 @@ public:
EventMap _events;
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
me->DeleteThreatList();
me->CombatStop(true);
@@ -2353,7 +2353,7 @@ public:
EventMap _events;
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
me->RemoveAura(SPELL_HEROIC_VANGUARD);
me->DeleteThreatList();
src/server/scripts/Events/hallows_end.cpp
+1 -1
View File
@@ -660,7 +660,7 @@ struct npc_hallows_end_soh : public ScriptedAI
me->SetDisableGravity(true);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /* why */) override
{
me->DespawnOrUnsummon(1);
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+1 -1
View File
@@ -406,7 +406,7 @@ void hyjalAI::Reset()
DoHide = true;
}
void hyjalAI::EnterEvadeMode()
void hyjalAI::EnterEvadeMode(EvadeReason /*why*/)
{
if (me->GetEntry() != JAINA)
me->RemoveAllAuras();
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h
+1 -1
View File
@@ -122,7 +122,7 @@ struct hyjalAI : public npc_escortAI
void Reset() override; // Generically used to reset our variables. Do *not* call in EnterEvadeMode as this may make problems if the raid is still in combat
void EnterEvadeMode() override; // Send creature back to spawn location and evade.
void EnterEvadeMode(EvadeReason /*why*/ = EVADE_REASON_OTHER) override; // Send creature back to spawn location and evade.
void EnterCombat(Unit* /*who*/) override; // Used to reset cooldowns for our spells and to inform the raid that we're under attack
src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+1 -1
View File
@@ -294,7 +294,7 @@ public:
}
}
bool CheckInRoom()
bool CheckInRoom() override
{
if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 95.0f)
{
src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp
+2 -2
View File
@@ -122,10 +122,10 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->ClearUnitState(UNIT_STATE_ROOT);
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
}
void EnterCombat(Unit* attacker) override
src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+2 -2
View File
@@ -70,9 +70,9 @@ public:
{
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
for (ObjectGuid const& guid : Eggs)
if (Creature* egg = me->GetMap()->GetCreature(guid))
src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+2 -2
View File
@@ -158,11 +158,11 @@ public:
Talk(SAY_SLAY);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
Cleanup();
summons.DespawnAll();
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
}
void JustDied(Unit* /*killer*/) override
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+2 -2
View File
@@ -68,9 +68,9 @@ public:
Talk(SAY_SLAY);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
if (me->IsSummon())
((TempSummon*)me)->UnSummon();
}
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp
+2 -2
View File
@@ -182,10 +182,10 @@ public:
events.ScheduleEvent(EVENT_POISON_SHOCK, urand(7000, 12000));
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
summons.DespawnAll();
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void JustDied(Unit* /*killer*/) override
src/server/scripts/Kalimdor/zone_desolace.cpp
+2 -2
View File
@@ -122,11 +122,11 @@ public:
npc_escortAI::JustDied(killer);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
SummonsFollow();
ImmuneFlagSet(false, 35);
npc_escortAI::EnterEvadeMode();
npc_escortAI::EnterEvadeMode(why);
}
void CheckPlayer()
src/server/scripts/Kalimdor/zone_feralas.cpp
+2 -2
View File
@@ -149,9 +149,9 @@ public:
_events.ScheduleEvent(EVENT_FINAL_TALK, 5 * IN_MILLISECONDS);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
_EnterEvadeMode();
_EnterEvadeMode(why);
if (Player* player = ObjectAccessor::GetPlayer(*me, _playerGUID))
{
src/server/scripts/Kalimdor/zone_moonglade.cpp
+2 -2
View File
@@ -356,7 +356,7 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID);
if (player && player->IsInCombat() && player->getAttackerForHelper())
@@ -364,7 +364,7 @@ public:
AttackStart(player->getAttackerForHelper());
return;
}
npc_escortAI::EnterEvadeMode();
npc_escortAI::EnterEvadeMode(why);
}
void StartEvent(Player* player)
src/server/scripts/Kalimdor/zone_the_barrens.cpp
+5 -5
View File
@@ -306,10 +306,10 @@ public:
void EnterCombat(Unit* /*who*/) override { }
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
CleanUp();
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void CleanUp()
@@ -343,7 +343,7 @@ public:
Player* pWarrior = ObjectAccessor::GetPlayer(*me, PlayerGUID);
if (!pWarrior || me->GetDistance2d(pWarrior) >= 200.0f)
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -351,7 +351,7 @@ public:
{
Talk(SAY_TWIGGY_FLATHEAD_DOWN);
pWarrior->FailQuest(1719);
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -435,7 +435,7 @@ public:
if (!creature || !creature->IsAlive())
{
Talk(SAY_TWIGGY_FLATHEAD_OVER);
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
else // Makes BIG WILL attackable.
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+2 -2
View File
@@ -83,10 +83,10 @@ class boss_anub_arak : public CreatureScript
bool intro;
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->DisableRotate(false);
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
}
void MoveInLineOfSight(Unit* who) override
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
-1
View File
@@ -195,7 +195,6 @@ public:
}
DoMeleeAttackIfReady();
EnterEvadeIfOutOfCombatArea();
}
bool CheckEvadeIfOutOfCombatArea() const override
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
+5 -5
View File
@@ -21,11 +21,11 @@
DoorData const doorData[] =
{
{ GO_KRIKTHIR_DOORS, DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ GO_ANUBARAK_DOORS1, DATA_ANUBARAK_EVENT, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ GO_ANUBARAK_DOORS2, DATA_ANUBARAK_EVENT, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ GO_ANUBARAK_DOORS3, DATA_ANUBARAK_EVENT, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE }
{ GO_KRIKTHIR_DOORS, DATA_KRIKTHIR_THE_GATEWATCHER_EVENT, DOOR_TYPE_PASSAGE },
{ GO_ANUBARAK_DOORS1, DATA_ANUBARAK_EVENT, DOOR_TYPE_ROOM },
{ GO_ANUBARAK_DOORS2, DATA_ANUBARAK_EVENT, DOOR_TYPE_ROOM },
{ GO_ANUBARAK_DOORS3, DATA_ANUBARAK_EVENT, DOOR_TYPE_ROOM },
{ 0, 0, DOOR_TYPE_ROOM }
};
ObjectData const creatureData[] =
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
+3 -3
View File
@@ -140,10 +140,10 @@ struct boss_amanitar : public BossAI
BossAI::SummonedCreatureDies(summon, killer);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MINI);
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
}
void ExecuteEvent(uint32 eventId) override
@@ -245,7 +245,7 @@ struct npc_amanitar_mushrooms : public ScriptedAI
// Disabled events
void EnterCombat(Unit* /*who*/) override {}
void AttackStart(Unit* /*victim*/) override {}
void EnterEvadeMode() override {}
void EnterEvadeMode(EvadeReason /*why*/) override {}
void Reset() override
{
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+2 -2
View File
@@ -592,11 +592,11 @@ struct npc_twilight_volunteer : public ScriptedAI
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (!isSacraficeTarget)
{
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
}
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
+1 -2
View File
@@ -177,7 +177,6 @@ public:
}
DoMeleeAttackIfReady();
EnterEvadeIfOutOfCombatArea();
}
bool CheckEvadeIfOutOfCombatArea() const override
@@ -218,7 +217,7 @@ public:
_events.ScheduleEvent(EVENT_LAVA_GOUT, 5000);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
// Prevent EvadeMode
}
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+3 -3
View File
@@ -272,12 +272,12 @@ public:
return false;
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (IsAnyPlayerValid())
return;
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
}
void AttackStart(Unit* who) override
@@ -473,7 +473,7 @@ public:
me->SetInCombatWithZone();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
}
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
+17 -10
View File
@@ -22,18 +22,24 @@
#include "WorldPacket.h"
#include "ruby_sanctum.h"
BossBoundaryData const boundaries =
{
{ DATA_GENERAL_ZARITHRIAN, new EllipseBoundary(Position(3013.409f, 529.492f), 45.0, 100.0) },
{ DATA_HALION, new CircleBoundary(Position(3156.037f, 533.2656f), 48.5) }
};
DoorData const doorData[] =
{
{GO_FIRE_FIELD, DATA_BALTHARUS_THE_WARBORN, DOOR_TYPE_PASSAGE, BOUNDARY_E },
{GO_FLAME_WALLS, DATA_SAVIANA_RAGEFIRE, DOOR_TYPE_PASSAGE, BOUNDARY_NONE},
{GO_FLAME_WALLS, DATA_BALTHARUS_THE_WARBORN, DOOR_TYPE_PASSAGE, BOUNDARY_NONE},
{GO_FLAME_WALLS, DATA_GENERAL_ZARITHRIAN, DOOR_TYPE_ROOM, BOUNDARY_NONE},
{GO_BURNING_TREE_4, DATA_HALION_INTRO1, DOOR_TYPE_PASSAGE, BOUNDARY_NONE},
{GO_BURNING_TREE_3, DATA_HALION_INTRO1, DOOR_TYPE_PASSAGE, BOUNDARY_NONE},
{GO_BURNING_TREE_2, DATA_HALION_INTRO2, DOOR_TYPE_PASSAGE, BOUNDARY_NONE},
{GO_BURNING_TREE_1, DATA_HALION_INTRO2, DOOR_TYPE_PASSAGE, BOUNDARY_NONE},
{GO_TWILIGHT_FLAME_RING, DATA_HALION, DOOR_TYPE_ROOM, BOUNDARY_NONE},
{0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE},
{GO_FIRE_FIELD, DATA_BALTHARUS_THE_WARBORN, DOOR_TYPE_PASSAGE },
{GO_FLAME_WALLS, DATA_SAVIANA_RAGEFIRE, DOOR_TYPE_PASSAGE },
{GO_FLAME_WALLS, DATA_BALTHARUS_THE_WARBORN, DOOR_TYPE_PASSAGE },
{GO_FLAME_WALLS, DATA_GENERAL_ZARITHRIAN, DOOR_TYPE_ROOM, },
{GO_BURNING_TREE_4, DATA_HALION_INTRO1, DOOR_TYPE_PASSAGE },
{GO_BURNING_TREE_3, DATA_HALION_INTRO1, DOOR_TYPE_PASSAGE },
{GO_BURNING_TREE_2, DATA_HALION_INTRO2, DOOR_TYPE_PASSAGE },
{GO_BURNING_TREE_1, DATA_HALION_INTRO2, DOOR_TYPE_PASSAGE },
{GO_TWILIGHT_FLAME_RING, DATA_HALION, DOOR_TYPE_ROOM },
{0, 0, DOOR_TYPE_ROOM },
};
class instance_ruby_sanctum : public InstanceMapScript
@@ -46,6 +52,7 @@ public:
instance_ruby_sanctum_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetBossNumber(MAX_ENCOUNTERS);
LoadBossBoundaries(boundaries);
LoadDoorData(doorData);
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+3 -3
View File
@@ -128,10 +128,10 @@ public:
//me->SetLootMode(0); // [LOOT]
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->DespawnOrUnsummon(1);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
@@ -225,7 +225,7 @@ public:
events.ScheduleEvent(EVENT_SPELL_MARKED_DEATH, 1000);
break;
default:
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
break;
}
break;
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+1 -1
View File
@@ -591,7 +591,7 @@ public:
}
}
void EnterEvadeMode() override {}
void EnterEvadeMode(EvadeReason /*why*/) override {}
void WaypointReached(uint32 i) override
{
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+1 -1
View File
@@ -389,7 +389,7 @@ public:
Talk(SAY_KILL_PLAYER);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
events.Reset();
summons.DespawnAll();
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+3 -3
View File
@@ -134,7 +134,7 @@ struct boss_faction_championsAI : public ScriptedAI
pInstance->SetData(TYPE_FACTION_CHAMPIONS_PLAYER_DIED, 1);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /* why */) override
{
if( pInstance )
pInstance->SetData(TYPE_FAILED, 0);
@@ -2368,7 +2368,7 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /* why */) override
{
me->DespawnOrUnsummon();
}
@@ -2435,7 +2435,7 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /* why */) override
{
me->DespawnOrUnsummon();
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+3 -3
View File
@@ -279,7 +279,7 @@ public:
summons.Summon(summon);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
events.Reset();
summons.DespawnAll();
@@ -355,7 +355,7 @@ public:
me->DespawnOrUnsummon(10000);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
me->DespawnOrUnsummon();
}
@@ -436,7 +436,7 @@ public:
me->DespawnOrUnsummon(10000);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
me->DespawnOrUnsummon();
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+3 -3
View File
@@ -402,7 +402,7 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
events.Reset();
summons.DespawnAll();
@@ -667,7 +667,7 @@ struct boss_jormungarAI : public ScriptedAI
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
events.Reset();
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
@@ -1000,7 +1000,7 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
events.Reset();
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+1 -1
View File
@@ -509,7 +509,7 @@ struct boss_twin_valkyrAI : public ScriptedAI
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /* why */) override
{
if( pInstance )
pInstance->SetData(TYPE_FAILED, 0);
src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
-2
View File
@@ -244,8 +244,6 @@ public:
events.ScheduleEvent(EVENT_SPELL_SUMMON_MINIONS, 500);
break;
}
EnterEvadeIfOutOfCombatArea();
}
bool CheckEvadeIfOutOfCombatArea() const override
src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
-1
View File
@@ -152,7 +152,6 @@ public:
}
DoMeleeAttackIfReady();
EnterEvadeIfOutOfCombatArea();
}
bool CheckEvadeIfOutOfCombatArea() const override
src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
+5 -5
View File
@@ -21,11 +21,11 @@
DoorData const doorData[] =
{
{ GO_NOVOS_CRYSTAL_1, DATA_NOVOS_CRYSTALS, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ GO_NOVOS_CRYSTAL_2, DATA_NOVOS_CRYSTALS, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ GO_NOVOS_CRYSTAL_3, DATA_NOVOS_CRYSTALS, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ GO_NOVOS_CRYSTAL_4, DATA_NOVOS_CRYSTALS, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE }
{ GO_NOVOS_CRYSTAL_1, DATA_NOVOS_CRYSTALS, DOOR_TYPE_ROOM },
{ GO_NOVOS_CRYSTAL_2, DATA_NOVOS_CRYSTALS, DOOR_TYPE_ROOM },
{ GO_NOVOS_CRYSTAL_3, DATA_NOVOS_CRYSTALS, DOOR_TYPE_ROOM },
{ GO_NOVOS_CRYSTAL_4, DATA_NOVOS_CRYSTALS, DOOR_TYPE_ROOM },
{ 0, 0, DOOR_TYPE_ROOM }
};
class instance_drak_tharon_keep : public InstanceMapScript
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+2 -2
View File
@@ -198,10 +198,10 @@ public:
summon->SetReactState(REACT_PASSIVE);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->RemoveUnitFlag(UNIT_FLAG_DISABLE_MOVE);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
};
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+2 -2
View File
@@ -293,11 +293,11 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->SetControlled(false, UNIT_STATE_ROOT);
me->DisableRotate(false);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
};
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp
+2 -2
View File
@@ -164,10 +164,10 @@ public:
Talk(RAND(SAY_SLAY_1, SAY_SLAY_2));
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->SetControlled(false, UNIT_STATE_ROOT);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
if (startFightTimer)
Reset();
}
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+2 -2
View File
@@ -153,9 +153,9 @@ public:
Talk(RAND(SAY_SLAY_1, SAY_SLAY_2));
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
if (startFightTimer)
Reset();
}
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+17 -17
View File
@@ -751,9 +751,9 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
if (me->GetInstanceScript()->GetData(DATA_WAVE_NUMBER))
me->RemoveUnitFlag(UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NOT_SELECTABLE);
}
@@ -847,9 +847,9 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
if (me->GetInstanceScript()->GetData(DATA_WAVE_NUMBER))
me->RemoveUnitFlag(UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NOT_SELECTABLE);
}
@@ -892,12 +892,12 @@ public:
npc_phantom_mageAI::UpdateAI(diff);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (numOfUpd)
return;
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
if (me->IsSummon())
me->ToTempSummon()->DespawnOrUnsummon(1);
}
@@ -990,9 +990,9 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
if (me->GetInstanceScript()->GetData(DATA_WAVE_NUMBER))
me->RemoveUnitFlag(UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NOT_SELECTABLE);
}
@@ -1073,9 +1073,9 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
if (me->GetInstanceScript()->GetData(DATA_WAVE_NUMBER))
me->RemoveUnitFlag(UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NOT_SELECTABLE);
}
@@ -1157,9 +1157,9 @@ public:
DoSpellAttackIfReady(SPELL_SHOOT);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
if (me->GetInstanceScript()->GetData(DATA_WAVE_NUMBER))
me->RemoveUnitFlag(UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NOT_SELECTABLE);
}
@@ -1202,7 +1202,7 @@ public:
Position p = me->GetHomePosition();
if (me->GetExactDist(&p) > 30.0f)
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -1234,10 +1234,10 @@ public:
pInstance->SetData(DATA_FROSTSWORN_GENERAL, DONE);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
pInstance->SetData(ACTION_SPIRITUAL_REFLECTIONS_HIDE, 1);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
};
@@ -1296,10 +1296,10 @@ public:
me->CastSpell((Unit*)nullptr, SPELL_SPIRIT_BURST, false);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->UpdatePosition(me->GetHomePosition(), true);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
me->SetVisible(false);
}
};
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+3 -3
View File
@@ -219,7 +219,7 @@ public:
if (x < 600.0f || x > 770.0f || y < -270.0f || y > -137.0f || z < 514.0f || z > 550.0f)
{
me->SetHealth(me->GetMaxHealth());
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
if (CreatureGroup* f = me->GetFormation())
{
const CreatureGroup::CreatureGroupMemberType& m = f->GetMembers();
@@ -289,11 +289,11 @@ public:
Talk(SAY_SLAY_1);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->SetControlled(false, UNIT_STATE_ROOT);
me->DisableRotate(false);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
};
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+1 -1
View File
@@ -1117,7 +1117,7 @@ public:
return who->GetEntry() == NPC_FALLEN_WARRIOR;
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /* why */) override
{
if (!me->IsAlive() || me->IsInEvadeMode())
return;
src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
+6 -6
View File
@@ -21,12 +21,12 @@
DoorData const doorData[] =
{
{ GO_ECK_DOORS, DATA_MOORABI, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ GO_ECK_UNDERWATER_GATE, DATA_ECK_THE_FEROCIOUS, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ GO_GAL_DARAH_DOORS0, DATA_GAL_DARAH, DOOR_TYPE_ROOM, BOUNDARY_NONE },
{ GO_GAL_DARAH_DOORS1, DATA_GAL_DARAH, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ GO_GAL_DARAH_DOORS2, DATA_GAL_DARAH, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE }
{ GO_ECK_DOORS, DATA_MOORABI, DOOR_TYPE_PASSAGE },
{ GO_ECK_UNDERWATER_GATE, DATA_ECK_THE_FEROCIOUS, DOOR_TYPE_PASSAGE },
{ GO_GAL_DARAH_DOORS0, DATA_GAL_DARAH, DOOR_TYPE_ROOM },
{ GO_GAL_DARAH_DOORS1, DATA_GAL_DARAH, DOOR_TYPE_PASSAGE },
{ GO_GAL_DARAH_DOORS2, DATA_GAL_DARAH, DOOR_TYPE_PASSAGE },
{ 0, 0, DOOR_TYPE_ROOM }
};
class instance_gundrak : public InstanceMapScript
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
+16 -16
View File
@@ -248,7 +248,7 @@ public:
valid = false;
if (!valid)
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -418,7 +418,7 @@ public:
DoSpellAttackIfReady(_isEmpowered ? SPELL_EMPOWERED_SHADOW_LANCE : SPELL_SHADOW_LANCE);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (_evading)
return;
@@ -430,7 +430,7 @@ public:
taldaram->AI()->EnterEvadeMode();
if (Creature* valanar = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_PRINCE_VALANAR_GUID)))
valanar->AI()->EnterEvadeMode();
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
_evading = false;
}
};
@@ -507,7 +507,7 @@ public:
valid = false;
if (!valid)
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -702,7 +702,7 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (_evading)
return;
@@ -711,10 +711,10 @@ public:
DoAction(ACTION_REMOVE_INVOCATION);
_evading = true;
if (Creature* keleseth = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_PRINCE_KELESETH_GUID)))
keleseth->AI()->EnterEvadeMode();
keleseth->AI()->EnterEvadeMode(why);
if (Creature* valanar = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_PRINCE_VALANAR_GUID)))
valanar->AI()->EnterEvadeMode();
ScriptedAI::EnterEvadeMode();
valanar->AI()->EnterEvadeMode(why);
ScriptedAI::EnterEvadeMode(why);
_evading = false;
}
};
@@ -791,7 +791,7 @@ public:
valid = false;
if (!valid)
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -959,10 +959,10 @@ public:
{
Creature* keleseth = instance->instance->GetCreature(instance->GetGuidData(DATA_PRINCE_KELESETH_GUID));
Creature* taldaram = instance->instance->GetCreature(instance->GetGuidData(DATA_PRINCE_TALDARAM_GUID));
if (keleseth && taldaram && CheckBoundary(me) && CheckBoundary(keleseth) && CheckBoundary(taldaram))
if (keleseth && taldaram && IsInBoundary(me) && IsInBoundary(keleseth) && IsInBoundary(taldaram))
return true;
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return false;
}
@@ -999,7 +999,7 @@ public:
}
if (!visualSpellId || !current || !next || !current->IsInCombat() || !next->IsInCombat())
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
next->SetHealth(current->GetHealth());
@@ -1041,7 +1041,7 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (_evading)
return;
@@ -1050,10 +1050,10 @@ public:
DoAction(ACTION_REMOVE_INVOCATION);
_evading = true;
if (Creature* keleseth = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_PRINCE_KELESETH_GUID)))
keleseth->AI()->EnterEvadeMode();
keleseth->AI()->EnterEvadeMode(why);
if (Creature* taldaram = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_PRINCE_TALDARAM_GUID)))
taldaram->AI()->EnterEvadeMode();
BossAI::EnterEvadeMode();
taldaram->AI()->EnterEvadeMode(why);
BossAI::EnterEvadeMode(why);
_evading = false;
}
};
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+3 -3
View File
@@ -172,7 +172,7 @@ public:
{
if (!instance->CheckRequiredBosses(DATA_BLOOD_QUEEN_LANA_THEL, who->ToPlayer()) || !me->IsVisible())
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT);
return;
}
@@ -552,7 +552,7 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
const Map::PlayerList& pl = me->GetMap()->GetPlayers();
for (Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr)
@@ -564,7 +564,7 @@ public:
{
if (!me->IsAlive())
return;
_EnterEvadeMode();
_EnterEvadeMode(why);
Reset();
GoToMinchar();
return;
src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+4 -4
View File
@@ -283,7 +283,7 @@ public:
if (!instance->CheckRequiredBosses(DATA_DEATHBRINGER_SAURFANG, who->ToPlayer()))
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT);
return;
}
@@ -405,7 +405,7 @@ public:
if (Player* p = itr->GetSource())
if (p->GetTransport())
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
}
@@ -495,9 +495,9 @@ public:
return 0;
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
if (Creature* creature = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_SAURFANG_EVENT_NPC)))
creature->AI()->DoAction(ACTION_EVADE);
}
src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
+4 -4
View File
@@ -112,7 +112,7 @@ public:
{
if (!instance->CheckRequiredBosses(DATA_FESTERGUT, who->ToPlayer()))
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT);
return;
}
@@ -151,11 +151,11 @@ public:
instance->SetBossState(DATA_FESTERGUT, FAIL);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
if (Creature* professor = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_PROFESSOR_PUTRICIDE)))
professor->AI()->EnterEvadeMode();
professor->AI()->EnterEvadeMode(why);
}
void KilledUnit(Unit* victim) override
src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+4 -4
View File
@@ -780,7 +780,7 @@ public:
_events.ScheduleEvent(EVENT_CLEAVE, urand(3000, 6000));
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
if (!me->IsAlive())
return;
@@ -1116,7 +1116,7 @@ public:
_events.ScheduleEvent(EVENT_CLEAVE, urand(3000, 6000));
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
if (!me->IsAlive())
return;
@@ -1492,7 +1492,7 @@ struct gunship_npc_AI : public ScriptedAI
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
if (!me->IsAlive() || !me->IsInCombat())
return;
@@ -1553,7 +1553,7 @@ struct npc_gunship_boarding_addAI : public ScriptedAI
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
if (!me->IsAlive() || !me->IsInCombat())
return;
src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+1 -1
View File
@@ -983,7 +983,7 @@ public:
}
void MoveInLineOfSight(Unit* /*who*/) override {}
void EnterEvadeMode() override {}
void EnterEvadeMode(EvadeReason /*why*/ = EVADE_REASON_OTHER) override {}
};
CreatureAI* GetAI(Creature* creature) const override
src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+5 -5
View File
@@ -501,7 +501,7 @@ public:
{
sayFestergutDeathTimer = 0;
Talk(SAY_FESTERGUT_DEATH);
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
}
else
sayFestergutDeathTimer -= diff;
@@ -512,7 +512,7 @@ public:
{
sayRotfaceDeathTimer = 0;
Talk(SAY_ROTFACE_DEATH);
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
}
else
sayRotfaceDeathTimer -= diff;
@@ -520,7 +520,7 @@ public:
else if (bCallEvade)
{
bCallEvade = false;
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -665,12 +665,12 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
Position p = me->GetHomePosition();
if (!me->IsInCombat() && me->GetExactDist2d(&p) > 10.0f)
me->GetMotionMaster()->MoveCharge(tablePos.GetPositionX(), tablePos.GetPositionY(), tablePos.GetPositionZ(), 15.0f, POINT_TABLE);
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
}
void ChangePhase()
src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
+6 -6
View File
@@ -151,7 +151,7 @@ public:
{
if (!instance->CheckRequiredBosses(DATA_ROTFACE, who->ToPlayer()))
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT);
return;
}
@@ -219,13 +219,13 @@ public:
Talk(SAY_KILL);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->SetControlled(false, UNIT_STATE_ROOT);
me->DisableRotate(false);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
if (Creature* professor = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_PROFESSOR_PUTRICIDE)))
professor->AI()->EnterEvadeMode();
professor->AI()->EnterEvadeMode(why);
}
void SpellHitTarget(Unit* target, SpellInfo const* spell) override
@@ -407,7 +407,7 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
me->SetInCombatWithZone();
}
@@ -492,7 +492,7 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
me->SetInCombatWithZone();
}
src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+3 -3
View File
@@ -324,7 +324,7 @@ public:
{
if (!instance->CheckRequiredBosses(DATA_SINDRAGOSA, victim->ToPlayer()) || !me->IsVisible())
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT);
return;
}
@@ -369,7 +369,7 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (!me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE)) // this flag is removed after she lands and can be engaged
{
@@ -381,7 +381,7 @@ public:
}
me->DisableRotate(false);
me->SetControlled(false, UNIT_STATE_ROOT);
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
}
void KilledUnit(Unit* victim) override
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+6 -6
View File
@@ -673,7 +673,7 @@ public:
{
if (!instance->CheckRequiredBosses(DATA_THE_LICH_KING, target->ToPlayer()) || !me->IsVisible())
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
instance->DoCastSpellOnPlayers(LIGHT_S_HAMMER_TELEPORT);
return;
}
@@ -1252,13 +1252,13 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
EntryCheckPredicate pred(NPC_STRANGULATE_VEHICLE);
summons.DoAction(ACTION_TELEPORT_BACK, pred);
instance->SetBossState(DATA_THE_LICH_KING, FAIL);
me->CastSpell((Unit*)nullptr, SPELL_KILL_FROSTMOURNE_PLAYERS, true);
BossAI::EnterEvadeMode();
BossAI::EnterEvadeMode(why);
me->SetReactState(REACT_AGGRESSIVE);
if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_HIGHLORD_TIRION_FORDRING)))
@@ -1635,7 +1635,7 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (!me->IsAlive())
return;
@@ -1643,7 +1643,7 @@ public:
if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_THE_LICH_KING)))
if (theLichKing->IsInEvadeMode())
{
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
return;
}
@@ -3365,7 +3365,7 @@ public:
return target->GetEntry() != NPC_THE_LICH_KING;
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
if (!me->IsAlive())
return;
src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+1 -1
View File
@@ -859,7 +859,7 @@ public:
void AttackStart(Unit*) override {}
void MoveInLineOfSight(Unit*) override {}
void EnterEvadeMode() override {}
void EnterEvadeMode(EvadeReason /*why*/) override {}
void UpdateAI(uint32 diff) override
{
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+2 -2
View File
@@ -1251,9 +1251,9 @@ public:
return (me->GetPositionY() > 2660.0f) == (target->GetPositionY() > 2660.0f) && (target->GetTypeId() == TYPEID_PLAYER || target->IsInCombat());
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (!_EnterEvadeMode())
if (!_EnterEvadeMode(why))
return;
me->GetMotionMaster()->Clear(false);
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+49 -29
View File
@@ -63,37 +63,56 @@ enum Spells
VOID_ZONE_VISUAL = 69422
};
BossBoundaryData const boundaries =
{
{ DATA_LORD_MARROWGAR, new CircleBoundary(Position(-428.0f,2211.0f), 95.0) },
{ DATA_LORD_MARROWGAR, new RectangleBoundary(-430.0f, -330.0f, 2110.0f, 2310.0f) },
{ DATA_LADY_DEATHWHISPER, new RectangleBoundary(-670.0f, -520.0f, 2145.0f, 2280.0f) },
{ DATA_DEATHBRINGER_SAURFANG, new RectangleBoundary(-565.0f, -465.0f, 2160.0f, 2260.0f) },
{ DATA_ROTFACE, new RectangleBoundary(4385.0f, 4505.0f, 3082.0f, 3195.0f) },
{ DATA_FESTERGUT, new RectangleBoundary(4205.0f, 4325.0f, 3082.0f, 3195.0f) },
{ DATA_PROFESSOR_PUTRICIDE, new ParallelogramBoundary(Position(4356.0f, 3290.0f), Position(4435.0f, 3194.0f), Position(4280.0f, 3194.0f)) },
{ DATA_PROFESSOR_PUTRICIDE, new RectangleBoundary(4280.0f, 4435.0f, 3150.0f, 4360.0f) },
{ DATA_BLOOD_PRINCE_COUNCIL, new EllipseBoundary(Position(4660.95f, 2769.194f), 85.0, 60.0) },
{ DATA_BLOOD_QUEEN_LANA_THEL, new CircleBoundary(Position(4595.93f, 2769.365f), 64.0) },
{ DATA_SISTER_SVALNA, new RectangleBoundary(4291.0f, 4423.0f, 2438.0f, 2653.0f) },
{ DATA_VALITHRIA_DREAMWALKER, new RectangleBoundary(4112.5f, 4293.5f, 2385.0f, 2585.0f) },
{ DATA_SINDRAGOSA, new EllipseBoundary(Position(4408.6f, 2484.0f), 100.0, 75.0) }
};
DoorData const doorData[] =
{
{GO_LORD_MARROWGAR_S_ENTRANCE, DATA_LORD_MARROWGAR, DOOR_TYPE_ROOM, BOUNDARY_N },
{GO_SCOURGE_TRANSPORTER_FIRST, DATA_LORD_MARROWGAR, DOOR_TYPE_PASSAGE, BOUNDARY_NONE},
{GO_ICEWALL, DATA_LORD_MARROWGAR, DOOR_TYPE_PASSAGE, BOUNDARY_NONE},
{GO_DOODAD_ICECROWN_ICEWALL02, DATA_LORD_MARROWGAR, DOOR_TYPE_PASSAGE, BOUNDARY_NONE},
{GO_ORATORY_OF_THE_DAMNED_ENTRANCE, DATA_LADY_DEATHWHISPER, DOOR_TYPE_ROOM, BOUNDARY_N },
{GO_SAURFANG_S_DOOR, DATA_DEATHBRINGER_SAURFANG, DOOR_TYPE_PASSAGE, BOUNDARY_NONE},
{GO_ORANGE_PLAGUE_MONSTER_ENTRANCE, DATA_FESTERGUT, DOOR_TYPE_ROOM, BOUNDARY_E },
{GO_GREEN_PLAGUE_MONSTER_ENTRANCE, DATA_ROTFACE, DOOR_TYPE_ROOM, BOUNDARY_E },
//{GO_SCIENTIST_ENTRANCE, DATA_PROFESSOR_PUTRICIDE, DOOR_TYPE_ROOM, BOUNDARY_E },
{GO_CRIMSON_HALL_DOOR, DATA_BLOOD_PRINCE_COUNCIL, DOOR_TYPE_ROOM, BOUNDARY_S },
{GO_CRIMSON_HALL_DOOR, DATA_BLOOD_PRINCE_TRASH, DOOR_TYPE_PASSAGE, BOUNDARY_NONE},
{GO_BLOOD_ELF_COUNCIL_DOOR, DATA_BLOOD_PRINCE_COUNCIL, DOOR_TYPE_PASSAGE, BOUNDARY_W },
{GO_BLOOD_ELF_COUNCIL_DOOR_RIGHT, DATA_BLOOD_PRINCE_COUNCIL, DOOR_TYPE_PASSAGE, BOUNDARY_E },
{GO_DOODAD_ICECROWN_BLOODPRINCE_DOOR_01, DATA_BLOOD_QUEEN_LANA_THEL, DOOR_TYPE_ROOM, BOUNDARY_S },
{GO_DOODAD_ICECROWN_GRATE_01, DATA_BLOOD_QUEEN_LANA_THEL, DOOR_TYPE_PASSAGE, BOUNDARY_NONE},
{GO_GREEN_DRAGON_BOSS_ENTRANCE, DATA_SISTER_SVALNA, DOOR_TYPE_PASSAGE, BOUNDARY_S },
{GO_GREEN_DRAGON_BOSS_ENTRANCE, DATA_VALITHRIA_DREAMWALKER, DOOR_TYPE_ROOM, BOUNDARY_N },
{GO_GREEN_DRAGON_BOSS_EXIT, DATA_VALITHRIA_DREAMWALKER, DOOR_TYPE_PASSAGE, BOUNDARY_S },
{GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_01, DATA_VALITHRIA_DREAMWALKER, DOOR_TYPE_SPAWN_HOLE, BOUNDARY_N },
{GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_02, DATA_VALITHRIA_DREAMWALKER, DOOR_TYPE_SPAWN_HOLE, BOUNDARY_S },
{GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_03, DATA_VALITHRIA_DREAMWALKER, DOOR_TYPE_SPAWN_HOLE, BOUNDARY_N },
{GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_04, DATA_VALITHRIA_DREAMWALKER, DOOR_TYPE_SPAWN_HOLE, BOUNDARY_S },
{GO_SINDRAGOSA_ENTRANCE_DOOR, DATA_SINDRAGOSA, DOOR_TYPE_ROOM, BOUNDARY_NONE},
{GO_SINDRAGOSA_ENTRANCE_DOOR, DATA_SINDRAGOSA_GAUNTLET, DOOR_TYPE_PASSAGE, BOUNDARY_NONE},
{GO_SINDRAGOSA_SHORTCUT_ENTRANCE_DOOR, DATA_SINDRAGOSA, DOOR_TYPE_PASSAGE, BOUNDARY_E },
{GO_SINDRAGOSA_SHORTCUT_EXIT_DOOR, DATA_SINDRAGOSA, DOOR_TYPE_PASSAGE, BOUNDARY_NONE},
{GO_ICE_WALL, DATA_SINDRAGOSA, DOOR_TYPE_ROOM, BOUNDARY_SE },
{GO_ICE_WALL, DATA_SINDRAGOSA, DOOR_TYPE_ROOM, BOUNDARY_SW },
{0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE}, // END
{GO_LORD_MARROWGAR_S_ENTRANCE, DATA_LORD_MARROWGAR, DOOR_TYPE_ROOM },
{GO_SCOURGE_TRANSPORTER_FIRST, DATA_LORD_MARROWGAR, DOOR_TYPE_PASSAGE },
{GO_ICEWALL, DATA_LORD_MARROWGAR, DOOR_TYPE_PASSAGE },
{GO_DOODAD_ICECROWN_ICEWALL02, DATA_LORD_MARROWGAR, DOOR_TYPE_PASSAGE },
{GO_ORATORY_OF_THE_DAMNED_ENTRANCE, DATA_LADY_DEATHWHISPER, DOOR_TYPE_ROOM },
{GO_SAURFANG_S_DOOR, DATA_DEATHBRINGER_SAURFANG, DOOR_TYPE_PASSAGE },
{GO_ORANGE_PLAGUE_MONSTER_ENTRANCE, DATA_FESTERGUT, DOOR_TYPE_ROOM },
{GO_GREEN_PLAGUE_MONSTER_ENTRANCE, DATA_ROTFACE, DOOR_TYPE_ROOM },
{GO_CRIMSON_HALL_DOOR, DATA_BLOOD_PRINCE_COUNCIL, DOOR_TYPE_ROOM },
{GO_CRIMSON_HALL_DOOR, DATA_BLOOD_PRINCE_TRASH, DOOR_TYPE_PASSAGE },
{GO_BLOOD_ELF_COUNCIL_DOOR, DATA_BLOOD_PRINCE_COUNCIL, DOOR_TYPE_PASSAGE },
{GO_BLOOD_ELF_COUNCIL_DOOR_RIGHT, DATA_BLOOD_PRINCE_COUNCIL, DOOR_TYPE_PASSAGE },
{GO_DOODAD_ICECROWN_BLOODPRINCE_DOOR_01, DATA_BLOOD_QUEEN_LANA_THEL, DOOR_TYPE_ROOM },
{GO_DOODAD_ICECROWN_GRATE_01, DATA_BLOOD_QUEEN_LANA_THEL, DOOR_TYPE_PASSAGE },
{GO_GREEN_DRAGON_BOSS_ENTRANCE, DATA_SISTER_SVALNA, DOOR_TYPE_PASSAGE },
{GO_GREEN_DRAGON_BOSS_ENTRANCE, DATA_VALITHRIA_DREAMWALKER, DOOR_TYPE_ROOM },
{GO_GREEN_DRAGON_BOSS_EXIT, DATA_VALITHRIA_DREAMWALKER, DOOR_TYPE_PASSAGE },
{GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_01, DATA_VALITHRIA_DREAMWALKER, DOOR_TYPE_SPAWN_HOLE },
{GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_02, DATA_VALITHRIA_DREAMWALKER, DOOR_TYPE_SPAWN_HOLE },
{GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_03, DATA_VALITHRIA_DREAMWALKER, DOOR_TYPE_SPAWN_HOLE },
{GO_DOODAD_ICECROWN_ROOSTPORTCULLIS_04, DATA_VALITHRIA_DREAMWALKER, DOOR_TYPE_SPAWN_HOLE },
{GO_SINDRAGOSA_ENTRANCE_DOOR, DATA_SINDRAGOSA, DOOR_TYPE_ROOM },
{GO_SINDRAGOSA_ENTRANCE_DOOR, DATA_SINDRAGOSA_GAUNTLET, DOOR_TYPE_PASSAGE },
{GO_SINDRAGOSA_SHORTCUT_ENTRANCE_DOOR, DATA_SINDRAGOSA, DOOR_TYPE_PASSAGE },
{GO_SINDRAGOSA_SHORTCUT_EXIT_DOOR, DATA_SINDRAGOSA, DOOR_TYPE_PASSAGE },
{GO_ICE_WALL, DATA_SINDRAGOSA, DOOR_TYPE_ROOM },
{GO_ICE_WALL, DATA_SINDRAGOSA, DOOR_TYPE_ROOM },
{0, 0, DOOR_TYPE_ROOM }
};
// this doesnt have to only store questgivers, also can be used for related quest spawns
@@ -179,6 +198,7 @@ public:
DarkwhisperElevatorTimer = 3000;
SetBossNumber(MAX_ENCOUNTERS);
LoadBossBoundaries(boundaries);
LoadDoorData(doorData);
TeamIdInInstance = TEAM_NEUTRAL;
HeroicAttempts = MaxHeroicAttempts;
src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+2 -2
View File
@@ -254,10 +254,10 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void KilledUnit(Unit* who) override
src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
+3 -3
View File
@@ -136,7 +136,7 @@ public:
{
if (me->GetExactDist(2684.8f, -3502.5f, 261.3f) > 80.0f)
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return false;
}
return true;
@@ -160,10 +160,10 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->SetControlled(false, UNIT_STATE_ROOT);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void EnterCombat(Unit* who) override
src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+3 -3
View File
@@ -408,10 +408,10 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->SetControlled(false, UNIT_STATE_STUNNED);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void EnterCombat(Unit* pWho) override
@@ -736,7 +736,7 @@ public:
{
public:
npc_teslaAI(Creature* creature) : ScriptedAI(creature) { }
void EnterEvadeMode() override { } // never stop casting due to evade
void EnterEvadeMode(EvadeReason /*why*/) override { } // never stop casting due to evade
void UpdateAI(uint32 /*diff*/) override { } // never do anything unless told
void EnterCombat(Unit* /*who*/) override { }
void DamageTaken(Unit* /*who*/, uint32& damage, DamageEffectType, SpellSchoolMask) override { damage = 0; } // no, you can't kill it
src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+3 -2
View File
@@ -814,12 +814,13 @@ public:
void MoveInLineOfSight(Unit* /*who*/) override {}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->SetDisableGravity(true);
me->GetMap()->SetZoneOverrideLight(AREA_EYE_OF_ETERNITY, LIGHT_GET_DEFAULT_FOR_MAP, 1s);
me->RemoveUnitFlag(UNIT_FLAG_DISABLE_MOVE);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void HandleIntroSpeech(const uint32 diff)
src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
-1
View File
@@ -192,7 +192,6 @@ public:
}
DoMeleeAttackIfReady();
EnterEvadeIfOutOfCombatArea();
}
bool CheckEvadeIfOutOfCombatArea() const override
src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+6 -6
View File
@@ -21,10 +21,10 @@
DoorData const doorData[] =
{
{ GO_TELESTRA_SPHERE, DATA_TELESTRA_ORB, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ GO_ANOMALUS_SPHERE, DATA_ANOMALUS_ORB, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ GO_ORMOROK_SPHERE, DATA_ORMOROK_ORB, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{ 0, 0, DOOR_TYPE_ROOM, BOUNDARY_NONE }
{ GO_TELESTRA_SPHERE, DATA_TELESTRA_ORB, DOOR_TYPE_PASSAGE },
{ GO_ANOMALUS_SPHERE, DATA_ANOMALUS_ORB, DOOR_TYPE_PASSAGE },
{ GO_ORMOROK_SPHERE, DATA_ORMOROK_ORB, DOOR_TYPE_PASSAGE },
{ 0, 0, DOOR_TYPE_ROOM }
};
class instance_nexus : public InstanceMapScript
@@ -226,10 +226,10 @@ public:
_allowDeath = me->GetInstanceScript()->GetBossState(DATA_ORMOROK_EVENT) == DONE;
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (me->isRegeneratingHealth())
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
+2 -2
View File
@@ -360,12 +360,12 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->SetCanFly(false);
me->SetDisableGravity(false);
me->SetControlled(false, UNIT_STATE_ROOT);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
};
};
src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
+2 -2
View File
@@ -145,11 +145,11 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->SetControlled(false, UNIT_STATE_ROOT);
me->DisableRotate(false);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void MoveInLineOfSight(Unit* /*who*/) override {}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
+3 -3
View File
@@ -350,7 +350,7 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (_fightWon)
return;
@@ -366,7 +366,7 @@ public:
return;
}
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void Reset() override
@@ -470,7 +470,7 @@ public:
if (!m_pInstance)
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
+1 -1
View File
@@ -566,7 +566,7 @@ public:
void MoveInLineOfSight(Unit*) override {}
void AttackStart(Unit*) override {}
void UpdateAI(uint32) override {}
void EnterEvadeMode() override {}
void EnterEvadeMode(EvadeReason /* why */) override {}
void OnCharmed(bool /*apply*/) override {}
bool _boomed;
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+1 -1
View File
@@ -724,7 +724,7 @@ public:
Vehicle* vehicle;
uint32 _despawnTimer;
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason /*why*/) override
{
vehicle->InstallAllAccessories(false);
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
-1
View File
@@ -667,7 +667,6 @@ public:
}
DoMeleeAttackIfReady();
EnterEvadeIfOutOfCombatArea();
}
bool CheckEvadeIfOutOfCombatArea() const override
src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+8 -4
View File
@@ -837,7 +837,8 @@ public:
}
void MoveInLineOfSight(Unit* /*who*/) override {}
void EnterEvadeMode() override {}
void EnterEvadeMode(EvadeReason /*why*/) override {}
bool CanAIAttack(Unit const* t) const override { return t->GetEntry() == NPC_HODIR; }
void JustDied(Unit* /*killer*/) override
@@ -934,7 +935,8 @@ public:
}
void MoveInLineOfSight(Unit* /*who*/) override {}
void EnterEvadeMode() override {}
void EnterEvadeMode(EvadeReason /*why*/) override {}
bool CanAIAttack(Unit const* t) const override { return t->GetEntry() == NPC_HODIR; }
void JustDied(Unit* /*killer*/) override
@@ -1034,7 +1036,8 @@ public:
}
void MoveInLineOfSight(Unit* /*who*/) override {}
void EnterEvadeMode() override {}
void EnterEvadeMode(EvadeReason /*why*/) override {}
bool CanAIAttack(Unit const* t) const override { return t->GetEntry() == NPC_HODIR; }
void JustDied(Unit* /*killer*/) override
@@ -1149,7 +1152,8 @@ public:
}
void MoveInLineOfSight(Unit* /*who*/) override {}
void EnterEvadeMode() override {}
void EnterEvadeMode(EvadeReason /*why*/) override {}
bool CanAIAttack(Unit const* t) const override { return t->GetEntry() == NPC_HODIR; }
void JustDied(Unit* /*killer*/) override
src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
+3 -3
View File
@@ -343,7 +343,7 @@ public:
if( me->GetPositionX() < 490.0f || me->GetPositionX() > 690.0f || me->GetPositionY() < 130.0f || me->GetPositionY() > 410.0f )
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -444,11 +444,11 @@ public:
DoMeleeAttackIfReady();
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->SetControlled(false, UNIT_STATE_ROOT);
me->DisableRotate(false);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
};
};
src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+4 -4
View File
@@ -185,9 +185,9 @@ public:
ScriptedAI::MoveInLineOfSight(who);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (!_EnterEvadeMode())
if (!_EnterEvadeMode(why))
return;
Reset();
me->setActive(false);
@@ -406,7 +406,7 @@ public:
{
if (!UpdateVictim())
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -524,7 +524,7 @@ public:
int32 _damageDone;
bool _combatStarted;
void EnterEvadeMode() override {}
void EnterEvadeMode(EvadeReason /*why*/ = EVADE_REASON_OTHER) override {}
void MoveInLineOfSight(Unit*) override {}
void AttackStart(Unit*) override {}
void UpdateAI(uint32 /*diff*/) override {}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+32 -32
View File
@@ -365,7 +365,7 @@ public:
{
if (c->IsInEvadeMode())
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
if (!c->IsAlive())
@@ -375,7 +375,7 @@ public:
}
else
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
CloseDoorAndButton();
@@ -429,7 +429,7 @@ public:
Position p = me->GetHomePosition();
if (me->GetExactDist(&p) > 80.0f || !SelectTargetFromPlayerList(150.0f))
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -512,7 +512,7 @@ public:
events.ScheduleEvent(EVENT_SIT_LMK2_INTERVAL, 2000);
break;
}
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
break;
case EVENT_SIT_LMK2_INTERVAL:
if (Creature* LMK2 = GetLMK2())
@@ -527,7 +527,7 @@ public:
LMK2->AI()->SetData(1, 1);
break;
}
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
break;
case EVENT_LMK2_RETREAT_INTERVAL:
if (Creature* LMK2 = GetLMK2())
@@ -539,7 +539,7 @@ public:
events.ScheduleEvent(EVENT_ELEVATOR_INTERVAL_0, 6000);
break;
}
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
break;
case EVENT_ELEVATOR_INTERVAL_0:
if( GameObject* elevator = me->FindNearestGameObject(GO_MIMIRON_ELEVATOR, 100.0f) )
@@ -562,7 +562,7 @@ public:
events.ScheduleEvent(EVENT_ELEVATOR_INTERVAL_2, 18000);
break;
}
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
break;
case EVENT_ELEVATOR_INTERVAL_2:
if (Creature* VX001 = GetVX001())
@@ -571,7 +571,7 @@ public:
events.ScheduleEvent(EVENT_SITTING_ON_VX001, 4000);
break;
}
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
break;
case EVENT_SITTING_ON_VX001:
me->Yell(TEXT_VX001_ACTIVATE, LANG_UNIVERSAL);
@@ -585,7 +585,7 @@ public:
events.ScheduleEvent(EVENT_EMOTE_VX001, 2000);
break;
}
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
break;
case EVENT_EMOTE_VX001:
if( Creature* VX001 = GetVX001() )
@@ -594,7 +594,7 @@ public:
events.ScheduleEvent(EVENT_VX001_START_FIGHT, 1750);
break;
}
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
break;
case EVENT_VX001_START_FIGHT:
if( Creature* VX001 = GetVX001() )
@@ -605,7 +605,7 @@ public:
me->SetInCombatWithZone();
break;
}
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
break;
case EVENT_VX001_EMOTESTATE_DEATH:
if( Creature* VX001 = GetVX001() )
@@ -615,7 +615,7 @@ public:
events.ScheduleEvent(EVENT_GET_OUT_VX001, 2500);
break;
}
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
break;
case EVENT_GET_OUT_VX001:
if( Creature* VX001 = GetVX001() )
@@ -628,7 +628,7 @@ public:
events.ScheduleEvent(EVENT_SAY_VX001_DEAD, 2000);
break;
}
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
break;
case EVENT_SAY_VX001_DEAD:
changeAllowedFlameSpreadTime = true;
@@ -643,7 +643,7 @@ public:
events.ScheduleEvent(EVENT_SAY_ACU_ACTIVATE, 6000);
break;
}
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
break;
case EVENT_SAY_ACU_ACTIVATE:
me->Yell(TEXT_ACU_ACTIVATE, LANG_UNIVERSAL);
@@ -659,7 +659,7 @@ public:
me->SetInCombatWithZone();
break;
}
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
break;
case EVENT_SAY_ACU_DEAD:
me->Yell(TEXT_ACU_DEATH, LANG_UNIVERSAL);
@@ -673,7 +673,7 @@ public:
events.ScheduleEvent(EVENT_VX001_EMOTE_JUMP, 4000);
break;
}
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
break;
case EVENT_VX001_EMOTE_JUMP:
{
@@ -681,7 +681,7 @@ public:
Creature* VX001 = GetVX001();
if( !VX001 || !LMK2 )
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -697,7 +697,7 @@ public:
Creature* LMK2 = GetLMK2();
if( !VX001 || !LMK2 )
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -714,7 +714,7 @@ public:
Creature* VX001 = GetVX001();
if( !VX001 || !ACU )
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -733,7 +733,7 @@ public:
Creature* ACU = GetACU();
if( !VX001 || !LMK2 || !ACU )
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -839,7 +839,7 @@ public:
void MoveInLineOfSight(Unit* /*mover*/) override {}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (bIsEvading)
return;
@@ -847,16 +847,16 @@ public:
if (Creature* c = GetLMK2())
{
c->AI()->EnterEvadeMode();
c->AI()->EnterEvadeMode(why);
}
if (Creature* c = GetVX001())
{
c->AI()->EnterEvadeMode();
c->AI()->EnterEvadeMode(why);
c->DespawnOrUnsummon();
}
if (Creature* c = GetACU())
{
c->AI()->EnterEvadeMode();
c->AI()->EnterEvadeMode(why);
c->DespawnOrUnsummon();
}
@@ -864,7 +864,7 @@ public:
me->RemoveAllAuras();
me->ExitVehicle();
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
bIsEvading = false;
}
@@ -952,7 +952,7 @@ public:
Creature* ACU = GetACU();
if (!LMK2 || !VX001 || !ACU)
{
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -1226,7 +1226,7 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (bIsEvading)
return;
@@ -1237,7 +1237,7 @@ public:
ScriptedAI::EnterEvadeMode();
if (Creature* mimiron = GetMimiron())
mimiron->AI()->EnterEvadeMode();
mimiron->AI()->EnterEvadeMode(why);
bIsEvading = false;
}
@@ -1580,7 +1580,7 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (bIsEvading)
return;
@@ -1591,7 +1591,7 @@ public:
_EnterEvadeMode();
Reset();
if (Creature* mimiron = GetMimiron())
mimiron->AI()->EnterEvadeMode();
mimiron->AI()->EnterEvadeMode(why);
bIsEvading = false;
}
@@ -1903,7 +1903,7 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (bIsEvading)
return;
@@ -1914,7 +1914,7 @@ public:
_EnterEvadeMode();
Reset();
if (Creature* mimiron = GetMimiron())
mimiron->AI()->EnterEvadeMode();
mimiron->AI()->EnterEvadeMode(why);
bIsEvading = false;
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+2 -2
View File
@@ -588,12 +588,12 @@ public:
pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, NPC_DARK_RUNE_GUARDIAN, 1, me);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->SetDisableGravity(true);
me->SetControlled(false, UNIT_STATE_ROOT);
me->DisableRotate(false);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
};
};
src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
+3 -3
View File
@@ -433,10 +433,10 @@ public:
go->SetGoState(GO_STATE_ACTIVE);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
DisableThorim(false);
CreatureAI::EnterEvadeMode();
CreatureAI::EnterEvadeMode(why);
}
void Reset() override
@@ -959,7 +959,7 @@ public:
uint32 Timer;
void EnterEvadeMode() override {}
void EnterEvadeMode(EvadeReason /*why*/) override {}
void MoveInLineOfSight(Unit*) override {}
void AttackStart(Unit*) override {}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
+3 -3
View File
@@ -399,9 +399,9 @@ public:
me->SummonCreature(NPC_SANITY_WELL, 1899.94f, 0.330621f, 332.296f, 0.0f);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (!_EnterEvadeMode())
if (!_EnterEvadeMode(why))
return;
Position pos;
@@ -736,7 +736,7 @@ public:
if (!SelectTargetFromPlayerList(90, SPELL_INSANE1))
{
m_pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_INSANE1);
EnterEvadeMode();
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp
+2 -2
View File
@@ -297,10 +297,10 @@ public:
ScriptedAI::AttackStart(who);
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
if (me->GetFaction() == FACTION_MONSTER_2)
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void OnCharmed(bool /*apply*/) override {}
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+2 -2
View File
@@ -232,11 +232,11 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->SetControlled(false, UNIT_STATE_ROOT);
me->DisableRotate(false);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void UpdateAI(uint32 diff) override
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+2 -2
View File
@@ -141,10 +141,10 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->SetControlled(false, UNIT_STATE_ROOT);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void SetData(uint32 data, uint32 param) override
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
+2 -2
View File
@@ -159,10 +159,10 @@ public:
}
}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->RemoveUnitFlag(UNIT_FLAG_DISABLE_MOVE);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
}
void EnterCombat(Unit* /*pWho*/) override
src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+2 -2
View File
@@ -179,10 +179,10 @@ public:
void MoveInLineOfSight(Unit* /*who*/) override {}
void EnterEvadeMode() override
void EnterEvadeMode(EvadeReason why) override
{
me->SetControlled(false, UNIT_STATE_ROOT);
ScriptedAI::EnterEvadeMode();
ScriptedAI::EnterEvadeMode(why);
events.Reset();
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
if (pInstance)

Some files were not shown because too many files have changed in this diff Show More