diff options
| author | Meji <alvaromegias_46@hotmail.com> | 2022-01-07 22:14:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-07 22:14:07 +0100 |
| commit | ddc71206de653d05aed479b82260bcf55dd72445 (patch) | |
| tree | ed1b1dc4ed91f1c29df169e8ca5fe85a7aa70c29 /src/server/game/Spells | |
| parent | 26bdbde4679989a452cf7d2c5e29ceb6e0036ce3 (diff) | |
Core/Spells: Implemented spell effect 225 (SPELL_EFFECT_GRANT_BATTLEPET_LEVEL) (#27506)
Diffstat (limited to 'src/server/game/Spells')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Spells/Spell.h | 1 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 17 |
3 files changed, 19 insertions, 2 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 4975457c2d6..aa290851a7a 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -6044,6 +6044,7 @@ SpellCastResult Spell::CheckCast(bool strict, int32* param1 /*= nullptr*/, int32 break; } case SPELL_EFFECT_CHANGE_BATTLEPET_QUALITY: + case SPELL_EFFECT_GRANT_BATTLEPET_LEVEL: case SPELL_EFFECT_GRANT_BATTLEPET_EXPERIENCE: { Player* playerCaster = m_caster->ToPlayer(); @@ -6090,7 +6091,7 @@ SpellCastResult Spell::CheckCast(bool strict, int32* param1 /*= nullptr*/, int32 return SPELL_FAILED_CANT_UPGRADE_BATTLE_PET; } - if (spellEffectInfo.Effect == SPELL_EFFECT_GRANT_BATTLEPET_EXPERIENCE) + if (spellEffectInfo.Effect == SPELL_EFFECT_GRANT_BATTLEPET_LEVEL || spellEffectInfo.Effect == SPELL_EFFECT_GRANT_BATTLEPET_EXPERIENCE) if (battlePet->PacketInfo.Level >= BattlePets::MAX_BATTLE_PET_LEVEL) return GRANT_PET_LEVEL_FAIL; diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index e8c3df6bb5f..f7de7c2663c 100644 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -377,6 +377,7 @@ class TC_GAME_API Spell void EffectCancelConversation(); void EffectAddGarrisonFollower(); void EffectActivateGarrisonBuilding(); + void EffectGrantBattlePetLevel(); void EffectHealBattlePetPct(); void EffectEnableBattlePets(); void EffectChangeBattlePetQuality(); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 43fb5bf68ef..b216bb5f372 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -306,7 +306,7 @@ NonDefaultConstructible<SpellEffectHandlerFn> SpellEffectHandlers[TOTAL_SPELL_EF &Spell::EffectCreateHeirloomItem, //222 SPELL_EFFECT_CREATE_HEIRLOOM_ITEM &Spell::EffectNULL, //223 SPELL_EFFECT_CHANGE_ITEM_BONUSES &Spell::EffectActivateGarrisonBuilding, //224 SPELL_EFFECT_ACTIVATE_GARRISON_BUILDING - &Spell::EffectNULL, //225 SPELL_EFFECT_GRANT_BATTLEPET_LEVEL + &Spell::EffectGrantBattlePetLevel, //225 SPELL_EFFECT_GRANT_BATTLEPET_LEVEL &Spell::EffectNULL, //226 SPELL_EFFECT_TRIGGER_ACTION_SET &Spell::EffectNULL, //227 SPELL_EFFECT_TELEPORT_TO_LFG_DUNGEON &Spell::EffectNULL, //228 SPELL_EFFECT_228 @@ -5315,6 +5315,21 @@ void Spell::EffectActivateGarrisonBuilding() garrison->ActivateBuilding(effectInfo->MiscValue); } +void Spell::EffectGrantBattlePetLevel() +{ + if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) + return; + + Player* playerCaster = m_caster->ToPlayer(); + if (!playerCaster) + return; + + if (!unitTarget || !unitTarget->IsCreature()) + return; + + playerCaster->GetSession()->GetBattlePetMgr()->GrantBattlePetLevel(unitTarget->GetBattlePetCompanionGUID(), damage); +} + void Spell::EffectHealBattlePetPct() { if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) |