From c4be47cad9a1715fbc5faadfb38095fb7d01abc3 Mon Sep 17 00:00:00 2001
From: Meta Vens <rwvens@hotmail.com>
Date: Sun, 14 Jun 2026 04:02:54 +0100
Subject: [PATCH] Use typed trade rows for buy decisions

---
 .voidbot/state/aetheria.cc           | Bin 61161 -> 61423 bytes
 Assets/Scripts/UI/Menu/TradeMenu.cs  |  54 ++++++++++++++++++++-------
 docs/aetheria-perfect-machine-map.md |  11 +++++-
 3 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc
index 1fe5d7288a4cb9190a215716a8f2ee0a79164c17..5a38d51818ee3f5701801546df6827d1914963b8 100644
GIT binary patch
delta 1350
zcmZuxPiS047&qCfZIYsBn?)q$!$xas_GNdQe<tF=1Z!GSOWIRzllQ*e9ei(QnVGkn
z^<Y5h!IQ{%@upa<_y;VnikIR^@Zg~r4}nUN=s_r`HxUnhGjHE!Md2NWZ)U#VpYQkP
z*B?v2-7S4_ZFJ)7a<#r(T@2=)UEF$m<hcEI^v$uNHea=Wl*(3?b_U1hYjuC@@S&;E
zyEn5_hx9`B=|_*AwQnt7Ew5ZrEW!;GDQu@bh%n@uOJOfuhe;*7I`}Y*8Bg}^4bIt-
zkB{xf*koZ3)(s|W%rIz31)*XMgVC(!Njt`WwbKEt=DWb@3bYjuaRzjYw=1nQj)6e5
z<_#V)L+G@V_XuT@$cURBY%`6;H73qP|2>hg9ngk_uK?XbXegP0X`%gT<%uOy5?nVZ
zoV2~K)<p+}k*WtqF`*l%aw>FDXrt0F=fFf{Z-0G!R~t?Yw=tHY2}Xj9BUGSLVL0K)
zu0W+%2#RY6Qv*`OJy4j)4r=K8w07lXV5w<I<+ONe&g~|trJe-jrMY!603F<5p2xa9
ze{Xy`doeYsLKsZJL1{8jrf~#@sU{jv*7Yi=73yY(b@d68^U&qQh!`u><c32(hsKSw
z;@r+T(Ui#8iZ^x!Xv+UHE@(5;(!nQ8gkvOe6C3)@eLQPF|NVrW`ts;uw!y*{7ii^o
zQ_l^jY>12JjS1tz@hB7|squm6AIy3el4l-#;{%0_y_2?fdTE!vkoKPLN6UqAod!rW
z@bnD0oy$H(t3`^a>TtY?n-qylE`}tZk%hfBDW>?bSQ5VMLW5%*>EJW$@Cd18E^94E
zpN?dxXPN!$=E>}-?%!iiZeF4QQ-{0{kuV4yRD(!+v+ap`d9stnlo+<nW0wUMb-1P|
zX6IjDePrZ}y)paPL!RWTs3f3LQe{89^XGVw<DOE@p$zoX<t)`96Hu?#7b?|-N^Q<Q
z{O)9uT$FH*CAh%^YoZFALB+a1=^2Pfa&AO_y}@=ayWhx9`z880{SWRi+?b)oDR&fa
zniSAC2&AnpmF@m})5nUJXl}8#b<MD*&%)#HU%mh6=hUQ91U$R7H*sWq=&-$ADj&RA
u^ZC;@v488Jwovo$m@GYDf8S4r>hr$-+RwW~wIx@}PW<xCk%Qu5ed`~MH0;L!

delta 1187
zcmZ`(J8KkC6gCe<NfZfDv4|XvqUdHfo6U1$p+wO|d?4BcEbh*n*||D%?{M#(O*VyT
zw6GGHzo3XgL>R0@Y!pNkEVMBAXjHJ$PVGE1`xIg`3?KJ==li~MI6pr3eE-<<@OF3q
zSaBj>92?6P3KR3Uy0%5nyKl6y@zE6f`DH^C_NWegGQ~Ic4t0Ne5by8RlhONCHv%yL
zc+@gnijgu?U`e4vpOrlXTgd>*T-ed2ox{<=Bb!IrQVl$;FslZPN~$a=%igg(#{Jc<
z!*!Yy%*WGAunMZ^=j`CjT#K<}&_Biu17_0tM$5F1;XY=eWI&;oUKKU4=&;<gZ-E;Z
zEM~AGRSnkS5;jEB_lB2UVl}k@ZBTMywyATC3a*<?Z1C6;_i7*oeH^Laf~qAh$QiaP
zfl-gtFpk)vN?n7)JuiFLpwN`T`<HXeEt`OjgO<@5Xg$V7w8A8;Ov=SADIj3RC6@|8
zNCP!&sSiaG2Ix>Z%tD>*a1HfJB`;G0q66~ca@$4$CDP@h0^>3P4)Z)NDo|$D6)>_H
zMk(o=(0h%fQaXpDXV;Z5qOzmi!Qk@aGq`9vw}JF)(5?(U%EGoA1Vq?em%8g*({t`0
zZVFIgIpkD)ocfzu_CHB08PZ#GDjlRYG=~gXB7X{fS;gc(8QPkw&{!RnU17p<r8<v}
z{;<xCe+94lqs-8jT<&6E6C-ILri&$Dp`mA_27DHzlM$)w&;Z4UasH}*XzP8fatheO
zI^A4+b|uqy;J`ViH8IsUjuw=8vXV;$LlqTwIAJuQ`1PZ?fs>`iYv!1AL<n32p&2PB
zZW%4MEv?W;L4K2|Ci@nk(o!%lQ5S@&f<P09XI}j7i}KUkqd#x=4(5yF<Hf>gwlF<5
zf7`H1YBvAw`ug~0aaSRJw%WI;uXQW(6VaQV9qoHCF_qqffiF+m*kqw`J9GzDzcJUo
UF1N9%^v1+{zdha50gliA1u#~wnE(I)

diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs
index 5a642e07d..014525caf 100644
--- a/Assets/Scripts/UI/Menu/TradeMenu.cs
+++ b/Assets/Scripts/UI/Menu/TradeMenu.cs
@@ -435,7 +435,9 @@ public class TradeMenu : MonoBehaviour
             get
             {
                 if (Item is CraftedItemInstance craftedItemInstance)
-                    return _itemManager.GetPrice(craftedItemInstance);
+                    return TypedItem != null
+                        ? (int)(_itemManager.GameplaySettings.QualityPriceModifier.Evaluate(craftedItemInstance.Quality) * TypedItem.Price)
+                        : 0;
 
                 return TypedItem != null ? TypedItem.Price : 0;
             }
@@ -479,18 +481,25 @@ public class TradeMenu : MonoBehaviour
 
     private void Buy(CraftedItemInstance item)
     {
-        var data = GameManager.ItemManager.GetData(item);
-        var price = GameManager.ItemManager.GetPrice(item);
+        var typedItem = FindTypedTradeItem(item);
+        if (typedItem == null)
+        {
+            ShowUnableToBuy("Missing typed trade row!");
+            return;
+        }
+
+        var price = GetTypedTradePrice(item, typedItem);
         if (price < GameManager.Credits)
         {
-            if (data is HullData hullData)
+            if (!string.IsNullOrWhiteSpace(typedItem?.HullType))
             {
-                if (hullData.HullType != HullType.Ship) throw new ArgumentException("Attempted to buy non-ship hull from station, WTF are you doing?!");
+                if (!string.Equals(typedItem.HullType, nameof(HullType.Ship), StringComparison.Ordinal))
+                    throw new ArgumentException("Attempted to buy non-ship hull from station, WTF are you doing?!");
 
                 var ship = new Ship(GameManager.ItemManager, GameManager.Zone, item as EquippableItem, GameManager.NewEntitySettings) { IsPlayerShip = true };
                 ship.SetParent(GameManager.DockedEntity);
 
-                GameManager.Credits -= data.Price;
+                GameManager.Credits -= price;
                 UpdateCreditsLabel();
             }
             else if (Inventory.TryTransferItem(_targetCargo, item))
@@ -519,18 +528,26 @@ public class TradeMenu : MonoBehaviour
 
     private void Buy(SimpleCommodity simpleCommodity, int quantity)
     {
-        var data = GameManager.ItemManager.GetData(simpleCommodity);
+        var typedItem = FindTypedTradeItem(simpleCommodity);
+        if (typedItem == null)
+        {
+            ShowUnableToBuy("Missing typed trade row!");
+            return;
+        }
+
+        var maxStack = typedItem.MaxStack > 0 ? typedItem.MaxStack : 1;
+        var price = typedItem.Price;
         // Up-rounded integer division from https://stackoverflow.com/a/503201
-        int lots = (quantity - 1) / data.MaxStack + 1;
+        int lots = (quantity - 1) / maxStack + 1;
         int remaining = quantity;
         for (int i = 0; i < lots; i++)
         {
-            int q = min(remaining, data.MaxStack);
-            if (q * data.Price < GameManager.Credits)
+            int q = min(remaining, maxStack);
+            if (q * price < GameManager.Credits)
             {
                 if (Inventory.TryTransferItem(_targetCargo, simpleCommodity, quantity))
                 {
-                    GameManager.Credits -= q * data.Price;
+                    GameManager.Credits -= q * price;
                     UpdateCreditsLabel();
                     remaining -= q;
                 }
@@ -551,11 +568,22 @@ public class TradeMenu : MonoBehaviour
                 Dialog.MoveToCursor();
                 return;
             }
-
-            
         }
     }
 
+    private int GetTypedTradePrice(CraftedItemInstance item, AetheriaRuntimeCatalogItem typedItem)
+    {
+        return (int)(GameManager.ItemManager.GameplaySettings.QualityPriceModifier.Evaluate(item.Quality) * typedItem.Price);
+    }
+
+    private void ShowUnableToBuy(string reason)
+    {
+        Dialog.Clear();
+        Dialog.Title.text = $"Unable to buy: {reason}";
+        Dialog.Show();
+        Dialog.MoveToCursor();
+    }
+
     void Start()
     {
         FoldoutButton.onClick.AddListener(() =>
diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md
index e5464957a..4a3e5fc2f 100644
--- a/docs/aetheria-perfect-machine-map.md
+++ b/docs/aetheria-perfect-machine-map.md
@@ -156,7 +156,11 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted.
   wraps rows in a typed `TradeRow`: name, mass, price, size, hardpoint type,
   commodity subtype, hull ownership, and behavior-kind filters read typed
   catalog rows before any legacy projection is hydrated. Legacy `ItemData`
-  hydration is lazy and bounded to behavior reflection columns and buy actions.
+  hydration is lazy and bounded to behavior reflection columns. Trade buy
+  decisions for crafted price, ship-hull classification, simple commodity base
+  price, and simple commodity stack size now read typed catalog rows; the
+  existing inventory transfer and ship-construction paths still own the actual
+  runtime mutation.
   The sector properties UI also resolves
   station/turret/ship counts only through typed hull classifications from the runtime catalog;
   missing typed hull rows no longer fall back to legacy `HullData`. Loot pickup
@@ -640,7 +644,10 @@ First Aetheria surfaces to publish:
    - Done: move trade menu row presentation for name, mass, price, size,
      hardpoint type, commodity subtype, hull-owned counts, and behavior-kind
      filtering onto typed `TradeRow` fields; legacy `ItemData` hydration is
-     lazy and bounded to behavior reflection columns and buy mechanics.
+     lazy and bounded to behavior reflection columns.
+   - Done: move trade menu buy price, ship-hull classification, and simple
+     commodity stack-size decisions onto typed catalog rows; inventory transfer
+     and ship construction remain the runtime mutation owners.
    - Done: move action-bar consumable drop binding onto typed catalog rows;
      legacy `ConsumableItemData` resolution is lazy and bounded to activation
      and active-duration fill until typed consumable effect execution exists.