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

fix(Scripts/TempleOfAhnQiraj): Fixed Skeram's Earth Shock. (#12740)

Browse Source 
* fix(Scripts/Temple of AhnQiraj): Fixed Skeram's Earth Shock.

Fixes #12714

* fix codestyle

Co-authored-by: Angelo Venturini <nefertum.dev@protonmail.com>
This commit is contained in:
UltraNix
2022-08-23 13:07:11 +02:00
committed by GitHub
parent 5acdc1845e
commit dabd75f9a1
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+15 -5
View File
@@ -125,7 +125,7 @@ struct boss_skeram : public BossAI
events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6s, 12s); events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 6s, 12s);
events.ScheduleEvent(EVENT_FULLFILMENT, 15s); events.ScheduleEvent(EVENT_FULLFILMENT, 15s);
events.ScheduleEvent(EVENT_BLINK, 30s, 45s); events.ScheduleEvent(EVENT_BLINK, 30s, 45s);
events.ScheduleEvent(EVENT_EARTH_SHOCK, 2s); events.ScheduleEvent(EVENT_EARTH_SHOCK, 1200ms);
Talk(SAY_AGGRO); Talk(SAY_AGGRO);
} }
@@ -159,7 +159,7 @@ struct boss_skeram : public BossAI
break; break;
case EVENT_EARTH_SHOCK: case EVENT_EARTH_SHOCK:
DoCastVictim(SPELL_EARTH_SHOCK); DoCastVictim(SPELL_EARTH_SHOCK);
events.ScheduleEvent(EVENT_EARTH_SHOCK, 2s); events.ScheduleEvent(EVENT_EARTH_SHOCK, 1200ms);
break; break;
} }
} }
@@ -173,10 +173,20 @@ struct boss_skeram : public BossAI
events.RescheduleEvent(EVENT_BLINK, 2s); events.RescheduleEvent(EVENT_BLINK, 2s);
} }
if (me->IsWithinMeleeRange(me->GetVictim())) if (Unit* myVictim = me->GetVictim())
{ {
events.RescheduleEvent(EVENT_EARTH_SHOCK, 2s); if (me->IsWithinMeleeRange(myVictim))
DoMeleeAttackIfReady(); {
DoMeleeAttackIfReady();
if (Unit* victimTarget = myVictim->GetVictim())
{
if (victimTarget->GetGUID() == me->GetGUID())
{
events.RescheduleEvent(EVENT_EARTH_SHOCK, 1200ms);
}
}
}
} }
} }