aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroffl <11556157+offl@users.noreply.github.com>2022-02-18 19:14:44 +0200
committerGitHub <noreply@github.com>2022-02-18 19:14:44 +0200
commit3dca705acc953d20e4a43d4c2b3c97a84e5ab346 (patch)
tree40e929c09e081a195ecc3ab2eba8df09cd38cd2c
parent410c3ff25f1484858263255bd3433f52280fa8ec (diff)
Core/AI: OnSpellCast, OnSpellFailed, OnSpellStart hooks (#27704)
-rw-r--r--src/server/game/AI/CreatureAI.h14
-rw-r--r--src/server/game/AI/SmartScripts/SmartAI.cpp15
-rw-r--r--src/server/game/AI/SmartScripts/SmartAI.h9
-rw-r--r--src/server/game/AI/SmartScripts/SmartScript.cpp14
-rw-r--r--src/server/game/AI/SmartScripts/SmartScriptMgr.cpp14
-rw-r--r--src/server/game/AI/SmartScripts/SmartScriptMgr.h15
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp2
-rw-r--r--src/server/game/Spells/Spell.cpp11
-rw-r--r--src/server/game/Spells/Spell.h7
-rw-r--r--src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp4
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp5
-rw-r--r--src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp5
-rw-r--r--src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp5
-rw-r--r--src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp5
14 files changed, 96 insertions, 29 deletions
diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h
index 56ab1fa03b0..b628fd830b6 100644
--- a/src/server/game/AI/CreatureAI.h
+++ b/src/server/game/AI/CreatureAI.h
@@ -31,7 +31,6 @@ class GameObject;
class PlayerAI;
class WorldObject;
struct Position;
-enum SpellFinishReason : uint8;
typedef std::vector<AreaBoundary const*> CreatureBoundary;
@@ -145,8 +144,17 @@ class TC_GAME_API CreatureAI : public UnitAI
// Called when spell hits a target
virtual void SpellHitTarget(WorldObject* /*target*/, SpellInfo const* /*spellInfo*/) { }
- // Called when a spell either finishes, interrupts or cancels a spell cast
- virtual void OnSpellCastFinished(SpellInfo const* /*spell*/, SpellFinishReason /*reason*/) { }
+ // Called when a spell finishes
+ virtual void OnSpellCast(SpellInfo const* /*spell*/) { }
+
+ // Called when a spell fails
+ virtual void OnSpellFailed(SpellInfo const* /*spell*/) { }
+
+ // Called when a spell starts
+ virtual void OnSpellStart(SpellInfo const* /*spell*/) { }
+
+ // Called when a channeled spell finishes
+ virtual void OnChannelFinished(SpellInfo const* /*spell*/) { }
// Should return true if the NPC is currently being escorted
virtual bool IsEscorted() const { return false; }
diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index 7a9bb9c0f2c..751337ca3d1 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -619,6 +619,21 @@ void SmartAI::SpellHitTarget(WorldObject* target, SpellInfo const* spellInfo)
GetScript()->ProcessEventsFor(SMART_EVENT_SPELLHIT_TARGET, target->ToUnit(), 0, 0, false, spellInfo, target->ToGameObject());
}
+void SmartAI::OnSpellCast(SpellInfo const* spellInfo)
+{
+ GetScript()->ProcessEventsFor(SMART_EVENT_ON_SPELL_CAST, nullptr, 0, 0, false, spellInfo);
+}
+
+void SmartAI::OnSpellFailed(SpellInfo const* spellInfo)
+{
+ GetScript()->ProcessEventsFor(SMART_EVENT_ON_SPELL_FAILED, nullptr, 0, 0, false, spellInfo);
+}
+
+void SmartAI::OnSpellStart(SpellInfo const* spellInfo)
+{
+ GetScript()->ProcessEventsFor(SMART_EVENT_ON_SPELL_START, nullptr, 0, 0, false, spellInfo);
+}
+
void SmartAI::DamageTaken(Unit* doneBy, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/)
{
GetScript()->ProcessEventsFor(SMART_EVENT_DAMAGED, doneBy, damage);
diff --git a/src/server/game/AI/SmartScripts/SmartAI.h b/src/server/game/AI/SmartScripts/SmartAI.h
index fce124740b2..f18316abf38 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.h
+++ b/src/server/game/AI/SmartScripts/SmartAI.h
@@ -123,6 +123,15 @@ class TC_GAME_API SmartAI : public CreatureAI
// Called when spell hits a target
void SpellHitTarget(WorldObject* target, SpellInfo const* spellInfo) override;
+ // Called when a spell finishes
+ void OnSpellCast(SpellInfo const* spellInfo) override;
+
+ // Called when a spell fails
+ void OnSpellFailed(SpellInfo const* spellInfo) override;
+
+ // Called when a spell starts
+ void OnSpellStart(SpellInfo const* spellInfo) override;
+
// Called at any Damage from any attacker (before damage apply)
void DamageTaken(Unit* doneBy, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override;
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp
index ad5303a428f..b9aa990a071 100644
--- a/src/server/game/AI/SmartScripts/SmartScript.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScript.cpp
@@ -2930,6 +2930,20 @@ void SmartScript::ProcessEvent(SmartScriptHolder& e, Unit* unit, uint32 var0, ui
}
break;
}
+ case SMART_EVENT_ON_SPELL_CAST:
+ case SMART_EVENT_ON_SPELL_FAILED:
+ case SMART_EVENT_ON_SPELL_START:
+ {
+ if (!spell)
+ return;
+
+ if (spell->Id != e.event.spellCast.spell)
+ return;
+
+ RecalcTimer(e, e.event.spellCast.cooldownMin, e.event.spellCast.cooldownMax);
+ ProcessAction(e, nullptr, 0, 0, bvar, spell);
+ break;
+ }
case SMART_EVENT_OOC_LOS:
{
if (!me || me->IsEngaged())
diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
index 9139c09867f..e7fb0dcbf63 100644
--- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
@@ -769,6 +769,9 @@ bool SmartAIMgr::CheckUnusedEventParams(SmartScriptHolder const& e)
//case SMART_EVENT_SCENE_CANCEL: return sizeof(SmartEvent::raw);
//case SMART_EVENT_SCENE_COMPLETE: return sizeof(SmartEvent::raw);
case SMART_EVENT_SUMMONED_UNIT_DIES: return sizeof(SmartEvent::summoned);
+ case SMART_EVENT_ON_SPELL_CAST: return sizeof(SmartEvent::spellCast);
+ case SMART_EVENT_ON_SPELL_FAILED: return sizeof(SmartEvent::spellCast);
+ case SMART_EVENT_ON_SPELL_START: return sizeof(SmartEvent::spellCast);
default:
TC_LOG_WARN("sql.sql", "SmartAIMgr: Entry %d SourceType %u Event %u Action %u is using an event with no unused params specified in SmartAIMgr::CheckUnusedEventParams(), please report this.",
e.entryOrGuid, e.GetScriptType(), e.event_id, e.GetActionType());
@@ -1099,6 +1102,17 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e)
if (!IsMinMaxValid(e, e.event.spellHit.cooldownMin, e.event.spellHit.cooldownMax))
return false;
break;
+ case SMART_EVENT_ON_SPELL_CAST:
+ case SMART_EVENT_ON_SPELL_FAILED:
+ case SMART_EVENT_ON_SPELL_START:
+ {
+ if (!IsSpellValid(e, e.event.spellCast.spell))
+ return false;
+
+ if (!IsMinMaxValid(e, e.event.spellCast.cooldownMin, e.event.spellCast.cooldownMax))
+ return false;
+ break;
+ }
case SMART_EVENT_OOC_LOS:
case SMART_EVENT_IC_LOS:
if (!IsMinMaxValid(e, e.event.los.cooldownMin, e.event.los.cooldownMax))
diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h
index 25c3a10c078..a6ca8b46f57 100644
--- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h
+++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h
@@ -182,8 +182,11 @@ enum SMART_EVENT
SMART_EVENT_SCENE_CANCEL = 80, // don't use on 3.3.5a
SMART_EVENT_SCENE_COMPLETE = 81, // don't use on 3.3.5a
SMART_EVENT_SUMMONED_UNIT_DIES = 82, // CreatureId(0 all), CooldownMin, CooldownMax
+ SMART_EVENT_ON_SPELL_CAST = 83, // SpellID, CooldownMin, CooldownMax
+ SMART_EVENT_ON_SPELL_FAILED = 84, // SpellID, CooldownMin, CooldownMax
+ SMART_EVENT_ON_SPELL_START = 85, // SpellID, CooldownMin, CooldownMax
- SMART_EVENT_END = 83
+ SMART_EVENT_END = 86
};
struct SmartEvent
@@ -410,6 +413,13 @@ struct SmartEvent
struct
{
+ uint32 spell;
+ uint32 cooldownMin;
+ uint32 cooldownMax;
+ } spellCast;
+
+ struct
+ {
uint32 param1;
uint32 param2;
uint32 param3;
@@ -1498,6 +1508,9 @@ const uint32 SmartAIEventMask[SMART_EVENT_END][2] =
{SMART_EVENT_SCENE_CANCEL, 0 },
{SMART_EVENT_SCENE_COMPLETE, 0 },
{SMART_EVENT_SUMMONED_UNIT_DIES, SMART_SCRIPT_TYPE_MASK_CREATURE + SMART_SCRIPT_TYPE_MASK_GAMEOBJECT },
+ {SMART_EVENT_ON_SPELL_CAST, SMART_SCRIPT_TYPE_MASK_CREATURE },
+ {SMART_EVENT_ON_SPELL_FAILED, SMART_SCRIPT_TYPE_MASK_CREATURE },
+ {SMART_EVENT_ON_SPELL_START, SMART_SCRIPT_TYPE_MASK_CREATURE },
};
enum SmartEventFlags
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 2f4678c5367..f31760dab2a 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -3072,7 +3072,7 @@ void Unit::InterruptSpell(CurrentSpellTypes spellType, bool withDelayed, bool wi
}
if (GetTypeId() == TYPEID_UNIT && IsAIEnabled())
- ToCreature()->AI()->OnSpellCastFinished(spell->GetSpellInfo(), SPELL_FINISHED_CANCELED);
+ ToCreature()->AI()->OnSpellFailed(spell->GetSpellInfo());
}
}
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 450957a5ca9..c36d26d5096 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -3145,6 +3145,11 @@ SpellCastResult Spell::prepare(SpellCastTargets const& targets, AuraEffect const
if (!(_triggeredCastFlags & TRIGGERED_IGNORE_GCD))
TriggerGlobalCooldown();
+ // Call CreatureAI hook OnSpellStart
+ if (Creature* caster = m_originalCaster->ToCreature())
+ if (caster->IsAIEnabled())
+ caster->AI()->OnSpellStart(GetSpellInfo());
+
// commented out !m_spellInfo->StartRecoveryTime, it forces instant spells with global cooldown to be processed in spell::update
// as a result a spell that passed CheckCast and should be processed instantly may suffer from this delayed process
// the easiest bug to observe is LoS check in AddUnitTarget, even if spell passed the CheckCast LoS check the situation can change in spell::update
@@ -3483,10 +3488,10 @@ void Spell::_cast(bool skipCheck)
Unit::ProcSkillsAndAuras(m_originalCaster, nullptr, procAttacker, PROC_FLAG_NONE, PROC_SPELL_TYPE_MASK_ALL, PROC_SPELL_PHASE_CAST, hitMask, this, nullptr, nullptr);
- // Call CreatureAI hook OnSpellCastFinished
+ // Call CreatureAI hook OnSpellCast
if (Creature* caster = m_originalCaster->ToCreature())
if (caster->IsAIEnabled())
- caster->AI()->OnSpellCastFinished(GetSpellInfo(), SPELL_FINISHED_SUCCESSFUL_CAST);
+ caster->AI()->OnSpellCast(GetSpellInfo());
}
template <class Container>
@@ -3802,7 +3807,7 @@ void Spell::update(uint32 difftime)
// We call the hook here instead of in Spell::finish because we only want to call it for completed channeling. Everything else is handled by interrupts
if (Creature* creatureCaster = m_caster->ToCreature())
if (creatureCaster->IsAIEnabled())
- creatureCaster->AI()->OnSpellCastFinished(m_spellInfo, SPELL_FINISHED_CHANNELING_COMPLETE);
+ creatureCaster->AI()->OnChannelFinished(m_spellInfo);
}
break;
}
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index c9f7b38cc69..dbd461ee655 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -114,13 +114,6 @@ enum SpellRangeFlag
SPELL_RANGE_RANGED = 2 //hunter range and ranged weapon
};
-enum SpellFinishReason : uint8
-{
- SPELL_FINISHED_SUCCESSFUL_CAST = 0, // spell has sucessfully launched
- SPELL_FINISHED_CANCELED = 1, // spell has been canceled (interrupts)
- SPELL_FINISHED_CHANNELING_COMPLETE = 2 // spell channeling has been finished
-};
-
struct TC_GAME_API SpellDestination
{
SpellDestination();
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);