@shipload/sdk 1.0.0-next.19 → 1.0.0-next.20

package/src/data/recipes.json

@@ -1,12 +1,11 @@
 [
   {
     "outputItemId": 10001,
-    "outputMass": 420000,
+    "outputMass": 4000,
     "inputs": [
       {
-        "category": "ore",
-        "tier": 1,
-        "quantity": 20
+        "itemId": 101,
+        "quantity": 10
       }
     ],
     "statSlots": [
@@ -31,17 +30,15 @@
   },
   {
     "outputItemId": 10002,
-    "outputMass": 600000,
+    "outputMass": 6000,
     "inputs": [
       {
-        "category": "regolith",
-        "tier": 1,
-        "quantity": 30
+        "itemId": 401,
+        "quantity": 6
       },
       {
-        "category": "biomass",
-        "tier": 1,
-        "quantity": 20
+        "itemId": 501,
+        "quantity": 9
       }
     ],
     "statSlots": [
@@ -66,12 +63,11 @@
   },
   {
     "outputItemId": 10003,
-    "outputMass": 390000,
+    "outputMass": 4000,
     "inputs": [
       {
-        "category": "gas",
-        "tier": 1,
-        "quantity": 65
+        "itemId": 301,
+        "quantity": 10
       }
     ],
     "statSlots": [
@@ -96,17 +92,15 @@
   },
   {
     "outputItemId": 10004,
-    "outputMass": 600000,
+    "outputMass": 6000,
     "inputs": [
       {
-        "category": "crystal",
-        "tier": 1,
-        "quantity": 25
+        "itemId": 201,
+        "quantity": 6
       },
       {
-        "category": "biomass",
-        "tier": 1,
-        "quantity": 15
+        "itemId": 501,
+        "quantity": 9
       }
     ],
     "statSlots": [
@@ -131,17 +125,15 @@
   },
   {
     "outputItemId": 10005,
-    "outputMass": 600000,
+    "outputMass": 6000,
     "inputs": [
       {
-        "category": "ore",
-        "tier": 1,
-        "quantity": 20
+        "itemId": 101,
+        "quantity": 6
       },
       {
-        "category": "gas",
-        "tier": 1,
-        "quantity": 30
+        "itemId": 301,
+        "quantity": 9
       }
     ],
     "statSlots": [
@@ -166,12 +158,11 @@
   },
   {
     "outputItemId": 10006,
-    "outputMass": 420000,
+    "outputMass": 4000,
     "inputs": [
       {
-        "category": "crystal",
-        "tier": 1,
-        "quantity": 30
+        "itemId": 201,
+        "quantity": 10
       }
     ],
     "statSlots": [
@@ -196,12 +187,11 @@
   },
   {
     "outputItemId": 10007,
-    "outputMass": 420000,
+    "outputMass": 4000,
     "inputs": [
       {
-        "category": "biomass",
-        "tier": 1,
-        "quantity": 25
+        "itemId": 501,
+        "quantity": 10
       }
     ],
     "statSlots": [
@@ -226,12 +216,11 @@
   },
   {
     "outputItemId": 10008,
-    "outputMass": 400000,
+    "outputMass": 4000,
     "inputs": [
       {
-        "category": "regolith",
-        "tier": 1,
-        "quantity": 45
+        "itemId": 401,
+        "quantity": 10
       }
     ],
     "statSlots": [
@@ -256,17 +245,15 @@
   },
   {
     "outputItemId": 10009,
-    "outputMass": 590000,
+    "outputMass": 6000,
     "inputs": [
       {
-        "category": "gas",
-        "tier": 1,
-        "quantity": 40
+        "itemId": 301,
+        "quantity": 6
       },
       {
-        "category": "regolith",
-        "tier": 1,
-        "quantity": 40
+        "itemId": 401,
+        "quantity": 9
       }
     ],
     "statSlots": [
@@ -291,17 +278,15 @@
   },
   {
     "outputItemId": 10010,
-    "outputMass": 590000,
+    "outputMass": 6000,
     "inputs": [
       {
-        "category": "crystal",
-        "tier": 1,
-        "quantity": 20
+        "itemId": 201,
+        "quantity": 6
       },
       {
-        "category": "ore",
-        "tier": 1,
-        "quantity": 15
+        "itemId": 101,
+        "quantity": 9
       }
     ],
     "statSlots": [
@@ -326,11 +311,11 @@
   },
   {
     "outputItemId": 10100,
-    "outputMass": 940000,
+    "outputMass": 900000,
     "inputs": [
       {
         "itemId": 10003,
-        "quantity": 6
+        "quantity": 600
       }
     ],
     "statSlots": [
@@ -355,11 +340,11 @@
   },
   {
     "outputItemId": 10101,
-    "outputMass": 1440000,
+    "outputMass": 1400000,
     "inputs": [
       {
         "itemId": 10004,
-        "quantity": 6
+        "quantity": 600
       }
     ],
     "statSlots": [
@@ -384,15 +369,15 @@
   },
   {
     "outputItemId": 10102,
-    "outputMass": 1220000,
+    "outputMass": 1200000,
     "inputs": [
       {
         "itemId": 10005,
-        "quantity": 3
+        "quantity": 300
       },
       {
         "itemId": 10006,
-        "quantity": 3
+        "quantity": 300
       }
     ],
     "statSlots": [
@@ -433,11 +418,11 @@
   },
   {
     "outputItemId": 10103,
-    "outputMass": 1010000,
+    "outputMass": 1000000,
     "inputs": [
       {
         "itemId": 10007,
-        "quantity": 6
+        "quantity": 600
       }
     ],
     "statSlots": [
@@ -462,15 +447,15 @@
   },
   {
     "outputItemId": 10104,
-    "outputMass": 1190000,
+    "outputMass": 1200000,
     "inputs": [
       {
         "itemId": 10008,
-        "quantity": 3
+        "quantity": 300
       },
       {
         "itemId": 10009,
-        "quantity": 3
+        "quantity": 300
       }
     ],
     "statSlots": [
@@ -495,15 +480,15 @@
   },
   {
     "outputItemId": 10105,
-    "outputMass": 1220000,
+    "outputMass": 1200000,
     "inputs": [
       {
         "itemId": 10001,
-        "quantity": 3
+        "quantity": 300
       },
       {
         "itemId": 10002,
-        "quantity": 3
+        "quantity": 300
       }
     ],
     "statSlots": [
@@ -544,15 +529,15 @@
   },
   {
     "outputItemId": 10106,
-    "outputMass": 1430000,
+    "outputMass": 1400000,
     "inputs": [
       {
         "itemId": 10004,
-        "quantity": 3
+        "quantity": 300
       },
       {
         "itemId": 10010,
-        "quantity": 3
+        "quantity": 300
       }
     ],
     "statSlots": [
@@ -585,15 +570,15 @@
   },
   {
     "outputItemId": 10107,
-    "outputMass": 1420000,
+    "outputMass": 1400000,
     "inputs": [
       {
         "itemId": 10010,
-        "quantity": 3
+        "quantity": 300
       },
       {
         "itemId": 10009,
-        "quantity": 3
+        "quantity": 300
       }
     ],
     "statSlots": [
@@ -617,15 +602,15 @@
   },
   {
     "outputItemId": 10108,
-    "outputMass": 970000,
+    "outputMass": 1000000,
     "inputs": [
       {
         "itemId": 10003,
-        "quantity": 3
+        "quantity": 300
       },
       {
         "itemId": 10007,
-        "quantity": 3
+        "quantity": 300
       }
     ],
     "statSlots": [
@@ -666,15 +651,15 @@
   },
   {
     "outputItemId": 10200,
-    "outputMass": 1490000,
+    "outputMass": 1500000,
     "inputs": [
       {
         "itemId": 10001,
-        "quantity": 6
+        "quantity": 600
       },
       {
         "itemId": 10002,
-        "quantity": 2
+        "quantity": 200
       }
     ],
     "statSlots": [
@@ -719,11 +704,11 @@
     "inputs": [
       {
         "itemId": 10001,
-        "quantity": 8
+        "quantity": 800
       },
       {
         "itemId": 10002,
-        "quantity": 4
+        "quantity": 400
       }
     ],
     "statSlots": [
@@ -764,15 +749,15 @@
   },
   {
     "outputItemId": 10202,
-    "outputMass": 5760000,
+    "outputMass": 5800000,
     "inputs": [
       {
         "itemId": 10001,
-        "quantity": 20
+        "quantity": 2000
       },
       {
         "itemId": 10002,
-        "quantity": 10
+        "quantity": 1000
       }
     ],
     "statSlots": [
@@ -813,15 +798,15 @@
   },
   {
     "outputItemId": 10203,
-    "outputMass": 4440000,
+    "outputMass": 4400000,
     "inputs": [
       {
         "itemId": 10001,
-        "quantity": 15
+        "quantity": 1500
       },
       {
         "itemId": 10002,
-        "quantity": 8
+        "quantity": 800
       }
     ],
     "statSlots": [
@@ -862,23 +847,23 @@
   },
   {
     "outputItemId": 10204,
-    "outputMass": 5540000,
+    "outputMass": 5500000,
     "inputs": [
       {
         "itemId": 10001,
-        "quantity": 15
+        "quantity": 1500
       },
       {
         "itemId": 10002,
-        "quantity": 6
+        "quantity": 600
       },
       {
         "itemId": 10008,
-        "quantity": 4
+        "quantity": 400
       },
       {
         "itemId": 10009,
-        "quantity": 4
+        "quantity": 400
       }
     ],
     "statSlots": [
@@ -919,15 +904,14 @@
   },
   {
     "outputItemId": 20001,
-    "outputMass": 50000,
+    "outputMass": 500,
     "inputs": [
       {
         "itemId": 10001,
-        "quantity": 2
+        "quantity": 200
       },
       {
-        "category": "ore",
-        "tier": 2,
+        "itemId": 102,
         "quantity": 15
       }
     ],
@@ -964,20 +948,18 @@
   },
   {
     "outputItemId": 20002,
-    "outputMass": 30000,
+    "outputMass": 300,
     "inputs": [
       {
         "itemId": 10002,
-        "quantity": 2
+        "quantity": 200
       },
       {
-        "category": "regolith",
-        "tier": 2,
+        "itemId": 402,
         "quantity": 10
       },
       {
-        "category": "biomass",
-        "tier": 2,
+        "itemId": 502,
         "quantity": 20
       }
     ],
@@ -1019,11 +1001,11 @@
     "inputs": [
       {
         "itemId": 20001,
-        "quantity": 6
+        "quantity": 600
       },
       {
         "itemId": 20002,
-        "quantity": 2
+        "quantity": 200
       }
     ],
     "statSlots": [

package/src/derivation/capabilities.ts

@@ -10,7 +10,7 @@ export function computeShipHullCapabilities(stats: Record<string, number>): {
     const exponent = statSum / 2997.0
     return {
         hullmass: computeBaseHullmass(stats),
-        capacity: Math.floor(5000000 * 10 ** exponent),
+        capacity: Math.floor(5000000 * 6 ** exponent),
     }
 }
 
@@ -212,7 +212,7 @@ export function computeWarehouseHullCapabilities(stats: Record<string, number>):
     const exponent = statSum / 2997.0
     return {
         hullmass: computeBaseHullmass(stats),
-        capacity: Math.floor(100000000 * 10 ** exponent),
+        capacity: Math.floor(100000000 * 6 ** exponent),
     }
 }
 
@@ -391,7 +391,7 @@ export function computeContainerCapabilities(stats: Record<string, number>): {
     const exponent = statSum / 2997.0
     return {
         hullmass: computeBaseHullmass(stats),
-        capacity: Math.floor(20000000 * 10 ** exponent),
+        capacity: Math.floor(22000000 * 6 ** exponent),
     }
 }
 
@@ -407,8 +407,8 @@ export function computeContainerT2Capabilities(stats: Record<string, number>): {
     const hullmass = 70000 - 50 * density
 
     const statSum = strength + hardness + saturation
-    const exponent = statSum / 2500
-    const capacity = Math.floor(40000000 * 10 ** exponent)
+    const exponent = statSum / 2947
+    const capacity = Math.floor(24000000 * 6 ** exponent)
 
     return {hullmass, capacity}
 }

package/src/derivation/capability-mappings.ts

@@ -1,11 +1,7 @@
 import {SLOT_FORMULAS, type SlotConsumerKind} from '../data/capability-formulas'
 import {getStatDefinitions, type StatDefinition} from './stats'
-import {
-    getRecipe,
-    type Recipe,
-    type RecipeInput,
-    type RecipeInputCategory,
-} from '../data/recipes-runtime'
+import {getRecipe, type Recipe} from '../data/recipes-runtime'
+import {getItem} from '../data/catalog'
 import {
     ITEM_ENGINE_T1,
     ITEM_EXTRACTOR_T1_PACKED,
@@ -41,10 +37,6 @@ export const KIND_TO_ITEM_ID: Record<SlotConsumerKind, number> = {
     'container-t2': ITEM_CONTAINER_T2_PACKED,
 }
 
-function isCategoryInput(input: RecipeInput): input is RecipeInputCategory {
-    return 'category' in input
-}
-
 /**
  * Walk a recipe's slot source down to the raw category stat that ultimately
  * lands in that slot. Returns the StatDefinition or undefined if the trace
@@ -60,8 +52,9 @@ function traceToRawCategoryStat(
 ): StatDefinition | undefined {
     const input = recipe.inputs[source.inputIndex]
     if (!input) return undefined
-    if (isCategoryInput(input)) {
-        const defs = getStatDefinitions(input.category)
+    const inputItem = getItem(input.itemId)
+    if (inputItem.type === 'resource' && inputItem.category) {
+        const defs = getStatDefinitions(inputItem.category)
         return defs[source.statIndex]
     }
     if (visited.has(input.itemId)) return undefined

package/src/derivation/crafting.ts

@@ -1,6 +1,6 @@
 import {UInt64} from '@wharfkit/antelope'
 import type {ResourceCategory} from '../types'
-import {findItemByCategoryAndTier, getRecipe, type Recipe} from '../data/recipes-runtime'
+import {getRecipe, type Recipe} from '../data/recipes-runtime'
 import {getItem} from '../data/catalog'
 import {getStatDefinitions} from './stats'
 import {deriveResourceStats} from './stratum'
@@ -58,11 +58,8 @@ function keyForStatSlot(
 function keyForRecipeInputStat(recipe: Recipe, inputIndex: number, statIndex: number): string {
     const input = recipe.inputs[inputIndex]
     if (!input) return ''
-    if ('category' in input) {
-        const defs = getStatDefinitions(input.category)
-        return defs[statIndex]?.key ?? ''
-    }
-    // itemId-typed input — its stats follow that item's own statSlots layout.
+    // Every input names an item by id; its stats follow that item's own layout
+    // (resource stat definitions for resources, statSlots for crafted items).
     const innerKeys = getItemStatKeys(input.itemId)
     return innerKeys[statIndex] ?? ''
 }
@@ -117,10 +114,11 @@ export function computeComponentStats(
         const src = slot.sources[0]
         const key = keyForStatSlot(recipe, slot)
         const input = src ? recipe.inputs[src.inputIndex] : undefined
-        if (!input || !('category' in input)) {
+        const inputItem = input ? getItem(input.itemId) : undefined
+        if (!inputItem || inputItem.type !== 'resource' || !inputItem.category) {
             return {key, value: Math.max(1, Math.min(999, 0))}
         }
-        const matching = categoryStacks.find((cs) => cs.category === input.category)
+        const matching = categoryStacks.find((cs) => cs.category === inputItem.category)
         const value = matching ? blendStacks(matching.stacks, key) : 0
         return {key, value: Math.max(1, Math.min(999, value))}
     })
@@ -147,7 +145,7 @@ export function computeEntityStats(
         const key = keyForStatSlot(recipe, slot)
         if (!src) return {key, value: 1}
         const input = recipe.inputs[src.inputIndex]
-        if (!input || 'category' in input) {
+        if (!input) {
             return {key, value: 1}
         }
         const blended = blendedByComponent[input.itemId] ?? {}
@@ -185,12 +183,7 @@ export function computeInputMass(itemId: number): number {
 
     let total = 0
     for (const input of recipe.inputs) {
-        if ('itemId' in input) {
-            total += getItem(input.itemId).mass * input.quantity
-        } else {
-            const item = findItemByCategoryAndTier(input.category, input.tier)
-            total += item.mass * input.quantity
-        }
+        total += getItem(input.itemId).mass * input.quantity
     }
     return total
 }
@@ -305,10 +298,13 @@ export function computeCraftedOutputStats(
             const key = keyForRecipeInputStat(recipe, src.inputIndex, src.statIndex)
             const input = recipe.inputs[src.inputIndex]
             let value = 0
-            if (input && 'category' in input) {
-                value = blendStacks(decodedByCategory[input.category] ?? [], key)
-            } else if (input) {
-                value = blendedByItem[input.itemId]?.[key] ?? 0
+            if (input) {
+                const inputItem = getItem(input.itemId)
+                if (inputItem.type === 'resource' && inputItem.category) {
+                    value = blendStacks(decodedByCategory[inputItem.category] ?? [], key)
+                } else {
+                    value = blendedByItem[input.itemId]?.[key] ?? 0
+                }
             }
             out.push(Math.max(1, Math.min(999, value)))
         } else {
@@ -319,10 +315,13 @@ export function computeCraftedOutputStats(
                 const input = recipe.inputs[src.inputIndex]
                 const weight = recipe.blendWeights[src.inputIndex] ?? 1
                 let value = 0
-                if (input && 'category' in input) {
-                    value = blendStacks(decodedByCategory[input.category] ?? [], key)
-                } else if (input) {
-                    value = blendedByItem[input.itemId]?.[key] ?? 0
+                if (input) {
+                    const inputItem = getItem(input.itemId)
+                    if (inputItem.type === 'resource' && inputItem.category) {
+                        value = blendStacks(decodedByCategory[inputItem.category] ?? [], key)
+                    } else {
+                        value = blendedByItem[input.itemId]?.[key] ?? 0
+                    }
                 }
                 weightedSum += value * weight
                 totalWeight += weight