From 540cadbef1f4c4be3d1f239f9a9cfc01ee3930ff Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 21 Jun 2026 13:51:26 +0100 Subject: [PATCH] Treat trade purchase as submitted intent --- Aetheria.State.Verify/Program.cs | 18 ++++++++++++++++++ Assets/Scripts/UI/Menu/TradeMenu.cs | 12 ++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 9752be6ae..ae38cca02 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -9311,6 +9311,24 @@ static void RequireTradePurchaseRequestAuthority(string root) throw new InvalidOperationException("TradeMenu no longer routes purchases through ActionGameManager."); } + var forbiddenSubmissionAcceptanceSymbols = new[] + { + "if (!GameManager.RequestTradePurchase(", + "\"Purchase request rejected!\"" + }; + var submissionAcceptanceHits = File.ReadLines(tradeMenuPath) + .Select((line, index) => new { LineNumber = index + 1, Line = line }) + .Where(line => forbiddenSubmissionAcceptanceSymbols.Any(symbol => line.Line.Contains(symbol, StringComparison.Ordinal))) + .Select(line => $"{Path.GetRelativePath(root, tradeMenuPath)}:{line.LineNumber}: {line.Line.Trim()}") + .ToArray(); + + if (submissionAcceptanceHits.Length > 0) + { + throw new InvalidOperationException( + "TradeMenu still treats daemon purchase submission as accepted or rejected purchase state: " + + string.Join("; ", submissionAcceptanceHits)); + } + var firstTradeRequest = tradeMenu.IndexOf("GameManager.RequestTradePurchase", StringComparison.Ordinal); var firstCreditRefreshAfterRequest = tradeMenu.IndexOf("UpdateCreditsLabel();", firstTradeRequest, StringComparison.Ordinal); if (firstTradeRequest >= 0 && firstCreditRefreshAfterRequest >= 0) diff --git a/Assets/Scripts/UI/Menu/TradeMenu.cs b/Assets/Scripts/UI/Menu/TradeMenu.cs index 64e5efc79..2b74af3fe 100644 --- a/Assets/Scripts/UI/Menu/TradeMenu.cs +++ b/Assets/Scripts/UI/Menu/TradeMenu.cs @@ -419,11 +419,7 @@ public class TradeMenu : MonoBehaviour return; } - if (!GameManager.RequestTradePurchase(Inventory, _targetCargo, item, price, isShipHull)) - { - ShowUnableToBuy("Purchase request rejected!"); - return; - } + GameManager.RequestTradePurchase(Inventory, _targetCargo, item, price, isShipHull); } @@ -437,11 +433,7 @@ public class TradeMenu : MonoBehaviour } var price = typedItem.Price; - if (!GameManager.RequestTradePurchase(Inventory, _targetCargo, simpleCommodity, quantity, price)) - { - ShowUnableToBuy("Purchase request rejected!"); - return; - } + GameManager.RequestTradePurchase(Inventory, _targetCargo, simpleCommodity, quantity, price); }