@shipload/sdk 1.0.0-next.67 → 1.0.0-next.68

package/lib/shipload.d.ts

@@ -5080,8 +5080,8 @@ interface CivicShuttleBay {
     queued: number;
     full: boolean;
 }
-declare function civicShuttleBays(modules: ModuleEntry$5[], entityItemId: number, lanes: Lane$1[]): CivicShuttleBay[];
-declare function selectCivicShuttleBay(modules: ModuleEntry$5[], entityItemId: number, lanes: Lane$1[]): CivicShuttleBay | undefined;
+declare function civicShuttleBays(modules: ModuleEntry$5[], entityItemId: number, lanes: Lane$1[], now?: Date): CivicShuttleBay[];
+declare function selectCivicShuttleBay(modules: ModuleEntry$5[], entityItemId: number, lanes: Lane$1[], now?: Date): CivicShuttleBay | undefined;
 interface PendingCivicTransfer {
     laneKey: number;
     taskIndex: number;
@@ -5091,11 +5091,12 @@ interface PendingCivicTransfer {
     startsAt: Date;
     completesAt: Date;
     isTail: boolean;
+    complete: boolean;
     callable: boolean;
 }
-declare function pendingCivicTransfers(entity: ScheduleData): PendingCivicTransfer[];
-declare function civicTransfersFrom(entity: ScheduleData, senderIds: Array<UInt64 | string | number>): PendingCivicTransfer[];
-declare function civicTransfersAtCap(entity: ScheduleData, senderIds: Array<UInt64 | string | number>): boolean;
+declare function pendingCivicTransfers(entity: ScheduleData, now?: Date): PendingCivicTransfer[];
+declare function civicTransfersFrom(entity: ScheduleData, senderIds: Array<UInt64 | string | number>, now?: Date): PendingCivicTransfer[];
+declare function civicTransfersAtCap(entity: ScheduleData, senderIds: Array<UInt64 | string | number>, now?: Date): boolean;
 
 declare function citizenryName(gameSeed: Checksum256Type, coordinates: CoordinatesType): string | undefined;
 declare function citizenryPatternCount(): number;

package/lib/shipload.js

@@ -20085,7 +20085,21 @@ function depotTransferDuration(params) {
 }
 
 const CIVIC_TRANSFER_PER_PLAYER_CAP = 4;
-function civicShuttleBays(modules, entityItemId, lanes) {
+function unfinishedTasks(lane, now) {
+    if (!lane)
+        return 0;
+    const startedMs = lane.schedule.started.toDate().getTime();
+    const nowMs = now.getTime();
+    let endSec = 0;
+    let count = 0;
+    for (const task of lane.schedule.tasks) {
+        endSec += task.duration.toNumber();
+        if (startedMs + endSec * 1000 > nowMs)
+            count++;
+    }
+    return count;
+}
+function civicShuttleBays(modules, entityItemId, lanes, now = new Date()) {
     const bays = [];
     for (let slotIndex = 0; slotIndex < modules.length; slotIndex++) {
         const installed = modules[slotIndex].installed;
@@ -20096,7 +20110,7 @@ function civicShuttleBays(modules, entityItemId, lanes) {
         const laneKey = laneKeyForModule(slotIndex);
         const loader = resolveLaneLoader(modules, entityItemId, laneKey);
         const lane = lanes.find((l) => l.lane_key.toNumber() === laneKey);
-        const queued = lane ? lane.schedule.tasks.length : 0;
+        const queued = unfinishedTasks(lane, now);
         bays.push({
             laneKey,
             slotIndex,
@@ -20109,11 +20123,11 @@ function civicShuttleBays(modules, entityItemId, lanes) {
     }
     return bays;
 }
-function selectCivicShuttleBay(modules, entityItemId, lanes) {
-    const bays = civicShuttleBays(modules, entityItemId, lanes);
+function selectCivicShuttleBay(modules, entityItemId, lanes, now = new Date()) {
+    const bays = civicShuttleBays(modules, entityItemId, lanes, now);
     return bays.find((bay) => bay.queued === 0) ?? bays[0];
 }
-function pendingCivicTransfers(entity) {
+function pendingCivicTransfers(entity, now = new Date()) {
     const tailIndex = new Map();
     for (const l of entity.lanes ?? []) {
         tailIndex.set(l.lane_key.toNumber(), l.schedule.tasks.length - 1);
@@ -20127,6 +20141,7 @@ function pendingCivicTransfers(entity) {
         if (!pull || !push)
             continue;
         const isTail = tailIndex.get(entry.laneKey) === entry.taskIndex;
+        const complete = entry.completesAt.getTime() <= now.getTime();
         out.push({
             laneKey: entry.laneKey,
             taskIndex: entry.taskIndex,
@@ -20136,17 +20151,19 @@ function pendingCivicTransfers(entity) {
             startsAt: entry.startsAt,
             completesAt: entry.completesAt,
             isTail,
-            callable: isTail && !entry.task.entitygroup,
+            complete,
+            callable: isTail && !complete && !entry.task.entitygroup,
         });
     }
     return out;
 }
-function civicTransfersFrom(entity, senderIds) {
+function civicTransfersFrom(entity, senderIds, now = new Date()) {
     const owned = new Set(senderIds.map((id) => String(id)));
-    return pendingCivicTransfers(entity).filter((t) => owned.has(String(t.senderId)));
+    return pendingCivicTransfers(entity, now).filter((t) => owned.has(String(t.senderId)));
 }
-function civicTransfersAtCap(entity, senderIds) {
-    return civicTransfersFrom(entity, senderIds).length >= CIVIC_TRANSFER_PER_PLAYER_CAP;
+function civicTransfersAtCap(entity, senderIds, now = new Date()) {
+    return (civicTransfersFrom(entity, senderIds, now).filter((t) => !t.complete).length >=
+        CIVIC_TRANSFER_PER_PLAYER_CAP);
 }
 
 var citizenryAdjectives = [