From a13a8e0d1e59d326e7aec1ec0c1284b08bf92c07 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 21 Jun 2026 11:59:17 +0100 Subject: [PATCH] Let daemon resolve cargo source positions --- Aetheria.State.Verify/Program.cs | 3 +- Assets/Scripts/Gameplay/ActionGameManager.cs | 14 +++--- .../Tests/DaemonRuntimeDocumentTests.cs | 44 +++++++++++++++++++ 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 0ad5c4f9d..d00313ba1 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -8727,7 +8727,8 @@ static void RequireInventoryDoubleClickTransferRequestAuthority(string root) "Cargo.ContainsKey(", "Equipment.Contains(", "origin == destination", - "ReferenceEquals(equippedItem.Entity, origin)" + "ReferenceEquals(equippedItem.Entity, origin)", + "!origin.Cargo.TryGetValue(item, out var sourcePosition)" }; var unityInventoryAcceptanceHits = forbiddenUnityInventoryAcceptanceSymbols .Where(symbol => actionGameManager.Contains(symbol, StringComparison.Ordinal)) diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index bf54bd066..1804d1d0d 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -1105,8 +1105,7 @@ public class ActionGameManager : MonoBehaviour if (!TryResolveCargoBayCommandTarget(origin, out var originEntityKey, out var originCargoIndex) || !TryResolveCargoBayCommandTarget(destination, out var destinationEntityKey, out var destinationCargoIndex) || item == null || - string.IsNullOrWhiteSpace(item.ItemKey) || - !origin.Cargo.TryGetValue(item, out var sourcePosition)) + string.IsNullOrWhiteSpace(item.ItemKey)) { return false; } @@ -1126,8 +1125,8 @@ public class ActionGameManager : MonoBehaviour destinationCargoIndex, item.ItemKey, quantity, - sourcePosition.x, - sourcePosition.y, + int.MinValue, + int.MinValue, destinationPosition.x, destinationPosition.y, hasDestinationPosition); @@ -1248,8 +1247,7 @@ public class ActionGameManager : MonoBehaviour if (!TryResolveCargoBayCommandTarget(origin, out var originEntityKey, out var originCargoIndex) || destination == null || item == null || - string.IsNullOrWhiteSpace(item.ItemKey) || - !origin.Cargo.TryGetValue(item, out var sourcePosition)) + string.IsNullOrWhiteSpace(item.ItemKey)) { return false; } @@ -1268,8 +1266,8 @@ public class ActionGameManager : MonoBehaviour originCargoIndex, destinationEntityKey, item.ItemKey, - sourcePosition.x, - sourcePosition.y, + int.MinValue, + int.MinValue, destinationPosition.x, destinationPosition.y, hasDestinationPosition); diff --git a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs index e9a81c389..2fedc984e 100644 --- a/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs +++ b/Assets/Scripts/Tests/DaemonRuntimeDocumentTests.cs @@ -1581,6 +1581,50 @@ public class DaemonRuntimeDocumentTests Assert.AreEqual(7, cargo[0].Y); } + [Test] + public void DaemonOperationsResolvesCargoSourcePositionWhenClientOmitsIt() + { + var run = RunWithTwoEntities(); + var transfer = AetheriaRuntimeDaemonCommandDocument.Create( + AetheriaRuntimeDaemonCommandKinds.TransferCargoItem, + "codex", + "session-inventory", + 31, + "zone.0.entity.0"); + transfer.TextValue = "ore"; + transfer.CargoTransfer.OriginEntityKey = "zone.0.entity.0"; + transfer.CargoTransfer.OriginCargoIndex = 0; + transfer.CargoTransfer.DestinationEntityKey = "zone.0.entity.1"; + transfer.CargoTransfer.DestinationCargoIndex = 0; + transfer.CargoTransfer.SourceX = int.MinValue; + transfer.CargoTransfer.SourceY = int.MinValue; + + var transferResult = AetheriaRuntimeDaemonOperations.Execute(run, new[] { transfer }); + Assert.AreEqual(1, transferResult.AppliedCommandIds.Count); + Assert.AreEqual(0, run.Zones[0].Entities[0].CargoContents[0].Items.Count); + Assert.AreEqual("ore", run.Zones[0].Entities[1].CargoContents[0].Items[0].Item.ItemKey); + + var equip = AetheriaRuntimeDaemonCommandDocument.Create( + AetheriaRuntimeDaemonCommandKinds.EquipItem, + "codex", + "session-inventory", + 32, + "zone.0.entity.0"); + equip.TextValue = "ore"; + equip.EquipmentTransfer.SourceKind = "cargo"; + equip.EquipmentTransfer.OriginEntityKey = "zone.0.entity.1"; + equip.EquipmentTransfer.OriginIndex = 0; + equip.EquipmentTransfer.DestinationEntityKey = "zone.0.entity.0"; + equip.EquipmentTransfer.SourceX = int.MinValue; + equip.EquipmentTransfer.SourceY = int.MinValue; + + var equipResult = AetheriaRuntimeDaemonOperations.Execute(run, new[] { equip }); + Assert.AreEqual(1, equipResult.AppliedCommandIds.Count); + Assert.AreEqual(3, run.Zones[0].Entities[0].Equipment.Count); + Assert.AreEqual("ore", run.Zones[0].Entities[0].Equipment[2].Item.ItemKey); + Assert.AreEqual(0, run.Zones[0].Entities[1].CargoContents[0].Items.Count); + } + [Test] public void DaemonOperationsEquipsCargoItemInDaemonState() {