Pass the random generator through an argument to inventory_changer::item_generator::generateItemFromContainer()

Author: danielkrupinski

Source/InventoryChanger/Backend/Request/ItemActivationHandler.h

@@ -53,7 +53,8 @@ class ItemActivationHandler {
     {
         assert(container->gameItem().isCrate() && key->gameItem().isCaseKey());
 
-        auto generatedItem = item_generator::generateItemFromContainer(gameItemLookup, crateLootLookup, *container, std::to_address(key));
+        Helpers::RandomGenerator randomGenerator;
+        auto generatedItem = item_generator::generateItemFromContainer(randomGenerator, gameItemLookup, crateLootLookup, *container, std::to_address(key));
         if (!generatedItem.has_value())
             return;
 
@@ -67,7 +68,8 @@ class ItemActivationHandler {
     {
         assert(container->gameItem().isCrate());
 
-        auto generatedItem = item_generator::generateItemFromContainer(gameItemLookup, crateLootLookup, *container, nullptr);
+        Helpers::RandomGenerator randomGenerator;
+        auto generatedItem = item_generator::generateItemFromContainer(randomGenerator, gameItemLookup, crateLootLookup, *container, nullptr);
         if (!generatedItem.has_value())
             return;
 

Source/InventoryChanger/Backend/Request/XRayScannerHandler.h

@@ -18,7 +18,8 @@ class XRayScannerHandler {
     {
         assert(crate->gameItem().isCrate());
 
-        auto generatedItem = item_generator::generateItemFromContainer(gameItemLookup, crateLootLookup, *crate, nullptr);
+        Helpers::RandomGenerator randomGenerator;
+        auto generatedItem = item_generator::generateItemFromContainer(randomGenerator, gameItemLookup, crateLootLookup, *crate, nullptr);
         if (!generatedItem.has_value())
             return;
 

Source/InventoryChanger/ItemGenerator/ItemGenerator.cpp

@@ -860,7 +860,7 @@ namespace inventory_changer::item_generator
 namespace inventory_changer::item_generator
 {
 
-std::optional<inventory::Item> generateItemFromContainer(const game_items::Lookup& gameItemLookup, const game_items::CrateLootLookup& crateLootLookup, const inventory::Item& caseItem, const inventory::Item* crateKey) noexcept
+std::optional<inventory::Item> generateItemFromContainer(Helpers::RandomGenerator& randomGenerator, const game_items::Lookup& gameItemLookup, const game_items::CrateLootLookup& crateLootLookup, const inventory::Item& caseItem, const inventory::Item* crateKey) noexcept
 {
     assert(caseItem.gameItem().isCrate());
 
@@ -869,7 +869,6 @@ std::optional<inventory::Item> generateItemFromContainer(const game_items::Looku
     if (!lootList)
         return std::nullopt;
 
-    Helpers::RandomGenerator randomGenerator{};
     const auto& unlockedItem = getRandomItemFromContainer(randomGenerator, gameItemLookup, crateLootLookup, caseItem.gameItem().getWeaponID(), *lootList);
     DropGenerator dropGenerator{ gameItemLookup, AttributeGenerator{ randomGenerator } };
     return inventory::Item{ unlockedItem, { dropGenerator.createCommonProperties(crateKey), dropGenerator.createVariantProperties(unlockedItem, caseItem, lootList->willProduceStatTrak) } };

Source/InventoryChanger/ItemGenerator/ItemGenerator.h

@@ -12,7 +12,7 @@
 
 namespace inventory_changer::item_generator
 {
-    [[nodiscard]] std::optional<inventory::Item> generateItemFromContainer(const game_items::Lookup& gameItemLookup, const game_items::CrateLootLookup& crateLootLookup, const inventory::Item& caseItem, const inventory::Item* crateKey) noexcept;
+    [[nodiscard]] std::optional<inventory::Item> generateItemFromContainer(Helpers::RandomGenerator& randomGenerator, const game_items::Lookup& gameItemLookup, const game_items::CrateLootLookup& crateLootLookup, const inventory::Item& caseItem, const inventory::Item* crateKey) noexcept;
     inventory::Item::Properties createDefaultItemProperties(Helpers::RandomGenerator& randomGenerator, const game_items::Storage& gameItemStorage, const game_items::Item& item) noexcept;
 }