@shipload/sdk 1.0.0-next.43 → 1.0.0-next.44

package/src/data/recipes.json

@@ -24,6 +24,14 @@
             "statIndex": 2
           }
         ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 1
+          }
+        ]
       }
     ],
     "blendWeights": []
@@ -57,6 +65,22 @@
             "statIndex": 0
           }
         ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 2
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 1,
+            "statIndex": 2
+          }
+        ]
       }
     ],
     "blendWeights": []
@@ -86,6 +110,14 @@
             "statIndex": 2
           }
         ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 1
+          }
+        ]
       }
     ],
     "blendWeights": []
@@ -119,6 +151,14 @@
             "statIndex": 2
           }
         ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 0
+          }
+        ]
       }
     ],
     "blendWeights": []
@@ -152,6 +192,14 @@
             "statIndex": 1
           }
         ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 2
+          }
+        ]
       }
     ],
     "blendWeights": []
@@ -181,6 +229,14 @@
             "statIndex": 2
           }
         ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 1
+          }
+        ]
       }
     ],
     "blendWeights": []
@@ -210,6 +266,14 @@
             "statIndex": 1
           }
         ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 2
+          }
+        ]
       }
     ],
     "blendWeights": []
@@ -272,6 +336,22 @@
             "statIndex": 2
           }
         ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 1,
+            "statIndex": 2
+          }
+        ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 1,
+            "statIndex": 0
+          }
+        ]
       }
     ],
     "blendWeights": []
@@ -305,6 +385,14 @@
             "statIndex": 0
           }
         ]
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 0,
+            "statIndex": 1
+          }
+        ]
       }
     ],
     "blendWeights": []
@@ -324,6 +412,10 @@
           {
             "inputIndex": 0,
             "statIndex": 0
+          },
+          {
+            "inputIndex": 0,
+            "statIndex": 2
           }
         ]
       },
@@ -336,7 +428,9 @@
         ]
       }
     ],
-    "blendWeights": []
+    "blendWeights": [
+      1
+    ]
   },
   {
     "outputItemId": 10101,
@@ -353,6 +447,10 @@
           {
             "inputIndex": 0,
             "statIndex": 0
+          },
+          {
+            "inputIndex": 0,
+            "statIndex": 2
           }
         ]
       },
@@ -365,7 +463,9 @@
         ]
       }
     ],
-    "blendWeights": []
+    "blendWeights": [
+      1
+    ]
   },
   {
     "outputItemId": 10102,
@@ -376,7 +476,7 @@
         "quantity": 300
       },
       {
-        "itemId": 10010,
+        "itemId": 10002,
         "quantity": 300
       }
     ],
@@ -386,14 +486,10 @@
           {
             "inputIndex": 0,
             "statIndex": 0
-          }
-        ]
-      },
-      {
-        "sources": [
+          },
           {
             "inputIndex": 0,
-            "statIndex": 1
+            "statIndex": 2
           }
         ]
       },
@@ -402,6 +498,10 @@
           {
             "inputIndex": 1,
             "statIndex": 0
+          },
+          {
+            "inputIndex": 0,
+            "statIndex": 1
           }
         ]
       },
@@ -409,12 +509,15 @@
         "sources": [
           {
             "inputIndex": 1,
-            "statIndex": 1
+            "statIndex": 3
           }
         ]
       }
     ],
-    "blendWeights": []
+    "blendWeights": [
+      1,
+      1
+    ]
   },
   {
     "outputItemId": 10103,
@@ -439,11 +542,17 @@
           {
             "inputIndex": 0,
             "statIndex": 0
+          },
+          {
+            "inputIndex": 0,
+            "statIndex": 2
           }
         ]
       }
     ],
-    "blendWeights": []
+    "blendWeights": [
+      1
+    ]
   },
   {
     "outputItemId": 10104,
@@ -463,7 +572,11 @@
         "sources": [
           {
             "inputIndex": 0,
-            "statIndex": 0
+            "statIndex": 2
+          },
+          {
+            "inputIndex": 0,
+            "statIndex": 3
           }
         ]
       },
@@ -476,7 +589,10 @@
         ]
       }
     ],
-    "blendWeights": []
+    "blendWeights": [
+      1,
+      1
+    ]
   },
   {
     "outputItemId": 10105,
@@ -546,6 +662,10 @@
           {
             "inputIndex": 0,
             "statIndex": 0
+          },
+          {
+            "inputIndex": 0,
+            "statIndex": 1
           }
         ]
       },
@@ -561,12 +681,15 @@
         "sources": [
           {
             "inputIndex": 0,
-            "statIndex": 1
+            "statIndex": 2
           }
         ]
       }
     ],
-    "blendWeights": []
+    "blendWeights": [
+      1,
+      1
+    ]
   },
   {
     "outputItemId": 10107,
@@ -586,11 +709,11 @@
         "sources": [
           {
             "inputIndex": 0,
-            "statIndex": 0
+            "statIndex": 1
           },
           {
-            "inputIndex": 1,
-            "statIndex": 1
+            "inputIndex": 0,
+            "statIndex": 2
           }
         ]
       }
@@ -875,5 +998,33 @@
       }
     ],
     "blendWeights": []
+  },
+  {
+    "outputItemId": 10207,
+    "outputMass": 2400000,
+    "inputs": [
+      {
+        "itemId": 10005,
+        "quantity": 200
+      },
+      {
+        "itemId": 10010,
+        "quantity": 200
+      }
+    ],
+    "statSlots": [
+      {
+        "sources": []
+      },
+      {
+        "sources": [
+          {
+            "inputIndex": 1,
+            "statIndex": 1
+          }
+        ]
+      }
+    ],
+    "blendWeights": []
   }
 ]

package/src/derivation/build-methods.test.ts

@@ -0,0 +1,13 @@
+import {describe, expect, test} from 'bun:test'
+import {availableBuildMethods} from './build-methods'
+import {ITEM_HUB_T1_PACKED, ITEM_WAREHOUSE_T1_PACKED} from '../data/item-ids'
+
+describe('availableBuildMethods', () => {
+    test('orbital structures build via craft+deploy or plot', () => {
+        expect(availableBuildMethods(ITEM_WAREHOUSE_T1_PACKED)).toEqual(['craft+deploy', 'plot'])
+    })
+
+    test('hub is craft+deploy only — excluded from the plot path', () => {
+        expect(availableBuildMethods(ITEM_HUB_T1_PACKED)).toEqual(['craft+deploy'])
+    })
+})

package/src/derivation/build-methods.ts

@@ -1,4 +1,4 @@
-import {EntityClass, getKindMeta, getTemplateMeta} from '../data/kind-registry'
+import {ENTITY_HUB, EntityClass, getKindMeta, getTemplateMeta} from '../data/kind-registry'
 import {getRecipe} from '../data/recipes-runtime'
 import {getItems} from '../data/catalog'
 import type {Item} from '../types'
@@ -15,7 +15,10 @@ export function availableBuildMethods(itemId: number): BuildMethod[] {
     const kindMeta = getKindMeta(template.kind)
     if (!kindMeta) return ['craft+deploy']
 
-    if (kindMeta.classification === EntityClass.PlanetaryStructure) {
+    if (
+        kindMeta.classification === EntityClass.OrbitalStructure &&
+        !kindMeta.kind.equals(ENTITY_HUB)
+    ) {
         return ['craft+deploy', 'plot']
     }
     return ['craft+deploy']

package/src/derivation/capabilities.ts

@@ -78,12 +78,12 @@ export function computeGathererCapabilities(
 } {
     const str = stats.strength
     const con = stats.saturation
-    const tol = stats.tolerance
+    const hrd = stats.hardness
 
     return {
         yield: 200 + str,
         drain: 2 * Math.max(250, 1250 - Math.floor((con * 25) / 20)),
-        depth: gathererDepthForTier(tol, tier),
+        depth: gathererDepthForTier(hrd, tier),
     }
 }
 
@@ -106,11 +106,11 @@ export function computeCrafterCapabilities(stats: Record<string, number>): {
     speed: number
     drain: number
 } {
-    const rea = stats.reactivity
+    const fin = stats.fineness
     const con = stats.conductivity
 
     return {
-        speed: 100 + Math.floor((rea * 4) / 5),
+        speed: 100 + Math.floor((fin * 4) / 5),
         drain: Math.max(5, 30 - Math.floor(con / 33)),
     }
 }
@@ -122,12 +122,12 @@ export function computeHaulerCapabilities(stats: Record<string, number>): {
 } {
     const resonance = stats.resonance
     const plasticity = stats.plasticity
-    const reflectivity = stats.reflectivity
+    const conductivity = stats.conductivity
 
     return {
         capacity: Math.max(1, 1 + Math.floor(resonance / 400)),
         efficiency: 2000 + plasticity * 6,
-        drain: Math.max(3, 15 - Math.floor(reflectivity / 80)),
+        drain: Math.max(3, 15 - Math.floor(conductivity / 80)),
     }
 }
 
@@ -224,8 +224,8 @@ export function computeBaseCapacity(itemId: number, stats: Record<string, number
 export function computeWarpCapabilities(stats: Record<string, number>): {
     range: number
 } {
-    const resonance = stats.resonance
-    return {range: 100 + resonance * 3}
+    const reflectivity = stats.reflectivity
+    return {range: 100 + reflectivity * 3}
 }
 
 export function computeWarehouseHullCapabilities(stats: Record<string, number>): {

package/src/index-module.ts

@@ -46,9 +46,12 @@ export {
     LocationsManager,
     EpochsManager,
     ActionsManager,
+    ClusterManager,
+    computeFreeCells,
     NftManager,
     ConstructionManager,
 } from './managers'
+export type {GridCell, ClusterCell, Cluster} from './managers'
 export type {
     PlayerRosterEntry,
     LocationStratum,
@@ -315,6 +318,7 @@ export {
     ENTITY_FACTORY,
     ENTITY_CONTAINER,
     ENTITY_NEXUS,
+    ENTITY_HUB,
     getEntityClass,
     getPackedEntityType,
     getKindMeta,
@@ -332,6 +336,7 @@ export {
     isContainer,
     isNexus,
     isPlot,
+    isHub,
 } from './data/kind-registry'
 export type {EntityTypeName, KindMeta, TemplateMeta} from './data/kind-registry'
 export * from './capabilities'

package/src/managers/actions.ts

@@ -17,7 +17,7 @@ import {
     type UInt64Type,
 } from '@wharfkit/antelope'
 import {BaseManager} from './base'
-import {Coordinates, PRECISION, type CoordinatesType} from '../types'
+import {Coordinates, PRECISION, type ClusterSlotType, type CoordinatesType} from '../types'
 import {ServerContract} from '../contracts'
 import {ATOMICASSETS_ABI, SHIPLOAD_COLLECTION} from '../nft/atomicassets'
 import {getItem} from '../data/catalog'
@@ -435,22 +435,39 @@ export class ActionsManager extends BaseManager {
         })
     }
 
-    deploy(entityId: UInt64Type, ref: ServerContract.ActionParams.Type.cargo_ref): Action {
+    deploy(
+        entityId: UInt64Type,
+        ref: ServerContract.ActionParams.Type.cargo_ref,
+        slot?: ClusterSlotType
+    ): Action {
         return this.server.action('deploy', {
             id: UInt64.from(entityId),
             ref,
+            slot: slot ? {hub: UInt64.from(slot.hub), gx: slot.gx, gy: slot.gy} : undefined,
         })
     }
 
-    claimplot(
-        entityId: UInt64Type,
-        targetItemId: UInt16Type,
-        coords: ServerContract.ActionParams.Type.coordinates
-    ): Action {
+    claimplot(entityId: UInt64Type, targetItemId: UInt16Type, slot: ClusterSlotType): Action {
         return this.server.action('claimplot', {
             builder_id: UInt64.from(entityId),
             target_item_id: UInt16.from(targetItemId),
-            coords,
+            slot: {hub: UInt64.from(slot.hub), gx: slot.gx, gy: slot.gy},
+        })
+    }
+
+    movetile(
+        hubId: UInt64Type,
+        fromGx: number,
+        fromGy: number,
+        toGx: number,
+        toGy: number
+    ): Action {
+        return this.server.action('movetile', {
+            hub_id: UInt64.from(hubId),
+            from_gx: fromGx,
+            from_gy: fromGy,
+            to_gx: toGx,
+            to_gy: toGy,
         })
     }
 

package/src/managers/cluster.test.ts

@@ -0,0 +1,39 @@
+import {describe, expect, test} from 'bun:test'
+import {computeFreeCells} from './cluster'
+
+describe('computeFreeCells', () => {
+    test('returns footprint cells that are not occupied', () => {
+        const footprint = [
+            {gx: 2, gy: 0},
+            {gx: 0, gy: 2},
+            {gx: 1, gy: 1},
+        ]
+        const occupied = [{gx: 2, gy: 0, entity: 7}]
+        expect(computeFreeCells(footprint, occupied)).toEqual([
+            {gx: 0, gy: 2},
+            {gx: 1, gy: 1},
+        ])
+    })
+
+    test('matches occupancy on signed coordinates', () => {
+        const footprint = [
+            {gx: -2, gy: 0},
+            {gx: 0, gy: -2},
+            {gx: -1, gy: 1},
+        ]
+        const occupied = [{gx: 0, gy: -2, entity: 9}]
+        expect(computeFreeCells(footprint, occupied)).toEqual([
+            {gx: -2, gy: 0},
+            {gx: -1, gy: 1},
+        ])
+    })
+
+    test('empty footprint yields no free cells', () => {
+        expect(computeFreeCells([], [])).toEqual([])
+    })
+
+    test('fully occupied footprint yields no free cells', () => {
+        const footprint = [{gx: 1, gy: 1}]
+        expect(computeFreeCells(footprint, [{gx: 1, gy: 1, entity: 3}])).toEqual([])
+    })
+})

package/src/managers/cluster.ts

@@ -0,0 +1,53 @@
+import {UInt16, type UInt16Type, UInt64, type UInt64Type} from '@wharfkit/antelope'
+import {BaseManager} from './base'
+import type {ServerContract} from '../contracts'
+
+export interface GridCell {
+    gx: number
+    gy: number
+}
+
+export interface ClusterCell extends GridCell {
+    entity: number
+}
+
+export interface Cluster {
+    root: number
+    cells: ClusterCell[]
+}
+
+export function computeFreeCells(footprint: GridCell[], occupied: ClusterCell[]): GridCell[] {
+    const taken = new Set(occupied.map((c) => `${c.gx},${c.gy}`))
+    return footprint.filter((c) => !taken.has(`${c.gx},${c.gy}`))
+}
+
+export class ClusterManager extends BaseManager {
+    async getFootprint(itemId: UInt16Type): Promise<GridCell[]> {
+        const res = (await this.server.readonly('getfootprint', {
+            item_id: UInt16.from(itemId),
+        })) as ServerContract.Types.footprint_result
+        return res.cells.map((c) => ({gx: Number(c.gx), gy: Number(c.gy)}))
+    }
+
+    async getCluster(hubId: UInt64Type): Promise<Cluster> {
+        const res = (await this.server.readonly('getcluster', {
+            hub_id: UInt64.from(hubId),
+        })) as ServerContract.Types.cluster_row
+        return {
+            root: Number(res.root),
+            cells: res.cells.map((c) => ({
+                gx: Number(c.gx),
+                gy: Number(c.gy),
+                entity: Number(c.entity),
+            })),
+        }
+    }
+
+    async freeCells(hubId: UInt64Type, hubItemId: UInt16Type): Promise<GridCell[]> {
+        const [footprint, cluster] = await Promise.all([
+            this.getFootprint(hubItemId),
+            this.getCluster(hubId),
+        ])
+        return computeFreeCells(footprint, cluster.cells)
+    }
+}

package/src/managers/context.ts

@@ -9,6 +9,7 @@ import {LocationsManager} from './locations'
 import {CoordinatesManager} from './coordinates'
 import {EpochsManager} from './epochs'
 import {ActionsManager} from './actions'
+import {ClusterManager} from './cluster'
 import {NftManager} from './nft'
 import {SubscriptionsManager} from '../subscriptions/manager'
 
@@ -19,6 +20,7 @@ export class GameContext {
     private _coordinates?: CoordinatesManager
     private _epochs?: EpochsManager
     private _actions?: ActionsManager
+    private _clusters?: ClusterManager
     private _nft?: NftManager
     private _subscriptions?: SubscriptionsManager
     private _subscriptionsUrl?: string
@@ -75,6 +77,13 @@ export class GameContext {
         return this._actions
     }
 
+    get clusters(): ClusterManager {
+        if (!this._clusters) {
+            this._clusters = new ClusterManager(this)
+        }
+        return this._clusters
+    }
+
     get nft(): NftManager {
         if (!this._nft) {
             this._nft = new NftManager(this)

package/src/managers/index.ts

@@ -8,6 +8,8 @@ export {LocationsManager} from './locations'
 export type {LocationStratum} from './locations'
 export {EpochsManager} from './epochs'
 export {ActionsManager} from './actions'
+export {ClusterManager, computeFreeCells} from './cluster'
+export type {GridCell, ClusterCell, Cluster} from './cluster'
 export {NftManager} from './nft'
 export type {NftConfigForItem} from './nft'
 export {PlotManager} from './plot'