Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/AI: OnSpellCast, OnSpellFailed, OnSpellStart hooks (#27704)

Browse Source 
(cherry picked from commit 3dca705acc)
This commit is contained in:
offl
2022-02-18 19:14:44 +02:00
committed by Shauren
parent bb18bd47e5
commit 050f55b62f
15 changed files with 97 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp
View File

@@ -24,7 +24,6 @@
#include "ObjectAccessor.h"
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "Spell.h"
#include "SpellAuras.h"
#include "SpellScript.h"
#include "SpellAuraEffects.h"
@@ -247,11 +246,8 @@ struct boss_garothi_worldbreaker : public BossAI
instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me);
}
void OnSpellCastFinished(SpellInfo const* spell, SpellFinishReason reason) override
void OnSpellCast(SpellInfo const* spell) override
{
if (reason != SPELL_FINISHED_SUCCESSFUL_CAST)
return;
switch (spell->Id)
{
case SPELL_APOCALYPSE_DRIVE_FINAL_DAMAGE:

4
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
View File

@@ -1322,9 +1322,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);
}

5
src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp
View File

@@ -19,7 +19,6 @@
#include "halls_of_stone.h"
#include "InstanceScript.h"
#include "ScriptedCreature.h"
#include "Spell.h"
#include "SpellInfo.h"
#include "SpellMgr.h"
@@ -83,9 +82,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 == SPELL_SHOCK_OF_SORROW)
if (spell->Id == SPELL_SHOCK_OF_SORROW)
Talk(SAY_STUN);
}

5
src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
View File

@@ -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);
}

5
src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
View File

@@ -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);
}

5
src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
View File

@@ -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);