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

package/src/derivation/crafting.ts

@@ -187,7 +187,7 @@ function legacyEntityIdToItemId(id: string): number {
         case 'warehouse-t1':
             return 10202
         case 'container-t2':
-            return 20200
+            return 11200
         default:
             return 0
     }

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

@@ -15,6 +15,7 @@ import {
     ITEM_CRAFTER_T1,
     ITEM_BUILDER_T1,
     ITEM_EXTRACTOR_T1_PACKED,
+    ITEM_WORKSHOP_T1_PACKED,
     ITEM_ROUSTABOUT_T1A_PACKED,
     ITEM_PROSPECTOR_T1A_PACKED,
     ITEM_TENDER_T1A_PACKED,
@@ -36,6 +37,7 @@ test('getRecipeConsumers lists every recipe that consumes Sensor', () => {
             ITEM_CRAFTER_T1,
             ITEM_BUILDER_T1,
             ITEM_EXTRACTOR_T1_PACKED,
+            ITEM_WORKSHOP_T1_PACKED,
             ITEM_ROUSTABOUT_T1A_PACKED,
         ].sort((a, b) => a - b)
     )

package/src/nft/buildImmutableData.ts

@@ -285,7 +285,7 @@ export function buildModuleImmutable(
             base.push({first: 'cohesion', second: ['uint16', com]})
             base.push({
                 first: 'capacity',
-                second: ['uint32', computeCargoBayCapacity(str, den, hrd)],
+                second: ['uint32', computeCargoBayCapacity(str, den, hrd, item.tier)],
             })
             base.push({
                 first: 'drain',
@@ -304,7 +304,10 @@ export function buildModuleImmutable(
             base.push({first: 'insulation', second: ['uint16', ins]})
             base.push({
                 first: 'capacity',
-                second: ['uint32', toWholeEnergy(computeBatteryBankCapacity(vol, thm, pla, ins))],
+                second: [
+                    'uint32',
+                    toWholeEnergy(computeBatteryBankCapacity(vol, thm, pla, ins, item.tier)),
+                ],
             })
             break
         }

package/src/nft/description.ts

@@ -11,44 +11,7 @@ import {
     MODULE_STORAGE,
     MODULE_WARP,
 } from '../capabilities/modules'
-import {
-    ITEM_CONTAINER_T1_PACKED,
-    ITEM_CONTAINER_T2_PACKED,
-    ITEM_CONSTRUCTION_DOCK_T1_PACKED,
-    ITEM_BUILDER_T1,
-    ITEM_BUILDER_T2,
-    ITEM_CRAFTER_T1,
-    ITEM_CRAFTER_T2,
-    ITEM_ENGINE_T1,
-    ITEM_ENGINE_T2,
-    ITEM_EXTRACTOR_T1_PACKED,
-    ITEM_FACTORY_T1_PACKED,
-    ITEM_GATHERER_T1,
-    ITEM_GATHERER_T2,
-    ITEM_GENERATOR_T1,
-    ITEM_GENERATOR_T2,
-    ITEM_HAULER_T1,
-    ITEM_HAULER_T2,
-    ITEM_BATTERY_T1,
-    ITEM_LAUNCHER_T1,
-    ITEM_LOADER_T1,
-    ITEM_LOADER_T2,
-    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_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,
-    ITEM_WARP_T2,
-} from '../data/item-ids'
+import {getKindMeta, getTemplateMeta} from '../data/kind-registry'
 import {decodeStat} from '../derivation/crafting'
 import {
     gathererDepthForTier,
@@ -61,8 +24,11 @@ import {
     BUILDER_SPEED_TIER_PCT,
     WARP_RANGE_TIER_PCT,
     LOADER_THRUST_TIER_PCT,
+    CARGO_BAY_CAPACITY_TIER_PCT,
+    BATTERY_CAPACITY_TIER_PCT,
 } from '../derivation/capabilities'
-import {getItem} from '../data/catalog'
+import {getItem, tryGetItem} from '../data/catalog'
+import type {ModuleType} from '../types'
 import {ENTITY_SHIP, getPackedEntityType} from '../data/kind-registry'
 import {getBaseHullmassFor} from '../derivation/capabilities'
 import {computeEffectiveModuleStat} from '../derivation/stat-scaling'
@@ -75,6 +41,11 @@ export function toWholeEnergy(milli: number): number {
     return idiv(milli + 500, 1000)
 }
 
+export function formatMassTonnes(kg: number): string {
+    const tenths = idiv(kg + 50, 100)
+    return `${idiv(tenths, 10)}.${tenths % 10} t`
+}
+
 function isShipHull(itemId: number): boolean {
     return getPackedEntityType(itemId)?.equals(ENTITY_SHIP) ?? false
 }
@@ -109,6 +80,29 @@ export function computeBaseCapacityWarehouse(stats: bigint): number {
     return Math.floor(100_000_000 * 6 ** (s / 1998))
 }
 
+export function computeBaseCapacityWorkshop(stats: bigint): number {
+    const s = decodeStat(stats, 0) + decodeStat(stats, 2)
+    return Math.floor(5_000_000 * 6 ** (s / 1998))
+}
+
+const CAPACITY_FN_BY_KIND: Record<string, (stats: bigint) => number> = {
+    ship: computeBaseCapacityShip,
+    warehouse: computeBaseCapacityWarehouse,
+    workshop: computeBaseCapacityWorkshop,
+    extractor: computeBaseCapacityContainer,
+    factory: computeBaseCapacityContainer,
+    builddock: computeBaseCapacityContainer,
+    mdriver: computeBaseCapacityContainer,
+    mcatcher: computeBaseCapacityContainer,
+    container: computeBaseCapacityContainer,
+}
+
+export function computeBaseCapacityForEntity(itemId: number, stats: bigint): number {
+    const kind = getTemplateMeta(itemId)?.kind
+    if (!kind) return 0
+    return CAPACITY_FN_BY_KIND[kind.toString()]?.(stats) ?? 0
+}
+
 export const computeEngineThrust = (vol: number, tier: number): number =>
     idiv((400 + idiv(vol * 3, 4)) * moduleTierPct(ENGINE_THRUST_TIER_PCT, tier), 100)
 export const computeEngineDrain = (thm: number): number => 2 * Math.max(30, 50 - idiv(thm, 70))
@@ -159,91 +153,52 @@ export const computeWarpRange = (stat: number, tier: number): number =>
 export const computeCargoBayCapacity = (
     strength: number,
     density: number,
-    hardness: number
-): number => 10_000_000 + idiv((strength + density + hardness) * 50_000_000, 2997)
+    hardness: number,
+    tier: number
+): number =>
+    idiv(
+        (10_000_000 + idiv((strength + density + hardness) * 50_000_000, 2997)) *
+            moduleTierPct(CARGO_BAY_CAPACITY_TIER_PCT, tier),
+        100
+    )
 export const computeBatteryBankCapacity = (
     volatility: number,
     thermal: number,
     plasticity: number,
-    insulation: number
-): number => 2_500_000 + idiv((volatility + thermal + plasticity + insulation) * 7_500_000, 3996)
+    insulation: number,
+    tier: number
+): number =>
+    idiv(
+        (2_500_000 + idiv((volatility + thermal + plasticity + insulation) * 7_500_000, 3996)) *
+            moduleTierPct(BATTERY_CAPACITY_TIER_PCT, tier),
+        100
+    )
 
 export function entityDisplayName(itemId: number): string {
-    switch (itemId) {
-        case ITEM_SHIP_T1_PACKED:
-            return 'Ship'
-        case ITEM_ROUSTABOUT_T1A_PACKED:
-            return 'Roustabout'
-        case ITEM_PROSPECTOR_T1A_PACKED:
-            return 'Prospector'
-        case ITEM_TENDER_T1A_PACKED:
-            return 'Tender'
-        case ITEM_TUG_T1A_PACKED:
-            return 'Tug'
-        case ITEM_PORTER_T1A_PACKED:
-            return 'Porter'
-        case ITEM_WRIGHT_T1A_PACKED:
-            return 'Wright'
-        case ITEM_SMITH_T1A_PACKED:
-            return 'Smith'
-        case ITEM_WAREHOUSE_T1_PACKED:
-            return 'Warehouse'
-        case ITEM_EXTRACTOR_T1_PACKED:
-            return 'Mining Rig'
-        case ITEM_FACTORY_T1_PACKED:
-            return 'Factory'
-        case ITEM_CONSTRUCTION_DOCK_T1_PACKED:
-            return 'Construction Dock'
-        case ITEM_CONTAINER_T1_PACKED:
-            return 'Container'
-        case ITEM_CONTAINER_T2_PACKED:
-            return 'Container'
-        case ITEM_PROSPECTOR_T2A_PACKED:
-            return 'Prospector'
-        case ITEM_PROSPECTOR_T2B_PACKED:
-            return 'Prospector'
-        case ITEM_DREDGER_T2A_PACKED:
-            return 'Dredger'
-        default:
-            return 'Entity'
-    }
+    const template = getTemplateMeta(itemId)
+    if (!template) return 'Entity'
+    if (template.displayLabel) return template.displayLabel
+    return getKindMeta(template.kind)?.defaultLabel || 'Entity'
+}
+
+const MODULE_DISPLAY_NAME_BY_TYPE: Partial<Record<ModuleType, string>> = {
+    engine: 'Engine',
+    generator: 'Power Core',
+    gatherer: 'Limpet Bay',
+    loader: 'Shuttle Bay',
+    crafter: 'Fabricator',
+    storage: 'Cargo Hold',
+    hauler: 'Tractor Beam',
+    warp: 'Warp Drive',
+    battery: 'Battery Bank',
+    launcher: 'Drive Coil',
+    builder: 'Assembly Arm',
 }
 
 export function moduleDisplayName(itemId: number): string {
-    switch (itemId) {
-        case ITEM_ENGINE_T1:
-        case ITEM_ENGINE_T2:
-            return 'Engine'
-        case ITEM_GENERATOR_T1:
-        case ITEM_GENERATOR_T2:
-            return 'Power Core'
-        case ITEM_GATHERER_T1:
-        case ITEM_GATHERER_T2:
-            return 'Limpet Bay'
-        case ITEM_LOADER_T1:
-        case ITEM_LOADER_T2:
-            return 'Shuttle Bay'
-        case ITEM_CRAFTER_T1:
-        case ITEM_CRAFTER_T2:
-            return 'Fabricator'
-        case ITEM_BUILDER_T1:
-        case ITEM_BUILDER_T2:
-            return 'Assembly Arm'
-        case ITEM_STORAGE_T1:
-            return 'Cargo Hold'
-        case ITEM_HAULER_T1:
-        case ITEM_HAULER_T2:
-            return 'Tractor Beam'
-        case ITEM_WARP_T1:
-        case ITEM_WARP_T2:
-            return 'Warp Drive'
-        case ITEM_BATTERY_T1:
-            return 'Battery Bank'
-        case ITEM_LAUNCHER_T1:
-            return 'Drive Coil'
-        default:
-            return 'Module'
-    }
+    const item = tryGetItem(itemId)
+    if (item?.type !== 'module' || !item.moduleType) return 'Module'
+    return MODULE_DISPLAY_NAME_BY_TYPE[item.moduleType] ?? 'Module'
 }
 
 export function formatModuleLine(slot: number, itemId: number, stats: bigint): string {
@@ -288,7 +243,7 @@ export function formatModuleLine(slot: number, itemId: number, stats: bigint): s
             const fin = decodeStat(stats, 0)
             const pla = decodeStat(stats, 1)
             const tier = getItem(itemId).tier
-            out += `  Mass ${computeLoaderMass(fin)}  Thrust ${computeLoaderThrust(pla, tier)}`
+            out += `  Mass ${formatMassTonnes(computeLoaderMass(fin))}  Thrust ${computeLoaderThrust(pla, tier)}`
             break
         }
         case MODULE_CRAFTER: {
@@ -311,7 +266,7 @@ export function formatModuleLine(slot: number, itemId: number, stats: bigint): s
             const hrd = decodeStat(stats, 2)
             const coh = decodeStat(stats, 3)
             const tier = getItem(itemId).tier
-            out += `  Cargo Capacity ${computeCargoBayCapacity(str, den, hrd)}  Drain ${toWholeEnergy(computeCargoBayDrain(coh, tier))}`
+            out += `  Cargo Capacity ${formatMassTonnes(computeCargoBayCapacity(str, den, hrd, tier))}  Drain ${toWholeEnergy(computeCargoBayDrain(coh, tier))}`
             break
         }
         case MODULE_HAULER: {
@@ -333,7 +288,8 @@ export function formatModuleLine(slot: number, itemId: number, stats: bigint): s
             const thm = decodeStat(stats, 1)
             const pla = decodeStat(stats, 2)
             const ins = decodeStat(stats, 3)
-            out += `  Energy Capacity ${toWholeEnergy(computeBatteryBankCapacity(vol, thm, pla, ins))}`
+            const tier = getItem(itemId).tier
+            out += `  Energy Capacity ${toWholeEnergy(computeBatteryBankCapacity(vol, thm, pla, ins, tier))}`
             break
         }
     }
@@ -347,25 +303,12 @@ export function buildEntityDescription(
     moduleStats: bigint[]
 ): string {
     const hullMass = computeBaseHullmass(itemId, hullStats)
-    let baseCapacity = 0
-    if (isShipHull(itemId)) {
-        baseCapacity = computeBaseCapacityShip(hullStats)
-    } else if (itemId === ITEM_WAREHOUSE_T1_PACKED) {
-        baseCapacity = computeBaseCapacityWarehouse(hullStats)
-    } else if (
-        itemId === ITEM_EXTRACTOR_T1_PACKED ||
-        itemId === ITEM_FACTORY_T1_PACKED ||
-        itemId === ITEM_CONSTRUCTION_DOCK_T1_PACKED ||
-        itemId === ITEM_CONTAINER_T1_PACKED ||
-        itemId === ITEM_CONTAINER_T2_PACKED
-    ) {
-        baseCapacity = computeBaseCapacityContainer(hullStats)
-    }
+    const baseCapacity = computeBaseCapacityForEntity(itemId, hullStats)
 
     let out = entityDisplayName(itemId)
-    out += ` - Hull ${hullMass} mass`
+    out += ` - Hull ${formatMassTonnes(hullMass)}`
     if (baseCapacity > 0) {
-        out += ` * ${baseCapacity} capacity`
+        out += ` * ${formatMassTonnes(baseCapacity)} capacity`
     }
     out += '\n\n'
 

package/src/resolution/resolve-item.ts

@@ -247,7 +247,7 @@ function computeCapabilityGroup(
             }
         }
         case MODULE_BATTERY: {
-            const caps = computeBatteryCapabilities(stats)
+            const caps = computeBatteryCapabilities(stats, tier)
             return {
                 capability: 'Energy',
                 attributes: [