@shipload/sdk 1.0.0-next.32 → 1.0.0-next.33

package/lib/testing.js

@@ -3174,7 +3174,7 @@ var items = [
 	},
 	{
 		id: 10002,
-		mass: 6000,
+		mass: 4000,
 		type: "component",
 		tier: 1
 	},
@@ -3186,13 +3186,13 @@ var items = [
 	},
 	{
 		id: 10004,
-		mass: 6000,
+		mass: 4000,
 		type: "component",
 		tier: 1
 	},
 	{
 		id: 10005,
-		mass: 6000,
+		mass: 4000,
 		type: "component",
 		tier: 1
 	},
@@ -3216,106 +3216,106 @@ var items = [
 	},
 	{
 		id: 10009,
-		mass: 6000,
+		mass: 4000,
 		type: "component",
 		tier: 1
 	},
 	{
 		id: 10010,
-		mass: 6000,
+		mass: 4000,
 		type: "component",
 		tier: 1
 	},
 	{
 		id: 10100,
-		mass: 900000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "engine"
 	},
 	{
 		id: 10101,
-		mass: 1400000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "generator"
 	},
 	{
 		id: 10102,
-		mass: 1200000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "gatherer"
 	},
 	{
 		id: 10103,
-		mass: 1000000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "loader"
 	},
 	{
 		id: 10104,
-		mass: 1200000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "crafter"
 	},
 	{
 		id: 10105,
-		mass: 1200000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "storage"
 	},
 	{
 		id: 10106,
-		mass: 1400000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "hauler"
 	},
 	{
 		id: 10107,
-		mass: 1400000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "warp"
 	},
 	{
 		id: 10108,
-		mass: 1000000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "battery"
 	},
 	{
 		id: 10200,
-		mass: 1500000,
+		mass: 1300000,
 		type: "entity",
 		tier: 1
 	},
 	{
 		id: 10201,
-		mass: 2300000,
+		mass: 1900000,
 		type: "entity",
 		tier: 1
 	},
 	{
 		id: 10202,
-		mass: 5800000,
+		mass: 4800000,
 		type: "entity",
 		tier: 1
 	},
 	{
 		id: 10203,
-		mass: 4400000,
+		mass: 3700000,
 		type: "entity",
 		tier: 1
 	},
 	{
 		id: 10204,
-		mass: 5500000,
+		mass: 4600000,
 		type: "entity",
 		tier: 1
 	},

package/lib/testing.m.js

@@ -3170,7 +3170,7 @@ var items = [
 	},
 	{
 		id: 10002,
-		mass: 6000,
+		mass: 4000,
 		type: "component",
 		tier: 1
 	},
@@ -3182,13 +3182,13 @@ var items = [
 	},
 	{
 		id: 10004,
-		mass: 6000,
+		mass: 4000,
 		type: "component",
 		tier: 1
 	},
 	{
 		id: 10005,
-		mass: 6000,
+		mass: 4000,
 		type: "component",
 		tier: 1
 	},
@@ -3212,106 +3212,106 @@ var items = [
 	},
 	{
 		id: 10009,
-		mass: 6000,
+		mass: 4000,
 		type: "component",
 		tier: 1
 	},
 	{
 		id: 10010,
-		mass: 6000,
+		mass: 4000,
 		type: "component",
 		tier: 1
 	},
 	{
 		id: 10100,
-		mass: 900000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "engine"
 	},
 	{
 		id: 10101,
-		mass: 1400000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "generator"
 	},
 	{
 		id: 10102,
-		mass: 1200000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "gatherer"
 	},
 	{
 		id: 10103,
-		mass: 1000000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "loader"
 	},
 	{
 		id: 10104,
-		mass: 1200000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "crafter"
 	},
 	{
 		id: 10105,
-		mass: 1200000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "storage"
 	},
 	{
 		id: 10106,
-		mass: 1400000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "hauler"
 	},
 	{
 		id: 10107,
-		mass: 1400000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "warp"
 	},
 	{
 		id: 10108,
-		mass: 1000000,
+		mass: 960000,
 		type: "module",
 		tier: 1,
 		subtype: "battery"
 	},
 	{
 		id: 10200,
-		mass: 1500000,
+		mass: 1300000,
 		type: "entity",
 		tier: 1
 	},
 	{
 		id: 10201,
-		mass: 2300000,
+		mass: 1900000,
 		type: "entity",
 		tier: 1
 	},
 	{
 		id: 10202,
-		mass: 5800000,
+		mass: 4800000,
 		type: "entity",
 		tier: 1
 	},
 	{
 		id: 10203,
-		mass: 4400000,
+		mass: 3700000,
 		type: "entity",
 		tier: 1
 	},
 	{
 		id: 10204,
-		mass: 5500000,
+		mass: 4600000,
 		type: "entity",
 		tier: 1
 	},

package/package.json

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

package/src/capabilities/gathering.ts

@@ -6,23 +6,33 @@ const GATHER_TIME_SCALE = 100
 const GATHER_MASS_DIVISOR = 228
 const DEPTH_PENALTY_DIVISOR = 5000
 
-export function calc_gather_duration(
+function gather_duration_raw(
     gatherer: ServerContract.Types.gatherer_stats,
     itemMass: number,
     quantity: number,
     stratum: number,
     richness: number
-): UInt32 {
+): number {
     const yieldValue = gatherer.yield.toNumber()
 
-    if (yieldValue === 0 || richness === 0) return UInt32.from(0)
+    if (yieldValue === 0 || richness === 0) return 0
 
     const massFactor = itemMass / GATHER_MASS_DIVISOR
     const depthPenalty = 1 + stratum / DEPTH_PENALTY_DIVISOR
     const richnessMul = richness / 1000
-    const duration =
-        (quantity * massFactor * GATHER_TIME_SCALE * depthPenalty) / (yieldValue * richnessMul)
-    return UInt32.from(Math.floor(duration))
+    return (quantity * massFactor * GATHER_TIME_SCALE * depthPenalty) / (yieldValue * richnessMul)
+}
+
+export function calc_gather_duration(
+    gatherer: ServerContract.Types.gatherer_stats,
+    itemMass: number,
+    quantity: number,
+    stratum: number,
+    richness: number
+): UInt32 {
+    return UInt32.from(
+        Math.floor(gather_duration_raw(gatherer, itemMass, quantity, stratum, richness))
+    )
 }
 
 export function calc_gather_rate(
@@ -31,10 +41,10 @@ export function calc_gather_rate(
     stratum: number,
     richness: number
 ): {unitsPerSec: number; unitsPerMin: number; secPerUnit: number} {
-    const seconds = calc_gather_duration(gatherer, itemMass, 1, stratum, richness).toNumber()
-    if (seconds <= 0) return {unitsPerSec: 0, unitsPerMin: 0, secPerUnit: 0}
-    const unitsPerSec = 1 / seconds
-    return {unitsPerSec, unitsPerMin: unitsPerSec * 60, secPerUnit: seconds}
+    const secPerUnit = gather_duration_raw(gatherer, itemMass, 1, stratum, richness)
+    if (secPerUnit <= 0) return {unitsPerSec: 0, unitsPerMin: 0, secPerUnit: 0}
+    const unitsPerSec = 1 / secPerUnit
+    return {unitsPerSec, unitsPerMin: unitsPerSec * 60, secPerUnit}
 }
 
 export function calc_gather_energy(

package/src/data/items.json

@@ -357,7 +357,7 @@
   },
   {
     "id": 10002,
-    "mass": 6000,
+    "mass": 4000,
     "type": "component",
     "tier": 1
   },
@@ -369,13 +369,13 @@
   },
   {
     "id": 10004,
-    "mass": 6000,
+    "mass": 4000,
     "type": "component",
     "tier": 1
   },
   {
     "id": 10005,
-    "mass": 6000,
+    "mass": 4000,
     "type": "component",
     "tier": 1
   },
@@ -399,106 +399,106 @@
   },
   {
     "id": 10009,
-    "mass": 6000,
+    "mass": 4000,
     "type": "component",
     "tier": 1
   },
   {
     "id": 10010,
-    "mass": 6000,
+    "mass": 4000,
     "type": "component",
     "tier": 1
   },
   {
     "id": 10100,
-    "mass": 900000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "engine"
   },
   {
     "id": 10101,
-    "mass": 1400000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "generator"
   },
   {
     "id": 10102,
-    "mass": 1200000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "gatherer"
   },
   {
     "id": 10103,
-    "mass": 1000000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "loader"
   },
   {
     "id": 10104,
-    "mass": 1200000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "crafter"
   },
   {
     "id": 10105,
-    "mass": 1200000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "storage"
   },
   {
     "id": 10106,
-    "mass": 1400000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "hauler"
   },
   {
     "id": 10107,
-    "mass": 1400000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "warp"
   },
   {
     "id": 10108,
-    "mass": 1000000,
+    "mass": 960000,
     "type": "module",
     "tier": 1,
     "subtype": "battery"
   },
   {
     "id": 10200,
-    "mass": 1500000,
+    "mass": 1300000,
     "type": "entity",
     "tier": 1
   },
   {
     "id": 10201,
-    "mass": 2300000,
+    "mass": 1900000,
     "type": "entity",
     "tier": 1
   },
   {
     "id": 10202,
-    "mass": 5800000,
+    "mass": 4800000,
     "type": "entity",
     "tier": 1
   },
   {
     "id": 10203,
-    "mass": 4400000,
+    "mass": 3700000,
     "type": "entity",
     "tier": 1
   },
   {
     "id": 10204,
-    "mass": 5500000,
+    "mass": 4600000,
     "type": "entity",
     "tier": 1
   },