@shipload/sdk 1.0.0-next.37 → 1.0.0-next.38

package/lib/shipload.d.ts

@@ -3582,6 +3582,7 @@ interface RouteFailure {
     reason: RouteFailureReason;
     furthest?: Coord;
     legsNeeded?: number;
+    partialWaypoints?: Coord[];
 }
 type RouteResult = RoutePlan | RouteFailure;
 interface PlanRouteParams {
@@ -3593,6 +3594,7 @@ interface PlanRouteParams {
     nodeBudget?: number;
     maxLegs?: number;
 }
+declare const MAX_LEGS = 12;
 declare function planRoute(params: PlanRouteParams): RouteResult;
 declare function sdkSystemGraph(seed: Checksum256Type): SystemGraph;
 
@@ -4000,8 +4002,11 @@ declare function computeHaulerCapabilities(stats: Record<string, number>): {
     efficiency: number;
     drain: number;
 };
-declare function computeStorageCapabilities(stats: Record<string, number>, baseCapacity: number): {
-    capacityBonus: number;
+declare function computeStorageCapabilities(stats: Record<string, number>): {
+    capacity: number;
+};
+declare function computeBatteryCapabilities(stats: Record<string, number>): {
+    capacity: number;
 };
 
 declare function computeBaseCapacity(itemId: number, stats: Record<string, number>): number;
@@ -4143,6 +4148,7 @@ interface ResolvedAttributeGroup {
 type ResolvedItemType = 'resource' | 'component' | 'module' | 'entity';
 interface ResolvedModuleSlot {
     name?: string;
+    capability?: string;
     installed: boolean;
     attributes?: {
         label: string;
@@ -4238,6 +4244,8 @@ declare const computeHaulerCapacity: (fin: number) => number;
 declare const computeHaulerEfficiency: (con: number) => number;
 declare const computeHaulerDrain: (com: number) => number;
 declare const computeWarpRange: (stat: number) => number;
+declare const computeCargoBayCapacity: (strength: number, density: number, hardness: number, cohesion: number) => number;
+declare const computeBatteryBankCapacity: (volatility: number, thermal: number, plasticity: number, insulation: number) => number;
 declare function entityDisplayName(itemId: number): string;
 declare function moduleDisplayName(itemId: number): string;
 declare function formatModuleLine(slot: number, itemId: number, stats: bigint): string;
@@ -4354,6 +4362,8 @@ declare const index_computeHaulerCapacity: typeof computeHaulerCapacity;
 declare const index_computeHaulerEfficiency: typeof computeHaulerEfficiency;
 declare const index_computeHaulerDrain: typeof computeHaulerDrain;
 declare const index_computeWarpRange: typeof computeWarpRange;
+declare const index_computeCargoBayCapacity: typeof computeCargoBayCapacity;
+declare const index_computeBatteryBankCapacity: typeof computeBatteryBankCapacity;
 declare const index_entityDisplayName: typeof entityDisplayName;
 declare const index_moduleDisplayName: typeof moduleDisplayName;
 declare const index_formatModuleLine: typeof formatModuleLine;
@@ -4416,6 +4426,8 @@ declare namespace index {
     index_computeHaulerEfficiency as computeHaulerEfficiency,
     index_computeHaulerDrain as computeHaulerDrain,
     index_computeWarpRange as computeWarpRange,
+    index_computeCargoBayCapacity as computeCargoBayCapacity,
+    index_computeBatteryBankCapacity as computeBatteryBankCapacity,
     index_entityDisplayName as entityDisplayName,
     index_moduleDisplayName as moduleDisplayName,
     index_formatModuleLine as formatModuleLine,
@@ -4554,4 +4566,4 @@ type entity_row = Types.entity_row;
 type location_static = Types.location_static;
 type location_derived = Types.location_derived;
 
-export { ALL_ENTITY_TYPES, ATOMICASSETS_ACCOUNT, AckMessage, ActionsManager, AnyEntity, AtomicAssetRow, AtomicAttributeType, AtomicSchemaRow, BASE_ORBITAL_MASS, BLEND_INPUTS_MUST_MATCH, BLEND_REQUIRES_MULTIPLE, BLEND_STAT_LESS_NOT_SUPPORTED, BoundingBox, BoundsDeltaMessage, BoundsSubscriptionHandle, BroadEntitySubscriptionFilter, BuildMethod, BuildState, BuildableTarget, CANCEL_CONTAINS_GROUPED_TASK, CAP_DEMOLISH, CAP_MODULES, CAP_UNDEPLOY, CAP_WRAP, CATEGORY_LABELS, COMMIT_ALREADY_SET, COMMIT_CANNOT_MATCH, COMMIT_NOT_SET, COMPANY_NOT_FOUND, COMPONENT_TIER_PREFIXES, CONTAINER_NOT_FOUND, CONTAINER_Z, COORD_MAX, COORD_MIN, COORD_OFFSET, CRAFT_ENERGY_DIVISOR, CRAFT_EXCEEDS_ENERGY_CAPACITY, CRAFT_NOT_ENOUGH_ENERGY, CancelBlockReason, CancelEffects, CancelEligibilityInput, CancelPlan, CancelRefund, CancelReleasedHold, CapabilityAttribute, CapabilityInput, CargoData, CargoMassInfo, CargoStack, CategoryInfo, CategoryStacks, ClientMessage, ComputedCapabilities, ConnectionState, ConstructionManager, Container, ContainerEntity, Coord, CoordinateAddress, Coordinates, CoordinatesType, CounterpartLookup, CraftedItemCategory, CrafterCapability, CrafterStats, DEPLOY_ENTITY_HAS_SCHEDULE, DEPTH_THRESHOLD_T1, DEPTH_THRESHOLD_T2, DEPTH_THRESHOLD_T3, DEPTH_THRESHOLD_T4, DEPTH_THRESHOLD_T5, DESTINATION_CAPACITY_EXCEEDED, DecodedAtomicAsset, DerivedStratum, DescribeOptions, DisplayNameResult, Distance, ENTITY_ALREADY_THERE, ENTITY_CAPACITY_EXCEEDED, ENTITY_CARGO_NOT_LOADED, ENTITY_CARGO_NOT_OWNED, ENTITY_CONTAINER, ENTITY_EXTRACTOR, ENTITY_FACTORY, ENTITY_INVALID_CARGO, ENTITY_INVALID_DESTINATION, ENTITY_INVALID_TRAVEL_DURATION, ENTITY_NEXUS, ENTITY_NOT_ENOUGH_ENERGY, ENTITY_NOT_ENOUGH_ENERGY_CAPACITY, ENTITY_NO_CRAFTER, ENTITY_SHIP, ENTITY_WAREHOUSE, EPOCH_NON_ZERO, EPOCH_NOT_READY, ERROR_SYSTEM_ALREADY_INITIALIZED, ERROR_SYSTEM_DISABLED, ERROR_SYSTEM_NOT_INITIALIZED, EffectiveReserveInput, EnergyCapability, EntitiesManager, EntitiesSubscriptionHandle, Entity$1 as Entity, EntityCapabilities, EntityClass, EntityDeletedMessage, EntityInfo$2 as EntityInfo, EntityInstance, EntityInventory, EntityLayout, EntityRefInput, EntitySlot, EntityState, EntityStateInput, EntitySubscriptionFilter, EntitySubscriptionHandle, EntitySubscriptionHandlers, EntitySubscriptionMeta, EntityTypeName, EpochInfo, EpochsManager, ErrorMessage, EstimateTravelTimeOptions, EstimatedTravelTime, EventCatchupCompleteMessage, EventMessage, ExactEntitySubscriptionFilter, Extractor, Factory, FetchAssetsOptions, FinalizerCapability, FinalizerEntityRef, FloatPosition, GAME_NOT_FOUND, GAME_SEED_NOT_SET, GATHERER_DEPTH_MAX_TIER, GATHERER_DEPTH_TABLE, GATHER_EXCEEDS_ENERGY_CAPACITY, GATHER_MASS_DIVISOR, GATHER_NOT_ENOUGH_ENERGY, GROUP_DUPLICATE_ENTITY, GROUP_EMPTY, GROUP_ENTITY_NOT_MOVABLE, GROUP_HAUL_CAPACITY_EXCEEDED, GROUP_NOT_FOUND, GROUP_NOT_SAME_LOCATION, GROUP_NOT_SAME_OWNER, GROUP_NO_THRUST, GameState, GatherPlanEntity, GathererCapability, GathererDepthParams, GathererStats, HasCapacity, HasCargo, HasCargomass, HasScheduleAndLocation, HoldKind, INSUFFICIENT_BALANCE, INSUFFICIENT_ITEM_QUANTITY, INSUFFICIENT_ITEM_SUPPLY, INVALID_AMOUNT, ITEM_BATTERY_T1, ITEM_BEAM, ITEM_BIOMASS_T1, ITEM_BIOMASS_T10, ITEM_BIOMASS_T2, ITEM_BIOMASS_T3, ITEM_BIOMASS_T4, ITEM_BIOMASS_T5, ITEM_BIOMASS_T6, ITEM_BIOMASS_T7, ITEM_BIOMASS_T8, ITEM_BIOMASS_T9, ITEM_CERAMIC, ITEM_CONTAINER_T1_PACKED, ITEM_CONTAINER_T2_PACKED, ITEM_CRAFTER_T1, ITEM_CRYSTAL_T1, ITEM_CRYSTAL_T10, ITEM_CRYSTAL_T2, ITEM_CRYSTAL_T3, ITEM_CRYSTAL_T4, ITEM_CRYSTAL_T5, ITEM_CRYSTAL_T6, ITEM_CRYSTAL_T7, ITEM_CRYSTAL_T8, ITEM_CRYSTAL_T9, ITEM_DOES_NOT_EXIST, ITEM_ENGINE_T1, ITEM_EXTRACTOR_T1_PACKED, ITEM_FACTORY_T1_PACKED, ITEM_FRAME, ITEM_FRAME_T2, ITEM_GAS_T1, ITEM_GAS_T10, ITEM_GAS_T2, ITEM_GAS_T3, ITEM_GAS_T4, ITEM_GAS_T5, ITEM_GAS_T6, ITEM_GAS_T7, ITEM_GAS_T8, ITEM_GAS_T9, ITEM_GATHERER_T1, ITEM_GENERATOR_T1, ITEM_HAULER_T1, ITEM_LOADER_T1, ITEM_NOT_AVAILABLE_AT_LOCATION, ITEM_NOT_DEPLOYABLE, ITEM_NOT_PACKED_ENTITY, ITEM_ORE_T1, ITEM_ORE_T10, ITEM_ORE_T2, ITEM_ORE_T3, ITEM_ORE_T4, ITEM_ORE_T5, ITEM_ORE_T6, ITEM_ORE_T7, ITEM_ORE_T8, ITEM_ORE_T9, ITEM_PLASMA_CELL, ITEM_PLATE, ITEM_PLATE_T2, ITEM_POLYMER, ITEM_REACTOR, ITEM_REGOLITH_T1, ITEM_REGOLITH_T10, ITEM_REGOLITH_T2, ITEM_REGOLITH_T3, ITEM_REGOLITH_T4, ITEM_REGOLITH_T5, ITEM_REGOLITH_T6, ITEM_REGOLITH_T7, ITEM_REGOLITH_T8, ITEM_REGOLITH_T9, ITEM_RESIN, ITEM_RESONATOR, ITEM_SENSOR, ITEM_SHIP_T1_PACKED, ITEM_STORAGE_T1, ITEM_TYPE_COMPONENT, ITEM_TYPE_ENTITY, ITEM_TYPE_MODULE, ITEM_TYPE_RESOURCE, ITEM_WAREHOUSE_T1_PACKED, ITEM_WARP_T1, IdleResolveTarget, ImmutableEntry, ImmutableModuleSlot, InboundTransfer, InstalledModule, InventoryAccessor, Item, ItemType, KindMeta, LANE_BARRIER, LANE_MOBILITY, LOCAL_HALF, LOCATION_MAX_DEPTH, LOCATION_MIN_DEPTH, LanePlanEntry, LaneView, LoadTimeBreakdown, LoaderCapability, LoaderStats, Location, LocationStratum, LocationType, LocationsManager, MAX_ORBITAL_ALTITUDE, MAX_STARS_PER_STAT, MAX_STAR_RATING, MIN_ORBITAL_ALTITUDE, MIN_TRANSFER_DISTANCE_ORBITAL_VESSEL, MIN_TRANSFER_DISTANCE_PLANETARY_STRUCTURE, MODULE_ANY, MODULE_BATTERY, MODULE_CARGO_NOT_FOUND, MODULE_CRAFTER, MODULE_ENGINE, MODULE_ENTITY_BUSY, MODULE_GATHERER, MODULE_GENERATOR, MODULE_HAULER, MODULE_LAUNCHER, MODULE_LOADER, MODULE_NOT_MODULE, MODULE_SLOT_EMPTY, MODULE_SLOT_INVALID, MODULE_SLOT_OCCUPIED, MODULE_STORAGE, MODULE_TIER_PREFIXES, MODULE_TYPE_MISMATCH, MODULE_WARP, MassCapability, MintAssetParams, ModuleDescription, ModuleEntry, ModuleType, MovementCapability, index as NFT, NFTCargoItem, NFTCommonBase, NFTInstalledModule, NFTModuleSlot, NO_SCHEDULE, NamedStats, Neighbor, Nexus, NftConfigForItem, NftManager, OrderedTask, OwnerSubscriptionHandle, PLANETARY_STRUCTURE_Z, PLANET_SUBTYPE_GAS_GIANT, PLANET_SUBTYPE_ICY, PLANET_SUBTYPE_INDUSTRIAL, PLANET_SUBTYPE_OCEAN, PLANET_SUBTYPE_ROCKY, PLANET_SUBTYPE_TERRESTRIAL, PLAYER_ALREADY_JOINED, PLAYER_NOT_FOUND, PLAYER_NOT_JOINED, PRECISION, PackedModule, PackedModuleInput, PingMessage, PlanRouteParams, PlanTarget, PlanetSubtypeInfo, platform as PlatformContract, Types$1 as PlatformTypes, Player, PlayerStateInput, PlayersManager, PongMessage, Projectable, ProjectedEntity, ProjectionOptions, RECIPE_INPUTS_EXCESS, RECIPE_INPUTS_INSUFFICIENT, RECIPE_INPUTS_INVALID, RECIPE_INPUTS_MIXED, RECIPE_NOT_FOUND, REGION_DIV, REGION_PER_AXIS, REQUIRES_MORE_THAN_ONE, REQUIRES_POSITIVE_VALUE, RESERVE_TIERS, RESOLVE_COUNT_EXCEEDS_COMPLETED, RESOURCE_TIER_ADJECTIVES, RawData, ReachStats, Recipe, RecipeInput, RecipeSlotInput, RenderDescriptionOptions, Reservation, ReserveTier, ResolvedAttributeGroup, ResolvedCrafterLane, ResolvedEvent, ResolvedGathererLane, ResolvedItem, ResolvedItemStat, ResolvedItemType, ResolvedLoaderLane, ResolvedModuleSlot, ResourceCategory, ResourceStats, RouteFailure, RouteFailureReason, RoutePlan, RouteResult, SECTORS_PER_AXIS, SECTOR_DIV, SHIPLOAD_COLLECTION, SHIP_ALREADY_TRAVELING, SHIP_CANNOT_BUY_TRAVELING, SHIP_CANNOT_CANCEL_TASK, SHIP_CANNOT_UPDATE_TRAVELING, SHIP_NOT_ARRIVED, SHIP_NOT_FOUND, SHIP_NOT_IDLE, SHIP_NOT_OWNED, SHIP_NO_COMPLETED_TASKS, SHIP_NO_TASKS_TO_CANCEL, SLOT_FORMULAS, STAR_STEP, ScheduleAccessor, ScheduleCapability, ScheduleData, ScheduledBuild, SchemaField, server as ServerContract, ServerMessage, Types as ServerTypes, Ship, ShipEntity, ShipLike, Shipload, SlotConsumer, SlotConsumerKind, SnapshotMessage, SourceCargoStack, SourceEntityRef, StackInput, StatDefinition, StatMapping, StatSlot, StorageCapability, StratumInfo, SubscribeEntityMessage, SubscribeEventsMessage, SubscribeMessage, SubscriptionEntityType, SubscriptionsManager, SubscriptionsOptions, SystemGraph, TIER_ROLL_MAX, TRAVEL_MAX_DURATION, TaskCancelable, TaskCargoChange, TaskCargoDirection, TaskType, TemplateMeta, TextSpan, TierRange, TransferEntity, UnsubscribeEntityMessage, UnsubscribeEventsMessage, UnsubscribeMessage, UpdateBoundsMessage, UpdateMessage, ValidateDisplayNameOptions, WAREHOUSE_ALREADY_AT_LOCATION, WAREHOUSE_NOT_FOUND, WARP_HAS_CARGO, WARP_HAS_SCHEDULE, WARP_NOT_FULL_ENERGY, WARP_NO_CAPABILITY, WARP_OUT_OF_RANGE, WH, WOULD_OVERFILL, WOULD_STRAND, Warehouse, WarehouseEntity, WebSocketConnection, WebSocketConnectionOptions, WireCoordinates, WireEntity, WrapDeposit, YIELD_FRACTION_DEEP, YIELD_FRACTION_SHALLOW, addressFromCoordinates, allBuildableItems, allPlotBuildableItems, availableBuildMethods, availableCapacity$1 as availableCapacity, availableCapacityFromMass, availableForItem, baseName, blendCargoStacks, blendComponentStacks, blendCrossGroup, blendStacks, buildComponentImmutable, buildEntityDescription, buildEntityImmutable, buildImmutableData, buildMintAssetAction, buildModuleImmutable, buildResourceImmutable, calcCargoItemMass, calcCargoMass, calcEnergyUsage, calcStacksMass, calc_acceleration, calc_craft_duration, calc_craft_energy, calc_energyusage, calc_flighttime, calc_gather_duration, calc_gather_energy, calc_gather_rate, calc_loader_acceleration, calc_loader_flighttime, calc_onesided_duration, calc_orbital_altitude, calc_rechargetime, calc_ship_acceleration, calc_ship_flighttime, calc_ship_mass, calc_ship_rechargetime, calc_transfer_duration, calc_transit_duration, calculateFlightTime, calculateLoadTimeBreakdown, calculateRefuelingTime, calculateTransferTime, canMove, cancelEligibility, candidateLaneCompletesAt, capabilityAttributes, capabilityNames, capsHasCrafter, capsHasGatherer, capsHasHauler, capsHasLoaders, capsHasMass, capsHasMovement, capsHasStorage, cargoItem, cargoItemToStack, cargoReadyAt, cargoRef, cargoUtils, cargo_item, categoryColors, categoryFromIndex, categoryLabel, categoryLabelFromIndex, componentIcon, composeIdleResolve, computeBaseCapacity, computeBaseCapacityShip, computeBaseCapacityWarehouse, computeBaseHullmass, computeComponentStats, computeContainerCapabilities, computeContainerT2Capabilities, computeCraftedOutputStats, computeCrafterCapabilities, computeCrafterDrain, computeCrafterSpeed, computeEngineCapabilities, computeEngineDrain, computeEngineThrust, computeEntityCapabilities, computeEntityStats, computeGathererCapabilities, computeGathererDepth, computeGathererDrain, computeGathererYield, computeGeneratorCap, computeGeneratorCapabilities, computeGeneratorRech, computeGroupPerLegReach, computeHaulPenalty, computeHaulerCapabilities, computeHaulerCapacity, computeHaulerDrain$1 as computeHaulerDrain, computeHaulerEfficiency, computeInputMass, computeLoaderCapabilities, computeLoaderMass, computeLoaderThrust, computeNftImageUrl, computePerLegReach, computeShipHullCapabilities, computeStorageCapabilities, computeWarehouseHullCapabilities, computeWarpCapabilities, computeWarpRange, coordsToLocationId, createInventoryAccessor, createProjectedEntity, createScheduleAccessor, decodeAddress, decodeAtomicAsset, decodeCraftedItemStats, decodeRegion, decodeSector, decodeStat, decodeStats, Shipload as default, deriveLocation, deriveLocationSize, deriveLocationStatic, deriveResourceStats, deriveStatMappings, deriveStrata, deriveStratum, describeItem, describeModule, describeModuleForItem, describeModuleForSlot, deserializeAsset, deserializeAtomicData, deserializeComponent, deserializeEntity, deserializeModule, deserializeResource, displayName, distanceBetweenCoordinates, distanceBetweenPoints, easeFlightProgress, encodeAddress, encodeAddressMemo, encodeGatheredCargoStats, encodeRegion, encodeSector, encodeStats, energyAtTime, energyPercent, energy_stats, entityDisplayName, entity_row, estimateDealTravelTime, estimateTravelTime, feistel, feistelInv, fetchAtomicAssetsForOwner, fetchAtomicSchemas, filterByBuildMethod, findNearbyPlanets, flightSpeedFactor, formatLocation, formatMass, formatMassDelta, formatMassScaled, formatModuleLine, formatTier, gathererDepthForTier, getCapabilityAttributes, getCategoryInfo, getComponents, getCurrentEpoch, getDepthThreshold, getDestinationLocation, getEffectiveReserve, getEligibleResources, getEntityClass, getEntityItems, getEntityLayout, getEpochInfo, getFlightOrigin, getInterpolatedPosition, getItem, getItems, getKindMeta, getLocationCandidates, getLocationKind, getLocationProfile, getLocationType, getLocationTypeName, getModuleCapabilityType, getModules, getPackedEntityType, getPlanetSubtype, getPlanetSubtypes, getPositionAt, getRecipe, getResourceTier, getResourceWeight, getResources, getStatDefinitions, getStatMappings, getStatMappingsForCapability, getStatMappingsForStat, getStatName, getSystemName, getTemplateMeta, hasEnergy, hasEnergyForDistance, hasGatherer, hasLoaders, hasMass, hasSchedule, hasSpace$1 as hasSpace, hasSpaceForMass, hasStorage, hasSystem, hash, hash512, interpolateFlightPosition, isBuildable, isContainer, isCraftedItem, isExtractor, isFactory, isFull$1 as isFull, isFullFromMass, isGatherableLocation, isInvertedAttribute, isLocationBuildable, isModuleItem, isNexus, isPlot, isPlotBuildable, isRelatedItem, isShip, isSubscriptionsDebugEnabled, isValidWormholePair, isWarehouse, itemAbbreviations, itemCategory, itemIds, itemOffset, itemTier, itemTypeCode, kindCan, lane, laneKeyForModule, lerp, location_derived, location_static, makeEntity, mapEntity, maxCraftable, maxTravelDistance, mergeStacks, moduleAccepts, moduleDisplayName, moduleIcon, moduleSlotTypeToCode, movement_stats, needsRecharge, normalizeDisplayName, parseWireEntity, partnerRegion, planParallelGather, planParallelTransfer, planRoute, projectEntity, projectEntityAt, projectRemainingAt, projectedCargoAvailableAt, rawScheduleEnd, readCommonBase, regionOf, removeFromStacks, renderDescription, resolveItem, resolveItemCategory, resolveLaneCrafter, resolveLaneGatherer, resolveLaneLoader, resolveLockedAmount, resolveStats, rollTier, rollWithinTier, rollupCrafter, rollupGatherer, rollupLoaders, rotation, schedule, sdkSystemGraph, selectGatherLane, setSubscriptionsDebug, stackKey, stackToCargoItem, stacksEqual, starRating, starsForStat, statMagnitude, subtractFromStacks, task, taskCargoChanges, taskCargoEffect, tierAdjective, tierColors, tierOfReserve, toLocation, typeLabel, validateDisplayName, validateSchedule, workerLaneKey, wormholeAt, wormholeAtRegionEndpoint, yieldThresholdAt };
+export { ALL_ENTITY_TYPES, ATOMICASSETS_ACCOUNT, AckMessage, ActionsManager, AnyEntity, AtomicAssetRow, AtomicAttributeType, AtomicSchemaRow, BASE_ORBITAL_MASS, BLEND_INPUTS_MUST_MATCH, BLEND_REQUIRES_MULTIPLE, BLEND_STAT_LESS_NOT_SUPPORTED, BoundingBox, BoundsDeltaMessage, BoundsSubscriptionHandle, BroadEntitySubscriptionFilter, BuildMethod, BuildState, BuildableTarget, CANCEL_CONTAINS_GROUPED_TASK, CAP_DEMOLISH, CAP_MODULES, CAP_UNDEPLOY, CAP_WRAP, CATEGORY_LABELS, COMMIT_ALREADY_SET, COMMIT_CANNOT_MATCH, COMMIT_NOT_SET, COMPANY_NOT_FOUND, COMPONENT_TIER_PREFIXES, CONTAINER_NOT_FOUND, CONTAINER_Z, COORD_MAX, COORD_MIN, COORD_OFFSET, CRAFT_ENERGY_DIVISOR, CRAFT_EXCEEDS_ENERGY_CAPACITY, CRAFT_NOT_ENOUGH_ENERGY, CancelBlockReason, CancelEffects, CancelEligibilityInput, CancelPlan, CancelRefund, CancelReleasedHold, CapabilityAttribute, CapabilityInput, CargoData, CargoMassInfo, CargoStack, CategoryInfo, CategoryStacks, ClientMessage, ComputedCapabilities, ConnectionState, ConstructionManager, Container, ContainerEntity, Coord, CoordinateAddress, Coordinates, CoordinatesType, CounterpartLookup, CraftedItemCategory, CrafterCapability, CrafterStats, DEPLOY_ENTITY_HAS_SCHEDULE, DEPTH_THRESHOLD_T1, DEPTH_THRESHOLD_T2, DEPTH_THRESHOLD_T3, DEPTH_THRESHOLD_T4, DEPTH_THRESHOLD_T5, DESTINATION_CAPACITY_EXCEEDED, DecodedAtomicAsset, DerivedStratum, DescribeOptions, DisplayNameResult, Distance, ENTITY_ALREADY_THERE, ENTITY_CAPACITY_EXCEEDED, ENTITY_CARGO_NOT_LOADED, ENTITY_CARGO_NOT_OWNED, ENTITY_CONTAINER, ENTITY_EXTRACTOR, ENTITY_FACTORY, ENTITY_INVALID_CARGO, ENTITY_INVALID_DESTINATION, ENTITY_INVALID_TRAVEL_DURATION, ENTITY_NEXUS, ENTITY_NOT_ENOUGH_ENERGY, ENTITY_NOT_ENOUGH_ENERGY_CAPACITY, ENTITY_NO_CRAFTER, ENTITY_SHIP, ENTITY_WAREHOUSE, EPOCH_NON_ZERO, EPOCH_NOT_READY, ERROR_SYSTEM_ALREADY_INITIALIZED, ERROR_SYSTEM_DISABLED, ERROR_SYSTEM_NOT_INITIALIZED, EffectiveReserveInput, EnergyCapability, EntitiesManager, EntitiesSubscriptionHandle, Entity$1 as Entity, EntityCapabilities, EntityClass, EntityDeletedMessage, EntityInfo$2 as EntityInfo, EntityInstance, EntityInventory, EntityLayout, EntityRefInput, EntitySlot, EntityState, EntityStateInput, EntitySubscriptionFilter, EntitySubscriptionHandle, EntitySubscriptionHandlers, EntitySubscriptionMeta, EntityTypeName, EpochInfo, EpochsManager, ErrorMessage, EstimateTravelTimeOptions, EstimatedTravelTime, EventCatchupCompleteMessage, EventMessage, ExactEntitySubscriptionFilter, Extractor, Factory, FetchAssetsOptions, FinalizerCapability, FinalizerEntityRef, FloatPosition, GAME_NOT_FOUND, GAME_SEED_NOT_SET, GATHERER_DEPTH_MAX_TIER, GATHERER_DEPTH_TABLE, GATHER_EXCEEDS_ENERGY_CAPACITY, GATHER_MASS_DIVISOR, GATHER_NOT_ENOUGH_ENERGY, GROUP_DUPLICATE_ENTITY, GROUP_EMPTY, GROUP_ENTITY_NOT_MOVABLE, GROUP_HAUL_CAPACITY_EXCEEDED, GROUP_NOT_FOUND, GROUP_NOT_SAME_LOCATION, GROUP_NOT_SAME_OWNER, GROUP_NO_THRUST, GameState, GatherPlanEntity, GathererCapability, GathererDepthParams, GathererStats, HasCapacity, HasCargo, HasCargomass, HasScheduleAndLocation, HoldKind, INSUFFICIENT_BALANCE, INSUFFICIENT_ITEM_QUANTITY, INSUFFICIENT_ITEM_SUPPLY, INVALID_AMOUNT, ITEM_BATTERY_T1, ITEM_BEAM, ITEM_BIOMASS_T1, ITEM_BIOMASS_T10, ITEM_BIOMASS_T2, ITEM_BIOMASS_T3, ITEM_BIOMASS_T4, ITEM_BIOMASS_T5, ITEM_BIOMASS_T6, ITEM_BIOMASS_T7, ITEM_BIOMASS_T8, ITEM_BIOMASS_T9, ITEM_CERAMIC, ITEM_CONTAINER_T1_PACKED, ITEM_CONTAINER_T2_PACKED, ITEM_CRAFTER_T1, ITEM_CRYSTAL_T1, ITEM_CRYSTAL_T10, ITEM_CRYSTAL_T2, ITEM_CRYSTAL_T3, ITEM_CRYSTAL_T4, ITEM_CRYSTAL_T5, ITEM_CRYSTAL_T6, ITEM_CRYSTAL_T7, ITEM_CRYSTAL_T8, ITEM_CRYSTAL_T9, ITEM_DOES_NOT_EXIST, ITEM_ENGINE_T1, ITEM_EXTRACTOR_T1_PACKED, ITEM_FACTORY_T1_PACKED, ITEM_FRAME, ITEM_FRAME_T2, ITEM_GAS_T1, ITEM_GAS_T10, ITEM_GAS_T2, ITEM_GAS_T3, ITEM_GAS_T4, ITEM_GAS_T5, ITEM_GAS_T6, ITEM_GAS_T7, ITEM_GAS_T8, ITEM_GAS_T9, ITEM_GATHERER_T1, ITEM_GENERATOR_T1, ITEM_HAULER_T1, ITEM_LOADER_T1, ITEM_NOT_AVAILABLE_AT_LOCATION, ITEM_NOT_DEPLOYABLE, ITEM_NOT_PACKED_ENTITY, ITEM_ORE_T1, ITEM_ORE_T10, ITEM_ORE_T2, ITEM_ORE_T3, ITEM_ORE_T4, ITEM_ORE_T5, ITEM_ORE_T6, ITEM_ORE_T7, ITEM_ORE_T8, ITEM_ORE_T9, ITEM_PLASMA_CELL, ITEM_PLATE, ITEM_PLATE_T2, ITEM_POLYMER, ITEM_REACTOR, ITEM_REGOLITH_T1, ITEM_REGOLITH_T10, ITEM_REGOLITH_T2, ITEM_REGOLITH_T3, ITEM_REGOLITH_T4, ITEM_REGOLITH_T5, ITEM_REGOLITH_T6, ITEM_REGOLITH_T7, ITEM_REGOLITH_T8, ITEM_REGOLITH_T9, ITEM_RESIN, ITEM_RESONATOR, ITEM_SENSOR, ITEM_SHIP_T1_PACKED, ITEM_STORAGE_T1, ITEM_TYPE_COMPONENT, ITEM_TYPE_ENTITY, ITEM_TYPE_MODULE, ITEM_TYPE_RESOURCE, ITEM_WAREHOUSE_T1_PACKED, ITEM_WARP_T1, IdleResolveTarget, ImmutableEntry, ImmutableModuleSlot, InboundTransfer, InstalledModule, InventoryAccessor, Item, ItemType, KindMeta, LANE_BARRIER, LANE_MOBILITY, LOCAL_HALF, LOCATION_MAX_DEPTH, LOCATION_MIN_DEPTH, LanePlanEntry, LaneView, LoadTimeBreakdown, LoaderCapability, LoaderStats, Location, LocationStratum, LocationType, LocationsManager, MAX_LEGS, MAX_ORBITAL_ALTITUDE, MAX_STARS_PER_STAT, MAX_STAR_RATING, MIN_ORBITAL_ALTITUDE, MIN_TRANSFER_DISTANCE_ORBITAL_VESSEL, MIN_TRANSFER_DISTANCE_PLANETARY_STRUCTURE, MODULE_ANY, MODULE_BATTERY, MODULE_CARGO_NOT_FOUND, MODULE_CRAFTER, MODULE_ENGINE, MODULE_ENTITY_BUSY, MODULE_GATHERER, MODULE_GENERATOR, MODULE_HAULER, MODULE_LAUNCHER, MODULE_LOADER, MODULE_NOT_MODULE, MODULE_SLOT_EMPTY, MODULE_SLOT_INVALID, MODULE_SLOT_OCCUPIED, MODULE_STORAGE, MODULE_TIER_PREFIXES, MODULE_TYPE_MISMATCH, MODULE_WARP, MassCapability, MintAssetParams, ModuleDescription, ModuleEntry, ModuleType, MovementCapability, index as NFT, NFTCargoItem, NFTCommonBase, NFTInstalledModule, NFTModuleSlot, NO_SCHEDULE, NamedStats, Neighbor, Nexus, NftConfigForItem, NftManager, OrderedTask, OwnerSubscriptionHandle, PLANETARY_STRUCTURE_Z, PLANET_SUBTYPE_GAS_GIANT, PLANET_SUBTYPE_ICY, PLANET_SUBTYPE_INDUSTRIAL, PLANET_SUBTYPE_OCEAN, PLANET_SUBTYPE_ROCKY, PLANET_SUBTYPE_TERRESTRIAL, PLAYER_ALREADY_JOINED, PLAYER_NOT_FOUND, PLAYER_NOT_JOINED, PRECISION, PackedModule, PackedModuleInput, PingMessage, PlanRouteParams, PlanTarget, PlanetSubtypeInfo, platform as PlatformContract, Types$1 as PlatformTypes, Player, PlayerStateInput, PlayersManager, PongMessage, Projectable, ProjectedEntity, ProjectionOptions, RECIPE_INPUTS_EXCESS, RECIPE_INPUTS_INSUFFICIENT, RECIPE_INPUTS_INVALID, RECIPE_INPUTS_MIXED, RECIPE_NOT_FOUND, REGION_DIV, REGION_PER_AXIS, REQUIRES_MORE_THAN_ONE, REQUIRES_POSITIVE_VALUE, RESERVE_TIERS, RESOLVE_COUNT_EXCEEDS_COMPLETED, RESOURCE_TIER_ADJECTIVES, RawData, ReachStats, Recipe, RecipeInput, RecipeSlotInput, RenderDescriptionOptions, Reservation, ReserveTier, ResolvedAttributeGroup, ResolvedCrafterLane, ResolvedEvent, ResolvedGathererLane, ResolvedItem, ResolvedItemStat, ResolvedItemType, ResolvedLoaderLane, ResolvedModuleSlot, ResourceCategory, ResourceStats, RouteFailure, RouteFailureReason, RoutePlan, RouteResult, SECTORS_PER_AXIS, SECTOR_DIV, SHIPLOAD_COLLECTION, SHIP_ALREADY_TRAVELING, SHIP_CANNOT_BUY_TRAVELING, SHIP_CANNOT_CANCEL_TASK, SHIP_CANNOT_UPDATE_TRAVELING, SHIP_NOT_ARRIVED, SHIP_NOT_FOUND, SHIP_NOT_IDLE, SHIP_NOT_OWNED, SHIP_NO_COMPLETED_TASKS, SHIP_NO_TASKS_TO_CANCEL, SLOT_FORMULAS, STAR_STEP, ScheduleAccessor, ScheduleCapability, ScheduleData, ScheduledBuild, SchemaField, server as ServerContract, ServerMessage, Types as ServerTypes, Ship, ShipEntity, ShipLike, Shipload, SlotConsumer, SlotConsumerKind, SnapshotMessage, SourceCargoStack, SourceEntityRef, StackInput, StatDefinition, StatMapping, StatSlot, StorageCapability, StratumInfo, SubscribeEntityMessage, SubscribeEventsMessage, SubscribeMessage, SubscriptionEntityType, SubscriptionsManager, SubscriptionsOptions, SystemGraph, TIER_ROLL_MAX, TRAVEL_MAX_DURATION, TaskCancelable, TaskCargoChange, TaskCargoDirection, TaskType, TemplateMeta, TextSpan, TierRange, TransferEntity, UnsubscribeEntityMessage, UnsubscribeEventsMessage, UnsubscribeMessage, UpdateBoundsMessage, UpdateMessage, ValidateDisplayNameOptions, WAREHOUSE_ALREADY_AT_LOCATION, WAREHOUSE_NOT_FOUND, WARP_HAS_CARGO, WARP_HAS_SCHEDULE, WARP_NOT_FULL_ENERGY, WARP_NO_CAPABILITY, WARP_OUT_OF_RANGE, WH, WOULD_OVERFILL, WOULD_STRAND, Warehouse, WarehouseEntity, WebSocketConnection, WebSocketConnectionOptions, WireCoordinates, WireEntity, WrapDeposit, YIELD_FRACTION_DEEP, YIELD_FRACTION_SHALLOW, addressFromCoordinates, allBuildableItems, allPlotBuildableItems, availableBuildMethods, availableCapacity$1 as availableCapacity, availableCapacityFromMass, availableForItem, baseName, blendCargoStacks, blendComponentStacks, blendCrossGroup, blendStacks, buildComponentImmutable, buildEntityDescription, buildEntityImmutable, buildImmutableData, buildMintAssetAction, buildModuleImmutable, buildResourceImmutable, calcCargoItemMass, calcCargoMass, calcEnergyUsage, calcStacksMass, calc_acceleration, calc_craft_duration, calc_craft_energy, calc_energyusage, calc_flighttime, calc_gather_duration, calc_gather_energy, calc_gather_rate, calc_loader_acceleration, calc_loader_flighttime, calc_onesided_duration, calc_orbital_altitude, calc_rechargetime, calc_ship_acceleration, calc_ship_flighttime, calc_ship_mass, calc_ship_rechargetime, calc_transfer_duration, calc_transit_duration, calculateFlightTime, calculateLoadTimeBreakdown, calculateRefuelingTime, calculateTransferTime, canMove, cancelEligibility, candidateLaneCompletesAt, capabilityAttributes, capabilityNames, capsHasCrafter, capsHasGatherer, capsHasHauler, capsHasLoaders, capsHasMass, capsHasMovement, capsHasStorage, cargoItem, cargoItemToStack, cargoReadyAt, cargoRef, cargoUtils, cargo_item, categoryColors, categoryFromIndex, categoryLabel, categoryLabelFromIndex, componentIcon, composeIdleResolve, computeBaseCapacity, computeBaseCapacityShip, computeBaseCapacityWarehouse, computeBaseHullmass, computeBatteryCapabilities, computeComponentStats, computeContainerCapabilities, computeContainerT2Capabilities, computeCraftedOutputStats, computeCrafterCapabilities, computeCrafterDrain, computeCrafterSpeed, computeEngineCapabilities, computeEngineDrain, computeEngineThrust, computeEntityCapabilities, computeEntityStats, computeGathererCapabilities, computeGathererDepth, computeGathererDrain, computeGathererYield, computeGeneratorCap, computeGeneratorCapabilities, computeGeneratorRech, computeGroupPerLegReach, computeHaulPenalty, computeHaulerCapabilities, computeHaulerCapacity, computeHaulerDrain$1 as computeHaulerDrain, computeHaulerEfficiency, computeInputMass, computeLoaderCapabilities, computeLoaderMass, computeLoaderThrust, computeNftImageUrl, computePerLegReach, computeShipHullCapabilities, computeStorageCapabilities, computeWarehouseHullCapabilities, computeWarpCapabilities, computeWarpRange, coordsToLocationId, createInventoryAccessor, createProjectedEntity, createScheduleAccessor, decodeAddress, decodeAtomicAsset, decodeCraftedItemStats, decodeRegion, decodeSector, decodeStat, decodeStats, Shipload as default, deriveLocation, deriveLocationSize, deriveLocationStatic, deriveResourceStats, deriveStatMappings, deriveStrata, deriveStratum, describeItem, describeModule, describeModuleForItem, describeModuleForSlot, deserializeAsset, deserializeAtomicData, deserializeComponent, deserializeEntity, deserializeModule, deserializeResource, displayName, distanceBetweenCoordinates, distanceBetweenPoints, easeFlightProgress, encodeAddress, encodeAddressMemo, encodeGatheredCargoStats, encodeRegion, encodeSector, encodeStats, energyAtTime, energyPercent, energy_stats, entityDisplayName, entity_row, estimateDealTravelTime, estimateTravelTime, feistel, feistelInv, fetchAtomicAssetsForOwner, fetchAtomicSchemas, filterByBuildMethod, findNearbyPlanets, flightSpeedFactor, formatLocation, formatMass, formatMassDelta, formatMassScaled, formatModuleLine, formatTier, gathererDepthForTier, getCapabilityAttributes, getCategoryInfo, getComponents, getCurrentEpoch, getDepthThreshold, getDestinationLocation, getEffectiveReserve, getEligibleResources, getEntityClass, getEntityItems, getEntityLayout, getEpochInfo, getFlightOrigin, getInterpolatedPosition, getItem, getItems, getKindMeta, getLocationCandidates, getLocationKind, getLocationProfile, getLocationType, getLocationTypeName, getModuleCapabilityType, getModules, getPackedEntityType, getPlanetSubtype, getPlanetSubtypes, getPositionAt, getRecipe, getResourceTier, getResourceWeight, getResources, getStatDefinitions, getStatMappings, getStatMappingsForCapability, getStatMappingsForStat, getStatName, getSystemName, getTemplateMeta, hasEnergy, hasEnergyForDistance, hasGatherer, hasLoaders, hasMass, hasSchedule, hasSpace$1 as hasSpace, hasSpaceForMass, hasStorage, hasSystem, hash, hash512, interpolateFlightPosition, isBuildable, isContainer, isCraftedItem, isExtractor, isFactory, isFull$1 as isFull, isFullFromMass, isGatherableLocation, isInvertedAttribute, isLocationBuildable, isModuleItem, isNexus, isPlot, isPlotBuildable, isRelatedItem, isShip, isSubscriptionsDebugEnabled, isValidWormholePair, isWarehouse, itemAbbreviations, itemCategory, itemIds, itemOffset, itemTier, itemTypeCode, kindCan, lane, laneKeyForModule, lerp, location_derived, location_static, makeEntity, mapEntity, maxCraftable, maxTravelDistance, mergeStacks, moduleAccepts, moduleDisplayName, moduleIcon, moduleSlotTypeToCode, movement_stats, needsRecharge, normalizeDisplayName, parseWireEntity, partnerRegion, planParallelGather, planParallelTransfer, planRoute, projectEntity, projectEntityAt, projectRemainingAt, projectedCargoAvailableAt, rawScheduleEnd, readCommonBase, regionOf, removeFromStacks, renderDescription, resolveItem, resolveItemCategory, resolveLaneCrafter, resolveLaneGatherer, resolveLaneLoader, resolveLockedAmount, resolveStats, rollTier, rollWithinTier, rollupCrafter, rollupGatherer, rollupLoaders, rotation, schedule, sdkSystemGraph, selectGatherLane, setSubscriptionsDebug, stackKey, stackToCargoItem, stacksEqual, starRating, starsForStat, statMagnitude, subtractFromStacks, task, taskCargoChanges, taskCargoEffect, tierAdjective, tierColors, tierOfReserve, toLocation, typeLabel, validateDisplayName, validateSchedule, workerLaneKey, wormholeAt, wormholeAtRegionEndpoint, yieldThresholdAt };

package/lib/shipload.js

@@ -3727,11 +3727,11 @@ var recipes = [
 		outputMass: 960000,
 		inputs: [
 			{
-				itemId: 10008,
+				itemId: 10009,
 				quantity: 300
 			},
 			{
-				itemId: 10009,
+				itemId: 10006,
 				quantity: 300
 			}
 		],
@@ -3739,7 +3739,7 @@ var recipes = [
 			{
 				sources: [
 					{
-						inputIndex: 1,
+						inputIndex: 0,
 						statIndex: 0
 					}
 				]
@@ -3747,8 +3747,8 @@ var recipes = [
 			{
 				sources: [
 					{
-						inputIndex: 0,
-						statIndex: 1
+						inputIndex: 1,
+						statIndex: 0
 					}
 				]
 			}
@@ -5129,8 +5129,8 @@ const itemMetadata = {
         color: '#B877FF',
     },
     10105: {
-        name: 'Storage',
-        description: 'Expands cargo capacity based on hull material quality.',
+        name: 'Cargo Bay',
+        description: 'Expanded cargo storage with reinforced internal holds.',
         color: '#8B7355',
     },
     10106: {
@@ -5144,8 +5144,8 @@ const itemMetadata = {
         color: '#9be4ff',
     },
     10108: {
-        name: 'Battery',
-        description: 'Extends energy capacity. Stores additional charge produced by generators, letting builds chain more high-drain actions between recharges.',
+        name: 'Battery Bank',
+        description: 'Stores additional charge produced by generators.',
         color: '#4ADBFF',
     },
     10200: {
@@ -13018,6 +13018,9 @@ const clampUint32 = (v) => Math.min(Math.max(Math.floor(v), 0), 4294967295);
 function applySlotMultiplier(value, outputPct) {
     return clampUint16(Math.floor((value * outputPct) / 100));
 }
+function applySlotMultiplierUint32(value, outputPct) {
+    return clampUint32(Math.floor((value * outputPct) / 100));
+}
 function getSlotAmp(layout, slotIndex) {
     return layout[slotIndex]?.outputPct ?? 100;
 }
@@ -13090,10 +13093,10 @@ function computeLoaderCapabilities(stats) {
 }
 function computeCrafterCapabilities(stats) {
     const rea = stats.reactivity;
-    const fin = stats.fineness;
+    const con = stats.conductivity;
     return {
         speed: 100 + Math.floor((rea * 4) / 5),
-        drain: Math.max(5, 30 - Math.floor(fin / 33)),
+        drain: Math.max(5, 30 - Math.floor(con / 33)),
     };
 }
 function computeHaulerCapabilities(stats) {
@@ -13106,14 +13109,21 @@ function computeHaulerCapabilities(stats) {
         drain: Math.max(3, 15 - Math.floor(reflectivity / 80)),
     };
 }
-function computeStorageCapabilities(stats, baseCapacity) {
-    const strength = stats.strength;
-    const density = stats.density;
-    const hardness = stats.hardness;
-    const cohesion = stats.cohesion;
+function computeStorageCapabilities(stats) {
+    const strength = stats.strength ?? 0;
+    const density = stats.density ?? 0;
+    const hardness = stats.hardness ?? 0;
+    const cohesion = stats.cohesion ?? 0;
     const statSum = strength + density + hardness + cohesion;
-    const capacityBonus = Math.floor((baseCapacity * (10 + Math.floor((statSum * 10) / 2997))) / 100);
-    return { capacityBonus };
+    return { capacity: 10000000 + Math.floor((statSum * 50000000) / 3996) };
+}
+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: 2500 + Math.floor((statSum * 7500) / 3996) };
 }
 function computeBaseCapacity(itemId, stats) {
     switch (itemId) {
@@ -13158,7 +13168,7 @@ function computeEntityCapabilities(stats, itemId, modules, layout) {
     let totalGathDrain = 0;
     let maxGathDepth = 0;
     let hasGatherer = false;
-    let totalStorageBonus = 0;
+    let totalStorageCapacity = 0;
     const baseCapacity = computeBaseCapacity(itemId, stats);
     let installedModuleMass = 0;
     let totalCrafterSpeed = 0;
@@ -13170,8 +13180,7 @@ function computeEntityCapabilities(stats, itemId, modules, layout) {
     let hasHauler = false;
     let totalWarpRange = 0;
     let hasWarp = false;
-    let totalBatteryStatSum = 0;
-    let batteryCount = 0;
+    let totalBatteryCapacity = 0;
     const gathererLanes = [];
     const crafterLanes = [];
     const loaderLanes = [];
@@ -13224,8 +13233,8 @@ function computeEntityCapabilities(stats, itemId, modules, layout) {
             });
         }
         else if (modType === MODULE_STORAGE) {
-            const caps = computeStorageCapabilities(decodedStats, baseCapacity);
-            totalStorageBonus += caps.capacityBonus;
+            const caps = computeStorageCapabilities(decodedStats);
+            totalStorageCapacity += applySlotMultiplierUint32(caps.capacity, amp);
         }
         else if (modType === MODULE_CRAFTER) {
             hasCrafter = true;
@@ -13254,22 +13263,16 @@ function computeEntityCapabilities(stats, itemId, modules, layout) {
             totalWarpRange += applySlotMultiplier(caps.range, amp);
         }
         else if (modType === MODULE_BATTERY) {
-            batteryCount++;
-            const vol = decodedStats.volatility ?? 0;
-            const thm = decodedStats.thermal ?? 0;
-            const pla = decodedStats.plasticity ?? 0;
-            const ins = decodedStats.insulation ?? 0;
-            totalBatteryStatSum += vol + thm + pla + ins;
+            const caps = computeBatteryCapabilities(decodedStats);
+            totalBatteryCapacity += applySlotMultiplierUint32(caps.capacity, amp);
         }
     }
-    if (hasGenerator && batteryCount > 0) {
-        const genCapBase = totalGenCapacity;
-        const bonusPctNum = 10 * batteryCount + Math.floor((totalBatteryStatSum * 10) / 2997);
-        totalGenCapacity += Math.floor((genCapBase * bonusPctNum) / 100);
+    if (hasGenerator && totalBatteryCapacity > 0) {
+        totalGenCapacity += totalBatteryCapacity;
     }
     const result = {
         hullmass: computeBaseHullmass$1(stats) + installedModuleMass,
-        capacity: baseCapacity + totalStorageBonus,
+        capacity: clampUint32(baseCapacity + totalStorageCapacity),
     };
     if (hasEngine) {
         result.engines = { thrust: totalThrust, drain: totalEngineDrain };
@@ -13922,11 +13925,12 @@ function validateDisplayName(input, opts = {}) {
 const key = (c) => `${c.x},${c.y}`;
 const sameCoord = (a, b) => a.x === b.x && a.y === b.y;
 const dist = (a, b) => Math.hypot(a.x - b.x, a.y - b.y);
+const MAX_LEGS = 12;
 function planRoute(params) {
     const { origin, dest, perLegReach, graph } = params;
     const corridorSlack = params.corridorSlack ?? perLegReach;
     const nodeBudget = params.nodeBudget ?? 5000;
-    const maxLegs = params.maxLegs ?? 12;
+    const maxLegs = params.maxLegs ?? MAX_LEGS;
     if (!graph.hasSystem(dest)) {
         return { ok: false, reason: 'empty-destination' };
     }
@@ -13984,9 +13988,33 @@ function planRoute(params) {
         }
     }
     if (cappedByMaxLegs) {
-        return { ok: false, reason: 'max-legs', furthest };
+        return {
+            ok: false,
+            reason: 'max-legs',
+            furthest,
+            partialWaypoints: reconstructWaypoints(cameFrom, origin, furthest),
+        };
     }
-    return { ok: false, reason: 'no-path', furthest };
+    return {
+        ok: false,
+        reason: 'no-path',
+        furthest,
+        partialWaypoints: reconstructWaypoints(cameFrom, origin, furthest),
+    };
+}
+function reconstructWaypoints(cameFrom, origin, target) {
+    if (sameCoord(target, origin))
+        return [];
+    const path = [target];
+    let cur = target;
+    while (!sameCoord(cur, origin)) {
+        const prev = cameFrom.get(key(cur));
+        if (!prev)
+            break;
+        path.unshift(prev);
+        cur = prev;
+    }
+    return path.slice(1);
 }
 function reconstruct(cameFrom, origin, dest) {
     const path = [dest];
@@ -14071,6 +14099,8 @@ const computeHaulerCapacity = (fin) => Math.max(1, 1 + idiv(fin, 400));
 const computeHaulerEfficiency = (con) => 2000 + con * 6;
 const computeHaulerDrain$1 = (com) => Math.max(3, 15 - idiv(com, 80));
 const computeWarpRange = (stat) => 100 + stat * 3;
+const computeCargoBayCapacity = (strength, density, hardness, cohesion) => 10000000 + idiv((strength + density + hardness + cohesion) * 50000000, 3996);
+const computeBatteryBankCapacity = (volatility, thermal, plasticity, insulation) => 2500 + idiv((volatility + thermal + plasticity + insulation) * 7500, 3996);
 function entityDisplayName(itemId) {
     switch (itemId) {
         case ITEM_SHIP_T1_PACKED:
@@ -14102,11 +14132,13 @@ function moduleDisplayName(itemId) {
         case ITEM_CRAFTER_T1:
             return 'Crafter';
         case ITEM_STORAGE_T1:
-            return 'Storage';
+            return 'Cargo Bay';
         case ITEM_HAULER_T1:
             return 'Hauler';
         case ITEM_WARP_T1:
             return 'Warp';
+        case ITEM_BATTERY_T1:
+            return 'Battery Bank';
         default:
             return 'Module';
     }
@@ -14148,17 +14180,16 @@ function formatModuleLine(slot, itemId, stats) {
         }
         case MODULE_CRAFTER: {
             const rea = decodeStat(stats, 0);
-            const com = decodeStat(stats, 1);
-            out += `  Speed ${computeCrafterSpeed(rea)}  Drain ${computeCrafterDrain(com)}`;
+            const con = decodeStat(stats, 1);
+            out += `  Speed ${computeCrafterSpeed(rea)}  Drain ${computeCrafterDrain(con)}`;
             break;
         }
         case MODULE_STORAGE: {
             const str = decodeStat(stats, 0);
-            const fin = decodeStat(stats, 2);
-            const sat = decodeStat(stats, 3);
-            const sum = str + fin + sat;
-            const pct = 10 + idiv(sum * 10, 2997);
-            out += `  +${pct}% capacity`;
+            const den = decodeStat(stats, 1);
+            const hrd = decodeStat(stats, 2);
+            const com = decodeStat(stats, 3);
+            out += `  Cargo Capacity ${computeCargoBayCapacity(str, den, hrd, com)}`;
             break;
         }
         case MODULE_HAULER: {
@@ -14173,6 +14204,14 @@ function formatModuleLine(slot, itemId, stats) {
             out += `  Range ${computeWarpRange(stat)}`;
             break;
         }
+        case MODULE_BATTERY: {
+            const vol = decodeStat(stats, 0);
+            const thm = decodeStat(stats, 1);
+            const pla = decodeStat(stats, 2);
+            const ins = decodeStat(stats, 3);
+            out += `  Energy Capacity ${computeBatteryBankCapacity(vol, thm, pla, ins)}`;
+            break;
+        }
     }
     return out;
 }
@@ -15495,19 +15534,21 @@ const capabilityNames = [
     'Crafter',
     'Launch',
     'Hauler',
-    'Battery',
 ];
 const capabilityAttributes = [
     { capability: 'Hull', attribute: 'mass', description: 'Total mass of the hull' },
-    { capability: 'Storage', attribute: 'capacity', description: 'Maximum mass that can be stored' },
     {
         capability: 'Storage',
-        attribute: 'bonus',
-        description: 'Capacity bonus added by an installed Storage module',
+        attribute: 'capacity',
+        description: 'Cargo capacity added by hulls and installed Cargo Bay modules',
     },
     { capability: 'Movement', attribute: 'thrust', description: 'Propulsion force' },
     { capability: 'Movement', attribute: 'drain', description: 'Energy consumed per movement' },
-    { capability: 'Energy', attribute: 'capacity', description: 'Maximum energy storage' },
+    {
+        capability: 'Energy',
+        attribute: 'capacity',
+        description: 'Energy capacity from Generators and installed Battery Bank modules',
+    },
     { capability: 'Energy', attribute: 'recharge', description: 'Energy regeneration rate' },
     { capability: 'Loader', attribute: 'mass', description: 'Weight of the loader unit itself' },
     { capability: 'Loader', attribute: 'thrust', description: 'Loading speed/force' },
@@ -15545,11 +15586,6 @@ const capabilityAttributes = [
         attribute: 'drain',
         description: 'Energy consumed per target during haul-beam operation',
     },
-    {
-        capability: 'Battery',
-        attribute: 'bonus',
-        description: 'Energy capacity bonus added by an installed Battery module',
-    },
 ];
 const invertedAttributes = new Set(['drain', 'mass']);
 function isInvertedAttribute(attribute) {
@@ -15590,10 +15626,10 @@ const SLOT_FORMULAS = {
         1: { capability: 'Crafter', attribute: 'drain' },
     },
     storage: {
-        0: { capability: 'Storage', attribute: 'bonus' },
-        1: { capability: 'Storage', attribute: 'bonus' },
-        2: { capability: 'Storage', attribute: 'bonus' },
-        3: { capability: 'Storage', attribute: 'bonus' },
+        0: { capability: 'Storage', attribute: 'capacity' },
+        1: { capability: 'Storage', attribute: 'capacity' },
+        2: { capability: 'Storage', attribute: 'capacity' },
+        3: { capability: 'Storage', attribute: 'capacity' },
     },
     hauler: {
         0: { capability: 'Hauler', attribute: 'capacity' },
@@ -15604,10 +15640,10 @@ const SLOT_FORMULAS = {
         0: { capability: 'Warp', attribute: 'range' },
     },
     battery: {
-        0: { capability: 'Battery', attribute: 'bonus' },
-        1: { capability: 'Battery', attribute: 'bonus' },
-        2: { capability: 'Battery', attribute: 'bonus' },
-        3: { capability: 'Battery', attribute: 'bonus' },
+        0: { capability: 'Energy', attribute: 'capacity' },
+        1: { capability: 'Energy', attribute: 'capacity' },
+        2: { capability: 'Energy', attribute: 'capacity' },
+        3: { capability: 'Energy', attribute: 'capacity' },
     },
     'ship-t1': ENTITY_HULL_SLOTS,
     'container-t1': ENTITY_HULL_SLOTS,
@@ -15851,7 +15887,7 @@ function resolveComponent(id, stats) {
         stats: resolvedStats,
     };
 }
-function computeCapabilityGroup(moduleType, stats, tier) {
+function computeCapabilityGroup(moduleType, stats, tier, outputPct = 100) {
     switch (moduleType) {
         case MODULE_ENGINE: {
             const caps = computeEngineCapabilities(stats);
@@ -15917,13 +15953,28 @@ function computeCapabilityGroup(moduleType, stats, tier) {
             };
         }
         case MODULE_STORAGE: {
-            const str = stats.strength;
-            const den = stats.density;
-            const hrd = stats.hardness;
-            const com = stats.cohesion;
-            const statSum = str + den + hrd + com;
-            const pct = 10 + Math.floor((statSum * 10) / 2997);
-            return { capability: 'Storage', attributes: [{ label: 'Capacity Bonus', value: pct }] };
+            const caps = computeStorageCapabilities(stats);
+            return {
+                capability: 'Storage',
+                attributes: [
+                    {
+                        label: 'Cargo Capacity',
+                        value: applySlotMultiplierUint32(caps.capacity, outputPct),
+                    },
+                ],
+            };
+        }
+        case MODULE_BATTERY: {
+            const caps = computeBatteryCapabilities(stats);
+            return {
+                capability: 'Energy',
+                attributes: [
+                    {
+                        label: 'Energy Capacity',
+                        value: applySlotMultiplierUint32(caps.capacity, outputPct),
+                    },
+                ],
+            };
         }
         default:
             return undefined;
@@ -16008,9 +16059,10 @@ function resolveEntity(id, stats, modules) {
                 catch {
                     modName = itemMetadata[modItemId]?.name ?? 'Module';
                 }
-                const group = computeCapabilityGroup(modType, decodedStats, modTier);
+                const group = computeCapabilityGroup(modType, decodedStats, modTier, slot.outputPct);
                 return {
                     name: modName,
+                    capability: group?.capability,
                     installed: true,
                     attributes: group?.attributes,
                 };
@@ -16094,9 +16146,15 @@ const TEMPLATES = {
     },
     storage: {
         id: 'module.storage.description',
-        template: 'boosts cargo capacity by {bonus}%',
-        params: [['bonus', 'Capacity Bonus']],
-        highlightKeys: ['bonus'],
+        template: 'adds {capacity} cargo capacity',
+        params: [['capacity', 'Cargo Capacity']],
+        highlightKeys: ['capacity'],
+    },
+    energy: {
+        id: 'module.energy-capacity.description',
+        template: 'adds {capacity} energy capacity',
+        params: [['capacity', 'Energy Capacity']],
+        highlightKeys: ['capacity'],
     },
     hauler: {
         id: 'module.hauler.description',
@@ -16138,9 +16196,12 @@ function describeModuleForItem(resolved) {
     return describeModule({ capability: group.capability, attributes: group.attributes });
 }
 function describeModuleForSlot(slot) {
-    if (!slot.installed || !slot.name || !slot.attributes)
+    if (!slot.installed || !slot.attributes)
         return null;
-    return describeModule({ capability: slot.name, attributes: slot.attributes });
+    const capability = slot.capability ?? slot.name;
+    if (!capability)
+        return null;
+    return describeModule({ capability, attributes: slot.attributes });
 }
 function renderDescription(desc, options) {
     const translate = options?.translate ?? ((_id, fallback) => fallback);
@@ -16295,11 +16356,11 @@ function buildModuleImmutable(itemId, quantity, stats, originX, originY) {
         }
         case MODULE_CRAFTER: {
             const rea = decodeStat(stats, 0);
-            const fin = decodeStat(stats, 1);
+            const con = decodeStat(stats, 1);
             base.push({ first: 'reactivity', second: ['uint16', rea] });
-            base.push({ first: 'fineness', second: ['uint16', fin] });
+            base.push({ first: 'conductivity', second: ['uint16', con] });
             base.push({ first: 'speed', second: ['uint16', computeCrafterSpeed(rea)] });
-            base.push({ first: 'drain', second: ['uint16', computeCrafterDrain(fin)] });
+            base.push({ first: 'drain', second: ['uint16', computeCrafterDrain(con)] });
             break;
         }
         case MODULE_STORAGE: {
@@ -16307,14 +16368,28 @@ function buildModuleImmutable(itemId, quantity, stats, originX, originY) {
             const den = decodeStat(stats, 1);
             const hrd = decodeStat(stats, 2);
             const com = decodeStat(stats, 3);
-            const sum = str + den + hrd + com;
             base.push({ first: 'strength', second: ['uint16', str] });
             base.push({ first: 'density', second: ['uint16', den] });
             base.push({ first: 'hardness', second: ['uint16', hrd] });
             base.push({ first: 'cohesion', second: ['uint16', com] });
             base.push({
-                first: 'capacity_bonus_pct',
-                second: ['uint16', 10 + Math.floor((sum * 10) / 2997)],
+                first: 'capacity',
+                second: ['uint32', computeCargoBayCapacity(str, den, hrd, com)],
+            });
+            break;
+        }
+        case MODULE_BATTERY: {
+            const vol = decodeStat(stats, 0);
+            const thm = decodeStat(stats, 1);
+            const pla = decodeStat(stats, 2);
+            const ins = decodeStat(stats, 3);
+            base.push({ first: 'volatility', second: ['uint16', vol] });
+            base.push({ first: 'thermal', second: ['uint16', thm] });
+            base.push({ first: 'plasticity', second: ['uint16', pla] });
+            base.push({ first: 'insulation', second: ['uint16', ins] });
+            base.push({
+                first: 'capacity',
+                second: ['uint32', computeBatteryBankCapacity(vol, thm, pla, ins)],
             });
             break;
         }
@@ -16400,6 +16475,8 @@ var index = /*#__PURE__*/Object.freeze({
     computeHaulerEfficiency: computeHaulerEfficiency,
     computeHaulerDrain: computeHaulerDrain$1,
     computeWarpRange: computeWarpRange,
+    computeCargoBayCapacity: computeCargoBayCapacity,
+    computeBatteryBankCapacity: computeBatteryBankCapacity,
     entityDisplayName: entityDisplayName,
     moduleDisplayName: moduleDisplayName,
     formatModuleLine: formatModuleLine,
@@ -16742,6 +16819,7 @@ exports.LOCATION_MAX_DEPTH = LOCATION_MAX_DEPTH;
 exports.LOCATION_MIN_DEPTH = LOCATION_MIN_DEPTH;
 exports.Location = Location;
 exports.LocationsManager = LocationsManager;
+exports.MAX_LEGS = MAX_LEGS;
 exports.MAX_ORBITAL_ALTITUDE = MAX_ORBITAL_ALTITUDE;
 exports.MAX_STARS_PER_STAT = MAX_STARS_PER_STAT;
 exports.MAX_STAR_RATING = MAX_STAR_RATING;
@@ -16903,6 +16981,7 @@ exports.computeBaseCapacity = computeBaseCapacity;
 exports.computeBaseCapacityShip = computeBaseCapacityShip;
 exports.computeBaseCapacityWarehouse = computeBaseCapacityWarehouse;
 exports.computeBaseHullmass = computeBaseHullmass;
+exports.computeBatteryCapabilities = computeBatteryCapabilities;
 exports.computeComponentStats = computeComponentStats;
 exports.computeContainerCapabilities = computeContainerCapabilities;
 exports.computeContainerT2Capabilities = computeContainerT2Capabilities;