nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 18:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/OnyxiasLair): Force Onyxia to enter evade mode if pulled out of her room (#10890)

Browse Source
This commit is contained in:
Skjalf
2022-03-07 14:14:10 -03:00
committed by GitHub
parent fd2a18a755
commit d835832171
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
View File

@@ -106,14 +106,12 @@ static sOnyxMove OnyxiaMoveData[] =
enum Yells
{
// Say
SAY_AGGRO = 0,
SAY_KILL = 1,
SAY_PHASE_2_TRANS = 2,
SAY_PHASE_3_TRANS = 3,
// Emote
EMOTE_BREATH = 4
EMOTE_BREATH = 4,
SAY_EVADE = 5
};
struct boss_onyxia : public BossAI
@@ -187,6 +185,8 @@ public:
instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); // just in case at reset some players already left the instance
instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
BossAI::EnterCombat(who);
me->SummonCreature(NPC_ONYXIAN_LAIR_GUARD, -167.837936f, -200.549332f, -66.343231f, 5.598287f, TEMPSUMMON_MANUAL_DESPAWN);
}
void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
@@ -204,11 +204,18 @@ public:
void JustSummoned(Creature* summon) override
{
summons.Summon(summon);
if (summon->GetEntry() != NPC_ONYXIAN_WHELP && summon->GetEntry() != NPC_ONYXIAN_LAIR_GUARD)
{
return;
}
if (summon->GetEntry() == NPC_ONYXIAN_LAIR_GUARD && Phase != PHASE_LANDED)
{
return;
}
if (Unit* target = summon->SelectNearestTarget(300.0f))
{
summon->AI()->AttackStart(target);
@@ -287,9 +294,21 @@ public:
}
}
bool CheckInRoom()
{
if (me->GetDistance2d(me->GetHomePosition().GetPositionX(), me->GetHomePosition().GetPositionY()) > 95.0f)
{
Talk(SAY_EVADE);
EnterEvadeMode();
return false;
}
return true;
}
void UpdateAI(uint32 diff) override
{
if (!UpdateVictim())
if (!UpdateVictim() || !CheckInRoom())
{
return;
}