@shipload/sdk 1.0.0-next.17 → 1.0.0-next.18

package/src/data/recipes.json

@@ -1,12 +1,12 @@
 [
   {
     "outputItemId": 10001,
-    "outputMass": 50000,
+    "outputMass": 420000,
     "inputs": [
       {
         "category": "ore",
         "tier": 1,
-        "quantity": 15
+        "quantity": 20
       }
     ],
     "statSlots": [
@@ -31,12 +31,12 @@
   },
   {
     "outputItemId": 10002,
-    "outputMass": 30000,
+    "outputMass": 600000,
     "inputs": [
       {
         "category": "regolith",
         "tier": 1,
-        "quantity": 10
+        "quantity": 30
       },
       {
         "category": "biomass",
@@ -66,12 +66,12 @@
   },
   {
     "outputItemId": 10003,
-    "outputMass": 50000,
+    "outputMass": 390000,
     "inputs": [
       {
         "category": "gas",
         "tier": 1,
-        "quantity": 32
+        "quantity": 65
       }
     ],
     "statSlots": [
@@ -96,12 +96,17 @@
   },
   {
     "outputItemId": 10004,
-    "outputMass": 30000,
+    "outputMass": 600000,
     "inputs": [
       {
         "category": "crystal",
         "tier": 1,
-        "quantity": 20
+        "quantity": 25
+      },
+      {
+        "category": "biomass",
+        "tier": 1,
+        "quantity": 15
       }
     ],
     "statSlots": [
@@ -126,12 +131,17 @@
   },
   {
     "outputItemId": 10005,
-    "outputMass": 50000,
+    "outputMass": 600000,
     "inputs": [
       {
         "category": "ore",
         "tier": 1,
-        "quantity": 15
+        "quantity": 20
+      },
+      {
+        "category": "gas",
+        "tier": 1,
+        "quantity": 30
       }
     ],
     "statSlots": [
@@ -156,12 +166,12 @@
   },
   {
     "outputItemId": 10006,
-    "outputMass": 30000,
+    "outputMass": 420000,
     "inputs": [
       {
         "category": "crystal",
         "tier": 1,
-        "quantity": 10
+        "quantity": 30
       }
     ],
     "statSlots": [
@@ -186,12 +196,12 @@
   },
   {
     "outputItemId": 10007,
-    "outputMass": 30000,
+    "outputMass": 420000,
     "inputs": [
       {
         "category": "biomass",
         "tier": 1,
-        "quantity": 32
+        "quantity": 25
       }
     ],
     "statSlots": [
@@ -216,12 +226,12 @@
   },
   {
     "outputItemId": 10008,
-    "outputMass": 30000,
+    "outputMass": 400000,
     "inputs": [
       {
         "category": "regolith",
         "tier": 1,
-        "quantity": 20
+        "quantity": 45
       }
     ],
     "statSlots": [
@@ -246,12 +256,17 @@
   },
   {
     "outputItemId": 10009,
-    "outputMass": 50000,
+    "outputMass": 590000,
     "inputs": [
       {
         "category": "gas",
         "tier": 1,
-        "quantity": 32
+        "quantity": 40
+      },
+      {
+        "category": "regolith",
+        "tier": 1,
+        "quantity": 40
       }
     ],
     "statSlots": [
@@ -276,12 +291,17 @@
   },
   {
     "outputItemId": 10010,
-    "outputMass": 40000,
+    "outputMass": 590000,
     "inputs": [
       {
         "category": "crystal",
         "tier": 1,
-        "quantity": 25
+        "quantity": 20
+      },
+      {
+        "category": "ore",
+        "tier": 1,
+        "quantity": 15
       }
     ],
     "statSlots": [
@@ -306,7 +326,7 @@
   },
   {
     "outputItemId": 10100,
-    "outputMass": 150000,
+    "outputMass": 940000,
     "inputs": [
       {
         "itemId": 10003,
@@ -335,11 +355,11 @@
   },
   {
     "outputItemId": 10101,
-    "outputMass": 75000,
+    "outputMass": 1440000,
     "inputs": [
       {
         "itemId": 10004,
-        "quantity": 5
+        "quantity": 6
       }
     ],
     "statSlots": [
@@ -364,11 +384,11 @@
   },
   {
     "outputItemId": 10102,
-    "outputMass": 145000,
+    "outputMass": 1220000,
     "inputs": [
       {
         "itemId": 10005,
-        "quantity": 4
+        "quantity": 3
       },
       {
         "itemId": 10006,
@@ -416,22 +436,18 @@
   },
   {
     "outputItemId": 10103,
-    "outputMass": 90000,
+    "outputMass": 1010000,
     "inputs": [
-      {
-        "itemId": 10002,
-        "quantity": 3
-      },
       {
         "itemId": 10007,
-        "quantity": 3
+        "quantity": 6
       }
     ],
     "statSlots": [
       {
         "sources": [
           {
-            "inputIndex": 1,
+            "inputIndex": 0,
             "statIndex": 1
           }
         ]
@@ -439,7 +455,7 @@
       {
         "sources": [
           {
-            "inputIndex": 1,
+            "inputIndex": 0,
             "statIndex": 0
           }
         ]
@@ -449,7 +465,7 @@
   },
   {
     "outputItemId": 10104,
-    "outputMass": 120000,
+    "outputMass": 1190000,
     "inputs": [
       {
         "itemId": 10008,
@@ -482,15 +498,15 @@
   },
   {
     "outputItemId": 10105,
-    "outputMass": 100000,
+    "outputMass": 1220000,
     "inputs": [
       {
         "itemId": 10001,
-        "quantity": 8
+        "quantity": 3
       },
       {
         "itemId": 10002,
-        "quantity": 4
+        "quantity": 3
       }
     ],
     "statSlots": [
@@ -531,7 +547,7 @@
   },
   {
     "outputItemId": 10106,
-    "outputMass": 120000,
+    "outputMass": 1430000,
     "inputs": [
       {
         "itemId": 10004,
@@ -575,15 +591,15 @@
   },
   {
     "outputItemId": 10107,
-    "outputMass": 180000,
+    "outputMass": 1420000,
     "inputs": [
       {
         "itemId": 10010,
-        "quantity": 6
+        "quantity": 3
       },
       {
         "itemId": 10009,
-        "quantity": 4
+        "quantity": 3
       }
     ],
     "statSlots": [
@@ -607,11 +623,11 @@
   },
   {
     "outputItemId": 10108,
-    "outputMass": 90000,
+    "outputMass": 970000,
     "inputs": [
       {
         "itemId": 10003,
-        "quantity": 4
+        "quantity": 3
       },
       {
         "itemId": 10007,
@@ -656,7 +672,7 @@
   },
   {
     "outputItemId": 10200,
-    "outputMass": 80000,
+    "outputMass": 1490000,
     "inputs": [
       {
         "itemId": 10001,
@@ -705,7 +721,7 @@
   },
   {
     "outputItemId": 10201,
-    "outputMass": 100000,
+    "outputMass": 2300000,
     "inputs": [
       {
         "itemId": 10001,
@@ -754,7 +770,7 @@
   },
   {
     "outputItemId": 10202,
-    "outputMass": 1300000,
+    "outputMass": 5760000,
     "inputs": [
       {
         "itemId": 10001,
@@ -803,7 +819,7 @@
   },
   {
     "outputItemId": 10203,
-    "outputMass": 800000,
+    "outputMass": 4440000,
     "inputs": [
       {
         "itemId": 10001,
@@ -852,7 +868,7 @@
   },
   {
     "outputItemId": 10204,
-    "outputMass": 800000,
+    "outputMass": 5540000,
     "inputs": [
       {
         "itemId": 10001,

package/src/derivation/index.ts

@@ -17,7 +17,9 @@ export {
     DEPTH_THRESHOLD_T5,
     LOCATION_MIN_DEPTH,
     LOCATION_MAX_DEPTH,
-    YIELD_THRESHOLD,
+    yieldThresholdAt,
+    YIELD_FRACTION_SHALLOW,
+    YIELD_FRACTION_DEEP,
     PLANET_SUBTYPE_GAS_GIANT,
     PLANET_SUBTYPE_ROCKY,
     PLANET_SUBTYPE_TERRESTRIAL,
@@ -26,8 +28,11 @@ export {
     PLANET_SUBTYPE_INDUSTRIAL,
 } from './resources'
 
-export {RESERVE_TIERS, TIER_ROLL_MAX, rollTier, rollWithinTier} from './tiers'
+export {RESERVE_TIERS, TIER_ROLL_MAX, tierOfReserve, rollTier, rollWithinTier} from './tiers'
 export type {ReserveTier, TierRange} from './tiers'
 
+export {getEffectiveReserve} from './reserve-regen'
+export type {EffectiveReserveInput} from './reserve-regen'
+
 export * from './stats'
 export * from './crafting'

package/src/derivation/reserve-regen.ts

@@ -0,0 +1,34 @@
+import type {BlockTimestamp, UInt32} from '@wharfkit/antelope'
+
+export interface EffectiveReserveInput {
+    remaining: UInt32 | number
+    max_reserve: UInt32 | number
+    last_block: BlockTimestamp
+}
+
+function toNumber(value: UInt32 | number): number {
+    return typeof value === 'number' ? value : Number(value)
+}
+
+function slotsBetween(now: BlockTimestamp, last: BlockTimestamp): number {
+    const nowMs = now.toMilliseconds()
+    const lastMs = last.toMilliseconds()
+    if (nowMs <= lastMs) return 0
+    return Math.floor((nowMs - lastMs) / 500)
+}
+
+export function getEffectiveReserve(
+    row: EffectiveReserveInput,
+    now: BlockTimestamp,
+    epochSeconds: number
+): number {
+    const remaining = toNumber(row.remaining)
+    const max = toNumber(row.max_reserve)
+    if (remaining >= max) return max
+    const epochSlots = epochSeconds * 2
+    if (epochSlots === 0) return remaining
+    const elapsed = slotsBetween(now, row.last_block)
+    const regen = Math.floor((max * elapsed) / epochSlots)
+    const effective = remaining + regen
+    return effective >= max ? max : effective
+}

package/src/derivation/resources.ts

@@ -15,7 +15,15 @@ export const DEPTH_THRESHOLD_T10 = 63000
 export const LOCATION_MIN_DEPTH = 500
 export const LOCATION_MAX_DEPTH = 65535
 
-export const YIELD_THRESHOLD = Math.floor(0.001 * 0xffffffff)
+export const YIELD_FRACTION_SHALLOW = 0.0025
+export const YIELD_FRACTION_DEEP = 0.0005
+
+export function yieldThresholdAt(stratum: number): number {
+    const clamped = stratum > 65535 ? 65535 : stratum
+    const t = clamped / 65535
+    const fraction = YIELD_FRACTION_SHALLOW + (YIELD_FRACTION_DEEP - YIELD_FRACTION_SHALLOW) * t
+    return Math.floor(fraction * 0xffffffff)
+}
 
 export const PLANET_SUBTYPE_GAS_GIANT = 0
 export const PLANET_SUBTYPE_ROCKY = 1

package/src/derivation/stratum.ts

@@ -1,7 +1,8 @@
 import {Bytes, Checksum256, type Checksum256Type} from '@wharfkit/antelope'
 import {hash512} from '../utils/hash'
 import {Coordinates, type CoordinatesType} from '../types'
-import {getEligibleResources, getResourceWeight, YIELD_THRESHOLD} from './resources'
+import {getItem} from '../data/catalog'
+import {getEligibleResources, getResourceWeight, yieldThresholdAt} from './resources'
 import {RESERVE_TIERS, rollTier, rollWithinTier} from './tiers'
 
 export interface StratumInfo {
@@ -33,15 +34,8 @@ export function deriveStratum(
 
     const rawReserve = ((bytes[0] << 24) | (bytes[1] << 16) | (bytes[2] << 8) | bytes[3]) >>> 0
 
-    let reserve = 0
-    if (rawReserve <= YIELD_THRESHOLD) {
-        const tierRoll = ((bytes[18] << 8) | bytes[19]) >>> 0
-        const withinRoll = ((bytes[20] << 8) | bytes[21]) >>> 0
-        const tier = rollTier(tierRoll, stratum)
-        reserve = rollWithinTier(withinRoll, RESERVE_TIERS[tier])
-    }
-
-    if (reserve === 0) return {itemId: 0, seed: 0n, richness: 0, reserve: 0}
+    if (rawReserve > yieldThresholdAt(stratum))
+        return {itemId: 0, seed: 0n, richness: 0, reserve: 0}
 
     const eligible = getEligibleResources(locationType, subtype, stratum)
     if (eligible.length === 0) return {itemId: 0, seed: 0n, richness: 0, reserve: 0}
@@ -66,6 +60,12 @@ export function deriveStratum(
         }
     }
 
+    const tierRoll = ((bytes[18] << 8) | bytes[19]) >>> 0
+    const withinRoll = ((bytes[20] << 8) | bytes[21]) >>> 0
+    const tier = rollTier(tierRoll, stratum)
+    const unitMass = getItem(selectedItemId).mass
+    const reserve = rollWithinTier(withinRoll, RESERVE_TIERS[tier], unitMass)
+
     const seedBigInt =
         (BigInt(bytes[8]) << 56n) |
         (BigInt(bytes[9]) << 48n) |

package/src/derivation/tiers.ts

@@ -1,3 +1,5 @@
+import {getItem} from '../data/catalog'
+
 export type ReserveTier = 'small' | 'medium' | 'large' | 'massive' | 'motherlode'
 
 export interface TierRange {
@@ -6,11 +8,11 @@ export interface TierRange {
 }
 
 export const RESERVE_TIERS: Record<ReserveTier, TierRange> = {
-    small: {min: 15, max: 60},
-    medium: {min: 100, max: 200},
-    large: {min: 400, max: 700},
-    massive: {min: 1000, max: 2500},
-    motherlode: {min: 4000, max: 10000},
+    small: {min: 3_600_000, max: 14_400_000},
+    medium: {min: 24_000_000, max: 48_000_000},
+    large: {min: 96_000_000, max: 168_000_000},
+    massive: {min: 240_000_000, max: 600_000_000},
+    motherlode: {min: 960_000_000, max: 2_400_000_000},
 }
 
 const SHALLOW_THRESHOLDS = {
@@ -47,8 +49,27 @@ export function rollTier(tierRoll: number, stratum: number): ReserveTier {
     return 'motherlode'
 }
 
-export function rollWithinTier(withinRoll: number, range: TierRange): number {
+export function rollWithinTier(
+    withinRoll: number,
+    range: TierRange,
+    resourceUnitMass: number
+): number {
     const u = withinRoll / 65535
     const skewed = u * u
-    return Math.floor(range.min + skewed * (range.max - range.min))
+    const depositMass = range.min + skewed * (range.max - range.min)
+    return Math.max(1, Math.floor(depositMass / resourceUnitMass))
+}
+
+const RESERVE_TIER_ENTRIES = Object.entries(RESERVE_TIERS) as Array<[ReserveTier, TierRange]>
+
+export function tierOfReserve(reserve: number, itemId: number): ReserveTier | null {
+    if (reserve <= 0) return null
+    const unitMass = getItem(itemId).mass
+    if (unitMass <= 0) return null
+    const impliedMassLow = reserve * unitMass
+    const impliedMassHigh = impliedMassLow + unitMass
+    for (const [tier, range] of RESERVE_TIER_ENTRIES) {
+        if (impliedMassHigh > range.min && impliedMassLow <= range.max) return tier
+    }
+    return null
 }

package/src/index-module.ts

@@ -97,6 +97,9 @@ export {
     DEPTH_THRESHOLD_T5,
     LOCATION_MIN_DEPTH,
     LOCATION_MAX_DEPTH,
+    yieldThresholdAt,
+    YIELD_FRACTION_SHALLOW,
+    YIELD_FRACTION_DEEP,
     PLANET_SUBTYPE_GAS_GIANT,
     PLANET_SUBTYPE_ROCKY,
     PLANET_SUBTYPE_TERRESTRIAL,
@@ -107,9 +110,12 @@ export {
 
 export type {StratumInfo, ResourceStats, DerivedStratum} from './derivation'
 
-export {RESERVE_TIERS, TIER_ROLL_MAX, rollTier, rollWithinTier} from './derivation'
+export {RESERVE_TIERS, TIER_ROLL_MAX, tierOfReserve, rollTier, rollWithinTier} from './derivation'
 export type {ReserveTier, TierRange} from './derivation'
 
+export {getEffectiveReserve} from './derivation'
+export type {EffectiveReserveInput} from './derivation'
+
 export {getStatDefinitions, getStatName, resolveStats} from './derivation'
 export type {StatDefinition, NamedStats} from './derivation'