@shipload/sdk 0.3.16 → 0.4.1

package/src/goods.ts

@@ -7,71 +7,71 @@ const goods: GoodType[] = [
         id: 1,
         name: 'FizzGlo',
         description: 'Pops with flavor! A neon drink that makes your burps glow.',
-        base_price: 200,
-        mass: 5000,
-    },
-    {
-        id: 2,
-        name: 'ZapSnacks',
-        description: 'Electric taste! Spicy edible energy sparks for a tongue-tingling experience.',
-        base_price: 300,
-        mass: 2000,
+        base_price: 20,
+        mass: 4500,
     },
+    // {
+    //     id: 2,
+    //     name: 'ZapSnacks',
+    //     description: 'Electric taste! Spicy edible energy sparks for a tongue-tingling experience.',
+    //     base_price: 30,
+    //     mass: 7000,
+    // },
     {
         id: 3,
         name: 'Blob Buddies',
         description: 'Squishy friends! Clingy, cute and mood-matching pet blobs for every home!',
-        base_price: 400,
-        mass: 10000,
+        base_price: 40,
+        mass: 9500,
     },
     {
         id: 4,
         name: 'TuneTooth',
         description: 'Whistle while you eat! Edible instrument treats that play tunes when chewed.',
-        base_price: 600,
-        mass: 3000,
+        base_price: 60,
+        mass: 14000,
     },
     {
         id: 5,
         name: 'SunPods',
         description: 'Miniature suns in your pocket providing on-demand light & warmth.',
-        base_price: 800,
-        mass: 1000,
-    },
-    {
-        id: 6,
-        name: 'Fuzzix',
-        description: 'Pocket-sized quantum fluff generator for instant comfy.',
-        base_price: 1000,
-        mass: 4000,
+        base_price: 80,
+        mass: 19000,
     },
+    // {
+    //     id: 6,
+    //     name: 'Fuzzix',
+    //     description: 'Pocket-sized quantum fluff generator for instant comfy.',
+    //     base_price: 100,
+    //     mass: 24000,
+    // },
     {
         id: 7,
         name: 'GlowGo',
         description: 'Ingestible bioluminescent jelly, your inside glows in the dark!',
         base_price: 140,
-        mass: 10000,
-    },
-    {
-        id: 8,
-        name: 'KrackleKaps',
-        description: 'Capsules packed with tiny firecrackers, spice up meals and parties.',
-        base_price: 180,
-        mass: 2000,
+        mass: 33500,
     },
+    // {
+    //     id: 8,
+    //     name: 'KrackleKaps',
+    //     description: 'Capsules packed with tiny firecrackers, spice up meals and parties.',
+    //     base_price: 180,
+    //     mass: 43500,
+    // },
     {
         id: 9,
         name: 'PlasmaMints',
         description: 'Hypercharged candy giving plasma breath capable of cutting through steel.',
         base_price: 220,
-        mass: 500,
+        mass: 53500,
     },
     {
         id: 10,
         name: 'TimeTreats',
         description: 'Confectionery morsels releasing slow-mo effect over a limited period.',
         base_price: 250,
-        mass: 3000,
+        mass: 60500,
     },
     {
         id: 11,
@@ -79,28 +79,28 @@ const goods: GoodType[] = [
         description:
             'Bottled hyper-fluid quenching thirst across multiple parallel realities simultaneously.',
         base_price: 300,
-        mass: 6000,
-    },
-    {
-        id: 12,
-        name: 'TransmatterTruffles',
-        description: 'Delectable chocolates instantly teleporting consumers short distances.',
-        base_price: 350,
-        mass: 4000,
+        mass: 73000,
     },
+    // {
+    //     id: 12,
+    //     name: 'TransmatterTruffles',
+    //     description: 'Delectable chocolates instantly teleporting consumers short distances.',
+    //     base_price: 350,
+    //     mass: 85500,
+    // },
     {
         id: 13,
         name: 'MemoryGum',
         description: 'Chewable gum storing or replaying memories while being chewed.',
         base_price: 400,
-        mass: 500,
+        mass: 97500,
     },
     {
         id: 14,
         name: 'SymbioSnack',
         description: 'Edible alien larvae adopting owner’s taste preference upon consumption.',
         base_price: 500,
-        mass: 10000,
+        mass: 12250,
     },
 ]
 

package/src/travel.ts

@@ -11,13 +11,14 @@ import {
 
 import {PlatformContract, ServerContract} from './contracts'
 import {hash512} from './hash'
-import {Distance, PRECISION} from './types'
+import {Distance, PRECISION, TRAVEL_MAXMASS_PENALTY} from './types'
 import {getGood} from './goods'
 
 export function travelplanDuration(travelplan: ServerContract.Types.travel_plan) {
     return UInt32.from(travelplan.flighttime)
         .adding(travelplan.rechargetime)
         .adding(travelplan.loadtime)
+        .adding(travelplan.masspenalty)
 }
 
 export function distanceTraveled(
@@ -132,6 +133,7 @@ export function travelplan(
     const loadtime = calc_ship_loadtime(ship, cargos)
     const flighttime = calc_ship_flighttime(ship, mass, distance)
     const rechargetime = recharge ? calc_ship_rechargetime(ship) : 0
+    const masspenalty = calc_mass_penalty(ship, mass)
     const energyusage = calc_energyusage(distance, ship.stats.drain) // Energy usage from ship and flighttime
 
     return ServerContract.Types.travel_plan.from({
@@ -141,12 +143,22 @@ export function travelplan(
         loadtime,
         flighttime,
         rechargetime,
+        masspenalty,
         // TODO: Remove below, used for debugging
         energyusage,
         mass,
     })
 }
 
+export function calc_mass_penalty(ship: ServerContract.Types.ship_row, mass: UInt64Type): UInt32 {
+    const current = Number(mass)
+    const maximum = Number(ship.stats.maxmass)
+    if (mass > ship.stats.maxmass) {
+        return UInt32.from(((current - maximum) / 1000 / PRECISION) * TRAVEL_MAXMASS_PENALTY)
+    }
+    return UInt32.from(0)
+}
+
 export function calc_rechargetime(
     capacity: UInt32Type,
     energy: UInt32Type,
@@ -173,7 +185,7 @@ export function calc_ship_loadtime(
     const mass_load = UInt64.from(0)
     const mass_unload = UInt64.from(0)
     for (const cargo of cargos) {
-        const cargo_delta = Number(cargo.quantity) - Number(cargo.loaded)
+        const cargo_delta = Number(cargo.owned) - Number(cargo.loaded)
         if (cargo_delta !== 0) {
             const good_mass = getGood(cargo.good_id).mass
             const cargo_mass = good_mass.multiplying(Math.abs(cargo_delta))
@@ -242,7 +254,7 @@ export function calc_ship_mass(
     }
 
     for (const cargo of cargos) {
-        mass.add(getGood(cargo.good_id).mass.multiplying(cargo.quantity))
+        mass.add(getGood(cargo.good_id).mass.multiplying(cargo.owned))
     }
 
     return mass

package/src/types.ts

@@ -2,6 +2,7 @@ import {UInt16, UInt16Type, UInt64, UInt64Type} from '@wharfkit/antelope'
 import {ServerContract} from './contracts'
 
 export const PRECISION = 10000
+export const TRAVEL_MAXMASS_PENALTY = 5 // Penalty (in seconds) for exceeding the maximum mass per 1000 unit
 
 export interface CameraPosition extends ServerContract.ActionParams.Type.coordinates {
     z: number