From 1c784a7fd7abb3550a11189711f8b428e2250d4d Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sat, 1 Feb 2020 11:01:45 +0100 Subject: [PATCH] Core/Packets: convert SMSG_QUEST_GIVER_QUEST_COMPLETE to packet class --- src/server/game/Entities/Player/Player.cpp | 40 +++++++++---------- src/server/game/Entities/Player/Player.h | 2 +- .../game/Server/Packets/QuestPackets.cpp | 16 ++++++++ src/server/game/Server/Packets/QuestPackets.h | 17 ++++++++ src/server/game/Server/Protocol/Opcodes.cpp | 2 +- src/server/game/Server/Protocol/Opcodes.h | 2 +- 6 files changed, 56 insertions(+), 23 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index bb9aea5a05..71905ae2c8 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -78,6 +78,7 @@ #include "QueryCallback.h" #include "QueryHolder.h" #include "QuestDef.h" +#include "QuestPackets.h" #include "Realm.h" #include "ReputationMgr.h" #include "SkillDiscovery.h" @@ -15251,7 +15252,7 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, _SaveQuestStatus(trans); if (announce) - SendQuestReward(quest, XP); + SendQuestReward(quest, questGiver ? questGiver->ToCreature() : nullptr, XP); RewardReputation(quest); @@ -16768,33 +16769,32 @@ void Player::SendQuestComplete(Quest const* quest) const } } -void Player::SendQuestReward(Quest const* quest, uint32 XP) +void Player::SendQuestReward(Quest const* quest, Creature const* questGiver, uint32 xp) { uint32 questId = quest->GetQuestId(); sGameEventMgr->HandleQuestComplete(questId); - uint32 xp = 0; + uint32 XP = 0; if (getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) - xp = XP; + XP = xp; - WorldPacket data(SMSG_QUESTGIVER_QUEST_COMPLETE, (4 + 4 + 4 + 4 + 4)); - data << uint32(quest->GetBonusTalents()); // bonus talents (not verified for 4.x) - data << uint32(quest->GetRewardSkillPoints()); // 4.x bonus skill points - data << uint32(quest->GetRewOrReqMoney(this)); - data << uint32(xp); - data << uint32(questId); - data << uint32(quest->GetRewardSkillId()); // 4.x bonus skill id + WorldPackets::Quest::QuestGiverQuestComplete packet; + packet.QuestID = questId; + packet.XPReward = XP; + packet.MoneyReward = quest->GetRewOrReqMoney(this); + packet.NumSkillUpsReward = quest->GetRewardSkillPoints(); + packet.TalentReward = quest->GetBonusTalents(); + packet.SkillLineIDReward = quest->GetRewardSkillId(); - bool canTakeNextRewardQuest = false; - if (uint32 nextQuestId = quest->GetNextQuestInChain()) - if (Quest const* quest = sObjectMgr->GetQuestTemplate(nextQuestId)) - canTakeNextRewardQuest = CanTakeQuest(quest, false); + if (questGiver) + { + if (questGiver->IsGossip()) + packet.LaunchGossip = true; + else if (quest->GetNextQuestInChain() && !quest->HasFlag(QUEST_FLAGS_AUTOCOMPLETE)) + packet.UseQuestReward = true; + } - data.WriteBit(0); // FIXME: unknown bit, common values sent - data.WriteBit(canTakeNextRewardQuest); // Can take next reward quest - data.FlushBits(); - - SendDirectMessage(&data); + SendDirectMessage(packet.Write()); } void Player::SendQuestFailed(uint32 questId, InventoryResult reason) const diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index ee37510350..b61d0a83eb 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1437,7 +1437,7 @@ class TC_GAME_API Player : public Unit, public GridObject bool CanShareQuest(uint32 questId) const; void SendQuestComplete(Quest const* quest) const; - void SendQuestReward(Quest const* quest, uint32 XP); + void SendQuestReward(Quest const* quest, Creature const* questGiver, uint32 xp); void SendQuestFailed(uint32 questId, InventoryResult reason = EQUIP_ERR_OK) const; void SendQuestTimerFailed(uint32 questId) const; void SendCanTakeQuestResponse(QuestFailedReason msg) const; diff --git a/src/server/game/Server/Packets/QuestPackets.cpp b/src/server/game/Server/Packets/QuestPackets.cpp index 5b5285723f..df03e138ee 100644 --- a/src/server/game/Server/Packets/QuestPackets.cpp +++ b/src/server/game/Server/Packets/QuestPackets.cpp @@ -173,6 +173,22 @@ WorldPacket const* WorldPackets::Quest::QuestGiverQuestDetails::Write() return &_worldPacket; } +WorldPacket const* WorldPackets::Quest::QuestGiverQuestComplete::Write() +{ + _worldPacket << uint32(TalentReward); + _worldPacket << uint32(NumSkillUpsReward); + _worldPacket << uint32(MoneyReward); + _worldPacket << uint32(XPReward); + _worldPacket << uint32(QuestID); + _worldPacket << uint32(SkillLineIDReward); + + _worldPacket.WriteBit(LaunchGossip); + _worldPacket.WriteBit(UseQuestReward); + _worldPacket.FlushBits(); + + return &_worldPacket; +} + ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Quest::QuestRewards const& questRewards) { data << uint32(questRewards.ChoiceItemCount); diff --git a/src/server/game/Server/Packets/QuestPackets.h b/src/server/game/Server/Packets/QuestPackets.h index 63cfa7eb43..314e931bb8 100644 --- a/src/server/game/Server/Packets/QuestPackets.h +++ b/src/server/game/Server/Packets/QuestPackets.h @@ -296,6 +296,23 @@ namespace WorldPackets bool StartCheat = false; bool AutoLaunched = false; }; + + class QuestGiverQuestComplete final : public ServerPacket + { + public: + QuestGiverQuestComplete() : ServerPacket(SMSG_QUEST_GIVER_QUEST_COMPLETE, 20) { } + + WorldPacket const* Write() override; + + int32 SkillLineIDReward = 0; + int32 MoneyReward = 0; + int32 NumSkillUpsReward = 0; + int32 XPReward = 0; + int32 QuestID = 0; + int32 TalentReward = 0; + bool LaunchGossip = false; + bool UseQuestReward = false; + }; } } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index fafc6d9a42..67a565cd03 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -1137,7 +1137,7 @@ void OpcodeTable::Initialize() DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_QUESTS_COMPLETED_RESPONSE, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUERY_TIME_RESPONSE, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUESTGIVER_OFFER_REWARD, STATUS_NEVER, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUESTGIVER_QUEST_COMPLETE, STATUS_NEVER, CONNECTION_TYPE_REALM); + DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_GIVER_QUEST_COMPLETE, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUEST_GIVER_QUEST_DETAILS, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUESTGIVER_QUEST_FAILED, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_QUESTGIVER_QUEST_INVALID, STATUS_NEVER, CONNECTION_TYPE_REALM); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index d10a515fab..3e1df5b4b8 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -1094,7 +1094,7 @@ enum OpcodeServer SMSG_QUERY_QUESTS_COMPLETED_RESPONSE = 0x6314, SMSG_QUERY_TIME_RESPONSE = 0x2124, SMSG_QUESTGIVER_OFFER_REWARD = 0x2427, - SMSG_QUESTGIVER_QUEST_COMPLETE = 0x55A4, + SMSG_QUEST_GIVER_QUEST_COMPLETE = 0x55A4, SMSG_QUEST_GIVER_QUEST_DETAILS = 0x2425, SMSG_QUESTGIVER_QUEST_FAILED = 0x4236, SMSG_QUESTGIVER_QUEST_INVALID = 0x4016,