Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_thunder_bluff.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_item.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/scripts/World/item_scripts.cpp
This commit is contained in:
Vincent-Michael committed 2014-04-29 20:14:42 +02:00
2 parents 796b77ca12 f9a6aa5479
commit 3ce6a9d5cf
629 files changed
+9538 -9546
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/Spells/spell_shaman.cpp
+75 -75
View File
@@ -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();
}