aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/master/2022_07_16_07_world.sql3
-rw-r--r--src/server/scripts/Spells/spell_priest.cpp20
2 files changed, 23 insertions, 0 deletions
diff --git a/sql/updates/world/master/2022_07_16_07_world.sql b/sql/updates/world/master/2022_07_16_07_world.sql
new file mode 100644
index 00000000000..dfff560f83a
--- /dev/null
+++ b/sql/updates/world/master/2022_07_16_07_world.sql
@@ -0,0 +1,3 @@
+UPDATE `areatrigger_template` SET `Data1`=40, `VerifiedBuild`=44325 WHERE (`Id`=3921 AND `IsServerSide`=0);
+
+UPDATE `areatrigger_create_properties` SET `TimeToTargetScale`=2150, `ShapeData1`=40, `ScriptName`='areatrigger_pri_halo', `VerifiedBuild`=44325 WHERE `Id`=658;
diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp
index 3d2d8dad90d..4e583e7cf24 100644
--- a/src/server/scripts/Spells/spell_priest.cpp
+++ b/src/server/scripts/Spells/spell_priest.cpp
@@ -48,6 +48,8 @@ enum PriestSpells
SPELL_PRIEST_DIVINE_WRATH = 40441,
SPELL_PRIEST_FLASH_HEAL = 2061,
SPELL_PRIEST_GUARDIAN_SPIRIT_HEAL = 48153,
+ SPELL_PRIEST_HALO_DAMAGE = 120696,
+ SPELL_PRIEST_HALO_HEAL = 120692,
SPELL_PRIEST_HEAL = 2060,
SPELL_PRIEST_HOLY_WORD_CHASTISE = 88625,
SPELL_PRIEST_HOLY_WORD_SANCTIFY = 34861,
@@ -369,6 +371,23 @@ class spell_pri_guardian_spirit : public AuraScript
}
};
+// 120517 - Halo
+struct areatrigger_pri_halo : AreaTriggerAI
+{
+ areatrigger_pri_halo(AreaTrigger* areatrigger) : AreaTriggerAI(areatrigger) {}
+
+ void OnUnitEnter(Unit* unit) override
+ {
+ if (Unit* caster = at->GetCaster())
+ {
+ if (caster->IsValidAttackTarget(unit))
+ caster->CastSpell(unit, SPELL_PRIEST_HALO_DAMAGE, CastSpellExtraArgs(TriggerCastFlags(TRIGGERED_IGNORE_GCD | TRIGGERED_IGNORE_CAST_IN_PROGRESS)));
+ else if (caster->IsValidAssistTarget(unit))
+ caster->CastSpell(unit, SPELL_PRIEST_HALO_HEAL, CastSpellExtraArgs(TriggerCastFlags(TRIGGERED_IGNORE_GCD | TRIGGERED_IGNORE_CAST_IN_PROGRESS)));
+ }
+ }
+};
+
// 63733 - Holy Words
class spell_pri_holy_words : public AuraScript
{
@@ -1318,6 +1337,7 @@ void AddSC_priest_spell_scripts()
RegisterSpellScript(spell_pri_atonement_triggered);
RegisterSpellScript(spell_pri_divine_hymn);
RegisterSpellScript(spell_pri_guardian_spirit);
+ RegisterAreaTriggerAI(areatrigger_pri_halo);
RegisterSpellScript(spell_pri_holy_words);
RegisterSpellScript(spell_pri_item_t6_trinket);
RegisterSpellScript(spell_pri_leap_of_faith_effect_trigger);