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

package/lib/shipload.js

@@ -3860,14 +3860,13 @@ const ITEM_MASS_CATCHER_T1_PACKED = 10206;
 const ITEM_HUB_T1_PACKED = 10207;
 const ITEM_WORKSHOP_T1_PACKED = 10208;
 const ITEM_CONSTRUCTION_DOCK_T1_PACKED = 10209;
-const ITEM_ROUSTABOUT_T1_PACKED = 10210;
-const ITEM_PROSPECTOR_T1_PACKED = 10211;
-const ITEM_TENDER_T1_PACKED = 10212;
-const ITEM_WRIGHT_T1_PACKED = 10213;
-const ITEM_TUG_T1_PACKED = 10214;
-const ITEM_PORTER_T1_PACKED = 10215;
-const ITEM_WRANGLER_T1_PACKED = 10216;
-const ITEM_DREDGER_T1_PACKED = 10217;
+const ITEM_ROUSTABOUT_T1A_PACKED = 10210;
+const ITEM_PROSPECTOR_T1A_PACKED = 10211;
+const ITEM_TENDER_T1A_PACKED = 10212;
+const ITEM_WRIGHT_T1A_PACKED = 10213;
+const ITEM_TUG_T1A_PACKED = 10214;
+const ITEM_PORTER_T1A_PACKED = 10215;
+const ITEM_SMITH_T1A_PACKED = 10218;
 const ITEM_PLATE_T2 = 20001;
 const ITEM_FRAME_T2 = 20002;
 const ITEM_PLASMA_CELL_T2 = 20003;
@@ -3881,8 +3880,9 @@ const ITEM_RESIN_T2 = 20010;
 const ITEM_GATHERER_T2 = 20102;
 const ITEM_HAULER_T2 = 20106;
 const ITEM_CONTAINER_T2_PACKED = 20200;
-const ITEM_PROSPECTOR_T2_PACKED = 20210;
-const ITEM_HAULER_SHIP_T2_PACKED = 20211;
+const ITEM_PROSPECTOR_T2A_PACKED = 20212;
+const ITEM_PROSPECTOR_T2B_PACKED = 20213;
+const ITEM_DREDGER_T2A_PACKED = 20214;
 
 var recipes = [
 	{
@@ -5512,126 +5512,31 @@ var recipes = [
 		sourceSubclass: 10210
 	},
 	{
-		outputItemId: 10216,
-		outputMass: 3600000,
-		inputs: [
-			{
-				itemId: 10005,
-				quantity: 150
-			},
-			{
-				itemId: 10002,
-				quantity: 150
-			},
-			{
-				itemId: 10010,
-				quantity: 150
-			},
-			{
-				itemId: 10009,
-				quantity: 150
-			},
-			{
-				itemId: 10004,
-				quantity: 150
-			},
-			{
-				itemId: 10211,
-				quantity: 1
-			}
-		],
-		statSlots: [
-			{
-				sources: [
-					{
-						inputIndex: 0,
-						statIndex: 0
-					},
-					{
-						inputIndex: 5,
-						statIndex: 0
-					}
-				]
-			},
-			{
-				sources: [
-					{
-						inputIndex: 1,
-						statIndex: 0
-					},
-					{
-						inputIndex: 5,
-						statIndex: 1
-					}
-				]
-			},
-			{
-				sources: [
-					{
-						inputIndex: 2,
-						statIndex: 0
-					},
-					{
-						inputIndex: 5,
-						statIndex: 2
-					}
-				]
-			},
-			{
-				sources: [
-					{
-						inputIndex: 3,
-						statIndex: 0
-					},
-					{
-						inputIndex: 5,
-						statIndex: 3
-					}
-				]
-			},
-			{
-				sources: [
-					{
-						inputIndex: 4,
-						statIndex: 0
-					},
-					{
-						inputIndex: 5,
-						statIndex: 4
-					}
-				]
-			}
-		],
-		blendWeights: [
-		],
-		sourceSubclass: 10211
-	},
-	{
-		outputItemId: 10217,
-		outputMass: 3600000,
+		outputItemId: 10218,
+		outputMass: 2400000,
 		inputs: [
 			{
 				itemId: 10005,
-				quantity: 150
+				quantity: 100
 			},
 			{
 				itemId: 10002,
-				quantity: 150
+				quantity: 100
 			},
 			{
 				itemId: 10010,
-				quantity: 150
+				quantity: 100
 			},
 			{
 				itemId: 10009,
-				quantity: 150
+				quantity: 100
 			},
 			{
 				itemId: 10004,
-				quantity: 150
+				quantity: 100
 			},
 			{
-				itemId: 10211,
+				itemId: 10210,
 				quantity: 1
 			}
 		],
@@ -5699,7 +5604,7 @@ var recipes = [
 		],
 		blendWeights: [
 		],
-		sourceSubclass: 10211
+		sourceSubclass: 10210
 	},
 	{
 		outputItemId: 20001,
@@ -6297,8 +6202,103 @@ var recipes = [
 		sourceSubclass: 10200
 	},
 	{
-		outputItemId: 20210,
-		outputMass: 3840000,
+		outputItemId: 20212,
+		outputMass: 4320000,
+		inputs: [
+			{
+				itemId: 20001,
+				quantity: 200
+			},
+			{
+				itemId: 20008,
+				quantity: 200
+			},
+			{
+				itemId: 20007,
+				quantity: 200
+			},
+			{
+				itemId: 20003,
+				quantity: 200
+			},
+			{
+				itemId: 20006,
+				quantity: 200
+			},
+			{
+				itemId: 10211,
+				quantity: 1
+			}
+		],
+		statSlots: [
+			{
+				sources: [
+					{
+						inputIndex: 0,
+						statIndex: 0
+					},
+					{
+						inputIndex: 5,
+						statIndex: 0
+					}
+				]
+			},
+			{
+				sources: [
+					{
+						inputIndex: 1,
+						statIndex: 0
+					},
+					{
+						inputIndex: 5,
+						statIndex: 1
+					}
+				]
+			},
+			{
+				sources: [
+					{
+						inputIndex: 2,
+						statIndex: 0
+					},
+					{
+						inputIndex: 5,
+						statIndex: 2
+					}
+				]
+			},
+			{
+				sources: [
+					{
+						inputIndex: 3,
+						statIndex: 0
+					},
+					{
+						inputIndex: 5,
+						statIndex: 3
+					}
+				]
+			},
+			{
+				sources: [
+					{
+						inputIndex: 4,
+						statIndex: 0
+					},
+					{
+						inputIndex: 5,
+						statIndex: 4
+					}
+				]
+			}
+		],
+		blendWeights: [
+		],
+		sourceSubclass: 10211
+	},
+	{
+		outputItemId: 20213,
+		outputMass: 5760000,
 		inputs: [
 			{
 				itemId: 20005,
@@ -6321,7 +6321,7 @@ var recipes = [
 				quantity: 150
 			},
 			{
-				itemId: 10211,
+				itemId: 20212,
 				quantity: 1
 			}
 		],
@@ -6389,11 +6389,11 @@ var recipes = [
 		],
 		blendWeights: [
 		],
-		sourceSubclass: 10211
+		sourceSubclass: 20212
 	},
 	{
-		outputItemId: 20211,
-		outputMass: 3840000,
+		outputItemId: 20214,
+		outputMass: 5760000,
 		inputs: [
 			{
 				itemId: 20005,
@@ -6416,7 +6416,7 @@ var recipes = [
 				quantity: 150
 			},
 			{
-				itemId: 10214,
+				itemId: 20212,
 				quantity: 1
 			}
 		],
@@ -6484,7 +6484,7 @@ var recipes = [
 		],
 		blendWeights: [
 		],
-		sourceSubclass: 10214
+		sourceSubclass: 20212
 	}
 ];
 
@@ -6719,7 +6719,7 @@ var entities = [
 				maxTier: 1
 			}
 		],
-		baseHullmass: 3600000
+		baseHullmass: 4000000
 	},
 	{
 		entityItemId: 10212,
@@ -6740,7 +6740,7 @@ var entities = [
 				maxTier: 1
 			}
 		],
-		baseHullmass: 3600000
+		baseHullmass: 4000000
 	},
 	{
 		entityItemId: 10213,
@@ -6761,7 +6761,7 @@ var entities = [
 				maxTier: 1
 			}
 		],
-		baseHullmass: 4400000
+		baseHullmass: 4000000
 	},
 	{
 		entityItemId: 10214,
@@ -6782,7 +6782,7 @@ var entities = [
 				maxTier: 1
 			}
 		],
-		baseHullmass: 4400000
+		baseHullmass: 4000000
 	},
 	{
 		entityItemId: 10215,
@@ -6803,28 +6803,23 @@ var entities = [
 				maxTier: 1
 			}
 		],
-		baseHullmass: 5000000
+		baseHullmass: 4000000
 	},
 	{
-		entityItemId: 10216,
+		entityItemId: 10218,
 		slots: [
 			{
 				type: "generator",
-				outputPct: 90,
+				outputPct: 85,
 				maxTier: 1
 			},
 			{
 				type: "engine",
-				outputPct: 90,
-				maxTier: 1
-			},
-			{
-				type: "gatherer",
-				outputPct: 100,
+				outputPct: 85,
 				maxTier: 1
 			},
 			{
-				type: "gatherer",
+				type: "crafter",
 				outputPct: 100,
 				maxTier: 1
 			}
@@ -6832,53 +6827,48 @@ var entities = [
 		baseHullmass: 4000000
 	},
 	{
-		entityItemId: 10217,
+		entityItemId: 20200,
+		slots: [
+		],
+		baseHullmass: 100000
+	},
+	{
+		entityItemId: 20212,
 		slots: [
 			{
 				type: "generator",
 				outputPct: 90,
-				maxTier: 1
+				maxTier: 2
 			},
 			{
 				type: "engine",
 				outputPct: 90,
-				maxTier: 1
+				maxTier: 2
 			},
 			{
 				type: "gatherer",
 				outputPct: 100,
-				maxTier: 1
-			},
-			{
-				type: "storage",
-				outputPct: 100,
-				maxTier: 1
+				maxTier: 2
 			}
 		],
-		baseHullmass: 4800000
-	},
-	{
-		entityItemId: 20200,
-		slots: [
-		],
-		baseHullmass: 100000
+		baseHullmass: 5920000
 	},
 	{
-		entityItemId: 20210,
+		entityItemId: 20213,
 		slots: [
 			{
 				type: "generator",
-				outputPct: 100,
+				outputPct: 95,
 				maxTier: 2
 			},
 			{
-				type: "generator",
-				outputPct: 100,
+				type: "engine",
+				outputPct: 95,
 				maxTier: 2
 			},
 			{
-				type: "engine",
-				outputPct: 100,
+				type: "aux",
+				outputPct: 95,
 				maxTier: 2
 			},
 			{
@@ -6887,33 +6877,33 @@ var entities = [
 				maxTier: 2
 			}
 		],
-		baseHullmass: 5760000
+		baseHullmass: 7360000
 	},
 	{
-		entityItemId: 20211,
+		entityItemId: 20214,
 		slots: [
 			{
 				type: "generator",
-				outputPct: 100,
+				outputPct: 95,
 				maxTier: 2
 			},
 			{
 				type: "engine",
-				outputPct: 100,
+				outputPct: 95,
 				maxTier: 2
 			},
 			{
-				type: "hauler",
+				type: "gatherer",
 				outputPct: 100,
 				maxTier: 2
 			},
 			{
-				type: "hauler",
+				type: "storage",
 				outputPct: 100,
 				maxTier: 2
 			}
 		],
-		baseHullmass: 7040000
+		baseHullmass: 7360000
 	}
 ];
 
@@ -7542,14 +7532,8 @@ var items = [
 		tier: 1
 	},
 	{
-		id: 10216,
-		mass: 3600000,
-		type: "entity",
-		tier: 1
-	},
-	{
-		id: 10217,
-		mass: 3600000,
+		id: 10218,
+		mass: 2400000,
 		type: "entity",
 		tier: 1
 	},
@@ -7634,14 +7618,20 @@ var items = [
 		tier: 2
 	},
 	{
-		id: 20210,
-		mass: 3840000,
+		id: 20212,
+		mass: 4320000,
 		type: "entity",
 		tier: 2
 	},
 	{
-		id: 20211,
-		mass: 3840000,
+		id: 20213,
+		mass: 5760000,
+		type: "entity",
+		tier: 2
+	},
+	{
+		id: 20214,
+		mass: 5760000,
 		type: "entity",
 		tier: 2
 	}
@@ -7919,14 +7909,9 @@ const itemMetadata = {
         description: 'A cargo ship built around a large storage hold. The extra mass makes it slower than a Roustabout.',
         color: '#4AE898',
     },
-    10216: {
-        name: 'Wrangler',
-        description: 'A heavy gathering ship with two gathering rigs, so it mines faster.',
-        color: '#4AE898',
-    },
-    10217: {
-        name: 'Dredger',
-        description: 'A gathering ship with its own storage hold, so it can keep mining before it has to offload.',
+    10218: {
+        name: 'Smith',
+        description: 'A crafting ship. One engine, one power core, and a fabricator for crafting away from home.',
         color: '#4AE898',
     },
     20001: {
@@ -7994,14 +7979,19 @@ const itemMetadata = {
         description: 'Advanced cargo container with improved capacity formulas.',
         color: '#9BADB8',
     },
-    20210: {
+    20212: {
         name: 'Prospector',
-        description: 'Advanced exploration vessel with tiered engine, power core, and limpet bay slots.',
+        description: 'The tier 2 Prospector. The same three systems, ready for tier 2 modules.',
         color: '#4AE898',
     },
-    20211: {
-        name: 'Tug',
-        description: 'Advanced towing vessel with tiered engine, generator, and tractor beam slots.',
+    20213: {
+        name: 'Prospector',
+        description: 'A tier 2 Prospector with an auxiliary system for extra power, mobility, or endurance.',
+        color: '#4AE898',
+    },
+    20214: {
+        name: 'Dredger',
+        description: 'A gathering ship that stores what it digs. Its limpet bay works alongside a cargo hold.',
         color: '#4AE898',
     },
 };
@@ -8013,8 +8003,7 @@ const entityMetadata = {
     10213: { moduleSlotLabels: ['Power Core', 'Engine', 'Assembly Arm'] },
     10214: { moduleSlotLabels: ['Power Core', 'Engine', 'Tractor Beam'] },
     10215: { moduleSlotLabels: ['Power Core', 'Engine', 'Cargo Hold'] },
-    10216: { moduleSlotLabels: ['Power Core', 'Engine', 'Limpet Bay', 'Limpet Bay'] },
-    10217: { moduleSlotLabels: ['Power Core', 'Engine', 'Limpet Bay', 'Cargo Hold'] },
+    10218: { moduleSlotLabels: ['Power Core', 'Engine', 'Fabricator'] },
     10202: {
         moduleSlotLabels: ['Shuttle Bay', 'Cargo Hold', 'Cargo Hold', 'Cargo Hold', 'Cargo Hold'],
     },
@@ -8026,8 +8015,9 @@ const entityMetadata = {
         moduleSlotLabels: ['Fabricator', 'Fabricator', 'Fabricator', 'Fabricator', 'Fabricator'],
     },
     10209: { moduleSlotLabels: ['Power Core', 'Assembly Arm'] },
-    20210: { moduleSlotLabels: ['Power Core', 'Power Core', 'Engine', 'Limpet Bay'] },
-    20211: { moduleSlotLabels: ['Power Core', 'Engine', 'Tractor Beam', 'Tractor Beam'] },
+    20212: { moduleSlotLabels: ['Power Core', 'Engine', 'Limpet Bay'] },
+    20213: { moduleSlotLabels: ['Power Core', 'Engine', 'Auxiliary System', 'Limpet Bay'] },
+    20214: { moduleSlotLabels: ['Power Core', 'Engine', 'Limpet Bay', 'Cargo Hold'] },
 };
 for (const item of items) {
     if (!itemMetadata[item.id]) {
@@ -10971,14 +10961,9 @@ var templates = [
 		displayLabel: "Porter"
 	},
 	{
-		itemId: 10216,
-		kind: "ship",
-		displayLabel: "Wrangler"
-	},
-	{
-		itemId: 10217,
+		itemId: 10218,
 		kind: "ship",
-		displayLabel: "Dredger"
+		displayLabel: "Smith"
 	},
 	{
 		itemId: 10202,
@@ -11031,14 +11016,19 @@ var templates = [
 		displayLabel: ""
 	},
 	{
-		itemId: 20210,
+		itemId: 20212,
 		kind: "ship",
 		displayLabel: "Prospector"
 	},
 	{
-		itemId: 20211,
+		itemId: 20213,
 		kind: "ship",
-		displayLabel: "Tug"
+		displayLabel: "Prospector"
+	},
+	{
+		itemId: 20214,
+		kind: "ship",
+		displayLabel: "Dredger"
 	}
 ];
 var kindRegistryJson = {
@@ -12632,6 +12622,24 @@ function keyForRecipeInputStat(recipe, inputIndex, statIndex) {
     const innerKeys = getItemStatKeys(input.itemId);
     return innerKeys[statIndex] ?? '';
 }
+function usedInputStatKeys(outputItemId) {
+    const recipe = getRecipe(outputItemId);
+    if (!recipe)
+        return [];
+    const usedIdx = recipe.inputs.map(() => new Set());
+    for (const slot of recipe.statSlots) {
+        for (const src of slot.sources) {
+            usedIdx[src.inputIndex]?.add(src.statIndex);
+        }
+    }
+    return recipe.inputs.map((input, i) => {
+        const keys = getItemStatKeys(input.itemId);
+        return [...usedIdx[i]]
+            .sort((a, b) => a - b)
+            .map((idx) => keys[idx] ?? '')
+            .filter(Boolean);
+    });
+}
 function decodeCraftedItemStats(itemId, stats) {
     const keys = getItemStatKeys(itemId);
     const result = {};
@@ -13425,7 +13433,13 @@ const MODULE_STORAGE = 8;
 const MODULE_HAULER = 9;
 const MODULE_BATTERY = 10;
 const MODULE_BUILDER = 12;
+const MODULE_AUX = 13;
 function moduleAccepts(slotType, moduleType) {
+    if (slotType === MODULE_AUX) {
+        return (moduleType === MODULE_GENERATOR ||
+            moduleType === MODULE_ENGINE ||
+            moduleType === MODULE_BATTERY);
+    }
     return slotType === MODULE_ANY || slotType === moduleType;
 }
 function getModuleCapabilityType(itemId) {
@@ -13487,6 +13501,8 @@ function moduleSlotTypeToCode(slotType) {
             return MODULE_HAULER;
         case 'battery':
             return MODULE_BATTERY;
+        case 'aux':
+            return MODULE_AUX;
         default:
             return MODULE_ANY;
     }
@@ -16477,22 +16493,20 @@ function entityDisplayName(itemId) {
     switch (itemId) {
         case ITEM_SHIP_T1_PACKED:
             return 'Ship';
-        case ITEM_ROUSTABOUT_T1_PACKED:
+        case ITEM_ROUSTABOUT_T1A_PACKED:
             return 'Roustabout';
-        case ITEM_PROSPECTOR_T1_PACKED:
+        case ITEM_PROSPECTOR_T1A_PACKED:
             return 'Prospector';
-        case ITEM_TENDER_T1_PACKED:
+        case ITEM_TENDER_T1A_PACKED:
             return 'Tender';
-        case ITEM_TUG_T1_PACKED:
+        case ITEM_TUG_T1A_PACKED:
             return 'Tug';
-        case ITEM_PORTER_T1_PACKED:
+        case ITEM_PORTER_T1A_PACKED:
             return 'Porter';
-        case ITEM_WRANGLER_T1_PACKED:
-            return 'Wrangler';
-        case ITEM_WRIGHT_T1_PACKED:
+        case ITEM_WRIGHT_T1A_PACKED:
             return 'Wright';
-        case ITEM_DREDGER_T1_PACKED:
-            return 'Dredger';
+        case ITEM_SMITH_T1A_PACKED:
+            return 'Smith';
         case ITEM_WAREHOUSE_T1_PACKED:
             return 'Warehouse';
         case ITEM_EXTRACTOR_T1_PACKED:
@@ -16505,10 +16519,12 @@ function entityDisplayName(itemId) {
             return 'Container';
         case ITEM_CONTAINER_T2_PACKED:
             return 'Container';
-        case ITEM_PROSPECTOR_T2_PACKED:
+        case ITEM_PROSPECTOR_T2A_PACKED:
             return 'Prospector';
-        case ITEM_HAULER_SHIP_T2_PACKED:
-            return 'Tug';
+        case ITEM_PROSPECTOR_T2B_PACKED:
+            return 'Prospector';
+        case ITEM_DREDGER_T2A_PACKED:
+            return 'Dredger';
         default:
             return 'Entity';
     }
@@ -18878,6 +18894,18 @@ function composeIdleResolve(blocker, action, actions, now, lookupCounterpart) {
     return [...ids.map((id) => actions.resolve(id)), action];
 }
 
+const INCOMING_COUPLING_KINDS = new Set([exports.HoldKind.PUSH, exports.HoldKind.GATHER, exports.HoldKind.FLIGHT]);
+function isIncomingCouplingKind(kind) {
+    return INCOMING_COUPLING_KINDS.has(kind);
+}
+function calcCounterpartDelivery(task, coupling) {
+    if (!isIncomingCouplingKind(coupling.kind.toNumber()))
+        return [];
+    if (task.type.toNumber() === exports.TaskType.CRAFT) {
+        return task.cargo.length === 0 ? [] : [task.cargo[task.cargo.length - 1]];
+    }
+    return task.cargo;
+}
 function taskCargoEffect(task) {
     switch (task.type.toNumber()) {
         case exports.TaskType.LOAD:
@@ -18885,6 +18913,7 @@ function taskCargoEffect(task) {
         case exports.TaskType.UNDEPLOY:
             return { added: task.cargo, removed: [] };
         case exports.TaskType.UNLOAD:
+        case exports.TaskType.UPGRADE:
             return { added: [], removed: task.cargo };
         case exports.TaskType.GATHER:
             return task.couplings.length > 0
@@ -18901,19 +18930,23 @@ function taskCargoEffect(task) {
             return { added: [], removed: [] };
     }
 }
-function cargoKey(item) {
-    const base = `${item.item_id.toNumber()}:${item.stats.toString()}`;
-    const modules = item.modules ?? [];
-    const entityId = item.entity_id?.toString();
-    const normalizedEntityId = entityId && entityId !== '0' ? entityId : '';
+function refKey(itemId, stats, modules, entityId) {
+    const base = `${itemId}:${stats.toString()}`;
+    const normalizedEntityId = entityId !== '0' ? entityId : '';
     if (modules.length === 0 && normalizedEntityId === '')
         return base;
     return `${base}:modules=${JSON.stringify(modules)}:entity=${normalizedEntityId}`;
 }
+function cargoKey(item) {
+    return refKey(item.item_id.toNumber(), BigInt(item.stats.toString()), item.modules ?? [], item.entity_id?.toString() ?? '');
+}
+function cargoInputKey(input) {
+    return refKey(input.itemId, input.stats, input.modules ?? [], '');
+}
 function cargoQuantity(item) {
     return BigInt(item.quantity.toString());
 }
-function projectedCargoAvailableAt(entity, at) {
+function projectedCargoAvailableAt(entity, at, incoming = []) {
     const avail = new Map();
     for (const item of entity.cargo) {
         const key = cargoKey(item);
@@ -18928,6 +18961,14 @@ function projectedCargoAvailableAt(entity, at) {
             avail.set(key, (avail.get(key) ?? 0n) + cargoQuantity(item));
         }
     }
+    for (const src of incoming) {
+        if (src.until.getTime() >= at.getTime())
+            continue;
+        for (const item of src.items) {
+            const key = cargoKey(item);
+            avail.set(key, (avail.get(key) ?? 0n) + cargoQuantity(item));
+        }
+    }
     for (const ordered of tasks) {
         for (const item of taskCargoEffect(ordered.task).removed) {
             const key = cargoKey(item);
@@ -18938,17 +18979,40 @@ function projectedCargoAvailableAt(entity, at) {
     }
     return avail;
 }
-function cargoReadyAt(entity, inputItemIds) {
-    let readyMs = 0;
+function cargoReadyAt(entity, inputs, incoming = []) {
+    const demand = new Map();
+    for (const input of inputs) {
+        const key = cargoInputKey(input);
+        demand.set(key, (demand.get(key) ?? 0n) + BigInt(input.quantity));
+    }
+    const candidates = [0];
     for (const ordered of orderedTasks(entity)) {
         for (const item of taskCargoEffect(ordered.task).added) {
-            if (inputItemIds.includes(item.item_id.toNumber())) {
-                readyMs = Math.max(readyMs, ordered.completesAt.getTime());
+            if (demand.has(cargoKey(item))) {
+                candidates.push(ordered.completesAt.getTime());
                 break;
             }
         }
     }
-    return new Date(readyMs);
+    for (const src of incoming) {
+        if (src.items.some((item) => demand.has(cargoKey(item)))) {
+            candidates.push(src.until.getTime());
+        }
+    }
+    candidates.sort((a, b) => a - b);
+    for (const candidateMs of candidates) {
+        const available = projectedCargoAvailableAt(entity, new Date(candidateMs + 1), incoming);
+        let sufficient = true;
+        for (const [key, quantity] of demand) {
+            if ((available.get(key) ?? 0n) < quantity) {
+                sufficient = false;
+                break;
+            }
+        }
+        if (sufficient)
+            return new Date(candidateMs);
+    }
+    return new Date(candidates[candidates.length - 1]);
 }
 function availableForItem(avail, itemId) {
     const prefix = `${itemId}:`;
@@ -18967,6 +19031,7 @@ exports.CancelBlockReason = void 0;
     CancelBlockReason["DONE"] = "DONE";
     CancelBlockReason["CONTAINS_LINKED_TASK"] = "CONTAINS_LINKED_TASK";
     CancelBlockReason["WOULD_STRAND"] = "WOULD_STRAND";
+    CancelBlockReason["WOULD_STRAND_COUNTERPART"] = "WOULD_STRAND_COUNTERPART";
     CancelBlockReason["WOULD_OVERFILL"] = "WOULD_OVERFILL";
     CancelBlockReason["NOT_OWNER"] = "NOT_OWNER";
 })(exports.CancelBlockReason || (exports.CancelBlockReason = {}));
@@ -18977,14 +19042,16 @@ function postCancelEntity(entity, laneKey, fromTaskIndex) {
     lane.schedule.tasks = lane.schedule.tasks.slice(0, fromTaskIndex);
     return clone;
 }
-function feasibleAfterCancel(post) {
-    const ordered = orderedTasks(post);
+function queueFeasible(entity, incoming = []) {
+    const ordered = orderedTasks(entity);
     const base = new Map();
-    for (const c of post.cargo ?? []) {
+    for (const c of entity.cargo ?? []) {
         const k = cargoKey(c);
         base.set(k, (base.get(k) ?? 0) + c.quantity.toNumber());
     }
-    const isConsumer = (t) => t.type.toNumber() === exports.TaskType.CRAFT || t.type.toNumber() === exports.TaskType.UNLOAD;
+    const isConsumer = (t) => t.type.toNumber() === exports.TaskType.CRAFT ||
+        t.type.toNumber() === exports.TaskType.UNLOAD ||
+        t.type.toNumber() === exports.TaskType.UPGRADE;
     for (const self of ordered) {
         if (!isConsumer(self.task))
             continue;
@@ -18996,6 +19063,13 @@ function feasibleAfterCancel(post) {
                 map.set(cargoKey(out), (map.get(cargoKey(out)) ?? 0) + out.quantity.toNumber());
             }
         }
+        for (const src of incoming) {
+            if (src.until.getTime() >= self.completesAt.getTime())
+                continue;
+            for (const item of src.items) {
+                map.set(cargoKey(item), (map.get(cargoKey(item)) ?? 0) + item.quantity.toNumber());
+            }
+        }
         for (const other of ordered) {
             if (other === self)
                 continue;
@@ -19009,6 +19083,11 @@ function feasibleAfterCancel(post) {
                 return false;
         }
     }
+    return true;
+}
+function feasibleAfterCancel(post) {
+    if (!queueFeasible(post))
+        return false;
     try {
         validateSchedule(post);
     }
@@ -19066,6 +19145,35 @@ function cancelEligibility(entity, laneKey, fromTaskIndex, input) {
     const post = postCancelEntity(entity, laneKey, fromTaskIndex);
     if (!feasibleAfterCancel(post))
         return block(exports.CancelBlockReason.WOULD_STRAND);
+    const releasedByCounterpart = new Map();
+    for (const i of taskIndices) {
+        for (const c of tasks[i].couplings ?? []) {
+            if (!isIncomingCouplingKind(c.kind.toNumber()))
+                continue;
+            const id = c.counterpart.entity_id.toString();
+            const entry = releasedByCounterpart.get(id) ?? {
+                counterpart: c.counterpart,
+                holdIds: new Set(),
+            };
+            entry.holdIds.add(c.hold.toString());
+            releasedByCounterpart.set(id, entry);
+        }
+    }
+    for (const [counterpartId, released] of releasedByCounterpart) {
+        const counterpart = input.counterparts?.get(counterpartId);
+        if (!counterpart)
+            continue;
+        const incoming = (input.counterpartIncoming?.get(counterpartId) ?? []).filter((src) => !released.holdIds.has(src.holdId));
+        if (!queueFeasible(counterpart, incoming)) {
+            return {
+                ok: false,
+                blockedReason: exports.CancelBlockReason.WOULD_STRAND_COUNTERPART,
+                blockedByCounterpart: released.counterpart,
+                range,
+                effects: { ...EMPTY_EFFECTS },
+            };
+        }
+    }
     const effects = { refunds: [], releasedHolds: [], abandonsRunning: false };
     let energyForfeited = 0;
     for (const i of taskIndices) {
@@ -19215,7 +19323,24 @@ function receiveFits(dest, item, now) {
     return peak <= capacity;
 }
 
-function maxCraftable(entity, recipe, crafterSpeed, now) {
+function itemReadyAt(entity, itemIds, incoming) {
+    let readyMs = 0;
+    for (const ordered of orderedTasks(entity)) {
+        for (const item of taskCargoEffect(ordered.task).added) {
+            if (itemIds.includes(item.item_id.toNumber())) {
+                readyMs = Math.max(readyMs, ordered.completesAt.getTime());
+                break;
+            }
+        }
+    }
+    for (const src of incoming) {
+        if (src.items.some((item) => itemIds.includes(item.item_id.toNumber()))) {
+            readyMs = Math.max(readyMs, src.until.getTime());
+        }
+    }
+    return new Date(readyMs);
+}
+function maxCraftable(entity, recipe, crafterSpeed, now, incoming = []) {
     if (recipe.inputs.length === 0)
         return 0;
     const perUnitMass = recipe.inputs.reduce((sum, input) => sum + getItem(input.itemId).mass * input.quantity, 0);
@@ -19223,9 +19348,9 @@ function maxCraftable(entity, recipe, crafterSpeed, now) {
     const crafterLane = workerLaneKey(entity.modules, 'crafter', entity.lanes ?? []);
     const naiveCompletesAt = candidateLaneCompletesAt(entity, crafterLane, perUnitDuration, now);
     const laneStartMs = naiveCompletesAt.getTime() - perUnitDuration * 1000;
-    const readyMs = cargoReadyAt(entity, recipe.inputs.map((input) => input.itemId)).getTime();
+    const readyMs = itemReadyAt(entity, recipe.inputs.map((input) => input.itemId), incoming).getTime();
     const completesAt = new Date(Math.max(laneStartMs, readyMs) + perUnitDuration * 1000);
-    const availability = projectedCargoAvailableAt(entity, completesAt);
+    const availability = projectedCargoAvailableAt(entity, completesAt, incoming);
     let maxUnits;
     for (const input of recipe.inputs) {
         if (input.quantity <= 0)
@@ -20090,6 +20215,16 @@ function computeCapabilityGroup(moduleType, stats, tier, outputPct = 100) {
                 ],
             };
         }
+        case MODULE_BUILDER: {
+            const caps = computeBuilderCapabilities(stats);
+            return {
+                capability: 'Build',
+                attributes: [
+                    { label: 'Speed', value: caps.speed },
+                    { label: 'Drain', value: toWholeEnergy$1(caps.drain) },
+                ],
+            };
+        }
         case MODULE_HAULER: {
             const caps = computeHaulerCapabilities(stats, tier);
             return {
@@ -21068,7 +21203,7 @@ exports.ITEM_CRYSTAL_T7 = ITEM_CRYSTAL_T7;
 exports.ITEM_CRYSTAL_T8 = ITEM_CRYSTAL_T8;
 exports.ITEM_CRYSTAL_T9 = ITEM_CRYSTAL_T9;
 exports.ITEM_DOES_NOT_EXIST = ITEM_DOES_NOT_EXIST;
-exports.ITEM_DREDGER_T1_PACKED = ITEM_DREDGER_T1_PACKED;
+exports.ITEM_DREDGER_T2A_PACKED = ITEM_DREDGER_T2A_PACKED;
 exports.ITEM_ENGINE_T1 = ITEM_ENGINE_T1;
 exports.ITEM_EXTRACTOR_T1_PACKED = ITEM_EXTRACTOR_T1_PACKED;
 exports.ITEM_FACTORY_T1_PACKED = ITEM_FACTORY_T1_PACKED;
@@ -21087,7 +21222,6 @@ exports.ITEM_GAS_T9 = ITEM_GAS_T9;
 exports.ITEM_GATHERER_T1 = ITEM_GATHERER_T1;
 exports.ITEM_GATHERER_T2 = ITEM_GATHERER_T2;
 exports.ITEM_GENERATOR_T1 = ITEM_GENERATOR_T1;
-exports.ITEM_HAULER_SHIP_T2_PACKED = ITEM_HAULER_SHIP_T2_PACKED;
 exports.ITEM_HAULER_T1 = ITEM_HAULER_T1;
 exports.ITEM_HAULER_T2 = ITEM_HAULER_T2;
 exports.ITEM_HUB_T1_PACKED = ITEM_HUB_T1_PACKED;
@@ -21114,9 +21248,10 @@ exports.ITEM_PLATE = ITEM_PLATE;
 exports.ITEM_PLATE_T2 = ITEM_PLATE_T2;
 exports.ITEM_POLYMER = ITEM_POLYMER;
 exports.ITEM_POLYMER_T2 = ITEM_POLYMER_T2;
-exports.ITEM_PORTER_T1_PACKED = ITEM_PORTER_T1_PACKED;
-exports.ITEM_PROSPECTOR_T1_PACKED = ITEM_PROSPECTOR_T1_PACKED;
-exports.ITEM_PROSPECTOR_T2_PACKED = ITEM_PROSPECTOR_T2_PACKED;
+exports.ITEM_PORTER_T1A_PACKED = ITEM_PORTER_T1A_PACKED;
+exports.ITEM_PROSPECTOR_T1A_PACKED = ITEM_PROSPECTOR_T1A_PACKED;
+exports.ITEM_PROSPECTOR_T2A_PACKED = ITEM_PROSPECTOR_T2A_PACKED;
+exports.ITEM_PROSPECTOR_T2B_PACKED = ITEM_PROSPECTOR_T2B_PACKED;
 exports.ITEM_REACTOR = ITEM_REACTOR;
 exports.ITEM_REACTOR_T2 = ITEM_REACTOR_T2;
 exports.ITEM_REGOLITH_T1 = ITEM_REGOLITH_T1;
@@ -21133,13 +21268,14 @@ exports.ITEM_RESIN = ITEM_RESIN;
 exports.ITEM_RESIN_T2 = ITEM_RESIN_T2;
 exports.ITEM_RESONATOR = ITEM_RESONATOR;
 exports.ITEM_RESONATOR_T2 = ITEM_RESONATOR_T2;
-exports.ITEM_ROUSTABOUT_T1_PACKED = ITEM_ROUSTABOUT_T1_PACKED;
+exports.ITEM_ROUSTABOUT_T1A_PACKED = ITEM_ROUSTABOUT_T1A_PACKED;
 exports.ITEM_SENSOR = ITEM_SENSOR;
 exports.ITEM_SENSOR_T2 = ITEM_SENSOR_T2;
 exports.ITEM_SHIP_T1_PACKED = ITEM_SHIP_T1_PACKED;
+exports.ITEM_SMITH_T1A_PACKED = ITEM_SMITH_T1A_PACKED;
 exports.ITEM_STORAGE_T1 = ITEM_STORAGE_T1;
-exports.ITEM_TENDER_T1_PACKED = ITEM_TENDER_T1_PACKED;
-exports.ITEM_TUG_T1_PACKED = ITEM_TUG_T1_PACKED;
+exports.ITEM_TENDER_T1A_PACKED = ITEM_TENDER_T1A_PACKED;
+exports.ITEM_TUG_T1A_PACKED = ITEM_TUG_T1A_PACKED;
 exports.ITEM_TYPE_COMPONENT = ITEM_TYPE_COMPONENT;
 exports.ITEM_TYPE_ENTITY = ITEM_TYPE_ENTITY;
 exports.ITEM_TYPE_MODULE = ITEM_TYPE_MODULE;
@@ -21147,8 +21283,7 @@ exports.ITEM_TYPE_RESOURCE = ITEM_TYPE_RESOURCE;
 exports.ITEM_WAREHOUSE_T1_PACKED = ITEM_WAREHOUSE_T1_PACKED;
 exports.ITEM_WARP_T1 = ITEM_WARP_T1;
 exports.ITEM_WORKSHOP_T1_PACKED = ITEM_WORKSHOP_T1_PACKED;
-exports.ITEM_WRANGLER_T1_PACKED = ITEM_WRANGLER_T1_PACKED;
-exports.ITEM_WRIGHT_T1_PACKED = ITEM_WRIGHT_T1_PACKED;
+exports.ITEM_WRIGHT_T1A_PACKED = ITEM_WRIGHT_T1A_PACKED;
 exports.InventoryAccessor = InventoryAccessor;
 exports.JOB_QUEUE_CAP = JOB_QUEUE_CAP;
 exports.LANE_BARRIER = LANE_BARRIER;
@@ -21166,6 +21301,7 @@ exports.MIN_ORBITAL_ALTITUDE = MIN_ORBITAL_ALTITUDE;
 exports.MIN_TRANSFER_DISTANCE_ORBITAL_VESSEL = MIN_TRANSFER_DISTANCE_ORBITAL_VESSEL;
 exports.MIN_TRANSFER_DISTANCE_PLANETARY_STRUCTURE = MIN_TRANSFER_DISTANCE_PLANETARY_STRUCTURE;
 exports.MODULE_ANY = MODULE_ANY;
+exports.MODULE_AUX = MODULE_AUX;
 exports.MODULE_BATTERY = MODULE_BATTERY;
 exports.MODULE_BUILDER = MODULE_BUILDER;
 exports.MODULE_CARGO_NOT_FOUND = MODULE_CARGO_NOT_FOUND;
@@ -21276,6 +21412,7 @@ exports.buildModuleImmutable = buildModuleImmutable;
 exports.buildResourceImmutable = buildResourceImmutable;
 exports.calcCargoItemMass = calcCargoItemMass;
 exports.calcCargoMass = calcCargoMass;
+exports.calcCounterpartDelivery = calcCounterpartDelivery;
 exports.calcEnergyUsage = calcEnergyUsage;
 exports.calcStacksMass = calcStacksMass;
 exports.calc_acceleration = calc_acceleration;
@@ -21319,8 +21456,10 @@ exports.capsHasLoaders = capsHasLoaders;
 exports.capsHasMass = capsHasMass;
 exports.capsHasMovement = capsHasMovement;
 exports.capsHasStorage = capsHasStorage;
+exports.cargoInputKey = cargoInputKey;
 exports.cargoItem = cargoItem;
 exports.cargoItemToStack = cargoItemToStack;
+exports.cargoKey = cargoKey;
 exports.cargoReadyAt = cargoReadyAt;
 exports.cargoRef = cargoRef;
 exports.cargoUtils = cargoUtils;
@@ -21601,6 +21740,7 @@ exports.toLocation = toLocation;
 exports.typeLabel = typeLabel;
 exports.unwrapLoadDuration = unwrapLoadDuration;
 exports.unwrapTransitDuration = unwrapTransitDuration;
+exports.usedInputStatKeys = usedInputStatKeys;
 exports.validateDisplayName = validateDisplayName;
 exports.validateSchedule = validateSchedule;
 exports.workerLaneKey = workerLaneKey;