diff options
Diffstat (limited to 'src/server/scripts/Spells')
| -rw-r--r-- | src/server/scripts/Spells/spell_dk.cpp | 122 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_druid.cpp | 124 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_generic.cpp | 342 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_holiday.cpp | 34 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_hunter.cpp | 94 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_item.cpp | 294 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_mage.cpp | 74 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_paladin.cpp | 96 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_pet.cpp | 130 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_priest.cpp | 79 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_quest.cpp | 210 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_rogue.cpp | 68 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_shaman.cpp | 88 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_warlock.cpp | 96 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_warrior.cpp | 82 |
15 files changed, 968 insertions, 965 deletions
diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index f4f7ca5fa42..2aa919d388c 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -68,7 +68,7 @@ class spell_dk_anti_magic_shell_raid : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -85,14 +85,14 @@ class spell_dk_anti_magic_shell_raid : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_anti_magic_shell_raid_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_anti_magic_shell_raid_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_anti_magic_shell_raid_AuraScript(); } @@ -109,14 +109,14 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader PrepareAuraScript(spell_dk_anti_magic_shell_self_AuraScript); uint32 absorbPct, hpPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); hpPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(GetCaster()); return true; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_RUNIC_POWER_ENERGIZE)) return false; @@ -142,7 +142,7 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader target->CastCustomSpell(target, SPELL_DK_RUNIC_POWER_ENERGIZE, &bp, NULL, NULL, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_anti_magic_shell_self_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_anti_magic_shell_self_AuraScript::Absorb, EFFECT_0); @@ -150,7 +150,7 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_anti_magic_shell_self_AuraScript(); } @@ -168,13 +168,13 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_ANTI_MAGIC_SHELL_TALENT)) return false; @@ -194,14 +194,14 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_anti_magic_zone_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_anti_magic_zone_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_anti_magic_zone_AuraScript(); } @@ -217,14 +217,14 @@ class spell_dk_blood_boil : public SpellScriptLoader { PrepareSpellScript(spell_dk_blood_boil_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_BOIL_TRIGGERED)) return false; return true; } - bool Load() + bool Load() OVERRIDE { _executed = false; return GetCaster()->GetTypeId() == TYPEID_PLAYER && GetCaster()->getClass() == CLASS_DEATH_KNIGHT; @@ -239,7 +239,7 @@ class spell_dk_blood_boil : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_DK_BLOOD_BOIL_TRIGGERED, true); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_dk_blood_boil_SpellScript::HandleAfterHit); } @@ -247,7 +247,7 @@ class spell_dk_blood_boil : public SpellScriptLoader bool _executed; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_blood_boil_SpellScript(); } @@ -263,14 +263,14 @@ class spell_dk_blood_gorged : public SpellScriptLoader { PrepareAuraScript(spell_dk_blood_gorged_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_GORGED_HEAL)) return false; return true; } - bool Load() + bool Load() OVERRIDE { _procTarget = NULL; return true; @@ -289,7 +289,7 @@ class spell_dk_blood_gorged : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_DK_BLOOD_GORGED_HEAL, SPELLVALUE_BASE_POINT0, bp, _procTarget, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_dk_blood_gorged_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_dk_blood_gorged_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); @@ -299,7 +299,7 @@ class spell_dk_blood_gorged : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_blood_gorged_AuraScript(); } @@ -315,7 +315,7 @@ class spell_dk_corpse_explosion : public SpellScriptLoader { PrepareSpellScript(spell_dk_corpse_explosion_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_CORPSE_EXPLOSION_TRIGGERED) || !sSpellMgr->GetSpellInfo(SPELL_DK_GHOUL_EXPLODE)) return false; @@ -346,13 +346,13 @@ class spell_dk_corpse_explosion : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dk_corpse_explosion_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_corpse_explosion_SpellScript(); } @@ -368,7 +368,7 @@ class spell_dk_death_coil : public SpellScriptLoader { PrepareSpellScript(spell_dk_death_coil_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_DEATH_COIL_DAMAGE) || !sSpellMgr->GetSpellInfo(SPELL_DK_DEATH_COIL_HEAL)) return false; @@ -412,14 +412,14 @@ class spell_dk_death_coil : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_dk_death_coil_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_dk_death_coil_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_death_coil_SpellScript(); } @@ -453,14 +453,14 @@ class spell_dk_death_gate : public SpellScriptLoader target->CastSpell(target, GetEffectValue(), false); } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_dk_death_gate_SpellScript::CheckClass); OnEffectHitTarget += SpellEffectFn(spell_dk_death_gate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_death_gate_SpellScript(); } @@ -487,14 +487,14 @@ class spell_dk_death_grip : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dk_death_grip_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_death_grip_SpellScript(); } @@ -543,14 +543,14 @@ class spell_dk_death_pact : public SpellScriptLoader targetList.push_back(target); } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_dk_death_pact_SpellScript::CheckCast); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dk_death_pact_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_death_pact_SpellScript(); } @@ -566,7 +566,7 @@ class spell_dk_death_strike : public SpellScriptLoader { PrepareSpellScript(spell_dk_death_strike_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_DEATH_STRIKE_HEAL)) return false; @@ -587,14 +587,14 @@ class spell_dk_death_strike : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dk_death_strike_SpellScript::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_death_strike_SpellScript(); } @@ -610,7 +610,7 @@ class spell_dk_ghoul_explode : public SpellScriptLoader { PrepareSpellScript(spell_dk_ghoul_explode_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_CORPSE_EXPLOSION_TRIGGERED)) return false; @@ -626,13 +626,13 @@ class spell_dk_ghoul_explode : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dk_ghoul_explode_SpellScript::Suicide, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_ghoul_explode_SpellScript(); } @@ -648,7 +648,7 @@ class spell_dk_icebound_fortitude : public SpellScriptLoader { PrepareAuraScript(spell_dk_icebound_fortitude_AuraScript); - bool Load() + bool Load() OVERRIDE { Unit* caster = GetCaster(); return caster && caster->GetTypeId() == TYPEID_PLAYER; @@ -675,13 +675,13 @@ class spell_dk_icebound_fortitude : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_icebound_fortitude_AuraScript::CalculateAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_icebound_fortitude_AuraScript(); } @@ -697,7 +697,7 @@ class spell_dk_improved_blood_presence : public SpellScriptLoader { PrepareAuraScript(spell_dk_improved_blood_presence_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_PRESENCE) || !sSpellMgr->GetSpellInfo(SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED)) return false; @@ -721,14 +721,14 @@ class spell_dk_improved_blood_presence : public SpellScriptLoader target->RemoveAura(SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_dk_improved_blood_presence_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_dk_improved_blood_presence_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_improved_blood_presence_AuraScript(); } @@ -744,7 +744,7 @@ class spell_dk_improved_unholy_presence : public SpellScriptLoader { PrepareAuraScript(spell_dk_improved_unholy_presence_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_UNHOLY_PRESENCE) || !sSpellMgr->GetSpellInfo(SPELL_DK_IMPROVED_UNHOLY_PRESENCE_TRIGGERED)) return false; @@ -767,14 +767,14 @@ class spell_dk_improved_unholy_presence : public SpellScriptLoader GetTarget()->RemoveAura(SPELL_DK_IMPROVED_UNHOLY_PRESENCE_TRIGGERED); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_dk_improved_unholy_presence_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_dk_improved_unholy_presence_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_improved_unholy_presence_AuraScript(); } @@ -795,13 +795,13 @@ class spell_dk_rune_tap_party : public SpellScriptLoader targets.remove(GetCaster()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dk_rune_tap_party_SpellScript::CheckTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_rune_tap_party_SpellScript(); } @@ -818,13 +818,13 @@ class spell_dk_scourge_strike : public SpellScriptLoader PrepareSpellScript(spell_dk_scourge_strike_SpellScript); float multiplier; - bool Load() + bool Load() OVERRIDE { multiplier = 1.0f; return true; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DK_SCOURGE_STRIKE_TRIGGERED)) return false; @@ -857,14 +857,14 @@ class spell_dk_scourge_strike : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dk_scourge_strike_SpellScript::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY); AfterHit += SpellHitFn(spell_dk_scourge_strike_SpellScript::HandleAfterHit); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dk_scourge_strike_SpellScript(); } @@ -882,7 +882,7 @@ class spell_dk_spell_deflection : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -901,14 +901,14 @@ class spell_dk_spell_deflection : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_spell_deflection_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_spell_deflection_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_spell_deflection_AuraScript(); } @@ -929,13 +929,13 @@ class spell_dk_vampiric_blood : public SpellScriptLoader amount = GetUnitOwner()->CountPctFromMaxHealth(amount); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_vampiric_blood_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_HEALTH); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_vampiric_blood_AuraScript(); } @@ -951,7 +951,7 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader { PrepareAuraScript(spell_dk_will_of_the_necropolis_AuraScript); - bool Validate(SpellInfo const* spellInfo) + bool Validate(SpellInfo const* spellInfo) OVERRIDE { // can't use other spell than will of the necropolis due to spell_ranks dependency if (sSpellMgr->GetFirstSpellInChain(SPELL_DK_WILL_OF_THE_NECROPOLIS_AURA_R1) != sSpellMgr->GetFirstSpellInChain(spellInfo->Id)) @@ -966,7 +966,7 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -992,14 +992,14 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_will_of_the_necropolis_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_will_of_the_necropolis_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_will_of_the_necropolis_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 8fd44544fb8..efb93a5d095 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -182,13 +182,13 @@ class spell_dru_dash : public SpellScriptLoader amount = 0; } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_dash_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_INCREASE_SPEED); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_dash_AuraScript(); } @@ -210,13 +210,13 @@ class spell_dru_enrage : public SpellScriptLoader GetHitUnit()->CastCustomSpell(SPELL_DRUID_ENRAGE_MOD_DAMAGE, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetHitUnit(), true); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_dru_enrage_SpellScript::OnHit); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_enrage_SpellScript(); } @@ -232,7 +232,7 @@ class spell_dru_glyph_of_starfire : public SpellScriptLoader { PrepareSpellScript(spell_dru_glyph_of_starfire_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_INCREASED_MOONFIRE_DURATION) || !sSpellMgr->GetSpellInfo(SPELL_DRUID_NATURES_SPLENDOR)) return false; @@ -262,13 +262,13 @@ class spell_dru_glyph_of_starfire : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dru_glyph_of_starfire_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_glyph_of_starfire_SpellScript(); } @@ -298,13 +298,13 @@ class spell_dru_idol_lifebloom : public SpellScriptLoader spellMod->value = aurEff->GetAmount() / 7; } - void Register() + void Register() OVERRIDE { DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_dru_idol_lifebloom_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_idol_lifebloom_AuraScript(); } @@ -325,13 +325,13 @@ class spell_dru_innervate : public SpellScriptLoader amount = CalculatePct(int32(GetUnitOwner()->GetCreatePowers(POWER_MANA) / aurEff->GetTotalTicks()), amount); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_innervate_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_innervate_AuraScript(); } @@ -354,13 +354,13 @@ class spell_dru_insect_swarm : public SpellScriptLoader amount += relicAurEff->GetAmount() / aurEff->GetTotalTicks(); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_insect_swarm_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_insect_swarm_AuraScript(); } @@ -376,7 +376,7 @@ class spell_dru_lifebloom : public SpellScriptLoader { PrepareAuraScript(spell_dru_lifebloom_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_LIFEBLOOM_FINAL_HEAL)) return false; @@ -435,14 +435,14 @@ class spell_dru_lifebloom : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_dru_lifebloom_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterDispel += AuraDispelFn(spell_dru_lifebloom_AuraScript::HandleDispel); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_lifebloom_AuraScript(); } @@ -458,7 +458,7 @@ class spell_dru_living_seed : public SpellScriptLoader { PrepareAuraScript(spell_dru_living_seed_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_LIVING_SEED_PROC)) return false; @@ -472,13 +472,13 @@ class spell_dru_living_seed : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_DRUID_LIVING_SEED_PROC, SPELLVALUE_BASE_POINT0, amount, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_dru_living_seed_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_living_seed_AuraScript(); } @@ -494,7 +494,7 @@ class spell_dru_living_seed_proc : public SpellScriptLoader { PrepareAuraScript(spell_dru_living_seed_proc_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_LIVING_SEED_HEAL)) return false; @@ -507,13 +507,13 @@ class spell_dru_living_seed_proc : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_DRUID_LIVING_SEED_HEAL, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_dru_living_seed_proc_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_living_seed_proc_AuraScript(); } @@ -531,7 +531,7 @@ class spell_dru_moonkin_form_passive : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -550,14 +550,14 @@ class spell_dru_moonkin_form_passive : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_moonkin_form_passive_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dru_moonkin_form_passive_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_moonkin_form_passive_AuraScript(); } @@ -578,13 +578,13 @@ class spell_dru_owlkin_frenzy : public SpellScriptLoader amount = CalculatePct(GetUnitOwner()->GetCreatePowers(POWER_MANA), amount); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_owlkin_frenzy_AuraScript::CalculateAmount, EFFECT_2, SPELL_AURA_PERIODIC_ENERGIZE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_owlkin_frenzy_AuraScript(); } @@ -606,14 +606,14 @@ class spell_dru_predatory_strikes : public SpellScriptLoader target->UpdateAttackPowerAndDamage(); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_dru_predatory_strikes_AuraScript::UpdateAmount, EFFECT_ALL, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectRemove += AuraEffectRemoveFn(spell_dru_predatory_strikes_AuraScript::UpdateAmount, EFFECT_ALL, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_predatory_strikes_AuraScript(); } @@ -631,7 +631,7 @@ class spell_dru_primal_tenacity : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(GetCaster()); return true; @@ -650,14 +650,14 @@ class spell_dru_primal_tenacity : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_primal_tenacity_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dru_primal_tenacity_AuraScript::Absorb, EFFECT_1); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_primal_tenacity_AuraScript(); } @@ -673,7 +673,7 @@ class spell_dru_rip : public SpellScriptLoader { PrepareAuraScript(spell_dru_rip_AuraScript); - bool Load() + bool Load() OVERRIDE { Unit* caster = GetCaster(); return caster && caster->GetTypeId() == TYPEID_PLAYER; @@ -699,13 +699,13 @@ class spell_dru_rip : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_rip_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_rip_AuraScript(); } @@ -723,7 +723,7 @@ class spell_dru_savage_defense : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -741,14 +741,14 @@ class spell_dru_savage_defense : public SpellScriptLoader aurEff->SetAmount(0); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_savage_defense_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_dru_savage_defense_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_savage_defense_AuraScript(); } @@ -773,7 +773,7 @@ class spell_dru_savage_roar : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_dru_savage_roar_SpellScript::CheckCast); } @@ -783,7 +783,7 @@ class spell_dru_savage_roar : public SpellScriptLoader { PrepareAuraScript(spell_dru_savage_roar_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_SAVAGE_ROAR)) return false; @@ -801,19 +801,19 @@ class spell_dru_savage_roar : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(SPELL_DRUID_SAVAGE_ROAR); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_dru_savage_roar_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_dru_savage_roar_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_savage_roar_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_savage_roar_AuraScript(); } @@ -834,13 +834,13 @@ class spell_dru_starfall_aoe : public SpellScriptLoader targets.remove(GetExplTargetUnit()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_starfall_aoe_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_starfall_aoe_SpellScript(); } @@ -879,14 +879,14 @@ class spell_dru_starfall_dummy : public SpellScriptLoader caster->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_starfall_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_dru_starfall_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_starfall_dummy_SpellScript(); } @@ -911,7 +911,7 @@ class spell_dru_survival_instincts : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_dru_survival_instincts_SpellScript::CheckCast); } @@ -921,7 +921,7 @@ class spell_dru_survival_instincts : public SpellScriptLoader { PrepareAuraScript(spell_dru_survival_instincts_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_SURVIVAL_INSTINCTS)) return false; @@ -940,19 +940,19 @@ class spell_dru_survival_instincts : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(SPELL_DRUID_SURVIVAL_INSTINCTS); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_dru_survival_instincts_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectRemove += AuraEffectRemoveFn(spell_dru_survival_instincts_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_survival_instincts_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_survival_instincts_AuraScript(); } @@ -968,7 +968,7 @@ class spell_dru_swift_flight_passive : public SpellScriptLoader { PrepareAuraScript(spell_dru_swift_flight_passive_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -980,13 +980,13 @@ class spell_dru_swift_flight_passive : public SpellScriptLoader amount = 310; } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_swift_flight_passive_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dru_swift_flight_passive_AuraScript(); } @@ -1008,13 +1008,13 @@ class spell_dru_tiger_s_fury : public SpellScriptLoader GetHitUnit()->CastCustomSpell(SPELL_DRUID_TIGER_S_FURY_ENERGIZE, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetHitUnit(), true); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_dru_tiger_s_fury_SpellScript::OnHit); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_tiger_s_fury_SpellScript(); } @@ -1037,13 +1037,13 @@ class spell_dru_typhoon : public SpellScriptLoader PreventHitDefaultEffect(effIndex); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_dru_typhoon_SpellScript::HandleKnockBack, EFFECT_0, SPELL_EFFECT_KNOCK_BACK); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_typhoon_SpellScript(); } @@ -1059,7 +1059,7 @@ class spell_dru_t10_restoration_4p_bonus : public SpellScriptLoader { PrepareSpellScript(spell_dru_t10_restoration_4p_bonus_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1092,13 +1092,13 @@ class spell_dru_t10_restoration_4p_bonus : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_t10_restoration_4p_bonus_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_dru_t10_restoration_4p_bonus_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 446c2d43f00..bce3ec54e21 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -48,7 +48,7 @@ class spell_gen_absorb0_hitlimit1 : public SpellScriptLoader uint32 limit; - bool Load() + bool Load() OVERRIDE { // Max absorb stored in 1 dummy effect limit = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); @@ -60,13 +60,13 @@ class spell_gen_absorb0_hitlimit1 : public SpellScriptLoader absorbAmount = std::min(limit, absorbAmount); } - void Register() + void Register() OVERRIDE { OnEffectAbsorb += AuraEffectAbsorbFn(spell_gen_absorb0_hitlimit1_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_absorb0_hitlimit1_AuraScript(); } @@ -91,7 +91,7 @@ class spell_gen_adaptive_warding : public SpellScriptLoader { PrepareAuraScript(spell_gen_adaptive_warding_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_GEN_ADAPTIVE_WARDING_FIRE) || !sSpellMgr->GetSpellInfo(SPELL_GEN_ADAPTIVE_WARDING_NATURE) || @@ -150,14 +150,14 @@ class spell_gen_adaptive_warding : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), spellId, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_gen_adaptive_warding_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_gen_adaptive_warding_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_adaptive_warding_AuraScript(); } @@ -180,13 +180,13 @@ class spell_gen_aura_of_anger : public SpellScriptLoader aurEff->SetAmount(100 * aurEff->GetTickNumber()); } - void Register() + void Register() OVERRIDE { OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_gen_aura_of_anger_AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_aura_of_anger_AuraScript(); } @@ -223,13 +223,13 @@ class spell_gen_av_drekthar_presence : public SpellScriptLoader break; } } - void Register() + void Register() OVERRIDE { DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_gen_av_drekthar_presence_AuraScript::CheckAreaTarget); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_av_drekthar_presence_AuraScript(); } @@ -251,13 +251,13 @@ class spell_gen_burn_brutallus : public SpellScriptLoader aurEff->SetAmount(aurEff->GetAmount() * 2); } - void Register() + void Register() OVERRIDE { OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_gen_burn_brutallus_AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_burn_brutallus_AuraScript(); } @@ -277,7 +277,7 @@ class spell_gen_cannibalize : public SpellScriptLoader { PrepareSpellScript(spell_gen_cannibalize_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CANNIBALIZE_TRIGGERED)) return false; @@ -304,14 +304,14 @@ class spell_gen_cannibalize : public SpellScriptLoader caster->CastSpell(caster, SPELL_CANNIBALIZE_TRIGGERED, false); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_gen_cannibalize_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_gen_cannibalize_SpellScript::CheckIfCorpseNear); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_cannibalize_SpellScript(); } @@ -333,7 +333,7 @@ class spell_gen_create_lance : public SpellScriptLoader { PrepareSpellScript(spell_gen_create_lance_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_LANCE_ALLIANCE) || !sSpellMgr->GetSpellInfo(SPELL_CREATE_LANCE_HORDE)) return false; @@ -353,13 +353,13 @@ class spell_gen_create_lance : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_create_lance_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_create_lance_SpellScript(); } @@ -380,7 +380,7 @@ class spell_gen_netherbloom : public SpellScriptLoader { PrepareSpellScript(spell_gen_netherbloom_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { for (uint8 i = 0; i < 5; ++i) if (!sSpellMgr->GetSpellInfo(SPELL_NETHERBLOOM_POLLEN_1 + i)) @@ -411,13 +411,13 @@ class spell_gen_netherbloom : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_netherbloom_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_netherbloom_SpellScript(); } @@ -438,7 +438,7 @@ class spell_gen_nightmare_vine : public SpellScriptLoader { PrepareSpellScript(spell_gen_nightmare_vine_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_NIGHTMARE_POLLEN)) return false; @@ -457,13 +457,13 @@ class spell_gen_nightmare_vine : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_nightmare_vine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_nightmare_vine_SpellScript(); } @@ -489,7 +489,7 @@ class spell_gen_obsidian_armor : public SpellScriptLoader { PrepareAuraScript(spell_gen_obsidian_armor_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_GEN_OBSIDIAN_ARMOR_HOLY) || !sSpellMgr->GetSpellInfo(SPELL_GEN_OBSIDIAN_ARMOR_FIRE) || @@ -543,14 +543,14 @@ class spell_gen_obsidian_armor : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), spellId, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_gen_obsidian_armor_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_gen_obsidian_armor_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_obsidian_armor_AuraScript(); } @@ -572,7 +572,7 @@ class spell_gen_parachute : public SpellScriptLoader { PrepareAuraScript(spell_gen_parachute_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PARACHUTE) || !sSpellMgr->GetSpellInfo(SPELL_PARACHUTE_BUFF)) return false; @@ -589,13 +589,13 @@ class spell_gen_parachute : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_parachute_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_parachute_AuraScript(); } @@ -617,7 +617,7 @@ class spell_gen_pet_summoned : public SpellScriptLoader { PrepareSpellScript(spell_gen_pet_summoned_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -655,13 +655,13 @@ class spell_gen_pet_summoned : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_pet_summoned_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_pet_summoned_SpellScript(); } @@ -685,13 +685,13 @@ class spell_gen_remove_flight_auras : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_remove_flight_auras_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_remove_flight_auras_SpellScript(); } @@ -716,7 +716,7 @@ class spell_gen_elune_candle : public SpellScriptLoader class spell_gen_elune_candle_SpellScript : public SpellScript { PrepareSpellScript(spell_gen_elune_candle_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ELUNE_CANDLE_OMEN_HEAD)) return false; @@ -751,13 +751,13 @@ class spell_gen_elune_candle : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_elune_candle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_elune_candle_SpellScript(); } @@ -782,13 +782,13 @@ class spell_creature_permanent_feign_death : public SpellScriptLoader target->ToCreature()->SetReactState(REACT_PASSIVE); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_creature_permanent_feign_death_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_creature_permanent_feign_death_AuraScript(); } @@ -809,12 +809,12 @@ class spell_pvp_trinket_wotf_shared_cd : public SpellScriptLoader { PrepareSpellScript(spell_pvp_trinket_wotf_shared_cd_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER) || !sSpellMgr->GetSpellInfo(SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER_WOTF)) return false; @@ -828,13 +828,13 @@ class spell_pvp_trinket_wotf_shared_cd : public SpellScriptLoader GetCaster()->ToPlayer()->AddSpellAndCategoryCooldowns(GetSpellInfo(), GetCastItem() ? GetCastItem()->GetEntry() : 0, GetSpell()); } - void Register() + void Register() OVERRIDE { AfterCast += SpellCastFn(spell_pvp_trinket_wotf_shared_cd_SpellScript::HandleScript); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pvp_trinket_wotf_shared_cd_SpellScript(); } @@ -855,7 +855,7 @@ class spell_gen_animal_blood : public SpellScriptLoader { PrepareAuraScript(spell_gen_animal_blood_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SPAWN_BLOOD_POOL)) return false; @@ -876,14 +876,14 @@ class spell_gen_animal_blood : public SpellScriptLoader owner->CastSpell(owner, SPELL_SPAWN_BLOOD_POOL, true); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectRemoveFn(spell_gen_animal_blood_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_gen_animal_blood_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_animal_blood_AuraScript(); } @@ -904,12 +904,12 @@ class spell_gen_divine_storm_cd_reset : public SpellScriptLoader { PrepareSpellScript(spell_gen_divine_storm_cd_reset_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_DIVINE_STORM)) return false; @@ -923,13 +923,13 @@ class spell_gen_divine_storm_cd_reset : public SpellScriptLoader caster->RemoveSpellCooldown(SPELL_DIVINE_STORM, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_divine_storm_cd_reset_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_divine_storm_cd_reset_SpellScript(); } @@ -944,7 +944,7 @@ class spell_gen_gunship_portal : public SpellScriptLoader { PrepareSpellScript(spell_gen_gunship_portal_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -957,13 +957,13 @@ class spell_gen_gunship_portal : public SpellScriptLoader bg->DoAction(1, caster->GetGUID()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_gunship_portal_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_gunship_portal_SpellScript(); } @@ -990,13 +990,13 @@ class spell_gen_parachute_ic : public SpellScriptLoader target->CastSpell(target, SPELL_PARACHUTE_IC, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_parachute_ic_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_parachute_ic_AuraScript(); } @@ -1011,7 +1011,7 @@ class spell_gen_dungeon_credit : public SpellScriptLoader { PrepareSpellScript(spell_gen_dungeon_credit_SpellScript); - bool Load() + bool Load() OVERRIDE { _handled = false; return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1029,7 +1029,7 @@ class spell_gen_dungeon_credit : public SpellScriptLoader instance->UpdateEncounterState(ENCOUNTER_CREDIT_CAST_SPELL, GetSpellInfo()->Id, caster); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_gen_dungeon_credit_SpellScript::CreditEncounter); } @@ -1037,7 +1037,7 @@ class spell_gen_dungeon_credit : public SpellScriptLoader bool _handled; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_dungeon_credit_SpellScript(); } @@ -1052,7 +1052,7 @@ class spell_gen_profession_research : public SpellScriptLoader { PrepareSpellScript(spell_gen_profession_research_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1080,14 +1080,14 @@ class spell_gen_profession_research : public SpellScriptLoader caster->UpdateCraftSkill(spellId); } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_gen_profession_research_SpellScript::CheckRequirement); OnEffectHitTarget += SpellEffectFn(spell_gen_profession_research_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_profession_research_SpellScript(); } @@ -1109,14 +1109,14 @@ class spell_generic_clone : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), spellId, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_generic_clone_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); OnEffectHitTarget += SpellEffectFn(spell_generic_clone_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_generic_clone_SpellScript(); } @@ -1156,13 +1156,13 @@ class spell_generic_clone_weapon : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_generic_clone_weapon_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_generic_clone_weapon_SpellScript(); } @@ -1179,7 +1179,7 @@ class spell_gen_clone_weapon_aura : public SpellScriptLoader uint32 prevItem; - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_COPY_WEAPON_AURA) || !sSpellMgr->GetSpellInfo(SPELL_COPY_WEAPON_2_AURA) || !sSpellMgr->GetSpellInfo(SPELL_COPY_WEAPON_3_AURA) || !sSpellMgr->GetSpellInfo(SPELL_COPY_OFFHAND_AURA) || !sSpellMgr->GetSpellInfo(SPELL_COPY_OFFHAND_2_AURA) || !sSpellMgr->GetSpellInfo(SPELL_COPY_RANGED_AURA)) @@ -1273,7 +1273,7 @@ class spell_gen_clone_weapon_aura : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_gen_clone_weapon_auraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); OnEffectRemove += AuraEffectRemoveFn(spell_gen_clone_weapon_auraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); @@ -1281,7 +1281,7 @@ class spell_gen_clone_weapon_aura : public SpellScriptLoader }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_clone_weapon_auraScript(); } @@ -1301,14 +1301,14 @@ class spell_gen_seaforium_blast : public SpellScriptLoader { PrepareSpellScript(spell_gen_seaforium_blast_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PLANT_CHARGES_CREDIT_ACHIEVEMENT)) return false; return true; } - bool Load() + bool Load() OVERRIDE { // OriginalCaster is always available in Spell::prepare return GetOriginalCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1323,13 +1323,13 @@ class spell_gen_seaforium_blast : public SpellScriptLoader originalCaster->CastSpell(originalCaster, SPELL_PLANT_CHARGES_CREDIT_ACHIEVEMENT, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_seaforium_blast_SpellScript::AchievementCredit, EFFECT_1, SPELL_EFFECT_GAMEOBJECT_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_seaforium_blast_SpellScript(); } @@ -1370,7 +1370,7 @@ class spell_gen_turkey_marker : public SpellScriptLoader ModStackAmount(-1, AURA_REMOVE_BY_EXPIRE); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_gen_turkey_marker_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_turkey_marker_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); @@ -1379,7 +1379,7 @@ class spell_gen_turkey_marker : public SpellScriptLoader std::list<uint32> _applyTimes; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_turkey_marker_AuraScript(); } @@ -1400,13 +1400,13 @@ class spell_gen_lifeblood : public SpellScriptLoader amount += int32(CalculatePct(owner->GetMaxHealth(), 1.5f / aurEff->GetTotalTicks())); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_lifeblood_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_lifeblood_AuraScript(); } @@ -1455,13 +1455,13 @@ class spell_gen_magic_rooster : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_magic_rooster_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_magic_rooster_SpellScript(); } @@ -1483,13 +1483,13 @@ class spell_gen_allow_cast_from_item_only : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_gen_allow_cast_from_item_only_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_allow_cast_from_item_only_SpellScript(); } @@ -1534,14 +1534,14 @@ class spell_gen_launch : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_launch_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_FORCE_CAST); AfterHit += SpellHitFn(spell_gen_launch_SpellScript::Launch); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_launch_SpellScript(); } @@ -1561,7 +1561,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader { PrepareAuraScript(spell_gen_vehicle_scaling_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1592,7 +1592,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader amount = uint16((avgILvl - baseItemLevel) * factor); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_vehicle_scaling_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_vehicle_scaling_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); @@ -1600,7 +1600,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_vehicle_scaling_AuraScript(); } @@ -1616,7 +1616,7 @@ class spell_gen_oracle_wolvar_reputation : public SpellScriptLoader { PrepareSpellScript(spell_gen_oracle_wolvar_reputation_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1640,13 +1640,13 @@ class spell_gen_oracle_wolvar_reputation : public SpellScriptLoader // EFFECT_INDEX_2 most likely update at war state, we already handle this in SetReputation } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_gen_oracle_wolvar_reputation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_oracle_wolvar_reputation_SpellScript(); } @@ -1667,7 +1667,7 @@ class spell_gen_dummy_trigger : public SpellScriptLoader { PrepareSpellScript(spell_gen_dummy_trigger_SpellScript); - bool Validate(SpellInfo const* /*SpellEntry*/) + bool Validate(SpellInfo const* /*SpellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PERSISTANT_SHIELD_TRIGGERED) || !sSpellMgr->GetSpellInfo(SPELL_PERSISTANT_SHIELD)) return false; @@ -1684,13 +1684,13 @@ class spell_gen_dummy_trigger : public SpellScriptLoader caster->CastCustomSpell(target, SPELL_PERSISTANT_SHIELD_TRIGGERED, &damage, NULL, NULL, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_dummy_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_dummy_trigger_SpellScript(); } @@ -1706,7 +1706,7 @@ class spell_gen_spirit_healer_res : public SpellScriptLoader { PrepareSpellScript(spell_gen_spirit_healer_res_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetOriginalCaster() && GetOriginalCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1722,13 +1722,13 @@ class spell_gen_spirit_healer_res : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_spirit_healer_res_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_spirit_healer_res_SpellScript(); } @@ -1750,7 +1750,7 @@ class spell_gen_gadgetzan_transporter_backfire : public SpellScriptLoader { PrepareSpellScript(spell_gen_gadgetzan_transporter_backfire_SpellScript) - bool Validate(SpellInfo const* /*SpellEntry*/) + bool Validate(SpellInfo const* /*SpellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_MALFUNCTION_POLYMORPH) || !sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_EVIL_TWIN) || !sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_MALFUNCTION_MISS)) @@ -1770,13 +1770,13 @@ class spell_gen_gadgetzan_transporter_backfire : public SpellScriptLoader caster->CastSpell(caster, SPELL_TRANSPORTER_MALFUNCTION_MISS, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_gadgetzan_transporter_backfire_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_gadgetzan_transporter_backfire_SpellScript(); } @@ -1797,7 +1797,7 @@ class spell_gen_gnomish_transporter : public SpellScriptLoader { PrepareSpellScript(spell_gen_gnomish_transporter_SpellScript) - bool Validate(SpellInfo const* /*SpellEntry*/) + bool Validate(SpellInfo const* /*SpellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_SUCCESS) || !sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_FAILURE)) return false; @@ -1810,13 +1810,13 @@ class spell_gen_gnomish_transporter : public SpellScriptLoader caster->CastSpell(caster, roll_chance_i(50) ? SPELL_TRANSPORTER_SUCCESS : SPELL_TRANSPORTER_FAILURE, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_gnomish_transporter_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_gnomish_transporter_SpellScript(); } @@ -1841,7 +1841,7 @@ class spell_gen_dalaran_disguise : public SpellScriptLoader class spell_gen_dalaran_disguise_SpellScript : public SpellScript { PrepareSpellScript(spell_gen_dalaran_disguise_SpellScript); - bool Validate(SpellInfo const* spellEntry) + bool Validate(SpellInfo const* spellEntry) OVERRIDE { switch (spellEntry->Id) { @@ -1880,13 +1880,13 @@ class spell_gen_dalaran_disguise : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_dalaran_disguise_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_dalaran_disguise_SpellScript(); } @@ -1989,13 +1989,13 @@ class spell_gen_break_shield: public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_break_shield_SpellScript::HandleScriptEffect, EFFECT_FIRST_FOUND, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_break_shield_SpellScript(); } @@ -2144,7 +2144,7 @@ class spell_gen_mounted_charge: public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), spellId, false); } - void Register() + void Register() OVERRIDE { SpellInfo const* spell = sSpellMgr->GetSpellInfo(m_scriptSpellId); @@ -2156,7 +2156,7 @@ class spell_gen_mounted_charge: public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_mounted_charge_SpellScript(); } @@ -2178,7 +2178,7 @@ class spell_gen_defend : public SpellScriptLoader { PrepareAuraScript(spell_gen_defend_AuraScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_VISUAL_SHIELD_1)) return false; @@ -2218,7 +2218,7 @@ class spell_gen_defend : public SpellScriptLoader rider->RemoveAurasDueToSpell(GetId()); } - void Register() + void Register() OVERRIDE { SpellInfo const* spell = sSpellMgr->GetSpellInfo(m_scriptSpellId); @@ -2242,7 +2242,7 @@ class spell_gen_defend : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_defend_AuraScript(); } @@ -2263,7 +2263,7 @@ class spell_gen_tournament_duel : public SpellScriptLoader { PrepareSpellScript(spell_gen_tournament_duel_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ON_TOURNAMENT_MOUNT)) return false; @@ -2289,13 +2289,13 @@ class spell_gen_tournament_duel : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_tournament_duel_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_tournament_duel_SpellScript(); } @@ -2315,7 +2315,7 @@ class spell_gen_summon_tournament_mount : public SpellScriptLoader { PrepareSpellScript(spell_gen_summon_tournament_mount_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_LANCE_EQUIPPED)) return false; @@ -2336,13 +2336,13 @@ class spell_gen_summon_tournament_mount : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_gen_summon_tournament_mount_SpellScript::CheckIfLanceEquiped); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_summon_tournament_mount_SpellScript(); } @@ -2454,7 +2454,7 @@ class spell_gen_on_tournament_mount : public SpellScriptLoader uint32 _pennantSpellId; - bool Load() + bool Load() OVERRIDE { _pennantSpellId = 0; return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2588,14 +2588,14 @@ class spell_gen_on_tournament_mount : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_gen_on_tournament_mount_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); OnEffectRemove += AuraEffectRemoveFn(spell_gen_on_tournament_mount_AuraScript::HandleRemoveEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_on_tournament_mount_AuraScript(); } @@ -2610,7 +2610,7 @@ class spell_gen_tournament_pennant : public SpellScriptLoader { PrepareAuraScript(spell_gen_tournament_pennant_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -2622,13 +2622,13 @@ class spell_gen_tournament_pennant : public SpellScriptLoader caster->RemoveAurasDueToSpell(GetId()); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_gen_tournament_pennant_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_tournament_pennant_AuraScript(); } @@ -2648,7 +2648,7 @@ class spell_gen_chaos_blast : public SpellScriptLoader { PrepareSpellScript(spell_gen_chaos_blast_SpellScript) - bool Validate(SpellInfo const* /*SpellEntry*/) + bool Validate(SpellInfo const* /*SpellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CHAOS_BLAST)) return false; @@ -2662,13 +2662,13 @@ class spell_gen_chaos_blast : public SpellScriptLoader caster->CastCustomSpell(target, SPELL_CHAOS_BLAST, &basepoints0, NULL, NULL, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_chaos_blast_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_chaos_blast_SpellScript(); } @@ -2700,13 +2700,13 @@ class spell_gen_ds_flush_knockback : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_ds_flush_knockback_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_ds_flush_knockback_SpellScript(); } @@ -2728,13 +2728,13 @@ class spell_gen_wg_water : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_gen_wg_water_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_wg_water_SpellScript(); } @@ -2760,7 +2760,7 @@ class spell_gen_count_pct_from_max_hp : public SpellScriptLoader SetHitDamage(GetHitUnit()->CountPctFromMaxHealth(_damagePct)); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_gen_count_pct_from_max_hp_SpellScript::RecalculateDamage); } @@ -2769,7 +2769,7 @@ class spell_gen_count_pct_from_max_hp : public SpellScriptLoader int32 _damagePct; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_count_pct_from_max_hp_SpellScript(_damagePct); } @@ -2787,7 +2787,7 @@ public: { PrepareSpellScript(spell_gen_despawn_self_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -2798,13 +2798,13 @@ public: GetCaster()->ToCreature()->DespawnOrUnsummon(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_despawn_self_SpellScript::HandleDummy, EFFECT_ALL, SPELL_EFFECT_ANY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_despawn_self_SpellScript(); } @@ -2825,13 +2825,13 @@ public: SetHitDamage(bp); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_touch_the_nightmare_SpellScript::HandleDamageCalc, EFFECT_2, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_touch_the_nightmare_SpellScript(); } @@ -2854,14 +2854,14 @@ public: canBeRecalculated = false; } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_dream_funnel_AuraScript::HandleEffectCalcAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_dream_funnel_AuraScript::HandleEffectCalcAmount, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_dream_funnel_AuraScript(); } @@ -2881,7 +2881,7 @@ class spell_gen_bandage : public SpellScriptLoader { PrepareSpellScript(spell_gen_bandage_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_RECENTLY_BANDAGED)) return false; @@ -2904,14 +2904,14 @@ class spell_gen_bandage : public SpellScriptLoader GetCaster()->CastSpell(target, SPELL_RECENTLY_BANDAGED, true); } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_gen_bandage_SpellScript::CheckCast); AfterHit += SpellHitFn(spell_gen_bandage_SpellScript::HandleScript); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_bandage_SpellScript(); } @@ -2938,7 +2938,7 @@ class spell_gen_lifebloom : public SpellScriptLoader public: spell_gen_lifebloom_AuraScript(uint32 spellId) : AuraScript(), _spellId(spellId) { } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(_spellId)) return false; @@ -2955,7 +2955,7 @@ class spell_gen_lifebloom : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), _spellId, true, NULL, aurEff, GetCasterGUID()); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_gen_lifebloom_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); } @@ -2964,7 +2964,7 @@ class spell_gen_lifebloom : public SpellScriptLoader uint32 _spellId; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_lifebloom_AuraScript(_spellId); } @@ -2991,7 +2991,7 @@ class spell_gen_summon_elemental : public SpellScriptLoader public: spell_gen_summon_elemental_AuraScript(uint32 spellId) : AuraScript(), _spellId(spellId) { } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(_spellId)) return false; @@ -3013,7 +3013,7 @@ class spell_gen_summon_elemental : public SpellScriptLoader owner->ToPlayer()->RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_gen_summon_elemental_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_gen_summon_elemental_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); @@ -3023,7 +3023,7 @@ class spell_gen_summon_elemental : public SpellScriptLoader uint32 _spellId; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_summon_elemental_AuraScript(_spellId); } @@ -3070,13 +3070,13 @@ class spell_gen_upper_deck_create_foam_sword : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_upper_deck_create_foam_sword_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_upper_deck_create_foam_sword_SpellScript(); } @@ -3110,13 +3110,13 @@ class spell_gen_bonked : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_bonked_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_bonked_SpellScript(); } @@ -3162,13 +3162,13 @@ class spell_gen_gift_of_naaru : public SpellScriptLoader amount += int32(std::max(healTick, 0)); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_gift_of_naaru_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_gift_of_naaru_AuraScript(); } @@ -3218,7 +3218,7 @@ class spell_gen_replenishment : public SpellScriptLoader { PrepareAuraScript(spell_gen_replenishment_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_REPLENISHMENT) || !sSpellMgr->GetSpellInfo(SPELL_INFINITE_REPLENISHMENT)) @@ -3226,7 +3226,7 @@ class spell_gen_replenishment : public SpellScriptLoader return true; } - bool Load() + bool Load() OVERRIDE { return GetUnitOwner()->GetPower(POWER_MANA); } @@ -3246,13 +3246,13 @@ class spell_gen_replenishment : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_replenishment_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_replenishment_AuraScript(); } @@ -3274,7 +3274,7 @@ class spell_gen_running_wild : public SpellScriptLoader { PrepareAuraScript(spell_gen_running_wild_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sCreatureDisplayInfoStore.LookupEntry(RUNNING_WILD_MODEL_MALE)) return false; @@ -3320,12 +3320,12 @@ class spell_gen_running_wild : public SpellScriptLoader return false; } - void Register() + void Register() OVERRIDE { } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_running_wild_AuraScript(); } @@ -3428,7 +3428,7 @@ class spell_gen_orc_disguise : public SpellScriptLoader { PrepareSpellScript(spell_gen_orc_disguise_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ORC_DISGUISE_TRIGGER) || !sSpellMgr->GetSpellInfo(SPELL_ORC_DISGUISE_MALE) || !sSpellMgr->GetSpellInfo(SPELL_ORC_DISGUISE_FEMALE)) @@ -3449,13 +3449,13 @@ class spell_gen_orc_disguise : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_orc_disguise_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_orc_disguise_SpellScript(); } @@ -3475,7 +3475,7 @@ class spell_gen_whisper_gulch_yogg_saron_whisper : public SpellScriptLoader { PrepareAuraScript(spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_YOGG_SARON_WHISPER_DUMMY)) return false; @@ -3488,13 +3488,13 @@ class spell_gen_whisper_gulch_yogg_saron_whisper : public SpellScriptLoader GetTarget()->CastSpell((Unit*)NULL, SPELL_YOGG_SARON_WHISPER_DUMMY, true); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript(); } @@ -3523,13 +3523,13 @@ class spell_gen_spectator_cheer_trigger : public SpellScriptLoader GetCaster()->HandleEmoteCommand(EmoteArray[urand(0, 2)]); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_spectator_cheer_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_spectator_cheer_trigger_SpellScript(); } @@ -3559,13 +3559,13 @@ class spell_gen_vendor_bark_trigger : public SpellScriptLoader vendor->AI()->Talk(SAY_AMPHITHEATER_VENDOR); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_gen_vendor_bark_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_gen_vendor_bark_trigger_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp index 37b6a202ed4..f61da1f7179 100644 --- a/src/server/scripts/Spells/spell_holiday.cpp +++ b/src/server/scripts/Spells/spell_holiday.cpp @@ -99,14 +99,14 @@ class spell_love_is_in_the_air_romantic_picnic : public SpellScriptLoader target->RemoveAura(SPELL_ROMANTIC_PICNIC_ACHIEV); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_love_is_in_the_air_romantic_picnic_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_love_is_in_the_air_romantic_picnic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_love_is_in_the_air_romantic_picnic_AuraScript(); } @@ -136,7 +136,7 @@ class spell_hallow_end_trick : public SpellScriptLoader { PrepareSpellScript(spell_hallow_end_trick_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PIRATE_COSTUME_MALE) || !sSpellMgr->GetSpellInfo(SPELL_PIRATE_COSTUME_FEMALE) || !sSpellMgr->GetSpellInfo(SPELL_NINJA_COSTUME_MALE) || !sSpellMgr->GetSpellInfo(SPELL_NINJA_COSTUME_FEMALE) || !sSpellMgr->GetSpellInfo(SPELL_LEPER_GNOME_COSTUME_MALE) || !sSpellMgr->GetSpellInfo(SPELL_LEPER_GNOME_COSTUME_FEMALE) @@ -177,13 +177,13 @@ class spell_hallow_end_trick : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hallow_end_trick_SpellScript(); } @@ -209,7 +209,7 @@ class spell_hallow_end_trick_or_treat : public SpellScriptLoader { PrepareSpellScript(spell_hallow_end_trick_or_treat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_TRICK) || !sSpellMgr->GetSpellInfo(SPELL_TREAT) || !sSpellMgr->GetSpellInfo(SPELL_TRICKED_OR_TREATED)) return false; @@ -226,13 +226,13 @@ class spell_hallow_end_trick_or_treat : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_or_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hallow_end_trick_or_treat_SpellScript(); } @@ -247,7 +247,7 @@ class spell_hallow_end_tricky_treat : public SpellScriptLoader { PrepareSpellScript(spell_hallow_end_tricky_treat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_TRICKY_TREAT_SPEED)) return false; @@ -265,13 +265,13 @@ class spell_hallow_end_tricky_treat : public SpellScriptLoader caster->CastSpell(caster, SPELL_UPSET_TUMMY, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hallow_end_tricky_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hallow_end_tricky_treat_SpellScript(); } @@ -293,7 +293,7 @@ class spell_winter_veil_mistletoe : public SpellScriptLoader { PrepareSpellScript(spell_winter_veil_mistletoe_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_MISTLETOE) || !sSpellMgr->GetSpellInfo(SPELL_CREATE_HOLLY) || @@ -311,13 +311,13 @@ class spell_winter_veil_mistletoe : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_winter_veil_mistletoe_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_winter_veil_mistletoe_SpellScript(); } @@ -341,7 +341,7 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader { PrepareSpellScript(spell_winter_veil_px_238_winter_wondervolt_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_1) || !sSpellMgr->GetSpellInfo(SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_2) || @@ -373,7 +373,7 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_winter_veil_px_238_winter_wondervolt_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } @@ -382,7 +382,7 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_winter_veil_px_238_winter_wondervolt_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 98357d82d16..d18c481e63d 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -64,12 +64,12 @@ class spell_hun_aspect_of_the_beast : public SpellScriptLoader { PrepareAuraScript(spell_hun_aspect_of_the_beast_AuraScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_ASPECT_OF_THE_BEAST_PET)) return false; @@ -90,14 +90,14 @@ class spell_hun_aspect_of_the_beast : public SpellScriptLoader caster->CastSpell(caster, SPELL_HUNTER_ASPECT_OF_THE_BEAST_PET, true); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_hun_aspect_of_the_beast_AuraScript::OnApply, EFFECT_0, SPELL_AURA_UNTRACKABLE, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_hun_aspect_of_the_beast_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_UNTRACKABLE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_aspect_of_the_beast_AuraScript(); } @@ -113,7 +113,7 @@ class spell_hun_ascpect_of_the_viper : public SpellScriptLoader { PrepareAuraScript(spell_hun_ascpect_of_the_viper_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_ASPECT_OF_THE_VIPER_ENERGIZE)) return false; @@ -135,13 +135,13 @@ class spell_hun_ascpect_of_the_viper : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_HUNTER_ASPECT_OF_THE_VIPER_ENERGIZE, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_hun_ascpect_of_the_viper_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_OBS_MOD_POWER); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_ascpect_of_the_viper_AuraScript(); } @@ -157,7 +157,7 @@ class spell_hun_chimera_shot : public SpellScriptLoader { PrepareSpellScript(spell_hun_chimera_shot_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_CHIMERA_SHOT_SERPENT) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_CHIMERA_SHOT_VIPER) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_CHIMERA_SHOT_SCORPID)) return false; @@ -228,13 +228,13 @@ class spell_hun_chimera_shot : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hun_chimera_shot_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_chimera_shot_SpellScript(); } @@ -259,13 +259,13 @@ class spell_hun_disengage : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_hun_disengage_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_disengage_SpellScript(); } @@ -281,7 +281,7 @@ class spell_hun_invigoration : public SpellScriptLoader { PrepareSpellScript(spell_hun_invigoration_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_INVIGORATION_TRIGGERED)) return false; @@ -296,13 +296,13 @@ class spell_hun_invigoration : public SpellScriptLoader unitTarget->CastSpell(unitTarget, SPELL_HUNTER_INVIGORATION_TRIGGERED, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hun_invigoration_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_invigoration_SpellScript(); } @@ -318,7 +318,7 @@ class spell_hun_last_stand_pet : public SpellScriptLoader { PrepareSpellScript(spell_hun_last_stand_pet_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_PET_LAST_STAND_TRIGGERED)) return false; @@ -332,13 +332,13 @@ class spell_hun_last_stand_pet : public SpellScriptLoader caster->CastCustomSpell(caster, SPELL_HUNTER_PET_LAST_STAND_TRIGGERED, &healthModSpellBasePoints0, NULL, NULL, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hun_last_stand_pet_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_last_stand_pet_SpellScript(); } @@ -354,7 +354,7 @@ class spell_hun_masters_call : public SpellScriptLoader { PrepareSpellScript(spell_hun_masters_call_SpellScript); - bool Validate(SpellInfo const* spellInfo) + bool Validate(SpellInfo const* spellInfo) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_MASTERS_CALL_TRIGGERED) || !sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_0].CalcValue()) || !sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_1].CalcValue())) return false; @@ -383,14 +383,14 @@ class spell_hun_masters_call : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hun_masters_call_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnEffectHitTarget += SpellEffectFn(spell_hun_masters_call_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_masters_call_SpellScript(); } @@ -406,7 +406,7 @@ class spell_hun_misdirection : public SpellScriptLoader { PrepareAuraScript(spell_hun_misdirection_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_MISDIRECTION_PROC)) return false; @@ -430,7 +430,7 @@ class spell_hun_misdirection : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_MISDIRECTION_PROC, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_hun_misdirection_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); DoCheckProc += AuraCheckProcFn(spell_hun_misdirection_AuraScript::CheckProc); @@ -438,7 +438,7 @@ class spell_hun_misdirection : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_misdirection_AuraScript(); } @@ -459,13 +459,13 @@ class spell_hun_misdirection_proc : public SpellScriptLoader GetTarget()->ResetRedirectThreat(); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_hun_misdirection_proc_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_misdirection_proc_AuraScript(); } @@ -481,14 +481,14 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader { PrepareSpellScript(spell_hun_pet_carrion_feeder_SpellScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster()->IsPet()) return false; return true; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_PET_CARRION_FEEDER_TRIGGERED)) return false; @@ -515,14 +515,14 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader caster->CastSpell(caster, SPELL_HUNTER_PET_CARRION_FEEDER_TRIGGERED, false); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_hun_pet_carrion_feeder_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_hun_pet_carrion_feeder_SpellScript::CheckIfCorpseNear); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_pet_carrion_feeder_SpellScript(); } @@ -538,14 +538,14 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScriptLoader { PrepareSpellScript(spell_hun_pet_heart_of_the_phoenix_SpellScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster()->IsPet()) return false; return true; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_PET_HEART_OF_THE_PHOENIX_TRIGGERED) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_PET_HEART_OF_THE_PHOENIX_DEBUFF)) return false; @@ -563,13 +563,13 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hun_pet_heart_of_the_phoenix_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_pet_heart_of_the_phoenix_SpellScript(); } @@ -585,7 +585,7 @@ class spell_hun_readiness : public SpellScriptLoader { PrepareSpellScript(spell_hun_readiness_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -612,13 +612,13 @@ class spell_hun_readiness : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hun_readiness_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_readiness_SpellScript(); } @@ -634,7 +634,7 @@ class spell_hun_scatter_shot : public SpellScriptLoader { PrepareSpellScript(spell_hun_scatter_shot_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -648,13 +648,13 @@ class spell_hun_scatter_shot : public SpellScriptLoader caster->SendAttackSwingCancelAttack(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_hun_scatter_shot_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_scatter_shot_SpellScript(); } @@ -670,7 +670,7 @@ class spell_hun_sniper_training : public SpellScriptLoader { PrepareAuraScript(spell_hun_sniper_training_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_SNIPER_TRAINING_R1) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_SNIPER_TRAINING_BUFF_R1)) return false; @@ -706,14 +706,14 @@ class spell_hun_sniper_training : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_hun_sniper_training_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_hun_sniper_training_AuraScript::HandleUpdatePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_sniper_training_AuraScript(); } @@ -759,13 +759,13 @@ class spell_hun_tame_beast : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_hun_tame_beast_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_tame_beast_SpellScript(); } @@ -790,14 +790,14 @@ class spell_hun_target_only_pet_and_owner : public SpellScriptLoader targets.push_back(owner); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hun_target_only_pet_and_owner_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hun_target_only_pet_and_owner_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_PARTY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_hun_target_only_pet_and_owner_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index c61a547d2c3..9b8e7d489ce 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -47,7 +47,7 @@ class spell_item_trigger_spell : public SpellScriptLoader public: spell_item_trigger_spell_SpellScript(uint32 triggeredSpellId) : SpellScript(), _triggeredSpellId(triggeredSpellId) { } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(_triggeredSpellId)) return false; @@ -61,13 +61,13 @@ class spell_item_trigger_spell : public SpellScriptLoader caster->CastSpell(caster, _triggeredSpellId, true, item); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_trigger_spell_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_trigger_spell_SpellScript(_triggeredSpellId); } @@ -90,13 +90,13 @@ class spell_item_arcane_shroud : public SpellScriptLoader amount += 2 * diff; } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_item_arcane_shroud_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_THREAT); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_arcane_shroud_AuraScript(); } @@ -117,7 +117,7 @@ class spell_item_blessing_of_ancient_kings : public SpellScriptLoader { PrepareAuraScript(spell_item_blessing_of_ancient_kings_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PROTECTION_OF_ANCIENT_KINGS)) return false; @@ -146,14 +146,14 @@ class spell_item_blessing_of_ancient_kings : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PROTECTION_OF_ANCIENT_KINGS, SPELLVALUE_BASE_POINT0, absorb, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_item_blessing_of_ancient_kings_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_item_blessing_of_ancient_kings_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_blessing_of_ancient_kings_AuraScript(); } @@ -180,7 +180,7 @@ class spell_item_defibrillate : public SpellScriptLoader public: spell_item_defibrillate_SpellScript(uint8 chance, uint32 failSpell) : SpellScript(), _chance(chance), _failSpell(failSpell) { } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (_failSpell && !sSpellMgr->GetSpellInfo(_failSpell)) return false; @@ -197,7 +197,7 @@ class spell_item_defibrillate : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_defibrillate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_RESURRECT); } @@ -207,7 +207,7 @@ class spell_item_defibrillate : public SpellScriptLoader uint32 _failSpell; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_defibrillate_SpellScript(_chance, _failSpell); } @@ -237,12 +237,12 @@ class spell_item_deviate_fish : public SpellScriptLoader { PrepareSpellScript(spell_item_deviate_fish_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { for (uint32 spellId = SPELL_SLEEPY; spellId <= SPELL_HEALTHY_SPIRIT; ++spellId) if (!sSpellMgr->GetSpellInfo(spellId)) @@ -257,13 +257,13 @@ class spell_item_deviate_fish : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_deviate_fish_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_deviate_fish_SpellScript(); } @@ -287,7 +287,7 @@ class spell_item_flask_of_the_north : public SpellScriptLoader { PrepareSpellScript(spell_item_flask_of_the_north_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FLASK_OF_THE_NORTH_SP) || !sSpellMgr->GetSpellInfo(SPELL_FLASK_OF_THE_NORTH_AP) || !sSpellMgr->GetSpellInfo(SPELL_FLASK_OF_THE_NORTH_STR)) return false; @@ -327,13 +327,13 @@ class spell_item_flask_of_the_north : public SpellScriptLoader caster->CastSpell(caster, possibleSpells[irand(0, (possibleSpells.size() - 1))], true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_flask_of_the_north_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_flask_of_the_north_SpellScript(); } @@ -356,7 +356,7 @@ class spell_item_gnomish_death_ray : public SpellScriptLoader { PrepareSpellScript(spell_item_gnomish_death_ray_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_GNOMISH_DEATH_RAY_SELF) || !sSpellMgr->GetSpellInfo(SPELL_GNOMISH_DEATH_RAY_TARGET)) return false; @@ -375,13 +375,13 @@ class spell_item_gnomish_death_ray : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_gnomish_death_ray_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_gnomish_death_ray_SpellScript(); } @@ -407,12 +407,12 @@ class spell_item_make_a_wish : public SpellScriptLoader { PrepareSpellScript(spell_item_make_a_wish_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MR_PINCHYS_BLESSING) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_MIGHTY_MR_PINCHY) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_FURIOUS_MR_PINCHY) || !sSpellMgr->GetSpellInfo(SPELL_TINY_MAGICAL_CRAWDAD) || !sSpellMgr->GetSpellInfo(SPELL_MR_PINCHYS_GIFT)) return false; @@ -433,13 +433,13 @@ class spell_item_make_a_wish : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_make_a_wish_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_make_a_wish_SpellScript(); } @@ -489,13 +489,13 @@ class spell_item_mingos_fortune_generator : public SpellScriptLoader CreateItem(effIndex, newitemid); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_mingos_fortune_generator_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_mingos_fortune_generator_SpellScript(); } @@ -516,7 +516,7 @@ class spell_item_necrotic_touch : public SpellScriptLoader { PrepareAuraScript(spell_item_necrotic_touch_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ITEM_NECROTIC_TOUCH_PROC)) return false; @@ -530,13 +530,13 @@ class spell_item_necrotic_touch : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_ITEM_NECROTIC_TOUCH_PROC, SPELLVALUE_BASE_POINT0, bp, GetTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_item_necrotic_touch_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_necrotic_touch_AuraScript(); } @@ -560,7 +560,7 @@ class spell_item_net_o_matic : public SpellScriptLoader { PrepareSpellScript(spell_item_net_o_matic_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_NET_O_MATIC_TRIGGERED1) || !sSpellMgr->GetSpellInfo(SPELL_NET_O_MATIC_TRIGGERED2) || !sSpellMgr->GetSpellInfo(SPELL_NET_O_MATIC_TRIGGERED3)) return false; @@ -582,13 +582,13 @@ class spell_item_net_o_matic : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_net_o_matic_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_net_o_matic_SpellScript(); } @@ -612,12 +612,12 @@ class spell_item_noggenfogger_elixir : public SpellScriptLoader { PrepareSpellScript(spell_item_noggenfogger_elixir_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_NOGGENFOGGER_ELIXIR_TRIGGERED1) || !sSpellMgr->GetSpellInfo(SPELL_NOGGENFOGGER_ELIXIR_TRIGGERED2) || !sSpellMgr->GetSpellInfo(SPELL_NOGGENFOGGER_ELIXIR_TRIGGERED3)) return false; @@ -637,13 +637,13 @@ class spell_item_noggenfogger_elixir : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_noggenfogger_elixir_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_noggenfogger_elixir_SpellScript(); } @@ -666,13 +666,13 @@ class spell_item_piccolo_of_the_flaming_fire : public SpellScriptLoader target->HandleEmoteCommand(EMOTE_STATE_DANCE); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_piccolo_of_the_flaming_fire_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_piccolo_of_the_flaming_fire_SpellScript(); } @@ -697,12 +697,12 @@ class spell_item_savory_deviate_delight : public SpellScriptLoader { PrepareSpellScript(spell_item_savory_deviate_delight_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { for (uint32 spellId = SPELL_FLIP_OUT_MALE; spellId <= SPELL_YAAARRRR_FEMALE; ++spellId) if (!sSpellMgr->GetSpellInfo(spellId)) @@ -724,13 +724,13 @@ class spell_item_savory_deviate_delight : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_savory_deviate_delight_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_savory_deviate_delight_SpellScript(); } @@ -758,7 +758,7 @@ class spell_item_scroll_of_recall : public SpellScriptLoader { PrepareSpellScript(spell_item_scroll_of_recall_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -797,13 +797,13 @@ class spell_item_scroll_of_recall : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_scroll_of_recall_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_TELEPORT_UNITS); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_scroll_of_recall_SpellScript(); } @@ -838,13 +838,13 @@ class spell_item_unsated_craving : public SpellScriptLoader return true; } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_item_unsated_craving_AuraScript::CheckProc); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_unsated_craving_AuraScript(); } @@ -869,13 +869,13 @@ class spell_item_shadows_fate : public SpellScriptLoader caster->CastSpell(target, SPELL_SOUL_FEAST, TRIGGERED_FULL_MASK); } - void Register() + void Register() OVERRIDE { OnProc += AuraProcFn(spell_item_shadows_fate_AuraScript::HandleProc); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_shadows_fate_AuraScript(); } @@ -900,7 +900,7 @@ class spell_item_shadowmourne : public SpellScriptLoader { PrepareAuraScript(spell_item_shadowmourne_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHADOWMOURNE_CHAOS_BANE_DAMAGE)) return false; @@ -934,14 +934,14 @@ class spell_item_shadowmourne : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_item_shadowmourne_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_item_shadowmourne_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_shadowmourne_AuraScript(); } @@ -957,7 +957,7 @@ class spell_item_shadowmourne_soul_fragment : public SpellScriptLoader { PrepareAuraScript(spell_item_shadowmourne_soul_fragment_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHADOWMOURNE_VISUAL_LOW) || !sSpellMgr->GetSpellInfo(SPELL_SHADOWMOURNE_VISUAL_HIGH) || !sSpellMgr->GetSpellInfo(SPELL_SHADOWMOURNE_CHAOS_BANE_BUFF)) return false; @@ -992,14 +992,14 @@ class spell_item_shadowmourne_soul_fragment : public SpellScriptLoader target->RemoveAurasDueToSpell(SPELL_SHADOWMOURNE_VISUAL_HIGH); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_item_shadowmourne_soul_fragment_AuraScript::OnStackChange, EFFECT_0, SPELL_AURA_MOD_STAT, AuraEffectHandleModes(AURA_EFFECT_HANDLE_REAL | AURA_EFFECT_HANDLE_REAPPLY)); AfterEffectRemove += AuraEffectRemoveFn(spell_item_shadowmourne_soul_fragment_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_shadowmourne_soul_fragment_AuraScript(); } @@ -1026,7 +1026,7 @@ class spell_item_six_demon_bag : public SpellScriptLoader { PrepareSpellScript(spell_item_six_demon_bag_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FROSTBOLT) || !sSpellMgr->GetSpellInfo(SPELL_POLYMORPH) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_FELHOUND_MINION) || !sSpellMgr->GetSpellInfo(SPELL_FIREBALL) || !sSpellMgr->GetSpellInfo(SPELL_CHAIN_LIGHTNING) || !sSpellMgr->GetSpellInfo(SPELL_ENVELOPING_WINDS)) return false; @@ -1064,13 +1064,13 @@ class spell_item_six_demon_bag : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_six_demon_bag_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_six_demon_bag_SpellScript(); } @@ -1093,13 +1093,13 @@ class spell_item_the_eye_of_diminution : public SpellScriptLoader amount += diff; } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_item_the_eye_of_diminution_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_THREAT); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_item_the_eye_of_diminution_AuraScript(); } @@ -1123,11 +1123,11 @@ class spell_item_underbelly_elixir : public SpellScriptLoader { PrepareSpellScript(spell_item_underbelly_elixir_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_UNDERBELLY_ELIXIR_TRIGGERED1) || !sSpellMgr->GetSpellInfo(SPELL_UNDERBELLY_ELIXIR_TRIGGERED2) || !sSpellMgr->GetSpellInfo(SPELL_UNDERBELLY_ELIXIR_TRIGGERED3)) return false; @@ -1146,13 +1146,13 @@ class spell_item_underbelly_elixir : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_underbelly_elixir_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_underbelly_elixir_SpellScript(); } @@ -1174,7 +1174,7 @@ class spell_item_red_rider_air_rifle : public SpellScriptLoader { PrepareSpellScript(spell_item_red_rider_air_rifle_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_AIR_RIFLE_HOLD_VISUAL) || !sSpellMgr->GetSpellInfo(SPELL_AIR_RIFLE_SHOOT) || !sSpellMgr->GetSpellInfo(SPELL_AIR_RIFLE_SHOOT_SELF)) return false; @@ -1198,13 +1198,13 @@ class spell_item_red_rider_air_rifle : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_red_rider_air_rifle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_red_rider_air_rifle_SpellScript(); } @@ -1249,13 +1249,13 @@ class spell_item_create_heart_candy : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_create_heart_candy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_create_heart_candy_SpellScript(); } @@ -1270,7 +1270,7 @@ class spell_item_book_of_glyph_mastery : public SpellScriptLoader { PrepareSpellScript(spell_item_book_of_glyph_mastery_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1296,14 +1296,14 @@ class spell_item_book_of_glyph_mastery : public SpellScriptLoader caster->learnSpell(discoveredSpellId, false); } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_item_book_of_glyph_mastery_SpellScript::CheckRequirement); OnEffectHitTarget += SpellEffectFn(spell_item_book_of_glyph_mastery_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_book_of_glyph_mastery_SpellScript(); } @@ -1337,13 +1337,13 @@ class spell_item_gift_of_the_harvester : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_item_gift_of_the_harvester_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_gift_of_the_harvester_SpellScript(); } @@ -1377,13 +1377,13 @@ class spell_item_map_of_the_geyser_fields : public SpellScriptLoader return SPELL_FAILED_CUSTOM_ERROR; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_item_map_of_the_geyser_fields_SpellScript::CheckSinkholes); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_map_of_the_geyser_fields_SpellScript(); } @@ -1405,7 +1405,7 @@ class spell_item_vanquished_clutches : public SpellScriptLoader { PrepareSpellScript(spell_item_vanquished_clutches_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CRUSHER) || !sSpellMgr->GetSpellInfo(SPELL_CONSTRICTOR) || !sSpellMgr->GetSpellInfo(SPELL_CORRUPTOR)) return false; @@ -1419,13 +1419,13 @@ class spell_item_vanquished_clutches : public SpellScriptLoader caster->CastSpell(caster, spellId, true); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_vanquished_clutches_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_vanquished_clutches_SpellScript(); } @@ -1456,7 +1456,7 @@ class spell_item_ashbringer : public SpellScriptLoader { PrepareSpellScript(spell_item_ashbringer_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1474,13 +1474,13 @@ class spell_item_ashbringer : public SpellScriptLoader player->PlayDirectSound(sound_id, player); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_item_ashbringer_SpellScript::OnDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_ashbringer_SpellScript(); } @@ -1532,13 +1532,13 @@ class spell_magic_eater_food : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_magic_eater_food_AuraScript::HandleTriggerSpell, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_magic_eater_food_AuraScript(); } @@ -1559,13 +1559,13 @@ class spell_item_shimmering_vessel : public SpellScriptLoader target->setDeathState(JUST_RESPAWNED); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_shimmering_vessel_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_shimmering_vessel_SpellScript(); } @@ -1586,12 +1586,12 @@ class spell_item_purify_helboar_meat : public SpellScriptLoader { PrepareSpellScript(spell_item_purify_helboar_meat_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_PURIFIED_HELBOAR_MEAT) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_TOXIC_HELBOAR_MEAT)) return false; @@ -1604,13 +1604,13 @@ class spell_item_purify_helboar_meat : public SpellScriptLoader caster->CastSpell(caster, roll_chance_i(50) ? SPELL_SUMMON_PURIFIED_HELBOAR_MEAT : SPELL_SUMMON_TOXIC_HELBOAR_MEAT, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_purify_helboar_meat_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_purify_helboar_meat_SpellScript(); } @@ -1630,7 +1630,7 @@ class spell_item_crystal_prison_dummy_dnd : public SpellScriptLoader { PrepareSpellScript(spell_item_crystal_prison_dummy_dnd_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sObjectMgr->GetGameObjectTemplate(OBJECT_IMPRISONED_DOOMGUARD)) return false; @@ -1647,13 +1647,13 @@ class spell_item_crystal_prison_dummy_dnd : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_crystal_prison_dummy_dnd_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_crystal_prison_dummy_dnd_SpellScript(); } @@ -1677,7 +1677,7 @@ class spell_item_reindeer_transformation : public SpellScriptLoader { PrepareSpellScript(spell_item_reindeer_transformation_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FLYING_REINDEER_310) || !sSpellMgr->GetSpellInfo(SPELL_FLYING_REINDEER_280) || !sSpellMgr->GetSpellInfo(SPELL_FLYING_REINDEER_60) || !sSpellMgr->GetSpellInfo(SPELL_REINDEER_100) @@ -1715,13 +1715,13 @@ class spell_item_reindeer_transformation : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_reindeer_transformation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_reindeer_transformation_SpellScript(); } @@ -1742,7 +1742,7 @@ class spell_item_nigh_invulnerability : public SpellScriptLoader { PrepareSpellScript(spell_item_nigh_invulnerability_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_NIGH_INVULNERABILITY) || !sSpellMgr->GetSpellInfo(SPELL_COMPLETE_VULNERABILITY)) return false; @@ -1761,13 +1761,13 @@ class spell_item_nigh_invulnerability : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_nigh_invulnerability_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_nigh_invulnerability_SpellScript(); } @@ -1788,7 +1788,7 @@ class spell_item_poultryizer : public SpellScriptLoader { PrepareSpellScript(spell_item_poultryizer_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_POULTRYIZER_SUCCESS) || !sSpellMgr->GetSpellInfo(SPELL_POULTRYIZER_BACKFIRE)) return false; @@ -1801,13 +1801,13 @@ class spell_item_poultryizer : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), roll_chance_i(80) ? SPELL_POULTRYIZER_SUCCESS : SPELL_POULTRYIZER_BACKFIRE, true, GetCastItem()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_poultryizer_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_poultryizer_SpellScript(); } @@ -1828,11 +1828,11 @@ class spell_item_socrethars_stone : public SpellScriptLoader { PrepareSpellScript(spell_item_socrethars_stone_SpellScript); - bool Load() + bool Load() OVERRIDE { return (GetCaster()->GetAreaId() == 3900 || GetCaster()->GetAreaId() == 3742); } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SOCRETHAR_TO_SEAT) || !sSpellMgr->GetSpellInfo(SPELL_SOCRETHAR_FROM_SEAT)) return false; @@ -1855,13 +1855,13 @@ class spell_item_socrethars_stone : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_socrethars_stone_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_socrethars_stone_SpellScript(); } @@ -1883,14 +1883,14 @@ class spell_item_demon_broiled_surprise : public SpellScriptLoader { PrepareSpellScript(spell_item_demon_broiled_surprise_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_DEMON_BROILED_SURPRISE) || !sObjectMgr->GetCreatureTemplate(NPC_ABYSSAL_FLAMEBRINGER) || !sObjectMgr->GetQuestTemplate(QUEST_SUPER_HOT_STEW)) return false; return true; } - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1913,14 +1913,14 @@ class spell_item_demon_broiled_surprise : public SpellScriptLoader return SPELL_FAILED_NOT_HERE; } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_demon_broiled_surprise_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_item_demon_broiled_surprise_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_demon_broiled_surprise_SpellScript(); } @@ -1940,7 +1940,7 @@ class spell_item_complete_raptor_capture : public SpellScriptLoader { PrepareSpellScript(spell_item_complete_raptor_capture_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_RAPTOR_CAPTURE_CREDIT)) return false; @@ -1959,13 +1959,13 @@ class spell_item_complete_raptor_capture : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_complete_raptor_capture_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_complete_raptor_capture_SpellScript(); } @@ -1986,7 +1986,7 @@ class spell_item_impale_leviroth : public SpellScriptLoader { PrepareSpellScript(spell_item_impale_leviroth_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sObjectMgr->GetCreatureTemplate(NPC_LEVIROTH)) return false; @@ -2000,13 +2000,13 @@ class spell_item_impale_leviroth : public SpellScriptLoader target->CastSpell(target, SPELL_LEVIROTH_SELF_IMPALE, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_impale_leviroth_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_impale_leviroth_SpellScript(); } @@ -2031,7 +2031,7 @@ class spell_item_brewfest_mount_transformation : public SpellScriptLoader { PrepareSpellScript(spell_item_brewfest_mount_transformation_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MOUNT_RAM_100) || !sSpellMgr->GetSpellInfo(SPELL_MOUNT_RAM_60) || !sSpellMgr->GetSpellInfo(SPELL_MOUNT_KODO_100) || !sSpellMgr->GetSpellInfo(SPELL_MOUNT_KODO_60)) return false; @@ -2067,13 +2067,13 @@ class spell_item_brewfest_mount_transformation : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_brewfest_mount_transformation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_brewfest_mount_transformation_SpellScript(); } @@ -2094,14 +2094,14 @@ class spell_item_nitro_boots : public SpellScriptLoader { PrepareSpellScript(spell_item_nitro_boots_SpellScript); - bool Load() + bool Load() OVERRIDE { if (!GetCastItem()) return false; return true; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_NITRO_BOOTS_SUCCESS) || !sSpellMgr->GetSpellInfo(SPELL_NITRO_BOOTS_BACKFIRE)) return false; @@ -2114,13 +2114,13 @@ class spell_item_nitro_boots : public SpellScriptLoader caster->CastSpell(caster, roll_chance_i(95) ? SPELL_NITRO_BOOTS_SUCCESS : SPELL_NITRO_BOOTS_BACKFIRE, true, GetCastItem()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_nitro_boots_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_nitro_boots_SpellScript(); } @@ -2141,12 +2141,12 @@ class spell_item_teach_language : public SpellScriptLoader { PrepareSpellScript(spell_item_teach_language_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_LEARN_GNOMISH_BINARY) || !sSpellMgr->GetSpellInfo(SPELL_LEARN_GOBLIN_BINARY)) return false; @@ -2161,13 +2161,13 @@ class spell_item_teach_language : public SpellScriptLoader caster->CastSpell(caster, caster->GetTeam() == ALLIANCE ? SPELL_LEARN_GNOMISH_BINARY : SPELL_LEARN_GOBLIN_BINARY, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_teach_language_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_teach_language_SpellScript(); } @@ -2187,12 +2187,12 @@ class spell_item_rocket_boots : public SpellScriptLoader { PrepareSpellScript(spell_item_rocket_boots_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ROCKET_BOOTS_PROC)) return false; @@ -2216,14 +2216,14 @@ class spell_item_rocket_boots : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_item_rocket_boots_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_item_rocket_boots_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_rocket_boots_SpellScript(); } @@ -2244,7 +2244,7 @@ class spell_item_pygmy_oil : public SpellScriptLoader { PrepareSpellScript(spell_item_pygmy_oil_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PYGMY_OIL_PYGMY_AURA) || !sSpellMgr->GetSpellInfo(SPELL_PYGMY_OIL_SMALLER_AURA)) return false; @@ -2269,13 +2269,13 @@ class spell_item_pygmy_oil : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_pygmy_oil_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_pygmy_oil_SpellScript(); } @@ -2296,13 +2296,13 @@ class spell_item_unusual_compass : public SpellScriptLoader caster->SetFacingTo(frand(0.0f, 2.0f * M_PI)); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_unusual_compass_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_unusual_compass_SpellScript(); } @@ -2325,12 +2325,12 @@ class spell_item_chicken_cover : public SpellScriptLoader { PrepareSpellScript(spell_item_chicken_cover_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CHICKEN_NET) || !sSpellMgr->GetSpellInfo(SPELL_CAPTURE_CHICKEN_ESCAPE) || !sObjectMgr->GetQuestTemplate(QUEST_CHICKEN_PARTY) || !sObjectMgr->GetQuestTemplate(QUEST_FLOWN_THE_COOP)) return false; @@ -2350,13 +2350,13 @@ class spell_item_chicken_cover : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_chicken_cover_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_chicken_cover_SpellScript(); } @@ -2395,13 +2395,13 @@ class spell_item_refocus : public SpellScriptLoader caster->RemoveSpellCooldown(SPELL_VOLLEY, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_refocus_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_refocus_SpellScript(); } @@ -2423,13 +2423,13 @@ class spell_item_muisek_vessel : public SpellScriptLoader target->DespawnOrUnsummon(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_muisek_vessel_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_muisek_vessel_SpellScript(); } @@ -2454,13 +2454,13 @@ public: GetCaster()->CastSpell(GetCaster(), SPELL_FORCE_CAST_SUMMON_GNOME_SOUL); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_item_greatmothers_soulcatcher_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_item_greatmothers_soulcatcher_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index caa40235ca7..d2a9935811d 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -87,7 +87,7 @@ enum MageIcons class spell_mage_incanters_absorbtion_base_AuraScript : public AuraScript { public: - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED)) return false; @@ -118,7 +118,7 @@ class spell_mage_blast_wave : public SpellScriptLoader { PrepareSpellScript(spell_mage_blast_wave_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_FLAMESTRIKE)) return false; @@ -146,7 +146,7 @@ class spell_mage_blast_wave : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_blast_wave_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); AfterCast += SpellCastFn(spell_mage_blast_wave_SpellScript::HandleImprovedFlamestrike); @@ -156,7 +156,7 @@ class spell_mage_blast_wave : public SpellScriptLoader uint32 _targetCount; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mage_blast_wave_SpellScript(); } @@ -172,7 +172,7 @@ class spell_mage_burnout : public SpellScriptLoader { PrepareAuraScript(spell_mage_burnout_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_BURNOUT)) return false; @@ -194,14 +194,14 @@ class spell_mage_burnout : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_MAGE_BURNOUT, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_mage_burnout_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_mage_burnout_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_burnout_AuraScript(); } @@ -261,7 +261,7 @@ class spell_mage_cold_snap : public SpellScriptLoader { PrepareSpellScript(spell_mage_cold_snap_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -286,13 +286,13 @@ class spell_mage_cold_snap : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_mage_cold_snap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mage_cold_snap_SpellScript(); } @@ -415,7 +415,7 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader { PrepareAuraScript(spell_mage_fire_frost_ward_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_FROST_WARDING_TRIGGERED)) return false; @@ -457,7 +457,7 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_fire_frost_ward_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_mage_fire_frost_ward_AuraScript::Absorb, EFFECT_0); @@ -465,7 +465,7 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_fire_frost_ward_AuraScript(); } @@ -481,14 +481,14 @@ class spell_mage_focus_magic : public SpellScriptLoader { PrepareAuraScript(spell_mage_focus_magic_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_FOCUS_MAGIC_PROC)) return false; return true; } - bool Load() + bool Load() OVERRIDE { _procTarget = NULL; return true; @@ -506,7 +506,7 @@ class spell_mage_focus_magic : public SpellScriptLoader GetTarget()->CastSpell(_procTarget, SPELL_MAGE_FOCUS_MAGIC_PROC, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_mage_focus_magic_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_mage_focus_magic_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); @@ -516,7 +516,7 @@ class spell_mage_focus_magic : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_focus_magic_AuraScript(); } @@ -585,7 +585,7 @@ class spell_mage_living_bomb : public SpellScriptLoader caster->CastSpell(GetTarget(), uint32(aurEff->GetAmount()), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_mage_living_bomb_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } @@ -625,7 +625,7 @@ class spell_mage_ice_barrier : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_ice_barrier_AuraScript(); } @@ -641,7 +641,7 @@ class spell_mage_ignite : public SpellScriptLoader { PrepareAuraScript(spell_mage_ignite_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_IGNITE)) return false; @@ -665,14 +665,14 @@ class spell_mage_ignite : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_MAGE_IGNITE, SPELLVALUE_BASE_POINT0, amount, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_mage_ignite_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_mage_ignite_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_ignite_AuraScript(); } @@ -689,7 +689,7 @@ class spell_mage_mage_ward : public SpellScriptLoader { PrepareAuraScript(spell_mage_mage_ward_AuraScript); - void HandleAbsorb(AuraEffect* /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount) + void HandleAbsorb(AuraEffect* /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount) OVERRIDE { if (AuraEffect* aurEff = GetTarget()->GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_GENERIC, ICON_MAGE_INCANTER_S_ABSORPTION, EFFECT_0)) { @@ -698,13 +698,13 @@ class spell_mage_mage_ward : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterEffectAbsorb += AuraEffectAbsorbFn(spell_mage_mage_ward_AuraScript::HandleAbsorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_mage_ward_AuraScript(); } @@ -730,20 +730,20 @@ class spell_mage_mana_shield : public SpellScriptLoader } } - void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) + void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) OVERRIDE { if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_ENEMY_SPELL) GetTarget()->CastSpell(GetTarget(), SPELL_MAGE_INCANTERS_ABSORBTION_R1, true); } - void Register() + void Register() OVERRIDE { AfterEffectManaShield += AuraEffectManaShieldFn(spell_mage_mana_shield_AuraScript::HandleAbsorb, EFFECT_0); AfterEffectRemove += AuraEffectRemoveFn(spell_mage_mana_shield_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MANA_SHIELD, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_mana_shield_AuraScript(); } @@ -759,7 +759,7 @@ class spell_mage_master_of_elements : public SpellScriptLoader { PrepareAuraScript(spell_mage_master_of_elements_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE)) return false; @@ -782,14 +782,14 @@ class spell_mage_master_of_elements : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_mage_master_of_elements_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_mage_master_of_elements_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_mage_master_of_elements_AuraScript(); } @@ -858,7 +858,7 @@ class spell_mage_polymorph_cast_visual : public SpellScriptLoader static const uint32 PolymorhForms[6]; - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { // check if spell ids exist in dbc for (uint32 i = 0; i < 6; i++) @@ -874,14 +874,14 @@ class spell_mage_polymorph_cast_visual : public SpellScriptLoader target->CastSpell(target, PolymorhForms[urand(0, 5)], true); } - void Register() + void Register() OVERRIDE { // add dummy effect spell handler to Polymorph visual OnEffectHitTarget += SpellEffectFn(spell_mage_polymorph_cast_visual_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mage_polymorph_cast_visual_SpellScript(); } @@ -1093,7 +1093,7 @@ class spell_mage_summon_water_elemental : public SpellScriptLoader { PrepareSpellScript(spell_mage_summon_water_elemental_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_GLYPH_OF_ETERNAL_WATER) || !sSpellMgr->GetSpellInfo(SPELL_MAGE_SUMMON_WATER_ELEMENTAL_TEMPORARY) || !sSpellMgr->GetSpellInfo(SPELL_MAGE_SUMMON_WATER_ELEMENTAL_PERMANENT)) return false; @@ -1118,14 +1118,14 @@ class spell_mage_summon_water_elemental : public SpellScriptLoader caster->CastSpell(caster, SPELL_MAGE_SUMMON_WATER_ELEMENTAL_TEMPORARY, true); } - void Register() + void Register() OVERRIDE { // add dummy effect spell handler to Summon Water Elemental OnEffectHit += SpellEffectFn(spell_mage_summon_water_elemental_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_mage_summon_water_elemental_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index fd4e560b1b7..1c7cd395de0 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -85,7 +85,7 @@ enum PaladinSpells PAL_SPELL_ARDENT_DEFENDER_HEAL = 66235, }; - bool Load() + bool Load() OVERRIDE { healPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(); @@ -131,14 +131,14 @@ enum PaladinSpells } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pal_ardent_defender_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_pal_ardent_defender_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_ardent_defender_AuraScript(); } @@ -154,7 +154,7 @@ class spell_pal_blessing_of_faith : public SpellScriptLoader { PrepareSpellScript(spell_pal_blessing_of_faith_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_BLESSING_OF_LOWER_CITY_DRUID) || !sSpellMgr->GetSpellInfo(SPELL_PALADIN_BLESSING_OF_LOWER_CITY_PALADIN) || !sSpellMgr->GetSpellInfo(SPELL_PALADIN_BLESSING_OF_LOWER_CITY_PRIEST) || !sSpellMgr->GetSpellInfo(SPELL_PALADIN_BLESSING_OF_LOWER_CITY_SHAMAN)) return false; @@ -188,13 +188,13 @@ class spell_pal_blessing_of_faith : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pal_blessing_of_faith_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_blessing_of_faith_SpellScript(); } @@ -211,7 +211,7 @@ class spell_pal_blessing_of_sanctuary : public SpellScriptLoader { PrepareAuraScript(spell_pal_blessing_of_sanctuary_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_BLESSING_OF_SANCTUARY_BUFF)) return false; @@ -244,7 +244,7 @@ class spell_pal_blessing_of_sanctuary : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_PALADIN_BLESSING_OF_SANCTUARY_ENERGIZE, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_pal_blessing_of_sanctuary_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); AfterEffectRemove += AuraEffectRemoveFn(spell_pal_blessing_of_sanctuary_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); @@ -253,7 +253,7 @@ class spell_pal_blessing_of_sanctuary : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_blessing_of_sanctuary_AuraScript(); } @@ -272,7 +272,7 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader uint32 groupSize, minHpPct; int32 remainingAmount; - bool Load() + bool Load() OVERRIDE { if (Unit* caster = GetCaster()) @@ -303,13 +303,13 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader caster->RemoveAura(SPELL_PALADIN_DIVINE_SACRIFICE); } - void Register() + void Register() OVERRIDE { OnEffectSplit += AuraEffectSplitFn(spell_pal_divine_sacrifice_AuraScript::Split, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_divine_sacrifice_AuraScript(); } @@ -327,14 +327,14 @@ class spell_pal_divine_storm : public SpellScriptLoader uint32 healPct; - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_DIVINE_STORM_DUMMY)) return false; return true; } - bool Load() + bool Load() OVERRIDE { healPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(GetCaster()); return true; @@ -346,13 +346,13 @@ class spell_pal_divine_storm : public SpellScriptLoader caster->CastCustomSpell(SPELL_PALADIN_DIVINE_STORM_DUMMY, SPELLVALUE_BASE_POINT0, (GetHitDamage() * healPct) / 100, caster, true); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_pal_divine_storm_SpellScript::TriggerHeal); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_divine_storm_SpellScript(); } @@ -368,7 +368,7 @@ class spell_pal_divine_storm_dummy : public SpellScriptLoader { PrepareSpellScript(spell_pal_divine_storm_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_DIVINE_STORM_HEAL)) return false; @@ -391,14 +391,14 @@ class spell_pal_divine_storm_dummy : public SpellScriptLoader private: uint32 _targetCount; - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pal_divine_storm_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pal_divine_storm_dummy_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_divine_storm_dummy_SpellScript(); } @@ -428,13 +428,13 @@ class spell_pal_exorcism_and_holy_wrath_damage : public SpellScriptLoader spellMod->value = aurEff->GetAmount(); } - void Register() + void Register() OVERRIDE { DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_pal_exorcism_and_holy_wrath_damage_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_exorcism_and_holy_wrath_damage_AuraScript(); } @@ -450,7 +450,7 @@ class spell_pal_eye_for_an_eye : public SpellScriptLoader { PrepareAuraScript(spell_pal_eye_for_an_eye_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_EYE_FOR_AN_EYE_DAMAGE)) return false; @@ -464,13 +464,13 @@ class spell_pal_eye_for_an_eye : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PALADIN_EYE_FOR_AN_EYE_DAMAGE, SPELLVALUE_BASE_POINT0, damage, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_pal_eye_for_an_eye_AuraScript::HandleEffectProc, EFFECT_0, m_scriptSpellId == SPELL_PALADIN_EYE_FOR_AN_EYE_RANK_1 ? SPELL_AURA_DUMMY : SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_eye_for_an_eye_AuraScript(); } @@ -486,7 +486,7 @@ class spell_pal_guarded_by_the_light : public SpellScriptLoader { PrepareSpellScript(spell_pal_guarded_by_the_light_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_DIVINE_PLEA)) return false; @@ -500,13 +500,13 @@ class spell_pal_guarded_by_the_light : public SpellScriptLoader aura->RefreshDuration(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pal_guarded_by_the_light_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_guarded_by_the_light_SpellScript(); } @@ -524,7 +524,7 @@ class spell_pal_hand_of_sacrifice : public SpellScriptLoader int32 remainingAmount; - bool Load() + bool Load() OVERRIDE { if (Unit* caster = GetCaster()) { @@ -544,13 +544,13 @@ class spell_pal_hand_of_sacrifice : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectSplit += AuraEffectSplitFn(spell_pal_hand_of_sacrifice_AuraScript::Split, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_hand_of_sacrifice_AuraScript(); } @@ -577,13 +577,13 @@ class spell_pal_hand_of_salvation : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pal_hand_of_salvation_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_hand_of_salvation_AuraScript(); } @@ -599,7 +599,7 @@ class spell_pal_holy_shock : public SpellScriptLoader { PrepareSpellScript(spell_pal_holy_shock_SpellScript); - bool Validate(SpellInfo const* spell) + bool Validate(SpellInfo const* spell) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_HOLY_SHOCK_R1)) return false; @@ -647,14 +647,14 @@ class spell_pal_holy_shock : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_pal_holy_shock_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_pal_holy_shock_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_holy_shock_SpellScript(); } @@ -677,13 +677,13 @@ class spell_pal_judgement_of_command : public SpellScriptLoader GetCaster()->CastSpell(unitTarget, spell_proto, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pal_judgement_of_command_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_judgement_of_command_SpellScript(); } @@ -699,7 +699,7 @@ class spell_pal_lay_on_hands : public SpellScriptLoader { PrepareSpellScript(spell_pal_lay_on_hands_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_FORBEARANCE)) return false; @@ -732,14 +732,14 @@ class spell_pal_lay_on_hands : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_pal_lay_on_hands_SpellScript::CheckCast); AfterHit += SpellHitFn(spell_pal_lay_on_hands_SpellScript::HandleScript); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_lay_on_hands_SpellScript(); } @@ -755,7 +755,7 @@ class spell_pal_righteous_defense : public SpellScriptLoader { PrepareSpellScript(spell_pal_righteous_defense_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_RIGHTEOUS_DEFENSE_TAUNT)) return false; @@ -791,7 +791,7 @@ class spell_pal_righteous_defense : public SpellScriptLoader GetCaster()->CastSpell(target, SPELL_PALADIN_RIGHTEOUS_DEFENSE_TAUNT, true); } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_pal_righteous_defense_SpellScript::CheckCast); //! WORKAROUND @@ -803,7 +803,7 @@ class spell_pal_righteous_defense : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_righteous_defense_SpellScript(); } @@ -899,13 +899,13 @@ class spell_pal_templar_s_verdict : public SpellScriptLoader SetHitDamage(damage); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pal_templar_s_verdict_SpellScript::ChangeDamage, EFFECT_0, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pal_templar_s_verdict_SpellScript(); } @@ -921,7 +921,7 @@ class spell_pal_seal_of_righteousness : public SpellScriptLoader { PrepareAuraScript(spell_pal_seal_of_righteousness_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_SEAL_OF_RIGHTEOUSNESS)) return false; @@ -944,14 +944,14 @@ class spell_pal_seal_of_righteousness : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PALADIN_SEAL_OF_RIGHTEOUSNESS, SPELLVALUE_BASE_POINT0, bp, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_pal_seal_of_righteousness_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_pal_seal_of_righteousness_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pal_seal_of_righteousness_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_pet.cpp b/src/server/scripts/Spells/spell_pet.cpp index 8c337f30ec3..cec8cc9d701 100644 --- a/src/server/scripts/Spells/spell_pet.cpp +++ b/src/server/scripts/Spells/spell_pet.cpp @@ -95,7 +95,7 @@ class spell_gen_pet_calculate : public SpellScriptLoader { PrepareAuraScript(spell_gen_pet_calculate_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -185,7 +185,7 @@ class spell_gen_pet_calculate : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { switch (m_scriptSpellId) { @@ -214,7 +214,7 @@ class spell_gen_pet_calculate : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_gen_pet_calculate_AuraScript(); } @@ -229,7 +229,7 @@ public: { PrepareAuraScript(spell_warl_pet_scaling_01_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -338,7 +338,7 @@ public: } } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectRemoveFn(spell_warl_pet_scaling_01_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectApply += AuraEffectApplyFn(spell_warl_pet_scaling_01_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); @@ -351,7 +351,7 @@ public: uint32 _tempBonus; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_scaling_01_AuraScript(); } @@ -366,7 +366,7 @@ public: { PrepareAuraScript(spell_warl_pet_scaling_02_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -451,7 +451,7 @@ public: } } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectRemoveFn(spell_warl_pet_scaling_02_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectApply += AuraEffectApplyFn(spell_warl_pet_scaling_02_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); @@ -464,7 +464,7 @@ public: uint32 _tempBonus; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_scaling_02_AuraScript(); } @@ -479,7 +479,7 @@ public: { PrepareAuraScript(spell_warl_pet_scaling_03_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -522,7 +522,7 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_03_AuraScript::CalculateFrostResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_03_AuraScript::CalculateArcaneResistanceAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE); @@ -530,7 +530,7 @@ public: } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_scaling_03_AuraScript(); } @@ -546,7 +546,7 @@ public: { PrepareAuraScript(spell_warl_pet_scaling_04_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -565,13 +565,13 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_04_AuraScript::CalculateShadowResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_scaling_04_AuraScript(); } @@ -586,7 +586,7 @@ public: { PrepareAuraScript(spell_warl_pet_scaling_05_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -638,7 +638,7 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_05_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_05_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); @@ -646,7 +646,7 @@ public: } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_scaling_05_AuraScript(); } @@ -661,7 +661,7 @@ public: { PrepareAuraScript(spell_warl_pet_passive_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -712,14 +712,14 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive_AuraScript::CalculateAmountCritSpell, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive_AuraScript::CalculateAmountCritMelee, EFFECT_1, SPELL_AURA_MOD_WEAPON_CRIT_PERCENT); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_passive_AuraScript(); } @@ -734,7 +734,7 @@ public: { PrepareAuraScript(spell_warl_pet_passive_damage_done_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -763,14 +763,14 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive_damage_done_AuraScript::CalculateAmountDamageDone, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive_damage_done_AuraScript::CalculateAmountDamageDone, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_passive_damage_done_AuraScript(); } @@ -785,7 +785,7 @@ public: { PrepareAuraScript(spell_warl_pet_passive_voidwalker_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -801,13 +801,13 @@ public: amount += /* aurEff */ect->GetAmount(); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive_voidwalker_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_pet_passive_voidwalker_AuraScript(); } @@ -823,7 +823,7 @@ public: { PrepareAuraScript(spell_sha_pet_scaling_04_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -860,14 +860,14 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_pet_scaling_04_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_pet_scaling_04_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_pet_scaling_04_AuraScript(); } @@ -980,7 +980,7 @@ public: } } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectRemoveFn(spell_hun_pet_scaling_01_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectApply += AuraEffectApplyFn(spell_hun_pet_scaling_01_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); @@ -993,7 +993,7 @@ public: uint32 _tempHealth; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_pet_scaling_01_AuraScript(); } @@ -1008,7 +1008,7 @@ public: { PrepareAuraScript(spell_hun_pet_scaling_02_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1072,7 +1072,7 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_02_AuraScript::CalculateFrostResistanceAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_02_AuraScript::CalculateFireResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); @@ -1080,7 +1080,7 @@ public: } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_pet_scaling_02_AuraScript(); } @@ -1095,7 +1095,7 @@ public: { PrepareAuraScript(spell_hun_pet_scaling_03_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1159,7 +1159,7 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_03_AuraScript::CalculateShadowResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_03_AuraScript::CalculateArcaneResistanceAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE); @@ -1167,7 +1167,7 @@ public: } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_pet_scaling_03_AuraScript(); } @@ -1182,7 +1182,7 @@ public: { PrepareAuraScript(spell_hun_pet_scaling_04_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1240,7 +1240,7 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_04_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_04_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); @@ -1248,7 +1248,7 @@ public: } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_pet_scaling_04_AuraScript(); } @@ -1263,7 +1263,7 @@ public: { PrepareAuraScript(spell_hun_pet_passive_crit_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1312,14 +1312,14 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_passive_crit_AuraScript::CalculateAmountCritSpell, EFFECT_1, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_passive_crit_AuraScript::CalculateAmountCritMelee, EFFECT_0, SPELL_AURA_MOD_WEAPON_CRIT_PERCENT); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_pet_passive_crit_AuraScript(); } @@ -1334,7 +1334,7 @@ public: { PrepareAuraScript(spell_hun_pet_passive_damage_done_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1353,13 +1353,13 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_passive_damage_done_AuraScript::CalculateAmountDamageDone, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_pet_passive_damage_done_AuraScript(); } @@ -1374,7 +1374,7 @@ public: { PrepareAuraScript(spell_hun_animal_handler_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1394,13 +1394,13 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_animal_handler_AuraScript::CalculateAmountDamageDone, EFFECT_0, SPELL_AURA_MOD_ATTACK_POWER_PCT); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_hun_animal_handler_AuraScript(); } @@ -1416,7 +1416,7 @@ public: { PrepareAuraScript(spell_dk_avoidance_passive_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1439,13 +1439,13 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_avoidance_passive_AuraScript::CalculateAvoidanceAmount, EFFECT_0, SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_avoidance_passive_AuraScript(); } @@ -1460,7 +1460,7 @@ public: { PrepareAuraScript(spell_dk_pet_scaling_01_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1537,7 +1537,7 @@ public: } } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectRemoveFn(spell_dk_pet_scaling_01_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); AfterEffectApply += AuraEffectApplyFn(spell_dk_pet_scaling_01_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); @@ -1549,7 +1549,7 @@ public: uint32 _tempHealth; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_pet_scaling_01_AuraScript(); } @@ -1564,7 +1564,7 @@ public: { PrepareAuraScript(spell_dk_pet_scaling_02_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1586,13 +1586,13 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_02_AuraScript::CalculateAmountMeleeHaste, EFFECT_1, SPELL_AURA_MELEE_SLOW); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_pet_scaling_02_AuraScript(); } @@ -1607,7 +1607,7 @@ public: { PrepareAuraScript(spell_dk_pet_scaling_03_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1648,14 +1648,14 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_03_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_03_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_pet_scaling_03_AuraScript(); } @@ -1670,7 +1670,7 @@ public: { PrepareAuraScript(spell_dk_rune_weapon_scaling_02_AuraScript); - bool Load() + bool Load() OVERRIDE { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1707,14 +1707,14 @@ public: } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_rune_weapon_scaling_02_AuraScript::CalculateDamageDoneAmount, EFFECT_0, SPELL_AURA_MOD_DAMAGE_DONE); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_rune_weapon_scaling_02_AuraScript::CalculateAmountMeleeHaste, EFFECT_1, SPELL_AURA_MELEE_SLOW); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_dk_rune_weapon_scaling_02_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index e9fae6b7b5e..bccac107be3 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -133,7 +133,7 @@ class spell_pri_divine_aegis : public SpellScriptLoader { PrepareAuraScript(spell_pri_divine_aegis_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_DIVINE_AEGIS)) return false; @@ -160,14 +160,14 @@ class spell_pri_divine_aegis : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PRIEST_DIVINE_AEGIS, SPELLVALUE_BASE_POINT0, absorb, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_pri_divine_aegis_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_pri_divine_aegis_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_divine_aegis_AuraScript(); } @@ -183,7 +183,7 @@ class spell_pri_glyph_of_prayer_of_healing : public SpellScriptLoader { PrepareAuraScript(spell_pri_glyph_of_prayer_of_healing_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_GLYPH_OF_PRAYER_OF_HEALING_HEAL)) return false; @@ -199,13 +199,13 @@ class spell_pri_glyph_of_prayer_of_healing : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_PRIEST_GLYPH_OF_PRAYER_OF_HEALING_HEAL, SPELLVALUE_BASE_POINT0, heal, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_pri_glyph_of_prayer_of_healing_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_glyph_of_prayer_of_healing_AuraScript(); } @@ -223,14 +223,14 @@ class spell_pri_guardian_spirit : public SpellScriptLoader uint32 healPct; - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_GUARDIAN_SPIRIT_HEAL)) return false; return true; } - bool Load() + bool Load() OVERRIDE { healPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); return true; @@ -255,14 +255,14 @@ class spell_pri_guardian_spirit : public SpellScriptLoader absorbAmount = dmgInfo.GetDamage(); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_guardian_spirit_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_pri_guardian_spirit_AuraScript::Absorb, EFFECT_1); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_guardian_spirit_AuraScript(); } @@ -328,13 +328,13 @@ class spell_pri_lightwell_renew : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_lightwell_renew_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_lightwell_renew_AuraScript(); } @@ -356,13 +356,13 @@ class spell_pri_mana_burn : public SpellScriptLoader unitTarget->RemoveAurasWithMechanic((1 << MECHANIC_FEAR) | (1 << MECHANIC_POLYMORPH)); } - void Register() + void Register() OVERRIDE { AfterHit += SpellHitFn(spell_pri_mana_burn_SpellScript::HandleAfterHit); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pri_mana_burn_SpellScript; } @@ -378,14 +378,14 @@ class spell_pri_mana_leech : public SpellScriptLoader { PrepareAuraScript(spell_pri_mana_leech_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_MANA_LEECH_PROC)) return false; return true; } - bool Load() + bool Load() OVERRIDE { _procTarget = NULL; return true; @@ -403,7 +403,7 @@ class spell_pri_mana_leech : public SpellScriptLoader GetTarget()->CastSpell(_procTarget, SPELL_PRIEST_MANA_LEECH_PROC, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_pri_mana_leech_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_pri_mana_leech_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); @@ -413,7 +413,7 @@ class spell_pri_mana_leech : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_mana_leech_AuraScript(); } @@ -434,13 +434,13 @@ class spell_pri_mind_sear : public SpellScriptLoader unitList.remove_if(Trinity::ObjectGUIDCheck(GetCaster()->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT))); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_mind_sear_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pri_mind_sear_SpellScript(); } @@ -464,13 +464,13 @@ class spell_pri_pain_and_suffering_proc : public SpellScriptLoader aur->GetBase()->RefreshDuration(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pri_pain_and_suffering_proc_SpellScript::HandleEffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pri_pain_and_suffering_proc_SpellScript; } @@ -486,12 +486,12 @@ class spell_pri_penance : public SpellScriptLoader { PrepareSpellScript(spell_pri_penance_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* spellInfo) + bool Validate(SpellInfo const* spellInfo) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_PENANCE_R1)) return false; @@ -534,14 +534,14 @@ class spell_pri_penance : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pri_penance_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_pri_penance_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pri_penance_SpellScript; } @@ -557,7 +557,7 @@ class spell_pri_power_word_shield : public SpellScriptLoader { PrepareAuraScript(spell_pri_power_word_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED)) return false; @@ -610,14 +610,14 @@ class spell_pri_power_word_shield : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_power_word_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); AfterEffectAbsorb += AuraEffectAbsorbFn(spell_pri_power_word_shield_AuraScript::ReflectDamage, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_power_word_shield_AuraScript(); } @@ -646,13 +646,13 @@ class spell_pri_prayer_of_mending_heal : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_pri_prayer_of_mending_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pri_prayer_of_mending_heal_SpellScript(); } @@ -711,14 +711,13 @@ class spell_pri_renew : public SpellScriptLoader { PrepareAuraScript(spell_pri_renew_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_DIVINE_TOUCH)) return false; return true; } - bool Load() { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -738,13 +737,13 @@ class spell_pri_renew : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_pri_renew_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_renew_AuraScript(); } @@ -771,13 +770,13 @@ class spell_pri_shadow_word_death : public SpellScriptLoader GetCaster()->CastCustomSpell(GetCaster(), SPELL_PRIEST_SHADOW_WORD_DEATH, &damage, 0, 0, true); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_pri_shadow_word_death_SpellScript::HandleDamage); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_pri_shadow_word_death_SpellScript(); } @@ -834,7 +833,7 @@ class spell_pri_vampiric_touch : public SpellScriptLoader { PrepareAuraScript(spell_pri_vampiric_touch_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_VAMPIRIC_TOUCH_DISPEL)) return false; @@ -853,13 +852,13 @@ class spell_pri_vampiric_touch : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterDispel += AuraDispelFn(spell_pri_vampiric_touch_AuraScript::HandleDispel); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_pri_vampiric_touch_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 5b55b532566..d87278cefc0 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -61,7 +61,7 @@ class spell_generic_quest_update_entry_SpellScript : public SpellScript } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_generic_quest_update_entry_SpellScript::HandleDummy, _effIndex, _spellEffect); } @@ -80,7 +80,7 @@ class spell_q55_sacred_cleansing : public SpellScriptLoader public: spell_q55_sacred_cleansing() : SpellScriptLoader("spell_q55_sacred_cleansing") { } - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_generic_quest_update_entry_SpellScript(SPELL_EFFECT_DUMMY, EFFECT_1, NPC_MORBENT, NPC_WEAKENED_MORBENT, true); } @@ -101,7 +101,7 @@ class spell_q2203_thaumaturgy_channel : public SpellScriptLoader { PrepareAuraScript(spell_q2203_thaumaturgy_channel_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_THAUMATURGY_CHANNEL)) return false; @@ -115,13 +115,13 @@ class spell_q2203_thaumaturgy_channel : public SpellScriptLoader caster->CastSpell(caster, SPELL_THAUMATURGY_CHANNEL, false); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q2203_thaumaturgy_channel_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_q2203_thaumaturgy_channel_AuraScript(); } @@ -144,12 +144,12 @@ class spell_q5206_test_fetid_skull : public SpellScriptLoader { PrepareSpellScript(spell_q5206_test_fetid_skull_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_RESONATING_SKULL) || !sSpellMgr->GetSpellInfo(SPELL_CREATE_BONE_DUST)) return false; @@ -163,13 +163,13 @@ class spell_q5206_test_fetid_skull : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q5206_test_fetid_skull_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q5206_test_fetid_skull_SpellScript(); } @@ -196,7 +196,7 @@ class spell_q6124_6129_apply_salve : public SpellScriptLoader { PrepareSpellScript(spell_q6124_6129_apply_salve_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -227,13 +227,13 @@ class spell_q6124_6129_apply_salve : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q6124_6129_apply_salve_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q6124_6129_apply_salve_SpellScript(); } @@ -252,7 +252,7 @@ class spell_q10255_administer_antidote : public SpellScriptLoader public: spell_q10255_administer_antidote() : SpellScriptLoader("spell_q10255_administer_antidote") { } - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_generic_quest_update_entry_SpellScript(SPELL_EFFECT_DUMMY, EFFECT_0, NPC_HELBOAR, NPC_DREADTUSK, true); } @@ -288,7 +288,7 @@ class spell_q11396_11399_force_shield_arcane_purple_x3 : public SpellScriptLoade GetTarget()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); @@ -296,7 +296,7 @@ class spell_q11396_11399_force_shield_arcane_purple_x3 : public SpellScriptLoade }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript(); } @@ -312,7 +312,7 @@ class spell_q11396_11399_scourging_crystal_controller : public SpellScriptLoader { PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3) || !sSpellMgr->GetSpellInfo(SPELL_SCOURGING_CRYSTAL_CONTROLLER)) return false; @@ -328,13 +328,13 @@ class spell_q11396_11399_scourging_crystal_controller : public SpellScriptLoader GetCaster()->CastSpell(target, SPELL_SCOURGING_CRYSTAL_CONTROLLER, true, GetCastItem()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q11396_11399_scourging_crystal_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q11396_11399_scourging_crystal_controller_SpellScript(); }; @@ -350,7 +350,7 @@ class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScript { PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3)) return false; @@ -364,13 +364,13 @@ class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScript target->RemoveAurasDueToSpell(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript(); }; @@ -389,7 +389,7 @@ class spell_q11515_fel_siphon_dummy : public SpellScriptLoader public: spell_q11515_fel_siphon_dummy() : SpellScriptLoader("spell_q11515_fel_siphon_dummy") { } - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_generic_quest_update_entry_SpellScript(SPELL_EFFECT_DUMMY, EFFECT_0, NPC_FELBLOOD_INITIATE, NPC_EMACIATED_FELBLOOD, true); } @@ -413,7 +413,7 @@ class spell_q11587_arcane_prisoner_rescue : public SpellScriptLoader { PrepareSpellScript(spell_q11587_arcane_prisoner_rescue_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_ARCANE_PRISONER_MALE) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_ARCANE_PRISONER_FEMALE) || !sSpellMgr->GetSpellInfo(SPELL_ARCANE_PRISONER_KILL_CREDIT)) return false; @@ -433,13 +433,13 @@ class spell_q11587_arcane_prisoner_rescue : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q11587_arcane_prisoner_rescue_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q11587_arcane_prisoner_rescue_SpellScript(); } @@ -471,12 +471,12 @@ class spell_q11730_ultrasonic_screwdriver : public SpellScriptLoader { PrepareSpellScript(spell_q11730_ultrasonic_screwdriver_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER && GetCastItem(); } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_SCAVENGEBOT_004A8) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_SENTRYBOT_57K) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_DEFENDOTANK_66D) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_SCAVENGEBOT_005B6) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_55D_COLLECTATRON) || !sSpellMgr->GetSpellInfo(SPELL_ROBOT_KILL_CREDIT)) return false; @@ -506,13 +506,13 @@ class spell_q11730_ultrasonic_screwdriver : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q11730_ultrasonic_screwdriver_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q11730_ultrasonic_screwdriver_SpellScript(); } @@ -557,13 +557,13 @@ class spell_q12459_seeds_of_natures_wrath : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12459_seeds_of_natures_wrath_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12459_seeds_of_natures_wrath_SpellScript(); } @@ -588,7 +588,7 @@ class spell_q12634_despawn_fruit_tosser : public SpellScriptLoader { PrepareSpellScript(spell_q12634_despawn_fruit_tosser_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_BANANAS_FALL_TO_GROUND) || !sSpellMgr->GetSpellInfo(SPELL_ORANGE_FALLS_TO_GROUND) || !sSpellMgr->GetSpellInfo(SPELL_PAPAYA_FALLS_TO_GROUND) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_ADVENTUROUS_DWARF)) return false; @@ -609,13 +609,13 @@ class spell_q12634_despawn_fruit_tosser : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), spellId, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q12634_despawn_fruit_tosser_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12634_despawn_fruit_tosser_SpellScript(); } @@ -644,13 +644,13 @@ class spell_q12683_take_sputum_sample : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q12683_take_sputum_sample_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12683_take_sputum_sample_SpellScript(); } @@ -705,14 +705,14 @@ class spell_q12851_going_bearback : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_q12851_going_bearback_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_q12851_going_bearback_AuraScript(); } @@ -735,12 +735,12 @@ class spell_q12937_relief_for_the_fallen : public SpellScriptLoader { PrepareSpellScript(spell_q12937_relief_for_the_fallen_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_TRIGGER_AID_OF_THE_EARTHEN)) return false; @@ -758,13 +758,13 @@ class spell_q12937_relief_for_the_fallen : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12937_relief_for_the_fallen_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12937_relief_for_the_fallen_SpellScript(); } @@ -786,7 +786,7 @@ class spell_q10041_q10040_who_are_they : public SpellScriptLoader { PrepareSpellScript(spell_q10041_q10040_who_are_they_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_MALE_DISGUISE) || !sSpellMgr->GetSpellInfo(SPELL_FEMALE_DISGUISE) || !sSpellMgr->GetSpellInfo(SPELL_GENERIC_DISGUISE)) return false; @@ -803,13 +803,13 @@ class spell_q10041_q10040_who_are_they : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q10041_q10040_who_are_they_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q10041_q10040_who_are_they_SpellScript(); } @@ -845,13 +845,13 @@ class spell_symbol_of_life_dummy : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_symbol_of_life_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_symbol_of_life_dummy_SpellScript(); }; @@ -873,7 +873,7 @@ class spell_q12659_ahunaes_knife : public SpellScriptLoader { PrepareSpellScript(spell_q12659_ahunaes_knife_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -888,13 +888,13 @@ class spell_q12659_ahunaes_knife : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12659_ahunaes_knife_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12659_ahunaes_knife_SpellScript(); }; @@ -917,7 +917,7 @@ class spell_q9874_liquid_fire : public SpellScriptLoader { PrepareSpellScript(spell_q9874_liquid_fire_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -934,13 +934,13 @@ class spell_q9874_liquid_fire : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q9874_liquid_fire_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q9874_liquid_fire_SpellScript(); }; @@ -962,7 +962,7 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader { PrepareSpellScript(spell_q12805_lifeblood_dummy_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -978,13 +978,13 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12805_lifeblood_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12805_lifeblood_dummy_SpellScript(); }; @@ -1018,13 +1018,13 @@ class spell_q13280_13283_plant_battle_standard: public SpellScriptLoader player->ToPlayer()->KilledMonsterCredit(NPC_KING_OF_THE_MOUNTAINT_KC, 0); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q13280_13283_plant_battle_standard_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q13280_13283_plant_battle_standard_SpellScript(); } @@ -1047,7 +1047,7 @@ class spell_q14112_14145_chum_the_water: public SpellScriptLoader { PrepareSpellScript(spell_q14112_14145_chum_the_water_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) + bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SUMMON_ANGRY_KVALDIR) || !sSpellMgr->GetSpellInfo(SUMMON_NORTH_SEA_MAKO) || !sSpellMgr->GetSpellInfo(SUMMON_NORTH_SEA_THRESHER) || !sSpellMgr->GetSpellInfo(SUMMON_NORTH_SEA_BLUE_SHARK)) return false; @@ -1060,13 +1060,13 @@ class spell_q14112_14145_chum_the_water: public SpellScriptLoader caster->CastSpell(caster, RAND(SUMMON_ANGRY_KVALDIR, SUMMON_NORTH_SEA_MAKO, SUMMON_NORTH_SEA_THRESHER, SUMMON_NORTH_SEA_BLUE_SHARK)); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q14112_14145_chum_the_water_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q14112_14145_chum_the_water_SpellScript(); } @@ -1089,7 +1089,7 @@ class spell_q9452_cast_net: public SpellScriptLoader { PrepareSpellScript(spell_q9452_cast_net_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1103,13 +1103,13 @@ class spell_q9452_cast_net: public SpellScriptLoader caster->CastSpell(caster, SPELL_NEW_SUMMON_TEST, true); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q9452_cast_net_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q9452_cast_net_SpellScript(); } @@ -1117,7 +1117,11 @@ class spell_q9452_cast_net: public SpellScriptLoader #define SAY_1 "Sons of Hodir! I humbly present to you..." #define SAY_2 "The Helm of Hodir!" -#define NPC_KILLCREDIT 30210 // Hodir's Helm KC Bunny + +enum HodirsHelm +{ + NPC_KILLCREDIT = 30210 // Hodir's Helm KC Bunny +}; class spell_q12987_read_pronouncement : public SpellScriptLoader { @@ -1139,13 +1143,13 @@ public: } } - void Register() + void Register() OVERRIDE { AfterEffectApply += AuraEffectApplyFn(spell_q12987_read_pronouncement_AuraScript::OnApply, EFFECT_0, SPELL_AURA_NONE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_q12987_read_pronouncement_AuraScript(); } @@ -1196,13 +1200,13 @@ class spell_q12277_wintergarde_mine_explosion : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12277_wintergarde_mine_explosion_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12277_wintergarde_mine_explosion_SpellScript(); } @@ -1228,13 +1232,13 @@ public: target->CastSpell(GetCaster(), SPELL_BUNNY_CREDIT_BEAM, false); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12066_bunny_kill_credit_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12066_bunny_kill_credit_SpellScript(); } @@ -1279,13 +1283,13 @@ class spell_q12735_song_of_cleansing : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12735_song_of_cleansing_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12735_song_of_cleansing_SpellScript(); } @@ -1310,13 +1314,13 @@ class spell_q12372_cast_from_gossip_trigger : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_SUMMON_WYRMREST_DEFENDER, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12372_cast_from_gossip_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12372_cast_from_gossip_trigger_SpellScript(); } @@ -1351,13 +1355,13 @@ class spell_q12372_destabilize_azure_dragonshrine_dummy : public SpellScriptLoad player->KilledMonsterCredit(NPC_WYRMREST_TEMPLE_CREDIT, 0); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript(); } @@ -1379,13 +1383,13 @@ class spell_q12372_azure_on_death_force_whisper : public SpellScriptLoader defender->AI()->Talk(WHISPER_ON_HIT_BY_FORCE_WHISPER, defender->GetCharmerOrOwnerGUID()); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12372_azure_on_death_force_whisper_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12372_azure_on_death_force_whisper_SpellScript(); } @@ -1419,13 +1423,13 @@ class spell_q11010_q11102_q11023_aggro_check_aura : public SpellScriptLoader target->CastSpell(target, SPELL_AGGRO_CHECK); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q11010_q11102_q11023_aggro_check_aura_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_q11010_q11102_q11023_aggro_check_aura_AuraScript(); } @@ -1449,13 +1453,13 @@ class spell_q11010_q11102_q11023_aggro_check : public SpellScriptLoader playerTarget->CastSpell(playerTarget, SPELL_FLAK_CANNON_TRIGGER, TRIGGERED_IGNORE_CASTER_MOUNTED_OR_ON_VEHICLE); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q11010_q11102_q11023_aggro_check_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q11010_q11102_q11023_aggro_check_SpellScript(); } @@ -1478,13 +1482,13 @@ class spell_q11010_q11102_q11023_aggro_burst : public SpellScriptLoader target->CastSpell(target, SPELL_CHOOSE_LOC); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q11010_q11102_q11023_aggro_burst_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_q11010_q11102_q11023_aggro_burst_AuraScript(); } @@ -1515,13 +1519,13 @@ class spell_q11010_q11102_q11023_choose_loc : public SpellScriptLoader caster->SummonCreature(NPC_FEL_CANNON2, (*itr)->GetPositionX(), (*itr)->GetPositionY(), (*itr)->GetPositionZ()); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q11010_q11102_q11023_choose_loc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q11010_q11102_q11023_choose_loc_SpellScript(); } @@ -1547,13 +1551,13 @@ class spell_q11010_q11102_q11023_q11008_check_fly_mount : public SpellScriptLoad return SPELL_CAST_OK; } - void Register() + void Register() OVERRIDE { OnCheckCast += SpellCheckCastFn(spell_q11010_q11102_q11023_q11008_check_fly_mount_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q11010_q11102_q11023_q11008_check_fly_mount_SpellScript(); } @@ -1573,7 +1577,7 @@ class spell_q12527_zuldrak_rat : public SpellScriptLoader { PrepareSpellScript(spell_q12527_zuldrak_rat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_GORGED_LURKING_BASILISK)) return false; @@ -1590,13 +1594,13 @@ class spell_q12527_zuldrak_rat : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q12527_zuldrak_rat_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12527_zuldrak_rat_SpellScript(); } @@ -1621,13 +1625,13 @@ class spell_q12661_q12669_q12676_q12677_q12713_summon_stefan : public SpellScrip GetHitDest()->RelocateOffset(offset); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q12661_q12669_q12676_q12677_q12713_summon_stefan_SpellScript::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q12661_q12669_q12676_q12677_q12713_summon_stefan_SpellScript(); } @@ -1647,7 +1651,7 @@ class spell_q12730_quenching_mist : public SpellScriptLoader { PrepareAuraScript(spell_q12730_quenching_mist_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_FLICKERING_FLAMES)) return false; @@ -1659,13 +1663,13 @@ class spell_q12730_quenching_mist : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(SPELL_FLICKERING_FLAMES); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q12730_quenching_mist_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_q12730_quenching_mist_AuraScript(); } @@ -1690,7 +1694,7 @@ class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy : public { PrepareSpellScript(spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_RIDE)) return false; @@ -1707,13 +1711,13 @@ class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy : public GetHitCreature()->CastSpell(GetCaster(), SPELL_RIDE, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript(); } @@ -1738,13 +1742,13 @@ class spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon : public S GetHitDest()->RelocateOffset(offset); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon_SpellScript::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon_SpellScript(); } @@ -1769,7 +1773,7 @@ class spell_q12847_summon_soul_moveto_bunny : public SpellScriptLoader GetHitDest()->RelocateOffset(offset); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_q12847_summon_soul_moveto_bunny_SpellScript::ChangeSummonPos, EFFECT_0, SPELL_EFFECT_SUMMON); } diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 12a5afb1683..a591209f6c6 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -52,14 +52,14 @@ class spell_rog_blade_flurry : public SpellScriptLoader { PrepareAuraScript(spell_rog_blade_flurry_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_BLADE_FLURRY_EXTRA_ATTACK)) return false; return true; } - bool Load() + bool Load() OVERRIDE { _procTarget = NULL; return true; @@ -81,7 +81,7 @@ class spell_rog_blade_flurry : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_rog_blade_flurry_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_rog_blade_flurry_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE); @@ -91,7 +91,7 @@ class spell_rog_blade_flurry : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rog_blade_flurry_AuraScript(); } @@ -109,14 +109,14 @@ class spell_rog_cheat_death : public SpellScriptLoader uint32 absorbChance; - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_CHEAT_DEATH_COOLDOWN)) return false; return true; } - bool Load() + bool Load() OVERRIDE { absorbChance = GetSpellInfo()->Effects[EFFECT_0].CalcValue(); return GetUnitOwner()->ToPlayer(); @@ -147,14 +147,14 @@ class spell_rog_cheat_death : public SpellScriptLoader absorbAmount = dmgInfo.GetDamage(); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_cheat_death_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_rog_cheat_death_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rog_cheat_death_AuraScript(); } @@ -170,7 +170,7 @@ class spell_rog_deadly_poison : public SpellScriptLoader { PrepareSpellScript(spell_rog_deadly_poison_SpellScript); - bool Load() + bool Load() OVERRIDE { _stackAmount = 0; // at this point CastItem must already be initialized @@ -242,7 +242,7 @@ class spell_rog_deadly_poison : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { BeforeHit += SpellHitFn(spell_rog_deadly_poison_SpellScript::HandleBeforeHit); AfterHit += SpellHitFn(spell_rog_deadly_poison_SpellScript::HandleAfterHit); @@ -251,7 +251,7 @@ class spell_rog_deadly_poison : public SpellScriptLoader uint8 _stackAmount; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_rog_deadly_poison_SpellScript(); } @@ -269,7 +269,7 @@ class spell_rog_nerves_of_steel : public SpellScriptLoader uint32 absorbPct; - bool Load() + bool Load() OVERRIDE { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -288,14 +288,14 @@ class spell_rog_nerves_of_steel : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_nerves_of_steel_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); OnEffectAbsorb += AuraEffectAbsorbFn(spell_rog_nerves_of_steel_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rog_nerves_of_steel_AuraScript(); } @@ -311,12 +311,12 @@ class spell_rog_preparation : public SpellScriptLoader { PrepareSpellScript(spell_rog_preparation_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_GLYPH_OF_PREPARATION)) return false; @@ -356,13 +356,13 @@ class spell_rog_preparation : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_rog_preparation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_rog_preparation_SpellScript(); } @@ -378,7 +378,7 @@ class spell_rog_prey_on_the_weak : public SpellScriptLoader { PrepareAuraScript(spell_rog_prey_on_the_weak_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_PREY_ON_THE_WEAK)) return false; @@ -401,13 +401,13 @@ class spell_rog_prey_on_the_weak : public SpellScriptLoader target->RemoveAurasDueToSpell(SPELL_ROGUE_PREY_ON_THE_WEAK); } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_prey_on_the_weak_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rog_prey_on_the_weak_AuraScript(); } @@ -472,7 +472,7 @@ class spell_rog_rupture : public SpellScriptLoader { PrepareAuraScript(spell_rog_rupture_AuraScript); - bool Load() + bool Load() OVERRIDE { Unit* caster = GetCaster(); return caster && caster->GetTypeId() == TYPEID_PLAYER; @@ -502,13 +502,13 @@ class spell_rog_rupture : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_rupture_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rog_rupture_AuraScript(); } @@ -524,12 +524,12 @@ class spell_rog_shiv : public SpellScriptLoader { PrepareSpellScript(spell_rog_shiv_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_SHIV_TRIGGERED)) return false; @@ -543,13 +543,13 @@ class spell_rog_shiv : public SpellScriptLoader caster->CastSpell(unitTarget, SPELL_ROGUE_SHIV_TRIGGERED, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_rog_shiv_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_rog_shiv_SpellScript(); } @@ -565,7 +565,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader { PrepareAuraScript(spell_rog_tricks_of_the_trade_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_TRICKS_OF_THE_TRADE_DMG_BOOST)) return false; @@ -574,7 +574,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader return true; } - bool Load() + bool Load() OVERRIDE { _redirectTarget = NULL; return true; @@ -602,7 +602,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader Remove(AURA_REMOVE_BY_DEFAULT); // maybe handle by proc charges } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_rog_tricks_of_the_trade_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); DoCheckProc += AuraCheckProcFn(spell_rog_tricks_of_the_trade_AuraScript::CheckProc); @@ -613,7 +613,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader Unit* _redirectTarget; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rog_tricks_of_the_trade_AuraScript(); } @@ -634,13 +634,13 @@ class spell_rog_tricks_of_the_trade_proc : public SpellScriptLoader GetTarget()->ResetRedirectThreat(); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_rog_tricks_of_the_trade_proc_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_rog_tricks_of_the_trade_proc_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index e036a476cbd..21304283507 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -76,7 +76,7 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader { PrepareSpellScript(spell_sha_ancestral_awakening_proc_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_ANCESTRAL_AWAKENING_PROC)) return false; @@ -90,13 +90,13 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader GetCaster()->CastCustomSpell(GetHitUnit(), SPELL_SHAMAN_ANCESTRAL_AWAKENING_PROC, &damage, NULL, NULL, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sha_ancestral_awakening_proc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_ancestral_awakening_proc_SpellScript(); } @@ -113,7 +113,7 @@ class spell_sha_bloodlust : public SpellScriptLoader { PrepareSpellScript(spell_sha_bloodlust_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_SATED)) return false; @@ -133,7 +133,7 @@ class spell_sha_bloodlust : public SpellScriptLoader target->CastSpell(target, SPELL_SHAMAN_SATED, true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_RAID); @@ -142,7 +142,7 @@ class spell_sha_bloodlust : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_bloodlust_SpellScript(); } @@ -159,7 +159,7 @@ class spell_sha_chain_heal : public SpellScriptLoader { PrepareSpellScript(spell_sha_chain_heal_SpellScript); - bool Load() + bool Load() OVERRIDE { firstHeal = true; riptide = false; @@ -189,7 +189,7 @@ class spell_sha_chain_heal : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sha_chain_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } @@ -199,7 +199,7 @@ class spell_sha_chain_heal : public SpellScriptLoader uint32 amount; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_chain_heal_SpellScript(); } @@ -215,7 +215,7 @@ class spell_sha_earth_shield : public SpellScriptLoader { PrepareAuraScript(spell_sha_earth_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EARTH_SHIELD_HEAL)) return false; @@ -254,14 +254,14 @@ class spell_sha_earth_shield : public SpellScriptLoader player->AddSpellCooldown(SPELL_SHAMAN_EARTH_SHIELD_HEAL, 0, time(NULL) + 3); } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_earth_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_DUMMY); OnEffectProc += AuraEffectProcFn(spell_sha_earth_shield_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_earth_shield_AuraScript(); } @@ -278,7 +278,7 @@ class spell_sha_earthbind_totem : public SpellScriptLoader { PrepareAuraScript(spell_sha_earthbind_totem_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TOTEM_EARTHBIND_TOTEM) || !sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TOTEM_EARTHEN_POWER)) return false; @@ -310,14 +310,14 @@ class spell_sha_earthbind_totem : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectPeriodic += AuraEffectPeriodicFn(spell_sha_earthbind_totem_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectApply += AuraEffectApplyFn(spell_sha_earthbind_totem_AuraScript::Apply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_earthbind_totem_AuraScript(); } @@ -355,13 +355,13 @@ class spell_sha_earthen_power : public SpellScriptLoader unitList.remove_if(EarthenPowerTargetSelector()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_earthen_power_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_earthen_power_SpellScript(); } @@ -377,7 +377,7 @@ class spell_sha_feedback : public SpellScriptLoader { PrepareAuraScript(spell_sha_feedback_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_ELEMENTAL_MASTERY)) return false; @@ -427,13 +427,13 @@ class spell_sha_fire_nova : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sha_fire_nova_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_fire_nova_SpellScript(); } @@ -450,7 +450,7 @@ class spell_sha_flame_shock : public SpellScriptLoader { PrepareAuraScript(spell_sha_flame_shock_AuraScript); - bool Validate(SpellInfo const* /*spell*/) + bool Validate(SpellInfo const* /*spell*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_LAVA_FLOWS_R1)) return false; @@ -475,13 +475,13 @@ class spell_sha_flame_shock : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterDispel += AuraDispelFn(spell_sha_flame_shock_AuraScript::HandleDispel); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_flame_shock_AuraScript(); } @@ -536,7 +536,7 @@ class spell_sha_healing_stream_totem : public SpellScriptLoader { PrepareSpellScript(spell_sha_healing_stream_totem_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { return sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TOTEM_HEALING_STREAM_HEAL); } @@ -563,13 +563,13 @@ class spell_sha_healing_stream_totem : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sha_healing_stream_totem_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_healing_stream_totem_SpellScript(); } @@ -586,7 +586,7 @@ class spell_sha_heroism : public SpellScriptLoader { PrepareSpellScript(spell_sha_heroism_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EXHAUSTION)) return false; @@ -606,7 +606,7 @@ class spell_sha_heroism : public SpellScriptLoader target->CastSpell(target, SPELL_SHAMAN_EXHAUSTION, true); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_RAID); @@ -615,7 +615,7 @@ class spell_sha_heroism : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_heroism_SpellScript(); } @@ -632,7 +632,7 @@ class spell_sha_lava_lash : public SpellScriptLoader { PrepareSpellScript(spell_sha_lava_lash_SpellScript) - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -653,14 +653,14 @@ class spell_sha_lava_lash : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sha_lava_lash_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_lava_lash_SpellScript(); } @@ -675,7 +675,7 @@ class spell_sha_lava_surge : public SpellScriptLoader { PrepareAuraScript(spell_sha_lava_surge_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_LAVA_SURGE)) return false; @@ -726,14 +726,14 @@ class spell_sha_lava_surge_proc : public SpellScriptLoader GetCaster()->ToPlayer()->RemoveSpellCooldown(SPELL_SHAMAN_LAVA_BURST, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sha_lava_surge_proc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_lava_surge_proc_SpellScript(); } @@ -780,7 +780,7 @@ class spell_sha_rolling_thunder : public SpellScriptLoader { PrepareAuraScript(spell_sha_rolling_thunder_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_LIGHTNING_SHIELD)) return false; @@ -796,13 +796,13 @@ class spell_sha_rolling_thunder : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_sha_rolling_thunder_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_rolling_thunder_AuraScript(); } @@ -818,14 +818,14 @@ class spell_sha_telluric_currents : public SpellScriptLoader { PrepareAuraScript(spell_sha_telluric_currents_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TELLURIC_CURRENTS)) return false; return true; } - void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) + void HandleEffectProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) OVERRIDE { PreventDefaultAction(); int32 basePoints0 = CalculatePct(eventInfo.GetDamageInfo()->GetDamage(), aurEff->GetAmount()); @@ -833,13 +833,13 @@ class spell_sha_telluric_currents : public SpellScriptLoader GetTarget()->CastCustomSpell(GetTarget(), SPELL_SHAMAN_TELLURIC_CURRENTS, &basePoints0, NULL, NULL, true); } - void Register() + void Register() OVERRIDE { OnEffectProc += AuraEffectProcFn(spell_sha_telluric_currents_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_sha_telluric_currents_AuraScript(); } @@ -862,13 +862,13 @@ class spell_sha_thunderstorm : public SpellScriptLoader PreventHitDefaultEffect(effIndex); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_sha_thunderstorm_SpellScript::HandleKnockBack, EFFECT_2, SPELL_EFFECT_KNOCK_BACK); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_sha_thunderstorm_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index d05ee843d44..5b76f06c195 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -80,7 +80,7 @@ class spell_warl_banish : public SpellScriptLoader { PrepareSpellScript(spell_warl_banish_SpellScript); - bool Load() + bool Load() OVERRIDE { _removed = false; return true; @@ -109,7 +109,7 @@ class spell_warl_banish : public SpellScriptLoader PreventHitAura(); } - void Register() + void Register() OVERRIDE { BeforeHit += SpellHitFn(spell_warl_banish_SpellScript::HandleBanish); AfterHit += SpellHitFn(spell_warl_banish_SpellScript::RemoveAura); @@ -118,7 +118,7 @@ class spell_warl_banish : public SpellScriptLoader bool _removed; }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_banish_SpellScript(); } @@ -171,7 +171,7 @@ class spell_warl_create_healthstone : public SpellScriptLoader static uint32 const iTypes[8][3]; - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_IMPROVED_HEALTHSTONE_R1) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_IMPROVED_HEALTHSTONE_R2)) return false; @@ -218,14 +218,14 @@ class spell_warl_create_healthstone : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warl_create_healthstone_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); OnCheckCast += SpellCheckCastFn(spell_warl_create_healthstone_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_create_healthstone_SpellScript(); } @@ -254,14 +254,14 @@ class spell_warl_bane_of_doom : public SpellScriptLoader { PrepareAuraScript(spell_warl_curse_of_doom_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_BANE_OF_DOOM_EFFECT)) return false; return true; } - bool Load() + bool Load() OVERRIDE { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -279,13 +279,13 @@ class spell_warl_bane_of_doom : public SpellScriptLoader GetCaster()->CastSpell(GetTarget(), SPELL_WARLOCK_BANE_OF_DOOM_EFFECT, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { AfterEffectRemove += AuraEffectRemoveFn(spell_warl_curse_of_doom_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_curse_of_doom_AuraScript(); } @@ -331,14 +331,14 @@ class spell_warl_demonic_circle_summon : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectApplyFn(spell_warl_demonic_circle_summon_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); OnEffectPeriodic += AuraEffectPeriodicFn(spell_warl_demonic_circle_summon_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_demonic_circle_summon_AuraScript(); } @@ -367,13 +367,13 @@ class spell_warl_demonic_circle_teleport : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_warl_demonic_circle_teleport_AuraScript::HandleTeleport, EFFECT_0, SPELL_AURA_MECHANIC_IMMUNITY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_demonic_circle_teleport_AuraScript(); } @@ -457,7 +457,7 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader { PrepareSpellScript(spell_warl_demonic_empowerment_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_SUCCUBUS) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_VOIDWALKER) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_FELGUARD) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_FELHUNTER) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMONIC_EMPOWERMENT_IMP)) return false; @@ -497,13 +497,13 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warl_demonic_empowerment_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_demonic_empowerment_SpellScript(); } @@ -528,13 +528,13 @@ class spell_warl_everlasting_affliction : public SpellScriptLoader aur->GetBase()->RefreshDuration(); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warl_everlasting_affliction_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_everlasting_affliction_SpellScript(); } @@ -587,7 +587,7 @@ class spell_warl_fel_synergy : public SpellScriptLoader { PrepareAuraScript(spell_warl_fel_synergy_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_FEL_SYNERGY_HEAL)) return false; @@ -607,14 +607,14 @@ class spell_warl_fel_synergy : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_WARLOCK_FEL_SYNERGY_HEAL, SPELLVALUE_BASE_POINT0, heal, (Unit*)NULL, true, NULL, aurEff); // TARGET_UNIT_PET } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_warl_fel_synergy_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_warl_fel_synergy_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_fel_synergy_AuraScript(); } @@ -638,7 +638,7 @@ class spell_warl_haunt : public SpellScriptLoader aurEff->SetAmount(CalculatePct(aurEff->GetAmount(), GetHitDamage())); } - void Register() + void Register() OVERRIDE { OnHit += SpellHitFn(spell_warl_haunt_SpellScript::HandleOnHit); } @@ -648,7 +648,7 @@ class spell_warl_haunt : public SpellScriptLoader { PrepareAuraScript(spell_warl_haunt_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_HAUNT_HEAL)) return false; @@ -664,18 +664,18 @@ class spell_warl_haunt : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectApplyFn(spell_warl_haunt_AuraScript::HandleRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_haunt_SpellScript(); } - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_haunt_AuraScript(); } @@ -712,14 +712,14 @@ class spell_warl_health_funnel : public SpellScriptLoader target->RemoveAurasDueToSpell(SPELL_WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R2); } - void Register() + void Register() OVERRIDE { OnEffectRemove += AuraEffectRemoveFn(spell_warl_health_funnel_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); OnEffectApply += AuraEffectApplyFn(spell_warl_health_funnel_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_health_funnel_AuraScript(); } @@ -736,12 +736,12 @@ class spell_warl_life_tap : public SpellScriptLoader { PrepareSpellScript(spell_warl_life_tap_SpellScript); - bool Load() + bool Load() OVERRIDE { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_LIFE_TAP_ENERGIZE) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_LIFE_TAP_ENERGIZE_2)) return false; @@ -782,14 +782,14 @@ class spell_warl_life_tap : public SpellScriptLoader return SPELL_FAILED_FIZZLE; } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warl_life_tap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); OnCheckCast += SpellCheckCastFn(spell_warl_life_tap_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_life_tap_SpellScript(); } @@ -811,13 +811,13 @@ class spell_warl_ritual_of_doom_effect : public SpellScriptLoader caster->CastSpell(caster, GetEffectValue(), true); } - void Register() + void Register() OVERRIDE { OnEffectHit += SpellEffectFn(spell_warl_ritual_of_doom_effect_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_ritual_of_doom_effect_SpellScript(); } @@ -840,13 +840,13 @@ class spell_warl_seed_of_corruption : public SpellScriptLoader targets.remove(GetExplTargetUnit()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warl_seed_of_corruption_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_seed_of_corruption_SpellScript(); } @@ -877,13 +877,13 @@ class spell_warl_shadow_ward : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_shadow_ward_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_shadow_ward_AuraScript(); } @@ -899,7 +899,7 @@ class spell_warl_siphon_life : public SpellScriptLoader { PrepareAuraScript(spell_warl_siphon_life_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SIPHON_LIFE_HEAL)) return false; @@ -925,14 +925,14 @@ class spell_warl_siphon_life : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_WARLOCK_SIPHON_LIFE_HEAL, SPELLVALUE_BASE_POINT0, amount, GetTarget(), true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_warl_siphon_life_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_warl_siphon_life_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_siphon_life_AuraScript(); } @@ -949,7 +949,7 @@ class spell_warl_soulshatter : public SpellScriptLoader { PrepareSpellScript(spell_warl_soulshatter_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOULSHATTER)) return false; @@ -964,13 +964,13 @@ class spell_warl_soulshatter : public SpellScriptLoader caster->CastSpell(target, SPELL_WARLOCK_SOULSHATTER, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warl_soulshatter_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warl_soulshatter_SpellScript(); } @@ -987,7 +987,7 @@ class spell_warl_unstable_affliction : public SpellScriptLoader { PrepareAuraScript(spell_warl_unstable_affliction_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL)) return false; @@ -1005,13 +1005,13 @@ class spell_warl_unstable_affliction : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { AfterDispel += AuraDispelFn(spell_warl_unstable_affliction_AuraScript::HandleDispel); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warl_unstable_affliction_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index a5316766239..fae038e4c10 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -92,14 +92,14 @@ class spell_warr_bloodthirst : public SpellScriptLoader GetCaster()->CastCustomSpell(GetCaster(), SPELL_WARRIOR_BLOODTHIRST, &damage, NULL, NULL, true, NULL); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_bloodthirst_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); OnEffectHit += SpellEffectFn(spell_warr_bloodthirst_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_bloodthirst_SpellScript(); } @@ -121,13 +121,13 @@ class spell_warr_bloodthirst_heal : public SpellScriptLoader SetHitHeal(GetCaster()->CountPctFromMaxHealth(spellInfo->Effects[EFFECT_1].CalcValue(GetCaster())) / 100); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_bloodthirst_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_bloodthirst_heal_SpellScript(); } @@ -143,7 +143,7 @@ class spell_warr_charge : public SpellScriptLoader { PrepareSpellScript(spell_warr_charge_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + 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)) return false; @@ -161,13 +161,13 @@ class spell_warr_charge : public SpellScriptLoader caster->CastSpell(caster, SPELL_WARRIOR_JUGGERNAUT_CRIT_BONUS_BUFF, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_charge_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_charge_SpellScript(); } @@ -188,13 +188,13 @@ class spell_warr_concussion_blow : public SpellScriptLoader SetHitDamage(CalculatePct(GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK), GetEffectValue())); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_concussion_blow_SpellScript::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_concussion_blow_SpellScript(); } @@ -210,7 +210,7 @@ class spell_warr_deep_wounds : public SpellScriptLoader { PrepareSpellScript(spell_warr_deep_wounds_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + 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)) return false; @@ -243,13 +243,13 @@ class spell_warr_deep_wounds : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_deep_wounds_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_deep_wounds_SpellScript(); } @@ -265,7 +265,7 @@ class spell_warr_execute : public SpellScriptLoader { PrepareSpellScript(spell_warr_execute_SpellScript); - void HandleEffect(SpellEffIndex /*effIndex*/) + void HandleEffect(SpellEffIndex /*effIndex*/) OVERRIDE { Unit* caster = GetCaster(); if (GetHitUnit()) @@ -291,13 +291,13 @@ class spell_warr_execute : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_execute_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_execute_SpellScript(); } @@ -319,13 +319,13 @@ class spell_warr_improved_spell_reflection : public SpellScriptLoader unitList.remove(GetCaster()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_improved_spell_reflection_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_improved_spell_reflection_SpellScript(); } @@ -346,14 +346,14 @@ class spell_warr_intimidating_shout : public SpellScriptLoader unitList.remove(GetExplTargetWorldObject()); } - void Register() + void Register() OVERRIDE { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_intimidating_shout_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_intimidating_shout_SpellScript::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_intimidating_shout_SpellScript(); } @@ -369,7 +369,7 @@ class spell_warr_last_stand : public SpellScriptLoader { PrepareSpellScript(spell_warr_last_stand_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_LAST_STAND_TRIGGERED)) return false; @@ -385,14 +385,14 @@ class spell_warr_last_stand : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { // add dummy effect spell handler to Last Stand OnEffectHit += SpellEffectFn(spell_warr_last_stand_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_last_stand_SpellScript(); } @@ -424,13 +424,13 @@ class spell_warr_overpower : public SpellScriptLoader target->CastSpell(target, spellId, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_overpower_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_ANY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_overpower_SpellScript(); } @@ -511,13 +511,13 @@ class spell_warr_rend : public SpellScriptLoader } } - void Register() + void Register() OVERRIDE { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warr_rend_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warr_rend_AuraScript(); } @@ -542,13 +542,13 @@ class spell_warr_shattering_throw : public SpellScriptLoader target->RemoveAurasWithMechanic(1 << MECHANIC_IMMUNE_SHIELD, AURA_REMOVE_BY_ENEMY_SPELL); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_shattering_throw_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_shattering_throw_SpellScript(); } @@ -564,7 +564,7 @@ class spell_warr_slam : public SpellScriptLoader { PrepareSpellScript(spell_warr_slam_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_SLAM)) return false; @@ -578,13 +578,13 @@ class spell_warr_slam : public SpellScriptLoader GetCaster()->CastCustomSpell(GetHitUnit(), SPELL_WARRIOR_SLAM, &bp0, NULL, NULL, true, 0); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_slam_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_slam_SpellScript(); } @@ -600,14 +600,14 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader { PrepareAuraScript(spell_warr_sweeping_strikes_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK)) return false; return true; } - bool Load() + bool Load() OVERRIDE { _procTarget = NULL; return true; @@ -625,7 +625,7 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader GetTarget()->CastSpell(_procTarget, SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { DoCheckProc += AuraCheckProcFn(spell_warr_sweeping_strikes_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_warr_sweeping_strikes_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); @@ -635,7 +635,7 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warr_sweeping_strikes_AuraScript(); } @@ -651,7 +651,7 @@ class spell_warr_vigilance : public SpellScriptLoader { PrepareAuraScript(spell_warr_vigilance_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) + bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_GLYPH_OF_VIGILANCE)) return false; @@ -664,7 +664,7 @@ class spell_warr_vigilance : public SpellScriptLoader return true; } - bool Load() + bool Load() OVERRIDE { _procTarget = NULL; return true; @@ -716,7 +716,7 @@ class spell_warr_vigilance : public SpellScriptLoader GetTarget()->CastSpell(_procTarget, SPELL_WARRIOR_VIGILANCE_PROC, true, NULL, aurEff); } - void Register() + void Register() OVERRIDE { OnEffectApply += AuraEffectApplyFn(spell_warr_vigilance_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); AfterEffectApply += AuraEffectApplyFn(spell_warr_vigilance_AuraScript::HandleAfterApply, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); @@ -729,7 +729,7 @@ class spell_warr_vigilance : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const + AuraScript* GetAuraScript() const OVERRIDE { return new spell_warr_vigilance_AuraScript(); } @@ -754,13 +754,13 @@ class spell_warr_vigilance_trigger : public SpellScriptLoader target->RemoveSpellCooldown(SPELL_WARRIOR_TAUNT, true); } - void Register() + void Register() OVERRIDE { OnEffectHitTarget += SpellEffectFn(spell_warr_vigilance_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const + SpellScript* GetSpellScript() const OVERRIDE { return new spell_warr_vigilance_trigger_SpellScript(); } |