@shipload/sdk 1.0.0-next.74 → 1.0.0-next.76

package/src/scheduling/unwrap.test.ts

@@ -11,9 +11,20 @@ import {
 import {TimePoint, UInt8, UInt16, UInt32, UInt64} from '@wharfkit/antelope'
 import {ServerContract} from '../contracts'
 import {getItem} from '../data/catalog'
-import {ITEM_BEAM} from '../data/item-ids'
+import {
+    ITEM_BEAM,
+    ITEM_ENGINE_T1,
+    ITEM_GENERATOR_T1,
+    ITEM_ROUSTABOUT_T1A_PACKED,
+} from '../data/item-ids'
+import {getBaseHullmassFor} from '../derivation/capabilities'
 import {TaskType} from '../types'
 
+const REFERENCE_MASS =
+    getBaseHullmassFor(ITEM_ROUSTABOUT_T1A_PACKED) +
+    Number(getItem(ITEM_ENGINE_T1).mass) +
+    Number(getItem(ITEM_GENERATOR_T1).mass)
+
 describe('unwrap duration mirror', () => {
     test('derivedLoaders aggregates lanes like derived_loaders()', () => {
         expect(derivedLoaders([])).toBeNull()
@@ -25,12 +36,20 @@ describe('unwrap duration mirror', () => {
         ).toEqual({mass: 1200, thrust: 30, quantity: 2}) // floor(2400/2)=1200, sum thrust, count
     })
 
-    test('transit floors distance then flight time', () => {
-        // distance = floor(sqrt(3^2+4^2)*10000)=50000; accel=400/(mass*100)*10000; flight=floor(2*sqrt(d/accel))
-        const mass = 1000
+    test('transit floors item mass at cruise-transition distance before cruise-capping flight time', () => {
+        // distance 50000 is past the cruise transition; item mass 1000 is under the floor, so accel uses it
+        const accel = (400 / (REFERENCE_MASS * 100)) * 10000
+        const cruiseVelocity = Math.sqrt(accel * 2 * 10000)
+        const expected = Math.floor(50000 / cruiseVelocity + cruiseVelocity / accel)
+        expect(unwrapTransitDuration(1000, {x: 0, y: 0}, {x: 3, y: 4})).toBe(expected)
+    })
+
+    test('transit below cruise transition uses the sqrt curve, and a heavy item skips the mass floor', () => {
+        // distance 5000 is within the cruise transition
+        const mass = REFERENCE_MASS * 2
         const accel = (400 / (mass * 100)) * 10000
-        const expected = Math.floor(2 * Math.sqrt(50000 / accel))
-        expect(unwrapTransitDuration(mass, {x: 0, y: 0}, {x: 3, y: 4})).toBe(expected)
+        const expected = Math.floor(2 * Math.sqrt(5000 / accel))
+        expect(unwrapTransitDuration(mass, {x: 0, y: 0}, {x: 0.3, y: 0.4})).toBe(expected)
     })
 
     test('load uses altitude z, adds loader mass, divides by quantity', () => {

package/src/scheduling/unwrap.ts

@@ -2,11 +2,19 @@ import type {UInt16Type, UInt32Type} from '@wharfkit/antelope'
 import {calcCargoItemMass} from '../capabilities/storage'
 import type {ServerContract} from '../contracts'
 import {MASS_STAT_SCALE, PRECISION} from '../types'
+import {getBaseHullmassFor} from '../derivation/capabilities'
+import {getItem} from '../data/catalog'
+import {ITEM_ENGINE_T1, ITEM_GENERATOR_T1, ITEM_ROUSTABOUT_T1A_PACKED} from '../data/item-ids'
 import * as sched from './schedule'
 import {taskCargoEffect} from './availability'
 import {candidateLaneCompletesAt} from './lanes'
 
 const NFT_TRANSIT_THRUST = 400
+const CRUISE_TRANSITION_DISTANCE = 2 * PRECISION
+const NFT_TRANSIT_REFERENCE_MASS =
+    getBaseHullmassFor(ITEM_ROUSTABOUT_T1A_PACKED) +
+    Number(getItem(ITEM_ENGINE_T1).mass) +
+    Number(getItem(ITEM_GENERATOR_T1).mass)
 const BASELINE_LOADER: DerivedLoaders = {mass: 20, thrust: 1, quantity: 1}
 // ground-level entities (warehouses, z=0) still incur a base orbital climb of load effort
 const MIN_LOAD_Z = 800
@@ -45,6 +53,13 @@ function flightTime(distance: number, accel: number): number {
     return Math.floor(2 * Math.sqrt(distance / accel))
 }
 
+function travelFlightTime(distance: number, accel: number): number {
+    if (accel <= 0 || distance <= 0) return 0
+    if (distance <= CRUISE_TRANSITION_DISTANCE) return flightTime(distance, accel)
+    const cruiseVelocity = Math.sqrt(accel * CRUISE_TRANSITION_DISTANCE)
+    return Math.floor(distance / cruiseVelocity + cruiseVelocity / accel)
+}
+
 function distance2d(ax: number, ay: number, bx: number, by: number): number {
     const dx = ax - bx
     const dy = ay - by
@@ -57,9 +72,9 @@ export function unwrapTransitDuration(
     dest: {x: number; y: number}
 ): number {
     if (itemMass <= 0) return 0
-    return flightTime(
+    return travelFlightTime(
         distance2d(origin.x, origin.y, dest.x, dest.y),
-        acceleration(NFT_TRANSIT_THRUST, itemMass)
+        acceleration(NFT_TRANSIT_THRUST, Math.max(itemMass, NFT_TRANSIT_REFERENCE_MASS))
     )
 }
 
@@ -71,7 +86,8 @@ export function unwrapLoadDuration(
     if (!loaders || itemMass <= 0) return 0
     const total = itemMass + loaders.mass
     const flight = flightTime(Math.max(destZ, MIN_LOAD_Z), acceleration(loaders.thrust, total))
-    return Math.floor(flight / loaders.quantity)
+    const duration = Math.floor(flight / loaders.quantity)
+    return duration === 0 ? 1 : duration
 }
 
 export interface UnwrapItem {

package/src/travel/travel.ts

@@ -42,6 +42,7 @@ import {hasSystem} from '../utils/system'
 import {WH} from '../derivation/wormhole'
 import * as scheduleModel from '../scheduling/schedule'
 import type {ScheduleData} from '../scheduling/schedule'
+import {incomingHoldMass} from '../scheduling/unwrap'
 
 function isPositionalTask(task: ServerContract.Types.task): boolean {
     return task.type.equals(TaskType.TRAVEL) || task.type.equals(TaskType.TRANSIT)
@@ -273,6 +274,9 @@ export function calc_ship_mass(ship: ShipLike, cargos: CargoMassInfo[]): UInt64
         mass.add(UInt64.from(cargoMass))
     }
 
+    // barrier logic defers a mobility task past max_hold_until, so incoming cargo is aboard by departure
+    mass.add(UInt64.from(incomingHoldMass(ship.holds)))
+
     return mass
 }
 

package/src/types.ts

@@ -47,6 +47,7 @@ export interface ShipLike {
     loader_lanes?: ServerContract.Types.loader_lane[]
     hauler?: ServerContract.Types.hauler_stats
     capacity?: UInt32
+    holds?: ServerContract.Types.hold[]
 }
 
 export interface CargoMassInfo {
@@ -80,6 +81,7 @@ export enum TaskType {
     DEPOT_TAKE = 22,
     CIVIC_DEPOSIT = 21,
     CIVIC_WITHDRAW = 22,
+    CIVIC_DRAW = 23,
 }
 
 export enum RefitOp {