fix: increase TradeBehavior::BUY_THRESHOLD (#549)

Author: ferreira-tb

Cargo.lock

@@ -23,7 +23,7 @@ members = [
 
 [workspace.package]
 description = "Multiplayer strategy game"
-version = "0.7.16"
+version = "0.7.17"
 edition = "2024"
 rust-version = "1.99"
 license = "AGPL-3.0-only"

Cargo.toml

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2.0.0",
   "productName": "Call of Nil",
-  "version": "0.7.16",
+  "version": "0.7.17",
   "identifier": "tsukilabs.nil",
   "build": {
     "beforeDevCommand": "pnpm run -F app dev",

app/src-tauri/tauri.conf.json

@@ -24,7 +24,7 @@ pub struct TradeBehavior {
 }
 
 impl TradeBehavior {
-  pub const BUY_THRESHOLD: f64 = 0.1;
+  pub const BUY_THRESHOLD: f64 = 0.3;
   pub const SELL_THRESHOLD: f64 = 0.9;
 }
 
@@ -84,19 +84,26 @@ impl Behavior for TradeBehavior {
 
       let in_vault = vault.get(id).as_u32();
 
-      if in_vault > 0 && gold > 0 && amount < capacity * Self::BUY_THRESHOLD {
+      if in_vault > 0 && gold > 0 && amount < (capacity * Self::BUY_THRESHOLD) {
         match id {
           ResourceId::Food => push!(BuyResourcesBehavior, Food),
           ResourceId::Iron => push!(BuyResourcesBehavior, Iron),
           ResourceId::Stone => push!(BuyResourcesBehavior, Stone),
           ResourceId::Wood => push!(BuyResourcesBehavior, Wood),
         }
-      } else if amount > capacity * Self::SELL_THRESHOLD {
-        match id {
-          ResourceId::Food => push!(SellResourcesBehavior, Food),
-          ResourceId::Iron => push!(SellResourcesBehavior, Iron),
-          ResourceId::Stone => push!(SellResourcesBehavior, Stone),
-          ResourceId::Wood => push!(SellResourcesBehavior, Wood),
+      } else {
+        let threshold = capacity * Self::SELL_THRESHOLD;
+        let surplus = (amount - threshold).floor().max(0.0) as u32;
+        if surplus > 0
+          && in_vault.saturating_add(surplus) < u32::MAX
+          && gold.saturating_add(surplus) < u32::MAX
+        {
+          match id {
+            ResourceId::Food => push!(SellResourcesBehavior, Food),
+            ResourceId::Iron => push!(SellResourcesBehavior, Iron),
+            ResourceId::Stone => push!(SellResourcesBehavior, Stone),
+            ResourceId::Wood => push!(SellResourcesBehavior, Wood),
+          }
         }
       }
     }

crates/nil-core/src/behavior/impl/trade.rs

@@ -1,6 +1,6 @@
 {
   "name": "docs",
-  "version": "0.7.16",
+  "version": "0.7.17",
   "type": "module",
   "packageManager": "pnpm@11.20.0",
   "license": "AGPL-3.0-only",

docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nil",
-  "version": "0.7.16",
+  "version": "0.7.17",
   "type": "module",
   "packageManager": "pnpm@11.20.0",
   "license": "AGPL-3.0-only",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsukilabs/nil-bindings",
-  "version": "0.7.16",
+  "version": "0.7.17",
   "description": "TypeScript bindings for Call of Nil",
   "type": "module",
   "packageManager": "pnpm@11.20.0",

packages/bindings/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsukilabs/nil-ffi",
-  "version": "0.7.16",
+  "version": "0.7.17",
   "description": "FFI bindings for Call of Nil",
   "type": "module",
   "packageManager": "pnpm@11.20.0",

packages/ffi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsukilabs/nil-i18n",
-  "version": "0.7.16",
+  "version": "0.7.17",
   "description": "Internationalization support for Call of Nil",
   "type": "module",
   "packageManager": "pnpm@11.20.0",