From 23e269940bd1ae7ea5f6c301cde51c20285075a4 Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Tue, 21 Dec 2021 23:26:54 -0800 Subject: [PATCH 01/18] Implemented sourceType for SendSetCurrency Implemented sourceType for the function SendSetCurrency. --- dGame/Character.cpp | 11 ++++------- dGame/Character.h | 2 +- dGame/TradingManager.cpp | 4 ++-- dGame/dComponents/DestroyableComponent.cpp | 2 +- dGame/dGameMessages/GameMessages.cpp | 11 +++++------ dGame/dGameMessages/GameMessages.h | 2 +- dGame/dMission/Mission.cpp | 10 ++++++---- dGame/dUtilities/Loot.cpp | 2 +- dGame/dUtilities/Mail.cpp | 2 +- dGame/dUtilities/SlashCommandHandler.cpp | 4 ++-- 10 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dGame/Character.cpp b/dGame/Character.cpp index 267e457..55b3742 100644 --- a/dGame/Character.cpp +++ b/dGame/Character.cpp @@ -527,7 +527,7 @@ void Character::OnZoneLoad() */ if (HasPermission(PermissionMap::Old)) { if (GetCoins() > 1000000) { - SetCoins(1000000); + SetCoins(1000000, 0); } } @@ -567,18 +567,15 @@ const NiPoint3& Character::GetRespawnPoint(LWOMAPID map) const return pair->second; } -void Character::SetCoins(int64_t newCoins, const bool message) { +void Character::SetCoins(int64_t newCoins, int lootType) { if (newCoins < 0) { newCoins = 0; } m_Coins = newCoins; - - if (message) - { - GameMessages::SendSetCurrency(EntityManager::Instance()->GetEntity(m_ObjectID), m_Coins, 0, 0, 0, 0, true); - } + + GameMessages::SendSetCurrency(EntityManager::Instance()->GetEntity(m_ObjectID), m_Coins, 0, 0, 0, 0, true, lootType); } bool Character::HasBeenToWorld(LWOMAPID mapID) const diff --git a/dGame/Character.h b/dGame/Character.h index 57da864..1f8f27e 100644 --- a/dGame/Character.h +++ b/dGame/Character.h @@ -314,7 +314,7 @@ public: * @param newCoins the amount of coins to update by * @param message whether to notify the client of the change */ - void SetCoins(int64_t newCoins, bool message = true); + void SetCoins(int64_t newCoins, int lootType); /** * Get the entity this character belongs to diff --git a/dGame/TradingManager.cpp b/dGame/TradingManager.cpp index 20af95e..294085a 100644 --- a/dGame/TradingManager.cpp +++ b/dGame/TradingManager.cpp @@ -151,8 +151,8 @@ void Trade::Complete() if (inventoryA == nullptr || inventoryB == nullptr || characterA == nullptr || characterB == nullptr || missionsA == nullptr || missionsB == nullptr) return; - characterA->SetCoins(characterA->GetCoins() - m_CoinsA + m_CoinsB); - characterB->SetCoins(characterB->GetCoins() - m_CoinsB + m_CoinsA); + characterA->SetCoins(characterA->GetCoins() - m_CoinsA + m_CoinsB, 6); + characterB->SetCoins(characterB->GetCoins() - m_CoinsB + m_CoinsA, 6); for (const auto& tradeItem : m_ItemsA) { diff --git a/dGame/dComponents/DestroyableComponent.cpp b/dGame/dComponents/DestroyableComponent.cpp index c84e906..6a68ce6 100644 --- a/dGame/dComponents/DestroyableComponent.cpp +++ b/dGame/dComponents/DestroyableComponent.cpp @@ -818,7 +818,7 @@ void DestroyableComponent::Smash(const LWOOBJID source, const eKillType killType LootGenerator::Instance().DropLoot(m_Parent, m_Parent, -1, coinsToLoose, coinsToLoose); } - character->SetCoins(coinsTotal); + character->SetCoins(coinsTotal, 11); Entity* zoneControl = EntityManager::Instance()->GetZoneControlEntity(); for (CppScripts::Script* script : CppScripts::GetEntityScripts(zoneControl)) { diff --git a/dGame/dGameMessages/GameMessages.cpp b/dGame/dGameMessages/GameMessages.cpp index fad5d7d..4f2d464 100644 --- a/dGame/dGameMessages/GameMessages.cpp +++ b/dGame/dGameMessages/GameMessages.cpp @@ -706,7 +706,7 @@ void GameMessages::SendBroadcastTextToChatbox(Entity* entity, const SystemAddres SEND_PACKET_BROADCAST } -void GameMessages::SendSetCurrency(Entity* entity, int64_t currency, int lootType, const LWOOBJID& sourceID, const LOT& sourceLOT, int sourceTradeID, bool overrideCurrent) { +void GameMessages::SendSetCurrency(Entity* entity, int64_t currency, int lootType, const LWOOBJID& sourceID, const LOT& sourceLOT, int sourceTradeID, bool overrideCurrent, int sourceType) { CBITSTREAM CMSGHEADER @@ -729,7 +729,6 @@ void GameMessages::SendSetCurrency(Entity* entity, int64_t currency, int lootTyp bitStream.Write(sourceTradeID != LWOOBJID_EMPTY); if (sourceTradeID != LWOOBJID_EMPTY) bitStream.Write(sourceTradeID); - int sourceType = 0; //For now. bitStream.Write(sourceType != LOOTTYPE_NONE); if (sourceType != LOOTTYPE_NONE) bitStream.Write(sourceType); @@ -4685,7 +4684,7 @@ void GameMessages::HandleBuyFromVendor(RakNet::BitStream* inStream, Entity* enti inv->RemoveItem(itemComp.currencyLOT, altCurrencyCost); } - character->SetCoins(character->GetCoins() - (coinCost)); + character->SetCoins(character->GetCoins() - (coinCost), 9); inv->AddItem(item, count); } @@ -4734,7 +4733,7 @@ void GameMessages::HandleSellToVendor(RakNet::BitStream* inStream, Entity* entit //inv->RemoveItem(count, -1, iObjID); inv->MoveItemToInventory(item, VENDOR_BUYBACK, count, true, false, true); - character->SetCoins(std::floor(character->GetCoins() + ((itemComp.baseValue * sellScalar)*count))); + character->SetCoins(std::floor(character->GetCoins() + ((itemComp.baseValue * sellScalar)*count)), 9); //EntityManager::Instance()->SerializeEntity(player); // so inventory updates GameMessages::SendVendorTransactionResult(entity, sysAddr); } @@ -4796,7 +4795,7 @@ void GameMessages::HandleBuybackFromVendor(RakNet::BitStream* inStream, Entity* //inv->RemoveItem(count, -1, iObjID); inv->MoveItemToInventory(item, Inventory::FindInventoryTypeForLot(item->GetLot()), count, true, false); - character->SetCoins(character->GetCoins() - cost); + character->SetCoins(character->GetCoins() - cost, 9); //EntityManager::Instance()->SerializeEntity(player); // so inventory updates GameMessages::SendVendorTransactionResult(entity, sysAddr); } @@ -5240,7 +5239,7 @@ void GameMessages::HandlePickupCurrency(RakNet::BitStream* inStream, Entity* ent auto* ch = entity->GetCharacter(); if (entity->CanPickupCoins(currency)) { - ch->SetCoins(ch->GetCoins() + currency); + ch->SetCoins(ch->GetCoins() + currency, 11); } } diff --git a/dGame/dGameMessages/GameMessages.h b/dGame/dGameMessages/GameMessages.h index e11f502..993223f 100644 --- a/dGame/dGameMessages/GameMessages.h +++ b/dGame/dGameMessages/GameMessages.h @@ -78,7 +78,7 @@ namespace GameMessages { void SendPlayFXEffect(const LWOOBJID& entity, int32_t effectID, const std::u16string& effectType, const std::string& name, LWOOBJID secondary = LWOOBJID_EMPTY, float priority = 1, float scale = 1, bool serialize = true); void SendStopFXEffect(Entity* entity, bool killImmediate, std::string name); void SendBroadcastTextToChatbox(Entity* entity, const SystemAddress& sysAddr, const std::u16string& attrs, const std::u16string& wsText); - void SendSetCurrency(Entity* entity, int64_t currency, int lootType, const LWOOBJID& sourceID, const LOT& sourceLOT, int sourceTradeID, bool overrideCurrent); + void SendSetCurrency(Entity* entity, int64_t currency, int lootType, const LWOOBJID& sourceID, const LOT& sourceLOT, int sourceTradeID, bool overrideCurrent, int sourceType); void SendRebuildNotifyState(Entity* entity, int prevState, int state, const LWOOBJID& playerID); void SendEnableRebuild(Entity* entity, bool enable, bool fail, bool success, int failReason, float duration, const LWOOBJID& playerID); diff --git a/dGame/dMission/Mission.cpp b/dGame/dMission/Mission.cpp index 7f5104e..8f88478 100644 --- a/dGame/dMission/Mission.cpp +++ b/dGame/dMission/Mission.cpp @@ -444,7 +444,7 @@ void Mission::YieldRewards() { auto count = pair.second > 0 ? pair.second : 1; - // Sanitfy check, 6 is the max any mission yields + // Sanity check, 6 is the max any mission yields if (count > 6) { count = 0; } @@ -453,7 +453,7 @@ void Mission::YieldRewards() { } if (info->reward_currency_repeatable > 0) { - character->SetCoins(character->GetCoins() + info->reward_currency_repeatable); + character->SetCoins(character->GetCoins() + info->reward_currency_repeatable, 2); } return; @@ -481,8 +481,10 @@ void Mission::YieldRewards() { inventoryComponent->AddItem(pair.first, count); } - if (info->reward_currency > 0) { - character->SetCoins(character->GetCoins() + info->reward_currency, info->isMission); + if (info->reward_currency > 0 && info->isMission) { + character->SetCoins(character->GetCoins() + info->reward_currency, 2); + } else if (info->reward_currency && !info->isMission) { + character->SetCoins(character->GetCoins() + info->reward_currency, 5); } if (info->reward_maxinventory > 0) { diff --git a/dGame/dUtilities/Loot.cpp b/dGame/dUtilities/Loot.cpp index 7e0f832..892ba4d 100644 --- a/dGame/dUtilities/Loot.cpp +++ b/dGame/dUtilities/Loot.cpp @@ -316,7 +316,7 @@ void LootGenerator::GiveActivityLoot(Entity* player, Entity* source, uint32_t ac auto* character = player->GetCharacter(); - character->SetCoins(character->GetCoins() + coins); + character->SetCoins(character->GetCoins() + coins, 10); } void LootGenerator::DropLoot(Entity* player, Entity* killedObject, uint32_t matrixIndex, uint32_t minCoins, uint32_t maxCoins) { diff --git a/dGame/dUtilities/Mail.cpp b/dGame/dUtilities/Mail.cpp index 2c3baf8..ecfbaf7 100644 --- a/dGame/dUtilities/Mail.cpp +++ b/dGame/dUtilities/Mail.cpp @@ -262,7 +262,7 @@ void Mail::HandleSendMail(RakNet::BitStream* packet, const SystemAddress& sysAdd } Mail::SendSendResponse(sysAddr, Mail::MailSendResponse::Success); - entity->GetCharacter()->SetCoins(entity->GetCharacter()->GetCoins() - mailCost); + entity->GetCharacter()->SetCoins(entity->GetCharacter()->GetCoins() - mailCost, 3); Game::logger->Log("Mail", "Seeing if we need to remove item with ID/count/LOT: %i %i %i\n", itemID, attachmentCount, itemLOT); diff --git a/dGame/dUtilities/SlashCommandHandler.cpp b/dGame/dUtilities/SlashCommandHandler.cpp index 8be9961..738d30f 100644 --- a/dGame/dUtilities/SlashCommandHandler.cpp +++ b/dGame/dUtilities/SlashCommandHandler.cpp @@ -1326,7 +1326,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit } auto* ch = entity->GetCharacter(); - ch->SetCoins(ch->GetCoins() + money); + ch->SetCoins(ch->GetCoins() + money, 14); } if ((chatCommand == "setcurrency") && args.size() == 1 && entity->GetGMLevel() >= GAME_MASTER_LEVEL_DEVELOPER) { @@ -1339,7 +1339,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit } auto* ch = entity->GetCharacter(); - ch->SetCoins(money); + ch->SetCoins(money, 14); } // Allow for this on even while not a GM, as it sometimes toggles incorrrectly. From c575294587df9982c3cff2dfbf7d6fd04b769d12 Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Tue, 21 Dec 2021 23:32:39 -0800 Subject: [PATCH 02/18] Changed variable names Changed variable names to more accurately match what they are --- dGame/Character.cpp | 4 ++-- dGame/Character.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dGame/Character.cpp b/dGame/Character.cpp index 55b3742..fe18cda 100644 --- a/dGame/Character.cpp +++ b/dGame/Character.cpp @@ -567,7 +567,7 @@ const NiPoint3& Character::GetRespawnPoint(LWOMAPID map) const return pair->second; } -void Character::SetCoins(int64_t newCoins, int lootType) { +void Character::SetCoins(int64_t newCoins, int coinSource) { if (newCoins < 0) { newCoins = 0; @@ -575,7 +575,7 @@ void Character::SetCoins(int64_t newCoins, int lootType) { m_Coins = newCoins; - GameMessages::SendSetCurrency(EntityManager::Instance()->GetEntity(m_ObjectID), m_Coins, 0, 0, 0, 0, true, lootType); + GameMessages::SendSetCurrency(EntityManager::Instance()->GetEntity(m_ObjectID), m_Coins, 0, 0, 0, 0, true, coinSource); } bool Character::HasBeenToWorld(LWOMAPID mapID) const diff --git a/dGame/Character.h b/dGame/Character.h index 1f8f27e..5d663d3 100644 --- a/dGame/Character.h +++ b/dGame/Character.h @@ -312,9 +312,9 @@ public: * Updates the current amount of coins of the character by a specified amount, for achievements this is not sent * as it's tracked by the client * @param newCoins the amount of coins to update by - * @param message whether to notify the client of the change + * @param coinSource The source of the loot */ - void SetCoins(int64_t newCoins, int lootType); + void SetCoins(int64_t newCoins, int coinSource); /** * Get the entity this character belongs to From 97f8e9e9fc62763bfd60df7a4dc43c32c917845b Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Wed, 22 Dec 2021 00:01:55 -0800 Subject: [PATCH 03/18] Added enum for coin sources Added an enum for coin sources as to avoid leaving a random number in the code. --- dCommon/dCommonVars.h | 25 ++++++++++++++++++++++ dGame/Character.cpp | 2 +- dGame/TradingManager.cpp | 4 ++-- dGame/dComponents/DestroyableComponent.cpp | 2 +- dGame/dGameMessages/GameMessages.cpp | 8 +++---- dGame/dMission/Mission.cpp | 6 +++--- dGame/dUtilities/Loot.cpp | 2 +- dGame/dUtilities/Mail.cpp | 2 +- dGame/dUtilities/SlashCommandHandler.cpp | 4 ++-- 9 files changed, 40 insertions(+), 15 deletions(-) diff --git a/dCommon/dCommonVars.h b/dCommon/dCommonVars.h index 7757028..521f856 100644 --- a/dCommon/dCommonVars.h +++ b/dCommon/dCommonVars.h @@ -469,6 +469,31 @@ enum eRebuildState : uint32_t { REBUILD_INCOMPLETE }; +enum eCoinSourceType : int32_t { + COIN_SOURCE_NONE = 0, + COIN_SOURCE_CHEST, + COIN_SOURCE_MISSION, + COIN_SOURCE_MAIL, + COIN_SOURCE_CURRENCY, + COIN_SOURCE_ACHIEVEMENT, + COIN_SOURCE_TRADE, + COIN_SOURCE_QUICKBUILD, + COIN_SOURCE_DELETION, + COIN_SOURCE_VENDOR, + COIN_SOURCE_ACTIVITY, + COIN_SOURCE_PICKUP, + COIN_SOURCE_BRICK, + COIN_SOURCE_PROPERTY, + COIN_SOURCE_MODERATION, + COIN_SOURCE_EXHIBIT, + COIN_SOURCE_INVENTORY, + COIN_SOURCE_CLAIMCODE, + COIN_SOURCE_CONSUMPTION, + COIN_SOURCE_CRAFTING, + COIN_SOURCE_LEVELREWARD, + COIN_SOURCE_RELOCATE +}; + enum eGameActivities : uint32_t { ACTIVITY_NONE, ACTIVITY_QUICKBUILDING, diff --git a/dGame/Character.cpp b/dGame/Character.cpp index fe18cda..b6f5fce 100644 --- a/dGame/Character.cpp +++ b/dGame/Character.cpp @@ -527,7 +527,7 @@ void Character::OnZoneLoad() */ if (HasPermission(PermissionMap::Old)) { if (GetCoins() > 1000000) { - SetCoins(1000000, 0); + SetCoins(1000000, COIN_SOURCE_NONE); } } diff --git a/dGame/TradingManager.cpp b/dGame/TradingManager.cpp index 294085a..34165e3 100644 --- a/dGame/TradingManager.cpp +++ b/dGame/TradingManager.cpp @@ -151,8 +151,8 @@ void Trade::Complete() if (inventoryA == nullptr || inventoryB == nullptr || characterA == nullptr || characterB == nullptr || missionsA == nullptr || missionsB == nullptr) return; - characterA->SetCoins(characterA->GetCoins() - m_CoinsA + m_CoinsB, 6); - characterB->SetCoins(characterB->GetCoins() - m_CoinsB + m_CoinsA, 6); + characterA->SetCoins(characterA->GetCoins() - m_CoinsA + m_CoinsB, COIN_SOURCE_TRADE); + characterB->SetCoins(characterB->GetCoins() - m_CoinsB + m_CoinsA, COIN_SOURCE_TRADE); for (const auto& tradeItem : m_ItemsA) { diff --git a/dGame/dComponents/DestroyableComponent.cpp b/dGame/dComponents/DestroyableComponent.cpp index 6a68ce6..058b725 100644 --- a/dGame/dComponents/DestroyableComponent.cpp +++ b/dGame/dComponents/DestroyableComponent.cpp @@ -818,7 +818,7 @@ void DestroyableComponent::Smash(const LWOOBJID source, const eKillType killType LootGenerator::Instance().DropLoot(m_Parent, m_Parent, -1, coinsToLoose, coinsToLoose); } - character->SetCoins(coinsTotal, 11); + character->SetCoins(coinsTotal, COIN_SOURCE_PICKUP); Entity* zoneControl = EntityManager::Instance()->GetZoneControlEntity(); for (CppScripts::Script* script : CppScripts::GetEntityScripts(zoneControl)) { diff --git a/dGame/dGameMessages/GameMessages.cpp b/dGame/dGameMessages/GameMessages.cpp index 4f2d464..e928321 100644 --- a/dGame/dGameMessages/GameMessages.cpp +++ b/dGame/dGameMessages/GameMessages.cpp @@ -4684,7 +4684,7 @@ void GameMessages::HandleBuyFromVendor(RakNet::BitStream* inStream, Entity* enti inv->RemoveItem(itemComp.currencyLOT, altCurrencyCost); } - character->SetCoins(character->GetCoins() - (coinCost), 9); + character->SetCoins(character->GetCoins() - (coinCost), COIN_SOURCE_VENDOR); inv->AddItem(item, count); } @@ -4733,7 +4733,7 @@ void GameMessages::HandleSellToVendor(RakNet::BitStream* inStream, Entity* entit //inv->RemoveItem(count, -1, iObjID); inv->MoveItemToInventory(item, VENDOR_BUYBACK, count, true, false, true); - character->SetCoins(std::floor(character->GetCoins() + ((itemComp.baseValue * sellScalar)*count)), 9); + character->SetCoins(std::floor(character->GetCoins() + ((itemComp.baseValue * sellScalar)*count)), COIN_SOURCE_VENDOR); //EntityManager::Instance()->SerializeEntity(player); // so inventory updates GameMessages::SendVendorTransactionResult(entity, sysAddr); } @@ -4795,7 +4795,7 @@ void GameMessages::HandleBuybackFromVendor(RakNet::BitStream* inStream, Entity* //inv->RemoveItem(count, -1, iObjID); inv->MoveItemToInventory(item, Inventory::FindInventoryTypeForLot(item->GetLot()), count, true, false); - character->SetCoins(character->GetCoins() - cost, 9); + character->SetCoins(character->GetCoins() - cost, COIN_SOURCE_VENDOR); //EntityManager::Instance()->SerializeEntity(player); // so inventory updates GameMessages::SendVendorTransactionResult(entity, sysAddr); } @@ -5239,7 +5239,7 @@ void GameMessages::HandlePickupCurrency(RakNet::BitStream* inStream, Entity* ent auto* ch = entity->GetCharacter(); if (entity->CanPickupCoins(currency)) { - ch->SetCoins(ch->GetCoins() + currency, 11); + ch->SetCoins(ch->GetCoins() + currency, COIN_SOURCE_PICKUP); } } diff --git a/dGame/dMission/Mission.cpp b/dGame/dMission/Mission.cpp index 8f88478..1d5ab4a 100644 --- a/dGame/dMission/Mission.cpp +++ b/dGame/dMission/Mission.cpp @@ -453,7 +453,7 @@ void Mission::YieldRewards() { } if (info->reward_currency_repeatable > 0) { - character->SetCoins(character->GetCoins() + info->reward_currency_repeatable, 2); + character->SetCoins(character->GetCoins() + info->reward_currency_repeatable, COIN_SOURCE_MISSION); } return; @@ -482,9 +482,9 @@ void Mission::YieldRewards() { } if (info->reward_currency > 0 && info->isMission) { - character->SetCoins(character->GetCoins() + info->reward_currency, 2); + character->SetCoins(character->GetCoins() + info->reward_currency, COIN_SOURCE_MISSION); } else if (info->reward_currency && !info->isMission) { - character->SetCoins(character->GetCoins() + info->reward_currency, 5); + character->SetCoins(character->GetCoins() + info->reward_currency, COIN_SOURCE_ACHIEVEMENT); } if (info->reward_maxinventory > 0) { diff --git a/dGame/dUtilities/Loot.cpp b/dGame/dUtilities/Loot.cpp index 892ba4d..ecd8bfe 100644 --- a/dGame/dUtilities/Loot.cpp +++ b/dGame/dUtilities/Loot.cpp @@ -316,7 +316,7 @@ void LootGenerator::GiveActivityLoot(Entity* player, Entity* source, uint32_t ac auto* character = player->GetCharacter(); - character->SetCoins(character->GetCoins() + coins, 10); + character->SetCoins(character->GetCoins() + coins, COIN_SOURCE_ACTIVITY); } void LootGenerator::DropLoot(Entity* player, Entity* killedObject, uint32_t matrixIndex, uint32_t minCoins, uint32_t maxCoins) { diff --git a/dGame/dUtilities/Mail.cpp b/dGame/dUtilities/Mail.cpp index ecfbaf7..9cc5a05 100644 --- a/dGame/dUtilities/Mail.cpp +++ b/dGame/dUtilities/Mail.cpp @@ -262,7 +262,7 @@ void Mail::HandleSendMail(RakNet::BitStream* packet, const SystemAddress& sysAdd } Mail::SendSendResponse(sysAddr, Mail::MailSendResponse::Success); - entity->GetCharacter()->SetCoins(entity->GetCharacter()->GetCoins() - mailCost, 3); + entity->GetCharacter()->SetCoins(entity->GetCharacter()->GetCoins() - mailCost, COIN_SOURCE_MAIL); Game::logger->Log("Mail", "Seeing if we need to remove item with ID/count/LOT: %i %i %i\n", itemID, attachmentCount, itemLOT); diff --git a/dGame/dUtilities/SlashCommandHandler.cpp b/dGame/dUtilities/SlashCommandHandler.cpp index 738d30f..c5f4a64 100644 --- a/dGame/dUtilities/SlashCommandHandler.cpp +++ b/dGame/dUtilities/SlashCommandHandler.cpp @@ -1326,7 +1326,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit } auto* ch = entity->GetCharacter(); - ch->SetCoins(ch->GetCoins() + money, 14); + ch->SetCoins(ch->GetCoins() + money, COIN_SOURCE_MODERATION); } if ((chatCommand == "setcurrency") && args.size() == 1 && entity->GetGMLevel() >= GAME_MASTER_LEVEL_DEVELOPER) { @@ -1339,7 +1339,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit } auto* ch = entity->GetCharacter(); - ch->SetCoins(money, 14); + ch->SetCoins(money, COIN_SOURCE_MODERATION); } // Allow for this on even while not a GM, as it sometimes toggles incorrrectly. From 29cf7f8998fa8814be4d031ef7ac8b2e18fb2aef Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Wed, 22 Dec 2021 00:15:08 -0800 Subject: [PATCH 04/18] Changed ambiguous variables Changed ambiguous variables from int to int32_t to clarify what they are. --- dGame/Character.cpp | 2 +- dGame/Character.h | 2 +- dGame/dGameMessages/GameMessages.cpp | 2 +- dGame/dGameMessages/GameMessages.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dGame/Character.cpp b/dGame/Character.cpp index b6f5fce..804bf47 100644 --- a/dGame/Character.cpp +++ b/dGame/Character.cpp @@ -567,7 +567,7 @@ const NiPoint3& Character::GetRespawnPoint(LWOMAPID map) const return pair->second; } -void Character::SetCoins(int64_t newCoins, int coinSource) { +void Character::SetCoins(int64_t newCoins, int32_t coinSource) { if (newCoins < 0) { newCoins = 0; diff --git a/dGame/Character.h b/dGame/Character.h index 5d663d3..6b000dd 100644 --- a/dGame/Character.h +++ b/dGame/Character.h @@ -314,7 +314,7 @@ public: * @param newCoins the amount of coins to update by * @param coinSource The source of the loot */ - void SetCoins(int64_t newCoins, int coinSource); + void SetCoins(int64_t newCoins, int32_t coinSource); /** * Get the entity this character belongs to diff --git a/dGame/dGameMessages/GameMessages.cpp b/dGame/dGameMessages/GameMessages.cpp index e928321..3433989 100644 --- a/dGame/dGameMessages/GameMessages.cpp +++ b/dGame/dGameMessages/GameMessages.cpp @@ -706,7 +706,7 @@ void GameMessages::SendBroadcastTextToChatbox(Entity* entity, const SystemAddres SEND_PACKET_BROADCAST } -void GameMessages::SendSetCurrency(Entity* entity, int64_t currency, int lootType, const LWOOBJID& sourceID, const LOT& sourceLOT, int sourceTradeID, bool overrideCurrent, int sourceType) { +void GameMessages::SendSetCurrency(Entity* entity, int64_t currency, int lootType, const LWOOBJID& sourceID, const LOT& sourceLOT, int sourceTradeID, bool overrideCurrent, int32_t sourceType) { CBITSTREAM CMSGHEADER diff --git a/dGame/dGameMessages/GameMessages.h b/dGame/dGameMessages/GameMessages.h index 993223f..a2182e0 100644 --- a/dGame/dGameMessages/GameMessages.h +++ b/dGame/dGameMessages/GameMessages.h @@ -78,7 +78,7 @@ namespace GameMessages { void SendPlayFXEffect(const LWOOBJID& entity, int32_t effectID, const std::u16string& effectType, const std::string& name, LWOOBJID secondary = LWOOBJID_EMPTY, float priority = 1, float scale = 1, bool serialize = true); void SendStopFXEffect(Entity* entity, bool killImmediate, std::string name); void SendBroadcastTextToChatbox(Entity* entity, const SystemAddress& sysAddr, const std::u16string& attrs, const std::u16string& wsText); - void SendSetCurrency(Entity* entity, int64_t currency, int lootType, const LWOOBJID& sourceID, const LOT& sourceLOT, int sourceTradeID, bool overrideCurrent, int sourceType); + void SendSetCurrency(Entity* entity, int64_t currency, int lootType, const LWOOBJID& sourceID, const LOT& sourceLOT, int sourceTradeID, bool overrideCurrent, int32_t sourceType); void SendRebuildNotifyState(Entity* entity, int prevState, int state, const LWOOBJID& playerID); void SendEnableRebuild(Entity* entity, bool enable, bool fail, bool success, int failReason, float duration, const LWOOBJID& playerID); From f772fedf19b9612b2610770136a0418b9a13b0fa Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Wed, 22 Dec 2021 00:43:42 -0800 Subject: [PATCH 05/18] Updated description of SetCoins Updated the description of the Character::SetCoins function to more accurately describe how the function works. --- dGame/Character.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dGame/Character.h b/dGame/Character.h index 6b000dd..089ec00 100644 --- a/dGame/Character.h +++ b/dGame/Character.h @@ -309,8 +309,7 @@ public: const int64_t GetCoins() const { return m_Coins; } /** - * Updates the current amount of coins of the character by a specified amount, for achievements this is not sent - * as it's tracked by the client + * Updates the current amount of coins of the character by a specified amount * @param newCoins the amount of coins to update by * @param coinSource The source of the loot */ From 6ff5ae78aa0f27b8e13bb65eea75085fe6c6669c Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Thu, 23 Dec 2021 18:46:21 -0800 Subject: [PATCH 06/18] Corrected enum name Corrected the enum name and prefixes of the elements in the enum. --- dCommon/dCommonVars.h | 46 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dCommon/dCommonVars.h b/dCommon/dCommonVars.h index 521f856..4920249 100644 --- a/dCommon/dCommonVars.h +++ b/dCommon/dCommonVars.h @@ -469,29 +469,29 @@ enum eRebuildState : uint32_t { REBUILD_INCOMPLETE }; -enum eCoinSourceType : int32_t { - COIN_SOURCE_NONE = 0, - COIN_SOURCE_CHEST, - COIN_SOURCE_MISSION, - COIN_SOURCE_MAIL, - COIN_SOURCE_CURRENCY, - COIN_SOURCE_ACHIEVEMENT, - COIN_SOURCE_TRADE, - COIN_SOURCE_QUICKBUILD, - COIN_SOURCE_DELETION, - COIN_SOURCE_VENDOR, - COIN_SOURCE_ACTIVITY, - COIN_SOURCE_PICKUP, - COIN_SOURCE_BRICK, - COIN_SOURCE_PROPERTY, - COIN_SOURCE_MODERATION, - COIN_SOURCE_EXHIBIT, - COIN_SOURCE_INVENTORY, - COIN_SOURCE_CLAIMCODE, - COIN_SOURCE_CONSUMPTION, - COIN_SOURCE_CRAFTING, - COIN_SOURCE_LEVELREWARD, - COIN_SOURCE_RELOCATE +enum eLootSourceType : int32_t { + LOOT_SOURCE_NONE = 0, + LOOT_SOURCE_CHEST, + LOOT_SOURCE_MISSION, + LOOT_SOURCE_MAIL, + LOOT_SOURCE_CURRENCY, + LOOT_SOURCE_ACHIEVEMENT, + LOOT_SOURCE_TRADE, + LOOT_SOURCE_QUICKBUILD, + LOOT_SOURCE_DELETION, + LOOT_SOURCE_VENDOR, + LOOT_SOURCE_ACTIVITY, + LOOT_SOURCE_PICKUP, + LOOT_SOURCE_BRICK, + LOOT_SOURCE_PROPERTY, + LOOT_SOURCE_MODERATION, + LOOT_SOURCE_EXHIBIT, + LOOT_SOURCE_INVENTORY, + LOOT_SOURCE_CLAIMCODE, + LOOT_SOURCE_CONSUMPTION, + LOOT_SOURCE_CRAFTING, + LOOT_SOURCE_LEVELREWARD, + LOOT_SOURCE_RELOCATE }; enum eGameActivities : uint32_t { From 6aad799f9551af5cbd0d4a4f93d9b17d2bd24392 Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Thu, 23 Dec 2021 18:48:08 -0800 Subject: [PATCH 07/18] Updated variable names Updated the variable names to match the enum name update. --- dGame/Character.cpp | 6 +++--- dGame/TradingManager.cpp | 4 ++-- dGame/dComponents/DestroyableComponent.cpp | 2 +- dGame/dGameMessages/GameMessages.cpp | 8 ++++---- dGame/dUtilities/Loot.cpp | 2 +- dGame/dUtilities/Mail.cpp | 2 +- dGame/dUtilities/SlashCommandHandler.cpp | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dGame/Character.cpp b/dGame/Character.cpp index 804bf47..4034a21 100644 --- a/dGame/Character.cpp +++ b/dGame/Character.cpp @@ -527,7 +527,7 @@ void Character::OnZoneLoad() */ if (HasPermission(PermissionMap::Old)) { if (GetCoins() > 1000000) { - SetCoins(1000000, COIN_SOURCE_NONE); + SetCoins(1000000, LOOT_SOURCE_NONE); } } @@ -567,7 +567,7 @@ const NiPoint3& Character::GetRespawnPoint(LWOMAPID map) const return pair->second; } -void Character::SetCoins(int64_t newCoins, int32_t coinSource) { +void Character::SetCoins(int64_t newCoins, int32_t lootSource) { if (newCoins < 0) { newCoins = 0; @@ -575,7 +575,7 @@ void Character::SetCoins(int64_t newCoins, int32_t coinSource) { m_Coins = newCoins; - GameMessages::SendSetCurrency(EntityManager::Instance()->GetEntity(m_ObjectID), m_Coins, 0, 0, 0, 0, true, coinSource); + GameMessages::SendSetCurrency(EntityManager::Instance()->GetEntity(m_ObjectID), m_Coins, 0, 0, 0, 0, true, lootSource); } bool Character::HasBeenToWorld(LWOMAPID mapID) const diff --git a/dGame/TradingManager.cpp b/dGame/TradingManager.cpp index 34165e3..d0ec08d 100644 --- a/dGame/TradingManager.cpp +++ b/dGame/TradingManager.cpp @@ -151,8 +151,8 @@ void Trade::Complete() if (inventoryA == nullptr || inventoryB == nullptr || characterA == nullptr || characterB == nullptr || missionsA == nullptr || missionsB == nullptr) return; - characterA->SetCoins(characterA->GetCoins() - m_CoinsA + m_CoinsB, COIN_SOURCE_TRADE); - characterB->SetCoins(characterB->GetCoins() - m_CoinsB + m_CoinsA, COIN_SOURCE_TRADE); + characterA->SetCoins(characterA->GetCoins() - m_CoinsA + m_CoinsB, LOOT_SOURCE_TRADE); + characterB->SetCoins(characterB->GetCoins() - m_CoinsB + m_CoinsA, LOOT_SOURCE_TRADE); for (const auto& tradeItem : m_ItemsA) { diff --git a/dGame/dComponents/DestroyableComponent.cpp b/dGame/dComponents/DestroyableComponent.cpp index 058b725..686e44e 100644 --- a/dGame/dComponents/DestroyableComponent.cpp +++ b/dGame/dComponents/DestroyableComponent.cpp @@ -818,7 +818,7 @@ void DestroyableComponent::Smash(const LWOOBJID source, const eKillType killType LootGenerator::Instance().DropLoot(m_Parent, m_Parent, -1, coinsToLoose, coinsToLoose); } - character->SetCoins(coinsTotal, COIN_SOURCE_PICKUP); + character->SetCoins(coinsTotal, LOOT_SOURCE_PICKUP); Entity* zoneControl = EntityManager::Instance()->GetZoneControlEntity(); for (CppScripts::Script* script : CppScripts::GetEntityScripts(zoneControl)) { diff --git a/dGame/dGameMessages/GameMessages.cpp b/dGame/dGameMessages/GameMessages.cpp index 3433989..0e26252 100644 --- a/dGame/dGameMessages/GameMessages.cpp +++ b/dGame/dGameMessages/GameMessages.cpp @@ -4684,7 +4684,7 @@ void GameMessages::HandleBuyFromVendor(RakNet::BitStream* inStream, Entity* enti inv->RemoveItem(itemComp.currencyLOT, altCurrencyCost); } - character->SetCoins(character->GetCoins() - (coinCost), COIN_SOURCE_VENDOR); + character->SetCoins(character->GetCoins() - (coinCost), LOOT_SOURCE_VENDOR); inv->AddItem(item, count); } @@ -4733,7 +4733,7 @@ void GameMessages::HandleSellToVendor(RakNet::BitStream* inStream, Entity* entit //inv->RemoveItem(count, -1, iObjID); inv->MoveItemToInventory(item, VENDOR_BUYBACK, count, true, false, true); - character->SetCoins(std::floor(character->GetCoins() + ((itemComp.baseValue * sellScalar)*count)), COIN_SOURCE_VENDOR); + character->SetCoins(std::floor(character->GetCoins() + ((itemComp.baseValue * sellScalar)*count)), LOOT_SOURCE_VENDOR); //EntityManager::Instance()->SerializeEntity(player); // so inventory updates GameMessages::SendVendorTransactionResult(entity, sysAddr); } @@ -4795,7 +4795,7 @@ void GameMessages::HandleBuybackFromVendor(RakNet::BitStream* inStream, Entity* //inv->RemoveItem(count, -1, iObjID); inv->MoveItemToInventory(item, Inventory::FindInventoryTypeForLot(item->GetLot()), count, true, false); - character->SetCoins(character->GetCoins() - cost, COIN_SOURCE_VENDOR); + character->SetCoins(character->GetCoins() - cost, LOOT_SOURCE_VENDOR); //EntityManager::Instance()->SerializeEntity(player); // so inventory updates GameMessages::SendVendorTransactionResult(entity, sysAddr); } @@ -5239,7 +5239,7 @@ void GameMessages::HandlePickupCurrency(RakNet::BitStream* inStream, Entity* ent auto* ch = entity->GetCharacter(); if (entity->CanPickupCoins(currency)) { - ch->SetCoins(ch->GetCoins() + currency, COIN_SOURCE_PICKUP); + ch->SetCoins(ch->GetCoins() + currency, LOOT_SOURCE_PICKUP); } } diff --git a/dGame/dUtilities/Loot.cpp b/dGame/dUtilities/Loot.cpp index ecd8bfe..f051fec 100644 --- a/dGame/dUtilities/Loot.cpp +++ b/dGame/dUtilities/Loot.cpp @@ -316,7 +316,7 @@ void LootGenerator::GiveActivityLoot(Entity* player, Entity* source, uint32_t ac auto* character = player->GetCharacter(); - character->SetCoins(character->GetCoins() + coins, COIN_SOURCE_ACTIVITY); + character->SetCoins(character->GetCoins() + coins, LOOT_SOURCE_ACTIVITY); } void LootGenerator::DropLoot(Entity* player, Entity* killedObject, uint32_t matrixIndex, uint32_t minCoins, uint32_t maxCoins) { diff --git a/dGame/dUtilities/Mail.cpp b/dGame/dUtilities/Mail.cpp index 9cc5a05..302ba1c 100644 --- a/dGame/dUtilities/Mail.cpp +++ b/dGame/dUtilities/Mail.cpp @@ -262,7 +262,7 @@ void Mail::HandleSendMail(RakNet::BitStream* packet, const SystemAddress& sysAdd } Mail::SendSendResponse(sysAddr, Mail::MailSendResponse::Success); - entity->GetCharacter()->SetCoins(entity->GetCharacter()->GetCoins() - mailCost, COIN_SOURCE_MAIL); + entity->GetCharacter()->SetCoins(entity->GetCharacter()->GetCoins() - mailCost, LOOT_SOURCE_MAIL); Game::logger->Log("Mail", "Seeing if we need to remove item with ID/count/LOT: %i %i %i\n", itemID, attachmentCount, itemLOT); diff --git a/dGame/dUtilities/SlashCommandHandler.cpp b/dGame/dUtilities/SlashCommandHandler.cpp index c5f4a64..ed7fdda 100644 --- a/dGame/dUtilities/SlashCommandHandler.cpp +++ b/dGame/dUtilities/SlashCommandHandler.cpp @@ -1326,7 +1326,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit } auto* ch = entity->GetCharacter(); - ch->SetCoins(ch->GetCoins() + money, COIN_SOURCE_MODERATION); + ch->SetCoins(ch->GetCoins() + money, LOOT_SOURCE_MODERATION); } if ((chatCommand == "setcurrency") && args.size() == 1 && entity->GetGMLevel() >= GAME_MASTER_LEVEL_DEVELOPER) { @@ -1339,7 +1339,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit } auto* ch = entity->GetCharacter(); - ch->SetCoins(money, COIN_SOURCE_MODERATION); + ch->SetCoins(money, LOOT_SOURCE_MODERATION); } // Allow for this on even while not a GM, as it sometimes toggles incorrrectly. From e84811bdcee9218b4c88c5ad6a3a4e63298cebcf Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Thu, 23 Dec 2021 18:49:01 -0800 Subject: [PATCH 08/18] Refactored if statement for coins Refactored the if statement for coins so there is only one SetCoins call for the function. --- dGame/dMission/Mission.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dGame/dMission/Mission.cpp b/dGame/dMission/Mission.cpp index 1d5ab4a..ac503b5 100644 --- a/dGame/dMission/Mission.cpp +++ b/dGame/dMission/Mission.cpp @@ -453,7 +453,7 @@ void Mission::YieldRewards() { } if (info->reward_currency_repeatable > 0) { - character->SetCoins(character->GetCoins() + info->reward_currency_repeatable, COIN_SOURCE_MISSION); + character->SetCoins(character->GetCoins() + info->reward_currency_repeatable, LOOT_SOURCE_MISSION); } return; @@ -480,11 +480,15 @@ void Mission::YieldRewards() { inventoryComponent->AddItem(pair.first, count); } - - if (info->reward_currency > 0 && info->isMission) { - character->SetCoins(character->GetCoins() + info->reward_currency, COIN_SOURCE_MISSION); - } else if (info->reward_currency && !info->isMission) { - character->SetCoins(character->GetCoins() + info->reward_currency, COIN_SOURCE_ACHIEVEMENT); + + int32_t lootSource = LOOT_SOURCE_NONE; + if (info->reward_currency > 0) { + if(info->isMission) { + lootSource = LOOT_SOURCE_MISSION; + } else { + lootSource = LOOT_SOURCE_ACHIEVEMENT; + } + character->SetCoins(character->GetCoins() + info->reward_currency, lootSource); } if (info->reward_maxinventory > 0) { From e95af79c8adefac38a7c49357d187a4fffbb7cde Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Thu, 23 Dec 2021 19:43:19 -0800 Subject: [PATCH 09/18] Consolidated if statement Changed default variable to achievement and removed the else. --- dGame/dMission/Mission.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dGame/dMission/Mission.cpp b/dGame/dMission/Mission.cpp index ac503b5..a180d32 100644 --- a/dGame/dMission/Mission.cpp +++ b/dGame/dMission/Mission.cpp @@ -481,12 +481,10 @@ void Mission::YieldRewards() { inventoryComponent->AddItem(pair.first, count); } - int32_t lootSource = LOOT_SOURCE_NONE; + int32_t lootSource = LOOT_SOURCE_ACHIEVEMENT; if (info->reward_currency > 0) { if(info->isMission) { lootSource = LOOT_SOURCE_MISSION; - } else { - lootSource = LOOT_SOURCE_ACHIEVEMENT; } character->SetCoins(character->GetCoins() + info->reward_currency, lootSource); } From 5e605b30de5709e8c15a5d13c5b829960d9c86a0 Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Thu, 23 Dec 2021 19:50:17 -0800 Subject: [PATCH 10/18] Grammatical change in a comment Small grammatical change in a comment --- dGame/dMission/Mission.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dGame/dMission/Mission.cpp b/dGame/dMission/Mission.cpp index a180d32..5809650 100644 --- a/dGame/dMission/Mission.cpp +++ b/dGame/dMission/Mission.cpp @@ -473,7 +473,7 @@ void Mission::YieldRewards() { auto count = pair.second > 0 ? pair.second : 1; - // Sanitfy check, 6 is the max any mission yields + // Sanity check, 6 is the max any mission yields if (count > 6) { count = 0; } From 74013e07a87231bba52c6c4a0adf47c011277c91 Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Mon, 3 Jan 2022 03:11:04 -0800 Subject: [PATCH 11/18] Encapsulated variable properly lootSource was not encapsulated properly so this is now fixed. --- dGame/dMission/Mission.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dGame/dMission/Mission.cpp b/dGame/dMission/Mission.cpp index 5809650..9dde125 100644 --- a/dGame/dMission/Mission.cpp +++ b/dGame/dMission/Mission.cpp @@ -481,8 +481,8 @@ void Mission::YieldRewards() { inventoryComponent->AddItem(pair.first, count); } - int32_t lootSource = LOOT_SOURCE_ACHIEVEMENT; if (info->reward_currency > 0) { + int32_t lootSource = LOOT_SOURCE_ACHIEVEMENT; if(info->isMission) { lootSource = LOOT_SOURCE_MISSION; } From f74cc9cb1077dd8cc5b46c215aa6104c4c652ed2 Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Mon, 3 Jan 2022 16:01:28 -0800 Subject: [PATCH 12/18] Updated variable assignment Changed the variable assignment to be a ternary operator. --- dGame/dMission/Mission.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dGame/dMission/Mission.cpp b/dGame/dMission/Mission.cpp index 9dde125..ed14429 100644 --- a/dGame/dMission/Mission.cpp +++ b/dGame/dMission/Mission.cpp @@ -482,10 +482,7 @@ void Mission::YieldRewards() { } if (info->reward_currency > 0) { - int32_t lootSource = LOOT_SOURCE_ACHIEVEMENT; - if(info->isMission) { - lootSource = LOOT_SOURCE_MISSION; - } + int32_t lootSource = info->isMission ? LOOT_SOURCE_MISSION : LOOT_SOURCE_ACHIEVEMENT; character->SetCoins(character->GetCoins() + info->reward_currency, lootSource); } From a9da275673c7158e975e010230413c0ae5af5e6f Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Mon, 3 Jan 2022 16:01:54 -0800 Subject: [PATCH 13/18] removed extra tab removed extra tab --- dGame/dMission/Mission.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dGame/dMission/Mission.cpp b/dGame/dMission/Mission.cpp index ed14429..0eb1a6b 100644 --- a/dGame/dMission/Mission.cpp +++ b/dGame/dMission/Mission.cpp @@ -480,7 +480,7 @@ void Mission::YieldRewards() { inventoryComponent->AddItem(pair.first, count); } - + if (info->reward_currency > 0) { int32_t lootSource = info->isMission ? LOOT_SOURCE_MISSION : LOOT_SOURCE_ACHIEVEMENT; character->SetCoins(character->GetCoins() + info->reward_currency, lootSource); From a92e05c640e71098cf8d250450c5ba5cbcd66c86 Mon Sep 17 00:00:00 2001 From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:37:40 -0800 Subject: [PATCH 14/18] Update dGame/dGameMessages/GameMessages.cpp Co-authored-by: Xiphoseer --- dGame/dGameMessages/GameMessages.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dGame/dGameMessages/GameMessages.cpp b/dGame/dGameMessages/GameMessages.cpp index 0e26252..1df0a3f 100644 --- a/dGame/dGameMessages/GameMessages.cpp +++ b/dGame/dGameMessages/GameMessages.cpp @@ -706,7 +706,7 @@ void GameMessages::SendBroadcastTextToChatbox(Entity* entity, const SystemAddres SEND_PACKET_BROADCAST } -void GameMessages::SendSetCurrency(Entity* entity, int64_t currency, int lootType, const LWOOBJID& sourceID, const LOT& sourceLOT, int sourceTradeID, bool overrideCurrent, int32_t sourceType) { +void GameMessages::SendSetCurrency(Entity* entity, int64_t currency, int lootType, const LWOOBJID& sourceID, const LOT& sourceLOT, int sourceTradeID, bool overrideCurrent, eLootSourceType sourceType) { CBITSTREAM CMSGHEADER From 7aed5f0500f7cacc5119863d611bbac09da2dd2f Mon Sep 17 00:00:00 2001 From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:37:49 -0800 Subject: [PATCH 15/18] Update dGame/Character.h Co-authored-by: Xiphoseer --- dGame/Character.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dGame/Character.h b/dGame/Character.h index 089ec00..61017cc 100644 --- a/dGame/Character.h +++ b/dGame/Character.h @@ -313,7 +313,7 @@ public: * @param newCoins the amount of coins to update by * @param coinSource The source of the loot */ - void SetCoins(int64_t newCoins, int32_t coinSource); + void SetCoins(int64_t newCoins, eLootSourceType coinSource); /** * Get the entity this character belongs to From cb9ce85bdae113fe4da07bf334fa1251800a16e7 Mon Sep 17 00:00:00 2001 From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:37:53 -0800 Subject: [PATCH 16/18] Update dGame/Character.cpp Co-authored-by: Xiphoseer --- dGame/Character.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dGame/Character.cpp b/dGame/Character.cpp index 4034a21..4383ee4 100644 --- a/dGame/Character.cpp +++ b/dGame/Character.cpp @@ -567,7 +567,7 @@ const NiPoint3& Character::GetRespawnPoint(LWOMAPID map) const return pair->second; } -void Character::SetCoins(int64_t newCoins, int32_t lootSource) { +void Character::SetCoins(int64_t newCoins, eLootSourceType lootSource) { if (newCoins < 0) { newCoins = 0; From 329d3d66b37bc4256f0953cfb9f356e28b866fba Mon Sep 17 00:00:00 2001 From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com> Date: Mon, 3 Jan 2022 22:37:58 -0800 Subject: [PATCH 17/18] Update dGame/dGameMessages/GameMessages.h Co-authored-by: Xiphoseer --- dGame/dGameMessages/GameMessages.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dGame/dGameMessages/GameMessages.h b/dGame/dGameMessages/GameMessages.h index a2182e0..0bc51c0 100644 --- a/dGame/dGameMessages/GameMessages.h +++ b/dGame/dGameMessages/GameMessages.h @@ -78,7 +78,7 @@ namespace GameMessages { void SendPlayFXEffect(const LWOOBJID& entity, int32_t effectID, const std::u16string& effectType, const std::string& name, LWOOBJID secondary = LWOOBJID_EMPTY, float priority = 1, float scale = 1, bool serialize = true); void SendStopFXEffect(Entity* entity, bool killImmediate, std::string name); void SendBroadcastTextToChatbox(Entity* entity, const SystemAddress& sysAddr, const std::u16string& attrs, const std::u16string& wsText); - void SendSetCurrency(Entity* entity, int64_t currency, int lootType, const LWOOBJID& sourceID, const LOT& sourceLOT, int sourceTradeID, bool overrideCurrent, int32_t sourceType); + void SendSetCurrency(Entity* entity, int64_t currency, int lootType, const LWOOBJID& sourceID, const LOT& sourceLOT, int sourceTradeID, bool overrideCurrent, eLootSourceType sourceType); void SendRebuildNotifyState(Entity* entity, int prevState, int state, const LWOOBJID& playerID); void SendEnableRebuild(Entity* entity, bool enable, bool fail, bool success, int failReason, float duration, const LWOOBJID& playerID); From cca5b79e9144eddd2f1b91be56d185e340428d56 Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Mon, 3 Jan 2022 23:05:56 -0800 Subject: [PATCH 18/18] Update Mission.cpp --- dGame/dMission/Mission.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dGame/dMission/Mission.cpp b/dGame/dMission/Mission.cpp index 0eb1a6b..8fadc49 100644 --- a/dGame/dMission/Mission.cpp +++ b/dGame/dMission/Mission.cpp @@ -482,7 +482,7 @@ void Mission::YieldRewards() { } if (info->reward_currency > 0) { - int32_t lootSource = info->isMission ? LOOT_SOURCE_MISSION : LOOT_SOURCE_ACHIEVEMENT; + eLootSourceType lootSource = info->isMission ? LOOT_SOURCE_MISSION : LOOT_SOURCE_ACHIEVEMENT; character->SetCoins(character->GetCoins() + info->reward_currency, lootSource); }