diff options
Diffstat (limited to 'src/server/scripts/Spells')
| -rw-r--r-- | src/server/scripts/Spells/spell_dk.cpp | 150 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_druid.cpp | 144 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_generic.cpp | 376 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_holiday.cpp | 40 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_hunter.cpp | 142 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_item.cpp | 306 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_mage.cpp | 146 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_paladin.cpp | 132 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_pet.cpp | 130 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_priest.cpp | 136 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_quest.cpp | 272 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_rogue.cpp | 94 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_shaman.cpp | 150 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_warlock.cpp | 172 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_warrior.cpp | 130 |
15 files changed, 1260 insertions, 1260 deletions
diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index e2f642d2b2a..9c6ed2ff120 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -76,7 +76,7 @@ class spell_dk_anti_magic_shell_raid : public SpellScriptLoader uint32 absorbPct; - bool Load() OVERRIDE + bool Load() override { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -93,14 +93,14 @@ class spell_dk_anti_magic_shell_raid : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_anti_magic_shell_raid_AuraScript(); } @@ -117,14 +117,14 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader PrepareAuraScript(spell_dk_anti_magic_shell_self_AuraScript); uint32 absorbPct, hpPct; - bool Load() OVERRIDE + bool Load() override { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); hpPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(GetCaster()); return true; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_RUNIC_POWER_ENERGIZE)) return false; @@ -149,7 +149,7 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_DK_RUNIC_POWER_ENERGIZE, SPELLVALUE_BASE_POINT0, bp, GetTarget(), true, NULL, aurEff); } - void Register() OVERRIDE + 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); @@ -157,7 +157,7 @@ class spell_dk_anti_magic_shell_self : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_anti_magic_shell_self_AuraScript(); } @@ -175,13 +175,13 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader uint32 absorbPct; - bool Load() OVERRIDE + bool Load() override { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_ANTI_MAGIC_SHELL_TALENT)) return false; @@ -201,14 +201,14 @@ class spell_dk_anti_magic_zone : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_anti_magic_zone_AuraScript(); } @@ -224,14 +224,14 @@ class spell_dk_blood_boil : public SpellScriptLoader { PrepareSpellScript(spell_dk_blood_boil_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_BOIL_TRIGGERED)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { _executed = false; return GetCaster()->GetTypeId() == TYPEID_PLAYER && GetCaster()->getClass() == CLASS_DEATH_KNIGHT; @@ -246,7 +246,7 @@ class spell_dk_blood_boil : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_DK_BLOOD_BOIL_TRIGGERED, true); } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_dk_blood_boil_SpellScript::HandleAfterHit); } @@ -254,7 +254,7 @@ class spell_dk_blood_boil : public SpellScriptLoader bool _executed; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_blood_boil_SpellScript(); } @@ -270,14 +270,14 @@ class spell_dk_blood_gorged : public SpellScriptLoader { PrepareAuraScript(spell_dk_blood_gorged_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_GORGED_HEAL)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { _procTarget = NULL; return true; @@ -295,7 +295,7 @@ class spell_dk_blood_gorged : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_DK_BLOOD_GORGED_HEAL, SPELLVALUE_BASE_POINT0, heal, _procTarget, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_dk_blood_gorged_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_dk_blood_gorged_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); @@ -305,7 +305,7 @@ class spell_dk_blood_gorged : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_blood_gorged_AuraScript(); } @@ -321,7 +321,7 @@ class spell_dk_butchery : public SpellScriptLoader { PrepareAuraScript(spell_dk_blood_gorged_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_BUTCHERY)) return false; @@ -334,13 +334,13 @@ class spell_dk_butchery : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_DK_BUTCHERY, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetTarget(), true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_dk_blood_gorged_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_blood_gorged_AuraScript(); } @@ -356,7 +356,7 @@ class spell_dk_death_coil : public SpellScriptLoader { PrepareSpellScript(spell_dk_death_coil_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_DEATH_COIL_DAMAGE) || !sSpellMgr->GetSpellInfo(SPELL_DK_DEATH_COIL_HEAL)) return false; @@ -400,14 +400,14 @@ class spell_dk_death_coil : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_death_coil_SpellScript(); } @@ -441,14 +441,14 @@ class spell_dk_death_gate : public SpellScriptLoader target->CastSpell(target, GetEffectValue(), false); } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_death_gate_SpellScript(); } @@ -475,14 +475,14 @@ class spell_dk_death_grip : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_dk_death_grip_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_death_grip_SpellScript(); } @@ -531,14 +531,14 @@ class spell_dk_death_pact : public SpellScriptLoader targetList.push_back(target); } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_death_pact_SpellScript(); } @@ -554,7 +554,7 @@ class spell_dk_death_strike : public SpellScriptLoader { PrepareSpellScript(spell_dk_death_strike_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_DEATH_STRIKE_ENABLER) || !sSpellMgr->GetSpellInfo(SPELL_DK_DEATH_STRIKE_HEAL) || @@ -585,13 +585,13 @@ class spell_dk_death_strike : public SpellScriptLoader GetCaster()->CastCustomSpell(SPELL_DK_BLOOD_SHIELD_ABSORB, SPELLVALUE_BASE_POINT0, GetCaster()->CountPctFromMaxHealth(aurEff->GetAmount()), GetCaster()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_dk_death_strike_SpellScript::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_death_strike_SpellScript(); } @@ -607,7 +607,7 @@ class spell_dk_death_strike_enabler : public SpellScriptLoader { PrepareAuraScript(spell_dk_death_strike_enabler_AuraScript); - bool Load() OVERRIDE + bool Load() override { for (uint8 i = 0; i < 5; ++i) _damagePerSecond[i] = 0; @@ -653,7 +653,7 @@ class spell_dk_death_strike_enabler : public SpellScriptLoader amount += int32(_damagePerSecond[i]); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_dk_death_strike_enabler_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_dk_death_strike_enabler_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); @@ -665,7 +665,7 @@ class spell_dk_death_strike_enabler : public SpellScriptLoader uint32 _damagePerSecond[5]; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_death_strike_enabler_AuraScript(); } @@ -681,7 +681,7 @@ class spell_dk_ghoul_explode : public SpellScriptLoader { PrepareSpellScript(spell_dk_ghoul_explode_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_CORPSE_EXPLOSION_TRIGGERED)) return false; @@ -697,13 +697,13 @@ class spell_dk_ghoul_explode : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_dk_ghoul_explode_SpellScript::Suicide, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_ghoul_explode_SpellScript(); } @@ -719,7 +719,7 @@ class spell_dk_icebound_fortitude : public SpellScriptLoader { PrepareAuraScript(spell_dk_icebound_fortitude_AuraScript); - bool Load() OVERRIDE + bool Load() override { Unit* caster = GetCaster(); return caster && caster->GetTypeId() == TYPEID_PLAYER; @@ -746,13 +746,13 @@ class spell_dk_icebound_fortitude : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_icebound_fortitude_AuraScript::CalculateAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_icebound_fortitude_AuraScript(); } @@ -768,7 +768,7 @@ class spell_dk_improved_blood_presence : public SpellScriptLoader { PrepareAuraScript(spell_dk_improved_blood_presence_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_PRESENCE) || !sSpellMgr->GetSpellInfo(SPELL_DK_FROST_PRESENCE) @@ -806,7 +806,7 @@ class spell_dk_improved_blood_presence : public SpellScriptLoader target->RemoveAura(SPELL_DK_BLOOD_PRESENCE_TRIGGERED); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_dk_improved_blood_presence_AuraScript::HandleModDamagePctTaken, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectApply += AuraEffectApplyFn(spell_dk_improved_blood_presence_AuraScript::HandleModAttackerMeleeCritChance, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); @@ -814,7 +814,7 @@ class spell_dk_improved_blood_presence : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_improved_blood_presence_AuraScript(); } @@ -830,7 +830,7 @@ class spell_dk_improved_frost_presence : public SpellScriptLoader { PrepareAuraScript(spell_dk_improved_frost_presence_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_PRESENCE) || !sSpellMgr->GetSpellInfo(SPELL_DK_UNHOLY_PRESENCE) @@ -851,14 +851,14 @@ class spell_dk_improved_frost_presence : public SpellScriptLoader GetTarget()->RemoveAura(SPELL_DK_IMPROVED_FROST_PRESENCE_TRIGGERED); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_dk_improved_frost_presence_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_dk_improved_frost_presence_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_improved_frost_presence_AuraScript(); } @@ -874,7 +874,7 @@ class spell_dk_improved_unholy_presence : public SpellScriptLoader { PrepareAuraScript(spell_dk_improved_unholy_presence_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_PRESENCE) || !sSpellMgr->GetSpellInfo(SPELL_DK_FROST_PRESENCE) @@ -895,14 +895,14 @@ class spell_dk_improved_unholy_presence : public SpellScriptLoader GetTarget()->RemoveAura(SPELL_DK_IMPROVED_UNHOLY_PRESENCE_TRIGGERED); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_improved_unholy_presence_AuraScript(); } @@ -924,13 +924,13 @@ class spell_dk_necrotic_strike : public SpellScriptLoader amount = int32(caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.7f); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_necrotic_strike_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_HEAL_ABSORB); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_necrotic_strike_AuraScript(); } @@ -948,7 +948,7 @@ class spell_dk_presence : public SpellScriptLoader { PrepareAuraScript(spell_dk_presence_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_PRESENCE) || !sSpellMgr->GetSpellInfo(SPELL_DK_FROST_PRESENCE) @@ -1019,7 +1019,7 @@ class spell_dk_presence : public SpellScriptLoader target->RemoveAura(SPELL_DK_IMPROVED_UNHOLY_PRESENCE_TRIGGERED); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_dk_presence_AuraScript::HandleImprovedBloodPresence, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL); AfterEffectApply += AuraEffectApplyFn(spell_dk_presence_AuraScript::HandleImprovedFrostPresence, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL); @@ -1028,7 +1028,7 @@ class spell_dk_presence : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_presence_AuraScript(); } @@ -1068,7 +1068,7 @@ class spell_dk_raise_dead : public SpellScriptLoader { PrepareSpellScript(spell_dk_raise_dead_SpellScript); - bool Validate(SpellInfo const* spellInfo) OVERRIDE + bool Validate(SpellInfo const* spellInfo) override { if (!sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_1].CalcValue()) || !sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_2].CalcValue()) @@ -1078,7 +1078,7 @@ class spell_dk_raise_dead : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { _result = SPELL_CAST_OK; _corpse = false; @@ -1170,7 +1170,7 @@ class spell_dk_raise_dead : public SpellScriptLoader GetCaster()->CastSpell(targets, spellInfo, NULL, TRIGGERED_FULL_MASK); } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_dk_raise_dead_SpellScript::CheckCast); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dk_raise_dead_SpellScript::CheckTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); @@ -1185,7 +1185,7 @@ class spell_dk_raise_dead : public SpellScriptLoader bool _corpse; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_raise_dead_SpellScript(); } @@ -1206,13 +1206,13 @@ class spell_dk_rune_tap_party : public SpellScriptLoader targets.remove(GetCaster()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dk_rune_tap_party_SpellScript::CheckTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_rune_tap_party_SpellScript(); } @@ -1228,7 +1228,7 @@ class spell_dk_scent_of_blood : public SpellScriptLoader { PrepareAuraScript(spell_dk_scent_of_blood_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_SCENT_OF_BLOOD)) return false; @@ -1242,13 +1242,13 @@ class spell_dk_scent_of_blood : public SpellScriptLoader GetTarget()->RemoveAuraFromStack(GetId()); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_dk_scent_of_blood_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_scent_of_blood_AuraScript(); } @@ -1265,13 +1265,13 @@ class spell_dk_scourge_strike : public SpellScriptLoader PrepareSpellScript(spell_dk_scourge_strike_SpellScript); float multiplier; - bool Load() OVERRIDE + bool Load() override { multiplier = 1.0f; return true; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_SCOURGE_STRIKE_TRIGGERED)) return false; @@ -1304,14 +1304,14 @@ class spell_dk_scourge_strike : public SpellScriptLoader } } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dk_scourge_strike_SpellScript(); } @@ -1332,13 +1332,13 @@ class spell_dk_vampiric_blood : public SpellScriptLoader amount = GetUnitOwner()->CountPctFromMaxHealth(amount); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_vampiric_blood_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_HEALTH); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_vampiric_blood_AuraScript(); } @@ -1354,7 +1354,7 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader { PrepareAuraScript(spell_dk_will_of_the_necropolis_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DK_WILL_OF_THE_NECROPOLIS)) return false; @@ -1382,14 +1382,14 @@ class spell_dk_will_of_the_necropolis : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_dk_will_of_the_necropolis_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_dk_will_of_the_necropolis_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE); } }; - AuraScript* GetAuraScript() const OVERRIDE + 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 fdc76f5fa95..a352ebb41ae 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -80,13 +80,13 @@ class spell_dru_dash : public SpellScriptLoader amount = 0; } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_dash_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_INCREASE_SPEED); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_dash_AuraScript(); } @@ -103,7 +103,7 @@ class spell_dru_eclipse : public SpellScriptLoader { PrepareAuraScript(spell_dru_eclipse_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_NATURES_GRACE) || !sSpellMgr->GetSpellInfo(SPELL_DRUID_NATURES_GRACE_TRIGGER)) @@ -111,7 +111,7 @@ class spell_dru_eclipse : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -126,13 +126,13 @@ class spell_dru_eclipse : public SpellScriptLoader caster->ToPlayer()->RemoveSpellCooldown(SPELL_DRUID_NATURES_GRACE_TRIGGER, true); } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_dru_eclipse_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_eclipse_AuraScript(); } @@ -150,7 +150,7 @@ class spell_dru_eclipse_energize : public SpellScriptLoader int32 energizeAmount; - bool Load() OVERRIDE + bool Load() override { if (GetCaster()->GetTypeId() != TYPEID_PLAYER) return false; @@ -236,13 +236,13 @@ class spell_dru_eclipse_energize : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_dru_eclipse_energize_SpellScript::HandleEnergize, EFFECT_1, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dru_eclipse_energize_SpellScript; } @@ -258,7 +258,7 @@ class spell_dru_enrage : public SpellScriptLoader { PrepareSpellScript(spell_dru_enrage_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_KING_OF_THE_JUNGLE) || !sSpellMgr->GetSpellInfo(SPELL_DRUID_ENRAGE_MOD_DAMAGE)) @@ -272,13 +272,13 @@ class spell_dru_enrage : public SpellScriptLoader GetHitUnit()->CastCustomSpell(SPELL_DRUID_ENRAGE_MOD_DAMAGE, SPELLVALUE_BASE_POINT0, aurEff->GetAmount(), GetHitUnit(), true); } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_dru_enrage_SpellScript::OnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dru_enrage_SpellScript(); } @@ -294,7 +294,7 @@ class spell_dru_glyph_of_innervate : public SpellScriptLoader { PrepareAuraScript(spell_dru_glyph_of_innervate_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_GLYPH_OF_INNERVATE)) return false; @@ -313,14 +313,14 @@ class spell_dru_glyph_of_innervate : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_DRUID_GLYPH_OF_INNERVATE, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_dru_glyph_of_innervate_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_dru_glyph_of_innervate_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_glyph_of_innervate_AuraScript(); } @@ -336,7 +336,7 @@ class spell_dru_glyph_of_starfire : public SpellScriptLoader { PrepareSpellScript(spell_dru_glyph_of_starfire_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_INCREASED_MOONFIRE_DURATION)) return false; @@ -364,13 +364,13 @@ class spell_dru_glyph_of_starfire : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_dru_glyph_of_starfire_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dru_glyph_of_starfire_SpellScript(); } @@ -386,7 +386,7 @@ class spell_dru_glyph_of_starfire_proc : public SpellScriptLoader { PrepareAuraScript(spell_dru_glyph_of_starfire_proc_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_GLYPH_OF_STARFIRE)) return false; @@ -399,13 +399,13 @@ class spell_dru_glyph_of_starfire_proc : public SpellScriptLoader GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_DRUID_GLYPH_OF_STARFIRE, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_dru_glyph_of_starfire_proc_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_glyph_of_starfire_proc_AuraScript(); } @@ -435,13 +435,13 @@ class spell_dru_idol_lifebloom : public SpellScriptLoader spellMod->value = aurEff->GetAmount() / 7; } - void Register() OVERRIDE + void Register() override { DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_dru_idol_lifebloom_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_idol_lifebloom_AuraScript(); } @@ -462,13 +462,13 @@ class spell_dru_innervate : public SpellScriptLoader amount = CalculatePct(int32(GetUnitOwner()->GetCreatePowers(POWER_MANA) / aurEff->GetTotalTicks()), amount); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_innervate_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_innervate_AuraScript(); } @@ -491,13 +491,13 @@ class spell_dru_insect_swarm : public SpellScriptLoader amount += relicAurEff->GetAmount() / aurEff->GetTotalTicks(); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_insect_swarm_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_insect_swarm_AuraScript(); } @@ -513,7 +513,7 @@ class spell_dru_lifebloom : public SpellScriptLoader { PrepareAuraScript(spell_dru_lifebloom_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_LIFEBLOOM_FINAL_HEAL)) return false; @@ -572,14 +572,14 @@ class spell_dru_lifebloom : public SpellScriptLoader } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_lifebloom_AuraScript(); } @@ -595,7 +595,7 @@ class spell_dru_living_seed : public SpellScriptLoader { PrepareAuraScript(spell_dru_living_seed_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_LIVING_SEED_PROC)) return false; @@ -609,13 +609,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() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_dru_living_seed_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_living_seed_AuraScript(); } @@ -631,7 +631,7 @@ class spell_dru_living_seed_proc : public SpellScriptLoader { PrepareAuraScript(spell_dru_living_seed_proc_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_LIVING_SEED_HEAL)) return false; @@ -644,13 +644,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() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_dru_living_seed_proc_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_living_seed_proc_AuraScript(); } @@ -672,14 +672,14 @@ class spell_dru_predatory_strikes : public SpellScriptLoader target->UpdateAttackPowerAndDamage(); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_predatory_strikes_AuraScript(); } @@ -695,7 +695,7 @@ class spell_dru_rip : public SpellScriptLoader { PrepareAuraScript(spell_dru_rip_AuraScript); - bool Load() OVERRIDE + bool Load() override { Unit* caster = GetCaster(); return caster && caster->GetTypeId() == TYPEID_PLAYER; @@ -721,13 +721,13 @@ class spell_dru_rip : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_rip_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_rip_AuraScript(); } @@ -745,7 +745,7 @@ class spell_dru_savage_defense : public SpellScriptLoader uint32 absorbPct; - bool Load() OVERRIDE + bool Load() override { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -763,14 +763,14 @@ class spell_dru_savage_defense : public SpellScriptLoader aurEff->SetAmount(0); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_savage_defense_AuraScript(); } @@ -795,7 +795,7 @@ class spell_dru_savage_roar : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_dru_savage_roar_SpellScript::CheckCast); } @@ -805,7 +805,7 @@ class spell_dru_savage_roar : public SpellScriptLoader { PrepareAuraScript(spell_dru_savage_roar_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_SAVAGE_ROAR)) return false; @@ -823,19 +823,19 @@ class spell_dru_savage_roar : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(SPELL_DRUID_SAVAGE_ROAR); } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dru_savage_roar_SpellScript(); } - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_savage_roar_AuraScript(); } @@ -874,14 +874,14 @@ class spell_dru_starfall_dummy : public SpellScriptLoader caster->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dru_starfall_dummy_SpellScript(); } @@ -897,7 +897,7 @@ class spell_dru_stampede : public SpellScriptLoader { PrepareAuraScript(spell_dru_stampede_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_STAMPEDE_BAER_RANK_1) || !sSpellMgr->GetSpellInfo(SPELL_DRUID_STAMPEDE_CAT_RANK_1) || @@ -927,14 +927,14 @@ class spell_dru_stampede : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), sSpellMgr->GetSpellWithRank(SPELL_DRUID_STAMPEDE_BAER_RANK_1, GetSpellInfo()->GetRank()), true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_dru_stampede_AuraScript::HandleEffectCatProc, EFFECT_0, SPELL_AURA_DUMMY); OnEffectProc += AuraEffectProcFn(spell_dru_stampede_AuraScript::HandleEffectBearProc, EFFECT_1, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_stampede_AuraScript(); } @@ -959,7 +959,7 @@ class spell_dru_survival_instincts : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_dru_survival_instincts_SpellScript::CheckCast); } @@ -969,7 +969,7 @@ class spell_dru_survival_instincts : public SpellScriptLoader { PrepareAuraScript(spell_dru_survival_instincts_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DRUID_SURVIVAL_INSTINCTS)) return false; @@ -988,19 +988,19 @@ class spell_dru_survival_instincts : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(SPELL_DRUID_SURVIVAL_INSTINCTS); } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dru_survival_instincts_SpellScript(); } - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_survival_instincts_AuraScript(); } @@ -1016,7 +1016,7 @@ class spell_dru_swift_flight_passive : public SpellScriptLoader { PrepareAuraScript(spell_dru_swift_flight_passive_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1028,13 +1028,13 @@ class spell_dru_swift_flight_passive : public SpellScriptLoader amount = 310; } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_swift_flight_passive_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dru_swift_flight_passive_AuraScript(); } @@ -1056,13 +1056,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() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_dru_tiger_s_fury_SpellScript::OnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dru_tiger_s_fury_SpellScript(); } @@ -1085,13 +1085,13 @@ class spell_dru_typhoon : public SpellScriptLoader PreventHitDefaultEffect(effIndex); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_dru_typhoon_SpellScript::HandleKnockBack, EFFECT_0, SPELL_EFFECT_KNOCK_BACK); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dru_typhoon_SpellScript(); } @@ -1107,7 +1107,7 @@ class spell_dru_t10_restoration_4p_bonus : public SpellScriptLoader { PrepareSpellScript(spell_dru_t10_restoration_4p_bonus_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1140,13 +1140,13 @@ class spell_dru_t10_restoration_4p_bonus : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_t10_restoration_4p_bonus_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dru_t10_restoration_4p_bonus_SpellScript(); } @@ -1179,7 +1179,7 @@ class spell_dru_wild_growth : public SpellScriptLoader { PrepareSpellScript(spell_dru_wild_growth_SpellScript); - bool Validate(SpellInfo const* spellInfo) OVERRIDE + bool Validate(SpellInfo const* spellInfo) override { if (spellInfo->Effects[EFFECT_2].IsEffect() || spellInfo->Effects[EFFECT_2].CalcValue() <= 0) return false; @@ -1206,7 +1206,7 @@ class spell_dru_wild_growth : public SpellScriptLoader targets = _targets; } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_wild_growth_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_wild_growth_SpellScript::SetTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY); @@ -1216,7 +1216,7 @@ class spell_dru_wild_growth : public SpellScriptLoader std::list<WorldObject*> _targets; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_dru_wild_growth_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index c3145450635..a97c5b8c18f 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -49,7 +49,7 @@ class spell_gen_absorb0_hitlimit1 : public SpellScriptLoader uint32 limit; - bool Load() OVERRIDE + bool Load() override { // Max absorb stored in 1 dummy effect limit = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); @@ -61,13 +61,13 @@ class spell_gen_absorb0_hitlimit1 : public SpellScriptLoader absorbAmount = std::min(limit, absorbAmount); } - void Register() OVERRIDE + void Register() override { OnEffectAbsorb += AuraEffectAbsorbFn(spell_gen_absorb0_hitlimit1_AuraScript::Absorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_absorb0_hitlimit1_AuraScript(); } @@ -92,7 +92,7 @@ class spell_gen_adaptive_warding : public SpellScriptLoader { PrepareAuraScript(spell_gen_adaptive_warding_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_GEN_ADAPTIVE_WARDING_FIRE) || !sSpellMgr->GetSpellInfo(SPELL_GEN_ADAPTIVE_WARDING_NATURE) || @@ -151,14 +151,14 @@ class spell_gen_adaptive_warding : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), spellId, true, NULL, aurEff); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_adaptive_warding_AuraScript(); } @@ -180,7 +180,7 @@ class spell_gen_alchemist_stone : public SpellScriptLoader { PrepareAuraScript(spell_gen_alchemist_stone_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(ALECHEMIST_STONE_HEAL) || !sSpellMgr->GetSpellInfo(ALECHEMIST_STONE_MANA)) @@ -212,14 +212,14 @@ class spell_gen_alchemist_stone : public SpellScriptLoader } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_gen_alchemist_stone_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_gen_alchemist_stone_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_alchemist_stone_AuraScript(); } @@ -241,13 +241,13 @@ class spell_gen_allow_cast_from_item_only : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_gen_allow_cast_from_item_only_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_allow_cast_from_item_only_SpellScript(); } @@ -268,7 +268,7 @@ class spell_gen_animal_blood : public SpellScriptLoader { PrepareAuraScript(spell_gen_animal_blood_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SPAWN_BLOOD_POOL)) return false; @@ -289,14 +289,14 @@ class spell_gen_animal_blood : public SpellScriptLoader owner->CastSpell(owner, SPELL_SPAWN_BLOOD_POOL, true); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_animal_blood_AuraScript(); } @@ -319,13 +319,13 @@ class spell_gen_aura_of_anger : public SpellScriptLoader aurEff->SetAmount(100 * aurEff->GetTickNumber()); } - void Register() OVERRIDE + void Register() override { OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_gen_aura_of_anger_AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_aura_of_anger_AuraScript(); } @@ -350,7 +350,7 @@ class spell_gen_aura_service_uniform : public SpellScriptLoader { PrepareAuraScript(spell_gen_aura_service_uniform_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SERVICE_UNIFORM)) return false; @@ -377,14 +377,14 @@ class spell_gen_aura_service_uniform : public SpellScriptLoader target->RestoreDisplayId(); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectRemoveFn(spell_gen_aura_service_uniform_AuraScript::OnApply, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_gen_aura_service_uniform_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_aura_service_uniform_AuraScript(); } @@ -421,13 +421,13 @@ class spell_gen_av_drekthar_presence : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_gen_av_drekthar_presence_AuraScript::CheckAreaTarget); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_av_drekthar_presence_AuraScript(); } @@ -447,7 +447,7 @@ class spell_gen_bandage : public SpellScriptLoader { PrepareSpellScript(spell_gen_bandage_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_RECENTLY_BANDAGED)) return false; @@ -470,14 +470,14 @@ class spell_gen_bandage : public SpellScriptLoader GetCaster()->CastSpell(target, SPELL_RECENTLY_BANDAGED, true); } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_gen_bandage_SpellScript::CheckCast); AfterHit += SpellHitFn(spell_gen_bandage_SpellScript::HandleScript); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_bandage_SpellScript(); } @@ -518,13 +518,13 @@ class spell_gen_bonked : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_bonked_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_bonked_SpellScript(); } @@ -627,13 +627,13 @@ class spell_gen_break_shield: public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_break_shield_SpellScript::HandleScriptEffect, EFFECT_FIRST_FOUND, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_break_shield_SpellScript(); } @@ -655,13 +655,13 @@ class spell_gen_burn_brutallus : public SpellScriptLoader aurEff->SetAmount(aurEff->GetAmount() * 2); } - void Register() OVERRIDE + void Register() override { OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_gen_burn_brutallus_AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_burn_brutallus_AuraScript(); } @@ -681,7 +681,7 @@ class spell_gen_cannibalize : public SpellScriptLoader { PrepareSpellScript(spell_gen_cannibalize_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CANNIBALIZE_TRIGGERED)) return false; @@ -707,14 +707,14 @@ class spell_gen_cannibalize : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_CANNIBALIZE_TRIGGERED, false); } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_cannibalize_SpellScript(); } @@ -734,7 +734,7 @@ class spell_gen_chaos_blast : public SpellScriptLoader { PrepareSpellScript(spell_gen_chaos_blast_SpellScript) - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CHAOS_BLAST)) return false; @@ -748,13 +748,13 @@ class spell_gen_chaos_blast : public SpellScriptLoader caster->CastCustomSpell(target, SPELL_CHAOS_BLAST, &basepoints0, NULL, NULL, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_chaos_blast_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_chaos_blast_SpellScript(); } @@ -780,7 +780,7 @@ class spell_gen_clone : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { if (m_scriptSpellId == SPELL_NIGHTMARE_FIGMENT_MIRROR_IMAGE) { @@ -795,7 +795,7 @@ class spell_gen_clone : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_clone_SpellScript(); } @@ -828,13 +828,13 @@ class spell_gen_clone_weapon : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_clone_weapon_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_clone_weapon_SpellScript(); } @@ -849,7 +849,7 @@ class spell_gen_clone_weapon_aura : public SpellScriptLoader { PrepareAuraScript(spell_gen_clone_weapon_auraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_COPY_WEAPON_AURA) || !sSpellMgr->GetSpellInfo(SPELL_COPY_WEAPON_2_AURA) || @@ -861,7 +861,7 @@ class spell_gen_clone_weapon_aura : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { prevItem = 0; return true; @@ -946,7 +946,7 @@ class spell_gen_clone_weapon_aura : public SpellScriptLoader } } - void Register() OVERRIDE + 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); @@ -956,7 +956,7 @@ class spell_gen_clone_weapon_aura : public SpellScriptLoader uint32 prevItem; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_clone_weapon_auraScript(); } @@ -982,7 +982,7 @@ class spell_gen_count_pct_from_max_hp : public SpellScriptLoader SetHitDamage(GetHitUnit()->CountPctFromMaxHealth(_damagePct)); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_gen_count_pct_from_max_hp_SpellScript::RecalculateDamage); } @@ -991,7 +991,7 @@ class spell_gen_count_pct_from_max_hp : public SpellScriptLoader int32 _damagePct; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_count_pct_from_max_hp_SpellScript(_damagePct); } @@ -1016,7 +1016,7 @@ class spell_gen_create_lance : public SpellScriptLoader { PrepareSpellScript(spell_gen_create_lance_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_LANCE_ALLIANCE) || !sSpellMgr->GetSpellInfo(SPELL_CREATE_LANCE_HORDE)) @@ -1037,13 +1037,13 @@ class spell_gen_create_lance : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_create_lance_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_create_lance_SpellScript(); } @@ -1068,13 +1068,13 @@ class spell_gen_creature_permanent_feign_death : public SpellScriptLoader target->ToCreature()->SetReactState(REACT_PASSIVE); } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_gen_creature_permanent_feign_death_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_creature_permanent_feign_death_AuraScript(); } @@ -1100,7 +1100,7 @@ class spell_gen_dalaran_disguise : public SpellScriptLoader { PrepareSpellScript(spell_gen_dalaran_disguise_SpellScript); - bool Validate(SpellInfo const* spellInfo) OVERRIDE + bool Validate(SpellInfo const* spellInfo) override { switch (spellInfo->Id) { @@ -1142,13 +1142,13 @@ class spell_gen_dalaran_disguise : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_dalaran_disguise_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_dalaran_disguise_SpellScript(); } @@ -1170,7 +1170,7 @@ class spell_gen_defend : public SpellScriptLoader { PrepareAuraScript(spell_gen_defend_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_VISUAL_SHIELD_1)) return false; @@ -1210,7 +1210,7 @@ class spell_gen_defend : public SpellScriptLoader rider->RemoveAurasDueToSpell(GetId()); } - void Register() OVERRIDE + void Register() override { SpellInfo const* spell = sSpellMgr->EnsureSpellInfo(m_scriptSpellId); @@ -1234,7 +1234,7 @@ class spell_gen_defend : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_defend_AuraScript(); } @@ -1249,7 +1249,7 @@ class spell_gen_despawn_self : public SpellScriptLoader { PrepareSpellScript(spell_gen_despawn_self_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -1260,13 +1260,13 @@ class spell_gen_despawn_self : public SpellScriptLoader GetCaster()->ToCreature()->DespawnOrUnsummon(); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_despawn_self_SpellScript::HandleDummy, EFFECT_ALL, SPELL_EFFECT_ANY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_despawn_self_SpellScript(); } @@ -1287,12 +1287,12 @@ class spell_gen_divine_storm_cd_reset : public SpellScriptLoader { PrepareSpellScript(spell_gen_divine_storm_cd_reset_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DIVINE_STORM)) return false; @@ -1306,13 +1306,13 @@ class spell_gen_divine_storm_cd_reset : public SpellScriptLoader caster->RemoveSpellCooldown(SPELL_DIVINE_STORM, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_divine_storm_cd_reset_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_divine_storm_cd_reset_SpellScript(); } @@ -1343,13 +1343,13 @@ class spell_gen_ds_flush_knockback : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_ds_flush_knockback_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_ds_flush_knockback_SpellScript(); } @@ -1370,7 +1370,7 @@ class spell_gen_dummy_trigger : public SpellScriptLoader { PrepareSpellScript(spell_gen_dummy_trigger_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PERSISTANT_SHIELD_TRIGGERED) || !sSpellMgr->GetSpellInfo(SPELL_PERSISTANT_SHIELD)) @@ -1388,13 +1388,13 @@ class spell_gen_dummy_trigger : public SpellScriptLoader caster->CastCustomSpell(target, SPELL_PERSISTANT_SHIELD_TRIGGERED, &damage, NULL, NULL, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_dummy_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_dummy_trigger_SpellScript(); } @@ -1409,7 +1409,7 @@ class spell_gen_dungeon_credit : public SpellScriptLoader { PrepareSpellScript(spell_gen_dungeon_credit_SpellScript); - bool Load() OVERRIDE + bool Load() override { _handled = false; return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1427,7 +1427,7 @@ class spell_gen_dungeon_credit : public SpellScriptLoader instance->UpdateEncounterState(ENCOUNTER_CREDIT_CAST_SPELL, GetSpellInfo()->Id, caster); } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_gen_dungeon_credit_SpellScript::CreditEncounter); } @@ -1436,7 +1436,7 @@ class spell_gen_dungeon_credit : public SpellScriptLoader bool _handled; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_dungeon_credit_SpellScript(); } @@ -1463,7 +1463,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* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ELUNE_CANDLE_OMEN_HEAD) || !sSpellMgr->GetSpellInfo(SPELL_ELUNE_CANDLE_OMEN_CHEST) || @@ -1502,13 +1502,13 @@ class spell_gen_elune_candle : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), spellId, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_elune_candle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_elune_candle_SpellScript(); } @@ -1530,7 +1530,7 @@ class spell_gen_gadgetzan_transporter_backfire : public SpellScriptLoader { PrepareSpellScript(spell_gen_gadgetzan_transporter_backfire_SpellScript) - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_MALFUNCTION_POLYMORPH) || !sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_EVIL_TWIN) || @@ -1551,13 +1551,13 @@ class spell_gen_gadgetzan_transporter_backfire : public SpellScriptLoader caster->CastSpell(caster, SPELL_TRANSPORTER_MALFUNCTION_MISS, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_gadgetzan_transporter_backfire_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_gadgetzan_transporter_backfire_SpellScript(); } @@ -1604,13 +1604,13 @@ class spell_gen_gift_of_naaru : public SpellScriptLoader amount += int32(std::max(healTick, 0)); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_gift_of_naaru_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_gift_of_naaru_AuraScript(); } @@ -1631,7 +1631,7 @@ class spell_gen_gnomish_transporter : public SpellScriptLoader { PrepareSpellScript(spell_gen_gnomish_transporter_SpellScript) - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_SUCCESS) || !sSpellMgr->GetSpellInfo(SPELL_TRANSPORTER_FAILURE)) @@ -1644,13 +1644,13 @@ class spell_gen_gnomish_transporter : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), roll_chance_i(50) ? SPELL_TRANSPORTER_SUCCESS : SPELL_TRANSPORTER_FAILURE, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_gnomish_transporter_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_gnomish_transporter_SpellScript(); } @@ -1665,7 +1665,7 @@ class spell_gen_gunship_portal : public SpellScriptLoader { PrepareSpellScript(spell_gen_gunship_portal_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1678,13 +1678,13 @@ class spell_gen_gunship_portal : public SpellScriptLoader bg->DoAction(1, caster->GetGUID()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_gunship_portal_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_gunship_portal_SpellScript(); } @@ -1707,7 +1707,7 @@ class spell_gen_interrupt : public SpellScriptLoader { PrepareAuraScript(spell_gen_interrupt_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_GEN_THROW_INTERRUPT)) return false; @@ -1720,13 +1720,13 @@ class spell_gen_interrupt : public SpellScriptLoader GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_GEN_THROW_INTERRUPT, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_gen_interrupt_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_interrupt_AuraScript(); } @@ -1771,14 +1771,14 @@ class spell_gen_launch : public SpellScriptLoader } } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_launch_SpellScript(); } @@ -1801,13 +1801,13 @@ class spell_gen_increase_stats_buff : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), GetEffectValue(), true); // single-target buff } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_increase_stats_buff_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_increase_stats_buff_SpellScript(); } @@ -1834,7 +1834,7 @@ class spell_gen_lifebloom : public SpellScriptLoader public: spell_gen_lifebloom_AuraScript(uint32 spellId) : AuraScript(), _spellId(spellId) { } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(_spellId)) return false; @@ -1851,7 +1851,7 @@ class spell_gen_lifebloom : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), _spellId, true, NULL, aurEff, GetCasterGUID()); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_gen_lifebloom_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); } @@ -1860,7 +1860,7 @@ class spell_gen_lifebloom : public SpellScriptLoader uint32 _spellId; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_lifebloom_AuraScript(_spellId); } @@ -2012,7 +2012,7 @@ class spell_gen_mounted_charge: public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), spellId, false); } - void Register() OVERRIDE + void Register() override { SpellInfo const* spell = sSpellMgr->EnsureSpellInfo(m_scriptSpellId); @@ -2024,7 +2024,7 @@ class spell_gen_mounted_charge: public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_mounted_charge_SpellScript(); } @@ -2045,7 +2045,7 @@ class spell_gen_netherbloom : public SpellScriptLoader { PrepareSpellScript(spell_gen_netherbloom_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { for (uint8 i = 0; i < 5; ++i) if (!sSpellMgr->GetSpellInfo(SPELL_NETHERBLOOM_POLLEN_1 + i)) @@ -2076,13 +2076,13 @@ class spell_gen_netherbloom : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_netherbloom_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_netherbloom_SpellScript(); } @@ -2103,7 +2103,7 @@ class spell_gen_nightmare_vine : public SpellScriptLoader { PrepareSpellScript(spell_gen_nightmare_vine_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_NIGHTMARE_POLLEN)) return false; @@ -2122,13 +2122,13 @@ class spell_gen_nightmare_vine : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_nightmare_vine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_nightmare_vine_SpellScript(); } @@ -2154,7 +2154,7 @@ class spell_gen_obsidian_armor : public SpellScriptLoader { PrepareAuraScript(spell_gen_obsidian_armor_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_GEN_OBSIDIAN_ARMOR_HOLY) || !sSpellMgr->GetSpellInfo(SPELL_GEN_OBSIDIAN_ARMOR_FIRE) || @@ -2208,14 +2208,14 @@ class spell_gen_obsidian_armor : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), spellId, true, NULL, aurEff); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_obsidian_armor_AuraScript(); } @@ -2327,7 +2327,7 @@ class spell_gen_on_tournament_mount : public SpellScriptLoader uint32 _pennantSpellId; - bool Load() OVERRIDE + bool Load() override { _pennantSpellId = 0; return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2461,14 +2461,14 @@ class spell_gen_on_tournament_mount : public SpellScriptLoader } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_on_tournament_mount_AuraScript(); } @@ -2483,7 +2483,7 @@ class spell_gen_oracle_wolvar_reputation : public SpellScriptLoader { PrepareSpellScript(spell_gen_oracle_wolvar_reputation_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -2507,13 +2507,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() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_gen_oracle_wolvar_reputation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_oracle_wolvar_reputation_SpellScript(); } @@ -2535,7 +2535,7 @@ class spell_gen_orc_disguise : public SpellScriptLoader { PrepareSpellScript(spell_gen_orc_disguise_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ORC_DISGUISE_TRIGGER) || !sSpellMgr->GetSpellInfo(SPELL_ORC_DISGUISE_MALE) || @@ -2557,13 +2557,13 @@ class spell_gen_orc_disguise : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_orc_disguise_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_orc_disguise_SpellScript(); } @@ -2585,7 +2585,7 @@ class spell_gen_parachute : public SpellScriptLoader { PrepareAuraScript(spell_gen_parachute_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PARACHUTE) || !sSpellMgr->GetSpellInfo(SPELL_PARACHUTE_BUFF)) @@ -2603,13 +2603,13 @@ class spell_gen_parachute : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_parachute_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_parachute_AuraScript(); } @@ -2636,13 +2636,13 @@ class spell_gen_parachute_ic : public SpellScriptLoader target->CastSpell(target, SPELL_PARACHUTE_IC, true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_parachute_ic_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_parachute_ic_AuraScript(); } @@ -2664,7 +2664,7 @@ class spell_gen_pet_summoned : public SpellScriptLoader { PrepareSpellScript(spell_gen_pet_summoned_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -2702,13 +2702,13 @@ class spell_gen_pet_summoned : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_pet_summoned_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_pet_summoned_SpellScript(); } @@ -2723,7 +2723,7 @@ class spell_gen_profession_research : public SpellScriptLoader { PrepareSpellScript(spell_gen_profession_research_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -2751,14 +2751,14 @@ class spell_gen_profession_research : public SpellScriptLoader caster->UpdateCraftSkill(spellId); } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_profession_research_SpellScript(); } @@ -2782,13 +2782,13 @@ class spell_gen_remove_flight_auras : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_remove_flight_auras_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_remove_flight_auras_SpellScript(); } @@ -2845,13 +2845,13 @@ class spell_gen_replenishment : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gen_replenishment_SpellScript::RemoveInvalidTargets, EFFECT_ALL, TARGET_UNIT_CASTER_AREA_RAID); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_replenishment_SpellScript(); } @@ -2860,7 +2860,7 @@ class spell_gen_replenishment : public SpellScriptLoader { PrepareAuraScript(spell_gen_replenishment_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetUnitOwner()->GetPower(POWER_MANA); } @@ -2880,13 +2880,13 @@ class spell_gen_replenishment : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_replenishment_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_replenishment_AuraScript(); } @@ -2909,7 +2909,7 @@ class spell_gen_running_wild : public SpellScriptLoader { PrepareAuraScript(spell_gen_running_wild_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sCreatureDisplayInfoStore.LookupEntry(RUNNING_WILD_MODEL_MALE)) return false; @@ -2930,7 +2930,7 @@ class spell_gen_running_wild : public SpellScriptLoader target->CastSpell(target, mountCapability->SpeedModSpell, TRIGGERED_FULL_MASK); } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_gen_running_wild_AuraScript::HandleMount, EFFECT_1, SPELL_AURA_MOUNTED, AURA_EFFECT_HANDLE_REAL); } @@ -2940,14 +2940,14 @@ class spell_gen_running_wild : public SpellScriptLoader { PrepareSpellScript(spell_gen_running_wild_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ALTERED_FORM)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { // Definitely not a good thing, but currently the only way to do something at cast start // Should be replaced as soon as possible with a new hook: BeforeCastStart @@ -2955,17 +2955,17 @@ class spell_gen_running_wild : public SpellScriptLoader return false; } - void Register() OVERRIDE + void Register() override { } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_running_wild_AuraScript(); } - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_running_wild_SpellScript(); } @@ -3008,14 +3008,14 @@ class spell_gen_two_forms : public SpellScriptLoader target->CastCustomSpell(SPELL_ALTERED_FORM, SPELLVALUE_BASE_POINT0, 1, target, TRIGGERED_FULL_MASK); } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_gen_two_forms_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_gen_two_forms_SpellScript::HandleTransform, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_two_forms_SpellScript(); } @@ -3035,13 +3035,13 @@ class spell_gen_darkflight : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_ALTERED_FORM, TRIGGERED_FULL_MASK); } - void Register() OVERRIDE + void Register() override { AfterCast += SpellCastFn(spell_gen_darkflight_SpellScript::TriggerTransform); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_darkflight_SpellScript(); } @@ -3060,14 +3060,14 @@ class spell_gen_seaforium_blast : public SpellScriptLoader { PrepareSpellScript(spell_gen_seaforium_blast_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PLANT_CHARGES_CREDIT_ACHIEVEMENT)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { // OriginalCaster is always available in Spell::prepare return GetOriginalCaster()->GetTypeId() == TYPEID_PLAYER; @@ -3082,13 +3082,13 @@ class spell_gen_seaforium_blast : public SpellScriptLoader originalCaster->CastSpell(originalCaster, SPELL_PLANT_CHARGES_CREDIT_ACHIEVEMENT, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_seaforium_blast_SpellScript::AchievementCredit, EFFECT_1, SPELL_EFFECT_GAMEOBJECT_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_seaforium_blast_SpellScript(); } @@ -3117,13 +3117,13 @@ class spell_gen_spectator_cheer_trigger : public SpellScriptLoader GetCaster()->HandleEmoteCommand(EmoteArray[urand(0, 2)]); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_spectator_cheer_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_spectator_cheer_trigger_SpellScript(); } @@ -3138,7 +3138,7 @@ class spell_gen_spirit_healer_res : public SpellScriptLoader { PrepareSpellScript(spell_gen_spirit_healer_res_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetOriginalCaster() && GetOriginalCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -3154,13 +3154,13 @@ class spell_gen_spirit_healer_res : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_spirit_healer_res_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_spirit_healer_res_SpellScript(); } @@ -3184,7 +3184,7 @@ class spell_gen_summon_elemental : public SpellScriptLoader public: spell_gen_summon_elemental_AuraScript(uint32 spellId) : AuraScript(), _spellId(spellId) { } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(_spellId)) return false; @@ -3206,7 +3206,7 @@ class spell_gen_summon_elemental : public SpellScriptLoader owner->ToPlayer()->RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true); } - void Register() OVERRIDE + 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); @@ -3216,7 +3216,7 @@ class spell_gen_summon_elemental : public SpellScriptLoader uint32 _spellId; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_summon_elemental_AuraScript(_spellId); } @@ -3239,7 +3239,7 @@ class spell_gen_summon_tournament_mount : public SpellScriptLoader { PrepareSpellScript(spell_gen_summon_tournament_mount_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_LANCE_EQUIPPED)) return false; @@ -3260,13 +3260,13 @@ class spell_gen_summon_tournament_mount : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_gen_summon_tournament_mount_SpellScript::CheckIfLanceEquiped); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_summon_tournament_mount_SpellScript(); } @@ -3288,13 +3288,13 @@ class spell_gen_throw_shield : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_throw_shield_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_throw_shield_SpellScript(); } @@ -3315,7 +3315,7 @@ class spell_gen_tournament_duel : public SpellScriptLoader { PrepareSpellScript(spell_gen_tournament_duel_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ON_TOURNAMENT_MOUNT) || !sSpellMgr->GetSpellInfo(SPELL_MOUNTED_DUEL)) @@ -3340,13 +3340,13 @@ class spell_gen_tournament_duel : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_tournament_duel_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_tournament_duel_SpellScript(); } @@ -3361,7 +3361,7 @@ class spell_gen_tournament_pennant : public SpellScriptLoader { PrepareAuraScript(spell_gen_tournament_pennant_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -3373,13 +3373,13 @@ class spell_gen_tournament_pennant : public SpellScriptLoader caster->RemoveAurasDueToSpell(GetId()); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_tournament_pennant_AuraScript(); } @@ -3402,12 +3402,12 @@ class spell_pvp_trinket_wotf_shared_cd : public SpellScriptLoader { PrepareSpellScript(spell_pvp_trinket_wotf_shared_cd_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER) || !sSpellMgr->GetSpellInfo(SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER_WOTF)) @@ -3422,13 +3422,13 @@ class spell_pvp_trinket_wotf_shared_cd : public SpellScriptLoader GetCaster()->ToPlayer()->AddSpellAndCategoryCooldowns(GetSpellInfo(), GetCastItem() ? GetCastItem()->GetEntry() : 0, GetSpell()); } - void Register() OVERRIDE + void Register() override { AfterCast += SpellCastFn(spell_pvp_trinket_wotf_shared_cd_SpellScript::HandleScript); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pvp_trinket_wotf_shared_cd_SpellScript(); } @@ -3469,7 +3469,7 @@ class spell_gen_turkey_marker : public SpellScriptLoader ModStackAmount(-1, AURA_REMOVE_BY_EXPIRE); } - void Register() OVERRIDE + 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); @@ -3478,7 +3478,7 @@ class spell_gen_turkey_marker : public SpellScriptLoader std::list<uint32> _applyTimes; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_turkey_marker_AuraScript(); } @@ -3518,13 +3518,13 @@ class spell_gen_upper_deck_create_foam_sword : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_upper_deck_create_foam_sword_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_upper_deck_create_foam_sword_SpellScript(); } @@ -3544,7 +3544,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader { PrepareAuraScript(spell_gen_vehicle_scaling_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -3575,7 +3575,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader amount = uint16((avgILvl - baseItemLevel) * factor); } - void Register() OVERRIDE + 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); @@ -3583,7 +3583,7 @@ class spell_gen_vehicle_scaling : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_vehicle_scaling_AuraScript(); } @@ -3611,13 +3611,13 @@ class spell_gen_vendor_bark_trigger : public SpellScriptLoader vendor->AI()->Talk(SAY_AMPHITHEATER_VENDOR); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_gen_vendor_bark_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_vendor_bark_trigger_SpellScript(); } @@ -3640,13 +3640,13 @@ class spell_gen_wg_water : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_gen_wg_water_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_wg_water_SpellScript(); } @@ -3666,7 +3666,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*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_YOGG_SARON_WHISPER_DUMMY)) return false; @@ -3679,13 +3679,13 @@ class spell_gen_whisper_gulch_yogg_saron_whisper : public SpellScriptLoader GetTarget()->CastSpell((Unit*)NULL, SPELL_YOGG_SARON_WHISPER_DUMMY, true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript(); } @@ -3706,13 +3706,13 @@ class spell_gen_eject_all_passengers : public SpellScriptLoader vehicle->RemoveAllPassengers(); } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_gen_eject_all_passengers_SpellScript::RemoveVehicleAuras); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_gen_eject_all_passengers_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp index 07d95aa63f5..dc0c70975dd 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() OVERRIDE + 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 OVERRIDE + 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*/) OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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*/) OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_or_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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*/) OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hallow_end_tricky_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hallow_end_tricky_treat_SpellScript(); } @@ -303,7 +303,7 @@ class spell_pilgrims_bounty_buff_food : public SpellScriptLoader public: spell_pilgrims_bounty_buff_food_AuraScript(uint32 triggeredSpellId) : AuraScript(), _triggeredSpellId(triggeredSpellId) { } - bool Load() OVERRIDE + bool Load() override { _handled = false; return true; @@ -319,7 +319,7 @@ class spell_pilgrims_bounty_buff_food : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), _triggeredSpellId, true); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_pilgrims_bounty_buff_food_AuraScript::HandleTriggerSpell, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } @@ -327,7 +327,7 @@ class spell_pilgrims_bounty_buff_food : public SpellScriptLoader bool _handled; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pilgrims_bounty_buff_food_AuraScript(_triggeredSpellId); } @@ -349,7 +349,7 @@ class spell_winter_veil_mistletoe : public SpellScriptLoader { PrepareSpellScript(spell_winter_veil_mistletoe_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_MISTLETOE) || !sSpellMgr->GetSpellInfo(SPELL_CREATE_HOLLY) || @@ -367,13 +367,13 @@ class spell_winter_veil_mistletoe : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_winter_veil_mistletoe_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_winter_veil_mistletoe_SpellScript(); } @@ -397,7 +397,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*/) OVERRIDE + 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) || @@ -429,7 +429,7 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_winter_veil_px_238_winter_wondervolt_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } @@ -438,7 +438,7 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader }; - SpellScript* GetSpellScript() const OVERRIDE + 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 c924b460cc0..e780b88c6be 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -74,7 +74,7 @@ class spell_hun_ancient_hysteria : public SpellScriptLoader { PrepareSpellScript(spell_hun_ancient_hysteria_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_INSANITY) || !sSpellMgr->GetSpellInfo(SPELL_MAGE_TEMPORAL_DISPLACEMENT) @@ -98,14 +98,14 @@ class spell_hun_ancient_hysteria : public SpellScriptLoader target->CastSpell(target, SPELL_HUNTER_INSANITY, true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hun_ancient_hysteria_SpellScript::RemoveInvalidTargets, EFFECT_ALL, TARGET_UNIT_CASTER_AREA_RAID); AfterHit += SpellHitFn(spell_hun_ancient_hysteria_SpellScript::ApplyDebuff); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_ancient_hysteria_SpellScript(); } @@ -121,7 +121,7 @@ class spell_hun_chimera_shot : public SpellScriptLoader { PrepareSpellScript(spell_hun_chimera_shot_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_CHIMERA_SHOT_HEAL) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_SERPENT_STING)) @@ -129,7 +129,7 @@ class spell_hun_chimera_shot : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -142,13 +142,13 @@ class spell_hun_chimera_shot : public SpellScriptLoader aur->SetDuration(aur->GetSpellInfo()->GetMaxDuration(), true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hun_chimera_shot_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_chimera_shot_SpellScript(); } @@ -164,7 +164,7 @@ class spell_hun_cobra_shot : public SpellScriptLoader { PrepareSpellScript(spell_hun_cobra_shot_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_GENERIC_ENERGIZE_FOCUS) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_SERPENT_STING)) @@ -172,7 +172,7 @@ class spell_hun_cobra_shot : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -188,13 +188,13 @@ class spell_hun_cobra_shot : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hun_cobra_shot_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_cobra_shot_SpellScript(); } @@ -219,13 +219,13 @@ class spell_hun_disengage : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_hun_disengage_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_disengage_SpellScript(); } @@ -255,13 +255,13 @@ class spell_hun_fire : public SpellScriptLoader spellMod->value = -aurEff->GetAmount(); } - void Register() OVERRIDE + void Register() override { DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_hun_fire_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_fire_AuraScript(); } @@ -277,7 +277,7 @@ class spell_hun_improved_mend_pet : public SpellScriptLoader { PrepareAuraScript(spell_hun_improved_mend_pet_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_IMPROVED_MEND_PET)) return false; @@ -295,14 +295,14 @@ class spell_hun_improved_mend_pet : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_IMPROVED_MEND_PET, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_hun_improved_mend_pet_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_hun_improved_mend_pet_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_improved_mend_pet_AuraScript(); } @@ -332,13 +332,13 @@ class spell_hun_improved_serpent_sting : public SpellScriptLoader spellMod->value = aurEff->GetAmount(); } - void Register() OVERRIDE + void Register() override { DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_hun_improved_serpent_sting_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_improved_serpent_sting_AuraScript(); } @@ -354,7 +354,7 @@ class spell_hun_invigoration : public SpellScriptLoader { PrepareSpellScript(spell_hun_invigoration_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_INVIGORATION_TRIGGERED)) return false; @@ -369,13 +369,13 @@ class spell_hun_invigoration : public SpellScriptLoader unitTarget->CastSpell(unitTarget, SPELL_HUNTER_INVIGORATION_TRIGGERED, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hun_invigoration_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_invigoration_SpellScript(); } @@ -391,7 +391,7 @@ class spell_hun_last_stand_pet : public SpellScriptLoader { PrepareSpellScript(spell_hun_last_stand_pet_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_PET_LAST_STAND_TRIGGERED)) return false; @@ -405,13 +405,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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hun_last_stand_pet_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_last_stand_pet_SpellScript(); } @@ -427,7 +427,7 @@ class spell_hun_masters_call : public SpellScriptLoader { PrepareSpellScript(spell_hun_masters_call_SpellScript); - bool Validate(SpellInfo const* spellInfo) OVERRIDE + bool Validate(SpellInfo const* spellInfo) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_MASTERS_CALL_TRIGGERED) || !sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_0].CalcValue())) @@ -456,14 +456,14 @@ class spell_hun_masters_call : public SpellScriptLoader } } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_masters_call_SpellScript(); } @@ -479,7 +479,7 @@ class spell_hun_misdirection : public SpellScriptLoader { PrepareAuraScript(spell_hun_misdirection_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_MISDIRECTION_PROC)) return false; @@ -503,7 +503,7 @@ class spell_hun_misdirection : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_MISDIRECTION_PROC, true, NULL, aurEff); } - void Register() OVERRIDE + 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); @@ -511,7 +511,7 @@ class spell_hun_misdirection : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_misdirection_AuraScript(); } @@ -532,13 +532,13 @@ class spell_hun_misdirection_proc : public SpellScriptLoader GetTarget()->ResetRedirectThreat(); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_hun_misdirection_proc_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_misdirection_proc_AuraScript(); } @@ -554,14 +554,14 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader { PrepareSpellScript(spell_hun_pet_carrion_feeder_SpellScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster()->IsPet()) return false; return true; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_PET_CARRION_FEEDER_TRIGGERED)) return false; @@ -588,14 +588,14 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader caster->CastSpell(caster, SPELL_HUNTER_PET_CARRION_FEEDER_TRIGGERED, false); } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_pet_carrion_feeder_SpellScript(); } @@ -611,14 +611,14 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScriptLoader { PrepareSpellScript(spell_hun_pet_heart_of_the_phoenix_SpellScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster()->IsPet()) return false; return true; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + 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; @@ -636,13 +636,13 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hun_pet_heart_of_the_phoenix_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_pet_heart_of_the_phoenix_SpellScript(); } @@ -658,7 +658,7 @@ class spell_hun_rapid_recuperation : public SpellScriptLoader { PrepareAuraScript(spell_hun_rapid_recuperation_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_RAPID_RECUPERATION)) return false; @@ -683,14 +683,14 @@ class spell_hun_rapid_recuperation : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_HUNTER_RAPID_RECUPERATION, SPELLVALUE_BASE_POINT0, focus, GetTarget(), true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_hun_rapid_recuperation_AuraScript::HandleAbilityCast, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); OnEffectProc += AuraEffectProcFn(spell_hun_rapid_recuperation_AuraScript::HandleFocusRegen, EFFECT_1, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_rapid_recuperation_AuraScript(); } @@ -706,7 +706,7 @@ class spell_hun_readiness : public SpellScriptLoader { PrepareSpellScript(spell_hun_readiness_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -733,13 +733,13 @@ class spell_hun_readiness : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hun_readiness_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_readiness_SpellScript(); } @@ -755,7 +755,7 @@ class spell_hun_ready_set_aim : public SpellScriptLoader { PrepareAuraScript(spell_hun_ready_set_aim_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_FIRE)) return false; @@ -771,13 +771,13 @@ class spell_hun_ready_set_aim : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_hun_ready_set_aim_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_ready_set_aim_AuraScript(); } @@ -793,7 +793,7 @@ class spell_hun_scatter_shot : public SpellScriptLoader { PrepareSpellScript(spell_hun_scatter_shot_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -807,13 +807,13 @@ class spell_hun_scatter_shot : public SpellScriptLoader caster->SendAttackSwingCancelAttack(); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_hun_scatter_shot_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_scatter_shot_SpellScript(); } @@ -829,7 +829,7 @@ class spell_hun_sniper_training : public SpellScriptLoader { PrepareAuraScript(spell_hun_sniper_training_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_SNIPER_TRAINING_R1) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_SNIPER_TRAINING_BUFF_R1)) @@ -866,14 +866,14 @@ class spell_hun_sniper_training : public SpellScriptLoader } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_sniper_training_AuraScript(); } @@ -889,14 +889,14 @@ class spell_hun_steady_shot : public SpellScriptLoader { PrepareSpellScript(spell_hun_steady_shot_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_STEADY_SHOT_FOCUS)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -906,13 +906,13 @@ class spell_hun_steady_shot : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_HUNTER_STEADY_SHOT_FOCUS, true); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_hun_steady_shot_SpellScript::HandleOnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_steady_shot_SpellScript(); } @@ -958,13 +958,13 @@ class spell_hun_tame_beast : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_hun_tame_beast_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_tame_beast_SpellScript(); } @@ -988,14 +988,14 @@ class spell_hun_target_only_pet_and_owner : public SpellScriptLoader targets.push_back(owner); } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_hun_target_only_pet_and_owner_SpellScript(); } @@ -1011,7 +1011,7 @@ class spell_hun_thrill_of_the_hunt : public SpellScriptLoader { PrepareAuraScript(spell_hun_thrill_of_the_hunt_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_THRILL_OF_THE_HUNT)) return false; @@ -1027,13 +1027,13 @@ class spell_hun_thrill_of_the_hunt : public SpellScriptLoader GetTarget()->CastCustomSpell(GetTarget(), SPELL_HUNTER_THRILL_OF_THE_HUNT, &focus, NULL, NULL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_hun_thrill_of_the_hunt_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_thrill_of_the_hunt_AuraScript(); } @@ -1049,7 +1049,7 @@ class spell_hun_tnt : public SpellScriptLoader { PrepareAuraScript(spell_hun_tnt_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_HUNTER_LOCK_AND_LOAD)) return false; @@ -1067,14 +1067,14 @@ class spell_hun_tnt : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_HUNTER_LOCK_AND_LOAD, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_hun_tnt_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_hun_tnt_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_tnt_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index d8d70246e99..e4563ba07fe 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* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) 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() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_trigger_spell_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_trigger_spell_SpellScript(_triggeredSpellId); } @@ -88,7 +88,7 @@ class spell_item_aegis_of_preservation : public SpellScriptLoader { PrepareAuraScript(spell_item_aegis_of_preservation_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_AEGIS_HEAL)) return false; @@ -101,13 +101,13 @@ class spell_item_aegis_of_preservation : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_AEGIS_HEAL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_item_aegis_of_preservation_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_aegis_of_preservation_AuraScript(); } @@ -130,13 +130,13 @@ class spell_item_arcane_shroud : public SpellScriptLoader amount += 2 * diff; } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_item_arcane_shroud_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_THREAT); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_arcane_shroud_AuraScript(); } @@ -157,7 +157,7 @@ class spell_item_blessing_of_ancient_kings : public SpellScriptLoader { PrepareAuraScript(spell_item_blessing_of_ancient_kings_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PROTECTION_OF_ANCIENT_KINGS)) return false; @@ -186,14 +186,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() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_blessing_of_ancient_kings_AuraScript(); } @@ -220,7 +220,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*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (_failSpell && !sSpellMgr->GetSpellInfo(_failSpell)) return false; @@ -237,7 +237,7 @@ class spell_item_defibrillate : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_defibrillate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_RESURRECT); } @@ -247,7 +247,7 @@ class spell_item_defibrillate : public SpellScriptLoader uint32 _failSpell; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_defibrillate_SpellScript(_chance, _failSpell); } @@ -272,7 +272,7 @@ class spell_item_desperate_defense : public SpellScriptLoader { PrepareAuraScript(spell_item_desperate_defense_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_DESPERATE_RAGE)) return false; @@ -285,13 +285,13 @@ class spell_item_desperate_defense : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_DESPERATE_RAGE, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_item_desperate_defense_AuraScript::HandleProc, EFFECT_2, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_desperate_defense_AuraScript(); } @@ -317,12 +317,12 @@ class spell_item_deviate_fish : public SpellScriptLoader { PrepareSpellScript(spell_item_deviate_fish_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { for (uint32 spellId = SPELL_SLEEPY; spellId <= SPELL_HEALTHY_SPIRIT; ++spellId) if (!sSpellMgr->GetSpellInfo(spellId)) @@ -337,13 +337,13 @@ class spell_item_deviate_fish : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_deviate_fish_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_deviate_fish_SpellScript(); } @@ -371,13 +371,13 @@ class spell_item_echoes_of_light : public SpellScriptLoader targets.push_back(target); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_item_echoes_of_light_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_echoes_of_light_SpellScript(); } @@ -401,7 +401,7 @@ class spell_item_flask_of_the_north : public SpellScriptLoader { PrepareSpellScript(spell_item_flask_of_the_north_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) 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; @@ -441,13 +441,13 @@ class spell_item_flask_of_the_north : public SpellScriptLoader caster->CastSpell(caster, possibleSpells[irand(0, (possibleSpells.size() - 1))], true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_flask_of_the_north_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_flask_of_the_north_SpellScript(); } @@ -470,7 +470,7 @@ class spell_item_gnomish_death_ray : public SpellScriptLoader { PrepareSpellScript(spell_item_gnomish_death_ray_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_GNOMISH_DEATH_RAY_SELF) || !sSpellMgr->GetSpellInfo(SPELL_GNOMISH_DEATH_RAY_TARGET)) return false; @@ -489,13 +489,13 @@ class spell_item_gnomish_death_ray : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_gnomish_death_ray_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_gnomish_death_ray_SpellScript(); } @@ -521,12 +521,12 @@ class spell_item_make_a_wish : public SpellScriptLoader { PrepareSpellScript(spell_item_make_a_wish_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) 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; @@ -547,13 +547,13 @@ class spell_item_make_a_wish : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_make_a_wish_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_make_a_wish_SpellScript(); } @@ -603,13 +603,13 @@ class spell_item_mingos_fortune_generator : public SpellScriptLoader CreateItem(effIndex, newitemid); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_mingos_fortune_generator_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_mingos_fortune_generator_SpellScript(); } @@ -630,7 +630,7 @@ class spell_item_necrotic_touch : public SpellScriptLoader { PrepareAuraScript(spell_item_necrotic_touch_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ITEM_NECROTIC_TOUCH_PROC)) return false; @@ -649,14 +649,14 @@ class spell_item_necrotic_touch : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_ITEM_NECROTIC_TOUCH_PROC, SPELLVALUE_BASE_POINT0, bp, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_item_necrotic_touch_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_item_necrotic_touch_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_necrotic_touch_AuraScript(); } @@ -680,7 +680,7 @@ class spell_item_net_o_matic : public SpellScriptLoader { PrepareSpellScript(spell_item_net_o_matic_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) 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; @@ -702,13 +702,13 @@ class spell_item_net_o_matic : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_net_o_matic_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_net_o_matic_SpellScript(); } @@ -732,12 +732,12 @@ class spell_item_noggenfogger_elixir : public SpellScriptLoader { PrepareSpellScript(spell_item_noggenfogger_elixir_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_NOGGENFOGGER_ELIXIR_TRIGGERED1) || !sSpellMgr->GetSpellInfo(SPELL_NOGGENFOGGER_ELIXIR_TRIGGERED2) || !sSpellMgr->GetSpellInfo(SPELL_NOGGENFOGGER_ELIXIR_TRIGGERED3)) return false; @@ -757,13 +757,13 @@ class spell_item_noggenfogger_elixir : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_noggenfogger_elixir_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_noggenfogger_elixir_SpellScript(); } @@ -786,13 +786,13 @@ class spell_item_piccolo_of_the_flaming_fire : public SpellScriptLoader target->HandleEmoteCommand(EMOTE_STATE_DANCE); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_piccolo_of_the_flaming_fire_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_piccolo_of_the_flaming_fire_SpellScript(); } @@ -817,12 +817,12 @@ class spell_item_savory_deviate_delight : public SpellScriptLoader { PrepareSpellScript(spell_item_savory_deviate_delight_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { for (uint32 spellId = SPELL_FLIP_OUT_MALE; spellId <= SPELL_YAAARRRR_FEMALE; ++spellId) if (!sSpellMgr->GetSpellInfo(spellId)) @@ -844,13 +844,13 @@ class spell_item_savory_deviate_delight : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_savory_deviate_delight_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_savory_deviate_delight_SpellScript(); } @@ -878,7 +878,7 @@ class spell_item_scroll_of_recall : public SpellScriptLoader { PrepareSpellScript(spell_item_scroll_of_recall_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -917,13 +917,13 @@ class spell_item_scroll_of_recall : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_scroll_of_recall_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_TELEPORT_UNITS); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_scroll_of_recall_SpellScript(); } @@ -958,13 +958,13 @@ class spell_item_unsated_craving : public SpellScriptLoader return true; } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_item_unsated_craving_AuraScript::CheckProc); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_unsated_craving_AuraScript(); } @@ -989,13 +989,13 @@ class spell_item_shadows_fate : public SpellScriptLoader caster->CastSpell(target, SPELL_SOUL_FEAST, TRIGGERED_FULL_MASK); } - void Register() OVERRIDE + void Register() override { OnProc += AuraProcFn(spell_item_shadows_fate_AuraScript::HandleProc); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_shadows_fate_AuraScript(); } @@ -1020,7 +1020,7 @@ class spell_item_shadowmourne : public SpellScriptLoader { PrepareAuraScript(spell_item_shadowmourne_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHADOWMOURNE_CHAOS_BANE_DAMAGE)) return false; @@ -1054,14 +1054,14 @@ class spell_item_shadowmourne : public SpellScriptLoader } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_shadowmourne_AuraScript(); } @@ -1077,7 +1077,7 @@ class spell_item_shadowmourne_soul_fragment : public SpellScriptLoader { PrepareAuraScript(spell_item_shadowmourne_soul_fragment_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + 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; @@ -1112,14 +1112,14 @@ class spell_item_shadowmourne_soul_fragment : public SpellScriptLoader target->RemoveAurasDueToSpell(SPELL_SHADOWMOURNE_VISUAL_HIGH); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_shadowmourne_soul_fragment_AuraScript(); } @@ -1146,7 +1146,7 @@ class spell_item_six_demon_bag : public SpellScriptLoader { PrepareSpellScript(spell_item_six_demon_bag_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) 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; @@ -1184,13 +1184,13 @@ class spell_item_six_demon_bag : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_six_demon_bag_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_six_demon_bag_SpellScript(); } @@ -1213,13 +1213,13 @@ class spell_item_the_eye_of_diminution : public SpellScriptLoader amount += diff; } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_item_the_eye_of_diminution_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_THREAT); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_item_the_eye_of_diminution_AuraScript(); } @@ -1243,11 +1243,11 @@ class spell_item_underbelly_elixir : public SpellScriptLoader { PrepareSpellScript(spell_item_underbelly_elixir_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_UNDERBELLY_ELIXIR_TRIGGERED1) || !sSpellMgr->GetSpellInfo(SPELL_UNDERBELLY_ELIXIR_TRIGGERED2) || !sSpellMgr->GetSpellInfo(SPELL_UNDERBELLY_ELIXIR_TRIGGERED3)) return false; @@ -1266,13 +1266,13 @@ class spell_item_underbelly_elixir : public SpellScriptLoader caster->CastSpell(caster, spellId, true, NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_underbelly_elixir_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_underbelly_elixir_SpellScript(); } @@ -1294,7 +1294,7 @@ class spell_item_red_rider_air_rifle : public SpellScriptLoader { PrepareSpellScript(spell_item_red_rider_air_rifle_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + 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; @@ -1318,13 +1318,13 @@ class spell_item_red_rider_air_rifle : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_red_rider_air_rifle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_red_rider_air_rifle_SpellScript(); } @@ -1369,13 +1369,13 @@ class spell_item_create_heart_candy : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_create_heart_candy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_create_heart_candy_SpellScript(); } @@ -1390,7 +1390,7 @@ class spell_item_book_of_glyph_mastery : public SpellScriptLoader { PrepareSpellScript(spell_item_book_of_glyph_mastery_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1416,14 +1416,14 @@ class spell_item_book_of_glyph_mastery : public SpellScriptLoader caster->learnSpell(discoveredSpellId, false); } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_book_of_glyph_mastery_SpellScript(); } @@ -1457,13 +1457,13 @@ class spell_item_gift_of_the_harvester : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_item_gift_of_the_harvester_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_gift_of_the_harvester_SpellScript(); } @@ -1497,13 +1497,13 @@ class spell_item_map_of_the_geyser_fields : public SpellScriptLoader return SPELL_FAILED_CUSTOM_ERROR; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_item_map_of_the_geyser_fields_SpellScript::CheckSinkholes); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_map_of_the_geyser_fields_SpellScript(); } @@ -1525,7 +1525,7 @@ class spell_item_vanquished_clutches : public SpellScriptLoader { PrepareSpellScript(spell_item_vanquished_clutches_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_CRUSHER) || !sSpellMgr->GetSpellInfo(SPELL_CONSTRICTOR) || !sSpellMgr->GetSpellInfo(SPELL_CORRUPTOR)) return false; @@ -1539,13 +1539,13 @@ class spell_item_vanquished_clutches : public SpellScriptLoader caster->CastSpell(caster, spellId, true); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_vanquished_clutches_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_vanquished_clutches_SpellScript(); } @@ -1576,7 +1576,7 @@ class spell_item_ashbringer : public SpellScriptLoader { PrepareSpellScript(spell_item_ashbringer_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1594,13 +1594,13 @@ class spell_item_ashbringer : public SpellScriptLoader player->PlayDirectSound(sound_id, player); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_item_ashbringer_SpellScript::OnDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_ashbringer_SpellScript(); } @@ -1652,13 +1652,13 @@ class spell_magic_eater_food : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_magic_eater_food_AuraScript::HandleTriggerSpell, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_magic_eater_food_AuraScript(); } @@ -1679,13 +1679,13 @@ class spell_item_shimmering_vessel : public SpellScriptLoader target->setDeathState(JUST_RESPAWNED); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_shimmering_vessel_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_shimmering_vessel_SpellScript(); } @@ -1706,12 +1706,12 @@ class spell_item_purify_helboar_meat : public SpellScriptLoader { PrepareSpellScript(spell_item_purify_helboar_meat_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_PURIFIED_HELBOAR_MEAT) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_TOXIC_HELBOAR_MEAT)) return false; @@ -1724,13 +1724,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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_purify_helboar_meat_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_purify_helboar_meat_SpellScript(); } @@ -1750,7 +1750,7 @@ class spell_item_crystal_prison_dummy_dnd : public SpellScriptLoader { PrepareSpellScript(spell_item_crystal_prison_dummy_dnd_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sObjectMgr->GetGameObjectTemplate(OBJECT_IMPRISONED_DOOMGUARD)) return false; @@ -1767,13 +1767,13 @@ class spell_item_crystal_prison_dummy_dnd : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_crystal_prison_dummy_dnd_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_crystal_prison_dummy_dnd_SpellScript(); } @@ -1797,7 +1797,7 @@ class spell_item_reindeer_transformation : public SpellScriptLoader { PrepareSpellScript(spell_item_reindeer_transformation_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + 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) @@ -1835,13 +1835,13 @@ class spell_item_reindeer_transformation : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_reindeer_transformation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_reindeer_transformation_SpellScript(); } @@ -1862,7 +1862,7 @@ class spell_item_nigh_invulnerability : public SpellScriptLoader { PrepareSpellScript(spell_item_nigh_invulnerability_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_NIGH_INVULNERABILITY) || !sSpellMgr->GetSpellInfo(SPELL_COMPLETE_VULNERABILITY)) return false; @@ -1881,13 +1881,13 @@ class spell_item_nigh_invulnerability : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_nigh_invulnerability_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_nigh_invulnerability_SpellScript(); } @@ -1908,7 +1908,7 @@ class spell_item_poultryizer : public SpellScriptLoader { PrepareSpellScript(spell_item_poultryizer_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_POULTRYIZER_SUCCESS) || !sSpellMgr->GetSpellInfo(SPELL_POULTRYIZER_BACKFIRE)) return false; @@ -1921,13 +1921,13 @@ class spell_item_poultryizer : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), roll_chance_i(80) ? SPELL_POULTRYIZER_SUCCESS : SPELL_POULTRYIZER_BACKFIRE, true, GetCastItem()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_poultryizer_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_poultryizer_SpellScript(); } @@ -1948,11 +1948,11 @@ class spell_item_socrethars_stone : public SpellScriptLoader { PrepareSpellScript(spell_item_socrethars_stone_SpellScript); - bool Load() OVERRIDE + bool Load() override { return (GetCaster()->GetAreaId() == 3900 || GetCaster()->GetAreaId() == 3742); } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SOCRETHAR_TO_SEAT) || !sSpellMgr->GetSpellInfo(SPELL_SOCRETHAR_FROM_SEAT)) return false; @@ -1975,13 +1975,13 @@ class spell_item_socrethars_stone : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_socrethars_stone_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_socrethars_stone_SpellScript(); } @@ -2003,14 +2003,14 @@ class spell_item_demon_broiled_surprise : public SpellScriptLoader { PrepareSpellScript(spell_item_demon_broiled_surprise_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + 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() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -2033,14 +2033,14 @@ class spell_item_demon_broiled_surprise : public SpellScriptLoader return SPELL_FAILED_NOT_HERE; } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_demon_broiled_surprise_SpellScript(); } @@ -2060,7 +2060,7 @@ class spell_item_complete_raptor_capture : public SpellScriptLoader { PrepareSpellScript(spell_item_complete_raptor_capture_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_RAPTOR_CAPTURE_CREDIT)) return false; @@ -2079,13 +2079,13 @@ class spell_item_complete_raptor_capture : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_complete_raptor_capture_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_complete_raptor_capture_SpellScript(); } @@ -2106,7 +2106,7 @@ class spell_item_impale_leviroth : public SpellScriptLoader { PrepareSpellScript(spell_item_impale_leviroth_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sObjectMgr->GetCreatureTemplate(NPC_LEVIROTH)) return false; @@ -2120,13 +2120,13 @@ class spell_item_impale_leviroth : public SpellScriptLoader target->CastSpell(target, SPELL_LEVIROTH_SELF_IMPALE, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_impale_leviroth_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_impale_leviroth_SpellScript(); } @@ -2151,7 +2151,7 @@ class spell_item_brewfest_mount_transformation : public SpellScriptLoader { PrepareSpellScript(spell_item_brewfest_mount_transformation_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + 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; @@ -2187,13 +2187,13 @@ class spell_item_brewfest_mount_transformation : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_brewfest_mount_transformation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_brewfest_mount_transformation_SpellScript(); } @@ -2214,14 +2214,14 @@ class spell_item_nitro_boots : public SpellScriptLoader { PrepareSpellScript(spell_item_nitro_boots_SpellScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCastItem()) return false; return true; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_NITRO_BOOTS_SUCCESS) || !sSpellMgr->GetSpellInfo(SPELL_NITRO_BOOTS_BACKFIRE)) return false; @@ -2234,13 +2234,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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_nitro_boots_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_nitro_boots_SpellScript(); } @@ -2261,12 +2261,12 @@ class spell_item_teach_language : public SpellScriptLoader { PrepareSpellScript(spell_item_teach_language_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_LEARN_GNOMISH_BINARY) || !sSpellMgr->GetSpellInfo(SPELL_LEARN_GOBLIN_BINARY)) return false; @@ -2281,13 +2281,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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_teach_language_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_teach_language_SpellScript(); } @@ -2307,12 +2307,12 @@ class spell_item_rocket_boots : public SpellScriptLoader { PrepareSpellScript(spell_item_rocket_boots_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROCKET_BOOTS_PROC)) return false; @@ -2336,14 +2336,14 @@ class spell_item_rocket_boots : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_rocket_boots_SpellScript(); } @@ -2364,7 +2364,7 @@ class spell_item_pygmy_oil : public SpellScriptLoader { PrepareSpellScript(spell_item_pygmy_oil_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PYGMY_OIL_PYGMY_AURA) || !sSpellMgr->GetSpellInfo(SPELL_PYGMY_OIL_SMALLER_AURA)) return false; @@ -2389,13 +2389,13 @@ class spell_item_pygmy_oil : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_pygmy_oil_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_pygmy_oil_SpellScript(); } @@ -2416,13 +2416,13 @@ class spell_item_unusual_compass : public SpellScriptLoader caster->SetFacingTo(frand(0.0f, 2.0f * M_PI)); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_unusual_compass_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_unusual_compass_SpellScript(); } @@ -2445,12 +2445,12 @@ class spell_item_chicken_cover : public SpellScriptLoader { PrepareSpellScript(spell_item_chicken_cover_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + 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; @@ -2470,13 +2470,13 @@ class spell_item_chicken_cover : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_chicken_cover_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_chicken_cover_SpellScript(); } @@ -2498,13 +2498,13 @@ class spell_item_muisek_vessel : public SpellScriptLoader target->DespawnOrUnsummon(); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_muisek_vessel_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_item_muisek_vessel_SpellScript(); } @@ -2529,13 +2529,13 @@ public: GetCaster()->CastSpell(GetCaster(), SPELL_FORCE_CAST_SUMMON_GNOME_SOUL); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_item_greatmothers_soulcatcher_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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 d1126f59c4c..55c1edec480 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -113,7 +113,7 @@ class spell_mage_arcane_potency : public SpellScriptLoader { PrepareAuraScript(spell_mage_arcane_potency_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ARCANCE_POTENCY_RANK_1) || !sSpellMgr->GetSpellInfo(SPELL_ARCANCE_POTENCY_RANK_2) || @@ -139,13 +139,13 @@ class spell_mage_arcane_potency : public SpellScriptLoader } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_mage_arcane_potency_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_arcane_potency_AuraScript(); } @@ -155,7 +155,7 @@ class spell_mage_arcane_potency : public SpellScriptLoader class spell_mage_incanters_absorbtion_base_AuraScript : public AuraScript { public: - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED)) return false; @@ -186,7 +186,7 @@ class spell_mage_blast_wave : public SpellScriptLoader { PrepareSpellScript(spell_mage_blast_wave_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_FLAMESTRIKE)) return false; @@ -214,7 +214,7 @@ class spell_mage_blast_wave : public SpellScriptLoader } } - void Register() OVERRIDE + 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); @@ -224,7 +224,7 @@ class spell_mage_blast_wave : public SpellScriptLoader uint32 _targetCount; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mage_blast_wave_SpellScript(); } @@ -240,7 +240,7 @@ class spell_mage_blazing_speed : public SpellScriptLoader { PrepareAuraScript(spell_mage_blazing_speed_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_BLAZING_SPEED)) return false; @@ -253,13 +253,13 @@ class spell_mage_blazing_speed : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_MAGE_BLAZING_SPEED, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_mage_blazing_speed_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_blazing_speed_AuraScript(); } @@ -319,7 +319,7 @@ class spell_mage_cold_snap : public SpellScriptLoader { PrepareSpellScript(spell_mage_cold_snap_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -344,13 +344,13 @@ class spell_mage_cold_snap : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_mage_cold_snap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mage_cold_snap_SpellScript(); } @@ -379,13 +379,13 @@ class spell_mage_cone_of_cold : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_mage_cone_of_cold_SpellScript::HandleConeOfColdScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mage_cone_of_cold_SpellScript(); } @@ -422,7 +422,7 @@ class spell_mage_conjure_refreshment : public SpellScriptLoader { PrepareSpellScript(spell_mage_conjure_refreshment_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { for (uint8 i = 0; i < MAX_CONJURE_REFRESHMENT_SPELLS; ++i) if (!sSpellMgr->GetSpellInfo(_conjureData[i].spellId)) @@ -430,7 +430,7 @@ class spell_mage_conjure_refreshment : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { if (GetCaster()->GetTypeId() != TYPEID_PLAYER) return false; @@ -450,13 +450,13 @@ class spell_mage_conjure_refreshment : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_mage_conjure_refreshment_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mage_conjure_refreshment_SpellScript(); } @@ -472,7 +472,7 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader { PrepareAuraScript(spell_mage_fire_frost_ward_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_FROST_WARDING_TRIGGERED) || !sSpellMgr->GetSpellInfo(SPELL_MAGE_FROST_WARDING_R1)) @@ -513,7 +513,7 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader } } - void Register() OVERRIDE + 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); @@ -521,7 +521,7 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_fire_frost_ward_AuraScript(); } @@ -537,14 +537,14 @@ class spell_mage_focus_magic : public SpellScriptLoader { PrepareAuraScript(spell_mage_focus_magic_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_FOCUS_MAGIC_PROC)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { _procTarget = NULL; return true; @@ -562,7 +562,7 @@ class spell_mage_focus_magic : public SpellScriptLoader GetTarget()->CastSpell(_procTarget, SPELL_MAGE_FOCUS_MAGIC_PROC, true, NULL, aurEff); } - void Register() OVERRIDE + 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); @@ -572,7 +572,7 @@ class spell_mage_focus_magic : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_focus_magic_AuraScript(); } @@ -624,7 +624,7 @@ class spell_mage_glyph_of_ice_block : public SpellScriptLoader { PrepareAuraScript(spell_mage_glyph_of_ice_block_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_FROST_NOVA)) return false; @@ -643,14 +643,14 @@ class spell_mage_glyph_of_ice_block : public SpellScriptLoader GetTarget()->ToPlayer()->RemoveSpellCooldown(SPELL_MAGE_FROST_NOVA, true); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_mage_glyph_of_ice_block_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_mage_glyph_of_ice_block_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_glyph_of_ice_block_AuraScript(); } @@ -674,13 +674,13 @@ class spell_mage_glyph_of_icy_veins : public SpellScriptLoader GetTarget()->RemoveAurasByType(SPELL_AURA_MOD_DECREASE_SPEED); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_mage_glyph_of_icy_veins_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_glyph_of_icy_veins_AuraScript(); } @@ -696,7 +696,7 @@ class spell_mage_glyph_of_polymorph : public SpellScriptLoader { PrepareAuraScript(spell_mage_glyph_of_polymorph_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_SHADOW_WORD_DEATH)) return false; @@ -713,13 +713,13 @@ class spell_mage_glyph_of_polymorph : public SpellScriptLoader target->RemoveAurasByType(SPELL_AURA_PERIODIC_LEECH); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_mage_glyph_of_polymorph_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_glyph_of_polymorph_AuraScript(); } @@ -752,13 +752,13 @@ class spell_mage_living_bomb : public SpellScriptLoader caster->CastSpell(GetTarget(), uint32(aurEff->GetAmount()), true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_mage_living_bomb_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_living_bomb_AuraScript(); } @@ -792,7 +792,7 @@ class spell_mage_ice_barrier : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_ice_barrier_AuraScript(); } @@ -808,7 +808,7 @@ class spell_mage_ignite : public SpellScriptLoader { PrepareAuraScript(spell_mage_ignite_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_IGNITE)) return false; @@ -832,14 +832,14 @@ class spell_mage_ignite : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_MAGE_IGNITE, SPELLVALUE_BASE_POINT0, amount, eventInfo.GetProcTarget(), true, NULL, aurEff); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_ignite_AuraScript(); } @@ -865,13 +865,13 @@ class spell_mage_mage_ward : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterEffectAbsorb += AuraEffectAbsorbFn(spell_mage_mage_ward_AuraScript::HandleAbsorb, EFFECT_0); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_mage_ward_AuraScript(); } @@ -903,14 +903,14 @@ class spell_mage_mana_shield : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_MAGE_INCANTERS_ABSORBTION_R1, true); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_mana_shield_AuraScript(); } @@ -926,7 +926,7 @@ class spell_mage_master_of_elements : public SpellScriptLoader { PrepareAuraScript(spell_mage_master_of_elements_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE)) return false; @@ -949,14 +949,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() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_master_of_elements_AuraScript(); } @@ -972,7 +972,7 @@ class spell_mage_nether_vortex : public SpellScriptLoader { PrepareAuraScript(spell_mage_nether_vortex_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_SLOW)) return false; @@ -994,14 +994,14 @@ class spell_mage_nether_vortex : public SpellScriptLoader GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_MAGE_SLOW, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_mage_nether_vortex_AuraScript::DoCheck); OnEffectProc += AuraEffectProcFn(spell_mage_nether_vortex_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_nether_vortex_AuraScript(); } @@ -1017,7 +1017,7 @@ class spell_mage_permafrost : public SpellScriptLoader { PrepareAuraScript(spell_mage_permafrost_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_PERMAFROST)) return false; @@ -1037,14 +1037,14 @@ class spell_mage_permafrost : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_MAGE_PERMAFROST, SPELLVALUE_BASE_POINT0, heal, (Unit*)NULL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_mage_permafrost_AuraScript::DoCheck); OnEffectProc += AuraEffectProcFn(spell_mage_permafrost_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_permafrost_AuraScript(); } @@ -1060,7 +1060,7 @@ class spell_mage_polymorph : public SpellScriptLoader { PrepareAuraScript(spell_mage_polymorph_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_IMPROVED_POLYMORPH_RANK_1) || !sSpellMgr->GetSpellInfo(SPELL_MAGE_IMPROVED_POLYMORPH_STUN_RANK_1) || @@ -1069,7 +1069,7 @@ class spell_mage_polymorph : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { _caster = NULL; return true; @@ -1095,7 +1095,7 @@ class spell_mage_polymorph : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_mage_polymorph_AuraScript::DoCheck); OnEffectProc += AuraEffectProcFn(spell_mage_polymorph_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_MOD_CONFUSE); @@ -1105,7 +1105,7 @@ class spell_mage_polymorph : public SpellScriptLoader Unit* _caster; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_polymorph_AuraScript(); } @@ -1129,7 +1129,7 @@ class spell_mage_polymorph_cast_visual : public SpellScriptLoader static const uint32 PolymorhForms[6]; - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { // check if spell ids exist in dbc for (uint32 i = 0; i < 6; i++) @@ -1145,14 +1145,14 @@ class spell_mage_polymorph_cast_visual : public SpellScriptLoader target->CastSpell(target, PolymorhForms[urand(0, 5)], true); } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mage_polymorph_cast_visual_SpellScript(); } @@ -1218,7 +1218,7 @@ class spell_mage_ring_of_frost : public SpellScriptLoader { PrepareAuraScript(spell_mage_ring_of_frost_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_RING_OF_FROST_SUMMON)) return false; @@ -1229,7 +1229,7 @@ class spell_mage_ring_of_frost : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { ringOfFrost = NULL; return true; @@ -1269,14 +1269,14 @@ class spell_mage_ring_of_frost : public SpellScriptLoader TempSummon* ringOfFrost; - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_mage_ring_of_frost_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); OnEffectApply += AuraEffectApplyFn(spell_mage_ring_of_frost_AuraScript::Apply, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_ring_of_frost_AuraScript(); } @@ -1293,7 +1293,7 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader { PrepareSpellScript(spell_mage_ring_of_frost_freeze_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_RING_OF_FROST_SUMMON)) return false; @@ -1313,13 +1313,13 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader targets.erase(itr--); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_ring_of_frost_freeze_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mage_ring_of_frost_freeze_SpellScript(); } @@ -1328,7 +1328,7 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader { PrepareAuraScript(spell_mage_ring_of_frost_freeze_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_RING_OF_FROST_DUMMY)) return false; @@ -1342,13 +1342,13 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader GetCaster()->CastSpell(GetTarget(), SPELL_MAGE_RING_OF_FROST_DUMMY, true); } - void Register() OVERRIDE + void Register() override { AfterEffectRemove += AuraEffectRemoveFn(spell_mage_ring_of_frost_freeze_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_mage_ring_of_frost_freeze_AuraScript(); } @@ -1364,7 +1364,7 @@ class spell_mage_time_warp : public SpellScriptLoader { PrepareSpellScript(spell_mage_time_warp_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_MAGE_TEMPORAL_DISPLACEMENT) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_INSANITY) @@ -1388,14 +1388,14 @@ class spell_mage_time_warp : public SpellScriptLoader target->CastSpell(target, SPELL_MAGE_TEMPORAL_DISPLACEMENT, true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_time_warp_SpellScript::RemoveInvalidTargets, EFFECT_ALL, TARGET_UNIT_CASTER_AREA_RAID); AfterHit += SpellHitFn(spell_mage_time_warp_SpellScript::ApplyDebuff); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_mage_time_warp_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 992f6fdbcfb..2efcbd5d35e 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -95,7 +95,7 @@ class spell_pal_ardent_defender : public SpellScriptLoader PAL_SPELL_ARDENT_DEFENDER_HEAL = 66235, }; - bool Load() OVERRIDE + bool Load() override { healPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(); @@ -141,14 +141,14 @@ class spell_pal_ardent_defender : public SpellScriptLoader } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pal_ardent_defender_AuraScript(); } @@ -165,7 +165,7 @@ class spell_pal_aura_mastery : public SpellScriptLoader { PrepareAuraScript(spell_pal_aura_mastery_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_AURA_MASTERY_IMMUNE)) return false; @@ -182,14 +182,14 @@ class spell_pal_aura_mastery : public SpellScriptLoader GetTarget()->RemoveOwnedAura(SPELL_PALADIN_AURA_MASTERY_IMMUNE, GetCasterGUID()); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_pal_aura_mastery_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_pal_aura_mastery_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pal_aura_mastery_AuraScript(); } @@ -205,7 +205,7 @@ class spell_pal_aura_mastery_immune : public SpellScriptLoader { PrepareAuraScript(spell_pal_aura_mastery_immune_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_CONCENTRACTION_AURA)) return false; @@ -217,13 +217,13 @@ class spell_pal_aura_mastery_immune : public SpellScriptLoader return target->HasAura(SPELL_PALADIN_CONCENTRACTION_AURA, GetCasterGUID()); } - void Register() OVERRIDE + void Register() override { DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_pal_aura_mastery_immune_AuraScript::CheckAreaTarget); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pal_aura_mastery_immune_AuraScript(); } @@ -239,7 +239,7 @@ class spell_pal_avenging_wrath : public SpellScriptLoader { PrepareAuraScript(spell_pal_avenging_wrath_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_SANCTIFIED_WRATH) || !sSpellMgr->GetSpellInfo(SPELL_PALADIN_SANCTIFIED_WRATH_TALENT_R1)) @@ -262,14 +262,14 @@ class spell_pal_avenging_wrath : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(SPELL_PALADIN_SANCTIFIED_WRATH); } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_pal_avenging_wrath_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_pal_avenging_wrath_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pal_avenging_wrath_AuraScript(); } @@ -285,7 +285,7 @@ class spell_pal_beacon_of_light : public SpellScriptLoader { PrepareAuraScript(spell_pal_beacon_of_light_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_BEACON_OF_LIGHT_HEAL)) return false; @@ -323,14 +323,14 @@ class spell_pal_beacon_of_light : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_pal_beacon_of_light_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_pal_beacon_of_light_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pal_beacon_of_light_AuraScript(); } @@ -347,7 +347,7 @@ class spell_pal_blessing_of_faith : public SpellScriptLoader { PrepareSpellScript(spell_pal_blessing_of_faith_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + 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; @@ -381,13 +381,13 @@ class spell_pal_blessing_of_faith : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_pal_blessing_of_faith_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pal_blessing_of_faith_SpellScript(); } @@ -406,7 +406,7 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader uint32 groupSize, minHpPct; int32 remainingAmount; - bool Load() OVERRIDE + bool Load() override { if (Unit* caster = GetCaster()) @@ -437,13 +437,13 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader caster->RemoveAura(SPELL_PALADIN_DIVINE_SACRIFICE); } - void Register() OVERRIDE + void Register() override { OnEffectSplit += AuraEffectSplitFn(spell_pal_divine_sacrifice_AuraScript::Split, EFFECT_0); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pal_divine_sacrifice_AuraScript(); } @@ -461,14 +461,14 @@ class spell_pal_divine_storm : public SpellScriptLoader uint32 healPct; - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_DIVINE_STORM_DUMMY)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { healPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(GetCaster()); return true; @@ -480,13 +480,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() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_pal_divine_storm_SpellScript::TriggerHeal); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pal_divine_storm_SpellScript(); } @@ -502,7 +502,7 @@ class spell_pal_divine_storm_dummy : public SpellScriptLoader { PrepareSpellScript(spell_pal_divine_storm_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_DIVINE_STORM_HEAL)) return false; @@ -525,14 +525,14 @@ class spell_pal_divine_storm_dummy : public SpellScriptLoader private: uint32 _targetCount; - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pal_divine_storm_dummy_SpellScript(); } @@ -562,13 +562,13 @@ class spell_pal_exorcism_and_holy_wrath_damage : public SpellScriptLoader spellMod->value = aurEff->GetAmount(); } - void Register() OVERRIDE + void Register() override { DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_pal_exorcism_and_holy_wrath_damage_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pal_exorcism_and_holy_wrath_damage_AuraScript(); } @@ -584,7 +584,7 @@ class spell_pal_eye_for_an_eye : public SpellScriptLoader { PrepareAuraScript(spell_pal_eye_for_an_eye_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_EYE_FOR_AN_EYE_DAMAGE)) return false; @@ -598,13 +598,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() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pal_eye_for_an_eye_AuraScript(); } @@ -620,7 +620,7 @@ class spell_pal_grand_crusader : public SpellScriptLoader { PrepareAuraScript(spell_pal_grand_crusader_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_AVENGERS_SHIELD)) return false; @@ -637,14 +637,14 @@ class spell_pal_grand_crusader : public SpellScriptLoader GetTarget()->ToPlayer()->RemoveSpellCooldown(SPELL_PALADIN_AVENGERS_SHIELD, true); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_pal_grand_crusader_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_pal_grand_crusader_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pal_grand_crusader_AuraScript(); } @@ -671,13 +671,13 @@ class spell_pal_glyph_of_holy_light : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pal_glyph_of_holy_light_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pal_glyph_of_holy_light_SpellScript(); } @@ -695,7 +695,7 @@ class spell_pal_hand_of_sacrifice : public SpellScriptLoader int32 remainingAmount; - bool Load() OVERRIDE + bool Load() override { if (Unit* caster = GetCaster()) { @@ -715,13 +715,13 @@ class spell_pal_hand_of_sacrifice : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectSplit += AuraEffectSplitFn(spell_pal_hand_of_sacrifice_AuraScript::Split, EFFECT_0); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pal_hand_of_sacrifice_AuraScript(); } @@ -737,7 +737,7 @@ class spell_pal_holy_shock : public SpellScriptLoader { PrepareSpellScript(spell_pal_holy_shock_SpellScript); - bool Validate(SpellInfo const* spellInfo) OVERRIDE + bool Validate(SpellInfo const* spellInfo) override { SpellInfo const* firstRankSpellInfo = sSpellMgr->GetSpellInfo(SPELL_PALADIN_HOLY_SHOCK_R1); if (!firstRankSpellInfo) @@ -786,14 +786,14 @@ class spell_pal_holy_shock : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pal_holy_shock_SpellScript(); } @@ -829,13 +829,13 @@ class spell_pal_improved_aura_effect : public SpellScriptLoader return false; } - void Register() OVERRIDE + void Register() override { DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_pal_improved_aura_effect_AuraScript::CheckAreaTarget); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pal_improved_aura_effect_AuraScript(); } @@ -851,7 +851,7 @@ class spell_pal_item_healing_discount : public SpellScriptLoader { PrepareAuraScript(spell_pal_item_healing_discount_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_ITEM_HEALING_TRANCE)) return false; @@ -864,13 +864,13 @@ class spell_pal_item_healing_discount : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_PALADIN_ITEM_HEALING_TRANCE, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_pal_item_healing_discount_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pal_item_healing_discount_AuraScript(); } @@ -887,7 +887,7 @@ class spell_pal_judgement : public SpellScriptLoader { PrepareSpellScript(spell_pal_judgement_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_JUDGEMENT_DAMAGE)) return false; @@ -913,13 +913,13 @@ class spell_pal_judgement : public SpellScriptLoader GetCaster()->CastSpell(GetHitUnit(), spellId, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_pal_judgement_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pal_judgement_SpellScript(); } @@ -935,7 +935,7 @@ class spell_pal_lay_on_hands : public SpellScriptLoader { PrepareSpellScript(spell_pal_lay_on_hands_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_FORBEARANCE) || !sSpellMgr->GetSpellInfo(SPELL_PALADIN_IMMUNE_SHIELD_MARKER)) @@ -967,14 +967,14 @@ class spell_pal_lay_on_hands : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_pal_lay_on_hands_SpellScript::CheckCast); AfterHit += SpellHitFn(spell_pal_lay_on_hands_SpellScript::HandleScript); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pal_lay_on_hands_SpellScript(); } @@ -990,7 +990,7 @@ class spell_pal_righteous_defense : public SpellScriptLoader { PrepareSpellScript(spell_pal_righteous_defense_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_RIGHTEOUS_DEFENSE_TAUNT)) return false; @@ -1026,7 +1026,7 @@ class spell_pal_righteous_defense : public SpellScriptLoader GetCaster()->CastSpell(target, SPELL_PALADIN_RIGHTEOUS_DEFENSE_TAUNT, true); } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_pal_righteous_defense_SpellScript::CheckCast); //! WORKAROUND @@ -1038,7 +1038,7 @@ class spell_pal_righteous_defense : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pal_righteous_defense_SpellScript(); } @@ -1066,13 +1066,13 @@ class spell_pal_sacred_shield : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_pal_sacred_shield_SpellScript::CheckCast); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pal_sacred_shield_SpellScript(); } @@ -1097,7 +1097,7 @@ class spell_pal_templar_s_verdict : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { if (GetCaster()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1134,13 +1134,13 @@ class spell_pal_templar_s_verdict : public SpellScriptLoader SetHitDamage(damage); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_pal_templar_s_verdict_SpellScript::ChangeDamage, EFFECT_0, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pal_templar_s_verdict_SpellScript(); } @@ -1156,7 +1156,7 @@ class spell_pal_seal_of_righteousness : public SpellScriptLoader { PrepareAuraScript(spell_pal_seal_of_righteousness_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PALADIN_SEAL_OF_RIGHTEOUSNESS)) return false; @@ -1179,14 +1179,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() OVERRIDE + 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 OVERRIDE + 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 b8c38ad3f02..f8466eb1f74 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() OVERRIDE + 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() OVERRIDE + void Register() override { switch (m_scriptSpellId) { @@ -214,7 +214,7 @@ class spell_gen_pet_calculate : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + 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() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -338,7 +338,7 @@ public: } } - void Register() OVERRIDE + 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 OVERRIDE + 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() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -451,7 +451,7 @@ public: } } - void Register() OVERRIDE + 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 OVERRIDE + 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() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -522,7 +522,7 @@ public: } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_pet_scaling_03_AuraScript(); } @@ -545,7 +545,7 @@ public: { PrepareAuraScript(spell_warl_pet_scaling_04_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -564,13 +564,13 @@ public: } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_04_AuraScript::CalculateShadowResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_pet_scaling_04_AuraScript(); } @@ -585,7 +585,7 @@ public: { PrepareAuraScript(spell_warl_pet_scaling_05_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -637,7 +637,7 @@ public: } } - void Register() OVERRIDE + 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); @@ -645,7 +645,7 @@ public: } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_pet_scaling_05_AuraScript(); } @@ -660,7 +660,7 @@ public: { PrepareAuraScript(spell_warl_pet_passive_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -711,14 +711,14 @@ public: } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_pet_passive_AuraScript(); } @@ -733,7 +733,7 @@ public: { PrepareAuraScript(spell_warl_pet_passive_damage_done_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -762,14 +762,14 @@ public: } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_pet_passive_damage_done_AuraScript(); } @@ -784,7 +784,7 @@ public: { PrepareAuraScript(spell_warl_pet_passive_voidwalker_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -800,13 +800,13 @@ public: amount += /* aurEff */ect->GetAmount(); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive_voidwalker_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_pet_passive_voidwalker_AuraScript(); } @@ -821,7 +821,7 @@ public: { PrepareAuraScript(spell_sha_pet_scaling_04_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -858,14 +858,14 @@ public: } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_pet_scaling_04_AuraScript(); } @@ -978,7 +978,7 @@ public: } } - void Register() OVERRIDE + 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); @@ -991,7 +991,7 @@ public: uint32 _tempHealth; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_pet_scaling_01_AuraScript(); } @@ -1006,7 +1006,7 @@ public: { PrepareAuraScript(spell_hun_pet_scaling_02_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1070,7 +1070,7 @@ public: } } - void Register() OVERRIDE + 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); @@ -1078,7 +1078,7 @@ public: } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_pet_scaling_02_AuraScript(); } @@ -1093,7 +1093,7 @@ public: { PrepareAuraScript(spell_hun_pet_scaling_03_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1157,7 +1157,7 @@ public: } } - void Register() OVERRIDE + 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); @@ -1165,7 +1165,7 @@ public: } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_pet_scaling_03_AuraScript(); } @@ -1180,7 +1180,7 @@ public: { PrepareAuraScript(spell_hun_pet_scaling_04_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1238,7 +1238,7 @@ public: } } - void Register() OVERRIDE + 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); @@ -1246,7 +1246,7 @@ public: } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_pet_scaling_04_AuraScript(); } @@ -1261,7 +1261,7 @@ public: { PrepareAuraScript(spell_hun_pet_passive_crit_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1310,14 +1310,14 @@ public: } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_pet_passive_crit_AuraScript(); } @@ -1332,7 +1332,7 @@ public: { PrepareAuraScript(spell_hun_pet_passive_damage_done_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1351,13 +1351,13 @@ public: } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_passive_damage_done_AuraScript::CalculateAmountDamageDone, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_pet_passive_damage_done_AuraScript(); } @@ -1372,7 +1372,7 @@ public: { PrepareAuraScript(spell_hun_animal_handler_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1392,13 +1392,13 @@ public: } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_animal_handler_AuraScript::CalculateAmountDamageDone, EFFECT_0, SPELL_AURA_MOD_ATTACK_POWER_PCT); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_hun_animal_handler_AuraScript(); } @@ -1413,7 +1413,7 @@ public: { PrepareAuraScript(spell_dk_avoidance_passive_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1436,13 +1436,13 @@ public: } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_avoidance_passive_AuraScript::CalculateAvoidanceAmount, EFFECT_0, SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_avoidance_passive_AuraScript(); } @@ -1457,7 +1457,7 @@ public: { PrepareAuraScript(spell_dk_pet_scaling_01_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1533,7 +1533,7 @@ public: } } - void Register() OVERRIDE + 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); @@ -1545,7 +1545,7 @@ public: uint32 _tempHealth; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_pet_scaling_01_AuraScript(); } @@ -1560,7 +1560,7 @@ public: { PrepareAuraScript(spell_dk_pet_scaling_02_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1582,13 +1582,13 @@ public: } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_02_AuraScript::CalculateAmountMeleeHaste, EFFECT_1, SPELL_AURA_MELEE_SLOW); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_pet_scaling_02_AuraScript(); } @@ -1603,7 +1603,7 @@ public: { PrepareAuraScript(spell_dk_pet_scaling_03_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1644,14 +1644,14 @@ public: } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_dk_pet_scaling_03_AuraScript(); } @@ -1666,7 +1666,7 @@ public: { PrepareAuraScript(spell_dk_rune_weapon_scaling_02_AuraScript); - bool Load() OVERRIDE + bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) return false; @@ -1703,14 +1703,14 @@ public: } } - void Register() OVERRIDE + 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 OVERRIDE + 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 ffdbd9b9ef9..de82d1b9780 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -119,7 +119,7 @@ class spell_pri_body_and_soul : public SpellScriptLoader { PrepareAuraScript(spell_pri_body_and_soul_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_CURE_DISEASE) || !sSpellMgr->GetSpellInfo(SPELL_PRIEST_BODY_AND_SOUL_DISPEL)) @@ -148,14 +148,14 @@ class spell_pri_body_and_soul : public SpellScriptLoader GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_PRIEST_BODY_AND_SOUL_DISPEL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_pri_body_and_soul_AuraScript::HandleEffectSpeedProc, EFFECT_0, SPELL_AURA_DUMMY); OnEffectProc += AuraEffectProcFn(spell_pri_body_and_soul_AuraScript::HandleEffectDispelProc, EFFECT_1, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_body_and_soul_AuraScript(); } @@ -171,7 +171,7 @@ class spell_pri_circle_of_healing : public SpellScriptLoader { PrepareSpellScript(spell_pri_circle_of_healing_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_GLYPH_OF_CIRCLE_OF_HEALING)) return false; @@ -191,13 +191,13 @@ class spell_pri_circle_of_healing : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_circle_of_healing_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_circle_of_healing_SpellScript(); } @@ -272,7 +272,7 @@ class spell_pri_divine_aegis : public SpellScriptLoader { PrepareAuraScript(spell_pri_divine_aegis_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_DIVINE_AEGIS)) return false; @@ -299,14 +299,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() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_divine_aegis_AuraScript(); } @@ -335,13 +335,13 @@ class spell_pri_divine_hymn : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_divine_hymn_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_divine_hymn_SpellScript(); } @@ -357,7 +357,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*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_GLYPH_OF_PRAYER_OF_HEALING_HEAL)) return false; @@ -373,13 +373,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() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_pri_glyph_of_prayer_of_healing_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_glyph_of_prayer_of_healing_AuraScript(); } @@ -408,13 +408,13 @@ class spell_pri_improved_power_word_shield : public SpellScriptLoader spellMod->value = aurEff->GetAmount(); } - void Register() OVERRIDE + void Register() override { DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_pri_improved_power_word_shield_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_improved_power_word_shield_AuraScript(); } @@ -430,7 +430,7 @@ class spell_pri_item_greater_heal_refund : public SpellScriptLoader { PrepareAuraScript(spell_pri_item_greater_heal_refund_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_ITEM_EFFICIENCY)) return false; @@ -443,13 +443,13 @@ class spell_pri_item_greater_heal_refund : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_PRIEST_ITEM_EFFICIENCY, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_pri_item_greater_heal_refund_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_item_greater_heal_refund_AuraScript(); } @@ -467,14 +467,14 @@ class spell_pri_guardian_spirit : public SpellScriptLoader uint32 healPct; - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_GUARDIAN_SPIRIT_HEAL)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { healPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); return true; @@ -499,14 +499,14 @@ class spell_pri_guardian_spirit : public SpellScriptLoader absorbAmount = dmgInfo.GetDamage(); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_guardian_spirit_AuraScript(); } @@ -536,13 +536,13 @@ class spell_pri_hymn_of_hope : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_hymn_of_hope_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_hymn_of_hope_SpellScript(); } @@ -558,7 +558,7 @@ class spell_pri_leap_of_faith_effect_trigger : public SpellScriptLoader { PrepareSpellScript(spell_pri_leap_of_faith_effect_trigger_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_LEAP_OF_FAITH_EFFECT)) return false; @@ -575,13 +575,13 @@ class spell_pri_leap_of_faith_effect_trigger : public SpellScriptLoader GetHitUnit()->CastSpell(targets, sSpellMgr->GetSpellInfo(GetEffectValue()), NULL); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_pri_leap_of_faith_effect_trigger_SpellScript::HandleEffectDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_leap_of_faith_effect_trigger_SpellScript(); } @@ -607,13 +607,13 @@ class spell_pri_lightwell_renew : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_lightwell_renew_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_lightwell_renew_AuraScript(); } @@ -635,13 +635,13 @@ class spell_pri_mana_burn : public SpellScriptLoader unitTarget->RemoveAurasWithMechanic((1 << MECHANIC_FEAR) | (1 << MECHANIC_POLYMORPH)); } - void Register() OVERRIDE + void Register() override { AfterHit += SpellHitFn(spell_pri_mana_burn_SpellScript::HandleAfterHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_mana_burn_SpellScript; } @@ -657,14 +657,14 @@ class spell_pri_mana_leech : public SpellScriptLoader { PrepareAuraScript(spell_pri_mana_leech_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_MANA_LEECH_PROC)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { _procTarget = NULL; return true; @@ -682,7 +682,7 @@ class spell_pri_mana_leech : public SpellScriptLoader GetTarget()->CastSpell(_procTarget, SPELL_PRIEST_MANA_LEECH_PROC, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_pri_mana_leech_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_pri_mana_leech_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); @@ -692,7 +692,7 @@ class spell_pri_mana_leech : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_mana_leech_AuraScript(); } @@ -713,13 +713,13 @@ class spell_pri_mind_sear : public SpellScriptLoader unitList.remove_if(Trinity::ObjectGUIDCheck(GetCaster()->GetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT))); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_mind_sear_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_mind_sear_SpellScript(); } @@ -743,13 +743,13 @@ class spell_pri_pain_and_suffering_proc : public SpellScriptLoader aur->GetBase()->RefreshDuration(); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_pri_pain_and_suffering_proc_SpellScript::HandleEffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_pain_and_suffering_proc_SpellScript; } @@ -765,12 +765,12 @@ class spell_pri_penance : public SpellScriptLoader { PrepareSpellScript(spell_pri_penance_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* spellInfo) OVERRIDE + bool Validate(SpellInfo const* spellInfo) override { SpellInfo const* firstRankSpellInfo = sSpellMgr->GetSpellInfo(SPELL_PRIEST_PENANCE_R1); if (!firstRankSpellInfo) @@ -815,14 +815,14 @@ class spell_pri_penance : public SpellScriptLoader return SPELL_CAST_OK; } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_penance_SpellScript; } @@ -849,14 +849,14 @@ class spell_pri_phantasm : public SpellScriptLoader GetTarget()->RemoveMovementImpairingAuras(); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_pri_phantasm_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_pri_phantasm_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_phantasm_AuraScript(); } @@ -872,7 +872,7 @@ class spell_pri_power_word_shield : public SpellScriptLoader { PrepareAuraScript(spell_pri_power_word_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_REFLECTIVE_SHIELD_TRIGGERED)) return false; @@ -924,14 +924,14 @@ class spell_pri_power_word_shield : public SpellScriptLoader } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_power_word_shield_AuraScript(); } @@ -960,13 +960,13 @@ class spell_pri_prayer_of_mending_heal : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_pri_prayer_of_mending_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_prayer_of_mending_heal_SpellScript(); } @@ -982,14 +982,14 @@ class spell_pri_renew : public SpellScriptLoader { PrepareAuraScript(spell_pri_renew_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_DIVINE_TOUCH)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -1009,13 +1009,13 @@ class spell_pri_renew : public SpellScriptLoader } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_renew_AuraScript(); } @@ -1042,13 +1042,13 @@ class spell_pri_shadow_word_death : public SpellScriptLoader GetCaster()->CastCustomSpell(GetCaster(), SPELL_PRIEST_SHADOW_WORD_DEATH, &damage, 0, 0, true); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_pri_shadow_word_death_SpellScript::HandleDamage); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_shadow_word_death_SpellScript(); } @@ -1064,7 +1064,7 @@ class spell_pri_shadowform : public SpellScriptLoader { PrepareAuraScript(spell_pri_shadowform_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_SHADOWFORM_VISUAL_WITHOUT_GLYPH) || !sSpellMgr->GetSpellInfo(SPELL_PRIEST_SHADOWFORM_VISUAL_WITH_GLYPH)) @@ -1082,14 +1082,14 @@ class spell_pri_shadowform : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(GetTarget()->HasAura(SPELL_PRIEST_GLYPH_OF_SHADOW) ? SPELL_PRIEST_SHADOWFORM_VISUAL_WITH_GLYPH : SPELL_PRIEST_SHADOWFORM_VISUAL_WITHOUT_GLYPH); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_pri_shadowform_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); AfterEffectRemove += AuraEffectRemoveFn(spell_pri_shadowform_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_shadowform_AuraScript(); } @@ -1105,7 +1105,7 @@ class spell_pri_vampiric_embrace : public SpellScriptLoader { PrepareAuraScript(spell_pri_vampiric_embrace_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_VAMPIRIC_EMBRACE_HEAL)) return false; @@ -1127,14 +1127,14 @@ class spell_pri_vampiric_embrace : public SpellScriptLoader GetTarget()->CastCustomSpell((Unit*)NULL, SPELL_PRIEST_VAMPIRIC_EMBRACE_HEAL, &team, &self, NULL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_pri_vampiric_embrace_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_pri_vampiric_embrace_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_pri_vampiric_embrace_AuraScript(); } @@ -1155,13 +1155,13 @@ class spell_pri_vampiric_embrace_target : public SpellScriptLoader unitList.remove(GetCaster()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_vampiric_embrace_target_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_pri_vampiric_embrace_target_SpellScript(); } @@ -1177,7 +1177,7 @@ class spell_pri_vampiric_touch : public SpellScriptLoader { PrepareAuraScript(spell_pri_vampiric_touch_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_PRIEST_VAMPIRIC_TOUCH_DISPEL) || !sSpellMgr->GetSpellInfo(SPELL_GEN_REPLENISHMENT)) @@ -1207,7 +1207,7 @@ class spell_pri_vampiric_touch : public SpellScriptLoader eventInfo.GetProcTarget()->CastSpell((Unit*)NULL, SPELL_GEN_REPLENISHMENT, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { AfterDispel += AuraDispelFn(spell_pri_vampiric_touch_AuraScript::HandleDispel); DoCheckProc += AuraCheckProcFn(spell_pri_vampiric_touch_AuraScript::CheckProc); @@ -1215,7 +1215,7 @@ class spell_pri_vampiric_touch : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + 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 0c3d64dcf48..f895381574e 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() OVERRIDE + 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 OVERRIDE + 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*/) OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q2203_thaumaturgy_channel_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + 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() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q5206_test_fetid_skull_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -227,13 +227,13 @@ class spell_q6124_6129_apply_salve : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q6124_6129_apply_salve_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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 OVERRIDE + 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() OVERRIDE + 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 OVERRIDE + 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*/) OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q11396_11399_scourging_crystal_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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*/) OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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 OVERRIDE + 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*/) OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q11587_arcane_prisoner_rescue_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER && GetCastItem(); } - bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q11730_ultrasonic_screwdriver_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12459_seeds_of_natures_wrath_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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*/) OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q12634_despawn_fruit_tosser_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q12683_take_sputum_sample_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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() OVERRIDE + 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 OVERRIDE + 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() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellEntry*/) OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12937_relief_for_the_fallen_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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*/) OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q10041_q10040_who_are_they_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_symbol_of_life_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -888,13 +888,13 @@ class spell_q12659_ahunaes_knife : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12659_ahunaes_knife_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -934,13 +934,13 @@ class spell_q9874_liquid_fire : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q9874_liquid_fire_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -978,13 +978,13 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12805_lifeblood_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q13280_13283_plant_battle_standard_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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*/) OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q14112_14145_chum_the_water_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + 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() OVERRIDE + 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() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q9452_cast_net_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q9452_cast_net_SpellScript(); } @@ -1143,13 +1143,13 @@ public: } } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_q12987_read_pronouncement_AuraScript::OnApply, EFFECT_0, SPELL_AURA_NONE, AURA_EFFECT_HANDLE_REAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_q12987_read_pronouncement_AuraScript(); } @@ -1200,13 +1200,13 @@ class spell_q12277_wintergarde_mine_explosion : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12277_wintergarde_mine_explosion_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12277_wintergarde_mine_explosion_SpellScript(); } @@ -1232,13 +1232,13 @@ public: target->CastSpell(GetCaster(), SPELL_BUNNY_CREDIT_BEAM, false); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12066_bunny_kill_credit_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12066_bunny_kill_credit_SpellScript(); } @@ -1283,13 +1283,13 @@ class spell_q12735_song_of_cleansing : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12735_song_of_cleansing_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12735_song_of_cleansing_SpellScript(); } @@ -1314,13 +1314,13 @@ class spell_q12372_cast_from_gossip_trigger : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_SUMMON_WYRMREST_DEFENDER, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12372_cast_from_gossip_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12372_cast_from_gossip_trigger_SpellScript(); } @@ -1355,13 +1355,13 @@ class spell_q12372_destabilize_azure_dragonshrine_dummy : public SpellScriptLoad player->KilledMonsterCredit(NPC_WYRMREST_TEMPLE_CREDIT, 0); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript(); } @@ -1383,13 +1383,13 @@ class spell_q12372_azure_on_death_force_whisper : public SpellScriptLoader defender->AI()->Talk(WHISPER_ON_HIT_BY_FORCE_WHISPER, defender->GetCharmerOrOwner()); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12372_azure_on_death_force_whisper_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12372_azure_on_death_force_whisper_SpellScript(); } @@ -1423,13 +1423,13 @@ class spell_q11010_q11102_q11023_aggro_check_aura : public SpellScriptLoader target->CastSpell(target, SPELL_AGGRO_CHECK); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q11010_q11102_q11023_aggro_check_aura_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_q11010_q11102_q11023_aggro_check_aura_AuraScript(); } @@ -1453,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() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q11010_q11102_q11023_aggro_check_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q11010_q11102_q11023_aggro_check_SpellScript(); } @@ -1482,13 +1482,13 @@ class spell_q11010_q11102_q11023_aggro_burst : public SpellScriptLoader target->CastSpell(target, SPELL_CHOOSE_LOC); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q11010_q11102_q11023_aggro_burst_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_q11010_q11102_q11023_aggro_burst_AuraScript(); } @@ -1519,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() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q11010_q11102_q11023_choose_loc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q11010_q11102_q11023_choose_loc_SpellScript(); } @@ -1551,13 +1551,13 @@ class spell_q11010_q11102_q11023_q11008_check_fly_mount : public SpellScriptLoad return SPELL_CAST_OK; } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_q11010_q11102_q11023_q11008_check_fly_mount_SpellScript::CheckRequirement); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q11010_q11102_q11023_q11008_check_fly_mount_SpellScript(); } @@ -1577,7 +1577,7 @@ class spell_q12527_zuldrak_rat : public SpellScriptLoader { PrepareSpellScript(spell_q12527_zuldrak_rat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_GORGED_LURKING_BASILISK)) return false; @@ -1594,13 +1594,13 @@ class spell_q12527_zuldrak_rat : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12527_zuldrak_rat_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12527_zuldrak_rat_SpellScript(); } @@ -1623,13 +1623,13 @@ class spell_q12661_q12669_q12676_q12677_q12713_summon_stefan : public SpellScrip dest.RelocateOffset(offset); } - void Register() OVERRIDE + void Register() override { OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_q12661_q12669_q12676_q12677_q12713_summon_stefan_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER_BACK); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12661_q12669_q12676_q12677_q12713_summon_stefan_SpellScript(); } @@ -1649,7 +1649,7 @@ class spell_q12730_quenching_mist : public SpellScriptLoader { PrepareAuraScript(spell_q12730_quenching_mist_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FLICKERING_FLAMES)) return false; @@ -1661,13 +1661,13 @@ class spell_q12730_quenching_mist : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(SPELL_FLICKERING_FLAMES); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q12730_quenching_mist_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_q12730_quenching_mist_AuraScript(); } @@ -1692,7 +1692,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*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_RIDE)) return false; @@ -1709,13 +1709,13 @@ class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy : public GetHitCreature()->CastSpell(GetCaster(), SPELL_RIDE, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript(); } @@ -1738,13 +1738,13 @@ class spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon : public S dest.RelocateOffset(offset); } - void Register() OVERRIDE + void Register() override { OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER_BACK); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon_SpellScript(); } @@ -1767,7 +1767,7 @@ class spell_q12847_summon_soul_moveto_bunny : public SpellScriptLoader dest.RelocateOffset(offset); } - void Register() OVERRIDE + void Register() override { OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_q12847_summon_soul_moveto_bunny_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER); } @@ -1795,7 +1795,7 @@ class spell_q13011_bear_flank_master : public SpellScriptLoader { PrepareSpellScript(spell_q13011_bear_flank_master_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_BEAR_FLANK_MASTER) || !sSpellMgr->GetSpellInfo(SPELL_CREATE_BEAR_FLANK)) @@ -1803,7 +1803,7 @@ class spell_q13011_bear_flank_master : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -1824,13 +1824,13 @@ class spell_q13011_bear_flank_master : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q13011_bear_flank_master_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q13011_bear_flank_master_SpellScript(); } @@ -1845,7 +1845,7 @@ class spell_q13086_cannons_target : public SpellScriptLoader { PrepareSpellScript(spell_q13086_cannons_target_SpellScript); - bool Validate(SpellInfo const* spellInfo) OVERRIDE + bool Validate(SpellInfo const* spellInfo) override { if (!sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_0].CalcValue())) return false; @@ -1858,13 +1858,13 @@ class spell_q13086_cannons_target : public SpellScriptLoader GetCaster()->CastSpell(pos->GetPositionX(), pos->GetPositionY(), pos->GetPositionZ(), GetEffectValue(), true); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q13086_cannons_target_SpellScript::HandleEffectDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q13086_cannons_target_SpellScript(); } @@ -1896,7 +1896,7 @@ class spell_q12690_burst_at_the_seams : public SpellScriptLoader { PrepareSpellScript(spell_q12690_burst_at_the_seams_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_BURST_AT_THE_SEAMS) || !sSpellMgr->GetSpellInfo(SPELL_BURST_AT_THE_SEAMS_DMG) @@ -1908,7 +1908,7 @@ class spell_q12690_burst_at_the_seams : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -1944,14 +1944,14 @@ class spell_q12690_burst_at_the_seams : public SpellScriptLoader GetCaster()->ToCreature()->DespawnOrUnsummon(2 * IN_MILLISECONDS); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12690_burst_at_the_seams_SpellScript::HandleKnockBack, EFFECT_1, SPELL_EFFECT_KNOCK_BACK); OnEffectHitTarget += SpellEffectFn(spell_q12690_burst_at_the_seams_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12690_burst_at_the_seams_SpellScript(); } @@ -1972,7 +1972,7 @@ class spell_q12308_escape_from_silverbrook : public SpellScriptLoader { PrepareSpellScript(spell_q12308_escape_from_silverbrook_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_WORGEN)) return false; @@ -1984,13 +1984,13 @@ class spell_q12308_escape_from_silverbrook : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_SUMMON_WORGEN, true); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q12308_escape_from_silverbrook_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12308_escape_from_silverbrook_SpellScript(); } @@ -2015,13 +2015,13 @@ class spell_q12308_escape_from_silverbrook_summon_worgen : public SpellScriptLoa dest.Relocate(pos); } - void Register() OVERRIDE + void Register() override { OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_q12308_escape_from_silverbrook_summon_worgen_SpellScript::ModDest, EFFECT_0, TARGET_DEST_CASTER_SUMMON); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12308_escape_from_silverbrook_summon_worgen_SpellScript(); } @@ -2051,7 +2051,7 @@ class spell_q12641_death_comes_from_on_high : public SpellScriptLoader { PrepareSpellScript(spell_q12641_death_comes_from_on_high_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_FORGE_CREDIT) || !sSpellMgr->GetSpellInfo(SPELL_TOWN_HALL_CREDIT) || @@ -2086,13 +2086,13 @@ class spell_q12641_death_comes_from_on_high : public SpellScriptLoader GetCaster()->CastSpell((Unit*)NULL, spellId, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12641_death_comes_from_on_high_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12641_death_comes_from_on_high_SpellScript(); } @@ -2115,13 +2115,13 @@ class spell_q12619_emblazon_runeblade : public SpellScriptLoader caster->CastSpell(caster, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_q12619_emblazon_runeblade_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_q12619_emblazon_runeblade_AuraScript(); } @@ -2142,13 +2142,13 @@ class spell_q12619_emblazon_runeblade_effect : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), uint32(GetEffectValue()), false); } - void Register() OVERRIDE + void Register() override { OnEffectHit += SpellEffectFn(spell_q12619_emblazon_runeblade_effect_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12619_emblazon_runeblade_effect_SpellScript(); } @@ -2169,7 +2169,7 @@ class spell_q12919_gymers_grab : public SpellScriptLoader { PrepareSpellScript(spell_q12919_gymers_grab_SpellScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_RIDE_GYMER)) return false; @@ -2185,13 +2185,13 @@ class spell_q12919_gymers_grab : public SpellScriptLoader GetHitCreature()->CastSpell(GetHitCreature(), SPELL_GRABBED, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12919_gymers_grab_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12919_gymers_grab_SpellScript(); } @@ -2222,13 +2222,13 @@ class spell_q12919_gymers_throw : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q12919_gymers_throw_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q12919_gymers_throw_SpellScript(); } @@ -2248,7 +2248,7 @@ class spell_q13400_illidan_kill_master : public SpellScriptLoader { PrepareSpellScript(spell_q13400_illidan_kill_master_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ILLIDAN_KILL_CREDIT)) return false; @@ -2263,13 +2263,13 @@ class spell_q13400_illidan_kill_master : public SpellScriptLoader passenger->CastSpell(passenger, SPELL_ILLIDAN_KILL_CREDIT, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q13400_illidan_kill_master_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q13400_illidan_kill_master_SpellScript(); } @@ -2290,7 +2290,7 @@ class spell_q14100_q14111_make_player_destroy_totems : public SpellScriptLoader { PrepareSpellScript(spell_q14100_q14111_make_player_destroy_totems_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_TOTEM_OF_THE_EARTHEN_RING)) return false; @@ -2303,13 +2303,13 @@ class spell_q14100_q14111_make_player_destroy_totems : public SpellScriptLoader player->CastSpell(player, SPELL_TOTEM_OF_THE_EARTHEN_RING, TRIGGERED_FULL_MASK); // ignore reagent cost, consumed by quest } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_q14100_q14111_make_player_destroy_totems_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_q14100_q14111_make_player_destroy_totems_SpellScript(); } diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 57c99a7d1e5..98fe019bcc6 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -66,14 +66,14 @@ class spell_rog_blade_flurry : public SpellScriptLoader { PrepareAuraScript(spell_rog_blade_flurry_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_BLADE_FLURRY_EXTRA_ATTACK)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { _procTarget = NULL; return true; @@ -95,7 +95,7 @@ class spell_rog_blade_flurry : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_ROGUE_BLADE_FLURRY_EXTRA_ATTACK, SPELLVALUE_BASE_POINT0, eventInfo.GetDamageInfo()->GetDamage(), _procTarget, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_rog_blade_flurry_AuraScript::CheckProc); if (m_scriptSpellId == SPELL_ROGUE_BLADE_FLURRY) @@ -108,7 +108,7 @@ class spell_rog_blade_flurry : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_blade_flurry_AuraScript(); } @@ -126,14 +126,14 @@ class spell_rog_cheat_death : public SpellScriptLoader uint32 absorbChance; - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_CHEAT_DEATH_COOLDOWN)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { absorbChance = GetSpellInfo()->Effects[EFFECT_0].CalcValue(); return GetUnitOwner()->ToPlayer(); @@ -164,14 +164,14 @@ class spell_rog_cheat_death : public SpellScriptLoader absorbAmount = dmgInfo.GetDamage(); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_cheat_death_AuraScript(); } @@ -187,7 +187,7 @@ class spell_rog_crippling_poison : public SpellScriptLoader { PrepareAuraScript(spell_rog_crippling_poison_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_CRIPPLING_POISON)) return false; @@ -200,13 +200,13 @@ class spell_rog_crippling_poison : public SpellScriptLoader GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_ROGUE_CRIPPLING_POISON, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_rog_crippling_poison_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_crippling_poison_AuraScript(); } @@ -229,13 +229,13 @@ class spell_rog_cut_to_the_chase : public SpellScriptLoader aur->SetDuration(aur->GetSpellInfo()->GetMaxDuration(), true); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_rog_cut_to_the_chase_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_cut_to_the_chase_AuraScript(); } @@ -251,7 +251,7 @@ class spell_rog_deadly_poison : public SpellScriptLoader { PrepareSpellScript(spell_rog_deadly_poison_SpellScript); - bool Load() OVERRIDE + bool Load() override { _stackAmount = 0; // at this point CastItem must already be initialized @@ -323,7 +323,7 @@ class spell_rog_deadly_poison : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { BeforeHit += SpellHitFn(spell_rog_deadly_poison_SpellScript::HandleBeforeHit); AfterHit += SpellHitFn(spell_rog_deadly_poison_SpellScript::HandleAfterHit); @@ -332,7 +332,7 @@ class spell_rog_deadly_poison : public SpellScriptLoader uint8 _stackAmount; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_rog_deadly_poison_SpellScript(); } @@ -364,14 +364,14 @@ class spell_rog_killing_spree : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_rog_killing_spree_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY); OnEffectHitTarget += SpellEffectFn(spell_rog_killing_spree_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_rog_killing_spree_SpellScript(); } @@ -380,7 +380,7 @@ class spell_rog_killing_spree : public SpellScriptLoader { PrepareAuraScript(spell_rog_killing_spree_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_KILLING_SPREE_TELEPORT) || !sSpellMgr->GetSpellInfo(SPELL_ROGUE_KILLING_SPREE_WEAPON_DMG) @@ -415,7 +415,7 @@ class spell_rog_killing_spree : public SpellScriptLoader GetTarget()->RemoveAurasDueToSpell(SPELL_ROGUE_KILLING_SPREE_DMG_BUFF); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectApplyFn(spell_rog_killing_spree_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_killing_spree_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); @@ -432,7 +432,7 @@ class spell_rog_killing_spree : public SpellScriptLoader std::list<uint64> _targets; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_killing_spree_AuraScript(); } @@ -487,7 +487,7 @@ class spell_rog_nerves_of_steel : public SpellScriptLoader uint32 absorbPct; - bool Load() OVERRIDE + bool Load() override { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); return true; @@ -506,14 +506,14 @@ class spell_rog_nerves_of_steel : public SpellScriptLoader absorbAmount = CalculatePct(dmgInfo.GetDamage(), absorbPct); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_nerves_of_steel_AuraScript(); } @@ -566,12 +566,12 @@ class spell_rog_preparation : public SpellScriptLoader { PrepareSpellScript(spell_rog_preparation_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_GLYPH_OF_PREPARATION)) return false; @@ -607,13 +607,13 @@ class spell_rog_preparation : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_rog_preparation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_rog_preparation_SpellScript(); } @@ -629,7 +629,7 @@ class spell_rog_prey_on_the_weak : public SpellScriptLoader { PrepareAuraScript(spell_rog_prey_on_the_weak_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_PREY_ON_THE_WEAK)) return false; @@ -652,13 +652,13 @@ class spell_rog_prey_on_the_weak : public SpellScriptLoader target->RemoveAurasDueToSpell(SPELL_ROGUE_PREY_ON_THE_WEAK); } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_prey_on_the_weak_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_prey_on_the_weak_AuraScript(); } @@ -674,7 +674,7 @@ class spell_rog_recuperate : public SpellScriptLoader { PrepareAuraScript(spell_rog_recuperate_AuraScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -700,14 +700,14 @@ class spell_rog_recuperate : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_recuperate_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_recuperate_AuraScript::CalculateBonus, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_recuperate_AuraScript(); } @@ -723,7 +723,7 @@ class spell_rog_rupture : public SpellScriptLoader { PrepareAuraScript(spell_rog_rupture_AuraScript); - bool Load() OVERRIDE + bool Load() override { Unit* caster = GetCaster(); return caster && caster->GetTypeId() == TYPEID_PLAYER; @@ -753,13 +753,13 @@ class spell_rog_rupture : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_rupture_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_rupture_AuraScript(); } @@ -775,12 +775,12 @@ class spell_rog_shiv : public SpellScriptLoader { PrepareSpellScript(spell_rog_shiv_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_SHIV_TRIGGERED)) return false; @@ -794,13 +794,13 @@ class spell_rog_shiv : public SpellScriptLoader caster->CastSpell(unitTarget, SPELL_ROGUE_SHIV_TRIGGERED, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_rog_shiv_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_rog_shiv_SpellScript(); } @@ -880,7 +880,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader { PrepareAuraScript(spell_rog_tricks_of_the_trade_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_ROGUE_TRICKS_OF_THE_TRADE_DMG_BOOST)) return false; @@ -889,7 +889,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader return true; } - bool Load() OVERRIDE + bool Load() override { _redirectTarget = NULL; return true; @@ -917,7 +917,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader Remove(AURA_REMOVE_BY_DEFAULT); // maybe handle by proc charges } - void Register() OVERRIDE + 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); @@ -928,7 +928,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader Unit* _redirectTarget; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_rog_tricks_of_the_trade_AuraScript(); } @@ -949,13 +949,13 @@ class spell_rog_tricks_of_the_trade_proc : public SpellScriptLoader GetTarget()->ResetRedirectThreat(); } - void Register() OVERRIDE + 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 OVERRIDE + 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 875beb4c8d8..013887234bf 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -85,7 +85,7 @@ class spell_sha_ancestral_awakening : public SpellScriptLoader { PrepareAuraScript(spell_sha_ancestral_awakening_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TIDAL_WAVES)) return false; @@ -100,13 +100,13 @@ class spell_sha_ancestral_awakening : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_SHAMAN_ANCESTRAL_AWAKENING, SPELLVALUE_BASE_POINT0, heal, (Unit*)NULL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_ancestral_awakening_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_ancestral_awakening_AuraScript(); } @@ -123,7 +123,7 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader { PrepareSpellScript(spell_sha_ancestral_awakening_proc_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_ANCESTRAL_AWAKENING_PROC)) return false; @@ -147,14 +147,14 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader GetCaster()->CastCustomSpell(SPELL_SHAMAN_ANCESTRAL_AWAKENING_PROC, SPELLVALUE_BASE_POINT0, GetEffectValue(), GetHitUnit(), true); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_ancestral_awakening_proc_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); OnEffectHitTarget += SpellEffectFn(spell_sha_ancestral_awakening_proc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_ancestral_awakening_proc_SpellScript(); } @@ -171,7 +171,7 @@ class spell_sha_bloodlust : public SpellScriptLoader { PrepareSpellScript(spell_sha_bloodlust_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_SATED) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_INSANITY) @@ -193,7 +193,7 @@ class spell_sha_bloodlust : public SpellScriptLoader target->CastSpell(target, SPELL_SHAMAN_SATED, true); } - void Register() OVERRIDE + 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); @@ -202,7 +202,7 @@ class spell_sha_bloodlust : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_bloodlust_SpellScript(); } @@ -219,7 +219,7 @@ class spell_sha_chain_heal : public SpellScriptLoader { PrepareSpellScript(spell_sha_chain_heal_SpellScript); - bool Load() OVERRIDE + bool Load() override { firstHeal = true; riptide = false; @@ -249,7 +249,7 @@ class spell_sha_chain_heal : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_sha_chain_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } @@ -259,7 +259,7 @@ class spell_sha_chain_heal : public SpellScriptLoader uint32 amount; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_chain_heal_SpellScript(); } @@ -275,7 +275,7 @@ class spell_sha_earth_shield : public SpellScriptLoader { PrepareAuraScript(spell_sha_earth_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EARTH_SHIELD_HEAL) || !sSpellMgr->GetSpellInfo(SPELL_SHAMAN_GLYPH_OF_EARTH_SHIELD)) @@ -318,7 +318,7 @@ class spell_sha_earth_shield : public SpellScriptLoader player->AddSpellCooldown(SPELL_SHAMAN_EARTH_SHIELD_HEAL, 0, time(NULL) + 3); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_earth_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_DUMMY); DoCheckProc += AuraCheckProcFn(spell_sha_earth_shield_AuraScript::CheckProc); @@ -326,7 +326,7 @@ class spell_sha_earth_shield : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_earth_shield_AuraScript(); } @@ -343,7 +343,7 @@ class spell_sha_earthbind_totem : public SpellScriptLoader { PrepareAuraScript(spell_sha_earthbind_totem_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TOTEM_EARTHBIND_TOTEM) || !sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TOTEM_EARTHEN_POWER)) @@ -376,14 +376,14 @@ class spell_sha_earthbind_totem : public SpellScriptLoader } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_earthbind_totem_AuraScript(); } @@ -421,13 +421,13 @@ class spell_sha_earthen_power : public SpellScriptLoader unitList.remove_if(EarthenPowerTargetSelector()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_earthen_power_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_earthen_power_SpellScript(); } @@ -443,7 +443,7 @@ class spell_sha_feedback : public SpellScriptLoader { PrepareAuraScript(spell_sha_feedback_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_ELEMENTAL_MASTERY)) return false; @@ -457,13 +457,13 @@ class spell_sha_feedback : public SpellScriptLoader target->ModifySpellCooldown(SPELL_SHAMAN_ELEMENTAL_MASTERY, aurEff->GetBaseAmount()); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_feedback_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_feedback_AuraScript(); } @@ -493,13 +493,13 @@ class spell_sha_fire_nova : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_sha_fire_nova_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_fire_nova_SpellScript(); } @@ -516,7 +516,7 @@ class spell_sha_flame_shock : public SpellScriptLoader { PrepareAuraScript(spell_sha_flame_shock_AuraScript); - bool Validate(SpellInfo const* /*spell*/) OVERRIDE + bool Validate(SpellInfo const* /*spell*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_LAVA_FLOWS_R1) || !sSpellMgr->GetSpellInfo(SPELL_SHAMAN_LAVA_FLOWS_TRIGGERED_R1)) @@ -541,13 +541,13 @@ class spell_sha_flame_shock : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterDispel += AuraDispelFn(spell_sha_flame_shock_AuraScript::HandleDispel); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_flame_shock_AuraScript(); } @@ -563,7 +563,7 @@ class spell_sha_focused_insight : public SpellScriptLoader { PrepareAuraScript(spell_sha_focused_insight_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_FOCUSED_INSIGHT)) return false; @@ -579,13 +579,13 @@ class spell_sha_focused_insight : public SpellScriptLoader GetTarget()->CastCustomSpell(GetTarget(), SPELL_SHAMAN_FOCUSED_INSIGHT, &basePoints0, &basePoints1, &basePoints1, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_focused_insight_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_focused_insight_AuraScript(); } @@ -601,7 +601,7 @@ class spell_sha_glyph_of_healing_wave : public SpellScriptLoader { PrepareAuraScript(spell_sha_glyph_of_healing_wave_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_GLYPH_OF_HEALING_WAVE)) return false; @@ -622,14 +622,14 @@ class spell_sha_glyph_of_healing_wave : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_SHAMAN_GLYPH_OF_HEALING_WAVE, SPELLVALUE_BASE_POINT0, heal, (Unit*)NULL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_sha_glyph_of_healing_wave_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_sha_glyph_of_healing_wave_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_glyph_of_healing_wave_AuraScript(); } @@ -646,7 +646,7 @@ class spell_sha_healing_stream_totem : public SpellScriptLoader { PrepareSpellScript(spell_sha_healing_stream_totem_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { return sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TOTEM_HEALING_STREAM_HEAL); } @@ -673,13 +673,13 @@ class spell_sha_healing_stream_totem : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_sha_healing_stream_totem_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_healing_stream_totem_SpellScript(); } @@ -696,7 +696,7 @@ class spell_sha_heroism : public SpellScriptLoader { PrepareSpellScript(spell_sha_heroism_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EXHAUSTION) || !sSpellMgr->GetSpellInfo(SPELL_HUNTER_INSANITY) @@ -718,7 +718,7 @@ class spell_sha_heroism : public SpellScriptLoader target->CastSpell(target, SPELL_SHAMAN_EXHAUSTION, true); } - void Register() OVERRIDE + 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); @@ -727,7 +727,7 @@ class spell_sha_heroism : public SpellScriptLoader } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_heroism_SpellScript(); } @@ -743,7 +743,7 @@ class spell_sha_item_lightning_shield : public SpellScriptLoader { PrepareAuraScript(spell_sha_item_lightning_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD)) return false; @@ -756,13 +756,13 @@ class spell_sha_item_lightning_shield : public SpellScriptLoader GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_item_lightning_shield_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_item_lightning_shield_AuraScript(); } @@ -778,7 +778,7 @@ class spell_sha_item_lightning_shield_trigger : public SpellScriptLoader { PrepareAuraScript(spell_sha_item_lightning_shield_trigger_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_ITEM_MANA_SURGE)) return false; @@ -791,13 +791,13 @@ class spell_sha_item_lightning_shield_trigger : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD_DAMAGE, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_item_lightning_shield_trigger_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_item_lightning_shield_trigger_AuraScript(); } @@ -813,7 +813,7 @@ class spell_sha_item_mana_surge : public SpellScriptLoader { PrepareAuraScript(spell_sha_item_mana_surge_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD_DAMAGE)) return false; @@ -829,13 +829,13 @@ class spell_sha_item_mana_surge : public SpellScriptLoader GetTarget()->CastCustomSpell(SPELL_SHAMAN_ITEM_MANA_SURGE, SPELLVALUE_BASE_POINT0, mana, GetTarget(), true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_item_mana_surge_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_item_mana_surge_AuraScript(); } @@ -852,7 +852,7 @@ class spell_sha_lava_lash : public SpellScriptLoader { PrepareSpellScript(spell_sha_lava_lash_SpellScript) - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -873,14 +873,14 @@ class spell_sha_lava_lash : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_sha_lava_lash_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_lava_lash_SpellScript(); } @@ -895,7 +895,7 @@ class spell_sha_lava_surge : public SpellScriptLoader { PrepareAuraScript(spell_sha_lava_surge_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_LAVA_SURGE)) return false; @@ -908,13 +908,13 @@ class spell_sha_lava_surge : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_SHAMAN_LAVA_SURGE, true); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_lava_surge_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_lava_surge_AuraScript(); } @@ -929,14 +929,14 @@ class spell_sha_lava_surge_proc : public SpellScriptLoader { PrepareSpellScript(spell_sha_lava_surge_proc_SpellScript) - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_LAVA_BURST)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -946,14 +946,14 @@ class spell_sha_lava_surge_proc : public SpellScriptLoader GetCaster()->ToPlayer()->RemoveSpellCooldown(SPELL_SHAMAN_LAVA_BURST, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_sha_lava_surge_proc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_lava_surge_proc_SpellScript(); } @@ -978,13 +978,13 @@ class spell_sha_mana_tide_totem : public SpellScriptLoader amount = CalculatePct(owner->GetStat(STAT_SPIRIT), aurEff->GetAmount()); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_mana_tide_totem_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_STAT); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_mana_tide_totem_AuraScript(); } @@ -1000,7 +1000,7 @@ class spell_sha_nature_guardian : public SpellScriptLoader { PrepareAuraScript(spell_sha_nature_guardian_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_NATURE_GUARDIAN)) return false; @@ -1031,14 +1031,14 @@ class spell_sha_nature_guardian : public SpellScriptLoader player->AddSpellCooldown(GetSpellInfo()->Id, 0, time(NULL) + aurEff->GetSpellInfo()->Effects[EFFECT_1].CalcValue()); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_sha_nature_guardian_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_sha_nature_guardian_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_nature_guardian_AuraScript(); } @@ -1054,7 +1054,7 @@ class spell_sha_rolling_thunder : public SpellScriptLoader { PrepareAuraScript(spell_sha_rolling_thunder_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_LIGHTNING_SHIELD)) return false; @@ -1070,13 +1070,13 @@ class spell_sha_rolling_thunder : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_rolling_thunder_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_rolling_thunder_AuraScript(); } @@ -1092,7 +1092,7 @@ class spell_sha_telluric_currents : public SpellScriptLoader { PrepareAuraScript(spell_sha_telluric_currents_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TELLURIC_CURRENTS)) return false; @@ -1107,13 +1107,13 @@ class spell_sha_telluric_currents : public SpellScriptLoader GetTarget()->CastCustomSpell(GetTarget(), SPELL_SHAMAN_TELLURIC_CURRENTS, &basePoints0, NULL, NULL, true); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_telluric_currents_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_telluric_currents_AuraScript(); } @@ -1136,13 +1136,13 @@ class spell_sha_thunderstorm : public SpellScriptLoader PreventHitDefaultEffect(effIndex); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_sha_thunderstorm_SpellScript::HandleKnockBack, EFFECT_2, SPELL_EFFECT_KNOCK_BACK); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_sha_thunderstorm_SpellScript(); } @@ -1158,7 +1158,7 @@ class spell_sha_tidal_waves : public SpellScriptLoader { PrepareAuraScript(spell_sha_tidal_waves_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_TIDAL_WAVES)) return false; @@ -1174,13 +1174,13 @@ class spell_sha_tidal_waves : public SpellScriptLoader GetTarget()->CastCustomSpell(GetTarget(), SPELL_SHAMAN_TIDAL_WAVES, &basePoints0, &basePoints1, NULL, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_sha_tidal_waves_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_sha_tidal_waves_AuraScript(); } diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index a467124bf50..2b0a5506a83 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -99,7 +99,7 @@ class spell_warl_aftermath : public SpellScriptLoader { PrepareAuraScript(spell_warl_aftermath_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_AFTERMATH_STUN)) return false; @@ -117,13 +117,13 @@ class spell_warl_aftermath : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_warl_aftermath_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_aftermath_AuraScript(); } @@ -139,7 +139,7 @@ class spell_warl_banish : public SpellScriptLoader { PrepareSpellScript(spell_warl_banish_SpellScript); - bool Load() OVERRIDE + bool Load() override { _removed = false; return true; @@ -168,7 +168,7 @@ class spell_warl_banish : public SpellScriptLoader PreventHitAura(); } - void Register() OVERRIDE + void Register() override { BeforeHit += SpellHitFn(spell_warl_banish_SpellScript::HandleBanish); AfterHit += SpellHitFn(spell_warl_banish_SpellScript::RemoveAura); @@ -177,7 +177,7 @@ class spell_warl_banish : public SpellScriptLoader bool _removed; }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_banish_SpellScript(); } @@ -193,7 +193,7 @@ class spell_warl_conflagrate : public SpellScriptLoader { PrepareSpellScript(spell_warl_conflagrate_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_IMMOLATE)) return false; @@ -206,13 +206,13 @@ class spell_warl_conflagrate : public SpellScriptLoader SetHitDamage(CalculatePct(aurEff->GetAmount(), GetSpellInfo()->Effects[EFFECT_1].CalcValue(GetCaster()))); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warl_conflagrate_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_conflagrate_SpellScript(); } @@ -228,14 +228,14 @@ class spell_warl_create_healthstone : public SpellScriptLoader { PrepareSpellScript(spell_warl_create_healthstone_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_CREATE_HEALTHSTONE)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -245,13 +245,13 @@ class spell_warl_create_healthstone : public SpellScriptLoader GetCaster()->CastSpell(GetCaster(), SPELL_WARLOCK_CREATE_HEALTHSTONE, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warl_create_healthstone_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_create_healthstone_SpellScript(); } @@ -268,14 +268,14 @@ class spell_warl_bane_of_doom : public SpellScriptLoader { PrepareAuraScript(spell_warl_curse_of_doom_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_BANE_OF_DOOM_EFFECT)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -293,13 +293,13 @@ class spell_warl_bane_of_doom : public SpellScriptLoader GetCaster()->CastSpell(GetTarget(), SPELL_WARLOCK_BANE_OF_DOOM_EFFECT, true, NULL, aurEff); } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_curse_of_doom_AuraScript(); } @@ -345,14 +345,14 @@ class spell_warl_demonic_circle_summon : public SpellScriptLoader } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_demonic_circle_summon_AuraScript(); } @@ -381,13 +381,13 @@ class spell_warl_demonic_circle_teleport : public SpellScriptLoader } } - void Register() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_demonic_circle_teleport_AuraScript(); } @@ -403,7 +403,7 @@ class spell_warl_demon_soul : public SpellScriptLoader { PrepareSpellScript(spell_warl_demon_soul_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_DEMON_SOUL_IMP)) return false; @@ -448,13 +448,13 @@ class spell_warl_demon_soul : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warl_demon_soul_SpellScript::OnHitTarget, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_demon_soul_SpellScript; } @@ -471,7 +471,7 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader { PrepareSpellScript(spell_warl_demonic_empowerment_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + 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; @@ -512,13 +512,13 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warl_demonic_empowerment_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_demonic_empowerment_SpellScript(); } @@ -543,13 +543,13 @@ class spell_warl_everlasting_affliction : public SpellScriptLoader aurEff->GetBase()->RefreshDuration(); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warl_everlasting_affliction_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_everlasting_affliction_SpellScript(); } @@ -580,13 +580,13 @@ class spell_warl_fel_flame : public SpellScriptLoader aura->SetDuration(std::min(newDuration, aura->GetMaxDuration())); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warl_fel_flame_SpellScript::OnHitTarget, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_fel_flame_SpellScript; } @@ -602,7 +602,7 @@ class spell_warl_fel_synergy : public SpellScriptLoader { PrepareAuraScript(spell_warl_fel_synergy_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_FEL_SYNERGY_HEAL)) return false; @@ -622,14 +622,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() OVERRIDE + 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 OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_fel_synergy_AuraScript(); } @@ -645,7 +645,7 @@ class spell_warl_glyph_of_shadowflame : public SpellScriptLoader { PrepareAuraScript(spell_warl_glyph_of_shadowflame_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_GLYPH_OF_SHADOWFLAME)) return false; @@ -658,13 +658,13 @@ class spell_warl_glyph_of_shadowflame : public SpellScriptLoader GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_WARLOCK_GLYPH_OF_SHADOWFLAME, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_warl_glyph_of_shadowflame_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_glyph_of_shadowflame_AuraScript(); } @@ -688,7 +688,7 @@ class spell_warl_haunt : public SpellScriptLoader aurEff->SetAmount(CalculatePct(aurEff->GetAmount(), GetHitDamage())); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_warl_haunt_SpellScript::HandleOnHit); } @@ -698,7 +698,7 @@ class spell_warl_haunt : public SpellScriptLoader { PrepareAuraScript(spell_warl_haunt_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_HAUNT_HEAL)) return false; @@ -714,18 +714,18 @@ class spell_warl_haunt : public SpellScriptLoader } } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_haunt_SpellScript(); } - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_haunt_AuraScript(); } @@ -779,7 +779,7 @@ class spell_warl_health_funnel : public SpellScriptLoader caster->DealSpellDamage(&damageInfo, false); } - void Register() OVERRIDE + void Register() override { OnEffectApply += AuraEffectApplyFn(spell_warl_health_funnel_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_OBS_MOD_HEALTH, AURA_EFFECT_HANDLE_REAL); OnEffectRemove += AuraEffectRemoveFn(spell_warl_health_funnel_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_OBS_MOD_HEALTH, AURA_EFFECT_HANDLE_REAL); @@ -787,7 +787,7 @@ class spell_warl_health_funnel : public SpellScriptLoader } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_health_funnel_AuraScript(); } @@ -809,13 +809,13 @@ class spell_warl_healthstone_heal : public SpellScriptLoader SetHitHeal(heal); } - void Register() OVERRIDE + void Register() override { OnHit += SpellHitFn(spell_warl_healthstone_heal_SpellScript::HandleOnHit); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_healthstone_heal_SpellScript(); } @@ -831,7 +831,7 @@ class spell_warl_improved_soul_fire : public SpellScriptLoader { PrepareAuraScript(spell_warl_improved_soul_fire_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_IMPROVED_SOUL_FIRE_PCT) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_IMPROVED_SOUL_FIRE_STATE)) @@ -846,13 +846,13 @@ class spell_warl_improved_soul_fire : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_WARLOCK_IMPROVED_SOUL_FIRE_STATE, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_warl_improved_soul_fire_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_improved_soul_fire_AuraScript(); } @@ -869,12 +869,12 @@ class spell_warl_life_tap : public SpellScriptLoader { PrepareSpellScript(spell_warl_life_tap_SpellScript); - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_LIFE_TAP_ENERGIZE) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_LIFE_TAP_ENERGIZE_2)) @@ -916,14 +916,14 @@ class spell_warl_life_tap : public SpellScriptLoader return SPELL_FAILED_FIZZLE; } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_life_tap_SpellScript(); } @@ -940,7 +940,7 @@ class spell_warl_nether_ward_overrride : public SpellScriptLoader { PrepareAuraScript(spell_warl_nether_ward_overrride_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_NETHER_TALENT) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_NETHER_WARD) || @@ -957,13 +957,13 @@ class spell_warl_nether_ward_overrride : public SpellScriptLoader amount = SPELL_WARLOCK_SHADOW_WARD; } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_nether_ward_overrride_AuraScript::CalculateAmount, EFFECT_2, SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_nether_ward_overrride_AuraScript(); } @@ -979,7 +979,7 @@ class spell_warl_seduction : public SpellScriptLoader { PrepareSpellScript(spell_warl_seduction_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_GLYPH_OF_SUCCUBUS) || !sSpellMgr->GetSpellInfo(SPELL_PRIEST_SHADOW_WORD_DEATH)) @@ -1001,13 +1001,13 @@ class spell_warl_seduction : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warl_seduction_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_seduction_SpellScript(); } @@ -1030,13 +1030,13 @@ class spell_warl_seed_of_corruption : public SpellScriptLoader targets.remove(GetExplTargetUnit()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warl_seed_of_corruption_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_seed_of_corruption_SpellScript(); } @@ -1053,7 +1053,7 @@ class spell_warl_shadow_trance_proc : public SpellScriptLoader { PrepareAuraScript(spell_warl_shadow_trance_proc_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SHADOW_TRANCE)) return false; @@ -1066,13 +1066,13 @@ class spell_warl_shadow_trance_proc : public SpellScriptLoader GetTarget()->CastSpell(GetTarget(), SPELL_WARLOCK_SHADOW_TRANCE, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_warl_shadow_trance_proc_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_shadow_trance_proc_AuraScript(); } @@ -1103,13 +1103,13 @@ class spell_warl_shadow_ward : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_shadow_ward_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_shadow_ward_AuraScript(); } @@ -1125,7 +1125,7 @@ class spell_warl_soul_leech : public SpellScriptLoader { PrepareAuraScript(spell_warl_soul_leech_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_GEN_REPLENISHMENT)) return false; @@ -1137,13 +1137,13 @@ class spell_warl_soul_leech : public SpellScriptLoader GetTarget()->CastSpell((Unit*)NULL, SPELL_GEN_REPLENISHMENT, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_warl_soul_leech_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_soul_leech_AuraScript(); } @@ -1159,7 +1159,7 @@ class spell_warl_soul_swap : public SpellScriptLoader { PrepareSpellScript(spell_warl_soul_swap_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_GLYPH_OF_SOUL_SWAP) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOUL_SWAP_CD_MARKER) || @@ -1174,13 +1174,13 @@ class spell_warl_soul_swap : public SpellScriptLoader GetHitUnit()->CastSpell(GetCaster(), SPELL_WARLOCK_SOUL_SWAP_DOT_MARKER, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_soul_swap_SpellScript(); } @@ -1196,14 +1196,14 @@ class spell_warl_soul_swap_override : public SpellScriptLoader { PrepareAuraScript(spell_warl_soul_swap_override_AuraScript); - bool Load() OVERRIDE + bool Load() override { _swapCaster = NULL; return true; } //! Forced to, pure virtual functions must have a body when linking - void Register() OVERRIDE { } + void Register() override { } public: void AddDot(uint32 id) { _dotList.push_back(id); } @@ -1216,7 +1216,7 @@ class spell_warl_soul_swap_override : public SpellScriptLoader Unit* _swapCaster; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warl_soul_swap_override_AuraScript(); } @@ -1262,13 +1262,13 @@ class spell_warl_soul_swap_dot_marker : public SpellScriptLoader swapSpellScript->SetOriginalSwapSource(swapVictim); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_dot_marker_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_soul_swap_dot_marker_SpellScript(); } @@ -1284,7 +1284,7 @@ public: { PrepareSpellScript(spell_warl_soul_swap_exhale_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOUL_SWAP_MOD_COST) || !sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOUL_SWAP_OVERRIDE)) @@ -1340,14 +1340,14 @@ public: GetCaster()->CastSpell(GetCaster(), SPELL_WARLOCK_SOUL_SWAP_CD_MARKER, false); } - void Register() OVERRIDE + void Register() override { OnCheckCast += SpellCheckCastFn(spell_warl_soul_swap_exhale_SpellScript::CheckCast); OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_exhale_SpellScript::OnEffectHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_soul_swap_exhale_SpellScript(); } @@ -1364,7 +1364,7 @@ class spell_warl_soulshatter : public SpellScriptLoader { PrepareSpellScript(spell_warl_soulshatter_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_SOULSHATTER)) return false; @@ -1379,13 +1379,13 @@ class spell_warl_soulshatter : public SpellScriptLoader caster->CastSpell(target, SPELL_WARLOCK_SOULSHATTER, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warl_soulshatter_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warl_soulshatter_SpellScript(); } @@ -1402,7 +1402,7 @@ class spell_warl_unstable_affliction : public SpellScriptLoader { PrepareAuraScript(spell_warl_unstable_affliction_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL)) return false; @@ -1420,13 +1420,13 @@ class spell_warl_unstable_affliction : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { AfterDispel += AuraDispelFn(spell_warl_unstable_affliction_AuraScript::HandleDispel); } }; - AuraScript* GetAuraScript() const OVERRIDE + 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 238989ea2b2..529d62b5297 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -106,14 +106,14 @@ class spell_warr_bloodthirst : public SpellScriptLoader GetCaster()->CastCustomSpell(GetCaster(), SPELL_WARRIOR_BLOODTHIRST, &damage, NULL, NULL, true, NULL); } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_bloodthirst_SpellScript(); } @@ -135,13 +135,13 @@ class spell_warr_bloodthirst_heal : public SpellScriptLoader SetHitHeal(GetCaster()->CountPctFromMaxHealth(spellInfo->Effects[EFFECT_1].CalcValue(GetCaster())) / 100); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warr_bloodthirst_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_bloodthirst_heal_SpellScript(); } @@ -157,7 +157,7 @@ class spell_warr_charge : public SpellScriptLoader { PrepareSpellScript(spell_warr_charge_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_JUGGERNAUT_CRIT_BONUS_TALENT) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_JUGGERNAUT_CRIT_BONUS_BUFF) || @@ -177,13 +177,13 @@ class spell_warr_charge : public SpellScriptLoader caster->CastSpell(caster, SPELL_WARRIOR_JUGGERNAUT_CRIT_BONUS_BUFF, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warr_charge_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_charge_SpellScript(); } @@ -204,13 +204,13 @@ class spell_warr_concussion_blow : public SpellScriptLoader SetHitDamage(CalculatePct(GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK), GetEffectValue())); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warr_concussion_blow_SpellScript::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_concussion_blow_SpellScript(); } @@ -226,7 +226,7 @@ class spell_warr_deep_wounds : public SpellScriptLoader { PrepareSpellScript(spell_warr_deep_wounds_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_DEEP_WOUNDS_RANK_1) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_DEEP_WOUNDS_RANK_2) || @@ -262,13 +262,13 @@ class spell_warr_deep_wounds : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warr_deep_wounds_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_deep_wounds_SpellScript(); } @@ -310,13 +310,13 @@ class spell_warr_execute : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warr_execute_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_execute_SpellScript(); } @@ -346,13 +346,13 @@ class spell_warr_glyph_of_sunder_armor : public SpellScriptLoader spellMod->value = aurEff->GetAmount(); } - void Register() OVERRIDE + void Register() override { DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_warr_glyph_of_sunder_armor_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_glyph_of_sunder_armor_AuraScript(); } @@ -374,13 +374,13 @@ class spell_warr_improved_spell_reflection : public SpellScriptLoader unitList.remove(GetCaster()); } - void Register() OVERRIDE + void Register() override { OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_improved_spell_reflection_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_improved_spell_reflection_SpellScript(); } @@ -401,14 +401,14 @@ class spell_warr_intimidating_shout : public SpellScriptLoader unitList.remove(GetExplTargetWorldObject()); } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_intimidating_shout_SpellScript(); } @@ -424,7 +424,7 @@ class spell_warr_lambs_to_the_slaughter : public SpellScriptLoader { PrepareAuraScript(spell_warr_lambs_to_the_slaughter_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_MORTAL_STRIKE) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_REND)) @@ -439,13 +439,13 @@ class spell_warr_lambs_to_the_slaughter : public SpellScriptLoader } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_warr_lambs_to_the_slaughter_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_lambs_to_the_slaughter_AuraScript(); } @@ -462,7 +462,7 @@ class spell_warr_last_stand : public SpellScriptLoader { PrepareSpellScript(spell_warr_last_stand_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_LAST_STAND_TRIGGERED)) return false; @@ -476,14 +476,14 @@ class spell_warr_last_stand : public SpellScriptLoader caster->CastCustomSpell(caster, SPELL_WARRIOR_LAST_STAND_TRIGGERED, &healthModSpellBasePoints0, NULL, NULL, true, NULL); } - void Register() OVERRIDE + 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 OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_last_stand_SpellScript(); } @@ -515,13 +515,13 @@ class spell_warr_overpower : public SpellScriptLoader target->CastSpell(target, spellId, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warr_overpower_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_ANY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_overpower_SpellScript(); } @@ -537,14 +537,14 @@ class spell_warr_rallying_cry : public SpellScriptLoader { PrepareSpellScript(spell_warr_rallying_cry_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_RALLYING_CRY)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; } @@ -556,13 +556,13 @@ class spell_warr_rallying_cry : public SpellScriptLoader GetCaster()->CastCustomSpell(GetHitUnit(), SPELL_WARRIOR_RALLYING_CRY, &basePoints0, NULL, NULL, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warr_rallying_cry_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_rallying_cry_SpellScript(); } @@ -594,13 +594,13 @@ class spell_warr_rend : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warr_rend_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_rend_AuraScript(); } @@ -616,7 +616,7 @@ class spell_warr_retaliation : public SpellScriptLoader { PrepareAuraScript(spell_warr_retaliation_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_RETALIATION_DAMAGE)) return false; @@ -635,14 +635,14 @@ class spell_warr_retaliation : public SpellScriptLoader GetTarget()->CastSpell(eventInfo.GetProcTarget(), SPELL_WARRIOR_RETALIATION_DAMAGE, true, NULL, aurEff); } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_warr_retaliation_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_warr_retaliation_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_retaliation_AuraScript(); } @@ -667,13 +667,13 @@ class spell_warr_shattering_throw : public SpellScriptLoader target->RemoveAurasWithMechanic(1 << MECHANIC_IMMUNE_SHIELD, AURA_REMOVE_BY_ENEMY_SPELL); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warr_shattering_throw_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_shattering_throw_SpellScript(); } @@ -689,7 +689,7 @@ class spell_warr_slam : public SpellScriptLoader { PrepareSpellScript(spell_warr_slam_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_SLAM)) return false; @@ -702,13 +702,13 @@ class spell_warr_slam : public SpellScriptLoader GetCaster()->CastCustomSpell(SPELL_WARRIOR_SLAM, SPELLVALUE_BASE_POINT0, GetEffectValue(), GetHitUnit(), TRIGGERED_FULL_MASK); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warr_slam_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_slam_SpellScript(); } @@ -723,7 +723,7 @@ class spell_warr_second_wind_proc : public SpellScriptLoader { PrepareAuraScript(spell_warr_second_wind_proc_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_SECOUND_WIND_PROC_RANK_1) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_SECOUND_WIND_PROC_RANK_2) || @@ -758,7 +758,7 @@ class spell_warr_second_wind_proc : public SpellScriptLoader } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_warr_second_wind_proc_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_warr_second_wind_proc_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); @@ -766,7 +766,7 @@ class spell_warr_second_wind_proc : public SpellScriptLoader }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_second_wind_proc_AuraScript(); } @@ -786,13 +786,13 @@ class spell_warr_second_wind_trigger : public SpellScriptLoader amount = int32(GetUnitOwner()->CountPctFromMaxHealth(amount)); } - void Register() OVERRIDE + void Register() override { DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warr_second_wind_trigger_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_PERIODIC_HEAL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_second_wind_trigger_AuraScript(); } @@ -808,7 +808,7 @@ class spell_warr_sudden_death : public SpellScriptLoader { PrepareAuraScript(spell_warr_sudden_death_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_COLOSSUS_SMASH)) return false; @@ -822,13 +822,13 @@ class spell_warr_sudden_death : public SpellScriptLoader player->RemoveSpellCooldown(SPELL_WARRIOR_COLOSSUS_SMASH, true); } - void Register() OVERRIDE + void Register() override { AfterEffectApply += AuraEffectRemoveFn(spell_warr_sudden_death_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); // correct? } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_sudden_death_AuraScript(); } @@ -844,14 +844,14 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader { PrepareAuraScript(spell_warr_sweeping_strikes_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK_1) || !sSpellMgr->GetSpellInfo(SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK_2)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { _procTarget = NULL; return true; @@ -882,7 +882,7 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_warr_sweeping_strikes_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_warr_sweeping_strikes_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); @@ -892,7 +892,7 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_sweeping_strikes_AuraScript(); } @@ -908,7 +908,7 @@ class spell_warr_sword_and_board : public SpellScriptLoader { PrepareAuraScript(spell_warr_sword_and_board_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_SHIELD_SLAM)) return false; @@ -922,13 +922,13 @@ class spell_warr_sword_and_board : public SpellScriptLoader player->RemoveSpellCooldown(SPELL_WARRIOR_SHIELD_SLAM, true); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_warr_sword_and_board_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_sword_and_board_AuraScript(); } @@ -951,13 +951,13 @@ class spell_warr_victorious : public SpellScriptLoader GetTarget()->RemoveAura(GetId()); } - void Register() OVERRIDE + void Register() override { OnEffectProc += AuraEffectProcFn(spell_warr_victorious_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_victorious_AuraScript(); } @@ -973,14 +973,14 @@ class spell_warr_vigilance : public SpellScriptLoader { PrepareAuraScript(spell_warr_vigilance_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE + bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sSpellMgr->GetSpellInfo(SPELL_WARRIOR_VENGEANCE)) return false; return true; } - bool Load() OVERRIDE + bool Load() override { _procTarget = NULL; return true; @@ -1010,7 +1010,7 @@ class spell_warr_vigilance : public SpellScriptLoader } } - void Register() OVERRIDE + void Register() override { DoCheckProc += AuraCheckProcFn(spell_warr_vigilance_AuraScript::CheckProc); OnEffectProc += AuraEffectProcFn(spell_warr_vigilance_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); @@ -1021,7 +1021,7 @@ class spell_warr_vigilance : public SpellScriptLoader Unit* _procTarget; }; - AuraScript* GetAuraScript() const OVERRIDE + AuraScript* GetAuraScript() const override { return new spell_warr_vigilance_AuraScript(); } @@ -1046,13 +1046,13 @@ class spell_warr_vigilance_trigger : public SpellScriptLoader target->RemoveSpellCooldown(SPELL_WARRIOR_TAUNT, true); } - void Register() OVERRIDE + void Register() override { OnEffectHitTarget += SpellEffectFn(spell_warr_vigilance_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; - SpellScript* GetSpellScript() const OVERRIDE + SpellScript* GetSpellScript() const override { return new spell_warr_vigilance_trigger_SpellScript(); } |