Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 16 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_dk.cpp
+75 -75
View File
@@ -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();
}