diff options
Diffstat (limited to 'src/server/scripts')
5 files changed, 10 insertions, 14 deletions
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index a3f9c8aab19..4a5efbe4252 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -1345,9 +1345,9 @@ struct npc_shambling_horror_icc : public ScriptedAI DoMeleeAttackIfReady(); } - void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override + void OnSpellFailed(SpellInfo const* spell) override { - if (reason == SPELL_FINISHED_CANCELED && spell->Id == ENRAGE) + if (spell->Id == ENRAGE) _events.RescheduleEvent(EVENT_ENRAGE, 1s); } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 88c7280eb23..5a88706560e 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -19,7 +19,6 @@ #include "halls_of_stone.h" #include "InstanceScript.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "SpellInfo.h" #include "SpellMgr.h" @@ -82,9 +81,9 @@ struct boss_maiden_of_grief : public BossAI Talk(SAY_SLAY); } - void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override + void OnSpellCast(SpellInfo const* spell) override { - if (reason == SPELL_FINISHED_SUCCESSFUL_CAST && spell->Id == sSpellMgr->GetSpellIdForDifficulty(SPELL_SHOCK_OF_SORROW, me)) + if (spell->Id == sSpellMgr->GetSpellIdForDifficulty(SPELL_SHOCK_OF_SORROW, me)) Talk(SAY_STUN); } diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index a0a120b46f3..5fecee52b14 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -20,7 +20,6 @@ #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "SpellInfo.h" #include "SpellScript.h" @@ -122,9 +121,9 @@ struct boss_exarch_maladaar : public BossAI } } - void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override + void OnSpellCast(SpellInfo const* spell) override { - if (reason == SPELL_FINISHED_SUCCESSFUL_CAST && spell->Id == SPELL_STOLEN_SOUL) + if (spell->Id == SPELL_STOLEN_SOUL) if (roll_chance_i(25)) Talk(SAY_SOUL_CLEAVE); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp index ffccab6b686..a637298c64e 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -17,7 +17,6 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "SpellInfo.h" #include "SpellScript.h" #include "the_botanica.h" @@ -97,9 +96,9 @@ struct boss_commander_sarannis : public BossAI } } - void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override + void OnSpellCast(SpellInfo const* spell) override { - if (reason == SPELL_FINISHED_SUCCESSFUL_CAST && spell->Id == SPELL_SUMMON_REINFORCEMENTS) + if (spell->Id == SPELL_SUMMON_REINFORCEMENTS) Talk(SAY_SUMMON); } diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index c8c5dd4d2e8..e4672be695a 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -17,7 +17,6 @@ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "SpellInfo.h" #include "the_botanica.h" @@ -82,9 +81,9 @@ struct boss_warp_splinter : public BossAI Talk(SAY_DEATH); } - void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override + void OnSpellCast(SpellInfo const* spell) override { - if (reason == SPELL_FINISHED_SUCCESSFUL_CAST && spell->Id == SPELL_SUMMON_SAPLINGS) + if (spell->Id == SPELL_SUMMON_SAPLINGS) { for (uint32 summonSpells : SummonSaplingsSpells) DoCastSelf(summonSpells, true); |