diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 2a98166778..13ef3783d4 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -15381,22 +15381,19 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, bool rewarded = (m_RewardedQuests.find(quest_id) != m_RewardedQuests.end()); // Not give XP in case already completed once repeatable quest - uint32 XP = rewarded && !quest->IsDFQuest() ? 0 : uint32(quest->XPValue(this) * sWorld->getRate(RATE_XP_QUEST)); + uint32 XP = rewarded && !quest->IsDFQuest() ? 0 : uint32(quest->GetXPReward(this) * sWorld->getRate(RATE_XP_QUEST)); // handle SPELL_AURA_MOD_XP_QUEST_PCT auras Unit::AuraEffectList const& ModXPPctAuras = GetAuraEffectsByType(SPELL_AURA_MOD_XP_QUEST_PCT); for (Unit::AuraEffectList::const_iterator i = ModXPPctAuras.begin(); i != ModXPPctAuras.end(); ++i) AddPct(XP, (*i)->GetAmount()); - int32 moneyRew = 0; if (getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) GiveXP(XP, nullptr); - else - moneyRew = int32(quest->GetRewMoneyMaxLevel() * sWorld->getRate(RATE_DROP_MONEY)); if (Guild* guild = GetGuild()) { - uint32 _xp = quest->XPValue(this); + uint32 _xp = quest->GetXPReward(this); uint32 guildRep = std::max(uint32(1), uint32(_xp / 450)); guild->GiveXP(uint32(_xp * sWorld->getRate(RATE_XP_QUEST) * sWorld->getRate(RATE_XP_QUEST_GUILD_MODIFIER)), this); guild->GiveReputation(guildRep, this); @@ -15404,12 +15401,7 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, } // Give player extra money if GetRewOrReqMoney > 0 and get ReqMoney if negative - // Do not reward the default reward money for max level dungeon quests - if (quest->GetRewOrReqMoney()) - if ((quest->IsDFQuest() && getLevel() != sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) || !quest->IsDFQuest()) - moneyRew += quest->GetRewOrReqMoney(); - - if (moneyRew) + if (int32 moneyRew = quest->GetRewOrReqMoney(this)) { ModifyMoney(moneyRew); @@ -16327,8 +16319,7 @@ QuestGiverStatus Player::GetQuestDialogStatus(Object* questgiver) { if (SatisfyQuestLevel(quest, false)) { - if (getLevel() <= (GetQuestLevel(quest) + sWorld->getIntConfig(CONFIG_QUEST_LOW_LEVEL_HIDE_DIFF))) - bool isNotLowLevelQuest = GetLevel() <= (GetQuestLevel(quest) + sWorld->getIntConfig(CONFIG_QUEST_LOW_LEVEL_HIDE_DIFF)); + bool isNotLowLevelQuest = getLevel() <= (GetQuestLevel(quest) + sWorld->getIntConfig(CONFIG_QUEST_LOW_LEVEL_HIDE_DIFF)); if (quest->IsRepeatable()) { if (quest->IsDaily()) @@ -17002,25 +16993,14 @@ void Player::SendQuestReward(Quest const* quest, uint32 XP) uint32 questId = quest->GetQuestId(); sGameEventMgr->HandleQuestComplete(questId); - uint32 xp; - uint32 moneyReward; - + uint32 xp = 0; if (getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) - { xp = XP; - moneyReward = quest->GetRewOrReqMoney(); - } - else // At max level, increase gold reward - { - xp = 0; - moneyReward = uint32(quest->GetRewOrReqMoney() + int32(quest->GetRewMoneyMaxLevel() * sWorld->getRate(RATE_DROP_MONEY))); - } - - WorldPacket data(SMSG_QUESTGIVER_QUEST_COMPLETE, (4+4+4+4+4)); + 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(moneyReward); + data << uint32(quest->GetRewOrReqMoney(this)); data << uint32(xp); data << uint32(questId); data << uint32(quest->GetRewardSkillId()); // 4.x bonus skill id diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 2f64f40bcf..0870e05b09 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -322,7 +322,7 @@ void Group::ConvertToGroup() // update quest related GO states (quest activity dependent from raid membership) for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) if (Player* player = ObjectAccessor::FindPlayer(citr->guid)) - player->UpdateForQuestWorldObjects(); + player->UpdateVisibleGameobjectsOrSpellClicks(); } bool Group::AddInvite(Player* player) diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp index 3ca26b4f5c..e903c0a0f0 100644 --- a/src/server/game/Handlers/LFGHandler.cpp +++ b/src/server/game/Handlers/LFGHandler.cpp @@ -186,8 +186,8 @@ void WorldSession::SendLfgPlayerLockInfo() if (currentQuest) { - playerDungeonInfo.Rewards.RewardMoney = _player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) ? currentQuest->GetRewOrReqMoney() : currentQuest->GetRewMoneyMaxLevel(); - playerDungeonInfo.Rewards.RewardXP = _player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) ? currentQuest->XPValue(_player) : 0; + playerDungeonInfo.Rewards.RewardMoney = currentQuest->GetRewOrReqMoney(_player); + playerDungeonInfo.Rewards.RewardXP = _player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) ? currentQuest->GetXPReward(_player) : 0; for (uint8 i = 0; i < QUEST_REWARDS_COUNT; ++i) if (uint32 itemId = currentQuest->RewardItemId[i]) playerDungeonInfo.Rewards.Item.emplace_back(itemId, currentQuest->RewardItemIdCount[i]); @@ -206,8 +206,8 @@ void WorldSession::SendLfgPlayerLockInfo() if (shortageQuest) { playerDungeonInfo.ShortageEligible = true; - playerDungeonInfo.ShortageReward.RewardMoney = _player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) ? shortageQuest->GetRewOrReqMoney() : shortageQuest->GetRewMoneyMaxLevel(); - playerDungeonInfo.ShortageReward.RewardXP = _player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) ? shortageQuest->XPValue(_player) : 0; + playerDungeonInfo.ShortageReward.RewardMoney = shortageQuest->GetRewOrReqMoney(_player);; + playerDungeonInfo.ShortageReward.RewardXP = _player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) ? shortageQuest->GetXPReward(_player) : 0; for (uint8 i = 0; i < QUEST_REWARDS_COUNT; ++i) if (uint32 itemId = shortageQuest->RewardItemId[i]) playerDungeonInfo.ShortageReward.Item.emplace_back(itemId, shortageQuest->RewardItemIdCount[i]); @@ -487,13 +487,13 @@ void WorldSession::SendLfgPlayerReward(lfg::LfgPlayerRewardData const& rewardDat WorldPackets::LFG::LFGPlayerReward lfgPlayerReward; lfgPlayerReward.QueuedSlot = rewardData.rdungeonEntry; lfgPlayerReward.ActualSlot = rewardData.sdungeonEntry; - uint32 rewardMoney = _player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) ? rewardData.quest->GetRewOrReqMoney() : rewardData.quest->GetRewMoneyMaxLevel(); - uint32 rewardExp = _player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) ? rewardData.quest->XPValue(_player) : 0; + uint32 rewardMoney = rewardData.quest->GetRewOrReqMoney(_player); + uint32 rewardExp = _player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) ? rewardData.quest->GetXPReward(_player) : 0; if (rewardData.shortageQuest) { - rewardMoney += _player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) ? rewardData.shortageQuest->GetRewOrReqMoney() : rewardData.shortageQuest->GetRewMoneyMaxLevel(); - rewardExp += _player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) ? rewardData.shortageQuest->XPValue(_player) : 0; + rewardMoney += rewardData.shortageQuest->GetRewOrReqMoney(_player); + rewardExp += _player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) ? rewardData.shortageQuest->GetXPReward(_player) : 0; } lfgPlayerReward.RewardMoney = rewardMoney; diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index fa54e747d5..3d16bea3a8 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -55,24 +55,6 @@ enum Expansions MAX_EXPANSIONS = 4 }; -inline uint32 GetMaxLevelForExpansion(uint32 expansion) -{ - switch (expansion) - { - case EXPANSION_CLASSIC: - return 60; - case EXPANSION_THE_BURNING_CRUSADE: - return 70; - case EXPANSION_WRATH_OF_THE_LICH_KING: - return 80; - case EXPANSION_CATACLYSM: - return 85; - default: - break; - } - return 0; -} - enum Gender { GENDER_MALE = 0, diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp index 7729e4a5aa..e9505d6916 100644 --- a/src/server/game/Quests/QuestDef.cpp +++ b/src/server/game/Quests/QuestDef.cpp @@ -244,7 +244,7 @@ void Quest::LoadQuestTemplateAddon(Field* fields) Flags |= QUEST_FLAGS_AUTO_ACCEPT; } -uint32 Quest::XPValue(Player* player) const +uint32 Quest::GetXPReward(Player const* player) const { if (player) { @@ -272,14 +272,17 @@ uint32 Quest::XPValue(Player* player) const return 0; } -int32 Quest::GetRewOrReqMoney() const +int32 Quest::GetRewOrReqMoney(Player const* player) const { // RequiredMoney: the amount is the negative copper sum. - if (RewardMoney <= 0) + if (RewardMoney < 0) return RewardMoney; // RewardMoney: the positive amount - return int32(RewardMoney * sWorld->getRate(RATE_MONEY_QUEST)); + if (!player || player->getLevel() < sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) + return int32(RewardMoney * sWorld->getRate(RATE_MONEY_QUEST)); + else // At level cap, the money reward is the maximum amount between normal and bonus money reward + return std::max(int32(GetRewMoneyMaxLevel()), int32(RewardMoney * sWorld->getRate(RATE_MONEY_QUEST))); } void Quest::BuildExtraQuestInfo(WorldPacket& data, Player* player) const @@ -310,8 +313,8 @@ void Quest::BuildExtraQuestInfo(WorldPacket& data, Player* player) const data << uint32(0); } - data << uint32(GetRewOrReqMoney()); - data << uint32(XPValue(player) * sWorld->getRate(RATE_XP_QUEST)); + data << uint32(GetRewOrReqMoney(player)); + data << uint32(GetXPReward(player) * sWorld->getRate(RATE_XP_QUEST)); data << uint32(GetCharTitleId()); data << uint32(0); // unk diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h index 2123f7836b..caec9c54c0 100644 --- a/src/server/game/Quests/QuestDef.h +++ b/src/server/game/Quests/QuestDef.h @@ -214,7 +214,7 @@ class TC_GAME_API Quest void LoadQuestOfferReward(Field* fields); void LoadQuestTemplateAddon(Field* fields); - uint32 XPValue(Player* player) const; + uint32 GetXPReward(Player const* player) const; bool HasFlag(uint32 flag) const { return (Flags & flag) != 0; } void SetFlag(uint32 flag) { Flags |= flag; } @@ -267,7 +267,7 @@ class TC_GAME_API Quest std::string const& GetQuestGiverTargetName() const { return QuestGiverTargetName; } std::string const& GetQuestTurnTextWindow() const { return QuestTurnTextWindow; } std::string const& GetQuestTurnTargetName() const { return QuestTurnTargetName; } - int32 GetRewOrReqMoney() const; + int32 GetRewOrReqMoney(Player const* player = nullptr) const; uint32 GetRewHonorAddition() const { return RewardHonor; } float GetRewHonorMultiplier() const { return RewardKillHonor; } uint32 GetRewMoneyMaxLevel() const; // use in XP calculation at client diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index ca9f8eeeb1..52065a5113 100644 --- a/src/server/scripts/Commands/cs_quest.cpp +++ b/src/server/scripts/Commands/cs_quest.cpp @@ -256,7 +256,7 @@ public: } // If the quest requires money - int32 ReqOrRewMoney = quest->GetRewOrReqMoney(); + int32 ReqOrRewMoney = quest->GetRewOrReqMoney(player); if (ReqOrRewMoney < 0) player->ModifyMoney(-ReqOrRewMoney);