From 2558f2562363558b9075ea0cf4b440357986ac1f Mon Sep 17 00:00:00 2001 From: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Date: Thu, 4 Jan 2024 18:57:53 +0100 Subject: [PATCH] =?UTF-8?q?fix(Core/Quest):=20Calculate=20reward=20money?= =?UTF-8?q?=20with=20RATE=5FREWARD=5FBONUS=5FMONEY=20=E2=80=A6=20(#18104)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(Core/Quest): Calculate reward money with RATE_REWARD_BONUS_MONEY instead of RATE_DROP_MONEY * Update worldserver.conf.dist --- src/server/apps/worldserver/worldserver.conf.dist | 1 - src/server/game/Quests/QuestDef.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/server/apps/worldserver/worldserver.conf.dist b/src/server/apps/worldserver/worldserver.conf.dist index a43f5e3c4..82962e6f4 100644 --- a/src/server/apps/worldserver/worldserver.conf.dist +++ b/src/server/apps/worldserver/worldserver.conf.dist @@ -2744,7 +2744,6 @@ Quests.IgnoreAutoComplete = 0 # Rate.RewardBonusMoney # Description: Allows to further tweak the amount of extra money rewarded by quests when the player # is at MaxPlayerLevel (this amount is specified in quest_template.RewardBonusMoney). -# NOTE: the final amount will also affected by Rate.Drop.Money # Default: 1 Rate.RewardBonusMoney = 1 diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index aba9f1509..f77b722cf 100644 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -252,7 +252,7 @@ int32 Quest::GetRewOrReqMoney(uint8 playerLevel) const } } - return static_cast(rewardedMoney * sWorld->getRate(RATE_DROP_MONEY)); + return static_cast(rewardedMoney * sWorld->getRate(RATE_REWARD_BONUS_MONEY)); } uint32 Quest::GetRewMoneyMaxLevel() const @@ -260,7 +260,7 @@ uint32 Quest::GetRewMoneyMaxLevel() const if (HasFlag(QUEST_FLAGS_NO_MONEY_FROM_XP)) return 0; - return static_cast(RewardBonusMoney * sWorld->getRate(RATE_REWARD_BONUS_MONEY) * sWorld->getRate(RATE_DROP_MONEY)); + return static_cast(RewardBonusMoney * sWorld->getRate(RATE_REWARD_BONUS_MONEY)); } bool Quest::IsAutoAccept() const