@shipload/sdk 1.0.0-next.59 → 1.0.0-next.60

package/src/scheduling/lanes.ts

@@ -2,10 +2,9 @@ import type {ServerContract} from '../contracts'
 import {getItem} from '../data/catalog'
 import {getEntityLayout} from '../data/recipes-runtime'
 import {decodeStat} from '../derivation/crafting'
-import {gathererDepthForTier} from '../derivation/capabilities'
+import {gathererDepthForTier, computeGathererYield} from '../derivation/capabilities'
 import {applySlotMultiplier, getSlotAmp} from '../entities/slot-multiplier'
 import {
-    computeGathererYield,
     computeGathererDrain,
     computeLoaderThrust,
     computeLoaderMass,
@@ -76,7 +75,7 @@ export function resolveLaneGatherer(
     const con = decodeStat(stats, 2)
     const layout = getEntityLayout(entityItemId)?.slots ?? []
     const amp = getSlotAmp(layout, idx)
-    const yieldVal = applySlotMultiplier(computeGathererYield(str), amp)
+    const yieldVal = applySlotMultiplier(computeGathererYield(str, item.tier ?? 1), amp)
     const drain = computeGathererDrain(con)
     const depth = gathererDepthForTier(tol, item.tier ?? 1)
     return {slotIndex: idx, yield: yieldVal, drain, depth, outputPct: amp}
@@ -114,7 +113,7 @@ export function resolveLaneCrafter(
     const fin = decodeStat(stats, 1)
     const layout = getEntityLayout(entityItemId)?.slots ?? []
     const amp = getSlotAmp(layout, idx)
-    const speed = applySlotMultiplier(computeCrafterSpeed(rea), amp)
+    const speed = applySlotMultiplier(computeCrafterSpeed(rea, item.tier ?? 1), amp)
     const drain = computeCrafterDrain(fin)
     return {slotIndex: idx, speed, drain, outputPct: amp}
 }
@@ -134,7 +133,7 @@ export function resolveLaneBuilder(
     const fin = decodeStat(stats, 1)
     const layout = getEntityLayout(entityItemId)?.slots ?? []
     const amp = getSlotAmp(layout, idx)
-    const speed = applySlotMultiplier(computeBuilderSpeed(res), amp)
+    const speed = applySlotMultiplier(computeBuilderSpeed(res, item.tier ?? 1), amp)
     const drain = computeBuilderDrain(fin)
     return {slotIndex: idx, speed, drain, outputPct: amp}
 }
@@ -153,12 +152,13 @@ export function resolveLaneLoader(
     if (!installed) {
         return {slotIndex: idx, thrust: 0, mass: 0, outputPct: 0, valid: false}
     }
+    const item = getItem(Number(installed.item_id.value ?? installed.item_id))
     const stats = BigInt(installed.stats.toString())
     const ins = decodeStat(stats, 0)
     const pla = decodeStat(stats, 1)
     const layout = getEntityLayout(entityItemId)?.slots ?? []
     const amp = getSlotAmp(layout, idx)
-    const thrust = applySlotMultiplier(computeLoaderThrust(pla), amp)
+    const thrust = applySlotMultiplier(computeLoaderThrust(pla, item.tier ?? 1), amp)
     const mass = computeLoaderMass(ins)
     return {slotIndex: idx, thrust, mass, outputPct: amp, valid: true}
 }

package/src/scheduling/projection.ts

@@ -29,6 +29,7 @@ import {
     subtractFromStacks,
     stackToCargoItem,
 } from '../capabilities/storage'
+import {craftCargoOwnership} from './availability'
 import * as schedule from './schedule'
 import type {ScheduleData} from './schedule'
 
@@ -394,10 +395,13 @@ function applyCraftTask(projected: ProjectedEntity, task: ServerContract.Types.t
     applyEnergyCost(projected, task)
     if (task.cargo.length === 0) return
 
-    for (let i = 0; i < task.cargo.length - 1; i++) {
-        removeCargoItem(projected, task.cargo[i])
+    const {clustered, ownOutput} = craftCargoOwnership(task)
+    if (!clustered) {
+        for (let i = 0; i < task.cargo.length - 1; i++) {
+            removeCargoItem(projected, task.cargo[i])
+        }
     }
-    if (task.couplings.length === 0) {
+    if (ownOutput) {
         addCargoItem(projected, task.cargo[task.cargo.length - 1])
     }
 }

package/src/scheduling/task-cargo.test.ts

@@ -0,0 +1,44 @@
+import {describe, expect, test} from 'bun:test'
+import {ServerContract, TaskType} from '../index-module'
+import {taskCargoChanges} from './task-cargo'
+
+function cargoItem(itemId: number, quantity: number) {
+    return ServerContract.Types.cargo_item.from({item_id: itemId, stats: 0, modules: [], quantity})
+}
+
+function craftTask(couplings: ReturnType<typeof coupling>[]) {
+    return ServerContract.Types.task.from({
+        type: TaskType.CRAFT,
+        duration: 60,
+        cancelable: 0,
+        cargo: [cargoItem(401, 19680), cargoItem(10008, 1968)],
+        couplings,
+    })
+}
+
+function coupling() {
+    return ServerContract.Types.coupling.from({
+        counterpart: {entity_type: 'warehouse', entity_id: 51},
+        hold: 1,
+        kind: 3,
+    })
+}
+
+describe('taskCargoChanges', () => {
+    test('a self-craft consumes inputs and delivers the output to the crafter', () => {
+        const changes = taskCargoChanges(craftTask([]))
+
+        expect(changes).toEqual([
+            {direction: 'out', item_id: 401, stats: 0n, modules: [], quantity: 19680},
+            {direction: 'in', item_id: 10008, stats: 0n, modules: [], quantity: 1968},
+        ])
+    })
+
+    test('a coupled craft consumes inputs but does not deliver the output to the crafter', () => {
+        const changes = taskCargoChanges(craftTask([coupling()]))
+
+        expect(changes).toEqual([
+            {direction: 'out', item_id: 401, stats: 0n, modules: [], quantity: 19680},
+        ])
+    })
+})

package/src/scheduling/task-cargo.ts

@@ -38,7 +38,7 @@ export function taskCargoChanges(task: ServerContract.Types.task): TaskCargoChan
         case TaskType.CRAFT:
             return [
                 ...items.slice(0, -1).map((i) => toChange(i, 'out')),
-                toChange(items[items.length - 1], 'in'),
+                ...(task.couplings.length > 0 ? [] : [toChange(items[items.length - 1], 'in')]),
             ]
         default:
             return []

package/src/types.ts

@@ -85,6 +85,7 @@ export enum HoldKind {
     BUILD = 4,
     FLIGHT = 5,
     UPGRADE = 6,
+    SOURCE = 7,
 }
 
 export enum LocationType {