aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Server
diff options
context:
space:
mode:
authorKinzcool <kinzzcool@hotmail.com>2015-07-01 17:57:09 -0400
committerKinzcool <kinzzcool@hotmail.com>2015-07-01 17:57:09 -0400
commit4bbbd9540a25845edb0d424199bab196b5e6bea1 (patch)
tree39aa0b8c6c76390a70e5e513131cb4a777ce32e5 /src/server/game/Server
parent97b693343586be8ec01178b6b0a02f52bee4d723 (diff)
Core/Quests: Calculate the RewardMoney value with QuestMoneyReward.dbc and defined an unknown field
Diffstat (limited to 'src/server/game/Server')
-rw-r--r--src/server/game/Server/Packets/QuestPackets.cpp2
-rw-r--r--src/server/game/Server/Packets/QuestPackets.h7
2 files changed, 4 insertions, 5 deletions
diff --git a/src/server/game/Server/Packets/QuestPackets.cpp b/src/server/game/Server/Packets/QuestPackets.cpp
index d792783cf9a..7135a79a74e 100644
--- a/src/server/game/Server/Packets/QuestPackets.cpp
+++ b/src/server/game/Server/Packets/QuestPackets.cpp
@@ -75,7 +75,7 @@ WorldPacket const* WorldPackets::Quest::QueryQuestInfoResponse::Write()
_worldPacket << Info.RewardXPMultiplier;
_worldPacket << Info.RewardMoney;
_worldPacket << Info.RewardMoneyDifficulty;
- _worldPacket << Info.Float13; // Unk
+ _worldPacket << Info.RewardMoneyMultiplier;
_worldPacket << Info.RewardBonusMoney;
_worldPacket << Info.RewardDisplaySpell;
_worldPacket << Info.RewardSpell;
diff --git a/src/server/game/Server/Packets/QuestPackets.h b/src/server/game/Server/Packets/QuestPackets.h
index b2d7269ebb0..90568ed36ea 100644
--- a/src/server/game/Server/Packets/QuestPackets.h
+++ b/src/server/game/Server/Packets/QuestPackets.h
@@ -118,7 +118,8 @@ namespace WorldPackets
int32 RewardXPDifficulty = 0; // used for calculating rewarded experience
float RewardXPMultiplier = 1.0f;
int32 RewardMoney = 0; // reward money (below max lvl)
- int32 RewardMoneyDifficulty = 0; // used in XP calculation at client
+ int32 RewardMoneyDifficulty = 0;
+ float RewardMoneyMultiplier = 1.0f;
int32 RewardBonusMoney = 0;
int32 RewardDisplaySpell = 0; // reward spell, this spell will be displayed (icon)
int32 RewardSpell = 0;
@@ -131,6 +132,7 @@ namespace WorldPackets
float POIx = 0.0f;
float POIy = 0.0f;
int32 POIPriority = 0;
+ int32 AllowableRaces = -1;
std::string LogTitle;
std::string LogDescription;
std::string QuestDescription;
@@ -163,9 +165,6 @@ namespace WorldPackets
int32 RewardFactionOverride[QUEST_REWARD_REPUTATIONS_COUNT] = {};
int32 RewardCurrencyID[QUEST_REWARD_CURRENCY_COUNT] = {};
int32 RewardCurrencyQty[QUEST_REWARD_CURRENCY_COUNT] = {};
-
- float Float13 = 1.0f;
- int32 AllowableRaces = -1;
};
class QueryQuestInfoResponse final : public ServerPacket