From 44bccb7a465e220c3f2885dabfffd006b2718e8c Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Mon, 6 Jul 2026 01:45:49 +0100 Subject: [PATCH] Honor daemon scenario cargo plans --- Aetheria.State.Daemon/AetheriaDaemonZoneGenerator.cs | 11 +++++++---- Aetheria.State.Verify/Program.cs | 11 +++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Aetheria.State.Daemon/AetheriaDaemonZoneGenerator.cs b/Aetheria.State.Daemon/AetheriaDaemonZoneGenerator.cs index b643429fd..c50f71bf2 100644 --- a/Aetheria.State.Daemon/AetheriaDaemonZoneGenerator.cs +++ b/Aetheria.State.Daemon/AetheriaDaemonZoneGenerator.cs @@ -350,7 +350,7 @@ internal static class AetheriaDaemonZoneGenerator _catalog = catalog ?? new AetheriaRuntimeCatalogSnapshot(); } - public DaemonLoadout Build(string entityKind, string factionKey, IReadOnlyList fallbackCargo) + public DaemonLoadout Build(string entityKind, string factionKey, IReadOnlyList scenarioCargo) { var hullType = string.Equals(entityKind, "station", StringComparison.OrdinalIgnoreCase) ? "Station" @@ -359,7 +359,7 @@ internal static class AetheriaDaemonZoneGenerator var equipment = PickEquipment(hull, factionKey) .Select((item, index) => Slot(index, item.ItemKey)) .ToArray(); - var cargo = PickCargo(fallbackCargo) + var cargo = PickCargo(scenarioCargo) .Select((itemKey, index) => CargoSlot(index, itemKey)) .ToArray(); @@ -397,8 +397,11 @@ internal static class AetheriaDaemonZoneGenerator } } - private IEnumerable PickCargo(IReadOnlyList fallbackCargo) + private IEnumerable PickCargo(IReadOnlyList scenarioCargo) { + if (scenarioCargo != null && scenarioCargo.Count > 0) + return scenarioCargo.Where(itemKey => !string.IsNullOrWhiteSpace(itemKey)); + var catalogCargo = _catalog.TradeItems .Where(item => item.MaxStack != 1 || string.Equals(item.Category, AetheriaRuntimeItemCategories.Gear, StringComparison.OrdinalIgnoreCase)) .OrderBy(item => item.Price <= 0 ? int.MaxValue : item.Price) @@ -406,7 +409,7 @@ internal static class AetheriaDaemonZoneGenerator .Select(item => item.ItemKey) .Take(4) .ToArray(); - return catalogCargo.Length > 0 ? catalogCargo : fallbackCargo; + return catalogCargo; } private static int ManufacturerScore(AetheriaRuntimeCatalogItem item, string factionKey) diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index e3e7c53e8..c7e85f325 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -11238,6 +11238,7 @@ static void RequireDaemonVersePublication(string root) var committedFactImporterPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeCommittedFactImporter.cs"); var daemonHostProjectPath = Path.Combine(root, "Aetheria.State.Daemon", "Aetheria.State.Daemon.csproj"); var daemonHostProgramPath = Path.Combine(root, "Aetheria.State.Daemon", "Program.cs"); + var daemonZoneGeneratorPath = Path.Combine(root, "Aetheria.State.Daemon", "AetheriaDaemonZoneGenerator.cs"); var documentRegistryPath = Path.Combine(root, "Aetheria.State", "AetheriaDocumentRegistry.cs"); var stateNodePath = Path.Combine(root, "Aetheria.State", "AetheriaStateNode.cs"); var runtimeSurfaceDocumentsPath = Path.Combine(root, "Packages", "org.gamecult.aetheria.state", "Runtime", "AetheriaRuntimeSurfaceDocuments.cs"); @@ -11264,6 +11265,7 @@ static void RequireDaemonVersePublication(string root) committedFactImporterPath, daemonHostProjectPath, daemonHostProgramPath, + daemonZoneGeneratorPath, documentRegistryPath, stateNodePath, runtimeSurfaceDocumentsPath, @@ -11299,6 +11301,7 @@ static void RequireDaemonVersePublication(string root) var committedFactImporter = File.ReadAllText(committedFactImporterPath); var daemonHostProject = File.ReadAllText(daemonHostProjectPath); var daemonHostProgram = File.ReadAllText(daemonHostProgramPath); + var daemonZoneGenerator = File.ReadAllText(daemonZoneGeneratorPath); var documentRegistry = File.ReadAllText(documentRegistryPath); var stateNode = File.ReadAllText(stateNodePath); var runtimeSurfaceDocuments = File.ReadAllText(runtimeSurfaceDocumentsPath); @@ -11763,6 +11766,14 @@ static void RequireDaemonVersePublication(string root) string.Join(", ", forbiddenTickPublicationHits)); } + if (daemonZoneGenerator.Contains("fallbackCargo", StringComparison.Ordinal) || + !daemonZoneGenerator.Contains("Build(string entityKind, string factionKey, IReadOnlyList scenarioCargo)", StringComparison.Ordinal) || + !daemonZoneGenerator.Contains("if (scenarioCargo != null && scenarioCargo.Count > 0)", StringComparison.Ordinal)) + { + throw new InvalidOperationException( + "Daemon zone generation must treat declared scenario cargo as authored state, not as a catalog-generation fallback."); + } + var requiredDaemonHostSymbols = new[] { "Exe",