Better handle cultist rewards not fitting the container (#979)

Better handle rewards not fitting (they shouldn't just poof) by instead trimming the rewards amount until they fit. (cherry picked from commit 8d05bf0)
sp-tarkov · Dec 9, 2024 · b4061b3 · b4061b3
1 parent 2abf216
commit b4061b3
Showing 1 changed file with 21 additions and 20 deletions.
diff --git a/project/src/services/CircleOfCultistService.ts b/project/src/services/CircleOfCultistService.ts
@@ -124,7 +124,7 @@ export class CircleOfCultistService {
             }
         }
 
-        const rewards = hasDirectReward
+        let rewards = hasDirectReward
             ? this.getDirectRewards(sessionId, directRewardSettings, cultistCircleStashId)
             : this.getRewardsWithinBudget(
                   this.getCultistCircleRewardPool(sessionId, pmcData, craftingInfo, this.hideoutConfig.cultistCircle),
@@ -138,27 +138,28 @@ export class CircleOfCultistService {
 
         // Ensure rewards fit into container
         const containerGrid = this.inventoryHelper.getContainerSlotMap(cultistStashDbItem[1]._id);
-        const canAddToContainer = this.inventoryHelper.canPlaceItemsInContainer(
-            this.cloner.clone(containerGrid), // MUST clone grid before passing in as function modifies grid
-            rewards,
-        );
+        let canAddToContainer = false;
+        while (!canAddToContainer && rewards.length > 0) {
+            canAddToContainer = this.inventoryHelper.canPlaceItemsInContainer(
+                this.cloner.clone(containerGrid), // MUST clone grid before passing in as function modifies grid
+                rewards,
+            );
 
-        if (canAddToContainer) {
-            for (const itemToAdd of rewards) {
-                this.inventoryHelper.placeItemInContainer(
-                    containerGrid,
-                    itemToAdd,
-                    cultistCircleStashId,
-                    CircleOfCultistService.circleOfCultistSlotId,
-                );
-                // Add item + mods to output and profile inventory
-                output.profileChanges[sessionId].items.new.push(...itemToAdd);
-                pmcData.Inventory.items.push(...itemToAdd);
+            if (canAddToContainer) {
+                for (const itemToAdd of rewards) {
+                    this.inventoryHelper.placeItemInContainer(
+                        containerGrid,
+                        itemToAdd,
+                        cultistCircleStashId,
+                        CircleOfCultistService.circleOfCultistSlotId,
+                    );
+                    // Add item + mods to output and profile inventory
+                    output.profileChanges[sessionId].items.new.push(...itemToAdd);
+                    pmcData.Inventory.items.push(...itemToAdd);
+                }
+            } else {
+                rewards.pop();
             }
-        } else {
-            this.logger.error(
-                `Unable to fit all: ${rewards.length} reward items into sacrifice grid, nothing will be returned (rewards so valuable cultists stole it)`,
-            );
         }
 
         return output;