From 9a95a945bb0813332f19a1a79d82b6c2fd567a51 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Fri, 22 Jun 2018 17:27:38 +0200 Subject: [PATCH] Core/Spells: implement opcode handling for SMSG_PET_TAME_FAILURE and updated Tame Beast checks for now pet slot system --- src/server/game/Entities/Player/Player.cpp | 7 +++ src/server/game/Entities/Player/Player.h | 2 + src/server/game/Miscellaneous/SharedDefines.h | 18 ++++++ src/server/game/Server/Protocol/Opcodes.cpp | 2 +- src/server/scripts/Spells/spell_hunter.cpp | 58 ++++++++++++++----- 5 files changed, 71 insertions(+), 16 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 638a6be2ef..c45e75d5af 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -28396,3 +28396,10 @@ void Player::RemoveSocial() sSocialMgr->RemovePlayerSocial(GetGUID()); m_social = nullptr; } + +void Player::SendTamePetFailure(PetTameFailureReason reason) +{ + WorldPacket data(SMSG_PET_TAME_FAILURE, 1); + data << uint8(reason); + SendDirectMessage(&data); +} diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 98fe3b599e..3f4a62d181 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1079,6 +1079,8 @@ class TC_GAME_API Player : public Unit, public GridObject PlayerSocial* GetSocial() { return m_social; } void RemoveSocial(); + void SendTamePetFailure(PetTameFailureReason reason); + PlayerTaxi m_taxi; void InitTaxiNodesForLevel() { m_taxi.InitTaxiNodesForLevel(getRace(), getClass(), getLevel()); } bool ActivateTaxiPathTo(std::vector const& nodes, Creature* npc = nullptr, uint32 spellid = 0); diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index b0c74bc895..fdd81766f1 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -3644,6 +3644,24 @@ enum PetDiet #define MAX_PET_DIET 9 +enum PetTameFailureReason +{ + PET_TAME_FAILURE_UNKNOWN = 0, + PET_TAME_FAILURE_CREATURE_NOT_FOUND = 1, + PET_TAME_FAILURE_TOO_MANY_PETS = 2, + PET_TAME_FAILURE_CREATURE_CONTROLLED = 3, + PET_TAME_FAILURE_NOT_TAMEABLE = 4, + PET_TAME_FAILURE_ACTIVE_SUMMON = 5, + PET_TAME_FAILURE_CANNOT_TAME_CREATURES = 6, + PET_TAME_FAILURE_NO_PET_TO_SUMMON = 7, + PET_TAME_FAILURE_INTERNAL_PET_ERROR = 8, + PET_TAME_FAILURE_TOO_HIGH_LEVEL = 9, + PET_TAME_FAILURE_DEAD_PET = 10, + PET_TAME_FAILURE_PET_NOT_DEAD = 11, + PET_TAME_FAILURE_CANNOT_TAME_EXOTIC = 12, + PET_TAME_FAILURE_SLOT_LOCKED = 13 +}; + #define CHAIN_SPELL_JUMP_RADIUS 8 enum GuildLogs diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index dbe01b1d8f..9df9b15eeb 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -1083,7 +1083,7 @@ void OpcodeTable::Initialize() DEFINE_OPCODE_HANDLER(SMSG_PET_RENAMEABLE, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_PET_SLOT_UPDATED, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_PET_SPELLS, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - DEFINE_OPCODE_HANDLER(SMSG_PET_TAME_FAILURE, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); + DEFINE_OPCODE_HANDLER(SMSG_PET_TAME_FAILURE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_PET_UPDATE_COMBO_POINTS, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_PLAYED_TIME, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); DEFINE_OPCODE_HANDLER(SMSG_PLAYERBINDERROR, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 11b60b50de..2e63dcc6df 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -35,6 +35,11 @@ enum HunterSpells SPELL_HUNTER_AIMED_SHOT = 19434, SPELL_HUNTER_AIMED_SHOT_INSTANT = 82928, SPELL_HUNTER_BESTIAL_WRATH = 19574, + SPELL_HUNTER_CALL_PET_1 = 883, + SPELL_HUNTER_CALL_PET_2 = 83242, + SPELL_HUNTER_CALL_PET_3 = 83243, + SPELL_HUNTER_CALL_PET_4 = 83244, + SPELL_HUNTER_CALL_PET_5 = 83245, SPELL_HUNTER_CHIMERA_SHOT = 53209, SPELL_HUNTER_CHIMERA_SHOT_HEAL = 53353, SPELL_HUNTER_FIRE = 82926, @@ -1081,6 +1086,15 @@ class spell_hun_improved_steady_shot : public SpellScriptLoader } }; +uint32 callPetSpellIdBySlot[] = +{ + SPELL_HUNTER_CALL_PET_1, + SPELL_HUNTER_CALL_PET_2, + SPELL_HUNTER_CALL_PET_3, + SPELL_HUNTER_CALL_PET_4, + SPELL_HUNTER_CALL_PET_5 +}; + // 1515 - Tame Beast class spell_hun_tame_beast : public SpellScriptLoader { @@ -1091,35 +1105,49 @@ class spell_hun_tame_beast : public SpellScriptLoader { PrepareSpellScript(spell_hun_tame_beast_SpellScript); + SpellCastResult SendTameFailResult(PetTameFailureReason reason) + { + Player* player = GetCaster()->ToPlayer(); + if (!player) + return SPELL_FAILED_DONT_REPORT; + + player->SendTamePetFailure(reason); + + return SPELL_FAILED_DONT_REPORT; + } + SpellCastResult CheckCast() { - Unit* caster = GetCaster(); - if (caster->GetTypeId() != TYPEID_PLAYER) + Player* player = GetCaster()->ToPlayer(); + if (!player) return SPELL_FAILED_DONT_REPORT; if (!GetExplTargetUnit()) return SPELL_FAILED_BAD_IMPLICIT_TARGETS; - if (!caster->ToPlayer()->GetFirstUnusedActivePetSlot()) - return SPELL_FAILED_DONT_REPORT; + PetTameFailureReason reason = PET_TAME_FAILURE_UNKNOWN; + + if (!player->GetFirstUnusedActivePetSlot()) + return SendTameFailResult(PET_TAME_FAILURE_TOO_MANY_PETS); + + if (Optional slot = player->GetFirstUnusedActivePetSlot()) + if (!player->HasSpell(callPetSpellIdBySlot[*slot])) + return SendTameFailResult(PET_TAME_FAILURE_SLOT_LOCKED); if (Creature* target = GetExplTargetUnit()->ToCreature()) { - if (target->getLevel() > caster->getLevel()) - return SPELL_FAILED_HIGHLEVEL; + if (target->getLevel() > player->getLevel()) + return SendTameFailResult(PET_TAME_FAILURE_TOO_HIGH_LEVEL); - // use SMSG_PET_TAME_FAILURE? - if (!target->GetCreatureTemplate()->IsTameable(caster->ToPlayer()->CanTameExoticPets())) - return SPELL_FAILED_BAD_TARGETS; + if (!target->GetCreatureTemplate()->IsTameable(player->ToPlayer()->CanTameExoticPets())) + return SendTameFailResult(PET_TAME_FAILURE_CANNOT_TAME_EXOTIC); - if (caster->GetPetGUID()) - return SPELL_FAILED_ALREADY_HAVE_SUMMON; + if (player->GetPetGUID()) + return SendTameFailResult(PET_TAME_FAILURE_ACTIVE_SUMMON); - if (caster->GetCharmGUID()) - return SPELL_FAILED_ALREADY_HAVE_CHARM; + if (player->GetCharmGUID()) + return SendTameFailResult(PET_TAME_FAILURE_CREATURE_CONTROLLED); } - else - return SPELL_FAILED_BAD_IMPLICIT_TARGETS; return SPELL_CAST_OK; }