josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Pets: more updates for pets and add spell_pet.cpp to the cmakelist file

Browse Source
This commit is contained in:
Kandera
2012-06-13 12:39:56 -04:00
parent 50bd43661c
commit 0ddaeaddc8
2 changed files with 81 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Spells/CMakeLists.txt
+1
View File
@@ -24,6 +24,7 @@ set(scripts_STAT_SRCS
Spells/spell_paladin.cpp Spells/spell_paladin.cpp
Spells/spell_item.cpp Spells/spell_item.cpp
Spells/spell_holiday.cpp Spells/spell_holiday.cpp
Spells/spell_pet.cpp
) )
message(" -> Prepared: Spells") message(" -> Prepared: Spells")
src/server/scripts/Spells/spell_pet.cpp
+80 -114
View File
@@ -56,6 +56,7 @@ enum WarlockPetCalculate
ENTRY_FELHUNTER = 417, ENTRY_FELHUNTER = 417,
ENTRY_SUCCUBUS = 1863, ENTRY_SUCCUBUS = 1863,
ENTRY_IMP = 416, ENTRY_IMP = 416,
SPELL_WARLOCK_GLYPH_OF_VOIDWALKER = 56247,
}; };
enum DKPetCalculate enum DKPetCalculate
@@ -261,6 +262,7 @@ public:
case ENTRY_IMP: case ENTRY_IMP:
healthMod = uint32(_tempBonus * 8.4f); healthMod = uint32(_tempBonus * 8.4f);
break; break;
case ENTRY_FELGUARD:
case ENTRY_VOIDWALKER: case ENTRY_VOIDWALKER:
healthMod = _tempBonus * 11; healthMod = _tempBonus * 11;
break; break;
@@ -270,9 +272,6 @@ public:
case ENTRY_FELHUNTER: case ENTRY_FELHUNTER:
healthMod = uint32(_tempBonus * 9.5f); healthMod = uint32(_tempBonus * 9.5f);
break; break;
case ENTRY_FELGUARD:
healthMod = _tempBonus * 11;
break;
default: default:
healthMod = 0; healthMod = 0;
break; break;
@@ -371,7 +370,7 @@ public:
{ {
if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER)
return false; return false;
_tempMana = 0; _tempBonus = 0;
return true; return true;
} }
@@ -386,58 +385,70 @@ public:
ownerBonus = CalculatePctN(owner->GetStat(STAT_INTELLECT), 30); ownerBonus = CalculatePctN(owner->GetStat(STAT_INTELLECT), 30);
amount += ownerBonus; amount += ownerBonus;
_tempBonus = ownerBonus;
} }
} }
void ApplyEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) void ApplyEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{ {
if (Unit* pet = GetUnitOwner()) if (Unit* pet = GetUnitOwner())
if (_tempMana) if (_tempBonus)
pet->SetPower(POWER_MANA, _tempMana); {
PetLevelInfo const* pInfo = sObjectMgr->GetPetLevelInfo(pet->GetEntry(), pet->getLevel());
uint32 manaMod = 0;
uint32 baseMana = pInfo->mana;
switch (pet->GetEntry())
{
case ENTRY_IMP:
manaMod = uint32(_tempBonus * 4.9f);
break;
case ENTRY_VOIDWALKER:
case ENTRY_SUCCUBUS:
case ENTRY_FELHUNTER:
case ENTRY_FELGUARD:
manaMod = uint32(_tempBonus * 11.5f);
break;
default:
manaMod = 0;
break;
}
if (manaMod)
pet->ToPet()->SetCreateMana(baseMana + manaMod);
}
} }
void RemoveEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) void RemoveEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{ {
if (Unit* pet = GetUnitOwner()) if (Unit* pet = GetUnitOwner())
_tempMana = pet->GetPower(POWER_MANA); if (pet->isPet())
{
PetLevelInfo const* pInfo = sObjectMgr->GetPetLevelInfo(pet->GetEntry(), pet->getLevel());
pet->ToPet()->SetCreateMana(pInfo->mana);
}
} }
void CalculateArmorAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/) void CalculateArmorAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/)
{ {
if (Unit* pet = GetUnitOwner()) if (Unit* pet = GetUnitOwner())
{ if (pet->isPet())
if (!pet->isPet()) if (Unit* owner = pet->ToPet()->GetOwner())
return; {
float ownerBonus = 0.0f;
Unit* owner = pet->ToPet()->GetOwner(); ownerBonus = CalculatePctN(owner->GetArmor(), 35);
if (!owner) amount += ownerBonus;
return; }
float ownerBonus = 0.0f;
ownerBonus = CalculatePctN(owner->GetArmor(), 35);
amount += ownerBonus;
}
} }
void CalculateFireResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/) void CalculateFireResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/)
{ {
if (Unit* pet = GetUnitOwner()) if (Unit* pet = GetUnitOwner())
{ if (pet->isPet())
if (!pet->isPet()) if (Unit* owner = pet->ToPet()->GetOwner())
return; {
float ownerBonus = 0.0f;
Unit* owner = pet->ToPet()->GetOwner(); ownerBonus = CalculatePctN(owner->GetResistance(SPELL_SCHOOL_FIRE), 40);
if (!owner) amount += ownerBonus;
return; }
float ownerBonus = 0.0f;
ownerBonus = CalculatePctN(owner->GetResistance(SPELL_SCHOOL_FIRE), 40);
amount += ownerBonus;
}
} }
void Register() void Register()
@@ -450,7 +461,7 @@ public:
} }
private: private:
uint32 _tempMana; uint32 _tempBonus;
}; };
AuraScript* GetAuraScript() const AuraScript* GetAuraScript() const
@@ -478,58 +489,37 @@ public:
void CalculateFrostResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/) void CalculateFrostResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/)
{ {
if (Unit* pet = GetUnitOwner()) if (Unit* pet = GetUnitOwner())
{ if (pet->isPet())
if (!pet->isPet()) if (Unit* owner = pet->ToPet()->GetOwner())
return; {
float ownerBonus = 0.0f;
Unit* owner = pet->ToPet()->GetOwner(); ownerBonus = CalculatePctN(owner->GetResistance(SPELL_SCHOOL_FROST), 40);
if (!owner) amount += ownerBonus;
return; }
float ownerBonus = 0.0f;
ownerBonus = CalculatePctN(owner->GetResistance(SPELL_SCHOOL_FROST), 40);
amount += ownerBonus;
}
} }
void CalculateArcaneResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/) void CalculateArcaneResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/)
{ {
if (Unit* pet = GetUnitOwner()) if (Unit* pet = GetUnitOwner())
{ if (pet->isPet())
if (!pet->isPet()) if (Unit* owner = pet->ToPet()->GetOwner())
return; {
float ownerBonus = 0.0f;
Unit* owner = pet->ToPet()->GetOwner(); ownerBonus = CalculatePctN(owner->GetResistance(SPELL_SCHOOL_ARCANE), 40);
if (!owner) amount += ownerBonus;
return; }
float ownerBonus = 0.0f;
ownerBonus = CalculatePctN(owner->GetResistance(SPELL_SCHOOL_ARCANE), 40);
amount += ownerBonus;
}
} }
void CalculateNatureResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/) void CalculateNatureResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/)
{ {
if (Unit* pet = GetUnitOwner()) if (Unit* pet = GetUnitOwner())
{ if (pet->isPet())
if (!pet->isPet()) if (Unit* owner = pet->ToPet()->GetOwner())
return; {
float ownerBonus = 0.0f;
Unit* owner = pet->ToPet()->GetOwner(); ownerBonus = CalculatePctN(owner->GetResistance(SPELL_SCHOOL_NATURE), 40);
if (!owner) amount += ownerBonus;
return; }
float ownerBonus = 0.0f;
ownerBonus = CalculatePctN(owner->GetResistance(SPELL_SCHOOL_NATURE), 40);
amount += ownerBonus;
}
} }
void Register() void Register()
@@ -566,20 +556,13 @@ public:
void CalculateShadowResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/) void CalculateShadowResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/)
{ {
if (Unit* pet = GetUnitOwner()) if (Unit* pet = GetUnitOwner())
{ if (pet->isPet())
if (!pet->isPet()) if (Unit* owner = pet->ToPet()->GetOwner())
return; {
float ownerBonus = 0.0f;
Unit* owner = pet->ToPet()->GetOwner(); ownerBonus = CalculatePctN(owner->GetResistance(SPELL_SCHOOL_SHADOW), 40);
if (!owner) amount += ownerBonus;
return; }
float ownerBonus = 0.0f;
ownerBonus = CalculatePctN(owner->GetResistance(SPELL_SCHOOL_SHADOW), 40);
amount += ownerBonus;
}
} }
void Register() void Register()
@@ -612,8 +595,6 @@ public:
void CalculateAmountMeleeHit(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) void CalculateAmountMeleeHit(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{ {
if (!GetCaster() || !GetCaster()->GetOwner())
return;
if (Player* owner = GetCaster()->GetOwner()->ToPlayer()) if (Player* owner = GetCaster()->GetOwner()->ToPlayer())
{ {
// For others recalculate it from: // For others recalculate it from:
@@ -629,8 +610,6 @@ public:
void CalculateAmountSpellHit(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) void CalculateAmountSpellHit(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{ {
if (!GetCaster() || !GetCaster()->GetOwner())
return;
if (Player* owner = GetCaster()->GetOwner()->ToPlayer()) if (Player* owner = GetCaster()->GetOwner()->ToPlayer())
{ {
// For others recalculate it from: // For others recalculate it from:
@@ -646,8 +625,6 @@ public:
void CalculateAmountExpertise(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) void CalculateAmountExpertise(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{ {
if (!GetCaster() || !GetCaster()->GetOwner())
return;
if (Player* owner = GetCaster()->GetOwner()->ToPlayer()) if (Player* owner = GetCaster()->GetOwner()->ToPlayer())
{ {
// For others recalculate it from: // For others recalculate it from:
@@ -693,8 +670,6 @@ public:
void CalculateAmountCritSpell(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) void CalculateAmountCritSpell(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{ {
if (!GetCaster() || !GetCaster()->GetOwner())
return;
if (Player* owner = GetCaster()->GetOwner()->ToPlayer()) if (Player* owner = GetCaster()->GetOwner()->ToPlayer())
{ {
// For others recalculate it from: // For others recalculate it from:
@@ -717,8 +692,6 @@ public:
void CalculateAmountCritMelee(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) void CalculateAmountCritMelee(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{ {
if (!GetCaster() || !GetCaster()->GetOwner())
return;
if (Player* owner = GetCaster()->GetOwner()->ToPlayer()) if (Player* owner = GetCaster()->GetOwner()->ToPlayer())
{ {
// For others recalculate it from: // For others recalculate it from:
@@ -751,7 +724,7 @@ public:
return new spell_warl_pet_passive_AuraScript(); return new spell_warl_pet_passive_AuraScript();
} }
}; };
// this doesnt actually fit in here
class spell_warl_pet_passive_damage_done : public SpellScriptLoader class spell_warl_pet_passive_damage_done : public SpellScriptLoader
{ {
public: public:
@@ -822,17 +795,10 @@ public:
void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/) void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/)
{ {
if (Unit* pet = GetUnitOwner()) if (Unit* pet = GetUnitOwner())
{ if (pet->isPet())
if (!pet->isPet()) if (Unit* owner = pet->ToPet()->GetOwner())
return; if (AuraEffect* aurEffect = owner->GetAuraEffect(SPELL_WARLOCK_GLYPH_OF_VOIDWALKER, EFFECT_0))
amount += aurEffect->GetAmount();
Unit* owner = pet->ToPet()->GetOwner();
if (!owner)
return;
if (AuraEffect* aurEffect = owner->GetAuraEffect(56247, EFFECT_0))
amount += aurEffect->GetAmount();
}
} }
void Register() void Register()