@shipload/sdk 1.0.0-next.60 → 1.0.0-next.61

package/src/data/recipes.json

@@ -1016,6 +1016,54 @@
     ],
     "blendWeights": []
   },
+  {
+    "outputItemId": 10208,
+    "outputMass": 4800000,
+    "inputs": [
+      {
+        "itemId": 10006,
+        "quantity": 1000
+      },
+      {
+        "itemId": 10003,
+        "quantity": 1000
+      },
+      {
+        "itemId": 10007,
+        "quantity": 1000
+      }
+    ],
+    "statSlots": [
+      {
+        "sources": []
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 1,
+            "statIndex": 0
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 0
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 2,
+            "statIndex": 0
+          }
+        ]
+      }
+    ],
+    "blendWeights": []
+  },
   {
     "outputItemId": 10209,
     "outputMass": 1900000,
@@ -1689,7 +1737,7 @@
     "sourceSubclass": 10210
   },
   {
-    "outputItemId": 20001,
+    "outputItemId": 11001,
     "outputMass": 4800,
     "inputs": [
       {
@@ -1726,7 +1774,7 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20002,
+    "outputItemId": 11002,
     "outputMass": 4800,
     "inputs": [
       {
@@ -1775,7 +1823,7 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20003,
+    "outputItemId": 11003,
     "outputMass": 4800,
     "inputs": [
       {
@@ -1812,7 +1860,7 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20004,
+    "outputItemId": 11004,
     "outputMass": 4800,
     "inputs": [
       {
@@ -1853,7 +1901,7 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20005,
+    "outputItemId": 11005,
     "outputMass": 4800,
     "inputs": [
       {
@@ -1894,7 +1942,7 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20006,
+    "outputItemId": 11006,
     "outputMass": 4800,
     "inputs": [
       {
@@ -1931,7 +1979,7 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20007,
+    "outputItemId": 11007,
     "outputMass": 4800,
     "inputs": [
       {
@@ -1968,7 +2016,7 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20008,
+    "outputItemId": 11008,
     "outputMass": 4800,
     "inputs": [
       {
@@ -1997,7 +2045,7 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20009,
+    "outputItemId": 11009,
     "outputMass": 4800,
     "inputs": [
       {
@@ -2046,7 +2094,7 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20010,
+    "outputItemId": 11010,
     "outputMass": 4800,
     "inputs": [
       {
@@ -2087,11 +2135,11 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20100,
+    "outputItemId": 11100,
     "outputMass": 1536000,
     "inputs": [
       {
-        "itemId": 20003,
+        "itemId": 11003,
         "quantity": 600
       },
       {
@@ -2128,11 +2176,11 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20101,
+    "outputItemId": 11101,
     "outputMass": 1536000,
     "inputs": [
       {
-        "itemId": 20004,
+        "itemId": 11004,
         "quantity": 600
       },
       {
@@ -2169,15 +2217,15 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20102,
+    "outputItemId": 11102,
     "outputMass": 1536000,
     "inputs": [
       {
-        "itemId": 20005,
+        "itemId": 11005,
         "quantity": 300
       },
       {
-        "itemId": 20002,
+        "itemId": 11002,
         "quantity": 300
       },
       {
@@ -2226,11 +2274,11 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20103,
+    "outputItemId": 11103,
     "outputMass": 1536000,
     "inputs": [
       {
-        "itemId": 20007,
+        "itemId": 11007,
         "quantity": 600
       },
       {
@@ -2267,15 +2315,15 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20104,
+    "outputItemId": 11104,
     "outputMass": 1536000,
     "inputs": [
       {
-        "itemId": 20009,
+        "itemId": 11009,
         "quantity": 300
       },
       {
-        "itemId": 20006,
+        "itemId": 11006,
         "quantity": 300
       },
       {
@@ -2312,15 +2360,84 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20106,
+    "outputItemId": 11105,
+    "outputMass": 1536000,
+    "inputs": [
+      {
+        "itemId": 11001,
+        "quantity": 300
+      },
+      {
+        "itemId": 11002,
+        "quantity": 300
+      },
+      {
+        "itemId": 10105,
+        "quantity": 1
+      }
+    ],
+    "statSlots": [
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 0
+          },
+          {
+            "inputIndex": 2,
+            "statIndex": 0
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 1
+          },
+          {
+            "inputIndex": 2,
+            "statIndex": 1
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 1,
+            "statIndex": 0
+          },
+          {
+            "inputIndex": 2,
+            "statIndex": 2
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 1,
+            "statIndex": 1
+          },
+          {
+            "inputIndex": 2,
+            "statIndex": 3
+          }
+        ]
+      }
+    ],
+    "blendWeights": []
+  },
+  {
+    "outputItemId": 11106,
     "outputMass": 1536000,
     "inputs": [
       {
-        "itemId": 20004,
+        "itemId": 11004,
         "quantity": 300
       },
       {
-        "itemId": 20010,
+        "itemId": 11010,
         "quantity": 300
       },
       {
@@ -2369,15 +2486,15 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20107,
+    "outputItemId": 11107,
     "outputMass": 1536000,
     "inputs": [
       {
-        "itemId": 20004,
+        "itemId": 11004,
         "quantity": 300
       },
       {
-        "itemId": 20009,
+        "itemId": 11009,
         "quantity": 300
       },
       {
@@ -2402,15 +2519,84 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20110,
+    "outputItemId": 11108,
+    "outputMass": 1536000,
+    "inputs": [
+      {
+        "itemId": 11003,
+        "quantity": 300
+      },
+      {
+        "itemId": 11007,
+        "quantity": 300
+      },
+      {
+        "itemId": 10108,
+        "quantity": 1
+      }
+    ],
+    "statSlots": [
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 0
+          },
+          {
+            "inputIndex": 2,
+            "statIndex": 0
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 1
+          },
+          {
+            "inputIndex": 2,
+            "statIndex": 1
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 1,
+            "statIndex": 0
+          },
+          {
+            "inputIndex": 2,
+            "statIndex": 2
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 1,
+            "statIndex": 1
+          },
+          {
+            "inputIndex": 2,
+            "statIndex": 3
+          }
+        ]
+      }
+    ],
+    "blendWeights": []
+  },
+  {
+    "outputItemId": 11110,
     "outputMass": 1536000,
     "inputs": [
       {
-        "itemId": 20006,
+        "itemId": 11006,
         "quantity": 300
       },
       {
-        "itemId": 20008,
+        "itemId": 11008,
         "quantity": 300
       },
       {
@@ -2447,15 +2633,15 @@
     "blendWeights": []
   },
   {
-    "outputItemId": 20200,
+    "outputItemId": 11200,
     "outputMass": 3100000,
     "inputs": [
       {
-        "itemId": 20001,
+        "itemId": 11001,
         "quantity": 600
       },
       {
-        "itemId": 20008,
+        "itemId": 11008,
         "quantity": 600
       },
       {
@@ -2517,27 +2703,27 @@
     "sourceSubclass": 10200
   },
   {
-    "outputItemId": 20212,
+    "outputItemId": 11212,
     "outputMass": 4320000,
     "inputs": [
       {
-        "itemId": 20001,
+        "itemId": 11001,
         "quantity": 200
       },
       {
-        "itemId": 20008,
+        "itemId": 11008,
         "quantity": 200
       },
       {
-        "itemId": 20007,
+        "itemId": 11007,
         "quantity": 200
       },
       {
-        "itemId": 20003,
+        "itemId": 11003,
         "quantity": 200
       },
       {
-        "itemId": 20006,
+        "itemId": 11006,
         "quantity": 200
       },
       {
@@ -2611,31 +2797,31 @@
     "sourceSubclass": 10211
   },
   {
-    "outputItemId": 20213,
+    "outputItemId": 11213,
     "outputMass": 5760000,
     "inputs": [
       {
-        "itemId": 20005,
+        "itemId": 11005,
         "quantity": 150
       },
       {
-        "itemId": 20002,
+        "itemId": 11002,
         "quantity": 150
       },
       {
-        "itemId": 20010,
+        "itemId": 11010,
         "quantity": 150
       },
       {
-        "itemId": 20009,
+        "itemId": 11009,
         "quantity": 150
       },
       {
-        "itemId": 20004,
+        "itemId": 11004,
         "quantity": 150
       },
       {
-        "itemId": 20212,
+        "itemId": 11212,
         "quantity": 1
       }
     ],
@@ -2702,34 +2888,34 @@
       }
     ],
     "blendWeights": [],
-    "sourceSubclass": 20212
+    "sourceSubclass": 11212
   },
   {
-    "outputItemId": 20214,
+    "outputItemId": 11214,
     "outputMass": 5760000,
     "inputs": [
       {
-        "itemId": 20005,
+        "itemId": 11005,
         "quantity": 150
       },
       {
-        "itemId": 20002,
+        "itemId": 11002,
         "quantity": 150
       },
       {
-        "itemId": 20010,
+        "itemId": 11010,
         "quantity": 150
       },
       {
-        "itemId": 20009,
+        "itemId": 11009,
         "quantity": 150
       },
       {
-        "itemId": 20004,
+        "itemId": 11004,
         "quantity": 150
       },
       {
-        "itemId": 20212,
+        "itemId": 11212,
         "quantity": 1
       }
     ],
@@ -2796,6 +2982,6 @@
       }
     ],
     "blendWeights": [],
-    "sourceSubclass": 20212
+    "sourceSubclass": 11212
   }
 ]

package/src/data/tiers.ts

@@ -18,17 +18,20 @@ export function itemTypeCode(id: number): number {
     }
 }
 
+const CRAFTED_BASE = 10000
+const TIER_STRIDE = 1000
+
 export function itemTier(id: number): number {
-    if (id < 10000) return 0
-    return Math.floor(id / 10000)
+    if (id < CRAFTED_BASE) return 0
+    return Math.floor((id - CRAFTED_BASE) / TIER_STRIDE) + 1
 }
 
 export function itemOffset(id: number): number {
-    return id % 10000
+    return id % TIER_STRIDE
 }
 
 export function itemCategory(id: number): CraftedItemCategory {
-    if (id < 10000) return 'resource'
+    if (id < CRAFTED_BASE) return 'resource'
     const offset = itemOffset(id)
     if (offset >= 200) return 'entity'
     if (offset >= 100) return 'module'
@@ -36,10 +39,10 @@ export function itemCategory(id: number): CraftedItemCategory {
 }
 
 export function isRelatedItem(a: number, b: number): boolean {
-    if (a < 10000 || b < 10000) return false
+    if (a < CRAFTED_BASE || b < CRAFTED_BASE) return false
     return itemOffset(a) === itemOffset(b)
 }
 
 export function isCraftedItem(id: number): boolean {
-    return id >= 10000
+    return id >= CRAFTED_BASE
 }

package/src/derivation/capabilities.ts

@@ -207,32 +207,32 @@ export function computeStorageCapabilities(
         capacity: computeCargoBayCapacity(
             stats.strength ?? 0,
             stats.density ?? 0,
-            stats.hardness ?? 0
+            stats.hardness ?? 0,
+            tier
         ),
         drain: computeCargoBayDrain(stats.cohesion ?? 0, tier),
     }
 }
 
-export function computeBatteryCapabilities(stats: Record<string, number>): {
+export function computeBatteryCapabilities(
+    stats: Record<string, number>,
+    tier: number
+): {
     capacity: number
 } {
-    const volatility = stats.volatility ?? 0
-    const thermal = stats.thermal ?? 0
-    const plasticity = stats.plasticity ?? 0
-    const insulation = stats.insulation ?? 0
-
-    const statSum = volatility + thermal + plasticity + insulation
-    return {capacity: 2_500_000 + Math.floor((statSum * 7_500_000) / 3996)}
+    return {
+        capacity: computeBatteryBankCapacity(
+            stats.volatility ?? 0,
+            stats.thermal ?? 0,
+            stats.plasticity ?? 0,
+            stats.insulation ?? 0,
+            tier
+        ),
+    }
 }
 
 import {
     ITEM_CONTAINER_T1_PACKED,
-    ITEM_CONTAINER_T2_PACKED,
-    ITEM_CONSTRUCTION_DOCK_T1_PACKED,
-    ITEM_EXTRACTOR_T1_PACKED,
-    ITEM_FACTORY_T1_PACKED,
-    ITEM_MASS_CATCHER_T1_PACKED,
-    ITEM_MASS_DRIVER_T1_PACKED,
     ITEM_SHIP_T1_PACKED,
     ITEM_WAREHOUSE_T1_PACKED,
     ITEM_WORKSHOP_T1_PACKED,
@@ -265,6 +265,7 @@ import type {EntitySlot} from '../data/recipes-runtime'
 import {
     computeCargoBayCapacity,
     computeCargoBayDrain,
+    computeBatteryBankCapacity,
     computeHaulerCapacity,
     computeHaulerDrain,
     computeTravelDrain,
@@ -296,6 +297,10 @@ export const CRAFTER_SPEED_TIER_PCT = [100, 120, 140, 160, 180, 200, 220, 240, 2
 export const BUILDER_SPEED_TIER_PCT = [100, 120, 140, 160, 180, 200, 220, 240, 260, 280] as const
 export const WARP_RANGE_TIER_PCT = [100, 120, 140, 160, 180, 200, 220, 240, 260, 280] as const
 export const LOADER_THRUST_TIER_PCT = [100, 120, 140, 160, 180, 200, 220, 240, 260, 280] as const
+export const CARGO_BAY_CAPACITY_TIER_PCT = [
+    100, 110, 120, 130, 140, 150, 160, 170, 180, 190,
+] as const
+export const BATTERY_CAPACITY_TIER_PCT = [100, 110, 120, 130, 140, 150, 160, 170, 180, 190] as const
 
 export function moduleTierPct(table: readonly number[], tier: number): number {
     const clamped = Math.min(Math.max(tier, 1), MODULE_MAX_TIER)
@@ -308,30 +313,26 @@ export function computeGathererYield(str: number, tier: number): number {
     return Math.floor(((200 + str) * pct) / 100)
 }
 
+const BASE_CAPACITY_FN_BY_KIND: Record<string, (stats: Record<string, number>) => number> = {
+    warehouse: (stats) => computeWarehouseHullCapabilities(stats).capacity,
+    workshop: (stats) => computeWorkshopHullCapabilities(stats).capacity,
+    extractor: (stats) => computeContainerCapabilities(stats).capacity,
+    factory: (stats) => computeContainerCapabilities(stats).capacity,
+    builddock: (stats) => computeContainerCapabilities(stats).capacity,
+    mdriver: (stats) => computeContainerCapabilities(stats).capacity,
+    mcatcher: (stats) => computeContainerCapabilities(stats).capacity,
+    container: (stats) => computeContainerCapabilities(stats).capacity,
+}
+
 export function computeBaseCapacity(itemId: number, stats: Record<string, number>): number {
     let base: number
     if (isShipHull(itemId)) {
         base = computeShipHullCapabilities(stats, itemId).capacity
     } else {
-        switch (itemId) {
-            case ITEM_EXTRACTOR_T1_PACKED:
-            case ITEM_FACTORY_T1_PACKED:
-            case ITEM_CONSTRUCTION_DOCK_T1_PACKED:
-            case ITEM_MASS_DRIVER_T1_PACKED:
-            case ITEM_MASS_CATCHER_T1_PACKED:
-            case ITEM_CONTAINER_T1_PACKED:
-            case ITEM_CONTAINER_T2_PACKED:
-                base = computeContainerCapabilities(stats).capacity
-                break
-            case ITEM_WAREHOUSE_T1_PACKED:
-                base = computeWarehouseHullCapabilities(stats).capacity
-                break
-            case ITEM_WORKSHOP_T1_PACKED:
-                base = computeWorkshopHullCapabilities(stats).capacity
-                break
-            default:
-                return 0
-        }
+        const kind = getPackedEntityType(itemId)
+        const capacityFn = kind ? BASE_CAPACITY_FN_BY_KIND[kind.toString()] : undefined
+        if (!capacityFn) return 0
+        base = capacityFn(stats)
     }
     return applyCapacityTier(base, getItem(itemId).tier)
 }
@@ -597,7 +598,7 @@ export function computeEntityCapabilities(
             totalLauncherVelocity = clampUint16(totalLauncherVelocity + caps.velocity)
             totalLauncherDrain = clampUint16(totalLauncherDrain + caps.drain)
         } else if (modType === MODULE_BATTERY) {
-            const caps = computeBatteryCapabilities(decodedStats)
+            const caps = computeBatteryCapabilities(decodedStats, item.tier)
             totalBatteryCapacity += applySlotMultiplierUint32(caps.capacity, amp)
         }
     }