@shipload/sdk 1.0.0-next.45 → 1.0.0-next.47

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@shipload/sdk",
     "description": "SDKs for Shipload",
-    "version": "1.0.0-next.45",
+    "version": "1.0.0-next.47",
     "homepage": "https://github.com/shipload/toolkit/tree/master/packages/sdk",
     "repository": {
         "type": "git",

package/src/capabilities/gathering.test.ts

@@ -1,6 +1,6 @@
 import {expect, test} from 'bun:test'
 import type {GathererStats} from '../types/capabilities'
-import {calc_gather_energy} from './gathering'
+import {calc_gather_duration, calc_gather_energy} from './gathering'
 
 function gatherer(drain: number): GathererStats {
     return {
@@ -14,3 +14,16 @@ test('calc_gather_energy does not clamp above the old uint16 ceiling', () => {
     const energy = calc_gather_energy(gatherer(30), 400_000_000)
     expect(Number(energy)).toBeGreaterThan(65535)
 })
+
+test('splitting a bulk gather never undercuts total lane-time', () => {
+    const g: GathererStats = {
+        yield: {toNumber: () => 413},
+        drain: {toNumber: () => 30},
+        depth: {toNumber: () => 0, toString: () => '0'},
+    }
+    const bulk = Number(calc_gather_duration(g, 1000, 10, 8, 500))
+    const unit = Number(calc_gather_duration(g, 1000, 1, 8, 500))
+    // d1 >= 1 regime (bulk > quantity), where the split exploit lived
+    expect(bulk).toBeGreaterThan(10)
+    expect(unit * 10).toBeGreaterThanOrEqual(bulk)
+})

package/src/capabilities/gathering.ts

@@ -30,9 +30,9 @@ export function calc_gather_duration(
     stratum: number,
     richness: number
 ): UInt32 {
-    return UInt32.from(
-        Math.floor(gather_duration_raw(gatherer, itemMass, quantity, stratum, richness))
-    )
+    const raw = gather_duration_raw(gatherer, itemMass, quantity, stratum, richness)
+    // +1 per-gather setup cost mirrors the contract: splitting a bulk gather must not undercut lane-time
+    return UInt32.from(raw <= 0 ? 0 : Math.floor(raw) + 1)
 }
 
 export function calc_gather_rate(
@@ -48,6 +48,7 @@ export function calc_gather_rate(
 }
 
 export function calc_gather_energy(gatherer: GathererStats, duration: number): UInt32 {
-    const energy = Math.floor((duration * gatherer.drain.toNumber()) / PRECISION)
-    return UInt32.from(energy)
+    if (duration <= 0) return UInt32.from(0)
+    const raw = Math.floor((duration * gatherer.drain.toNumber()) / PRECISION)
+    return UInt32.from(Math.min(Math.max(raw, 1), 4294967295))
 }

package/src/capabilities/modules.ts

@@ -3,13 +3,17 @@ import {
     ITEM_CRAFTER_T1,
     ITEM_ENGINE_T1,
     ITEM_GATHERER_T1,
+    ITEM_GATHERER_T2,
     ITEM_GENERATOR_T1,
     ITEM_HAULER_T1,
+    ITEM_HAULER_T2,
     ITEM_LAUNCHER_T1,
     ITEM_LOADER_T1,
     ITEM_STORAGE_T1,
     ITEM_WARP_T1,
 } from '../data/item-ids'
+import {getItem} from '../data/catalog'
+import type {EntitySlot} from '../data/recipes-runtime'
 
 export const MODULE_ANY = 0
 export const MODULE_ENGINE = 1
@@ -44,6 +48,7 @@ export function getModuleCapabilityType(itemId: number): number {
         case ITEM_GENERATOR_T1:
             return MODULE_GENERATOR
         case ITEM_GATHERER_T1:
+        case ITEM_GATHERER_T2:
             return MODULE_GATHERER
         case ITEM_LOADER_T1:
             return MODULE_LOADER
@@ -52,6 +57,7 @@ export function getModuleCapabilityType(itemId: number): number {
         case ITEM_STORAGE_T1:
             return MODULE_STORAGE
         case ITEM_HAULER_T1:
+        case ITEM_HAULER_T2:
             return MODULE_HAULER
         case ITEM_WARP_T1:
             return MODULE_WARP
@@ -96,3 +102,10 @@ export function moduleSlotTypeToCode(slotType: string): number {
             return MODULE_ANY
     }
 }
+
+export function slotAcceptsModule(slot: EntitySlot, moduleItemId: number): boolean {
+    const moduleType = getModuleCapabilityType(moduleItemId)
+    if (moduleType === 0xff) return false
+    if (!moduleAccepts(moduleSlotTypeToCode(slot.type), moduleType)) return false
+    return getItem(moduleItemId).tier <= slot.maxTier
+}