@shipload/sdk 2.0.0-rc7 → 2.0.0-rc9

package/src/data/recipes.ts

@@ -1,20 +1,25 @@
-import {MODULE_ENGINE, MODULE_GENERATOR, MODULE_EXTRACTOR, MODULE_LOADER, MODULE_CRAFTER, ITEM_ENGINE_T1, ITEM_GENERATOR_T1, ITEM_EXTRACTOR_T1, ITEM_LOADER_T1, ITEM_MANUFACTURING_T1} from '../capabilities/modules'
+import {MODULE_ANY, MODULE_ENGINE, MODULE_GENERATOR, MODULE_EXTRACTOR, MODULE_LOADER, MODULE_CRAFTER, MODULE_STORAGE, ITEM_ENGINE_T1, ITEM_GENERATOR_T1, ITEM_EXTRACTOR_T1, ITEM_LOADER_T1, ITEM_MANUFACTURING_T1, ITEM_STORAGE_T1} from '../capabilities/modules'
 import type {ResourceCategory} from '../types'
 
-export {ITEM_ENGINE_T1, ITEM_GENERATOR_T1, ITEM_EXTRACTOR_T1, ITEM_LOADER_T1, ITEM_MANUFACTURING_T1}
+export {ITEM_ENGINE_T1, ITEM_GENERATOR_T1, ITEM_EXTRACTOR_T1, ITEM_LOADER_T1, ITEM_MANUFACTURING_T1, ITEM_STORAGE_T1}
 
-export const ITEM_DRILL_SHAFT = 10009
-export const ITEM_EXTRACTION_PROBE = 10010
-export const ITEM_CARGO_ARM = 10011
-export const ITEM_TOOL_BIT = 10012
-export const ITEM_REACTION_CHAMBER = 10013
+export const ITEM_DRILL_SHAFT = 10005
+export const ITEM_EXTRACTION_PROBE = 10006
+export const ITEM_CARGO_ARM = 10007
+export const ITEM_TOOL_BIT = 10008
+export const ITEM_REACTION_CHAMBER = 10009
 
 export const ITEM_HULL_PLATES = 10001
 export const ITEM_CARGO_LINING = 10002
-export const ITEM_CONTAINER_PACKED = 10003
-export const ITEM_THRUSTER_CORE = 10004
-export const ITEM_POWER_CELL = 10005
-export const ITEM_SHIP_T1_PACKED = 10008
+export const ITEM_CONTAINER_T1_PACKED = 10200
+export const ITEM_THRUSTER_CORE = 10003
+export const ITEM_POWER_CELL = 10004
+export const ITEM_SHIP_T1_PACKED = 10201
+export const ITEM_WAREHOUSE_T1_PACKED = 10202
+
+export const ITEM_HULL_PLATES_T2 = 20001
+export const ITEM_CARGO_LINING_T2 = 20002
+export const ITEM_CONTAINER_T2_PACKED = 20200
 
 export interface RecipeInput {
 	category?: ResourceCategory
@@ -38,6 +43,11 @@ export interface ComponentDefinition {
 	usedIn: {type: 'entity' | 'module'; name: string}[]
 }
 
+export interface ModuleSlot {
+	type: number
+	label?: string
+}
+
 export interface EntityRecipe {
 	id: string
 	name: string
@@ -46,6 +56,7 @@ export interface EntityRecipe {
 	packedItemId: number
 	recipe: RecipeInput[]
 	stats: {key: string; sourceComponentId: number; sourceStatKey: string}[]
+	moduleSlots?: ModuleSlot[]
 }
 
 export interface CraftableItem {
@@ -68,7 +79,7 @@ export const components: ComponentDefinition[] = [
 			{key: 'density', source: 'metal'},
 		],
 		recipe: [{category: 'metal', quantity: 15}],
-		usedIn: [{type: 'entity', name: 'Container'}, {type: 'entity', name: 'Ship T1'}],
+		usedIn: [{type: 'entity', name: 'Container'}, {type: 'entity', name: 'Warehouse T1'}, {type: 'entity', name: 'Ship T1'}],
 	},
 	{
 		id: ITEM_CARGO_LINING,
@@ -85,7 +96,7 @@ export const components: ComponentDefinition[] = [
 			{category: 'precious', quantity: 6},
 			{category: 'organic', quantity: 14},
 		],
-		usedIn: [{type: 'entity', name: 'Container'}, {type: 'entity', name: 'Ship T1'}],
+		usedIn: [{type: 'entity', name: 'Container'}, {type: 'entity', name: 'Warehouse T1'}, {type: 'entity', name: 'Ship T1'}],
 	},
 	{
 		id: ITEM_THRUSTER_CORE,
@@ -98,7 +109,7 @@ export const components: ComponentDefinition[] = [
 			{key: 'thermal', source: 'gas'},
 		],
 		recipe: [{category: 'gas' as ResourceCategory, quantity: 32}],
-		usedIn: [{type: 'module', name: 'Engine Module T1'}],
+		usedIn: [{type: 'module', name: 'Engine'}],
 	},
 	{
 		id: ITEM_POWER_CELL,
@@ -111,7 +122,7 @@ export const components: ComponentDefinition[] = [
 			{key: 'clarity', source: 'mineral'},
 		],
 		recipe: [{category: 'mineral' as ResourceCategory, quantity: 20}],
-		usedIn: [{type: 'module', name: 'Generator Module T1'}],
+		usedIn: [{type: 'module', name: 'Generator'}],
 	},
 	{
 		id: ITEM_DRILL_SHAFT,
@@ -124,7 +135,7 @@ export const components: ComponentDefinition[] = [
 			{key: 'tolerance', source: 'metal'},
 		],
 		recipe: [{category: 'metal' as ResourceCategory, quantity: 15}],
-		usedIn: [{type: 'module', name: 'Extractor Module T1'}],
+		usedIn: [{type: 'module', name: 'Extractor'}],
 	},
 	{
 		id: ITEM_EXTRACTION_PROBE,
@@ -137,7 +148,7 @@ export const components: ComponentDefinition[] = [
 			{key: 'reflectivity', source: 'precious'},
 		],
 		recipe: [{category: 'precious' as ResourceCategory, quantity: 10}],
-		usedIn: [{type: 'module', name: 'Extractor Module T1'}],
+		usedIn: [{type: 'module', name: 'Extractor'}],
 	},
 	{
 		id: ITEM_CARGO_ARM,
@@ -150,7 +161,7 @@ export const components: ComponentDefinition[] = [
 			{key: 'insulation', source: 'organic'},
 		],
 		recipe: [{category: 'organic' as ResourceCategory, quantity: 32}],
-		usedIn: [{type: 'module', name: 'Loader Module T1'}],
+		usedIn: [{type: 'module', name: 'Loader'}],
 	},
 	{
 		id: ITEM_TOOL_BIT,
@@ -163,7 +174,7 @@ export const components: ComponentDefinition[] = [
 			{key: 'clarity', source: 'mineral'},
 		],
 		recipe: [{category: 'mineral' as ResourceCategory, quantity: 20}],
-		usedIn: [{type: 'module', name: 'Manufacturing Module T1'}],
+		usedIn: [{type: 'module', name: 'Manufacturing'}],
 	},
 	{
 		id: ITEM_REACTION_CHAMBER,
@@ -176,7 +187,40 @@ export const components: ComponentDefinition[] = [
 			{key: 'thermal', source: 'gas'},
 		],
 		recipe: [{category: 'gas' as ResourceCategory, quantity: 32}],
-		usedIn: [{type: 'module', name: 'Manufacturing Module T1'}],
+		usedIn: [{type: 'module', name: 'Manufacturing'}],
+	},
+	{
+		id: ITEM_HULL_PLATES_T2,
+		name: 'Hull Plates T2',
+		description: 'Advanced structural plating reinforced with tier 2 metals.',
+		color: '#9BADB8',
+		mass: 50000,
+		stats: [
+			{key: 'strength', source: 'metal'},
+			{key: 'density', source: 'metal'},
+		],
+		recipe: [
+			{itemId: ITEM_HULL_PLATES, quantity: 2},
+			{category: 'metal', quantity: 15},
+		],
+		usedIn: [{type: 'entity', name: 'Container T2'}],
+	},
+	{
+		id: ITEM_CARGO_LINING_T2,
+		name: 'Cargo Lining T2',
+		description: 'Advanced composite lining with improved storage properties.',
+		color: '#E0B84D',
+		mass: 30000,
+		stats: [
+			{key: 'ductility', source: 'precious'},
+			{key: 'purity', source: 'organic'},
+		],
+		recipe: [
+			{itemId: ITEM_CARGO_LINING, quantity: 2},
+			{category: 'precious', quantity: 6},
+			{category: 'organic', quantity: 14},
+		],
+		usedIn: [{type: 'entity', name: 'Container T2'}],
 	},
 ]
 
@@ -186,7 +230,7 @@ export const entityRecipes: EntityRecipe[] = [
 		name: 'Container',
 		description: 'Passive floating cargo storage in space. Towed by ships.',
 		color: '#7B8D9E',
-		packedItemId: ITEM_CONTAINER_PACKED,
+		packedItemId: ITEM_CONTAINER_T1_PACKED,
 		recipe: [
 			{itemId: ITEM_HULL_PLATES, quantity: 6},
 			{itemId: ITEM_CARGO_LINING, quantity: 2},
@@ -214,6 +258,54 @@ export const entityRecipes: EntityRecipe[] = [
 			{key: 'ductility', sourceComponentId: ITEM_CARGO_LINING, sourceStatKey: 'ductility'},
 			{key: 'purity', sourceComponentId: ITEM_CARGO_LINING, sourceStatKey: 'purity'},
 		],
+		moduleSlots: [
+			{type: MODULE_ANY},
+			{type: MODULE_ANY},
+			{type: MODULE_ANY},
+			{type: MODULE_ANY},
+			{type: MODULE_ANY},
+		],
+	},
+	{
+		id: 'warehouse-t1',
+		name: 'Warehouse T1',
+		description: 'Massive stationary storage facility with a single loader module slot.',
+		color: '#EAB308',
+		packedItemId: ITEM_WAREHOUSE_T1_PACKED,
+		recipe: [
+			{itemId: ITEM_HULL_PLATES, quantity: 20},
+			{itemId: ITEM_CARGO_LINING, quantity: 10},
+		],
+		stats: [
+			{key: 'strength', sourceComponentId: ITEM_HULL_PLATES, sourceStatKey: 'strength'},
+			{key: 'density', sourceComponentId: ITEM_HULL_PLATES, sourceStatKey: 'density'},
+			{key: 'ductility', sourceComponentId: ITEM_CARGO_LINING, sourceStatKey: 'ductility'},
+			{key: 'purity', sourceComponentId: ITEM_CARGO_LINING, sourceStatKey: 'purity'},
+		],
+		moduleSlots: [
+			{type: MODULE_LOADER, label: 'Loader'},
+			{type: MODULE_STORAGE, label: 'Storage'},
+			{type: MODULE_STORAGE, label: 'Storage'},
+			{type: MODULE_STORAGE, label: 'Storage'},
+			{type: MODULE_STORAGE, label: 'Storage'},
+		],
+	},
+	{
+		id: 'container-t2',
+		name: 'Container T2',
+		description: 'Advanced cargo container with improved capacity formulas.',
+		color: '#9BADB8',
+		packedItemId: ITEM_CONTAINER_T2_PACKED,
+		recipe: [
+			{itemId: ITEM_HULL_PLATES_T2, quantity: 6},
+			{itemId: ITEM_CARGO_LINING_T2, quantity: 2},
+		],
+		stats: [
+			{key: 'strength', sourceComponentId: ITEM_HULL_PLATES_T2, sourceStatKey: 'strength'},
+			{key: 'density', sourceComponentId: ITEM_HULL_PLATES_T2, sourceStatKey: 'density'},
+			{key: 'ductility', sourceComponentId: ITEM_CARGO_LINING_T2, sourceStatKey: 'ductility'},
+			{key: 'purity', sourceComponentId: ITEM_CARGO_LINING_T2, sourceStatKey: 'purity'},
+		],
 	},
 ]
 
@@ -231,7 +323,7 @@ export interface ModuleRecipe {
 export const moduleRecipes: ModuleRecipe[] = [
 	{
 		id: 'engine-t1',
-		name: 'Engine Module T1',
+		name: 'Engine',
 		description: 'Basic propulsion system. Converts volatile gases into thrust.',
 		color: '#E86344',
 		itemId: ITEM_ENGINE_T1,
@@ -244,7 +336,7 @@ export const moduleRecipes: ModuleRecipe[] = [
 	},
 	{
 		id: 'generator-t1',
-		name: 'Generator Module T1',
+		name: 'Generator',
 		description: 'Basic energy system. Stores and recharges energy from resonant minerals.',
 		color: '#7B5AE8',
 		itemId: ITEM_GENERATOR_T1,
@@ -257,7 +349,7 @@ export const moduleRecipes: ModuleRecipe[] = [
 	},
 	{
 		id: 'extractor-t1',
-		name: 'Extractor Module T1',
+		name: 'Extractor',
 		description: 'Basic extraction system. Drills and probes for raw resources.',
 		color: '#7B8D9E',
 		itemId: ITEM_EXTRACTOR_T1,
@@ -276,7 +368,7 @@ export const moduleRecipes: ModuleRecipe[] = [
 	},
 	{
 		id: 'loader-t1',
-		name: 'Loader Module T1',
+		name: 'Loader',
 		description: 'Basic cargo handling system. Loads and unloads cargo with articulated arms.',
 		color: '#6B8E5A',
 		itemId: ITEM_LOADER_T1,
@@ -292,7 +384,7 @@ export const moduleRecipes: ModuleRecipe[] = [
 	},
 	{
 		id: 'manufacturing-t1',
-		name: 'Manufacturing Module T1',
+		name: 'Manufacturing',
 		description: 'Basic crafting system. Processes materials using reaction chambers and cutting tools.',
 		color: '#7EC8E3',
 		itemId: ITEM_MANUFACTURING_T1,
@@ -306,6 +398,24 @@ export const moduleRecipes: ModuleRecipe[] = [
 			{key: 'clarity', sourceComponentId: ITEM_TOOL_BIT, sourceStatKey: 'clarity'},
 		],
 	},
+	{
+		id: 'storage-t1',
+		name: 'Storage',
+		description: 'Expands cargo capacity based on hull material quality',
+		color: '#8B7355',
+		itemId: ITEM_STORAGE_T1,
+		moduleType: MODULE_STORAGE,
+		recipe: [
+			{itemId: ITEM_HULL_PLATES, quantity: 8},
+			{itemId: ITEM_CARGO_LINING, quantity: 4},
+		],
+		stats: [
+			{key: 'strength', sourceComponentId: ITEM_HULL_PLATES, sourceStatKey: 'strength'},
+			{key: 'ductility', sourceComponentId: ITEM_HULL_PLATES, sourceStatKey: 'ductility'},
+			{key: 'purity', sourceComponentId: ITEM_CARGO_LINING, sourceStatKey: 'purity'},
+			{key: 'density', sourceComponentId: ITEM_CARGO_LINING, sourceStatKey: 'density'},
+		],
+	},
 ]
 
 export function getModuleRecipe(id: string): ModuleRecipe | undefined {
@@ -328,6 +438,11 @@ export function getEntityRecipeByItemId(itemId: number): EntityRecipe | undefine
 	return entityRecipes.find((r) => r.packedItemId === itemId)
 }
 
+export function getEntitySlotLayout(packedItemId: number): ModuleSlot[] {
+	const recipe = getEntityRecipeByItemId(packedItemId)
+	return recipe?.moduleSlots ?? []
+}
+
 export function getAllCraftableItems(): CraftableItem[] {
 	const items: CraftableItem[] = []
 	for (const comp of components) {

package/src/data/tiers.ts

@@ -0,0 +1,41 @@
+export type CraftedItemCategory = 'component' | 'module' | 'entity' | 'resource'
+
+export const ITEM_TYPE_RESOURCE = 0
+export const ITEM_TYPE_COMPONENT = 1
+export const ITEM_TYPE_MODULE = 2
+export const ITEM_TYPE_ENTITY = 3
+
+export function itemTypeCode(id: number): number {
+    switch (itemCategory(id)) {
+        case 'resource': return ITEM_TYPE_RESOURCE
+        case 'component': return ITEM_TYPE_COMPONENT
+        case 'module': return ITEM_TYPE_MODULE
+        case 'entity': return ITEM_TYPE_ENTITY
+    }
+}
+
+export function itemTier(id: number): number {
+    if (id < 10000) return 0
+    return Math.floor(id / 10000)
+}
+
+export function itemOffset(id: number): number {
+    return id % 10000
+}
+
+export function itemCategory(id: number): CraftedItemCategory {
+    if (id < 10000) return 'resource'
+    const offset = itemOffset(id)
+    if (offset >= 200) return 'entity'
+    if (offset >= 100) return 'module'
+    return 'component'
+}
+
+export function isRelatedItem(a: number, b: number): boolean {
+    if (a < 10000 || b < 10000) return false
+    return itemOffset(a) === itemOffset(b)
+}
+
+export function isCraftedItem(id: number): boolean {
+    return id >= 10000
+}

package/src/derivation/crafting.ts

@@ -27,10 +27,14 @@ export function encodeStats(values: number[]): bigint {
 	return seed
 }
 
+export function decodeStat(seed: bigint, index: number): number {
+	return Number((seed >> BigInt(index * 10)) & 0x3ffn)
+}
+
 export function decodeStats(seed: bigint, count: number): number[] {
 	const stats: number[] = []
 	for (let i = 0; i < count; i++) {
-		stats.push(Number((seed >> BigInt(i * 10)) & 0x3ffn))
+		stats.push(decodeStat(seed, i))
 	}
 	return stats
 }
@@ -128,6 +132,59 @@ function decodeStackStats(itemId: number, seed: UInt64): Record<string, number>
 	return {stat1: raw.stat1, stat2: raw.stat2, stat3: raw.stat3}
 }
 
+export const categoryItemMass: Record<string, number> = {
+	metal: 30000,
+	precious: 40000,
+	gas: 15000,
+	mineral: 22000,
+	organic: 15000,
+}
+
+export function computeInputMass(
+	itemId: string | number,
+	itemType: 'component' | 'module' | 'entity'
+): number {
+	if (itemType === 'component') {
+		const comp = getComponentById(itemId as number)
+		if (!comp) return 0
+		return comp.recipe.reduce((sum, input) => {
+			const mass = input.category ? (categoryItemMass[input.category] ?? 0) : 0
+			return sum + mass * input.quantity
+		}, 0)
+	}
+	if (itemType === 'module') {
+		const mod = getModuleRecipe(itemId as string)
+		if (!mod) return 0
+		return mod.recipe.reduce((sum, input) => {
+			const comp = input.itemId ? getComponentById(input.itemId) : undefined
+			return sum + (comp?.mass ?? 0) * input.quantity
+		}, 0)
+	}
+	if (itemType === 'entity') {
+		const ent = getEntityRecipe(itemId as string)
+		if (!ent) return 0
+		return ent.recipe.reduce((sum, input) => {
+			const comp = input.itemId ? getComponentById(input.itemId) : undefined
+			return sum + (comp?.mass ?? 0) * input.quantity
+		}, 0)
+	}
+	return 0
+}
+
+export function blendCrossGroup(
+	sources: {value: number; weight: number}[]
+): number {
+	let weightedSum = 0
+	let totalWeight = 0
+	for (const src of sources) {
+		weightedSum += src.value * src.weight
+		totalWeight += src.weight
+	}
+	if (totalWeight === 0) return 1
+	const result = Math.floor(weightedSum / totalWeight)
+	return Math.max(1, Math.min(999, result))
+}
+
 export function blendCargoStacks(
 	itemId: number,
 	stacks: {quantity: number; seed: UInt64}[]

package/src/entities/container.ts

@@ -86,3 +86,21 @@ export function computeContainerCapabilities(stats: Record<string, number>): {
 
 	return {hullmass, capacity}
 }
+
+export function computeContainerT2Capabilities(stats: Record<string, number>): {
+	hullmass: number
+	capacity: number
+} {
+	const strength = stats['strength'] ?? 0
+	const density = stats['density'] ?? 0
+	const ductility = stats['ductility'] ?? 0
+	const purity = stats['purity'] ?? 0
+
+	const hullmass = 20000 + 50 * density
+
+	const statSum = strength + ductility + purity
+	const exponent = statSum / 2500
+	const capacity = Math.floor(1500000 * Math.pow(10, exponent))
+
+	return {hullmass, capacity}
+}

package/src/entities/makers.ts

@@ -30,7 +30,7 @@ export function makeShip(state: ShipStateInput): Ship {
 }
 
 export function makeWarehouse(state: WarehouseStateInput): Warehouse {
-    const entityInfo = ServerContract.Types.entity_info.from({
+    const info: Record<string, unknown> = {
         type: Name.from('warehouse'),
         id: UInt64.from(state.id),
         owner: Name.from(state.owner),
@@ -39,13 +39,15 @@ export function makeWarehouse(state: WarehouseStateInput): Warehouse {
         capacity: UInt32.from(state.capacity),
         cargomass: UInt32.from(0),
         cargo: state.cargo || [],
-        loaders: state.loaders,
         is_idle: !state.schedule,
         current_task_elapsed: UInt32.from(0),
         current_task_remaining: UInt32.from(0),
         pending_tasks: [],
-        schedule: state.schedule,
-    })
+    }
+    if (state.hullmass !== undefined) info.hullmass = UInt32.from(state.hullmass)
+    if (state.loaders) info.loaders = state.loaders
+    if (state.schedule) info.schedule = state.schedule
+    const entityInfo = ServerContract.Types.entity_info.from(info)
     return new Warehouse(entityInfo)
 }
 

package/src/entities/ship-deploy.ts

@@ -24,7 +24,7 @@ export function computeEngineCapabilities(stats: Record<string, number>): {
 
     return {
         thrust: 400 + Math.floor(vol * 3 / 4),
-        drain: Math.max(16, 30 - Math.floor(thm / 70)),
+        drain: Math.max(30, 50 - Math.floor(thm / 70)),
     }
 }
 
@@ -87,3 +87,36 @@ export function computeManufacturingCapabilities(stats: Record<string, number>):
         drain: Math.max(5, 30 - Math.floor(clr / 33)),
     }
 }
+
+export function computeStorageCapabilities(
+    stats: Record<string, number>,
+    baseCapacity: number
+): {
+    capacityBonus: number
+} {
+    const strength = stats.strength ?? 500
+    const ductility = stats.ductility ?? 500
+    const purity = stats.purity ?? 500
+
+    const statSum = strength + ductility + purity
+    const capacityBonus = Math.floor(baseCapacity * (10 + Math.floor(statSum * 10 / 2997)) / 100)
+
+    return {capacityBonus}
+}
+
+export function computeWarehouseHullCapabilities(stats: Record<string, number>): {
+    hullmass: number
+    capacity: number
+} {
+    const density = stats.density ?? 500
+    const strength = stats.strength ?? 500
+    const ductility = stats.ductility ?? 500
+    const purity = stats.purity ?? 500
+
+    const hullmass = 25000 + 75 * density
+    const statSum = strength + ductility + purity
+    const exponent = statSum / 2997.0
+    const capacity = Math.floor(20000000 * Math.pow(10, exponent))
+
+    return {hullmass, capacity}
+}

package/src/entities/warehouse.ts

@@ -12,8 +12,9 @@ export interface WarehouseStateInput {
     owner: string
     name: string
     coordinates: CoordinatesType | {x: number; y: number; z?: number}
+    hullmass?: number
     capacity: number
-    loaders: ServerContract.Types.loader_stats
+    loaders?: ServerContract.Types.loader_stats
     schedule?: ServerContract.Types.schedule
     cargo?: ServerContract.Types.cargo_item[]
 }
@@ -82,4 +83,9 @@ export class Warehouse extends ServerContract.Types.entity_info {
     get orbitalAltitude(): number {
         return this.coordinates.z?.toNumber() || 0
     }
+
+    get totalMass(): UInt64 {
+        const hull = this.hullmass ? UInt64.from(this.hullmass) : UInt64.from(0)
+        return hull.adding(this.totalCargoMass)
+    }
 }

package/src/index-module.ts

@@ -141,7 +141,28 @@ export * from './types/capabilities'
 export * from './types/entity'
 export * from './capabilities'
 
-export {categoryColors, tierColors, categoryIcons, componentIcon, moduleIcon} from './data/colors'
+export {categoryColors, tierColors, categoryIcons, componentIcon, moduleIcon, itemIcons} from './data/colors'
+
+export {itemTier, itemOffset, itemCategory, isRelatedItem, isCraftedItem} from './data/tiers'
+export type {CraftedItemCategory} from './data/tiers'
+
+export {getCategoryInfo} from './data/categories'
+export type {CategoryInfo} from './data/categories'
+
+export {getPlanetSubtypes, getPlanetSubtype} from './data/locations'
+export type {PlanetSubtypeInfo} from './data/locations'
+
+export {
+    capabilityNames,
+    capabilityAttributes,
+    statMappings,
+    isInvertedAttribute,
+    getCapabilityAttributes,
+    getStatMappings,
+    getStatMappingsForStat,
+    getStatMappingsForCapability,
+} from './data/capabilities'
+export type {CapabilityAttribute, StatMapping} from './data/capabilities'
 
 export {
    components,
@@ -157,12 +178,13 @@ export {
    getComponentsForStat,
    ITEM_HULL_PLATES,
    ITEM_CARGO_LINING,
-   ITEM_CONTAINER_PACKED,
+   ITEM_CONTAINER_T1_PACKED,
    ITEM_THRUSTER_CORE,
    ITEM_POWER_CELL,
    ITEM_ENGINE_T1,
    ITEM_GENERATOR_T1,
    ITEM_SHIP_T1_PACKED,
+   ITEM_WAREHOUSE_T1_PACKED,
    ITEM_DRILL_SHAFT,
    ITEM_EXTRACTION_PROBE,
    ITEM_CARGO_ARM,
@@ -171,6 +193,10 @@ export {
    ITEM_EXTRACTOR_T1,
    ITEM_LOADER_T1,
    ITEM_MANUFACTURING_T1,
+   ITEM_STORAGE_T1,
+   ITEM_HULL_PLATES_T2,
+   ITEM_CARGO_LINING_T2,
+   ITEM_CONTAINER_T2_PACKED,
 } from './data/recipes'
 export type {
    ComponentDefinition,
@@ -178,11 +204,13 @@ export type {
    RecipeInput,
    EntityRecipe,
    ModuleRecipe,
+   ModuleSlot,
    CraftableItem,
 } from './data/recipes'
 
 export {
    encodeStats,
+   decodeStat,
    decodeStats,
    decodeCraftedItemStats,
    blendStacks,
@@ -190,10 +218,13 @@ export {
    blendComponentStacks,
    computeEntityStats,
    blendCargoStacks,
+   blendCrossGroup,
+   categoryItemMass,
+   computeInputMass,
 } from './derivation/crafting'
 export type {StackInput, CategoryStacks} from './derivation/crafting'
 
-export {computeContainerCapabilities} from './entities/container'
+export {computeContainerCapabilities, computeContainerT2Capabilities} from './entities/container'
 
 export {
     computeShipHullCapabilities,
@@ -202,7 +233,45 @@ export {
     computeExtractorCapabilities,
     computeLoaderCapabilities,
     computeManufacturingCapabilities,
+    computeWarehouseHullCapabilities,
+    computeStorageCapabilities,
 } from './entities/ship-deploy'
 
 export {resolveItem} from './resolution/resolve-item'
-export type {ResolvedItem, ResolvedItemStat, ResolvedAttributeGroup, ResolvedItemType} from './resolution/resolve-item'
+export type {ResolvedItem, ResolvedItemStat, ResolvedAttributeGroup, ResolvedModuleSlot, ResolvedItemType} from './resolution/resolve-item'
+
+export * as NFT from './nft'
+export {
+    deserializeAsset,
+    deserializeResource,
+    deserializeComponent,
+    deserializeModule,
+    deserializeEntity,
+    readCommonBase,
+} from './nft/deserializers'
+export type {NFTCargoItem, NFTModuleSlot, NFTInstalledModule, NFTCommonBase} from './nft/deserializers'
+
+export {
+    buildEntityDescription,
+    formatModuleLine,
+    entityDisplayName,
+    moduleDisplayName,
+    computeBaseHullmass,
+    computeBaseCapacityShip,
+    computeBaseCapacityWarehouse,
+    computeEngineThrust,
+    computeEngineDrain,
+    computeGeneratorCap,
+    computeGeneratorRech,
+    computeExtractorRate,
+    computeExtractorDrain,
+    computeExtractorDepth,
+    computeExtractorDrill,
+    computeLoaderMass,
+    computeLoaderThrust,
+    computeCrafterSpeed,
+    computeCrafterDrain,
+} from './nft/description'
+
+export {getEntitySlotLayout} from './data/recipes'
+export {ITEM_TYPE_RESOURCE, ITEM_TYPE_COMPONENT, ITEM_TYPE_MODULE, ITEM_TYPE_ENTITY, itemTypeCode} from './data/tiers'