diff options
-rw-r--r-- | sql/updates/world/master/2022_02_07_02_world.sql | 7 | ||||
-rw-r--r-- | src/server/scripts/Spells/spell_paladin.cpp | 31 |
2 files changed, 38 insertions, 0 deletions
diff --git a/sql/updates/world/master/2022_02_07_02_world.sql b/sql/updates/world/master/2022_02_07_02_world.sql new file mode 100644 index 00000000000..e5ca0ef5918 --- /dev/null +++ b/sql/updates/world/master/2022_02_07_02_world.sql @@ -0,0 +1,7 @@ +DELETE FROM `spell_proc` WHERE `SpellId` IN (231843); +INSERT INTO `spell_proc` (`SpellId`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`SpellFamilyMask3`,`ProcFlags`,`SpellTypeMask`,`SpellPhaseMask`,`HitMask`,`AttributesMask`,`DisableEffectsMask`,`ProcsPerMinute`,`Chance`,`Cooldown`,`Charges`) VALUES +(231843,0x00,10,0x00000000,0x00000000,0x00000000,0x40000000,0x0,0x0,0x1,0x0,0x0,0x0,0,0,0,0); -- Art of War + +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_pal_art_of_war'; +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(267344,'spell_pal_art_of_war'); diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index c8f99a607bc..61954640c87 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -38,10 +38,12 @@ enum PaladinSpells { + SPELL_PALADIN_ART_OF_WAR_TRIGGERED = 231843, SPELL_PALADIN_AVENGERS_SHIELD = 31935, SPELL_PALADIN_AVENGING_WRATH = 31884, SPELL_PALADIN_BEACON_OF_LIGHT = 53563, SPELL_PALADIN_BEACON_OF_LIGHT_HEAL = 53652, + SPELL_PALADIN_BLADE_OF_JUSTICE = 184575, SPELL_PALADIN_BLINDING_LIGHT_EFFECT = 105421, SPELL_PALADIN_CONCENTRACTION_AURA = 19746, SPELL_PALADIN_CONSECRATED_GROUND_PASSIVE = 204054, @@ -118,6 +120,34 @@ enum PaladinSpellVisual PALADIN_VISUAL_SPELL_HOLY_SHOCK_HEAL_CRIT = 83880, }; +// 267344 - Art of War +class spell_pal_art_of_war : public AuraScript +{ + PrepareAuraScript(spell_pal_art_of_war); + + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_PALADIN_ART_OF_WAR_TRIGGERED, SPELL_PALADIN_BLADE_OF_JUSTICE }); + } + + bool CheckProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) + { + return roll_chance_i(aurEff->GetAmount()); + } + + void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) + { + GetTarget()->GetSpellHistory()->ResetCooldown(SPELL_PALADIN_BLADE_OF_JUSTICE, true); + GetTarget()->CastSpell(GetTarget(), SPELL_PALADIN_ART_OF_WAR_TRIGGERED, TRIGGERED_IGNORE_CAST_IN_PROGRESS); + } + + void Register() override + { + DoCheckEffectProc += AuraCheckEffectProcFn(spell_pal_art_of_war::CheckProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc += AuraEffectProcFn(spell_pal_art_of_war::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + } +}; + // 19042 - Ashen Hallow struct areatrigger_pal_ashen_hallow : AreaTriggerAI { @@ -1439,6 +1469,7 @@ class spell_pal_zeal : public AuraScript void AddSC_paladin_spell_scripts() { //new spell_pal_ardent_defender(); + RegisterSpellScript(spell_pal_art_of_war); RegisterAreaTriggerAI(areatrigger_pal_ashen_hallow); RegisterSpellScript(spell_pal_blessing_of_protection); RegisterSpellScript(spell_pal_blinding_light); |