diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h index f8c8e1fd7e..9b820c3768 100644 --- a/src/server/game/DataStores/DBCEnums.h +++ b/src/server/game/DataStores/DBCEnums.h @@ -783,4 +783,22 @@ enum CurrencyTypes CURRENCY_TYPE_TOLVIR_FRAGMENT = 401, }; +enum class CurrencyTypeFlags : uint32 +{ + None = 0x000, + Tradable = 0x001, + AppearsInLootWindow = 0x002, + ComputedWeeklyMaximum = 0x004, + Uses1To100ScalarForDisplay = 0x008, + NoLowLevelLoot = 0x010, + IgnoreMaxQuantityOnLoad = 0x020, + LogQuantityWhenChangingWorlds = 0x040, + TrackQuantity = 0x080, + ResetTrackedQuantityWhenUpdatingVersion = 0x100, + GainsFromUpdatingVersionsIgnoresMaximumQuantity = 0x200, + SupressGainMessageWhenUpdatingVersions = 0x400 +}; + +DEFINE_ENUM_FLAG(CurrencyTypeFlags); + #endif diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 437bf8afe1..5d6fe23419 100644 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -588,6 +588,8 @@ struct CurrencyTypesEntry uint32 MaxEarnablePerWeek; // 8 uint32 Flags; // 9 //uint32 Description; // 10 + + EnumFlag GetFlags() const { return static_cast(Flags); } }; struct DestructibleModelDataEntry diff --git a/src/server/game/Entities/Item/ItemTemplate.h b/src/server/game/Entities/Item/ItemTemplate.h index e713dc62c2..8115d29e3d 100644 --- a/src/server/game/Entities/Item/ItemTemplate.h +++ b/src/server/game/Entities/Item/ItemTemplate.h @@ -229,15 +229,6 @@ enum ItemFlagsCustom ITEM_FLAGS_CU_FOLLOW_LOOT_RULES = 0x0004 // Item will always follow group/master/need before greed looting rules }; -enum CurrencyFlags -{ - CURRENCY_FLAG_TRADEABLE = 0x01, - // ... - CURRENCY_FLAG_HIGH_PRECISION = 0x08, - // ... - CURRENCY_FLAG_COUNT_SEASON_TOTAL = 0x80, -}; - enum CurrencyCategory { // ... diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index a8e2dee6c1..d80fa2fe32 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -6564,7 +6564,6 @@ bool Player::RewardHonor(Unit* victim, uint32 groupsize, int32 honor, bool pvpto return true; } - void Player::_LoadCurrency(PreparedQueryResult result) { if (!result) @@ -6581,11 +6580,11 @@ void Player::_LoadCurrency(PreparedQueryResult result) continue; PlayerCurrency cur; - cur.state = PLAYERCURRENCY_UNCHANGED; - cur.Quantity = fields[1].GetUInt32(); - cur.WeeklyQuantity = fields[2].GetUInt32(); + cur.State = PLAYERCURRENCY_UNCHANGED; + cur.Quantity = fields[1].GetUInt32(); + cur.WeeklyQuantity = fields[2].GetUInt32(); cur.TrackedQuantity = fields[3].GetUInt32(); - cur.Flags = fields[4].GetUInt8(); + cur.Flags = fields[4].GetUInt8(); _currencyStorage.insert(PlayerCurrenciesMap::value_type(currencyID, cur)); @@ -6601,7 +6600,7 @@ void Player::_SaveCurrency(CharacterDatabaseTransaction& trans) if (!entry) // should never happen continue; - switch (itr->second.state) + switch (itr->second.State) { case PLAYERCURRENCY_NEW: stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_PLAYER_CURRENCY); @@ -6627,7 +6626,7 @@ void Player::_SaveCurrency(CharacterDatabaseTransaction& trans) break; } - itr->second.state = PLAYERCURRENCY_UNCHANGED; + itr->second.State = PLAYERCURRENCY_UNCHANGED; } } @@ -6667,18 +6666,22 @@ void Player::SendCurrencies() const if (!entry || entry->CategoryID == CURRENCY_CATEGORY_META_CONQUEST) continue; - uint32 precision = (entry->Flags & CURRENCY_FLAG_HIGH_PRECISION) ? CURRENCY_PRECISION : 1; + uint32 precision = (entry->GetFlags().HasFlag(CurrencyTypeFlags::Uses1To100ScalarForDisplay)) ? CURRENCY_PRECISION : 1; WorldPackets::Misc::SetupCurrency::Record record; record.Type = entry->ID; record.Quantity = itr->second.Quantity / precision; - record.WeeklyQuantity = itr->second.WeeklyQuantity / precision; - record.MaxWeeklyQuantity = GetCurrencyWeekCap(entry) / precision; - if (entry->Flags & CURRENCY_FLAG_COUNT_SEASON_TOTAL) + if (itr->second.WeeklyQuantity / precision > 0) + record.WeeklyQuantity = itr->second.WeeklyQuantity / precision; + + if (entry->GetFlags().HasFlag(CurrencyTypeFlags::ComputedWeeklyMaximum) || entry->MaxEarnablePerWeek) + record.MaxWeeklyQuantity = GetCurrencyWeekCap(entry) / precision; + + if (entry->GetFlags().HasFlag(CurrencyTypeFlags::TrackQuantity)) record.TrackedQuantity = itr->second.TrackedQuantity / precision; - record.Flags = itr->second.state; + record.Flags = itr->second.Flags; packet.Data.push_back(record); } @@ -6705,7 +6708,7 @@ uint32 Player::GetCurrency(uint32 id, bool usePrecision) const return 0; CurrencyTypesEntry const* currency = sCurrencyTypesStore.LookupEntry(id); - uint32 precision = (usePrecision && currency->Flags & CURRENCY_FLAG_HIGH_PRECISION) ? CURRENCY_PRECISION : 1; + uint32 precision = (usePrecision && currency->GetFlags().HasFlag(CurrencyTypeFlags::Uses1To100ScalarForDisplay)) ? CURRENCY_PRECISION : 1; return itr->second.Quantity / precision; } @@ -6717,7 +6720,7 @@ uint32 Player::GetCurrencyOnWeek(uint32 id, bool usePrecision) const return 0; CurrencyTypesEntry const* currency = sCurrencyTypesStore.LookupEntry(id); - uint32 precision = (usePrecision && currency->Flags & CURRENCY_FLAG_HIGH_PRECISION) ? CURRENCY_PRECISION : 1; + uint32 precision = (usePrecision && currency->GetFlags().HasFlag(CurrencyTypeFlags::Uses1To100ScalarForDisplay)) ? CURRENCY_PRECISION : 1; return itr->second.WeeklyQuantity / precision; } @@ -6737,147 +6740,114 @@ bool Player::HasCurrency(uint32 id, uint32 count) const return itr != _currencyStorage.end() && itr->second.Quantity >= count; } -void Player::ModifyCurrency(uint32 id, int32 count, bool printLog/* = true*/, bool ignoreMultipliers/* = false*/, bool isRefund/* = false*/) +void Player::ModifyCurrency(uint32 currencyId, int32 amount, bool supressChatLog /*= false*/, bool ignoreModifiersAndTracking /*= false*/) { - if (!count) + if (amount == 0) return; - CurrencyTypesEntry const* currency = sCurrencyTypesStore.LookupEntry(id); - ASSERT(currency); + CurrencyTypesEntry const* currency = sCurrencyTypesStore.LookupEntry(currencyId); + if (!currency) + { + TC_LOG_ERROR("player", "Player %s was attempting to modify a invalid currency (Id: %u).", GetGUID().ToString().c_str(), currencyId); + return; + } - if (!ignoreMultipliers && !isRefund) - count *= GetTotalAuraMultiplierByMiscValue(SPELL_AURA_MOD_CURRENCY_GAIN, id); + if (!ignoreModifiersAndTracking) + amount *= GetTotalAuraMultiplierByMiscValue(SPELL_AURA_MOD_CURRENCY_GAIN, currencyId); - int32 precision = currency->Flags & CURRENCY_FLAG_HIGH_PRECISION ? CURRENCY_PRECISION : 1; - uint32 oldTotalCount = 0; - uint32 oldWeekCount = 0; - uint32 oldTrackedCount = 0; - bool hasSeasonCount = false; - PlayerCurrenciesMap::iterator itr = _currencyStorage.find(id); + PlayerCurrency* playerCurrency = nullptr; + PlayerCurrenciesMap::iterator itr = _currencyStorage.find(currencyId); if (itr == _currencyStorage.end()) { - PlayerCurrency cur; - cur.state = PLAYERCURRENCY_NEW; - cur.Quantity = 0; - cur.WeeklyQuantity = 0; - cur.TrackedQuantity = 0; - cur.Flags = 0; - _currencyStorage[id] = cur; - itr = _currencyStorage.find(id); - } - else - { - oldTotalCount = itr->second.Quantity; - oldWeekCount = itr->second.WeeklyQuantity; - oldTrackedCount = itr->second.TrackedQuantity; + _currencyStorage.insert(PlayerCurrenciesMap::value_type(currencyId, PlayerCurrency())); + itr = _currencyStorage.find(currencyId); } - // count can't be more then weekCap if used (weekCap > 0) - uint32 weekCap = GetCurrencyWeekCap(currency); - if (!isRefund && weekCap && weekCap == oldWeekCount && count > 0) + playerCurrency = &itr->second; + + // Weekly cap + uint32 weeklyCap = GetCurrencyWeekCap(currency); + if (!ignoreModifiersAndTracking) // Refunds and commands bypass the weekly limit + if (weeklyCap > 0 && amount > 0 && (playerCurrency->WeeklyQuantity + amount) > weeklyCap) + amount = weeklyCap - playerCurrency->WeeklyQuantity; + + // Total cap + if (currency->MaxQty > 0 && amount > 0 && (playerCurrency->Quantity + amount) > currency->MaxQty) + { + // Patch 4.0.3a (2010-11-23): Justice Points over the 4,000 hard cap will be immediately converted at a ratio of 47s 50c per Justice Point + // Apparently there are no currency type flags for this so we assume that this is a hardcoded behavior + if (currency->ID == CURRENCY_TYPE_JUSTICE_POINTS) + { + int32 surplousAmount = amount - (currency->MaxQty - playerCurrency->Quantity); + if (surplousAmount > 0) + ModifyMoney(static_cast(surplousAmount) * JUSTICE_POINTS_CONVERSION_MONEY / CURRENCY_PRECISION, false); + } + + amount = currency->MaxQty - playerCurrency->Quantity; + } + + // Underflow protection + if (amount < 0 && uint32(std::abs(amount)) > playerCurrency->Quantity) + amount = playerCurrency->Quantity * -1; + + if (amount == 0) return; - if (!isRefund && weekCap && count > int32(weekCap)) - count = weekCap; + if (playerCurrency->State != PLAYERCURRENCY_NEW) + playerCurrency->State = PLAYERCURRENCY_CHANGED; - // count can't be more then totalCap if used (totalCap > 0) - uint32 totalCap = GetCurrencyTotalCap(currency); + playerCurrency->Quantity += amount; - // Patch 4.0.3a - Justice Points over the hard cap of 4000 will be converted to 47 silver and 50 copper per point. - uint32 surplousJusticePoints = 0; - if (totalCap && count > int32(totalCap)) + if (!ignoreModifiersAndTracking) { - if (id == CURRENCY_TYPE_JUSTICE_POINTS) - surplousJusticePoints = (oldTotalCount + count - totalCap) / precision; - count = totalCap; + if (weeklyCap) + playerCurrency->WeeklyQuantity += amount; + + if (currency->GetFlags().HasFlag(CurrencyTypeFlags::TrackQuantity)) + playerCurrency->TrackedQuantity += amount; + + if (amount > 0) + UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CURRENCY, currencyId, amount); } - if (surplousJusticePoints) - ModifyMoney(surplousJusticePoints * JUSTICE_POINTS_CONVERSION_MONEY, false); - - int32 newTotalCount = int32(oldTotalCount) + count; - if (newTotalCount < 0) - newTotalCount = 0; - - int32 newWeekCount = int32(oldWeekCount) + (count > 0 ? count : 0); - if (newWeekCount < 0) - newWeekCount = 0; - - // if we get more than weekCap just set to limit - if (!isRefund && weekCap && int32(weekCap) < newWeekCount) + // Arena and rated battleground have two seperate currency Ids but display them both in a unified currency. + if (currency->CategoryID == CURRENCY_CATEGORY_META_CONQUEST) { - newWeekCount = int32(weekCap); - // weekCap - oldWeekCount always >= 0 as we set limit before! - newTotalCount = oldTotalCount + (weekCap - oldWeekCount); + ModifyCurrency(CURRENCY_TYPE_CONQUEST_POINTS, amount, supressChatLog); + return; } - // if we get more then totalCap set to maximum; - if (totalCap && int32(totalCap) < newTotalCount) - { - newTotalCount = int32(totalCap); - newWeekCount = weekCap; - } + uint8 precision = (currency->GetFlags().HasFlag(CurrencyTypeFlags::Uses1To100ScalarForDisplay)) ? CURRENCY_PRECISION : 1; - if (uint32(newTotalCount) != oldTotalCount) - { - if (currency->Flags & CURRENCY_FLAG_COUNT_SEASON_TOTAL && !isRefund) - hasSeasonCount = true; + WorldPackets::Misc::SetCurrency setCurrency; + setCurrency.Type = currency->ID; + setCurrency.Quantity = playerCurrency->Quantity / precision; + if (uint32 trackedQuantity = playerCurrency->TrackedQuantity / precision) + setCurrency.TrackedQuantity = trackedQuantity; + if (uint32 weeklyQuantity = playerCurrency->WeeklyQuantity / precision) + setCurrency.WeeklyQuantity = weeklyQuantity; + setCurrency.SuppressChatLog = supressChatLog; - if (itr->second.state != PLAYERCURRENCY_NEW) - itr->second.state = PLAYERCURRENCY_CHANGED; + SendDirectMessage(setCurrency.Write()); - itr->second.Quantity = newTotalCount; - itr->second.WeeklyQuantity = isRefund ? oldWeekCount : newWeekCount; - - if (!isRefund && count > 0) - { - UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CURRENCY, id, count); - if (hasSeasonCount) - oldTrackedCount += count; - itr->second.TrackedQuantity = oldTrackedCount; - } - - if (currency->CategoryID == CURRENCY_CATEGORY_META_CONQUEST) - { - // count was changed to week limit, now we can modify original points. - ModifyCurrency(CURRENCY_TYPE_CONQUEST_POINTS, count, printLog); - return; - } - - if (itr->second.state == PLAYERCURRENCY_NEW && HasSkill(SKILL_ARCHAEOLOGY) && - currency->CategoryID == CURRENCY_CATEGORY_ARCHAEOLOGY) - _archaeology->ActivateBranch(sArchaeologyMgr->Currency2BranchId(currency->ID)); - - WorldPacket packet(SMSG_UPDATE_CURRENCY, 12); - - packet.WriteBit(weekCap != 0); - packet.WriteBit(hasSeasonCount); // hasSeasonCount - packet.WriteBit(!printLog); // print in log - - if (hasSeasonCount) - packet << uint32(oldTrackedCount / precision); - - packet << uint32(newTotalCount / precision); - packet << uint32(id); - if (weekCap) - packet << uint32((!isRefund ? newWeekCount : oldWeekCount) / precision); - - SendDirectMessage(&packet); - } + // Archaeology branch activation + if (itr->second.State == PLAYERCURRENCY_NEW && HasSkill(SKILL_ARCHAEOLOGY) && + currency->CategoryID == CURRENCY_CATEGORY_ARCHAEOLOGY) + _archaeology->ActivateBranch(sArchaeologyMgr->Currency2BranchId(currency->ID)); } -void Player::SetCurrency(uint32 id, uint32 count, bool /*printLog*/ /*= true*/) +void Player::SetCurrency(uint32 currencyId, uint32 amount) { - PlayerCurrenciesMap::iterator itr = _currencyStorage.find(id); + PlayerCurrenciesMap::iterator itr = _currencyStorage.find(currencyId); if (itr == _currencyStorage.end()) { PlayerCurrency cur; - cur.state = PLAYERCURRENCY_NEW; - cur.Quantity = count; + cur.State = PLAYERCURRENCY_NEW; + cur.Quantity = amount; cur.WeeklyQuantity = 0; cur.TrackedQuantity = 0; cur.Flags = 0; - _currencyStorage[id] = cur; + _currencyStorage.insert(PlayerCurrenciesMap::value_type(currencyId, cur)); } } @@ -6887,7 +6857,7 @@ uint32 Player::GetCurrencyWeekCap(uint32 id, bool usePrecision) const if (!entry) return 0; - uint32 precision = (usePrecision && entry->Flags & CURRENCY_FLAG_HIGH_PRECISION) ? CURRENCY_PRECISION : 1; + uint32 precision = (usePrecision && entry->GetFlags().HasFlag(CurrencyTypeFlags::Uses1To100ScalarForDisplay)) ? CURRENCY_PRECISION : 1; return GetCurrencyWeekCap(entry) / precision; } @@ -6908,7 +6878,7 @@ void Player::ResetCurrencyWeekCap() for (PlayerCurrenciesMap::iterator itr = _currencyStorage.begin(); itr != _currencyStorage.end(); ++itr) { itr->second.WeeklyQuantity = 0; - itr->second.state = PLAYERCURRENCY_CHANGED; + itr->second.State = PLAYERCURRENCY_CHANGED; } WorldPacket data(SMSG_WEEKLY_RESET_CURRENCY, 0); @@ -6917,17 +6887,22 @@ void Player::ResetCurrencyWeekCap() uint32 Player::GetCurrencyWeekCap(CurrencyTypesEntry const* currency) const { - switch (currency->ID) + if (currency->GetFlags().HasFlag(CurrencyTypeFlags::ComputedWeeklyMaximum)) { + switch (currency->ID) + { //original conquest not have week cap - case CURRENCY_TYPE_CONQUEST_POINTS: - return std::max(GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_ARENA, false), GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_RBG, false)); - case CURRENCY_TYPE_CONQUEST_META_ARENA: - // should add precision mod = 100 - return Trinity::Currency::ConquestRatingCalculator(_maxPersonalArenaRate) * CURRENCY_PRECISION; - case CURRENCY_TYPE_CONQUEST_META_RBG: - // should add precision mod = 100 - return Trinity::Currency::BgConquestRatingCalculator(GetRBGPersonalRating()) * CURRENCY_PRECISION; + case CURRENCY_TYPE_CONQUEST_POINTS: + return std::max(GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_ARENA, false), GetCurrencyWeekCap(CURRENCY_TYPE_CONQUEST_META_RBG, false)); + case CURRENCY_TYPE_CONQUEST_META_ARENA: + // should add precision mod = 100 + return Trinity::Currency::ConquestRatingCalculator(_maxPersonalArenaRate) * CURRENCY_PRECISION; + case CURRENCY_TYPE_CONQUEST_META_RBG: + // should add precision mod = 100 + return Trinity::Currency::BgConquestRatingCalculator(GetRBGPersonalRating()) * CURRENCY_PRECISION; + default: + return 0; + } } return currency->MaxEarnablePerWeek; @@ -6968,7 +6943,7 @@ void Player::UpdateConquestCurrencyCap(uint32 currency) if (!currencyEntry) continue; - uint32 precision = (currencyEntry->Flags & CURRENCY_FLAG_HIGH_PRECISION) ? 100 : 1; + uint32 precision = (currencyEntry->GetFlags().HasFlag(CurrencyTypeFlags::Uses1To100ScalarForDisplay)) ? 100 : 1; uint32 cap = GetCurrencyWeekCap(currencyEntry); WorldPacket packet(SMSG_UPDATE_CURRENCY_WEEK_LIMIT, 8); @@ -14899,7 +14874,7 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver, uint32 rewardCurrencyCount = quest->RewardCurrencyCount[i]; CurrencyTypesEntry const* currency = sCurrencyTypesStore.LookupEntry(quest->RewardCurrencyId[i]); - if (currency->Flags & CURRENCY_FLAG_HIGH_PRECISION) + if (currency->GetFlags().HasFlag(CurrencyTypeFlags::Uses1To100ScalarForDisplay)) rewardCurrencyCount = rewardCurrencyCount * CURRENCY_PRECISION; ModifyCurrency(quest->RewardCurrencyId[i], rewardCurrencyCount, !quest->IsDFQuest()); @@ -22139,7 +22114,7 @@ bool Player::BuyCurrencyFromVendorSlot(ObjectGuid vendorGuid, uint32 vendorSlot, if (iece->RequirementFlags & (ITEM_EXT_COST_CURRENCY_REQ_IS_SEASON_EARNED_1 << i)) continue; - ModifyCurrency(iece->RequiredCurrency[i], -int32(iece->RequiredCurrencyCount[i]) * stacks, false, true); + ModifyCurrency(iece->RequiredCurrency[i], -int32(iece->RequiredCurrencyCount[i]) * stacks, true, true); } return true; @@ -27033,7 +27008,7 @@ void Player::SendRefundInfo(Item* item) } CurrencyTypesEntry const* currencyType = sCurrencyTypesStore.LookupEntry(iece->RequiredCurrency[i]); - uint32 precision = (currencyType && currencyType->Flags & CURRENCY_FLAG_HIGH_PRECISION) ? CURRENCY_PRECISION : 1; + uint32 precision = (currencyType && currencyType->GetFlags().HasFlag(CurrencyTypeFlags::Uses1To100ScalarForDisplay)) ? CURRENCY_PRECISION : 1; data << uint32(iece->RequiredCurrencyCount[i] / precision); data << uint32(iece->RequiredCurrency[i]); @@ -27097,7 +27072,7 @@ void Player::SendItemRefundResult(Item* item, ItemExtendedCostEntry const* iece, } CurrencyTypesEntry const* currencyType = sCurrencyTypesStore.LookupEntry(iece->RequiredCurrency[i]); - uint32 precision = (currencyType && currencyType->Flags & CURRENCY_FLAG_HIGH_PRECISION) ? CURRENCY_PRECISION : 1; + uint32 precision = (currencyType && currencyType->GetFlags().HasFlag(CurrencyTypeFlags::Uses1To100ScalarForDisplay)) ? CURRENCY_PRECISION : 1; data << uint32(iece->RequiredCurrencyCount[i] / precision); data << uint32(iece->RequiredCurrency[i]); @@ -27218,7 +27193,7 @@ void Player::RefundItem(Item* item) continue; if (count && currencyid) - ModifyCurrency(currencyid, count, false, false, true); + ModifyCurrency(currencyid, count, true, true); } // Grant back money diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 5123316da6..acdf605887 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -207,7 +207,9 @@ enum PlayerCurrencyState struct PlayerCurrency { - PlayerCurrencyState state; + PlayerCurrency() : State(PLAYERCURRENCY_NEW), Quantity(0), WeeklyQuantity(0), TrackedQuantity(0), Flags(0) { } + + PlayerCurrencyState State; uint32 Quantity; uint32 WeeklyQuantity; uint32 TrackedQuantity; @@ -1222,19 +1224,9 @@ class TC_GAME_API Player : public Unit, public GridObject /// return presence related currency bool HasCurrency(uint32 id, uint32 count) const; /// initialize currency count for custom initialization at create character - void SetCurrency(uint32 id, uint32 count, bool printLog = true); + void SetCurrency(uint32 currencyId, uint32 amount); void ResetCurrencyWeekCap(); - - /** - * @name ModifyCurrency - * @brief Change specific currency and send result to client - - * @param id currency entry from CurrencyTypes.dbc - * @param count integer value for adding/removing curent currency - * @param printLog used on SMSG_UPDATE_CURRENCY - * @param ignore gain multipliers - */ - void ModifyCurrency(uint32 id, int32 count, bool printLog = true, bool ignoreMultipliers = false, bool isRefund = false); + void ModifyCurrency(uint32 currencyId, int32 amount, bool supressChatLog = false, bool ignoreModifiersAndTracking = false); void ApplyEquipCooldown(Item* pItem); void QuickEquipItem(uint16 pos, Item* pItem); diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index 14dd5a677c..566e787df9 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -24,6 +24,7 @@ #include "Item.h" #include "ItemPackets.h" #include "Log.h" +#include "MiscPackets.h" #include "NPCPackets.h" #include "ObjectMgr.h" #include "Opcodes.h" @@ -571,8 +572,14 @@ void WorldSession::HandleBuyItemOpcode(WorldPacket& recvData) TC_LOG_DEBUG("network", "WORLD: received wrong itemType (%u) in HandleBuyItemOpcode", itemType); } -void WorldSession::HandleSetCurrencyFlags(WorldPackets::Misc::SetCurrencyFlags& /*packet*/) +void WorldSession::HandleSetCurrencyFlags(WorldPackets::Misc::SetCurrencyFlags& packet) { + PlayerCurrenciesMap::iterator itr = _player->_currencyStorage.find(packet.CurrencyID); + if (itr == _player->_currencyStorage.end()) + return; + + itr->second.Flags = packet.Flags; + itr->second.State = PLAYERCURRENCY_CHANGED; } void WorldSession::HandleListInventoryOpcode(WorldPackets::NPC::Hello& packet) diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp index 29174830c5..d26903504d 100644 --- a/src/server/game/Handlers/LFGHandler.cpp +++ b/src/server/game/Handlers/LFGHandler.cpp @@ -203,7 +203,7 @@ void WorldSession::SendLfgPlayerLockInfo() if (uint32 currencyId = currentQuest->RewardCurrencyId[i]) if (CurrencyTypesEntry const* currency = sCurrencyTypesStore.LookupEntry(currencyId)) { - if (currency->Flags & CURRENCY_FLAG_HIGH_PRECISION) + if (currency->GetFlags().HasFlag(CurrencyTypeFlags::Uses1To100ScalarForDisplay)) playerDungeonInfo.Rewards.Currency.emplace_back(currencyId, currentQuest->RewardCurrencyCount[i] * CURRENCY_PRECISION); else playerDungeonInfo.Rewards.Currency.emplace_back(currencyId, currentQuest->RewardCurrencyCount[i]); @@ -223,7 +223,7 @@ void WorldSession::SendLfgPlayerLockInfo() if (uint32 currencyId = shortageQuest->RewardCurrencyId[i]) if (CurrencyTypesEntry const* currency = sCurrencyTypesStore.LookupEntry(currencyId)) { - if (currency->Flags & CURRENCY_FLAG_HIGH_PRECISION) + if (currency->GetFlags().HasFlag(CurrencyTypeFlags::Uses1To100ScalarForDisplay)) playerDungeonInfo.ShortageReward.Currency.emplace_back(currencyId, shortageQuest->RewardCurrencyCount[i] * CURRENCY_PRECISION); else playerDungeonInfo.ShortageReward.Currency.emplace_back(currencyId, shortageQuest->RewardCurrencyCount[i]); @@ -520,7 +520,7 @@ void WorldSession::SendLfgPlayerReward(lfg::LfgPlayerRewardData const& rewardDat if (uint32 currencyId = rewardData.quest->RewardCurrencyId[i]) if (CurrencyTypesEntry const* currency = sCurrencyTypesStore.LookupEntry(currencyId)) { - if (currency->Flags & CURRENCY_FLAG_HIGH_PRECISION) + if (currency->GetFlags().HasFlag(CurrencyTypeFlags::Uses1To100ScalarForDisplay)) lfgPlayerReward.Rewards.emplace_back(currencyId, rewardData.quest->RewardCurrencyCount[i] * CURRENCY_PRECISION, true); else lfgPlayerReward.Rewards.emplace_back(currencyId, rewardData.quest->RewardCurrencyCount[i], true); @@ -533,7 +533,7 @@ void WorldSession::SendLfgPlayerReward(lfg::LfgPlayerRewardData const& rewardDat if (uint32 currencyId = rewardData.shortageQuest->RewardCurrencyId[i]) if (CurrencyTypesEntry const* currency = sCurrencyTypesStore.LookupEntry(currencyId)) { - if (currency->Flags & CURRENCY_FLAG_HIGH_PRECISION) + if (currency->GetFlags().HasFlag(CurrencyTypeFlags::Uses1To100ScalarForDisplay)) lfgPlayerReward.Rewards.emplace_back(currencyId, rewardData.shortageQuest->RewardCurrencyCount[i] * CURRENCY_PRECISION, true); else lfgPlayerReward.Rewards.emplace_back(currencyId, rewardData.shortageQuest->RewardCurrencyCount[i], true); diff --git a/src/server/game/Server/Packets/MiscPackets.cpp b/src/server/game/Server/Packets/MiscPackets.cpp index 259468c079..e9f28aaefd 100644 --- a/src/server/game/Server/Packets/MiscPackets.cpp +++ b/src/server/game/Server/Packets/MiscPackets.cpp @@ -500,3 +500,22 @@ WorldPacket const* WorldPackets::Misc::MapObjEvents::Write() return &_worldPacket; } + +WorldPacket const* WorldPackets::Misc::SetCurrency::Write() +{ + _worldPacket.WriteBit(WeeklyQuantity.has_value()); + _worldPacket.WriteBit(TrackedQuantity.has_value()); + _worldPacket.WriteBit(SuppressChatLog); + _worldPacket.FlushBits(); + + if (TrackedQuantity.has_value()) + _worldPacket << int32(*TrackedQuantity); + + _worldPacket << int32(Quantity); + _worldPacket << int32(Type); + + if (WeeklyQuantity.has_value()) + _worldPacket << int32(*WeeklyQuantity); + + return &_worldPacket; +} diff --git a/src/server/game/Server/Packets/MiscPackets.h b/src/server/game/Server/Packets/MiscPackets.h index 4556ea3f17..0369e70ecb 100644 --- a/src/server/game/Server/Packets/MiscPackets.h +++ b/src/server/game/Server/Packets/MiscPackets.h @@ -541,6 +541,20 @@ namespace WorldPackets uint32 UniqueID = 0; std::vector Events; }; + + class SetCurrency final : public ServerPacket + { + public: + SetCurrency() : ServerPacket(SMSG_SET_CURRENCY, 13) { } + + WorldPacket const* Write() override; + + bool SuppressChatLog = false; + int32 Quantity = 0; + int32 Type = 0; + Optional TrackedQuantity; + Optional WeeklyQuantity; + }; } } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 7e4ede1152..a583f18d7a 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -1195,7 +1195,8 @@ void OpcodeTable::Initialize() DEFINE_SERVER_OPCODE_HANDLER(SMSG_SERVER_MESSAGE, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_SERVER_PERF, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_AI_ANIM_KIT, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_ANIM_TIER, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); + DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_ANIM_TIER, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); + DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_CURRENCY, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_DF_FAST_LAUNCH_RESULT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_FACTION_ATWAR, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_SET_FACTION_NOT_VISIBLE, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); @@ -1310,7 +1311,6 @@ void OpcodeTable::Initialize() DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_ACCOUNT_DATA_COMPLETE, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_ACTION_BUTTONS, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_COMBO_POINTS, STATUS_NEVER, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_CURRENCY, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_CURRENCY_WEEK_LIMIT, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_DUNGEON_ENCOUNTER_FOR_LOOT, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_UPDATE_INSTANCE_ENCOUNTER_UNIT, STATUS_NEVER, CONNECTION_TYPE_INSTANCE); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index cb19248b9f..5f861e1d7d 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -1155,6 +1155,7 @@ enum OpcodeServer SMSG_SERVER_PERF = 0x74B6, SMSG_SET_AI_ANIM_KIT = 0x4626, SMSG_SET_ANIM_TIER = 0x4335, + SMSG_SET_CURRENCY = 0x59B0, SMSG_SET_DF_FAST_LAUNCH_RESULT = 0x35B6, SMSG_SET_FACTION_ATWAR = 0x4216, SMSG_SET_FACTION_NOT_VISIBLE = 0x6737, @@ -1270,7 +1271,6 @@ enum OpcodeServer SMSG_UPDATE_ACCOUNT_DATA_COMPLETE = 0x2015, SMSG_UPDATE_ACTION_BUTTONS = 0x38B5, SMSG_UPDATE_COMBO_POINTS = 0x6B34, - SMSG_UPDATE_CURRENCY = 0x59B0, SMSG_UPDATE_CURRENCY_WEEK_LIMIT = 0x70A7, SMSG_UPDATE_DUNGEON_ENCOUNTER_FOR_LOOT = 0x3CB5, SMSG_UPDATE_INSTANCE_ENCOUNTER_UNIT = 0x4007, diff --git a/src/server/game/Skills/Archaeology/ArchaeologyProjects.cpp b/src/server/game/Skills/Archaeology/ArchaeologyProjects.cpp index 991dc530f0..6b7b9643fb 100644 --- a/src/server/game/Skills/Archaeology/ArchaeologyProjects.cpp +++ b/src/server/game/Skills/Archaeology/ArchaeologyProjects.cpp @@ -186,7 +186,7 @@ void Archaeology::CompleteProject(uint16 projectId) ASSERT(_branches[project->branch].Project == projectId); ASSERT(_archData); - _player->ModifyCurrency(_archData->FragId, -int32(_archData->FragCount), false, true); + _player->ModifyCurrency(_archData->FragId, -int32(_archData->FragCount), false, false); _player->DestroyItemCount(_archData->KeyId, _archData->KeyCount, true, false); WorldPackets::Archaeology::ResearchComplete packet; diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 0780ceea5d..a10256e12c 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -682,7 +682,7 @@ public: int32 amount = (uint32)atoi(args); - target->ModifyCurrency(CURRENCY_TYPE_HONOR_POINTS, amount, true, true); + target->ModifyCurrency(CURRENCY_TYPE_HONOR_POINTS, amount, false, true); handler->PSendSysMessage(LANG_COMMAND_MODIFY_HONOR, handler->GetNameLink(target).c_str(), target->GetCurrency(CURRENCY_TYPE_HONOR_POINTS, false)); @@ -986,7 +986,7 @@ public: if (!amount) return false; - target->ModifyCurrency(currencyId, amount, true, true); + target->ModifyCurrency(currencyId, amount, false, true); return true; }