diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Spells/spell_warlock.cpp | 179 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_warrior.cpp | 9 |
2 files changed, 97 insertions, 91 deletions
diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index c931b309e82..fe7c3584969 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -538,8 +538,8 @@ class spell_warl_everlasting_affliction : public SpellScriptLoader { if (Unit* unitTarget = GetHitUnit()) // Refresh corruption on target - if (AuraEffect* aur = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_WARLOCK, 0x2, 0, 0, GetCaster()->GetGUID())) - aur->GetBase()->RefreshDuration(); + if (AuraEffect* aurEff = unitTarget->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_WARLOCK, 0x2, 0, 0, GetCaster()->GetGUID())) + aurEff->GetBase()->RefreshDuration(); } void Register() OVERRIDE @@ -875,7 +875,8 @@ class spell_warl_life_tap : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { - if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_LIFE_TAP_ENERGIZE) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_LIFE_TAP_ENERGIZE_2)) + if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_LIFE_TAP_ENERGIZE) || + !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_LIFE_TAP_ENERGIZE_2)) return false; return true; } @@ -1150,74 +1151,74 @@ class spell_warl_soul_leech : public SpellScriptLoader // 86121 - Soul Swap class spell_warl_soul_swap : public SpellScriptLoader { -public: - spell_warl_soul_swap() : SpellScriptLoader("spell_warl_soul_swap") { } - - class spell_warl_soul_swap_SpellScript : public SpellScript - { - PrepareSpellScript(spell_warl_soul_swap_SpellScript); + public: + spell_warl_soul_swap() : SpellScriptLoader("spell_warl_soul_swap") { } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + class spell_warl_soul_swap_SpellScript : public SpellScript { - if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_GLYPH_OF_SOUL_SWAP) - || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOUL_SWAP_CD_MARKER) - || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOUL_SWAP_OVERRIDE)) - return false; - return true; - } + PrepareSpellScript(spell_warl_soul_swap_SpellScript); - void HandleHit(SpellEffIndex /*effIndex*/) - { - GetCaster()->CastSpell(GetCaster(), SPELL_WARLOCK_SOUL_SWAP_OVERRIDE, true); - GetHitUnit()->CastSpell(GetCaster(), SPELL_WARLOCK_SOUL_SWAP_DOT_MARKER, true); - } + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + { + if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_GLYPH_OF_SOUL_SWAP) || + !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOUL_SWAP_CD_MARKER) || + !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOUL_SWAP_OVERRIDE)) + return false; + return true; + } - void Register() OVERRIDE + void HandleHit(SpellEffIndex /*effIndex*/) + { + GetCaster()->CastSpell(GetCaster(), SPELL_WARLOCK_SOUL_SWAP_OVERRIDE, true); + GetHitUnit()->CastSpell(GetCaster(), SPELL_WARLOCK_SOUL_SWAP_DOT_MARKER, true); + } + + void Register() OVERRIDE + { + OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + } + }; + + SpellScript* GetSpellScript() const OVERRIDE { - OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + return new spell_warl_soul_swap_SpellScript(); } - }; - - SpellScript* GetSpellScript() const OVERRIDE - { - return new spell_warl_soul_swap_SpellScript(); - } }; // 86211 - Soul Swap Override - Also acts as a dot container class spell_warl_soul_swap_override : public SpellScriptLoader { -public: - spell_warl_soul_swap_override() : SpellScriptLoader("spell_warl_soul_swap_override") { } - - class spell_warl_soul_swap_override_AuraScript : public AuraScript - { - PrepareAuraScript(spell_warl_soul_swap_override_AuraScript); + public: + spell_warl_soul_swap_override() : SpellScriptLoader("spell_warl_soul_swap_override") { } - bool Load() OVERRIDE + class spell_warl_soul_swap_override_AuraScript : public AuraScript { - swapCaster = NULL; - return true; - } + PrepareAuraScript(spell_warl_soul_swap_override_AuraScript); - //! Forced to, pure virtual functions must have a body when linking - void Register() OVERRIDE { } + bool Load() OVERRIDE + { + _swapCaster = NULL; + return true; + } - public: - void AddDot(uint32 id) { dotList.push_back(id); } - std::list<uint32> const GetDotList() const { return dotList; } - Unit* GetOriginalSwapSource() const { return swapCaster; } - void SetOriginalSwapSource(Unit* victim) { swapCaster = victim; } - - private: - std::list<uint32> dotList; - Unit* swapCaster; - }; + //! Forced to, pure virtual functions must have a body when linking + void Register() OVERRIDE { } - AuraScript* GetAuraScript() const OVERRIDE - { - return new spell_warl_soul_swap_override_AuraScript(); - } + public: + void AddDot(uint32 id) { _dotList.push_back(id); } + std::list<uint32> const GetDotList() const { return _dotList; } + Unit* GetOriginalSwapSource() const { return _swapCaster; } + void SetOriginalSwapSource(Unit* victim) { _swapCaster = victim; } + + private: + std::list<uint32> _dotList; + Unit* _swapCaster; + }; + + AuraScript* GetAuraScript() const OVERRIDE + { + return new spell_warl_soul_swap_override_AuraScript(); + } }; typedef spell_warl_soul_swap_override::spell_warl_soul_swap_override_AuraScript SoulSwapOverrideAuraScript; @@ -1225,51 +1226,51 @@ typedef spell_warl_soul_swap_override::spell_warl_soul_swap_override_AuraScript //! Soul Swap Copy Spells - 92795 - Simply copies spell IDs. class spell_warl_soul_swap_dot_marker : public SpellScriptLoader { -public: - spell_warl_soul_swap_dot_marker() : SpellScriptLoader("spell_warl_soul_swap_dot_marker") { } - - class spell_warl_soul_swap_dot_marker_SpellScript : public SpellScript - { - PrepareSpellScript(spell_warl_soul_swap_dot_marker_SpellScript); + public: + spell_warl_soul_swap_dot_marker() : SpellScriptLoader("spell_warl_soul_swap_dot_marker") { } - void HandleHit(SpellEffIndex effIndex) + class spell_warl_soul_swap_dot_marker_SpellScript : public SpellScript { - Unit* swapVictim = GetCaster(); - Unit* warlock = GetHitUnit(); - if (!warlock || !swapVictim) - return; + PrepareSpellScript(spell_warl_soul_swap_dot_marker_SpellScript); + + void HandleHit(SpellEffIndex effIndex) + { + Unit* swapVictim = GetCaster(); + Unit* warlock = GetHitUnit(); + if (!warlock || !swapVictim) + return; - flag96 classMask = GetSpellInfo()->Effects[effIndex].SpellClassMask; + flag96 classMask = GetSpellInfo()->Effects[effIndex].SpellClassMask; - Unit::AuraApplicationMap const& appliedAuras = swapVictim->GetAppliedAuras(); - SoulSwapOverrideAuraScript* swapSpellScript = NULL; - if (Aura* swapOverrideAura = warlock->GetAura(SPELL_WARLOCK_SOUL_SWAP_OVERRIDE)) - swapSpellScript = dynamic_cast<SoulSwapOverrideAuraScript*>(swapOverrideAura->GetScriptByName("spell_warlock_soul_swap_override")); + Unit::AuraApplicationMap const& appliedAuras = swapVictim->GetAppliedAuras(); + SoulSwapOverrideAuraScript* swapSpellScript = NULL; + if (Aura* swapOverrideAura = warlock->GetAura(SPELL_WARLOCK_SOUL_SWAP_OVERRIDE)) + swapSpellScript = dynamic_cast<SoulSwapOverrideAuraScript*>(swapOverrideAura->GetScriptByName("spell_warlock_soul_swap_override")); - if (swapSpellScript == NULL) - return; + if (swapSpellScript == NULL) + return; - for (Unit::AuraApplicationMap::const_iterator itr = appliedAuras.begin(); itr != appliedAuras.end(); ++itr) - { - SpellInfo const* spellProto = itr->second->GetBase()->GetSpellInfo(); - if (itr->second->GetBase()->GetCaster() == warlock) - if (spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && (spellProto->SpellFamilyFlags & classMask)) - swapSpellScript->AddDot(itr->first); + for (Unit::AuraApplicationMap::const_iterator itr = appliedAuras.begin(); itr != appliedAuras.end(); ++itr) + { + SpellInfo const* spellProto = itr->second->GetBase()->GetSpellInfo(); + if (itr->second->GetBase()->GetCaster() == warlock) + if (spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && (spellProto->SpellFamilyFlags & classMask)) + swapSpellScript->AddDot(itr->first); + } + + swapSpellScript->SetOriginalSwapSource(swapVictim); } - swapSpellScript->SetOriginalSwapSource(swapVictim); - } + void Register() OVERRIDE + { + OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_dot_marker_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + } + }; - void Register() OVERRIDE + SpellScript* GetSpellScript() const OVERRIDE { - OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_dot_marker_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + return new spell_warl_soul_swap_dot_marker_SpellScript(); } - }; - - SpellScript* GetSpellScript() const OVERRIDE - { - return new spell_warl_soul_swap_dot_marker_SpellScript(); - } }; // 86213 - Soul Swap Exhale diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 37bca931e67..cfa77a65b8c 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -157,7 +157,9 @@ class spell_warr_charge : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { - if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_JUGGERNAUT_CRIT_BONUS_TALENT) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_JUGGERNAUT_CRIT_BONUS_BUFF) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_CHARGE)) + if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_JUGGERNAUT_CRIT_BONUS_TALENT) || + !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_JUGGERNAUT_CRIT_BONUS_BUFF) || + !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_CHARGE)) return false; return true; } @@ -225,7 +227,9 @@ class spell_warr_deep_wounds : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { - if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_DEEP_WOUNDS_RANK_1) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_DEEP_WOUNDS_RANK_2) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_DEEP_WOUNDS_RANK_3)) + if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_DEEP_WOUNDS_RANK_1) || + !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_DEEP_WOUNDS_RANK_2) || + !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_DEEP_WOUNDS_RANK_3)) return false; return true; } @@ -932,6 +936,7 @@ class spell_warr_sword_and_board : public SpellScriptLoader }; // 32216 - Victorious +// 82368 - Victorious class spell_warr_victorious : public SpellScriptLoader { public: |