@shipload/sdk 1.0.0-next.46 → 1.0.0-next.48

package/src/derivation/crafting.ts

@@ -141,16 +141,20 @@ export function computeEntityStats(
     }
 
     return recipe.statSlots.map((slot) => {
-        const src = slot.sources[0]
-        const key = keyForStatSlot(recipe, slot)
-        if (!src) return {key, value: 1}
-        const input = recipe.inputs[src.inputIndex]
-        if (!input) {
-            return {key, value: 1}
+        const slotKey = keyForStatSlot(recipe, slot)
+        if (slot.sources.length === 0) return {key: slotKey, value: 1}
+        let weightedSum = 0
+        let totalWeight = 0
+        for (const src of slot.sources) {
+            const key = keyForRecipeInputStat(recipe, src.inputIndex, src.statIndex)
+            const input = recipe.inputs[src.inputIndex]
+            if (!input) continue
+            const weight = recipe.blendWeights?.[src.inputIndex] ?? 1
+            weightedSum += (blendedByComponent[input.itemId]?.[key] ?? 0) * weight
+            totalWeight += weight
         }
-        const blended = blendedByComponent[input.itemId] ?? {}
-        const value = blended[key] ?? 0
-        return {key, value: Math.max(1, Math.min(999, value))}
+        const value = totalWeight > 0 ? Math.floor(weightedSum / totalWeight) : 0
+        return {key: slotKey, value: Math.max(1, Math.min(999, value))}
     })
 }
 
@@ -293,7 +297,7 @@ export function computeCraftedOutputStats(
             out.push(0)
             continue
         }
-        if (slot.sources.length === 1 || recipe.blendWeights.length === 0) {
+        if (slot.sources.length === 1) {
             const src = slot.sources[0]
             const key = keyForRecipeInputStat(recipe, src.inputIndex, src.statIndex)
             const input = recipe.inputs[src.inputIndex]

package/src/derivation/index.ts

@@ -44,6 +44,7 @@ export type {EffectiveReserveInput} from './reserve-regen'
 
 export * from './stats'
 export * from './crafting'
+export * from './upgrades'
 
 export {
     STAR_STEP,

package/src/derivation/upgrades.ts

@@ -0,0 +1,14 @@
+import recipes from '../data/recipes.json'
+import type {Recipe} from '../data/recipes-runtime'
+
+const bySource = new Map<number, Recipe[]>()
+for (const r of recipes as Recipe[]) {
+    if (r.sourceSubclass === undefined) continue
+    const list = bySource.get(r.sourceSubclass) ?? []
+    list.push(r)
+    bySource.set(r.sourceSubclass, list)
+}
+
+export function eligibleUpgrades(entityItemId: number): Recipe[] {
+    return bySource.get(entityItemId) ?? []
+}

package/src/index-module.ts

@@ -150,6 +150,8 @@ export type {ReserveTier, TierRange} from './derivation'
 export {getEffectiveReserve} from './derivation'
 export type {EffectiveReserveInput} from './derivation'
 
+export {eligibleUpgrades} from './derivation'
+
 export {getStatDefinitions, getStatName, resolveStats} from './derivation'
 export type {StatDefinition, NamedStats} from './derivation'
 

package/src/managers/actions.ts

@@ -447,6 +447,25 @@ export class ActionsManager extends BaseManager {
         })
     }
 
+    upgrade(
+        builderId: UInt64Type,
+        targetId: UInt64Type,
+        targetItemId: UInt16Type,
+        inputs: ServerContract.ActionParams.Type.cargo_item[],
+        slot?: UInt8Type
+    ): Action {
+        const params: ServerContract.ActionParams.upgrade = {
+            builder_id: UInt64.from(builderId),
+            target_id: UInt64.from(targetId),
+            target_item_id: UInt16.from(targetItemId),
+            inputs,
+        }
+        if (slot !== undefined) {
+            params.slot = UInt8.from(slot)
+        }
+        return this.server.action('upgrade', params)
+    }
+
     claimplot(entityId: UInt64Type, targetItemId: UInt16Type, slot: ClusterSlotType): Action {
         return this.server.action('claimplot', {
             builder_id: UInt64.from(entityId),

package/src/nft/description.ts

@@ -22,7 +22,9 @@ import {
     ITEM_GENERATOR_T1,
     ITEM_HAULER_SHIP_T2_PACKED,
     ITEM_HAULER_T1,
+    ITEM_HAULER_T2,
     ITEM_BATTERY_T1,
+    ITEM_LAUNCHER_T1,
     ITEM_LOADER_T1,
     ITEM_PROSPECTOR_T2_PACKED,
     ITEM_SHIP_T1_PACKED,
@@ -102,7 +104,7 @@ export const computeBatteryBankCapacity = (
 export function entityDisplayName(itemId: number): string {
     switch (itemId) {
         case ITEM_SHIP_T1_PACKED:
-            return 'Ship'
+            return 'Roustabout'
         case ITEM_WAREHOUSE_T1_PACKED:
             return 'Warehouse'
         case ITEM_EXTRACTOR_T1_PACKED:
@@ -127,11 +129,10 @@ export function moduleDisplayName(itemId: number): string {
         case ITEM_ENGINE_T1:
             return 'Engine'
         case ITEM_GENERATOR_T1:
-            return 'Reactor'
+            return 'Power Core'
         case ITEM_GATHERER_T1:
-            return 'Limpet Bay'
         case ITEM_GATHERER_T2:
-            return 'Gatherer (T2)'
+            return 'Limpet Bay'
         case ITEM_LOADER_T1:
             return 'Shuttle Bay'
         case ITEM_CRAFTER_T1:
@@ -139,11 +140,14 @@ export function moduleDisplayName(itemId: number): string {
         case ITEM_STORAGE_T1:
             return 'Cargo Hold'
         case ITEM_HAULER_T1:
+        case ITEM_HAULER_T2:
             return 'Tractor Beam'
         case ITEM_WARP_T1:
             return 'Warp Drive'
         case ITEM_BATTERY_T1:
             return 'Battery Bank'
+        case ITEM_LAUNCHER_T1:
+            return 'Drive Coil'
         default:
             return 'Module'
     }

package/src/types.ts

@@ -64,6 +64,8 @@ export enum TaskType {
     DEMOLISH = 13,
     CLAIMPLOT = 14,
     BUILDPLOT = 15,
+    CHARGE = 16,
+    UPGRADE = 17,
 }
 
 export enum HoldKind {
@@ -71,6 +73,7 @@ export enum HoldKind {
     PUSH = 2,
     GATHER = 3,
     BUILD = 4,
+    UPGRADE = 6,
 }
 
 export enum LocationType {