Hideout production:

- fixed item not being added to inventory after production completed, - refactored singleProductionStart()
Make-Tarkov-Great-Again · Jan 10, 2023 · 18de7d0 · 18de7d0
1 parent b3c7d27
commit 18de7d0
Showing 1 changed file with 35 additions and 41 deletions.
diff --git a/lib/controllers/HideoutController.js b/lib/controllers/HideoutController.js
@@ -309,55 +309,49 @@ class HideoutController {
         let allItemsTaken = true;
         for (const itemToTake of moveAction.items) {
             const itemTaken = await playerProfile.character.removeItem(itemToTake.id, itemToTake.count);
-            if (itemTaken) {
-                if (typeof itemTaken.changed !== "undefined") {
-                    output.items.change = output.items.change.concat(itemTaken.changed);
-                }
+            if (!itemTaken) {
+                await logger.error(`[singleProductionStart] Starting hideout production for recepie with Id ${moveAction.recipeId} failed. Unable to take required items.`);
+                return false;
+            }
+            if (typeof itemTaken.changed !== "undefined") {
+                output.items.change = output.items.change.concat(itemTaken.changed);
+            }
 
-                if (typeof itemTaken.removed !== "undefined") {
-                    output.items.del = output.items.del.concat(itemTaken.removed);
-                }
-            } else {
-                allItemsTaken = false;
+            if (typeof itemTaken.removed !== "undefined") {
+                output.items.del = output.items.del.concat(itemTaken.removed);
             }
         }
 
-        if (allItemsTaken) {
-            let productionTime = 0;
+        let productionTime = 0;
 
-            if (typeof hideoutProductionTemplate.ProductionTime !== "undefined") {
-                productionTime = hideoutProductionTemplate.ProductionTime;
-            } else if (typeof hideoutProductionTemplate.productionTime !== "undefined") {
-                productionTime = hideoutProductionTemplate.productionTime;
-            }
+        if (typeof hideoutProductionTemplate.ProductionTime !== "undefined") {
+            productionTime = hideoutProductionTemplate.ProductionTime;
+        } else if (typeof hideoutProductionTemplate.productionTime !== "undefined") {
+            productionTime = hideoutProductionTemplate.productionTime;
+        }
 
-            if (!hideoutProductionTemplate.count) {
-                hideoutProductionTemplate.count = 1;
-            }
+        if (!hideoutProductionTemplate.count) {
+            hideoutProductionTemplate.count = 1;
+        }
 
-            const productId = await generateMongoID();
-            const products = [{
-                _id: productId,
-                _tpl: hideoutProductionTemplate.endProduct,
-                count: hideoutProductionTemplate.count
-            }];
+        const productId = await generateMongoID();
+        const products = [{
+            _id: productId,
+            _tpl: hideoutProductionTemplate.endProduct,
+            count: hideoutProductionTemplate.count
+        }];
 
-            playerProfile.character.Hideout.Production[hideoutProductionTemplate._id] = {
-                Progress: 0,
-                inProgress: true,
-                Products: products,
-                RecipeId: moveAction.recepieId,
-                SkipTime: 0,
-                ProductionTime: Number(productionTime),
-                StartTimestamp: await getCurrentTimestamp()
-            };
+        playerProfile.character.Hideout.Production[hideoutProductionTemplate._id] = {
+            Progress: 0,
+            inProgress: true,
+            Products: products,
+            RecipeId: moveAction.recepieId,
+            SkipTime: 0,
+            ProductionTime: Number(productionTime),
+            StartTimestamp: await getCurrentTimestamp()
+        };
 
-            return output;
-        } else {
-            // How do return custom error to client!!1!1!!!111!elf?
-            await logger.error(`[singleProductionStart] Starting hideout production for recepie with Id ${moveAction.recipeId} failed. Unable to take required items.`);
-            return false;
-        }
+        return output;
     }
 
     static async continuousProductionStart(moveAction = null, playerProfile = null) {
@@ -443,7 +437,7 @@ class HideoutController {
                 product.count = 1;
             }
             const itemTemplate = await Item.get(product._tpl);
-            const container = playerProfile.character.getInventoryItemByID(await playerProfile.character.getStashContainer());
+            const container = await playerProfile.character.getInventoryItemByID(await playerProfile.character.getStashContainer());
             if (await Preset.itemHasPreset(itemTemplate._id)) {
                 const itemPresets = await Preset.getPresetsForItem(itemTemplate._id);
                 const itemPreset = Object.values(itemPresets).find(preset => preset._encyclopedia);