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

package/package.json

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

package/src/data/entities.json

@@ -171,6 +171,22 @@
     ],
     "baseHullmass": 100000
   },
+  {
+    "entityItemId": 10209,
+    "slots": [
+      {
+        "type": "generator",
+        "outputPct": 200,
+        "maxTier": 1
+      },
+      {
+        "type": "builder",
+        "outputPct": 200,
+        "maxTier": 1
+      }
+    ],
+    "baseHullmass": 100000
+  },
   {
     "entityItemId": 10210,
     "slots": [

package/src/data/item-ids.ts

@@ -80,6 +80,7 @@ export const ITEM_MASS_DRIVER_T1_PACKED = 10205
 export const ITEM_MASS_CATCHER_T1_PACKED = 10206
 export const ITEM_HUB_T1_PACKED = 10207
 export const ITEM_WORKSHOP_T1_PACKED = 10208
+export const ITEM_CONSTRUCTION_DOCK_T1_PACKED = 10209
 export const ITEM_ROUSTABOUT_T1_PACKED = 10210
 export const ITEM_PROSPECTOR_T1_PACKED = 10211
 export const ITEM_TENDER_T1_PACKED = 10212

package/src/data/items.json

@@ -540,6 +540,12 @@
     "type": "entity",
     "tier": 1
   },
+  {
+    "id": 10209,
+    "mass": 1900000,
+    "type": "entity",
+    "tier": 1
+  },
   {
     "id": 10210,
     "mass": 1600000,

package/src/data/kind-registry.json

@@ -76,6 +76,13 @@
       "capabilityFlags": 20,
       "zCoord": 0,
       "defaultLabel": "Workshop"
+    },
+    {
+      "kind": "builddock",
+      "classification": "OrbitalStructure",
+      "capabilityFlags": 20,
+      "zCoord": 0,
+      "defaultLabel": "Construction Dock"
     }
   ],
   "templates": [
@@ -169,6 +176,11 @@
       "kind": "workshop",
       "displayLabel": ""
     },
+    {
+      "itemId": 10209,
+      "kind": "builddock",
+      "displayLabel": ""
+    },
     {
       "itemId": 20210,
       "kind": "ship",

package/src/data/kind-registry.ts

@@ -26,6 +26,7 @@ export type EntityTypeName =
     | 'warehouse'
     | 'extractor'
     | 'factory'
+    | 'builddock'
     | 'workshop'
     | 'container'
     | 'nexus'
@@ -134,6 +135,7 @@ export const ENTITY_SHIP = Name.from('ship')
 export const ENTITY_WAREHOUSE = Name.from('warehouse')
 export const ENTITY_EXTRACTOR = Name.from('extractor')
 export const ENTITY_FACTORY = Name.from('factory')
+export const ENTITY_CONSTRUCTION_DOCK = Name.from('builddock')
 export const ENTITY_WORKSHOP = Name.from('workshop')
 export const ENTITY_CONTAINER = Name.from('container')
 export const ENTITY_NEXUS = Name.from('nexus')
@@ -154,6 +156,9 @@ export function isExtractor(entity: {type?: Name}): boolean {
 export function isFactory(entity: {type?: Name}): boolean {
     return entity.type?.equals(ENTITY_FACTORY) ?? false
 }
+export function isConstructionDock(entity: {type?: Name}): boolean {
+    return entity.type?.equals(ENTITY_CONSTRUCTION_DOCK) ?? false
+}
 export function isWorkshop(entity: {type?: Name}): boolean {
     return entity.type?.equals(ENTITY_WORKSHOP) ?? false
 }

package/src/data/metadata.ts

@@ -279,6 +279,12 @@ export const itemMetadata: Record<number, ItemMetadata> = {
             'A station workshop with five independent workers. Visiting ships bring materials and power, and the workshop does the crafting.',
         color: '#B877FF',
     },
+    10209: {
+        name: 'Construction Dock',
+        description:
+            'An immobile station construction facility with amplified power core and assembly arm slots.',
+        color: '#FFB347',
+    },
     10210: {
         name: 'Roustabout',
         description:
@@ -433,6 +439,7 @@ export const entityMetadata: Record<number, EntityMetadata> = {
     10208: {
         moduleSlotLabels: ['Fabricator', 'Fabricator', 'Fabricator', 'Fabricator', 'Fabricator'],
     },
+    10209: {moduleSlotLabels: ['Power Core', 'Assembly Arm']},
     20210: {moduleSlotLabels: ['Power Core', 'Power Core', 'Engine', 'Limpet Bay']},
     20211: {moduleSlotLabels: ['Power Core', 'Engine', 'Tractor Beam', 'Tractor Beam']},
 }

package/src/data/recipes.json

@@ -1016,6 +1016,45 @@
     ],
     "blendWeights": []
   },
+  {
+    "outputItemId": 10209,
+    "outputMass": 1900000,
+    "inputs": [
+      {
+        "itemId": 10001,
+        "quantity": 600
+      },
+      {
+        "itemId": 10003,
+        "quantity": 600
+      }
+    ],
+    "statSlots": [
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 0
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 1
+          }
+        ]
+      },
+      {
+        "sources": []
+      },
+      {
+        "sources": []
+      }
+    ],
+    "blendWeights": []
+  },
   {
     "outputItemId": 10210,
     "outputMass": 1600000,

package/src/derivation/capabilities.ts

@@ -218,6 +218,7 @@ export function computeBatteryCapabilities(stats: Record<string, number>): {
 import {
     ITEM_CONTAINER_T1_PACKED,
     ITEM_CONTAINER_T2_PACKED,
+    ITEM_CONSTRUCTION_DOCK_T1_PACKED,
     ITEM_EXTRACTOR_T1_PACKED,
     ITEM_FACTORY_T1_PACKED,
     ITEM_MASS_CATCHER_T1_PACKED,
@@ -277,6 +278,7 @@ export function computeBaseCapacity(itemId: number, stats: Record<string, number
         switch (itemId) {
             case ITEM_EXTRACTOR_T1_PACKED:
             case ITEM_FACTORY_T1_PACKED:
+            case ITEM_CONSTRUCTION_DOCK_T1_PACKED:
             case ITEM_MASS_DRIVER_T1_PACKED:
             case ITEM_MASS_CATCHER_T1_PACKED:
             case ITEM_CONTAINER_T1_PACKED:

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

@@ -13,6 +13,7 @@ import {
     ITEM_BEAM,
     ITEM_GATHERER_T1,
     ITEM_CRAFTER_T1,
+    ITEM_BUILDER_T1,
     ITEM_EXTRACTOR_T1_PACKED,
     ITEM_ROUSTABOUT_T1_PACKED,
     ITEM_PROSPECTOR_T1_PACKED,
@@ -33,7 +34,12 @@ test('getRecipeConsumers lists every recipe that consumes Sensor', () => {
     const consumers = getRecipeConsumers(ITEM_SENSOR)
     const ids = consumers.map((c) => c.outputItemId).sort((a, b) => a - b)
     expect(ids).toEqual(
-        [ITEM_CRAFTER_T1, ITEM_EXTRACTOR_T1_PACKED, ITEM_ROUSTABOUT_T1_PACKED].sort((a, b) => a - b)
+        [
+            ITEM_CRAFTER_T1,
+            ITEM_BUILDER_T1,
+            ITEM_EXTRACTOR_T1_PACKED,
+            ITEM_ROUSTABOUT_T1_PACKED,
+        ].sort((a, b) => a - b)
     )
 })
 

package/src/index-module.ts

@@ -333,6 +333,7 @@ export {
     ENTITY_WAREHOUSE,
     ENTITY_EXTRACTOR,
     ENTITY_FACTORY,
+    ENTITY_CONSTRUCTION_DOCK,
     ENTITY_WORKSHOP,
     ENTITY_CONTAINER,
     ENTITY_NEXUS,
@@ -351,6 +352,7 @@ export {
     isWarehouse,
     isExtractor,
     isFactory,
+    isConstructionDock,
     isWorkshop,
     isContainer,
     isNexus,

package/src/managers/construction.ts

@@ -95,20 +95,24 @@ export class ConstructionManager extends BaseManager {
         now: Date
     ): Map<string, InboundTransfer[]> {
         const buckets = new Map<string, Map<string, InboundTransfer>>()
+        const entitiesById = new Map(entities.map((entity) => [entity.id.toString(), entity]))
         const nowMs = now.getTime()
         for (const entity of entities) {
-            const entityIdStr = entity.id.toString()
-            const sourceName = entity.entity_name || entityIdStr
             for (const lane of getLanes(entity)) {
                 const startedMs = lane.schedule.started.toDate().getTime()
                 let cumulativeSec = 0
                 for (const task of lane.schedule.tasks) {
                     cumulativeSec += task.duration.toNumber()
-                    if (!isPushTask(task)) continue
-                    if (task.couplings.length === 0) continue
+                    if (!isDeliveryTask(task)) continue
+                    const target = deliveryTarget(task)
+                    if (!target) continue
+                    const source = deliverySource(task, entity, entitiesById)
+                    if (!source) continue
                     const projectedEndMs = startedMs + cumulativeSec * 1000
                     if (projectedEndMs < nowMs) continue
-                    const targetIdStr = task.couplings[0].counterpart.entity_id.toString()
+                    const targetIdStr = target.entity_id.toString()
+                    const sourceIdStr = source.id.toString()
+                    const sourceName = source.entity_name || sourceIdStr
                     const etaSeconds = Math.max(0, Math.round((projectedEndMs - nowMs) / 1000))
                     let perTarget = buckets.get(targetIdStr)
                     if (!perTarget) {
@@ -119,15 +123,15 @@ export class ConstructionManager extends BaseManager {
                         const itemId = c.item_id.toNumber()
                         const quantity = c.quantity.toNumber()
                         if (quantity === 0) continue
-                        const key = `${entityIdStr}#${itemId}`
+                        const key = `${sourceIdStr}#${itemId}`
                         const existing = perTarget.get(key)
                         if (existing) {
                             existing.quantity += quantity
                             existing.etaSeconds = Math.min(existing.etaSeconds, etaSeconds)
                         } else {
                             perTarget.set(key, {
-                                sourceEntityId: entity.id,
-                                sourceEntityType: entity.type,
+                                sourceEntityId: source.id,
+                                sourceEntityType: source.type,
                                 sourceName,
                                 itemId,
                                 quantity,
@@ -363,7 +367,34 @@ function partitionSources(
     return {eligible, unreachable}
 }
 
-function isPushTask(task: ServerContract.Types.task): boolean {
+function isDeliveryTask(task: ServerContract.Types.task): boolean {
+    const type = task.type.toNumber()
+    return type === TaskType.UNLOAD || type === TaskType.SHUTTLE
+}
+
+function deliveryTarget(
+    task: ServerContract.Types.task
+): ServerContract.Types.entity_ref | undefined {
+    if (task.type.toNumber() === TaskType.SHUTTLE) {
+        return task.couplings.find((coupling) => coupling.kind.toNumber() === HoldKind.PUSH)
+            ?.counterpart
+    }
+    return task.couplings[0]?.counterpart
+}
+
+function deliverySource(
+    task: ServerContract.Types.task,
+    transporter: ServerContract.Types.entity_info,
+    entitiesById: ReadonlyMap<string, ServerContract.Types.entity_info>
+): ServerContract.Types.entity_info | undefined {
+    if (task.type.toNumber() !== TaskType.SHUTTLE) return transporter
+    const source = task.couplings.find(
+        (coupling) => coupling.kind.toNumber() === HoldKind.PULL
+    )?.counterpart
+    return source ? entitiesById.get(source.entity_id.toString()) : undefined
+}
+
+function isReservingPushTask(task: ServerContract.Types.task): boolean {
     return task.type.toNumber() === TaskType.UNLOAD
 }
 
@@ -378,7 +409,7 @@ function isBuildOfPlot(task: ServerContract.Types.task, plotId: UInt64): boolean
 function reservationsOf(source: ServerContract.Types.entity_info): Reservation[] {
     const out = new Map<string, Reservation>()
     for (const task of getTasks(source)) {
-        if (!isPushTask(task)) continue
+        if (!isReservingPushTask(task)) continue
         if (task.couplings.length === 0) continue
         const targetType = task.couplings[0].counterpart.entity_type
         const targetId = task.couplings[0].counterpart.entity_id

package/src/nft/description.ts

@@ -14,6 +14,7 @@ import {
 import {
     ITEM_CONTAINER_T1_PACKED,
     ITEM_CONTAINER_T2_PACKED,
+    ITEM_CONSTRUCTION_DOCK_T1_PACKED,
     ITEM_BUILDER_T1,
     ITEM_CRAFTER_T1,
     ITEM_ENGINE_T1,
@@ -170,6 +171,8 @@ export function entityDisplayName(itemId: number): string {
             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:
@@ -317,6 +320,7 @@ export function buildEntityDescription(
     } 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
     ) {

package/src/scheduling/projection.ts

@@ -1,6 +1,6 @@
 import {Name, type UInt16, UInt32, UInt64} from '@wharfkit/antelope'
 import {ServerContract} from '../contracts'
-import {Coordinates, RefitOp, TaskType} from '../types'
+import {Coordinates, TaskType} from '../types'
 import {
     capsHasMovement,
     capsHasStorage,
@@ -402,13 +402,6 @@ function applyCraftTask(projected: ProjectedEntity, task: ServerContract.Types.t
     }
 }
 
-// Mirrors calc_task_effect's TASK_REFIT: only ADD has a projectable cargo effect (REMOVE/SWAP return mass the entity row holds, invisible to the task itself).
-function applyRefitTask(projected: ProjectedEntity, task: ServerContract.Types.task): void {
-    if (task.refit?.op.toNumber() === RefitOp.ADD) {
-        removeCargoItem(projected, task.cargo[0])
-    }
-}
-
 function applyTask(projected: ProjectedEntity, task: ServerContract.Types.task): void {
     switch (task.type.toNumber()) {
         case TaskType.RECHARGE:
@@ -432,9 +425,6 @@ function applyTask(projected: ProjectedEntity, task: ServerContract.Types.task):
         case TaskType.CRAFT:
             applyCraftTask(projected, task)
             break
-        case TaskType.REFIT:
-            applyRefitTask(projected, task)
-            break
         case TaskType.UNDEPLOY:
         case TaskType.DEMOLISH:
             break
@@ -591,9 +581,6 @@ export function projectEntityAt(entity: Projectable, now: Date): ProjectedEntity
             case TaskType.CRAFT:
                 if (taskComplete) applyCraftTask(projected, task)
                 break
-            case TaskType.REFIT:
-                if (taskComplete) applyRefitTask(projected, task)
-                break
             case TaskType.UNDEPLOY:
             case TaskType.DEMOLISH:
                 break

package/src/scheduling/schedule.test.ts

@@ -50,10 +50,13 @@ function hold(kind: number) {
 }
 
 describe('isCapperTaskType', () => {
-    test('UNDEPLOY, DEMOLISH, REFIT are cappers', () => {
+    test('UNDEPLOY, DEMOLISH are cappers', () => {
         expect(isCapperTaskType(TaskType.UNDEPLOY)).toBe(true)
         expect(isCapperTaskType(TaskType.DEMOLISH)).toBe(true)
-        expect(isCapperTaskType(TaskType.REFIT)).toBe(true)
+    })
+
+    test('REFIT is not a capper', () => {
+        expect(isCapperTaskType(TaskType.REFIT)).toBe(false)
     })
 
     test('non-capper task types are not cappers', () => {
@@ -71,8 +74,8 @@ describe('hasPendingCapper', () => {
         expect(hasPendingCapper(entity([task({type: TaskType.TRAVEL})]))).toBe(false)
     })
 
-    test('true when a REFIT task is queued anywhere in the lane', () => {
-        const e = entity([task({type: TaskType.TRAVEL}), task({type: TaskType.REFIT})])
+    test('true when a DEMOLISH task is queued anywhere in the lane', () => {
+        const e = entity([task({type: TaskType.TRAVEL}), task({type: TaskType.DEMOLISH})])
         expect(hasPendingCapper(e)).toBe(true)
     })
 
@@ -88,18 +91,18 @@ describe('hasResolvable — capper gating', () => {
     })
 
     test('a completed capper front with no holds is resolvable', () => {
-        const e = entity([task({type: TaskType.REFIT, duration: 30})])
+        const e = entity([task({type: TaskType.DEMOLISH, duration: 30})])
         expect(hasResolvable(e, NOW)).toBe(true)
     })
 
     test('a completed capper front with a live hold is gated', () => {
-        const e = entity([task({type: TaskType.REFIT, duration: 30})], [hold(2)])
+        const e = entity([task({type: TaskType.DEMOLISH, duration: 30})], [hold(2)])
         expect(hasResolvable(e, NOW)).toBe(false)
     })
 
     test('a capper front clears once holds empty', () => {
-        const withHold = entity([task({type: TaskType.REFIT, duration: 30})], [hold(2)])
-        const cleared = entity([task({type: TaskType.REFIT, duration: 30})], [])
+        const withHold = entity([task({type: TaskType.DEMOLISH, duration: 30})], [hold(2)])
+        const cleared = entity([task({type: TaskType.DEMOLISH, duration: 30})], [])
         expect(hasResolvable(withHold, NOW)).toBe(false)
         expect(hasResolvable(cleared, NOW)).toBe(true)
     })
@@ -110,7 +113,7 @@ describe('hasResolvable — capper gating', () => {
     })
 
     test('an in-progress front is not resolvable regardless of holds', () => {
-        const e = entity([task({type: TaskType.REFIT, duration: 3600})])
+        const e = entity([task({type: TaskType.DEMOLISH, duration: 3600})])
         expect(hasResolvable(e, NOW)).toBe(false)
     })
 })

package/src/scheduling/schedule.ts

@@ -63,13 +63,9 @@ export function isIdle(entity: ScheduleData): boolean {
     return !hasSchedule(entity) && !hasHolds(entity)
 }
 
-// Mirrors is_capper_task_type: demolish/undeploy/refit cap a plan — no further appends once queued.
+// Mirrors is_capper_task_type: demolish/undeploy cap a plan — no further appends once queued.
 export function isCapperTaskType(taskType: number): boolean {
-    return (
-        taskType === TaskType.UNDEPLOY ||
-        taskType === TaskType.DEMOLISH ||
-        taskType === TaskType.REFIT
-    )
+    return taskType === TaskType.UNDEPLOY || taskType === TaskType.DEMOLISH
 }
 
 export function hasPendingCapper(entity: ScheduleData): boolean {