Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Pets:

Browse Source 
* corrected level 85 stats for Death Knight's Risen Ghoul
* removed an old leftover that was causing Blood Worms to have way too much health
* enabled and use Avoidance for Death Knight Ghouls used in Raise Dead and Army of the Dead
This commit is contained in:
Ovahlord
2019-02-10 18:43:54 +01:00
parent 949c6b8d8a
commit f73630dd0e
4 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/server/scripts/Spells/spell_pet.cpp
View File

@@ -775,48 +775,37 @@ class spell_hun_pet_passive_crit : public AuraScript
}
};
class spell_dk_avoidance_passive : public SpellScriptLoader
class spell_dk_avoidance_passive : public AuraScript
{
public:
spell_dk_avoidance_passive() : SpellScriptLoader("spell_dk_avoidance_passive") { }
PrepareAuraScript(spell_dk_avoidance_passive);
class spell_dk_avoidance_passive_AuraScript : public AuraScript
bool Load() override
{
PrepareAuraScript(spell_dk_avoidance_passive_AuraScript);
if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER)
return false;
return true;
}
bool Load() override
void CalculateAvoidanceAmount(AuraEffect const* /* aurEff */, int32& amount, bool& canBeRecalculated)
{
canBeRecalculated = true;
if (Unit* pet = GetUnitOwner())
{
if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER)
return false;
return true;
}
void CalculateAvoidanceAmount(AuraEffect const* /* aurEff */, int32& amount, bool& canBeRecalculated)
{
canBeRecalculated = true;
if (Unit* pet = GetUnitOwner())
if (Unit* owner = pet->GetOwner())
{
if (Unit* owner = pet->GetOwner())
{
// Army of the dead ghoul
if (pet->GetEntry() == ENTRY_ARMY_OF_THE_DEAD_GHOUL)
amount = -90;
// Night of the dead
else if (Aura* aur = owner->GetAuraOfRankedSpell(SPELL_NIGHT_OF_THE_DEAD))
amount = aur->GetSpellInfo()->Effects[EFFECT_2].CalcValue();
}
// Army of the dead ghoul
if (pet->GetEntry() == ENTRY_ARMY_OF_THE_DEAD_GHOUL)
amount = -90;
// Night of the dead
else if (Aura* aur = owner->GetAuraOfRankedSpell(SPELL_NIGHT_OF_THE_DEAD))
amount = aur->GetSpellInfo()->Effects[EFFECT_2].CalcValue();
}
}
}
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_avoidance_passive_AuraScript::CalculateAvoidanceAmount, EFFECT_0, SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE);
}
};
AuraScript* GetAuraScript() const override
void Register() override
{
return new spell_dk_avoidance_passive_AuraScript();
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_avoidance_passive::CalculateAvoidanceAmount, EFFECT_0, SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE);
}
};
@@ -1174,6 +1163,7 @@ void AddSC_pet_spell_scripts()
RegisterAuraScript(spell_hun_pet_scaling_05);
RegisterAuraScript(spell_hun_pet_passive_crit);
RegisterAuraScript(spell_dk_avoidance_passive);
RegisterAuraScript(spell_dk_pet_scaling_01);
RegisterAuraScript(spell_dk_pet_scaling_02);
RegisterAuraScript(spell_dk_pet_scaling_03);