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

fix(Scripts/BT): correct illidari council enrage timer (#19975)

Browse Source 
* fix(Scripts/BT): correct illidari council enrage timer

* wrong conversion from https://github.com/azerothcore/azerothcore-wotlk/commit/5ae1473e3064beb4adf666e33a38b6072639069a

* redundant
This commit is contained in:
Kitzunu
2024-09-15 14:39:04 +02:00
committed by GitHub
parent d13b6963ea
commit 04c8e85434
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
+15 -15
View File
@@ -147,11 +147,11 @@ struct boss_illidari_council : public BossAI
bool spoken = false; bool spoken = false;
me->CastSpell(me, SPELL_EMPYREAL_BALANCE, true); DoCastSelf(SPELL_EMPYREAL_BALANCE, true);
ScheduleTimedEvent(3200ms, [&] ScheduleTimedEvent(3200ms, [&]
{ {
me->CastSpell(me, SPELL_EMPYREAL_EQUIVALENCY, true); DoCastSelf(SPELL_EMPYREAL_EQUIVALENCY, true);
}, 3200ms); }, 3200ms);
for (uint8 i = DATA_GATHIOS_THE_SHATTERER; i <= DATA_VERAS_DARKSHADOW; ++i) for (uint8 i = DATA_GATHIOS_THE_SHATTERER; i <= DATA_VERAS_DARKSHADOW; ++i)
@@ -239,7 +239,7 @@ struct boss_illidari_council_memberAI : public ScriptedAI
{ {
if (param == ACTION_ENRAGE) if (param == ACTION_ENRAGE)
{ {
me->CastSpell(me, SPELL_BERSERK, true); DoCastSelf(SPELL_BERSERK, true);
Talk(SAY_COUNCIL_ENRAGE); Talk(SAY_COUNCIL_ENRAGE);
} }
} }
@@ -331,14 +331,14 @@ struct boss_gathios_the_shatterer : public boss_illidari_council_memberAI
events.ScheduleEvent(EVENT_SPELL_BLESSING, 15s); events.ScheduleEvent(EVENT_SPELL_BLESSING, 15s);
break; break;
case EVENT_SPELL_AURA: case EVENT_SPELL_AURA:
me->CastSpell(me, _toggleAura ? SPELL_DEVOTION_AURA : SPELL_CHROMATIC_RESISTANCE_AURA); DoCastSelf(_toggleAura ? SPELL_DEVOTION_AURA : SPELL_CHROMATIC_RESISTANCE_AURA);
_toggleAura = !_toggleAura; _toggleAura = !_toggleAura;
events.ScheduleEvent(EVENT_SPELL_AURA, 60s); events.ScheduleEvent(EVENT_SPELL_AURA, 60s);
break; break;
case EVENT_SPELL_CONSECRATION: case EVENT_SPELL_CONSECRATION:
if (roll_chance_i(50)) if (roll_chance_i(50))
Talk(SAY_COUNCIL_SPECIAL); Talk(SAY_COUNCIL_SPECIAL);
me->CastSpell(me, SPELL_CONSECRATION, false); DoCastSelf(SPELL_CONSECRATION);
events.ScheduleEvent(EVENT_SPELL_AURA, 30s); events.ScheduleEvent(EVENT_SPELL_AURA, 30s);
break; break;
case EVENT_SPELL_HAMMER_OF_JUSTICE: case EVENT_SPELL_HAMMER_OF_JUSTICE:
@@ -352,12 +352,12 @@ struct boss_gathios_the_shatterer : public boss_illidari_council_memberAI
events.ScheduleEvent(EVENT_SPELL_HAMMER_OF_JUSTICE, 0s); events.ScheduleEvent(EVENT_SPELL_HAMMER_OF_JUSTICE, 0s);
break; break;
case EVENT_SPELL_SEAL: case EVENT_SPELL_SEAL:
me->CastSpell(me, _toggleSeal ? SPELL_SEAL_OF_COMMAND : SPELL_SEAL_OF_BLOOD); DoCastSelf(_toggleSeal ? SPELL_SEAL_OF_COMMAND : SPELL_SEAL_OF_BLOOD);
_toggleSeal = !_toggleSeal; _toggleSeal = !_toggleSeal;
events.ScheduleEvent(EVENT_SPELL_SEAL, 20s); events.ScheduleEvent(EVENT_SPELL_SEAL, 20s);
break; break;
case EVENT_SPELL_JUDGEMENT: case EVENT_SPELL_JUDGEMENT:
me->CastSpell(me->GetVictim(), SPELL_JUDGEMENT, false); me->CastSpell(me->GetVictim(), SPELL_JUDGEMENT);
events.ScheduleEvent(EVENT_SPELL_JUDGEMENT, 16s, 20s); events.ScheduleEvent(EVENT_SPELL_JUDGEMENT, 16s, 20s);
break; break;
} }
@@ -511,22 +511,22 @@ struct boss_lady_malande : public boss_illidari_council_memberAI
switch (events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case EVENT_SPELL_CIRCLE_OF_HEALING: case EVENT_SPELL_CIRCLE_OF_HEALING:
me->CastSpell(me, SPELL_CIRCLE_OF_HEALING, false); DoCastSelf(SPELL_CIRCLE_OF_HEALING);
events.ScheduleEvent(EVENT_SPELL_CIRCLE_OF_HEALING, 20s); events.ScheduleEvent(EVENT_SPELL_CIRCLE_OF_HEALING, 20s);
break; break;
case EVENT_SPELL_REFLECTIVE_SHIELD: case EVENT_SPELL_REFLECTIVE_SHIELD:
if (roll_chance_i(50)) if (roll_chance_i(50))
Talk(SAY_COUNCIL_SPECIAL); Talk(SAY_COUNCIL_SPECIAL);
me->CastSpell(me, SPELL_REFLECTIVE_SHIELD, false); DoCastSelf(SPELL_REFLECTIVE_SHIELD);
events.ScheduleEvent(EVENT_SPELL_REFLECTIVE_SHIELD, 40s); events.ScheduleEvent(EVENT_SPELL_REFLECTIVE_SHIELD, 40s);
break; break;
case EVENT_SPELL_DIVINE_WRATH: case EVENT_SPELL_DIVINE_WRATH:
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f)) if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f))
me->CastSpell(target, SPELL_DIVINE_WRATH, false); me->CastSpell(target, SPELL_DIVINE_WRATH);
events.ScheduleEvent(EVENT_SPELL_DIVINE_WRATH, 20s); events.ScheduleEvent(EVENT_SPELL_DIVINE_WRATH, 20s);
break; break;
case EVENT_SPELL_EMPOWERED_SMITE: case EVENT_SPELL_EMPOWERED_SMITE:
me->CastSpell(me->GetVictim(), SPELL_EMPOWERED_SMITE, false); me->CastSpell(me->GetVictim(), SPELL_EMPOWERED_SMITE);
events.ScheduleEvent(EVENT_SPELL_EMPOWERED_SMITE, 3s); events.ScheduleEvent(EVENT_SPELL_EMPOWERED_SMITE, 3s);
break; break;
} }
@@ -542,7 +542,7 @@ struct boss_veras_darkshadow : public boss_illidari_council_memberAI
me->SetCanDualWield(true); me->SetCanDualWield(true);
boss_illidari_council_memberAI::JustEngagedWith(who); boss_illidari_council_memberAI::JustEngagedWith(who);
events.ScheduleEvent(EVENT_SPELL_VANISH, 10s); events.ScheduleEvent(EVENT_SPELL_VANISH, 10s);
events.ScheduleEvent(EVENT_SPELL_ENRAGE, 90s); events.ScheduleEvent(EVENT_SPELL_ENRAGE, 15min);
} }
void JustSummoned(Creature* summon) override void JustSummoned(Creature* summon) override
@@ -564,13 +564,13 @@ struct boss_veras_darkshadow : public boss_illidari_council_memberAI
case EVENT_SPELL_VANISH: case EVENT_SPELL_VANISH:
if (roll_chance_i(50)) if (roll_chance_i(50))
Talk(SAY_COUNCIL_SPECIAL); Talk(SAY_COUNCIL_SPECIAL);
me->CastSpell(me, SPELL_DEADLY_STRIKE, false); DoCastSelf(SPELL_DEADLY_STRIKE);
me->CastSpell(me, SPELL_VANISH, false); DoCastSelf(SPELL_VANISH);
events.ScheduleEvent(EVENT_SPELL_VANISH, 60s); events.ScheduleEvent(EVENT_SPELL_VANISH, 60s);
events.ScheduleEvent(EVENT_SPELL_VANISH_OUT, 29s); events.ScheduleEvent(EVENT_SPELL_VANISH_OUT, 29s);
break; break;
case EVENT_SPELL_VANISH_OUT: case EVENT_SPELL_VANISH_OUT:
me->CastSpell(me, SPELL_VANISH_OUT, false); DoCastSelf(SPELL_VANISH_OUT);
break; break;
case EVENT_SPELL_ENRAGE: case EVENT_SPELL_ENRAGE:
DoResetThreatList(); DoResetThreatList();