@shipload/sdk 1.0.0-next.71 → 1.0.0-next.73

package/src/data/recipes.json

@@ -861,161 +861,6 @@
     ],
     "blendWeights": []
   },
-  {
-    "outputItemId": 10202,
-    "outputMass": 32000,
-    "inputs": [
-      {
-        "itemId": 10001,
-        "quantity": 1000
-      },
-      {
-        "itemId": 10008,
-        "quantity": 1000
-      }
-    ],
-    "statSlots": [
-      {
-        "sources": [
-          {
-            "inputIndex": 0,
-            "statIndex": 0
-          }
-        ]
-      },
-      {
-        "sources": [
-          {
-            "inputIndex": 0,
-            "statIndex": 1
-          }
-        ]
-      },
-      {
-        "sources": [
-          {
-            "inputIndex": 1,
-            "statIndex": 0
-          }
-        ]
-      },
-      {
-        "sources": [
-          {
-            "inputIndex": 1,
-            "statIndex": 1
-          }
-        ]
-      }
-    ],
-    "blendWeights": []
-  },
-  {
-    "outputItemId": 10203,
-    "outputMass": 19000,
-    "inputs": [
-      {
-        "itemId": 10008,
-        "quantity": 600
-      },
-      {
-        "itemId": 10006,
-        "quantity": 600
-      }
-    ],
-    "statSlots": [
-      {
-        "sources": []
-      },
-      {
-        "sources": [
-          {
-            "inputIndex": 0,
-            "statIndex": 1
-          }
-        ]
-      },
-      {
-        "sources": [
-          {
-            "inputIndex": 0,
-            "statIndex": 0
-          }
-        ]
-      },
-      {
-        "sources": []
-      }
-    ],
-    "blendWeights": []
-  },
-  {
-    "outputItemId": 10204,
-    "outputMass": 19000,
-    "inputs": [
-      {
-        "itemId": 10008,
-        "quantity": 600
-      },
-      {
-        "itemId": 10007,
-        "quantity": 600
-      }
-    ],
-    "statSlots": [
-      {
-        "sources": []
-      },
-      {
-        "sources": [
-          {
-            "inputIndex": 0,
-            "statIndex": 1
-          }
-        ]
-      },
-      {
-        "sources": [
-          {
-            "inputIndex": 0,
-            "statIndex": 0
-          }
-        ]
-      },
-      {
-        "sources": []
-      }
-    ],
-    "blendWeights": []
-  },
-  {
-    "outputItemId": 10207,
-    "outputMass": 24000,
-    "inputs": [
-      {
-        "itemId": 10005,
-        "quantity": 200
-      },
-      {
-        "itemId": 10010,
-        "quantity": 200
-      }
-    ],
-    "statSlots": [
-      {
-        "sources": []
-      },
-      {
-        "sources": [
-          {
-            "inputIndex": 1,
-            "statIndex": 1
-          }
-        ]
-      }
-    ],
-    "blendWeights": []
-  },
   {
     "outputItemId": 10210,
     "outputMass": 16000,
@@ -2615,6 +2460,200 @@
     "blendWeights": [],
     "sourceSubclass": 10200
   },
+  {
+    "outputItemId": 11202,
+    "outputMass": 51200,
+    "inputs": [
+      {
+        "itemId": 11001,
+        "quantity": 1000
+      },
+      {
+        "itemId": 11008,
+        "quantity": 1000
+      }
+    ],
+    "statSlots": [
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 0
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 1
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 1,
+            "statIndex": 0
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 1,
+            "statIndex": 1
+          }
+        ]
+      }
+    ],
+    "blendWeights": []
+  },
+  {
+    "outputItemId": 11203,
+    "outputMass": 30400,
+    "inputs": [
+      {
+        "itemId": 11008,
+        "quantity": 600
+      },
+      {
+        "itemId": 11006,
+        "quantity": 600
+      }
+    ],
+    "statSlots": [
+      {
+        "sources": []
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 1
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 0
+          }
+        ]
+      },
+      {
+        "sources": []
+      }
+    ],
+    "blendWeights": []
+  },
+  {
+    "outputItemId": 11204,
+    "outputMass": 30400,
+    "inputs": [
+      {
+        "itemId": 11008,
+        "quantity": 600
+      },
+      {
+        "itemId": 11007,
+        "quantity": 600
+      }
+    ],
+    "statSlots": [
+      {
+        "sources": []
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 1
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 0
+          }
+        ]
+      },
+      {
+        "sources": []
+      }
+    ],
+    "blendWeights": []
+  },
+  {
+    "outputItemId": 11207,
+    "outputMass": 38400,
+    "inputs": [
+      {
+        "itemId": 11005,
+        "quantity": 200
+      },
+      {
+        "itemId": 11010,
+        "quantity": 200
+      }
+    ],
+    "statSlots": [
+      {
+        "sources": []
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 1,
+            "statIndex": 1
+          }
+        ]
+      }
+    ],
+    "blendWeights": []
+  },
+  {
+    "outputItemId": 11209,
+    "outputMass": 30400,
+    "inputs": [
+      {
+        "itemId": 11001,
+        "quantity": 600
+      },
+      {
+        "itemId": 11003,
+        "quantity": 600
+      }
+    ],
+    "statSlots": [
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 0
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 1
+          }
+        ]
+      },
+      {
+        "sources": []
+      },
+      {
+        "sources": []
+      }
+    ],
+    "blendWeights": []
+  },
   {
     "outputItemId": 11212,
     "outputMass": 43200,

package/src/data/task-types.json

@@ -0,0 +1,184 @@
+{
+  "types": [
+    {
+      "type": 0,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 1,
+      "positionBound": false,
+      "mobility": true,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 2,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 3,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 4,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": true,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 5,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 6,
+      "positionBound": false,
+      "mobility": true,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 7,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": true,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 9,
+      "positionBound": false,
+      "mobility": true,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 10,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 11,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": true,
+      "capsPlan": true,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 12,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 13,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": true,
+      "capsPlan": true,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 15,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 16,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 17,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": true,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 18,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": true
+    },
+    {
+      "type": 20,
+      "positionBound": false,
+      "mobility": false,
+      "consumer": true,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 21,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": true,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": false
+    },
+    {
+      "type": 22,
+      "positionBound": true,
+      "mobility": false,
+      "consumer": false,
+      "isTerminal": false,
+      "capsPlan": false,
+      "cargoEffectResolve": false
+    }
+  ]
+}

package/src/derivation/build-methods.test.ts

@@ -11,8 +11,8 @@ import {
 import {getRecipe} from '../data/recipes-runtime'
 import {
     ITEM_DEPOT_T1_PACKED,
-    ITEM_HUB_T1_PACKED,
-    ITEM_WAREHOUSE_T1_PACKED,
+    ITEM_HUB_T2_PACKED,
+    ITEM_WAREHOUSE_T2_PACKED,
     ITEM_WORKSHOP_T1_PACKED,
 } from '../data/item-ids'
 
@@ -30,11 +30,11 @@ function planetaryStructures(): {itemId: number; capabilityFlags: number}[] {
 
 describe('availableBuildMethods', () => {
     test('orbital structures build via craft+deploy or plot', () => {
-        expect(availableBuildMethods(ITEM_WAREHOUSE_T1_PACKED)).toEqual(['craft+deploy', 'plot'])
+        expect(availableBuildMethods(ITEM_WAREHOUSE_T2_PACKED)).toEqual(['craft+deploy', 'plot'])
     })
 
     test('hub is craft+deploy only — excluded from the plot path', () => {
-        expect(availableBuildMethods(ITEM_HUB_T1_PACKED)).toEqual(['craft+deploy'])
+        expect(availableBuildMethods(ITEM_HUB_T2_PACKED)).toEqual(['craft+deploy'])
     })
 
     test('planetary structures are charter-granted and carry no build method', () => {

package/src/derivation/capabilities.test.ts

@@ -10,6 +10,7 @@ import {
     computeLoaderCapabilities,
     computeBaseCapacity,
     computeContainerCapabilities,
+    applyCapacityTier,
     GATHERER_YIELD_TIER_TABLE,
     ENGINE_THRUST_TIER_PCT,
     GENERATOR_CAPACITY_TIER_PCT,
@@ -30,10 +31,11 @@ import {
     computeLoaderThrust,
 } from '../nft/description'
 import {applySlotMultiplier, U16_MAX} from '../entities/slot-multiplier'
+import {getItem} from '../data/catalog'
 import {encodeStats} from './crafting'
 import {
-    ITEM_EXTRACTOR_T1_PACKED,
-    ITEM_FACTORY_T1_PACKED,
+    ITEM_EXTRACTOR_T2_PACKED,
+    ITEM_FACTORY_T2_PACKED,
     ITEM_MASS_DRIVER_T1_PACKED,
     ITEM_MASS_CATCHER_T1_PACKED,
     ITEM_GATHERER_T1,
@@ -74,14 +76,16 @@ function makeBuilderStats(resonance: number, fineness: number): bigint {
 
 test('computeBaseCapacity uses container formula for all container-class entities', () => {
     const stats = {strength: 300, hardness: 400, density: 100}
-    const expected = computeContainerCapabilities(stats).capacity
+    const base = computeContainerCapabilities(stats).capacity
     for (const itemId of [
-        ITEM_EXTRACTOR_T1_PACKED,
-        ITEM_FACTORY_T1_PACKED,
+        ITEM_EXTRACTOR_T2_PACKED,
+        ITEM_FACTORY_T2_PACKED,
         ITEM_MASS_DRIVER_T1_PACKED,
         ITEM_MASS_CATCHER_T1_PACKED,
     ]) {
-        expect(computeBaseCapacity(itemId, stats)).toBe(expected)
+        expect(computeBaseCapacity(itemId, stats)).toBe(
+            applyCapacityTier(base, getItem(itemId).tier)
+        )
     }
 })
 
@@ -117,7 +121,7 @@ test('computeEntityCapabilities emits gathererLanes alongside legacy gatherer su
         {type: 'gatherer', outputPct: 100, maxTier: 1},
     ]
 
-    const result = computeEntityCapabilities({}, ITEM_EXTRACTOR_T1_PACKED, modules, layout)
+    const result = computeEntityCapabilities({}, ITEM_EXTRACTOR_T2_PACKED, modules, layout)
 
     // Lane lists must exist
     expect(result.gathererLanes).toBeDefined()
@@ -160,7 +164,7 @@ test('computeEntityCapabilities emits crafterLanes alongside legacy crafter sum'
 
     const layout: EntitySlot[] = [{type: 'crafter', outputPct: 120, maxTier: 1}]
 
-    const result = computeEntityCapabilities({}, ITEM_EXTRACTOR_T1_PACKED, modules, layout)
+    const result = computeEntityCapabilities({}, ITEM_EXTRACTOR_T2_PACKED, modules, layout)
 
     expect(result.crafterLanes).toBeDefined()
     expect(result.crafterLanes!.length).toBe(1)
@@ -189,7 +193,7 @@ test('computeEntityCapabilities emits a Builder lane from resonance and fineness
         {slotIndex: 0, itemId: ITEM_BUILDER_T1, stats: makeBuilderStats(500, 330)},
     ]
     const layout: EntitySlot[] = [{type: 'builder', outputPct: 80, maxTier: 1}]
-    const result = computeEntityCapabilities({}, ITEM_EXTRACTOR_T1_PACKED, modules, layout)
+    const result = computeEntityCapabilities({}, ITEM_EXTRACTOR_T2_PACKED, modules, layout)
 
     expect(result.builderLanes).toEqual([{slotIndex: 0, speed: 400, drain: 20_000, outputPct: 80}])
     expect(result.builder).toEqual({speed: 400, drain: 20_000})
@@ -202,7 +206,7 @@ test('computeEntityCapabilities emits loaderLanes alongside legacy loaders sum',
 
     const layout: EntitySlot[] = [{type: 'loader', outputPct: 80, maxTier: 1}]
 
-    const result = computeEntityCapabilities({}, ITEM_EXTRACTOR_T1_PACKED, modules, layout)
+    const result = computeEntityCapabilities({}, ITEM_EXTRACTOR_T2_PACKED, modules, layout)
 
     expect(result.loaderLanes).toBeDefined()
     expect(result.loaderLanes!.length).toBe(1)

package/src/derivation/capabilities.ts

@@ -1,6 +1,7 @@
 import {getEntityLayout} from '../data/recipes-runtime'
 import {ENTITY_SHIP, getPackedEntityType} from '../data/kind-registry'
 import {computeEffectiveModuleStat} from './stat-scaling'
+import {resolveCapacityFnName, type CapacityFnName} from './capacity-fn-registry'
 
 export const DEFAULT_BASE_HULLMASS = 1_000
 
@@ -235,7 +236,7 @@ import {
     ITEM_CONTAINER_T1_PACKED,
     ITEM_DEPOT_T1_PACKED,
     ITEM_SHIP_T1_PACKED,
-    ITEM_WAREHOUSE_T1_PACKED,
+    ITEM_WAREHOUSE_T2_PACKED,
     ITEM_WORKSHOP_T1_PACKED,
 } from '../data/item-ids'
 import {
@@ -314,15 +315,12 @@ 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> = {
+const CAPACITY_FN_BY_NAME: Partial<
+    Record<CapacityFnName, (stats: Record<string, number>) => number>
+> = {
     warehouse: (stats) => computeWarehouseHullCapabilities(stats).capacity,
     depot: (stats) => computeDepotHullCapabilities(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,
 }
 
@@ -331,8 +329,8 @@ export function computeBaseCapacity(itemId: number, stats: Record<string, number
     if (isShipHull(itemId)) {
         base = computeShipHullCapabilities(stats, itemId).capacity
     } else {
-        const kind = getPackedEntityType(itemId)
-        const capacityFn = kind ? BASE_CAPACITY_FN_BY_KIND[kind.toString()] : undefined
+        const fnName = resolveCapacityFnName(itemId)
+        const capacityFn = fnName ? CAPACITY_FN_BY_NAME[fnName] : undefined
         if (!capacityFn) return 0
         base = capacityFn(stats)
     }
@@ -358,7 +356,7 @@ export function computeWarehouseHullCapabilities(stats: Record<string, number>):
     const statSum = (stats.strength ?? 0) + (stats.hardness ?? 0)
     const exponent = statSum / 1998.0
     return {
-        hullmass: computeBaseHullmass(ITEM_WAREHOUSE_T1_PACKED, stats),
+        hullmass: computeBaseHullmass(ITEM_WAREHOUSE_T2_PACKED, stats),
         capacity: Math.floor(1000000 * 6 ** exponent),
     }
 }