@shipload/sdk 1.0.0-next.56 → 1.0.0-next.59

package/src/data/recipes.json

@@ -1595,125 +1595,31 @@
     "sourceSubclass": 10210
   },
   {
-    "outputItemId": 10216,
-    "outputMass": 3600000,
-    "inputs": [
-      {
-        "itemId": 10005,
-        "quantity": 150
-      },
-      {
-        "itemId": 10002,
-        "quantity": 150
-      },
-      {
-        "itemId": 10010,
-        "quantity": 150
-      },
-      {
-        "itemId": 10009,
-        "quantity": 150
-      },
-      {
-        "itemId": 10004,
-        "quantity": 150
-      },
-      {
-        "itemId": 10211,
-        "quantity": 1
-      }
-    ],
-    "statSlots": [
-      {
-        "sources": [
-          {
-            "inputIndex": 0,
-            "statIndex": 0
-          },
-          {
-            "inputIndex": 5,
-            "statIndex": 0
-          }
-        ]
-      },
-      {
-        "sources": [
-          {
-            "inputIndex": 1,
-            "statIndex": 0
-          },
-          {
-            "inputIndex": 5,
-            "statIndex": 1
-          }
-        ]
-      },
-      {
-        "sources": [
-          {
-            "inputIndex": 2,
-            "statIndex": 0
-          },
-          {
-            "inputIndex": 5,
-            "statIndex": 2
-          }
-        ]
-      },
-      {
-        "sources": [
-          {
-            "inputIndex": 3,
-            "statIndex": 0
-          },
-          {
-            "inputIndex": 5,
-            "statIndex": 3
-          }
-        ]
-      },
-      {
-        "sources": [
-          {
-            "inputIndex": 4,
-            "statIndex": 0
-          },
-          {
-            "inputIndex": 5,
-            "statIndex": 4
-          }
-        ]
-      }
-    ],
-    "blendWeights": [],
-    "sourceSubclass": 10211
-  },
-  {
-    "outputItemId": 10217,
-    "outputMass": 3600000,
+    "outputItemId": 10218,
+    "outputMass": 2400000,
     "inputs": [
       {
         "itemId": 10005,
-        "quantity": 150
+        "quantity": 100
       },
       {
         "itemId": 10002,
-        "quantity": 150
+        "quantity": 100
       },
       {
         "itemId": 10010,
-        "quantity": 150
+        "quantity": 100
       },
       {
         "itemId": 10009,
-        "quantity": 150
+        "quantity": 100
       },
       {
         "itemId": 10004,
-        "quantity": 150
+        "quantity": 100
       },
       {
-        "itemId": 10211,
+        "itemId": 10210,
         "quantity": 1
       }
     ],
@@ -1780,7 +1686,7 @@
       }
     ],
     "blendWeights": [],
-    "sourceSubclass": 10211
+    "sourceSubclass": 10210
   },
   {
     "outputItemId": 20001,
@@ -2365,8 +2271,102 @@
     "sourceSubclass": 10200
   },
   {
-    "outputItemId": 20210,
-    "outputMass": 3840000,
+    "outputItemId": 20212,
+    "outputMass": 4320000,
+    "inputs": [
+      {
+        "itemId": 20001,
+        "quantity": 200
+      },
+      {
+        "itemId": 20008,
+        "quantity": 200
+      },
+      {
+        "itemId": 20007,
+        "quantity": 200
+      },
+      {
+        "itemId": 20003,
+        "quantity": 200
+      },
+      {
+        "itemId": 20006,
+        "quantity": 200
+      },
+      {
+        "itemId": 10211,
+        "quantity": 1
+      }
+    ],
+    "statSlots": [
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 0
+          },
+          {
+            "inputIndex": 5,
+            "statIndex": 0
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 1,
+            "statIndex": 0
+          },
+          {
+            "inputIndex": 5,
+            "statIndex": 1
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 2,
+            "statIndex": 0
+          },
+          {
+            "inputIndex": 5,
+            "statIndex": 2
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 3,
+            "statIndex": 0
+          },
+          {
+            "inputIndex": 5,
+            "statIndex": 3
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 4,
+            "statIndex": 0
+          },
+          {
+            "inputIndex": 5,
+            "statIndex": 4
+          }
+        ]
+      }
+    ],
+    "blendWeights": [],
+    "sourceSubclass": 10211
+  },
+  {
+    "outputItemId": 20213,
+    "outputMass": 5760000,
     "inputs": [
       {
         "itemId": 20005,
@@ -2389,7 +2389,7 @@
         "quantity": 150
       },
       {
-        "itemId": 10211,
+        "itemId": 20212,
         "quantity": 1
       }
     ],
@@ -2456,11 +2456,11 @@
       }
     ],
     "blendWeights": [],
-    "sourceSubclass": 10211
+    "sourceSubclass": 20212
   },
   {
-    "outputItemId": 20211,
-    "outputMass": 3840000,
+    "outputItemId": 20214,
+    "outputMass": 5760000,
     "inputs": [
       {
         "itemId": 20005,
@@ -2483,7 +2483,7 @@
         "quantity": 150
       },
       {
-        "itemId": 10214,
+        "itemId": 20212,
         "quantity": 1
       }
     ],
@@ -2550,6 +2550,6 @@
       }
     ],
     "blendWeights": [],
-    "sourceSubclass": 10214
+    "sourceSubclass": 20212
   }
 ]

package/src/derivation/capabilities.test.ts

@@ -21,14 +21,13 @@ import {
     ITEM_CRAFTER_T1,
     ITEM_LOADER_T1,
     ITEM_SHIP_T1_PACKED,
-    ITEM_ROUSTABOUT_T1_PACKED,
-    ITEM_PROSPECTOR_T1_PACKED,
-    ITEM_TENDER_T1_PACKED,
-    ITEM_TUG_T1_PACKED,
-    ITEM_PORTER_T1_PACKED,
-    ITEM_WRANGLER_T1_PACKED,
-    ITEM_DREDGER_T1_PACKED,
-    ITEM_WRIGHT_T1_PACKED,
+    ITEM_ROUSTABOUT_T1A_PACKED,
+    ITEM_PROSPECTOR_T1A_PACKED,
+    ITEM_TENDER_T1A_PACKED,
+    ITEM_TUG_T1A_PACKED,
+    ITEM_PORTER_T1A_PACKED,
+    ITEM_SMITH_T1A_PACKED,
+    ITEM_WRIGHT_T1A_PACKED,
     ITEM_ENGINE_T1,
     ITEM_GENERATOR_T1,
     ITEM_BUILDER_T1,
@@ -72,14 +71,13 @@ test('computeBaseCapacity uses ship-hull formula for every ship-class entity', (
     const expected = computeBaseCapacity(ITEM_SHIP_T1_PACKED, stats)
     expect(expected).toBeGreaterThan(0)
     for (const itemId of [
-        ITEM_ROUSTABOUT_T1_PACKED,
-        ITEM_PROSPECTOR_T1_PACKED,
-        ITEM_TENDER_T1_PACKED,
-        ITEM_TUG_T1_PACKED,
-        ITEM_PORTER_T1_PACKED,
-        ITEM_WRANGLER_T1_PACKED,
-        ITEM_DREDGER_T1_PACKED,
-        ITEM_WRIGHT_T1_PACKED,
+        ITEM_ROUSTABOUT_T1A_PACKED,
+        ITEM_PROSPECTOR_T1A_PACKED,
+        ITEM_TENDER_T1A_PACKED,
+        ITEM_TUG_T1A_PACKED,
+        ITEM_PORTER_T1A_PACKED,
+        ITEM_SMITH_T1A_PACKED,
+        ITEM_WRIGHT_T1A_PACKED,
     ]) {
         expect(computeBaseCapacity(itemId, stats)).toBe(expected)
     }
@@ -223,7 +221,7 @@ test('engine and generator capabilities use tapered quality consistently', () =>
         {type: 'generator', outputPct: 100, maxTier: 1},
     ]
 
-    const result = computeEntityCapabilities({}, ITEM_ROUSTABOUT_T1_PACKED, modules, layout)
+    const result = computeEntityCapabilities({}, ITEM_ROUSTABOUT_T1A_PACKED, modules, layout)
     const engines = computeEngineCapabilities({volatility: 500, thermal: 500})
 
     expect(result.engines).toEqual({

package/src/derivation/crafting.test.ts

@@ -0,0 +1,17 @@
+import {describe, expect, test} from 'bun:test'
+import {usedInputStatKeys} from './crafting'
+import {ITEM_BUILDER_T1} from '../data/item-ids'
+
+describe('usedInputStatKeys', () => {
+    test('maps each input to the stat keys the blend actually consumes', () => {
+        // Ceramic.hardness feeds the output's resonance slot; a name match would miss it.
+        expect(usedInputStatKeys(ITEM_BUILDER_T1)).toEqual([
+            ['resonance'],
+            ['hardness', 'fineness'],
+        ])
+    })
+
+    test('returns an empty array for an unknown recipe', () => {
+        expect(usedInputStatKeys(999999)).toEqual([])
+    })
+})

package/src/derivation/crafting.ts

@@ -66,6 +66,24 @@ function keyForRecipeInputStat(recipe: Recipe, inputIndex: number, statIndex: nu
     return innerKeys[statIndex] ?? ''
 }
 
+export function usedInputStatKeys(outputItemId: number): string[][] {
+    const recipe = getRecipe(outputItemId)
+    if (!recipe) return []
+    const usedIdx = recipe.inputs.map(() => new Set<number>())
+    for (const slot of recipe.statSlots) {
+        for (const src of slot.sources) {
+            usedIdx[src.inputIndex]?.add(src.statIndex)
+        }
+    }
+    return recipe.inputs.map((input, i) => {
+        const keys = getItemStatKeys(input.itemId)
+        return [...usedIdx[i]]
+            .sort((a, b) => a - b)
+            .map((idx) => keys[idx] ?? '')
+            .filter(Boolean)
+    })
+}
+
 export function decodeCraftedItemStats(itemId: number, stats: bigint): Record<string, number> {
     const keys = getItemStatKeys(itemId)
     const result: Record<string, number> = {}

package/src/derivation/recipe-usage.test.ts

@@ -15,13 +15,11 @@ import {
     ITEM_CRAFTER_T1,
     ITEM_BUILDER_T1,
     ITEM_EXTRACTOR_T1_PACKED,
-    ITEM_ROUSTABOUT_T1_PACKED,
-    ITEM_PROSPECTOR_T1_PACKED,
-    ITEM_TENDER_T1_PACKED,
-    ITEM_TUG_T1_PACKED,
-    ITEM_PORTER_T1_PACKED,
-    ITEM_WRANGLER_T1_PACKED,
-    ITEM_DREDGER_T1_PACKED,
+    ITEM_ROUSTABOUT_T1A_PACKED,
+    ITEM_PROSPECTOR_T1A_PACKED,
+    ITEM_TENDER_T1A_PACKED,
+    ITEM_TUG_T1A_PACKED,
+    ITEM_PORTER_T1A_PACKED,
 } from '../data/item-ids'
 
 test('getAllRecipes returns the full catalog including the gatherer', () => {
@@ -38,7 +36,7 @@ test('getRecipeConsumers lists every recipe that consumes Sensor', () => {
             ITEM_CRAFTER_T1,
             ITEM_BUILDER_T1,
             ITEM_EXTRACTOR_T1_PACKED,
-            ITEM_ROUSTABOUT_T1_PACKED,
+            ITEM_ROUSTABOUT_T1A_PACKED,
         ].sort((a, b) => a - b)
     )
 })
@@ -82,9 +80,9 @@ test('getResourceDemand scales by quantity', () => {
     expect(getResourceDemand(ITEM_PLATE, 3)).toEqual({ore: 30})
 })
 
-test('getComponentDemand reports Resin as consumed by nine recipes', () => {
+test('getComponentDemand reports Resin as consumed by eight recipes', () => {
     const demand = getComponentDemand()
     const resin = demand.find((d) => d.itemId === ITEM_RESIN)
     expect(resin).toBeDefined()
-    expect(resin?.consumerCount).toBe(9)
+    expect(resin?.consumerCount).toBe(8)
 })

package/src/index-module.ts

@@ -319,7 +319,11 @@ export {
     availableForItem,
     cargoReadyAt,
     taskCargoEffect,
+    calcCounterpartDelivery,
+    cargoKey,
+    cargoInputKey,
 } from './scheduling/availability'
+export type {CargoInput, IncomingSource} from './scheduling/availability'
 
 export {maxCraftable} from './capabilities/craftable'
 
@@ -412,6 +416,7 @@ export {
     decodeStat,
     decodeStats,
     decodeCraftedItemStats,
+    usedInputStatKeys,
     blendStacks,
     computeComponentStats,
     blendComponentStacks,

package/src/nft/description.ts

@@ -23,23 +23,23 @@ import {
     ITEM_GATHERER_T1,
     ITEM_GATHERER_T2,
     ITEM_GENERATOR_T1,
-    ITEM_HAULER_SHIP_T2_PACKED,
     ITEM_HAULER_T1,
     ITEM_HAULER_T2,
     ITEM_BATTERY_T1,
     ITEM_LAUNCHER_T1,
     ITEM_LOADER_T1,
-    ITEM_PROSPECTOR_T1_PACKED,
-    ITEM_PROSPECTOR_T2_PACKED,
-    ITEM_ROUSTABOUT_T1_PACKED,
+    ITEM_PROSPECTOR_T1A_PACKED,
+    ITEM_PROSPECTOR_T2A_PACKED,
+    ITEM_PROSPECTOR_T2B_PACKED,
+    ITEM_ROUSTABOUT_T1A_PACKED,
     ITEM_SHIP_T1_PACKED,
+    ITEM_SMITH_T1A_PACKED,
     ITEM_STORAGE_T1,
-    ITEM_TENDER_T1_PACKED,
-    ITEM_TUG_T1_PACKED,
-    ITEM_PORTER_T1_PACKED,
-    ITEM_WRANGLER_T1_PACKED,
-    ITEM_WRIGHT_T1_PACKED,
-    ITEM_DREDGER_T1_PACKED,
+    ITEM_TENDER_T1A_PACKED,
+    ITEM_TUG_T1A_PACKED,
+    ITEM_PORTER_T1A_PACKED,
+    ITEM_WRIGHT_T1A_PACKED,
+    ITEM_DREDGER_T2A_PACKED,
     ITEM_WAREHOUSE_T1_PACKED,
     ITEM_WARP_T1,
 } from '../data/item-ids'
@@ -149,22 +149,20 @@ export function entityDisplayName(itemId: number): string {
     switch (itemId) {
         case ITEM_SHIP_T1_PACKED:
             return 'Ship'
-        case ITEM_ROUSTABOUT_T1_PACKED:
+        case ITEM_ROUSTABOUT_T1A_PACKED:
             return 'Roustabout'
-        case ITEM_PROSPECTOR_T1_PACKED:
+        case ITEM_PROSPECTOR_T1A_PACKED:
             return 'Prospector'
-        case ITEM_TENDER_T1_PACKED:
+        case ITEM_TENDER_T1A_PACKED:
             return 'Tender'
-        case ITEM_TUG_T1_PACKED:
+        case ITEM_TUG_T1A_PACKED:
             return 'Tug'
-        case ITEM_PORTER_T1_PACKED:
+        case ITEM_PORTER_T1A_PACKED:
             return 'Porter'
-        case ITEM_WRANGLER_T1_PACKED:
-            return 'Wrangler'
-        case ITEM_WRIGHT_T1_PACKED:
+        case ITEM_WRIGHT_T1A_PACKED:
             return 'Wright'
-        case ITEM_DREDGER_T1_PACKED:
-            return 'Dredger'
+        case ITEM_SMITH_T1A_PACKED:
+            return 'Smith'
         case ITEM_WAREHOUSE_T1_PACKED:
             return 'Warehouse'
         case ITEM_EXTRACTOR_T1_PACKED:
@@ -177,10 +175,12 @@ export function entityDisplayName(itemId: number): string {
             return 'Container'
         case ITEM_CONTAINER_T2_PACKED:
             return 'Container'
-        case ITEM_PROSPECTOR_T2_PACKED:
+        case ITEM_PROSPECTOR_T2A_PACKED:
             return 'Prospector'
-        case ITEM_HAULER_SHIP_T2_PACKED:
-            return 'Tug'
+        case ITEM_PROSPECTOR_T2B_PACKED:
+            return 'Prospector'
+        case ITEM_DREDGER_T2A_PACKED:
+            return 'Dredger'
         default:
             return 'Entity'
     }

package/src/resolution/resolve-item.ts

@@ -8,6 +8,7 @@ import {entityMetadata, itemMetadata} from '../data/metadata'
 import {
     getModuleCapabilityType,
     isModuleItem,
+    MODULE_BUILDER,
     MODULE_CRAFTER,
     MODULE_ENGINE,
     MODULE_BATTERY,
@@ -21,6 +22,7 @@ import {decodeCraftedItemStats, decodeStat} from '../derivation/crafting'
 import {getStatDefinitions} from '../derivation/stats'
 import {
     computeCrafterCapabilities,
+    computeBuilderCapabilities,
     computeBatteryCapabilities,
     computeEngineCapabilities,
     computeGathererCapabilities,
@@ -210,6 +212,16 @@ function computeCapabilityGroup(
                 ],
             }
         }
+        case MODULE_BUILDER: {
+            const caps = computeBuilderCapabilities(stats)
+            return {
+                capability: 'Build',
+                attributes: [
+                    {label: 'Speed', value: caps.speed},
+                    {label: 'Drain', value: toWholeEnergy(caps.drain)},
+                ],
+            }
+        }
         case MODULE_HAULER: {
             const caps = computeHaulerCapabilities(stats, tier)
             return {