From 9940024a0130f6eebe24d76f03c066a8eac74d8d Mon Sep 17 00:00:00 2001
From: Sainan <63328889+Sainan@users.noreply.github.com>
Date: Wed, 16 Apr 2025 10:39:01 -0700
Subject: [PATCH] fix: put acquired house version railjack armaments into raw
 salvage (#1685)

Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/1685
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
---
 package-lock.json                |  8 ++++----
 package.json                     |  2 +-
 src/services/inventoryService.ts | 25 +++++++++++++++++++++----
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e84d1c57..081c89a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "morgan": "^1.10.0",
         "ncp": "^2.0.0",
         "typescript": "^5.5",
-        "warframe-public-export-plus": "^0.5.55",
+        "warframe-public-export-plus": "^0.5.56",
         "warframe-riven-info": "^0.1.2",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"
@@ -3789,9 +3789,9 @@
       }
     },
     "node_modules/warframe-public-export-plus": {
-      "version": "0.5.55",
-      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.55.tgz",
-      "integrity": "sha512-Gnd4FCBVuxm2xWGfu8xxxqPIPSnnTqiEWlpP3rsFpVlQs09RNFnW2PEX9rCZt0f3SvHBv5ssDDrFlzgBHS1yrA=="
+      "version": "0.5.56",
+      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.56.tgz",
+      "integrity": "sha512-px+J7tUm6fkSzwKkvL73ySQReDq9oM1UrHSLM3vbYGBvELM892iBgPYG45okIhScCSdwmmXTiWZTf4x/I4qiNQ=="
     },
     "node_modules/warframe-riven-info": {
       "version": "0.1.2",
diff --git a/package.json b/package.json
index 58b231d3..afcbe580 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "morgan": "^1.10.0",
     "ncp": "^2.0.0",
     "typescript": "^5.5",
-    "warframe-public-export-plus": "^0.5.55",
+    "warframe-public-export-plus": "^0.5.56",
     "warframe-riven-info": "^0.1.2",
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0"
diff --git a/src/services/inventoryService.ts b/src/services/inventoryService.ts
index 391f40ae..71dfa9d1 100644
--- a/src/services/inventoryService.ts
+++ b/src/services/inventoryService.ts
@@ -539,10 +539,27 @@ export const addItem = async (
         }
     }
     if (typeName in ExportRailjackWeapons) {
-        return {
-            ...addEquipment(inventory, ExportRailjackWeapons[typeName].productCategory, typeName),
-            ...occupySlot(inventory, InventorySlot.RJ_COMPONENT_AND_ARMAMENTS, premiumPurchase)
-        };
+        const meta = ExportRailjackWeapons[typeName];
+        if (meta.defaultUpgrades?.length) {
+            // House versions need to be identified to get stats so put them into raw salvage first.
+            const rawSalvageChanges = [
+                {
+                    ItemType: typeName,
+                    ItemCount: quantity
+                }
+            ];
+            addCrewShipRawSalvage(inventory, rawSalvageChanges);
+            return { CrewShipRawSalvage: rawSalvageChanges };
+        } else {
+            // Sigma versions can be added directly.
+            if (quantity != 1) {
+                throw new Error(`unexpected acquisition quantity of CrewShipWeapon: got ${quantity}, expected 1`);
+            }
+            return {
+                ...addEquipment(inventory, meta.productCategory, typeName),
+                ...occupySlot(inventory, InventorySlot.RJ_COMPONENT_AND_ARMAMENTS, premiumPurchase)
+            };
+        }
     }
     if (typeName in ExportMisc.creditBundles) {
         const creditsTotal = ExportMisc.creditBundles[typeName] * quantity;