@shipload/sdk 1.0.0-next.8 → 1.0.0-next.9

package/src/types/entity-traits.ts

@@ -2,12 +2,14 @@ import {Name} from '@wharfkit/antelope'
 import {
     ITEM_CONTAINER_T1_PACKED,
     ITEM_CONTAINER_T2_PACKED,
+    ITEM_EXTRACTOR_T1_PACKED,
     ITEM_SHIP_T1_PACKED,
     ITEM_WAREHOUSE_T1_PACKED,
 } from '../data/item-ids'
 
 export const ENTITY_SHIP = Name.from('ship')
 export const ENTITY_WAREHOUSE = Name.from('warehouse')
+export const ENTITY_EXTRACTOR = Name.from('extractor')
 export const ENTITY_CONTAINER = Name.from('container')
 
 export enum EntityClass {
@@ -22,6 +24,7 @@ export function getEntityClass(entityType: Name | EntityTypeName): EntityClass {
         case 'container':
             return EntityClass.OrbitalVessel
         case 'warehouse':
+        case 'extractor':
             return EntityClass.PlanetaryStructure
         default:
             throw new Error(`Entity type has no class: ${typeName}`)
@@ -37,12 +40,14 @@ export function getPackedEntityType(itemId: number): Name | null {
             return ENTITY_CONTAINER
         case ITEM_WAREHOUSE_T1_PACKED:
             return ENTITY_WAREHOUSE
+        case ITEM_EXTRACTOR_T1_PACKED:
+            return ENTITY_EXTRACTOR
         default:
             return null
     }
 }
 
-export type EntityTypeName = 'ship' | 'warehouse' | 'container'
+export type EntityTypeName = 'ship' | 'warehouse' | 'extractor' | 'container'
 
 export interface EntityTraits {
     typeName: Name
@@ -70,6 +75,15 @@ export const warehouseTraits: EntityTraits = {
     notFoundError: 'warehouse not found',
 }
 
+export const extractorTraits: EntityTraits = {
+    typeName: ENTITY_EXTRACTOR,
+    isMovable: false,
+    hasEnergy: true,
+    hasLoaders: false,
+
+    notFoundError: 'extractor not found',
+}
+
 export const containerTraits: EntityTraits = {
     typeName: ENTITY_CONTAINER,
     isMovable: true,
@@ -87,6 +101,8 @@ export function getEntityTraits(entityType: Name | EntityTypeName): EntityTraits
             return shipTraits
         case 'warehouse':
             return warehouseTraits
+        case 'extractor':
+            return extractorTraits
         case 'container':
             return containerTraits
         default:
@@ -102,6 +118,10 @@ export function isWarehouse(entity: {type?: Name}): boolean {
     return entity.type?.equals(ENTITY_WAREHOUSE) ?? false
 }
 
+export function isExtractor(entity: {type?: Name}): boolean {
+    return entity.type?.equals(ENTITY_EXTRACTOR) ?? false
+}
+
 export function isContainer(entity: {type?: Name}): boolean {
     return entity.type?.equals(ENTITY_CONTAINER) ?? false
 }

package/src/types.ts

@@ -12,7 +12,7 @@ import {ServerContract} from './contracts'
 export const PRECISION = 10000
 export const CRAFT_ENERGY_DIVISOR = 150000
 
-export const WAREHOUSE_Z = 500
+export const PLANETARY_STRUCTURE_Z = 0
 
 export const CONTAINER_Z = 300
 

package/src/scheduling/predict-cargo.ts

@@ -1,151 +0,0 @@
-import type {ServerContract} from '../contracts'
-import {TaskType} from '../types'
-
-export type PredictedCargoTarget = {kind: 'existing'; rowId: bigint} | {kind: 'new'; label: string}
-
-export interface PredictedCargoAddition {
-    item_id: number
-    stats: bigint
-    modules: ServerContract.Types.module_entry[]
-    quantity: number
-    target: PredictedCargoTarget
-}
-
-export interface TaskCargoEffect {
-    additions: PredictedCargoAddition[]
-}
-
-interface StackState {
-    item_id: number
-    stats: bigint
-    modules: ServerContract.Types.module_entry[]
-    quantity: number
-    target: PredictedCargoTarget
-}
-
-function modulesEqual(
-    a: ServerContract.Types.module_entry[],
-    b: ServerContract.Types.module_entry[]
-): boolean {
-    if (a.length !== b.length) return false
-    for (let i = 0; i < a.length; i++) {
-        const ai = a[i]
-        const bi = b[i]
-        if (Number(ai.type) !== Number(bi.type)) return false
-        const aInst = ai.installed
-        const bInst = bi.installed
-        if (!aInst && !bInst) continue
-        if (!aInst || !bInst) return false
-        if (Number(aInst.item_id) !== Number(bInst.item_id)) return false
-        if (BigInt(aInst.stats.toString()) !== BigInt(bInst.stats.toString())) return false
-    }
-    return true
-}
-
-function findStack(
-    state: StackState[],
-    item_id: number,
-    stats: bigint,
-    modules: ServerContract.Types.module_entry[]
-): number {
-    for (let i = 0; i < state.length; i++) {
-        const s = state[i]
-        if (s.item_id !== item_id) continue
-        if (s.stats !== stats) continue
-        if (!modulesEqual(s.modules, modules)) continue
-        return i
-    }
-    return -1
-}
-
-function applyAddition(
-    state: StackState[],
-    item: ServerContract.Types.cargo_item,
-    nextNewLabel: () => string
-): PredictedCargoAddition {
-    const item_id = Number(item.item_id)
-    const stats = BigInt(item.stats.toString())
-    const modules = item.modules ?? []
-    const quantity = Number(item.quantity)
-
-    const idx = findStack(state, item_id, stats, modules)
-    if (idx === -1) {
-        const target: PredictedCargoTarget = {kind: 'new', label: nextNewLabel()}
-        state.push({item_id, stats, modules, quantity, target})
-        return {item_id, stats, modules, quantity, target}
-    }
-    state[idx].quantity += quantity
-    return {item_id, stats, modules, quantity, target: state[idx].target}
-}
-
-function applyRemoval(state: StackState[], item: ServerContract.Types.cargo_item): void {
-    const item_id = Number(item.item_id)
-    const stats = BigInt(item.stats.toString())
-    const modules = item.modules ?? []
-    const quantity = Number(item.quantity)
-
-    const idx = findStack(state, item_id, stats, modules)
-    if (idx === -1) return
-    state[idx].quantity -= quantity
-    if (state[idx].quantity <= 0) state.splice(idx, 1)
-}
-
-export function predictTaskCargoEffects(
-    cargo: readonly ServerContract.Types.cargo_view[],
-    tasks: readonly ServerContract.Types.task[]
-): TaskCargoEffect[] {
-    const state: StackState[] = cargo.map((c) => ({
-        item_id: Number(c.item_id),
-        stats: BigInt(c.stats.toString()),
-        modules: c.modules ?? [],
-        quantity: Number(c.quantity),
-        target: {kind: 'existing', rowId: BigInt(c.id.toString())},
-    }))
-
-    let newCounter = 0
-    const nextNewLabel = () => {
-        newCounter += 1
-        return `new#${newCounter}`
-    }
-
-    const effects: TaskCargoEffect[] = []
-
-    for (const task of tasks) {
-        const type = Number(task.type)
-        const items = task.cargo ?? []
-        const additions: PredictedCargoAddition[] = []
-
-        switch (type) {
-            case TaskType.LOAD:
-            case TaskType.UNWRAP: {
-                for (const item of items) additions.push(applyAddition(state, item, nextNewLabel))
-                break
-            }
-            case TaskType.GATHER: {
-                if (!task.entitytarget) {
-                    for (const item of items)
-                        additions.push(applyAddition(state, item, nextNewLabel))
-                }
-                break
-            }
-            case TaskType.UNLOAD:
-            case TaskType.WRAP: {
-                for (const item of items) applyRemoval(state, item)
-                break
-            }
-            case TaskType.CRAFT: {
-                if (items.length > 0) {
-                    for (let i = 0; i < items.length - 1; i++) applyRemoval(state, items[i])
-                    additions.push(applyAddition(state, items[items.length - 1], nextNewLabel))
-                }
-                break
-            }
-            default:
-                break
-        }
-
-        effects.push({additions})
-    }
-
-    return effects
-}