@shipload/sdk 0.5.1 → 0.7.0

package/src/goods.ts

@@ -1,5 +1,5 @@
 import {UInt16, UInt16Type, UInt64} from '@wharfkit/antelope'
-import {Good, GoodType, PRECISION} from './types'
+import {Coordinates, Good, GoodType, PRECISION} from './types'
 
 // List of goods with titles and descriptions
 const goods: GoodType[] = [
@@ -7,8 +7,8 @@ const goods: GoodType[] = [
         id: 1,
         name: 'FizzGlo',
         description: 'Pops with flavor! A neon drink that makes your burps glow.',
-        base_price: 20,
-        mass: 2000,
+        base_price: 50,
+        mass: 35_000,
     },
     // {
     //     id: 2,
@@ -21,22 +21,22 @@ const goods: GoodType[] = [
         id: 3,
         name: 'Blob Buddies',
         description: 'Squishy friends! Clingy, cute and mood-matching pet blobs for every home!',
-        base_price: 40,
-        mass: 8000,
+        base_price: 95,
+        mass: 60_000,
     },
     {
         id: 4,
         name: 'TuneTooth',
         description: 'Whistle while you eat! Edible instrument treats that play tunes when chewed.',
-        base_price: 60,
-        mass: 12000,
+        base_price: 145,
+        mass: 75_000,
     },
     {
         id: 5,
         name: 'SunPods',
         description: 'Miniature suns in your pocket providing on-demand light & warmth.',
-        base_price: 80,
-        mass: 24000,
+        base_price: 295,
+        mass: 135_000,
     },
     // {
     //     id: 6,
@@ -49,8 +49,8 @@ const goods: GoodType[] = [
         id: 7,
         name: 'GlowGo',
         description: 'Ingestible bioluminescent jelly, your inside glows in the dark!',
-        base_price: 100,
-        mass: 30000,
+        base_price: 650,
+        mass: 255_000,
     },
     // {
     //     id: 8,
@@ -63,23 +63,23 @@ const goods: GoodType[] = [
         id: 9,
         name: 'PlasmaMints',
         description: 'Hypercharged candy giving plasma breath capable of cutting through steel.',
-        base_price: 120,
-        mass: 48000,
+        base_price: 3450,
+        mass: 1_100_000,
     },
     {
         id: 10,
         name: 'TimeTreats',
         description: 'Confectionery morsels releasing slow-mo effect over a limited period.',
-        base_price: 140,
-        mass: 56000,
+        base_price: 8500,
+        mass: 2_100_000,
     },
     {
         id: 11,
         name: 'QuantumQuencher',
         description:
             'Bottled hyper-fluid quenching thirst across multiple parallel realities simultaneously.',
-        base_price: 160,
-        mass: 80000,
+        base_price: 20_500,
+        mass: 4_100_000,
     },
     // {
     //     id: 12,
@@ -92,15 +92,15 @@ const goods: GoodType[] = [
         id: 13,
         name: 'MemoryGum',
         description: 'Chewable gum storing or replaying memories while being chewed.',
-        base_price: 180,
-        mass: 90000,
+        base_price: 52_500,
+        mass: 9_500_000,
     },
     {
         id: 14,
         name: 'SymbioSnack',
         description: 'Edible alien larvae adopting owner’s taste preference upon consumption.',
-        base_price: 200,
-        mass: 120000,
+        base_price: 115_000,
+        mass: 16_000_000,
     },
 ]
 
@@ -111,12 +111,12 @@ export function getGood(good_id: UInt16Type): Good {
     if (!good) {
         throw new Error('Good does not exist')
     }
-    return {
+    return Good.from({
         ...good,
         id: UInt16.from(good.id),
         base_price: UInt64.from(good.base_price),
         mass: UInt64.from(good.mass).multiplying(PRECISION),
-    }
+    })
 }
 
 export function getGoods(): Good[] {

package/src/index-module.ts

@@ -3,6 +3,7 @@ export * from './epoch'
 export * from './errors'
 export * from './goods'
 export * from './hash'
+export * from './system'
 export * from './market'
 export * from './ship'
 export * from './travel'

package/src/market.ts

@@ -75,8 +75,8 @@ export function getRarity(
         // ~40.30% chance = no value change
         return {
             rarity: Rarities.trash,
-            minMultiplier: 0,
-            maxMultiplier: 0,
+            minMultiplier: 1,
+            maxMultiplier: 1.07,
         } // Product is not available
     } else if (rarityRoll < 62508) {
         // (White) ~25.33% chance = slightly lower value
@@ -161,18 +161,32 @@ export function getLocationMultiplier(
     }
 }
 
+export function getSupply(
+    gameSeed: Checksum256Type,
+    state: ServerContract.Types.state_row,
+    location: Coordinates,
+    good_id: UInt16Type
+): number {
+    const seed = `${state.seed}${location.x}${location.y}${good_id}supply`
+    const r = roll(gameSeed, seed)
+    const percent = r / 65535
+    const epoch = 1 + Number(state.epoch) / 90
+    const ship = Math.pow(Number(state.ships), 1 / 3)
+    return UInt64.from((128 / good_id) * percent * ship * epoch).toNumber()
+}
+
 export function marketprice(
     location: ServerContract.ActionParams.Type.coordinates,
     good_id: UInt16Type,
     gameSeed: Checksum256Type,
-    epochSeed: Checksum256Type
-): UInt64 {
-    const {base_price} = getGood(good_id)
-    let price = Number(base_price)
+    state: ServerContract.Types.state_row
+): GoodPrice {
+    const good = getGood(good_id)
+    let price = Number(good.base_price)
 
     // Rarity multiplier of the deal (changes with epoch)
     // Large impact range on price, from 0.285x to 3.0x
-    const rarityMultiplier = getRarityMultiplier(gameSeed, epochSeed, location, good_id)
+    const rarityMultiplier = getRarityMultiplier(gameSeed, state.seed, location, good_id)
     price *= rarityMultiplier
 
     // Location multiplier of the deal (static, based on game seed)
@@ -180,16 +194,21 @@ export function marketprice(
     const locationMultiplier = getLocationMultiplier(gameSeed, location, good_id)
     price *= locationMultiplier
 
-    return UInt64.from(price)
+    // Determine the current supply of the good at the location
+    const supply = getSupply(gameSeed, state, location, good_id)
+
+    return GoodPrice.from({
+        id: good_id,
+        good,
+        price: UInt64.from(price),
+        supply: UInt64.from(supply),
+    })
 }
 
 export function marketprices(
     location: ServerContract.ActionParams.Type.coordinates,
     gameSeed: Checksum256Type,
-    epochSeed: Checksum256Type
+    state: ServerContract.Types.state_row
 ): GoodPrice[] {
-    return getGoods().map((good) => {
-        const price = marketprice(location, good.id, gameSeed, epochSeed)
-        return {price, good: good}
-    })
+    return getGoods().map((good) => marketprice(location, good.id, gameSeed, state))
 }

package/src/shipload.ts

@@ -1,5 +1,7 @@
 import {
     APIClient,
+    Bytes,
+    Checksum256,
     Name,
     NameType,
     Serializer,
@@ -7,15 +9,17 @@ import {
     UInt64,
     UInt64Type,
 } from '@wharfkit/antelope'
-import {Distance, GoodPrice} from './types'
+import {Coordinates, Distance, GoodPrice} from './types'
 import {marketprice, marketprices} from './market'
 import {PlatformContract, ServerContract} from './contracts'
 import {ERROR_SYSTEM_NOT_INITIALIZED} from './errors'
 import {ChainDefinition} from '@wharfkit/session'
 import ContractKit, {Contract} from '@wharfkit/contract'
-import {findNearbyPlanets, hasSystem, travelplan} from './travel'
+import {findNearbyPlanets, travelplan} from './travel'
+
 import {Ship} from './ship'
 import {EpochInfo, getCurrentEpoch, getEpochInfo} from './epoch'
+import {hasSystem} from './system'
 
 interface ShiploadOptions {
     platformContractName?: string
@@ -138,10 +142,10 @@ export class Shipload {
     async marketprice(
         location: ServerContract.ActionParams.Type.coordinates,
         good_id: number
-    ): Promise<UInt64> {
+    ): Promise<GoodPrice> {
         const game = await this.getGame()
         const state = await this.getState()
-        return marketprice(location, good_id, game.config.seed, state.seed)
+        return marketprice(location, good_id, game.config.seed, state)
     }
 
     async marketprices(
@@ -149,7 +153,7 @@ export class Shipload {
     ): Promise<GoodPrice[]> {
         const game = await this.getGame()
         const state = await this.getState()
-        return marketprices(location, game.config.seed, state.seed)
+        return marketprices(location, game.config.seed, state)
     }
 
     async hasSystem(location: ServerContract.ActionParams.Type.coordinates): Promise<boolean> {
@@ -218,4 +222,13 @@ export class Shipload {
         const game = await this.getGame()
         return getEpochInfo(game, UInt64.from(height))
     }
+
+    async getLocation(location: Coordinates) {
+        const hash = Checksum256.hash(Bytes.from(`${location.x}-${location.y}`, 'utf8'))
+        return this.server.table('location').all({
+            index_position: 'secondary',
+            from: hash,
+            to: hash,
+        })
+    }
 }