Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2024-01-06 17:54:45 +08:00
7 changed files with 605 additions and 3 deletions

View File

@@ -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

View File

@@ -252,7 +252,7 @@ int32 Quest::GetRewOrReqMoney(uint8 playerLevel) const
}
}
return static_cast<int32>(rewardedMoney * sWorld->getRate(RATE_DROP_MONEY));
return static_cast<int32>(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<int32>(RewardBonusMoney * sWorld->getRate(RATE_REWARD_BONUS_MONEY) * sWorld->getRate(RATE_DROP_MONEY));
return static_cast<int32>(RewardBonusMoney * sWorld->getRate(RATE_REWARD_BONUS_MONEY));
}
bool Quest::IsAutoAccept() const