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_pet.cpp
+65 -65
View File
@@ -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();
}