@shipload/sdk 1.0.0-next.22 → 1.0.0-next.24

package/lib/testing.js

@@ -3248,24 +3248,24 @@ const itemMetadata = {
     208: { name: 'Crystal', description: '', color: '#4ADBFF' },
     209: { name: 'Crystal', description: '', color: '#4ADBFF' },
     210: { name: 'Crystal', description: '', color: '#4ADBFF' },
-    301: { name: 'Gas', description: 'Raw volatile gas.', color: '#B8E4A0' },
+    301: { name: 'Gas', description: 'Raw volatile gas.', color: '#B877FF' },
     302: {
         name: 'Gas',
         description: 'Refined volatile gas with improved reactivity.',
-        color: '#B8E4A0',
+        color: '#B877FF',
     },
     303: {
         name: 'Gas',
         description: 'High-grade volatile gas with exceptional energy density.',
-        color: '#B8E4A0',
+        color: '#B877FF',
     },
-    304: { name: 'Gas', description: '', color: '#B8E4A0' },
-    305: { name: 'Gas', description: '', color: '#B8E4A0' },
-    306: { name: 'Gas', description: '', color: '#B8E4A0' },
-    307: { name: 'Gas', description: '', color: '#B8E4A0' },
-    308: { name: 'Gas', description: '', color: '#B8E4A0' },
-    309: { name: 'Gas', description: '', color: '#B8E4A0' },
-    310: { name: 'Gas', description: '', color: '#B8E4A0' },
+    304: { name: 'Gas', description: '', color: '#B877FF' },
+    305: { name: 'Gas', description: '', color: '#B877FF' },
+    306: { name: 'Gas', description: '', color: '#B877FF' },
+    307: { name: 'Gas', description: '', color: '#B877FF' },
+    308: { name: 'Gas', description: '', color: '#B877FF' },
+    309: { name: 'Gas', description: '', color: '#B877FF' },
+    310: { name: 'Gas', description: '', color: '#B877FF' },
     401: { name: 'Regolith', description: 'Crude regolith dust.', color: '#C4A57B' },
     402: {
         name: 'Regolith',
@@ -3345,7 +3345,7 @@ const itemMetadata = {
     10009: {
         name: 'Reactor',
         description: 'Gas-pressurized vessel for controlled reactions. Vents heat and contains volatility.',
-        color: '#B8E4A0',
+        color: '#B877FF',
     },
     10010: {
         name: 'Emitter',
@@ -3375,7 +3375,7 @@ const itemMetadata = {
     10104: {
         name: 'Crafter',
         description: 'Basic crafting system. Processes materials using reaction chambers and cutting tools.',
-        color: '#B8E4A0',
+        color: '#B877FF',
     },
     10105: {
         name: 'Storage',

package/lib/testing.m.js

@@ -3244,24 +3244,24 @@ const itemMetadata = {
     208: { name: 'Crystal', description: '', color: '#4ADBFF' },
     209: { name: 'Crystal', description: '', color: '#4ADBFF' },
     210: { name: 'Crystal', description: '', color: '#4ADBFF' },
-    301: { name: 'Gas', description: 'Raw volatile gas.', color: '#B8E4A0' },
+    301: { name: 'Gas', description: 'Raw volatile gas.', color: '#B877FF' },
     302: {
         name: 'Gas',
         description: 'Refined volatile gas with improved reactivity.',
-        color: '#B8E4A0',
+        color: '#B877FF',
     },
     303: {
         name: 'Gas',
         description: 'High-grade volatile gas with exceptional energy density.',
-        color: '#B8E4A0',
+        color: '#B877FF',
     },
-    304: { name: 'Gas', description: '', color: '#B8E4A0' },
-    305: { name: 'Gas', description: '', color: '#B8E4A0' },
-    306: { name: 'Gas', description: '', color: '#B8E4A0' },
-    307: { name: 'Gas', description: '', color: '#B8E4A0' },
-    308: { name: 'Gas', description: '', color: '#B8E4A0' },
-    309: { name: 'Gas', description: '', color: '#B8E4A0' },
-    310: { name: 'Gas', description: '', color: '#B8E4A0' },
+    304: { name: 'Gas', description: '', color: '#B877FF' },
+    305: { name: 'Gas', description: '', color: '#B877FF' },
+    306: { name: 'Gas', description: '', color: '#B877FF' },
+    307: { name: 'Gas', description: '', color: '#B877FF' },
+    308: { name: 'Gas', description: '', color: '#B877FF' },
+    309: { name: 'Gas', description: '', color: '#B877FF' },
+    310: { name: 'Gas', description: '', color: '#B877FF' },
     401: { name: 'Regolith', description: 'Crude regolith dust.', color: '#C4A57B' },
     402: {
         name: 'Regolith',
@@ -3341,7 +3341,7 @@ const itemMetadata = {
     10009: {
         name: 'Reactor',
         description: 'Gas-pressurized vessel for controlled reactions. Vents heat and contains volatility.',
-        color: '#B8E4A0',
+        color: '#B877FF',
     },
     10010: {
         name: 'Emitter',
@@ -3371,7 +3371,7 @@ const itemMetadata = {
     10104: {
         name: 'Crafter',
         description: 'Basic crafting system. Processes materials using reaction chambers and cutting tools.',
-        color: '#B8E4A0',
+        color: '#B877FF',
     },
     10105: {
         name: 'Storage',

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@shipload/sdk",
     "description": "SDKs for Shipload",
-    "version": "1.0.0-next.22",
+    "version": "1.0.0-next.24",
     "homepage": "https://github.com/shipload/toolkit/tree/master/packages/sdk",
     "repository": {
         "type": "git",

package/src/capabilities/crafting.ts

@@ -18,5 +18,5 @@ export function calc_craft_duration(speed: number, totalInputMass: number): UInt
 
 export function calc_craft_energy(drain: number, totalInputMass: number): UInt16 {
     const raw = Math.floor((totalInputMass * drain) / CRAFT_ENERGY_DIVISOR)
-    return UInt16.from(Math.min(raw, 65535))
+    return UInt16.from(Math.min(Math.max(raw, 1), 65535))
 }

package/src/data/colors.ts

@@ -3,7 +3,7 @@ import type {ResourceCategory} from '../types'
 export const categoryColors: Record<ResourceCategory, string> = {
     ore: '#C26D3F',
     crystal: '#4ADBFF',
-    gas: '#B8E4A0',
+    gas: '#B877FF',
     regolith: '#C4A57B',
     biomass: '#5A8B3E',
 }
@@ -21,24 +21,6 @@ export const tierColors: Record<number, string> = {
     10: '#ffffff',
 }
 
-export const categoryIcons: Record<ResourceCategory, string> = {
-    ore: '⬡',
-    crystal: '◈',
-    gas: '◎',
-    regolith: '■',
-    biomass: '❋',
-}
-
-export type CategoryIconShape = 'hex' | 'diamond' | 'star' | 'circle' | 'square'
-
-export const categoryIconShapes: Record<ResourceCategory, CategoryIconShape> = {
-    ore: 'hex',
-    crystal: 'diamond',
-    gas: 'circle',
-    regolith: 'square',
-    biomass: 'star',
-}
-
 export const componentIcon = '▣'
 export const moduleIcon = '⬢'
 

package/src/data/metadata.ts

@@ -48,24 +48,24 @@ export const itemMetadata: Record<number, ItemMetadata> = {
     210: {name: 'Crystal', description: '', color: '#4ADBFF'},
 
     // === Resources / Gas ===
-    301: {name: 'Gas', description: 'Raw volatile gas.', color: '#B8E4A0'},
+    301: {name: 'Gas', description: 'Raw volatile gas.', color: '#B877FF'},
     302: {
         name: 'Gas',
         description: 'Refined volatile gas with improved reactivity.',
-        color: '#B8E4A0',
+        color: '#B877FF',
     },
     303: {
         name: 'Gas',
         description: 'High-grade volatile gas with exceptional energy density.',
-        color: '#B8E4A0',
-    },
-    304: {name: 'Gas', description: '', color: '#B8E4A0'},
-    305: {name: 'Gas', description: '', color: '#B8E4A0'},
-    306: {name: 'Gas', description: '', color: '#B8E4A0'},
-    307: {name: 'Gas', description: '', color: '#B8E4A0'},
-    308: {name: 'Gas', description: '', color: '#B8E4A0'},
-    309: {name: 'Gas', description: '', color: '#B8E4A0'},
-    310: {name: 'Gas', description: '', color: '#B8E4A0'},
+        color: '#B877FF',
+    },
+    304: {name: 'Gas', description: '', color: '#B877FF'},
+    305: {name: 'Gas', description: '', color: '#B877FF'},
+    306: {name: 'Gas', description: '', color: '#B877FF'},
+    307: {name: 'Gas', description: '', color: '#B877FF'},
+    308: {name: 'Gas', description: '', color: '#B877FF'},
+    309: {name: 'Gas', description: '', color: '#B877FF'},
+    310: {name: 'Gas', description: '', color: '#B877FF'},
 
     // === Resources / Regolith ===
     401: {name: 'Regolith', description: 'Crude regolith dust.', color: '#C4A57B'},
@@ -160,7 +160,7 @@ export const itemMetadata: Record<number, ItemMetadata> = {
         name: 'Reactor',
         description:
             'Gas-pressurized vessel for controlled reactions. Vents heat and contains volatility.',
-        color: '#B8E4A0',
+        color: '#B877FF',
     },
     10010: {
         name: 'Emitter',
@@ -194,7 +194,7 @@ export const itemMetadata: Record<number, ItemMetadata> = {
         name: 'Crafter',
         description:
             'Basic crafting system. Processes materials using reaction chambers and cutting tools.',
-        color: '#B8E4A0',
+        color: '#B877FF',
     },
     10105: {
         name: 'Storage',

package/src/derivation/capabilities.ts

@@ -23,7 +23,7 @@ export function computeEngineCapabilities(stats: Record<string, number>): {
 
     return {
         thrust: 400 + Math.floor((vol * 3) / 4),
-        drain: Math.max(30, 50 - Math.floor(thm / 70)),
+        drain: 2 * Math.max(30, 50 - Math.floor(thm / 70)),
     }
 }
 
@@ -35,8 +35,8 @@ export function computeGeneratorCapabilities(stats: Record<string, number>): {
     const ref = stats.reflectivity
 
     return {
-        capacity: 300 + Math.floor(res / 6),
-        recharge: 1 + Math.floor((ref * 3) / 1000),
+        capacity: 950 + Math.floor(res / 2),
+        recharge: 2 * (1 + Math.floor((ref * 3) / 1000)),
     }
 }
 
@@ -82,7 +82,7 @@ export function computeGathererCapabilities(
 
     return {
         yield: 200 + str,
-        drain: Math.max(250, 1250 - Math.floor((con * 25) / 20)),
+        drain: 2 * Math.max(250, 1250 - Math.floor((con * 25) / 20)),
         depth: gathererDepthForTier(tol, tier),
     }
 }

package/src/index-module.ts

@@ -240,13 +240,10 @@ export * from './capabilities'
 export {
     categoryColors,
     tierColors,
-    categoryIcons,
-    categoryIconShapes,
     componentIcon,
     moduleIcon,
     itemAbbreviations,
 } from './data/colors'
-export type {CategoryIconShape} from './data/colors'
 
 export {itemTier, itemOffset, itemCategory, isRelatedItem, isCraftedItem} from './data/tiers'
 export type {CraftedItemCategory} from './data/tiers'

package/src/managers/locations.ts

@@ -1,10 +1,10 @@
-import type {UInt16Type} from '@wharfkit/antelope'
+import {BlockTimestamp, type UInt16Type} from '@wharfkit/antelope'
 import {BaseManager} from './base'
 import type {CoordinatesType, Distance} from '../types'
 import {hasSystem} from '../utils/system'
 import {findNearbyPlanets} from '../travel/travel'
 import type {ServerContract} from '../contracts'
-import {type DerivedStratum, deriveStrata} from '../derivation'
+import {type DerivedStratum, deriveStrata, getEffectiveReserve} from '../derivation'
 
 export interface LocationStratum extends DerivedStratum {
     reserveMax: number
@@ -24,7 +24,10 @@ export class LocationsManager extends BaseManager {
         return findNearbyPlanets(game.config.seed, origin, maxDistance)
     }
 
-    async getStrata(coords: CoordinatesType): Promise<LocationStratum[]> {
+    async getStrata(
+        coords: CoordinatesType,
+        now: BlockTimestamp = BlockTimestamp.fromMilliseconds(Date.now())
+    ): Promise<LocationStratum[]> {
         const game = await this.getGame()
         const state = await this.getState()
 
@@ -36,15 +39,26 @@ export class LocationsManager extends BaseManager {
             y: coords.y,
         })) as ServerContract.Types.stratum_remaining[]
 
-        const overrideMap = new Map<number, number>()
+        const epochSeconds = Number(game.config.epochtime)
+        const overrideMap = new Map<number, ServerContract.Types.stratum_remaining>()
         for (const o of overrides) {
-            overrideMap.set(Number(o.stratum), Number(o.remaining))
+            overrideMap.set(Number(o.stratum), o)
         }
 
-        return derived.map((s) => ({
-            ...s,
-            reserveMax: s.reserve,
-            reserve: overrideMap.get(s.index) ?? s.reserve,
-        }))
+        return derived.map((s) => {
+            const override = overrideMap.get(s.index)
+            const reserve = override
+                ? getEffectiveReserve(
+                      {
+                          remaining: override.remaining,
+                          max_reserve: s.reserve,
+                          last_block: override.last_block,
+                      },
+                      now,
+                      epochSeconds
+                  )
+                : s.reserve
+            return {...s, reserveMax: s.reserve, reserve}
+        })
     }
 }

package/src/nft/description.ts

@@ -48,12 +48,12 @@ export function computeBaseCapacityWarehouse(stats: bigint): number {
 }
 
 export const computeEngineThrust = (vol: number): number => 400 + idiv(vol * 3, 4)
-export const computeEngineDrain = (thm: number): number => Math.max(30, 50 - idiv(thm, 70))
-export const computeGeneratorCap = (com: number): number => 300 + idiv(com, 6)
-export const computeGeneratorRech = (fin: number): number => 1 + idiv(fin * 3, 1000)
+export const computeEngineDrain = (thm: number): number => 2 * Math.max(30, 50 - idiv(thm, 70))
+export const computeGeneratorCap = (com: number): number => 950 + idiv(com, 2)
+export const computeGeneratorRech = (fin: number): number => 2 * (1 + idiv(fin * 3, 1000))
 export const computeGathererYield = (str: number): number => 200 + str
 export const computeGathererDrain = (con: number): number =>
-    Math.max(250, 1250 - idiv(con * 25, 20))
+    2 * Math.max(250, 1250 - idiv(con * 25, 20))
 export const computeGathererDepth = (tol: number, tier: number): number =>
     gathererDepthForTier(tol, tier)
 export const computeLoaderMass = (ins: number): number => Math.max(200, 2000 - ins * 2)

package/src/resolution/resolve-item.ts

@@ -29,13 +29,7 @@ import {
     computeContainerCapabilities,
     computeContainerT2Capabilities,
 } from '../derivation/capabilities'
-import {
-    categoryColors,
-    categoryIcons,
-    componentIcon,
-    itemAbbreviations,
-    moduleIcon,
-} from '../data/colors'
+import {categoryColors, componentIcon, itemAbbreviations, moduleIcon} from '../data/colors'
 import type {ServerContract} from '../contracts'
 import {
     ITEM_CONTAINER_T1_PACKED,
@@ -111,7 +105,7 @@ function resolveResource(id: number, stats?: UInt64Type): ResolvedItem {
     return {
         itemId: id,
         name: item.name,
-        icon: cat ? categoryIcons[cat] : '⬡',
+        icon: '',
         abbreviation: null,
         category: cat,
         tier: item.tier,