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

package/lib/shipload.js

@@ -3904,28 +3904,30 @@ 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;
-const ITEM_RESONATOR_T2 = 20004;
-const ITEM_BEAM_T2 = 20005;
-const ITEM_SENSOR_T2 = 20006;
-const ITEM_POLYMER_T2 = 20007;
-const ITEM_CERAMIC_T2 = 20008;
-const ITEM_REACTOR_T2 = 20009;
-const ITEM_RESIN_T2 = 20010;
-const ITEM_ENGINE_T2 = 20100;
-const ITEM_GENERATOR_T2 = 20101;
-const ITEM_GATHERER_T2 = 20102;
-const ITEM_LOADER_T2 = 20103;
-const ITEM_CRAFTER_T2 = 20104;
-const ITEM_HAULER_T2 = 20106;
-const ITEM_WARP_T2 = 20107;
-const ITEM_BUILDER_T2 = 20110;
-const ITEM_CONTAINER_T2_PACKED = 20200;
-const ITEM_PROSPECTOR_T2A_PACKED = 20212;
-const ITEM_PROSPECTOR_T2B_PACKED = 20213;
-const ITEM_DREDGER_T2A_PACKED = 20214;
+const ITEM_PLATE_T2 = 11001;
+const ITEM_FRAME_T2 = 11002;
+const ITEM_PLASMA_CELL_T2 = 11003;
+const ITEM_RESONATOR_T2 = 11004;
+const ITEM_BEAM_T2 = 11005;
+const ITEM_SENSOR_T2 = 11006;
+const ITEM_POLYMER_T2 = 11007;
+const ITEM_CERAMIC_T2 = 11008;
+const ITEM_REACTOR_T2 = 11009;
+const ITEM_RESIN_T2 = 11010;
+const ITEM_ENGINE_T2 = 11100;
+const ITEM_GENERATOR_T2 = 11101;
+const ITEM_GATHERER_T2 = 11102;
+const ITEM_LOADER_T2 = 11103;
+const ITEM_CRAFTER_T2 = 11104;
+const ITEM_STORAGE_T2 = 11105;
+const ITEM_HAULER_T2 = 11106;
+const ITEM_WARP_T2 = 11107;
+const ITEM_BATTERY_T2 = 11108;
+const ITEM_BUILDER_T2 = 11110;
+const ITEM_CONTAINER_T2_PACKED = 11200;
+const ITEM_PROSPECTOR_T2A_PACKED = 11212;
+const ITEM_PROSPECTOR_T2B_PACKED = 11213;
+const ITEM_DREDGER_T2A_PACKED = 11214;
 
 var recipes = [
 	{
@@ -4967,6 +4969,56 @@ var recipes = [
 		blendWeights: [
 		]
 	},
+	{
+		outputItemId: 10208,
+		outputMass: 4800000,
+		inputs: [
+			{
+				itemId: 10006,
+				quantity: 1000
+			},
+			{
+				itemId: 10003,
+				quantity: 1000
+			},
+			{
+				itemId: 10007,
+				quantity: 1000
+			}
+		],
+		statSlots: [
+			{
+				sources: [
+				]
+			},
+			{
+				sources: [
+					{
+						inputIndex: 1,
+						statIndex: 0
+					}
+				]
+			},
+			{
+				sources: [
+					{
+						inputIndex: 0,
+						statIndex: 0
+					}
+				]
+			},
+			{
+				sources: [
+					{
+						inputIndex: 2,
+						statIndex: 0
+					}
+				]
+			}
+		],
+		blendWeights: [
+		]
+	},
 	{
 		outputItemId: 10209,
 		outputMass: 1900000,
@@ -5650,7 +5702,7 @@ var recipes = [
 		sourceSubclass: 10210
 	},
 	{
-		outputItemId: 20001,
+		outputItemId: 11001,
 		outputMass: 4800,
 		inputs: [
 			{
@@ -5688,7 +5740,7 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20002,
+		outputItemId: 11002,
 		outputMass: 4800,
 		inputs: [
 			{
@@ -5738,7 +5790,7 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20003,
+		outputItemId: 11003,
 		outputMass: 4800,
 		inputs: [
 			{
@@ -5776,7 +5828,7 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20004,
+		outputItemId: 11004,
 		outputMass: 4800,
 		inputs: [
 			{
@@ -5818,7 +5870,7 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20005,
+		outputItemId: 11005,
 		outputMass: 4800,
 		inputs: [
 			{
@@ -5860,7 +5912,7 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20006,
+		outputItemId: 11006,
 		outputMass: 4800,
 		inputs: [
 			{
@@ -5898,7 +5950,7 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20007,
+		outputItemId: 11007,
 		outputMass: 4800,
 		inputs: [
 			{
@@ -5936,7 +5988,7 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20008,
+		outputItemId: 11008,
 		outputMass: 4800,
 		inputs: [
 			{
@@ -5966,7 +6018,7 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20009,
+		outputItemId: 11009,
 		outputMass: 4800,
 		inputs: [
 			{
@@ -6016,7 +6068,7 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20010,
+		outputItemId: 11010,
 		outputMass: 4800,
 		inputs: [
 			{
@@ -6058,11 +6110,11 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20100,
+		outputItemId: 11100,
 		outputMass: 1536000,
 		inputs: [
 			{
-				itemId: 20003,
+				itemId: 11003,
 				quantity: 600
 			},
 			{
@@ -6100,11 +6152,11 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20101,
+		outputItemId: 11101,
 		outputMass: 1536000,
 		inputs: [
 			{
-				itemId: 20004,
+				itemId: 11004,
 				quantity: 600
 			},
 			{
@@ -6142,15 +6194,15 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20102,
+		outputItemId: 11102,
 		outputMass: 1536000,
 		inputs: [
 			{
-				itemId: 20005,
+				itemId: 11005,
 				quantity: 300
 			},
 			{
-				itemId: 20002,
+				itemId: 11002,
 				quantity: 300
 			},
 			{
@@ -6200,11 +6252,11 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20103,
+		outputItemId: 11103,
 		outputMass: 1536000,
 		inputs: [
 			{
-				itemId: 20007,
+				itemId: 11007,
 				quantity: 600
 			},
 			{
@@ -6242,15 +6294,15 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20104,
+		outputItemId: 11104,
 		outputMass: 1536000,
 		inputs: [
 			{
-				itemId: 20009,
+				itemId: 11009,
 				quantity: 300
 			},
 			{
-				itemId: 20006,
+				itemId: 11006,
 				quantity: 300
 			},
 			{
@@ -6288,15 +6340,85 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20106,
+		outputItemId: 11105,
+		outputMass: 1536000,
+		inputs: [
+			{
+				itemId: 11001,
+				quantity: 300
+			},
+			{
+				itemId: 11002,
+				quantity: 300
+			},
+			{
+				itemId: 10105,
+				quantity: 1
+			}
+		],
+		statSlots: [
+			{
+				sources: [
+					{
+						inputIndex: 0,
+						statIndex: 0
+					},
+					{
+						inputIndex: 2,
+						statIndex: 0
+					}
+				]
+			},
+			{
+				sources: [
+					{
+						inputIndex: 0,
+						statIndex: 1
+					},
+					{
+						inputIndex: 2,
+						statIndex: 1
+					}
+				]
+			},
+			{
+				sources: [
+					{
+						inputIndex: 1,
+						statIndex: 0
+					},
+					{
+						inputIndex: 2,
+						statIndex: 2
+					}
+				]
+			},
+			{
+				sources: [
+					{
+						inputIndex: 1,
+						statIndex: 1
+					},
+					{
+						inputIndex: 2,
+						statIndex: 3
+					}
+				]
+			}
+		],
+		blendWeights: [
+		]
+	},
+	{
+		outputItemId: 11106,
 		outputMass: 1536000,
 		inputs: [
 			{
-				itemId: 20004,
+				itemId: 11004,
 				quantity: 300
 			},
 			{
-				itemId: 20010,
+				itemId: 11010,
 				quantity: 300
 			},
 			{
@@ -6346,15 +6468,15 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20107,
+		outputItemId: 11107,
 		outputMass: 1536000,
 		inputs: [
 			{
-				itemId: 20004,
+				itemId: 11004,
 				quantity: 300
 			},
 			{
-				itemId: 20009,
+				itemId: 11009,
 				quantity: 300
 			},
 			{
@@ -6380,15 +6502,85 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20110,
+		outputItemId: 11108,
 		outputMass: 1536000,
 		inputs: [
 			{
-				itemId: 20006,
+				itemId: 11003,
 				quantity: 300
 			},
 			{
-				itemId: 20008,
+				itemId: 11007,
+				quantity: 300
+			},
+			{
+				itemId: 10108,
+				quantity: 1
+			}
+		],
+		statSlots: [
+			{
+				sources: [
+					{
+						inputIndex: 0,
+						statIndex: 0
+					},
+					{
+						inputIndex: 2,
+						statIndex: 0
+					}
+				]
+			},
+			{
+				sources: [
+					{
+						inputIndex: 0,
+						statIndex: 1
+					},
+					{
+						inputIndex: 2,
+						statIndex: 1
+					}
+				]
+			},
+			{
+				sources: [
+					{
+						inputIndex: 1,
+						statIndex: 0
+					},
+					{
+						inputIndex: 2,
+						statIndex: 2
+					}
+				]
+			},
+			{
+				sources: [
+					{
+						inputIndex: 1,
+						statIndex: 1
+					},
+					{
+						inputIndex: 2,
+						statIndex: 3
+					}
+				]
+			}
+		],
+		blendWeights: [
+		]
+	},
+	{
+		outputItemId: 11110,
+		outputMass: 1536000,
+		inputs: [
+			{
+				itemId: 11006,
+				quantity: 300
+			},
+			{
+				itemId: 11008,
 				quantity: 300
 			},
 			{
@@ -6426,15 +6618,15 @@ var recipes = [
 		]
 	},
 	{
-		outputItemId: 20200,
+		outputItemId: 11200,
 		outputMass: 3100000,
 		inputs: [
 			{
-				itemId: 20001,
+				itemId: 11001,
 				quantity: 600
 			},
 			{
-				itemId: 20008,
+				itemId: 11008,
 				quantity: 600
 			},
 			{
@@ -6497,27 +6689,27 @@ var recipes = [
 		sourceSubclass: 10200
 	},
 	{
-		outputItemId: 20212,
+		outputItemId: 11212,
 		outputMass: 4320000,
 		inputs: [
 			{
-				itemId: 20001,
+				itemId: 11001,
 				quantity: 200
 			},
 			{
-				itemId: 20008,
+				itemId: 11008,
 				quantity: 200
 			},
 			{
-				itemId: 20007,
+				itemId: 11007,
 				quantity: 200
 			},
 			{
-				itemId: 20003,
+				itemId: 11003,
 				quantity: 200
 			},
 			{
-				itemId: 20006,
+				itemId: 11006,
 				quantity: 200
 			},
 			{
@@ -6592,31 +6784,31 @@ var recipes = [
 		sourceSubclass: 10211
 	},
 	{
-		outputItemId: 20213,
+		outputItemId: 11213,
 		outputMass: 5760000,
 		inputs: [
 			{
-				itemId: 20005,
+				itemId: 11005,
 				quantity: 150
 			},
 			{
-				itemId: 20002,
+				itemId: 11002,
 				quantity: 150
 			},
 			{
-				itemId: 20010,
+				itemId: 11010,
 				quantity: 150
 			},
 			{
-				itemId: 20009,
+				itemId: 11009,
 				quantity: 150
 			},
 			{
-				itemId: 20004,
+				itemId: 11004,
 				quantity: 150
 			},
 			{
-				itemId: 20212,
+				itemId: 11212,
 				quantity: 1
 			}
 		],
@@ -6684,34 +6876,34 @@ var recipes = [
 		],
 		blendWeights: [
 		],
-		sourceSubclass: 20212
+		sourceSubclass: 11212
 	},
 	{
-		outputItemId: 20214,
+		outputItemId: 11214,
 		outputMass: 5760000,
 		inputs: [
 			{
-				itemId: 20005,
+				itemId: 11005,
 				quantity: 150
 			},
 			{
-				itemId: 20002,
+				itemId: 11002,
 				quantity: 150
 			},
 			{
-				itemId: 20010,
+				itemId: 11010,
 				quantity: 150
 			},
 			{
-				itemId: 20009,
+				itemId: 11009,
 				quantity: 150
 			},
 			{
-				itemId: 20004,
+				itemId: 11004,
 				quantity: 150
 			},
 			{
-				itemId: 20212,
+				itemId: 11212,
 				quantity: 1
 			}
 		],
@@ -6779,7 +6971,7 @@ var recipes = [
 		],
 		blendWeights: [
 		],
-		sourceSubclass: 20212
+		sourceSubclass: 11212
 	}
 ];
 
@@ -7122,13 +7314,13 @@ var entities = [
 		baseHullmass: 4000000
 	},
 	{
-		entityItemId: 20200,
+		entityItemId: 11200,
 		slots: [
 		],
 		baseHullmass: 100000
 	},
 	{
-		entityItemId: 20212,
+		entityItemId: 11212,
 		slots: [
 			{
 				type: "generator",
@@ -7149,7 +7341,7 @@ var entities = [
 		baseHullmass: 5920000
 	},
 	{
-		entityItemId: 20213,
+		entityItemId: 11213,
 		slots: [
 			{
 				type: "generator",
@@ -7175,7 +7367,7 @@ var entities = [
 		baseHullmass: 7360000
 	},
 	{
-		entityItemId: 20214,
+		entityItemId: 11214,
 		slots: [
 			{
 				type: "generator",
@@ -7780,7 +7972,7 @@ var items = [
 	},
 	{
 		id: 10208,
-		mass: 1900000,
+		mass: 4800000,
 		type: "entity",
 		tier: 1
 	},
@@ -7833,141 +8025,155 @@ var items = [
 		tier: 1
 	},
 	{
-		id: 20001,
+		id: 11001,
 		mass: 4800,
 		type: "component",
 		tier: 2
 	},
 	{
-		id: 20002,
+		id: 11002,
 		mass: 4800,
 		type: "component",
 		tier: 2
 	},
 	{
-		id: 20003,
+		id: 11003,
 		mass: 4800,
 		type: "component",
 		tier: 2
 	},
 	{
-		id: 20004,
+		id: 11004,
 		mass: 4800,
 		type: "component",
 		tier: 2
 	},
 	{
-		id: 20005,
+		id: 11005,
 		mass: 4800,
 		type: "component",
 		tier: 2
 	},
 	{
-		id: 20006,
+		id: 11006,
 		mass: 4800,
 		type: "component",
 		tier: 2
 	},
 	{
-		id: 20007,
+		id: 11007,
 		mass: 4800,
 		type: "component",
 		tier: 2
 	},
 	{
-		id: 20008,
+		id: 11008,
 		mass: 4800,
 		type: "component",
 		tier: 2
 	},
 	{
-		id: 20009,
+		id: 11009,
 		mass: 4800,
 		type: "component",
 		tier: 2
 	},
 	{
-		id: 20010,
+		id: 11010,
 		mass: 4800,
 		type: "component",
 		tier: 2
 	},
 	{
-		id: 20100,
+		id: 11100,
 		mass: 1536000,
 		type: "module",
 		tier: 2,
 		subtype: "engine"
 	},
 	{
-		id: 20101,
+		id: 11101,
 		mass: 1536000,
 		type: "module",
 		tier: 2,
 		subtype: "generator"
 	},
 	{
-		id: 20102,
+		id: 11102,
 		mass: 1536000,
 		type: "module",
 		tier: 2,
 		subtype: "gatherer"
 	},
 	{
-		id: 20103,
+		id: 11103,
 		mass: 1536000,
 		type: "module",
 		tier: 2,
 		subtype: "loader"
 	},
 	{
-		id: 20104,
+		id: 11104,
 		mass: 1536000,
 		type: "module",
 		tier: 2,
 		subtype: "crafter"
 	},
 	{
-		id: 20106,
+		id: 11105,
+		mass: 1536000,
+		type: "module",
+		tier: 2,
+		subtype: "storage"
+	},
+	{
+		id: 11106,
 		mass: 1536000,
 		type: "module",
 		tier: 2,
 		subtype: "hauler"
 	},
 	{
-		id: 20107,
+		id: 11107,
 		mass: 1536000,
 		type: "module",
 		tier: 2,
 		subtype: "warp"
 	},
 	{
-		id: 20110,
+		id: 11108,
+		mass: 1536000,
+		type: "module",
+		tier: 2,
+		subtype: "battery"
+	},
+	{
+		id: 11110,
 		mass: 1536000,
 		type: "module",
 		tier: 2,
 		subtype: "builder"
 	},
 	{
-		id: 20200,
+		id: 11200,
 		mass: 3100000,
 		type: "entity",
 		tier: 2
 	},
 	{
-		id: 20212,
+		id: 11212,
 		mass: 4320000,
 		type: "entity",
 		tier: 2
 	},
 	{
-		id: 20213,
+		id: 11213,
 		mass: 5760000,
 		type: "entity",
 		tier: 2
 	},
 	{
-		id: 20214,
+		id: 11214,
 		mass: 5760000,
 		type: "entity",
 		tier: 2
@@ -8251,112 +8457,122 @@ const itemMetadata = {
         description: 'A crafting ship. One engine, one power core, and a fabricator for crafting away from home.',
         color: '#4AE898',
     },
-    20001: {
+    11001: {
         name: 'Plate',
         description: 'Advanced structural plating reinforced with tier 2 ore.',
         color: '#9BADB8',
     },
-    20002: {
+    11002: {
         name: 'Frame',
         description: 'Advanced composite framing reinforced with tier 2 regolith and biomass polymer.',
         color: '#C4A57B',
     },
-    20003: {
+    11003: {
         name: 'Plasma Cell',
         description: 'Advanced high-energy gaseous storage cell reinforced with tier 2 gas.',
         color: '#E86344',
     },
-    20004: {
+    11004: {
         name: 'Resonator',
         description: 'Advanced crystalline resonance lattice reinforced with tier 2 crystal.',
         color: '#4ADBFF',
     },
-    20005: {
+    11005: {
         name: 'Beam',
         description: 'Advanced heavy-duty structural beam reinforced with tier 2 ore.',
         color: '#7B8D9E',
     },
-    20006: {
+    11006: {
         name: 'Sensor',
         description: 'Advanced crystal-lattice sensing element reinforced with tier 2 crystal.',
         color: '#4ADBFF',
     },
-    20007: {
+    11007: {
         name: 'Polymer',
         description: 'Advanced pliable biomass-derived polymer reinforced with tier 2 biomass.',
         color: '#5A8B3E',
     },
-    20008: {
+    11008: {
         name: 'Ceramic',
         description: 'Advanced hardened ceramic reinforced with tier 2 regolith.',
         color: '#C4A57B',
     },
-    20009: {
+    11009: {
         name: 'Reactor',
         description: 'Advanced gas-pressurized reaction vessel reinforced with tier 2 gas.',
         color: '#B877FF',
     },
-    20010: {
+    11010: {
         name: 'Resin',
         description: 'Advanced saturated organic binder reinforced with tier 2 biomass.',
         color: '#5A8B3E',
     },
-    20100: {
+    11100: {
         name: 'Engine',
         description: 'Advanced propulsion system. Reinforced thrust chambers for higher velocity.',
         color: '#E86344',
     },
-    20101: {
+    11101: {
         name: 'Power Core',
         description: 'Advanced energy system. Higher-density crystal matrix for increased energy throughput.',
         color: '#4ADBFF',
     },
-    20102: {
+    11102: {
         name: 'Limpet Bay',
         description: 'Advanced gathering system. Reinforced probes and conduits for deeper yield.',
         color: '#7B8D9E',
     },
-    20103: {
+    11103: {
         name: 'Shuttle Bay',
         description: 'Advanced cargo handling system. Reinforced articulated arms for greater loading throughput.',
         color: '#5A8B3E',
     },
-    20104: {
+    11104: {
         name: 'Fabricator',
         description: 'Advanced crafting system. Higher-grade reaction chambers for faster processing.',
         color: '#B877FF',
     },
-    20106: {
+    11105: {
+        name: 'Cargo Hold',
+        description: 'Advanced cargo storage. Reinforced tier 2 holds carry more mass.',
+        color: '#8B7355',
+    },
+    11106: {
         name: 'Tractor Beam',
         description: 'Advanced haul beam projector reinforced with tier 2 components for greater towing capacity.',
         color: '#4ADBFF',
     },
-    20107: {
+    11107: {
         name: 'Warp Drive',
         description: 'Advanced warp system. Reinforced field coils project the hull across greater distances.',
         color: '#9be4ff',
     },
-    20110: {
+    11108: {
+        name: 'Battery Bank',
+        description: 'Advanced battery bank. Higher-density cells store more charge from the power core.',
+        color: '#4ADBFF',
+    },
+    11110: {
         name: 'Assembly Arm',
         description: 'Advanced construction system. Reinforced manipulator arms for faster build and upgrade work.',
         color: '#FFB347',
     },
-    20200: {
+    11200: {
         name: 'Container',
         description: 'Advanced cargo container with improved capacity formulas.',
         color: '#9BADB8',
     },
-    20212: {
+    11212: {
         name: 'Prospector',
         description: 'The tier 2 Prospector. The same three systems, ready for tier 2 modules.',
         color: '#4AE898',
     },
-    20213: {
+    11213: {
         name: 'Prospector',
         description: 'A tier 2 Prospector with an auxiliary system for extra power, mobility, or endurance.',
         color: '#4AE898',
     },
-    20214: {
+    11214: {
         name: 'Dredger',
         description: 'A gathering ship that stores what it digs. Its limpet bay works alongside a cargo hold.',
         color: '#4AE898',
@@ -8382,9 +8598,9 @@ const entityMetadata = {
         moduleSlotLabels: ['Fabricator', 'Fabricator', 'Fabricator', 'Fabricator', 'Fabricator'],
     },
     10209: { moduleSlotLabels: ['Power Core', 'Assembly Arm'] },
-    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'] },
+    11212: { moduleSlotLabels: ['Power Core', 'Engine', 'Limpet Bay'] },
+    11213: { moduleSlotLabels: ['Power Core', 'Engine', 'Auxiliary System', 'Limpet Bay'] },
+    11214: { moduleSlotLabels: ['Power Core', 'Engine', 'Limpet Bay', 'Cargo Hold'] },
 };
 for (const item of items) {
     if (!itemMetadata[item.id]) {
@@ -8412,12 +8628,15 @@ for (const raw of items) {
 }
 const itemIds = Array.from(itemsById.keys());
 function getItem(itemId) {
-    const id = antelope.UInt16.from(itemId).toNumber();
-    const item = itemsById.get(id);
+    const item = tryGetItem(itemId);
     if (!item)
-        throw new Error(`Unknown item id: ${id}`);
+        throw new Error(`Unknown item id: ${antelope.UInt16.from(itemId).toNumber()}`);
     return item;
 }
+function tryGetItem(itemId) {
+    const id = antelope.UInt16.from(itemId).toNumber();
+    return itemsById.get(id);
+}
 function getItems() {
     return Array.from(itemsById.values());
 }
@@ -11376,7 +11595,7 @@ var templates = [
 		displayLabel: ""
 	},
 	{
-		itemId: 20200,
+		itemId: 11200,
 		kind: "container",
 		displayLabel: ""
 	},
@@ -11396,17 +11615,17 @@ var templates = [
 		displayLabel: ""
 	},
 	{
-		itemId: 20212,
+		itemId: 11212,
 		kind: "ship",
 		displayLabel: "Prospector"
 	},
 	{
-		itemId: 20213,
+		itemId: 11213,
 		kind: "ship",
 		displayLabel: "Prospector"
 	},
 	{
-		itemId: 20214,
+		itemId: 11214,
 		kind: "ship",
 		displayLabel: "Dredger"
 	}
@@ -13111,7 +13330,7 @@ function legacyEntityIdToItemId(id) {
         case 'warehouse-t1':
             return 10202;
         case 'container-t2':
-            return 20200;
+            return 11200;
         default:
             return 0;
     }
@@ -13823,36 +14042,8 @@ function moduleAccepts(slotType, moduleType) {
     return slotType === MODULE_ANY || slotType === moduleType;
 }
 function getModuleCapabilityType(itemId) {
-    switch (itemId) {
-        case ITEM_ENGINE_T1:
-        case ITEM_ENGINE_T2:
-            return MODULE_ENGINE;
-        case ITEM_GENERATOR_T1:
-        case ITEM_GENERATOR_T2:
-            return MODULE_GENERATOR;
-        case ITEM_GATHERER_T1:
-        case ITEM_GATHERER_T2:
-            return MODULE_GATHERER;
-        case ITEM_LOADER_T1:
-            return MODULE_LOADER;
-        case ITEM_CRAFTER_T1:
-            return MODULE_CRAFTER;
-        case ITEM_BUILDER_T1:
-            return MODULE_BUILDER;
-        case ITEM_STORAGE_T1:
-            return MODULE_STORAGE;
-        case ITEM_HAULER_T1:
-        case ITEM_HAULER_T2:
-            return MODULE_HAULER;
-        case ITEM_WARP_T1:
-            return MODULE_WARP;
-        case ITEM_BATTERY_T1:
-            return MODULE_BATTERY;
-        case ITEM_LAUNCHER_T1:
-            return MODULE_LAUNCHER;
-        default:
-            return 0xff;
-    }
+    const item = tryGetItem(itemId);
+    return item?.type === 'module' && item.moduleType ? moduleSlotTypeToCode(item.moduleType) : 0xff;
 }
 function isModuleItem(itemId) {
     return getModuleCapabilityType(itemId) !== 0xff;
@@ -13914,16 +14105,18 @@ function itemTypeCode(id) {
             return ITEM_TYPE_ENTITY;
     }
 }
+const CRAFTED_BASE = 10000;
+const TIER_STRIDE = 1000;
 function itemTier(id) {
-    if (id < 10000)
+    if (id < CRAFTED_BASE)
         return 0;
-    return Math.floor(id / 10000);
+    return Math.floor((id - CRAFTED_BASE) / TIER_STRIDE) + 1;
 }
 function itemOffset(id) {
-    return id % 10000;
+    return id % TIER_STRIDE;
 }
 function itemCategory(id) {
-    if (id < 10000)
+    if (id < CRAFTED_BASE)
         return 'resource';
     const offset = itemOffset(id);
     if (offset >= 200)
@@ -13933,12 +14126,12 @@ function itemCategory(id) {
     return 'component';
 }
 function isRelatedItem(a, b) {
-    if (a < 10000 || b < 10000)
+    if (a < CRAFTED_BASE || b < CRAFTED_BASE)
         return false;
     return itemOffset(a) === itemOffset(b);
 }
 function isCraftedItem(id) {
-    return id >= 10000;
+    return id >= CRAFTED_BASE;
 }
 
 function readCommonBase(data) {
@@ -16824,6 +17017,10 @@ function idiv(a, b) {
 function toWholeEnergy$1(milli) {
     return idiv(milli + 500, 1000);
 }
+function formatMassTonnes(kg) {
+    const tenths = idiv(kg + 50, 100);
+    return `${idiv(tenths, 10)}.${tenths % 10} t`;
+}
 function isShipHull$1(itemId) {
     return getPackedEntityType(itemId)?.equals(ENTITY_SHIP) ?? false;
 }
@@ -16851,6 +17048,27 @@ function computeBaseCapacityWarehouse(stats) {
     const s = decodeStat(stats, 0) + decodeStat(stats, 2);
     return Math.floor(100000000 * 6 ** (s / 1998));
 }
+function computeBaseCapacityWorkshop(stats) {
+    const s = decodeStat(stats, 0) + decodeStat(stats, 2);
+    return Math.floor(5000000 * 6 ** (s / 1998));
+}
+const CAPACITY_FN_BY_KIND = {
+    ship: computeBaseCapacityShip,
+    warehouse: computeBaseCapacityWarehouse,
+    workshop: computeBaseCapacityWorkshop,
+    extractor: computeBaseCapacityContainer,
+    factory: computeBaseCapacityContainer,
+    builddock: computeBaseCapacityContainer,
+    mdriver: computeBaseCapacityContainer,
+    mcatcher: computeBaseCapacityContainer,
+    container: computeBaseCapacityContainer,
+};
+function computeBaseCapacityForEntity(itemId, stats) {
+    const kind = getTemplateMeta(itemId)?.kind;
+    if (!kind)
+        return 0;
+    return CAPACITY_FN_BY_KIND[kind.toString()]?.(stats) ?? 0;
+}
 const computeEngineThrust = (vol, tier) => idiv((400 + idiv(vol * 3, 4)) * moduleTierPct(ENGINE_THRUST_TIER_PCT, tier), 100);
 const computeEngineDrain = (thm) => 2 * Math.max(30, 50 - idiv(thm, 70));
 const ENGINE_DRAIN_BASE = 156;
@@ -16883,83 +17101,36 @@ const computeT1LogisticsDrain = (stat) => Math.max(3000, 15000 - Math.min(12000,
 const computeHaulerDrain = (conductivity, tier) => idiv(computeT1LogisticsDrain(conductivity) * supportDrainTierPercent(tier), 100);
 const computeCargoBayDrain = (cohesion, tier) => idiv(computeT1LogisticsDrain(cohesion) * 3 * supportDrainTierPercent(tier), 400);
 const computeWarpRange = (stat, tier) => idiv((100 + stat * 3) * moduleTierPct(WARP_RANGE_TIER_PCT, tier), 100);
-const computeCargoBayCapacity = (strength, density, hardness) => 10000000 + idiv((strength + density + hardness) * 50000000, 2997);
-const computeBatteryBankCapacity = (volatility, thermal, plasticity, insulation) => 2500000 + idiv((volatility + thermal + plasticity + insulation) * 7500000, 3996);
+const computeCargoBayCapacity = (strength, density, hardness, tier) => idiv((10000000 + idiv((strength + density + hardness) * 50000000, 2997)) *
+    moduleTierPct(CARGO_BAY_CAPACITY_TIER_PCT, tier), 100);
+const computeBatteryBankCapacity = (volatility, thermal, plasticity, insulation, tier) => idiv((2500000 + idiv((volatility + thermal + plasticity + insulation) * 7500000, 3996)) *
+    moduleTierPct(BATTERY_CAPACITY_TIER_PCT, tier), 100);
 function entityDisplayName(itemId) {
-    switch (itemId) {
-        case ITEM_SHIP_T1_PACKED:
-            return 'Ship';
-        case ITEM_ROUSTABOUT_T1A_PACKED:
-            return 'Roustabout';
-        case ITEM_PROSPECTOR_T1A_PACKED:
-            return 'Prospector';
-        case ITEM_TENDER_T1A_PACKED:
-            return 'Tender';
-        case ITEM_TUG_T1A_PACKED:
-            return 'Tug';
-        case ITEM_PORTER_T1A_PACKED:
-            return 'Porter';
-        case ITEM_WRIGHT_T1A_PACKED:
-            return 'Wright';
-        case ITEM_SMITH_T1A_PACKED:
-            return 'Smith';
-        case ITEM_WAREHOUSE_T1_PACKED:
-            return 'Warehouse';
-        case ITEM_EXTRACTOR_T1_PACKED:
-            return 'Mining Rig';
-        case ITEM_FACTORY_T1_PACKED:
-            return 'Factory';
-        case ITEM_CONSTRUCTION_DOCK_T1_PACKED:
-            return 'Construction Dock';
-        case ITEM_CONTAINER_T1_PACKED:
-            return 'Container';
-        case ITEM_CONTAINER_T2_PACKED:
-            return 'Container';
-        case ITEM_PROSPECTOR_T2A_PACKED:
-            return 'Prospector';
-        case ITEM_PROSPECTOR_T2B_PACKED:
-            return 'Prospector';
-        case ITEM_DREDGER_T2A_PACKED:
-            return 'Dredger';
-        default:
-            return 'Entity';
-    }
-}
+    const template = getTemplateMeta(itemId);
+    if (!template)
+        return 'Entity';
+    if (template.displayLabel)
+        return template.displayLabel;
+    return getKindMeta(template.kind)?.defaultLabel || 'Entity';
+}
+const MODULE_DISPLAY_NAME_BY_TYPE = {
+    engine: 'Engine',
+    generator: 'Power Core',
+    gatherer: 'Limpet Bay',
+    loader: 'Shuttle Bay',
+    crafter: 'Fabricator',
+    storage: 'Cargo Hold',
+    hauler: 'Tractor Beam',
+    warp: 'Warp Drive',
+    battery: 'Battery Bank',
+    launcher: 'Drive Coil',
+    builder: 'Assembly Arm',
+};
 function moduleDisplayName(itemId) {
-    switch (itemId) {
-        case ITEM_ENGINE_T1:
-        case ITEM_ENGINE_T2:
-            return 'Engine';
-        case ITEM_GENERATOR_T1:
-        case ITEM_GENERATOR_T2:
-            return 'Power Core';
-        case ITEM_GATHERER_T1:
-        case ITEM_GATHERER_T2:
-            return 'Limpet Bay';
-        case ITEM_LOADER_T1:
-        case ITEM_LOADER_T2:
-            return 'Shuttle Bay';
-        case ITEM_CRAFTER_T1:
-        case ITEM_CRAFTER_T2:
-            return 'Fabricator';
-        case ITEM_BUILDER_T1:
-        case ITEM_BUILDER_T2:
-            return 'Assembly Arm';
-        case ITEM_STORAGE_T1:
-            return 'Cargo Hold';
-        case ITEM_HAULER_T1:
-        case ITEM_HAULER_T2:
-            return 'Tractor Beam';
-        case ITEM_WARP_T1:
-        case ITEM_WARP_T2:
-            return 'Warp Drive';
-        case ITEM_BATTERY_T1:
-            return 'Battery Bank';
-        case ITEM_LAUNCHER_T1:
-            return 'Drive Coil';
-        default:
-            return 'Module';
-    }
+    const item = tryGetItem(itemId);
+    if (item?.type !== 'module' || !item.moduleType)
+        return 'Module';
+    return MODULE_DISPLAY_NAME_BY_TYPE[item.moduleType] ?? 'Module';
 }
 function formatModuleLine(slot, itemId, stats) {
     let out = `Slot ${slot} - `;
@@ -16996,7 +17167,7 @@ function formatModuleLine(slot, itemId, stats) {
             const fin = decodeStat(stats, 0);
             const pla = decodeStat(stats, 1);
             const tier = getItem(itemId).tier;
-            out += `  Mass ${computeLoaderMass(fin)}  Thrust ${computeLoaderThrust(pla, tier)}`;
+            out += `  Mass ${formatMassTonnes(computeLoaderMass(fin))}  Thrust ${computeLoaderThrust(pla, tier)}`;
             break;
         }
         case MODULE_CRAFTER: {
@@ -17019,7 +17190,7 @@ function formatModuleLine(slot, itemId, stats) {
             const hrd = decodeStat(stats, 2);
             const coh = decodeStat(stats, 3);
             const tier = getItem(itemId).tier;
-            out += `  Cargo Capacity ${computeCargoBayCapacity(str, den, hrd)}  Drain ${toWholeEnergy$1(computeCargoBayDrain(coh, tier))}`;
+            out += `  Cargo Capacity ${formatMassTonnes(computeCargoBayCapacity(str, den, hrd, tier))}  Drain ${toWholeEnergy$1(computeCargoBayDrain(coh, tier))}`;
             break;
         }
         case MODULE_HAULER: {
@@ -17041,7 +17212,8 @@ function formatModuleLine(slot, itemId, stats) {
             const thm = decodeStat(stats, 1);
             const pla = decodeStat(stats, 2);
             const ins = decodeStat(stats, 3);
-            out += `  Energy Capacity ${toWholeEnergy$1(computeBatteryBankCapacity(vol, thm, pla, ins))}`;
+            const tier = getItem(itemId).tier;
+            out += `  Energy Capacity ${toWholeEnergy$1(computeBatteryBankCapacity(vol, thm, pla, ins, tier))}`;
             break;
         }
     }
@@ -17049,24 +17221,11 @@ function formatModuleLine(slot, itemId, stats) {
 }
 function buildEntityDescription(itemId, hullStats, moduleItems, moduleStats) {
     const hullMass = computeBaseHullmass$1(itemId, hullStats);
-    let baseCapacity = 0;
-    if (isShipHull$1(itemId)) {
-        baseCapacity = computeBaseCapacityShip(hullStats);
-    }
-    else if (itemId === ITEM_WAREHOUSE_T1_PACKED) {
-        baseCapacity = computeBaseCapacityWarehouse(hullStats);
-    }
-    else if (itemId === ITEM_EXTRACTOR_T1_PACKED ||
-        itemId === ITEM_FACTORY_T1_PACKED ||
-        itemId === ITEM_CONSTRUCTION_DOCK_T1_PACKED ||
-        itemId === ITEM_CONTAINER_T1_PACKED ||
-        itemId === ITEM_CONTAINER_T2_PACKED) {
-        baseCapacity = computeBaseCapacityContainer(hullStats);
-    }
+    const baseCapacity = computeBaseCapacityForEntity(itemId, hullStats);
     let out = entityDisplayName(itemId);
-    out += ` - Hull ${hullMass} mass`;
+    out += ` - Hull ${formatMassTonnes(hullMass)}`;
     if (baseCapacity > 0) {
-        out += ` * ${baseCapacity} capacity`;
+        out += ` * ${formatMassTonnes(baseCapacity)} capacity`;
     }
     out += '\n\n';
     for (let i = 0; i < moduleItems.length; i++) {
@@ -17195,17 +17354,14 @@ function computeLauncherCapabilities(stats, amp = 100) {
 }
 function computeStorageCapabilities(stats, tier) {
     return {
-        capacity: computeCargoBayCapacity(stats.strength ?? 0, stats.density ?? 0, stats.hardness ?? 0),
+        capacity: computeCargoBayCapacity(stats.strength ?? 0, stats.density ?? 0, stats.hardness ?? 0, tier),
         drain: computeCargoBayDrain(stats.cohesion ?? 0, tier),
     };
 }
-function computeBatteryCapabilities(stats) {
-    const volatility = stats.volatility ?? 0;
-    const thermal = stats.thermal ?? 0;
-    const plasticity = stats.plasticity ?? 0;
-    const insulation = stats.insulation ?? 0;
-    const statSum = volatility + thermal + plasticity + insulation;
-    return { capacity: 2500000 + Math.floor((statSum * 7500000) / 3996) };
+function computeBatteryCapabilities(stats, tier) {
+    return {
+        capacity: computeBatteryBankCapacity(stats.volatility ?? 0, stats.thermal ?? 0, stats.plasticity ?? 0, stats.insulation ?? 0, tier),
+    };
 }
 const CAPACITY_TIER_TABLE = [1.0, 1.4, 1.8, 2.2, 2.6, 3.0, 3.4, 3.8, 4.2, 4.6];
 function capacityTierMultiplier(tier) {
@@ -17228,6 +17384,10 @@ const CRAFTER_SPEED_TIER_PCT = [100, 120, 140, 160, 180, 200, 220, 240, 260, 280
 const BUILDER_SPEED_TIER_PCT = [100, 120, 140, 160, 180, 200, 220, 240, 260, 280];
 const WARP_RANGE_TIER_PCT = [100, 120, 140, 160, 180, 200, 220, 240, 260, 280];
 const LOADER_THRUST_TIER_PCT = [100, 120, 140, 160, 180, 200, 220, 240, 260, 280];
+const CARGO_BAY_CAPACITY_TIER_PCT = [
+    100, 110, 120, 130, 140, 150, 160, 170, 180, 190,
+];
+const BATTERY_CAPACITY_TIER_PCT = [100, 110, 120, 130, 140, 150, 160, 170, 180, 190];
 function moduleTierPct(table, tier) {
     const clamped = Math.min(Math.max(tier, 1), MODULE_MAX_TIER);
     return table[clamped - 1];
@@ -17237,31 +17397,27 @@ function computeGathererYield(str, tier) {
     const pct = GATHERER_YIELD_TIER_TABLE[clampedTier - 1];
     return Math.floor(((200 + str) * pct) / 100);
 }
+const BASE_CAPACITY_FN_BY_KIND = {
+    warehouse: (stats) => computeWarehouseHullCapabilities(stats).capacity,
+    workshop: (stats) => computeWorkshopHullCapabilities(stats).capacity,
+    extractor: (stats) => computeContainerCapabilities(stats).capacity,
+    factory: (stats) => computeContainerCapabilities(stats).capacity,
+    builddock: (stats) => computeContainerCapabilities(stats).capacity,
+    mdriver: (stats) => computeContainerCapabilities(stats).capacity,
+    mcatcher: (stats) => computeContainerCapabilities(stats).capacity,
+    container: (stats) => computeContainerCapabilities(stats).capacity,
+};
 function computeBaseCapacity(itemId, stats) {
     let base;
     if (isShipHull(itemId)) {
         base = computeShipHullCapabilities(stats, itemId).capacity;
     }
     else {
-        switch (itemId) {
-            case ITEM_EXTRACTOR_T1_PACKED:
-            case ITEM_FACTORY_T1_PACKED:
-            case ITEM_CONSTRUCTION_DOCK_T1_PACKED:
-            case ITEM_MASS_DRIVER_T1_PACKED:
-            case ITEM_MASS_CATCHER_T1_PACKED:
-            case ITEM_CONTAINER_T1_PACKED:
-            case ITEM_CONTAINER_T2_PACKED:
-                base = computeContainerCapabilities(stats).capacity;
-                break;
-            case ITEM_WAREHOUSE_T1_PACKED:
-                base = computeWarehouseHullCapabilities(stats).capacity;
-                break;
-            case ITEM_WORKSHOP_T1_PACKED:
-                base = computeWorkshopHullCapabilities(stats).capacity;
-                break;
-            default:
-                return 0;
-        }
+        const kind = getPackedEntityType(itemId);
+        const capacityFn = kind ? BASE_CAPACITY_FN_BY_KIND[kind.toString()] : undefined;
+        if (!capacityFn)
+            return 0;
+        base = capacityFn(stats);
     }
     return applyCapacityTier(base, getItem(itemId).tier);
 }
@@ -17439,7 +17595,7 @@ function computeEntityCapabilities(stats, itemId, modules, layout) {
             totalLauncherDrain = clampUint16(totalLauncherDrain + caps.drain);
         }
         else if (modType === MODULE_BATTERY) {
-            const caps = computeBatteryCapabilities(decodedStats);
+            const caps = computeBatteryCapabilities(decodedStats, item.tier);
             totalBatteryCapacity += applySlotMultiplierUint32(caps.capacity, amp);
         }
     }
@@ -20003,9 +20159,9 @@ const itemAbbreviations = {
     10200: 'CT',
     10201: 'SH',
     10202: 'WH',
-    20001: 'PL',
-    20002: 'FR',
-    20200: 'CT',
+    11001: 'PL',
+    11002: 'FR',
+    11200: 'CT',
 };
 
 const categories = [
@@ -20733,7 +20889,7 @@ function computeCapabilityGroup(moduleType, stats, tier, outputPct = 100) {
             };
         }
         case MODULE_BATTERY: {
-            const caps = computeBatteryCapabilities(stats);
+            const caps = computeBatteryCapabilities(stats, tier);
             return {
                 capability: 'Energy',
                 attributes: [
@@ -21207,7 +21363,7 @@ function buildModuleImmutable(itemId, quantity, stats, originX, originY) {
             base.push({ first: 'cohesion', second: ['uint16', com] });
             base.push({
                 first: 'capacity',
-                second: ['uint32', computeCargoBayCapacity(str, den, hrd)],
+                second: ['uint32', computeCargoBayCapacity(str, den, hrd, item.tier)],
             });
             base.push({
                 first: 'drain',
@@ -21226,7 +21382,10 @@ function buildModuleImmutable(itemId, quantity, stats, originX, originY) {
             base.push({ first: 'insulation', second: ['uint16', ins] });
             base.push({
                 first: 'capacity',
-                second: ['uint32', toWholeEnergy(computeBatteryBankCapacity(vol, thm, pla, ins))],
+                second: [
+                    'uint32',
+                    toWholeEnergy(computeBatteryBankCapacity(vol, thm, pla, ins, item.tier)),
+                ],
             });
             break;
         }
@@ -21296,10 +21455,13 @@ var index = /*#__PURE__*/Object.freeze({
     deserializeEntity: deserializeEntity,
     deserializeAsset: deserializeAsset,
     toWholeEnergy: toWholeEnergy$1,
+    formatMassTonnes: formatMassTonnes,
     computeBaseHullmass: computeBaseHullmass$1,
     computeBaseCapacityShip: computeBaseCapacityShip,
     computeBaseCapacityContainer: computeBaseCapacityContainer,
     computeBaseCapacityWarehouse: computeBaseCapacityWarehouse,
+    computeBaseCapacityWorkshop: computeBaseCapacityWorkshop,
+    computeBaseCapacityForEntity: computeBaseCapacityForEntity,
     computeEngineThrust: computeEngineThrust,
     computeEngineDrain: computeEngineDrain,
     ENGINE_DRAIN_BASE: ENGINE_DRAIN_BASE,
@@ -21659,6 +21821,7 @@ exports.INSUFFICIENT_ITEM_SUPPLY = INSUFFICIENT_ITEM_SUPPLY;
 exports.INTAKE_RATE = INTAKE_RATE;
 exports.INVALID_AMOUNT = INVALID_AMOUNT;
 exports.ITEM_BATTERY_T1 = ITEM_BATTERY_T1;
+exports.ITEM_BATTERY_T2 = ITEM_BATTERY_T2;
 exports.ITEM_BEAM = ITEM_BEAM;
 exports.ITEM_BEAM_T2 = ITEM_BEAM_T2;
 exports.ITEM_BIOMASS_T1 = ITEM_BIOMASS_T1;
@@ -21765,6 +21928,7 @@ 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_STORAGE_T2 = ITEM_STORAGE_T2;
 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;