@shipload/sdk 1.0.0-next.31 → 1.0.0-next.33

package/src/data/items.json

@@ -357,7 +357,7 @@
   },
   {
     "id": 10002,
-    "mass": 6000,
+    "mass": 4000,
     "type": "component",
     "tier": 1
   },
@@ -369,13 +369,13 @@
   },
   {
     "id": 10004,
-    "mass": 6000,
+    "mass": 4000,
     "type": "component",
     "tier": 1
   },
   {
     "id": 10005,
-    "mass": 6000,
+    "mass": 4000,
     "type": "component",
     "tier": 1
   },
@@ -399,106 +399,106 @@
   },
   {
     "id": 10009,
-    "mass": 6000,
+    "mass": 4000,
     "type": "component",
     "tier": 1
   },
   {
     "id": 10010,
-    "mass": 6000,
+    "mass": 4000,
     "type": "component",
     "tier": 1
   },
   {
     "id": 10100,
-    "mass": 900000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "engine"
   },
   {
     "id": 10101,
-    "mass": 1400000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "generator"
   },
   {
     "id": 10102,
-    "mass": 1200000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "gatherer"
   },
   {
     "id": 10103,
-    "mass": 1000000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "loader"
   },
   {
     "id": 10104,
-    "mass": 1200000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "crafter"
   },
   {
     "id": 10105,
-    "mass": 1200000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "storage"
   },
   {
     "id": 10106,
-    "mass": 1400000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "hauler"
   },
   {
     "id": 10107,
-    "mass": 1400000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "warp"
   },
   {
     "id": 10108,
-    "mass": 1000000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "battery"
   },
   {
     "id": 10200,
-    "mass": 1500000,
+    "mass": 1300000,
     "type": "entity",
     "tier": 1
   },
   {
     "id": 10201,
-    "mass": 2300000,
+    "mass": 1900000,
     "type": "entity",
     "tier": 1
   },
   {
     "id": 10202,
-    "mass": 5800000,
+    "mass": 4800000,
     "type": "entity",
     "tier": 1
   },
   {
     "id": 10203,
-    "mass": 4400000,
+    "mass": 3700000,
     "type": "entity",
     "tier": 1
   },
   {
     "id": 10204,
-    "mass": 5500000,
+    "mass": 4600000,
     "type": "entity",
     "tier": 1
   },

package/src/data/recipes.json

@@ -30,15 +30,15 @@
   },
   {
     "outputItemId": 10002,
-    "outputMass": 6000,
+    "outputMass": 4000,
     "inputs": [
       {
         "itemId": 401,
-        "quantity": 6
+        "quantity": 5
       },
       {
         "itemId": 501,
-        "quantity": 9
+        "quantity": 5
       }
     ],
     "statSlots": [
@@ -92,15 +92,15 @@
   },
   {
     "outputItemId": 10004,
-    "outputMass": 6000,
+    "outputMass": 4000,
     "inputs": [
       {
         "itemId": 201,
-        "quantity": 6
+        "quantity": 5
       },
       {
         "itemId": 101,
-        "quantity": 9
+        "quantity": 5
       }
     ],
     "statSlots": [
@@ -125,15 +125,15 @@
   },
   {
     "outputItemId": 10005,
-    "outputMass": 6000,
+    "outputMass": 4000,
     "inputs": [
       {
         "itemId": 101,
-        "quantity": 6
+        "quantity": 5
       },
       {
         "itemId": 301,
-        "quantity": 9
+        "quantity": 5
       }
     ],
     "statSlots": [
@@ -245,15 +245,15 @@
   },
   {
     "outputItemId": 10009,
-    "outputMass": 6000,
+    "outputMass": 4000,
     "inputs": [
       {
         "itemId": 301,
-        "quantity": 6
+        "quantity": 5
       },
       {
         "itemId": 401,
-        "quantity": 9
+        "quantity": 5
       }
     ],
     "statSlots": [
@@ -278,15 +278,15 @@
   },
   {
     "outputItemId": 10010,
-    "outputMass": 6000,
+    "outputMass": 4000,
     "inputs": [
       {
         "itemId": 501,
-        "quantity": 6
+        "quantity": 5
       },
       {
         "itemId": 201,
-        "quantity": 9
+        "quantity": 5
       }
     ],
     "statSlots": [
@@ -311,7 +311,7 @@
   },
   {
     "outputItemId": 10100,
-    "outputMass": 900000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10003,
@@ -340,7 +340,7 @@
   },
   {
     "outputItemId": 10101,
-    "outputMass": 1400000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10004,
@@ -369,7 +369,7 @@
   },
   {
     "outputItemId": 10102,
-    "outputMass": 1200000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10005,
@@ -418,7 +418,7 @@
   },
   {
     "outputItemId": 10103,
-    "outputMass": 1000000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10007,
@@ -447,7 +447,7 @@
   },
   {
     "outputItemId": 10104,
-    "outputMass": 1200000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10008,
@@ -480,7 +480,7 @@
   },
   {
     "outputItemId": 10105,
-    "outputMass": 1200000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10001,
@@ -529,7 +529,7 @@
   },
   {
     "outputItemId": 10106,
-    "outputMass": 1400000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10004,
@@ -570,7 +570,7 @@
   },
   {
     "outputItemId": 10107,
-    "outputMass": 1400000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10004,
@@ -602,7 +602,7 @@
   },
   {
     "outputItemId": 10108,
-    "outputMass": 1000000,
+    "outputMass": 960000,
     "inputs": [
       {
         "itemId": 10003,
@@ -651,7 +651,7 @@
   },
   {
     "outputItemId": 10200,
-    "outputMass": 1500000,
+    "outputMass": 1300000,
     "inputs": [
       {
         "itemId": 10001,
@@ -700,7 +700,7 @@
   },
   {
     "outputItemId": 10201,
-    "outputMass": 2300000,
+    "outputMass": 1900000,
     "inputs": [
       {
         "itemId": 10001,
@@ -749,7 +749,7 @@
   },
   {
     "outputItemId": 10202,
-    "outputMass": 5800000,
+    "outputMass": 4800000,
     "inputs": [
       {
         "itemId": 10001,
@@ -798,7 +798,7 @@
   },
   {
     "outputItemId": 10203,
-    "outputMass": 4400000,
+    "outputMass": 3700000,
     "inputs": [
       {
         "itemId": 10001,
@@ -847,7 +847,7 @@
   },
   {
     "outputItemId": 10204,
-    "outputMass": 5500000,
+    "outputMass": 4600000,
     "inputs": [
       {
         "itemId": 10001,

package/src/derivation/capabilities.ts

@@ -97,7 +97,7 @@ export function computeLoaderCapabilities(stats: Record<string, number>): {
 
     return {
         mass: Math.max(200, 2000 - Math.floor(insulation * 2)),
-        thrust: 1 + Math.floor(plasticity / 500),
+        thrust: 1 + Math.floor((plasticity * plasticity) / 10000),
         quantity: 1,
     }
 }

package/src/entities/makers.ts

@@ -109,6 +109,7 @@ export function makeEntity(packedItemId: number, state: EntityStateInput): Entit
         cargomass: UInt32.from(state.cargomass ?? 0),
         cargo: state.cargo || [],
         lanes,
+        holds: [],
     }
 
     if (state.energy !== undefined) info.energy = UInt16.from(state.energy)

package/src/errors.ts

@@ -45,7 +45,6 @@ export const WAREHOUSE_ALREADY_AT_LOCATION = 'Warehouse already exists at this l
 export const CONTAINER_NOT_FOUND = 'Cannot find container for given id.'
 export const DESTINATION_CAPACITY_EXCEEDED =
     'Destination entity does not have enough capacity for the gather.'
-export const CANCEL_PAIRED_HAS_PENDING = 'Cannot cancel transfer, paired entity has pending tasks.'
 export const GROUP_EMPTY = 'Group travel requires at least one entity.'
 export const GROUP_NO_THRUST = 'Group travel requires at least one entity with engines.'
 export const GROUP_NOT_SAME_LOCATION = 'All entities must be at the same location for group travel.'

package/src/index-module.ts

@@ -65,6 +65,8 @@ export type {
     Reservation,
 } from './managers'
 export type {EntityRefInput} from './managers/actions'
+export type {WrapDeposit} from './managers/nft'
+export {resolveLockedAmount} from './managers/nft'
 
 export {
     getItem,
@@ -227,6 +229,9 @@ export type {
 export {taskCargoChanges} from './scheduling/task-cargo'
 export type {TaskCargoChange, TaskCargoDirection} from './scheduling/task-cargo'
 
+export {composeIdleResolve} from './scheduling/idle-resolve'
+export type {CounterpartLookup, IdleResolveTarget} from './scheduling/idle-resolve'
+
 export {
     projectedCargoAvailableAt,
     availableForItem,

package/src/managers/actions.ts

@@ -73,14 +73,6 @@ export class ActionsManager extends BaseManager {
         })
     }
 
-    retarget(sourceId: UInt64Type, taskIndex: UInt64Type, newDestId: UInt64Type): Action {
-        return this.server.action('retarget', {
-            source_id: UInt64.from(sourceId),
-            task_index: UInt64.from(taskIndex),
-            new_dest_id: UInt64.from(newDestId),
-        })
-    }
-
     recharge(entityId: UInt64Type): Action {
         return this.server.action('recharge', {
             id: UInt64.from(entityId),
@@ -100,14 +92,26 @@ export class ActionsManager extends BaseManager {
         })
     }
 
-    transfer(
-        sourceId: UInt64Type,
-        destId: UInt64Type,
+    load(
+        id: UInt64Type,
+        fromId: UInt64Type,
         items: ServerContract.ActionParams.Type.cargo_item[]
     ): Action {
-        return this.server.action('transfer', {
-            source_id: UInt64.from(sourceId),
-            dest_id: UInt64.from(destId),
+        return this.server.action('load', {
+            id: UInt64.from(id),
+            from_id: UInt64.from(fromId),
+            items,
+        })
+    }
+
+    unload(
+        id: UInt64Type,
+        toId: UInt64Type,
+        items: ServerContract.ActionParams.Type.cargo_item[]
+    ): Action {
+        return this.server.action('unload', {
+            id: UInt64.from(id),
+            to_id: UInt64.from(toId),
             items,
         })
     }
@@ -154,14 +158,19 @@ export class ActionsManager extends BaseManager {
         entityId: UInt64Type,
         recipeId: number,
         quantity: number,
-        inputs: ServerContract.ActionParams.Type.cargo_item[]
+        inputs: ServerContract.ActionParams.Type.cargo_item[],
+        target?: UInt64Type
     ): Action {
-        return this.server.action('craft', {
+        const params: ServerContract.ActionParams.craft = {
             id: UInt64.from(entityId),
             recipe_id: UInt16.from(recipeId),
             quantity: UInt32.from(quantity),
             inputs,
-        })
+        }
+        if (target !== undefined) {
+            params.target = UInt64.from(target)
+        }
+        return this.server.action('craft', params)
     }
 
     blend(entityId: UInt64Type, inputs: ServerContract.ActionParams.Type.cargo_item[]): Action {

package/src/managers/construction.ts

@@ -5,7 +5,7 @@ import {PlotManager} from './plot'
 import {getItem} from '../data/catalog'
 import {calc_craft_duration} from '../capabilities/crafting'
 import {getLanes, getTasks} from '../scheduling/schedule'
-import {TaskType} from '../types'
+import {HoldKind, TaskType} from '../types'
 import type {
     BuildableTarget,
     FinalizerEntityRef,
@@ -102,7 +102,7 @@ export class ConstructionManager extends BaseManager {
                 let cumulativeSec = 0
                 for (const task of lane.schedule.tasks) {
                     cumulativeSec += task.duration.toNumber()
-                    if (!isTransferTask(task)) continue
+                    if (!isPushTask(task)) continue
                     if (!task.entitytarget) continue
                     const projectedEndMs = startedMs + cumulativeSec * 1000
                     if (projectedEndMs < nowMs) continue
@@ -145,51 +145,53 @@ export class ConstructionManager extends BaseManager {
 
     private plotReservation(
         plot: ServerContract.Types.entity_info,
+        builder: ServerContract.Types.entity_info | undefined,
         now: Date
     ): {
         builderId: UInt64
-        group?: UInt64
         startsAt: number
         completesAt: number
         hasStarted: boolean
     } | null {
-        for (const lane of getLanes(plot)) {
+        const hold = plot.holds.find((h) => h.kind.toNumber() === HoldKind.BUILD)
+        if (!hold) return null
+        const builderId = hold.counterpart.entity_id
+        const completesAt = hold.until.toDate().getTime()
+        const startsAt = this.builderBuildStart(builder, plot.id) ?? completesAt
+        return {
+            builderId,
+            startsAt,
+            completesAt,
+            hasStarted: startsAt <= now.getTime(),
+        }
+    }
+
+    private builderBuildStart(
+        builder: ServerContract.Types.entity_info | undefined,
+        plotId: UInt64
+    ): number | undefined {
+        if (!builder) return undefined
+        for (const lane of getLanes(builder)) {
             const startedMs = lane.schedule.started.toDate().getTime()
             let startSec = 0
             for (const task of lane.schedule.tasks) {
-                if (task.type.toNumber() === TaskType.RESERVED) {
-                    if (!task.entitytarget) return null
-                    const startsAt = startedMs + startSec * 1000
-                    const completesAt = startsAt + task.duration.toNumber() * 1000
-                    return {
-                        builderId: task.entitytarget.entity_id,
-                        group: task.entitygroup ?? undefined,
-                        startsAt,
-                        completesAt,
-                        hasStarted: startsAt <= now.getTime(),
-                    }
-                }
+                if (isBuildOfPlot(task, plotId)) return startedMs + startSec * 1000
                 startSec += task.duration.toNumber()
             }
         }
-        return null
+        return undefined
     }
 
     private builderCancelability(
         builder: ServerContract.Types.entity_info | undefined,
-        group: UInt64 | undefined
+        plotId: UInt64
     ): {cancelable: boolean; blockingTaskCount: number} {
-        if (!builder || group === undefined) {
+        if (!builder) {
             return {cancelable: false, blockingTaskCount: 0}
         }
         for (const lane of getLanes(builder)) {
             const tasks = lane.schedule.tasks
-            const buildIdx = tasks.findIndex(
-                (t) =>
-                    t.type.toNumber() === TaskType.BUILDPLOT &&
-                    t.entitygroup !== undefined &&
-                    t.entitygroup.equals(group)
-            )
+            const buildIdx = tasks.findIndex((t) => isBuildOfPlot(t, plotId))
             if (buildIdx < 0) continue
             const trailing = tasks.length - 1 - buildIdx
             return {cancelable: trailing === 0, blockingTaskCount: trailing}
@@ -200,14 +202,14 @@ export class ConstructionManager extends BaseManager {
     private buildFromReservation(
         res: {
             builderId: UInt64
-            group?: UInt64
             startsAt: number
             completesAt: number
             hasStarted: boolean
         },
+        plotId: UInt64,
         builder: ServerContract.Types.entity_info | undefined
     ): ScheduledBuild {
-        const {cancelable, blockingTaskCount} = this.builderCancelability(builder, res.group)
+        const {cancelable, blockingTaskCount} = this.builderCancelability(builder, plotId)
         return {
             shipId: res.builderId,
             shipName: builder?.entity_name || res.builderId.toString(),
@@ -224,10 +226,12 @@ export class ConstructionManager extends BaseManager {
         entities: ServerContract.Types.entity_info[],
         now: Date
     ): ScheduledBuild | null {
-        const res = this.plotReservation(plot, now)
+        const hold = plot.holds.find((h) => h.kind.toNumber() === HoldKind.BUILD)
+        if (!hold) return null
+        const builder = entities.find((e) => e.id.equals(hold.counterpart.entity_id))
+        const res = this.plotReservation(plot, builder, now)
         if (!res) return null
-        const builder = entities.find((e) => e.id.equals(res.builderId))
-        return this.buildFromReservation(res, builder)
+        return this.buildFromReservation(res, plot.id, builder)
     }
 
     scheduledBuildsByTarget(
@@ -238,10 +242,12 @@ export class ConstructionManager extends BaseManager {
         const out = new Map<string, ScheduledBuild>()
         for (const entity of entities) {
             if (entity.type.toString() !== 'plot') continue
-            const res = this.plotReservation(entity, now)
+            const hold = entity.holds.find((h) => h.kind.toNumber() === HoldKind.BUILD)
+            if (!hold) continue
+            const builder = byId.get(hold.counterpart.entity_id.toString())
+            const res = this.plotReservation(entity, builder, now)
             if (!res) continue
-            const builder = byId.get(res.builderId.toString())
-            out.set(entity.id.toString(), this.buildFromReservation(res, builder))
+            out.set(entity.id.toString(), this.buildFromReservation(res, entity.id, builder))
         }
         return out
     }
@@ -354,15 +360,22 @@ function partitionSources(
     return {eligible, unreachable}
 }
 
-function isTransferTask(task: ServerContract.Types.task): boolean {
-    const type = task.type.toNumber()
-    return type === TaskType.LOAD || type === TaskType.UNLOAD
+function isPushTask(task: ServerContract.Types.task): boolean {
+    return task.type.toNumber() === TaskType.UNLOAD
+}
+
+function isBuildOfPlot(task: ServerContract.Types.task, plotId: UInt64): boolean {
+    return (
+        task.type.toNumber() === TaskType.BUILDPLOT &&
+        task.entitytarget !== undefined &&
+        task.entitytarget.entity_id.equals(plotId)
+    )
 }
 
 function reservationsOf(source: ServerContract.Types.entity_info): Reservation[] {
     const out = new Map<string, Reservation>()
     for (const task of getTasks(source)) {
-        if (!isTransferTask(task)) continue
+        if (!isPushTask(task)) continue
         if (!task.entitytarget) continue
         const targetType = task.entitytarget.entity_type
         const targetId = task.entitytarget.entity_id

package/src/managers/nft.test.ts

@@ -0,0 +1,14 @@
+import {describe, expect, test} from 'bun:test'
+import {resolveLockedAmount} from './nft'
+
+describe('resolveLockedAmount', () => {
+    test('no fee refunds the full cost', () => {
+        expect(resolveLockedAmount(5_0000n, 0)).toBe(5_0000n)
+    })
+    test('2% fee floors the fee and refunds the remainder', () => {
+        expect(resolveLockedAmount(5_0000n, 200)).toBe(4_9000n)
+    })
+    test('rounding floors the fee (contract uses integer division)', () => {
+        expect(resolveLockedAmount(101n, 250)).toBe(99n) // fee = floor(101*250/10000)=2
+    })
+})