diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 74953ee76..090b29bc8 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -11465,9 +11465,9 @@ static void RequireDaemonVersePublication(string root) { "public static class AetheriaRuntimeTradeValuePolicySurfaceBuilder", "public static AetheriaRuntimeSurfaceDocument BuildFromCatalog(", - "private static AetheriaRuntimeTradeValuePolicySurfaceState ComposeState(", "SurfaceId = \"aetheria.tradeValuePolicy\"", - "AetheriaRuntimeTradeValuePolicySurfaceState", + "var settings = catalog?.TradeValueSettings ?? AetheriaRuntimeTradeValueSettings.Default", + "updatedAtUtc: DateTime.UtcNow.ToString(\"O\", CultureInfo.InvariantCulture)", "Quality Price Modifier", "Rarity Tiers", "AetheriaRuntimeTradeValuePolicyCommands.SetQualityMinimum", @@ -11509,12 +11509,14 @@ static void RequireDaemonVersePublication(string root) } if (tradeValuePolicySurfaceBuilder.Contains("public static AetheriaRuntimeTradeValuePolicySurfaceState ProjectState(", StringComparison.Ordinal) || + tradeValuePolicySurfaceBuilder.Contains("AetheriaRuntimeTradeValuePolicySurfaceState", StringComparison.Ordinal) || + tradeValuePolicySurfaceBuilder.Contains("ComposeState(", StringComparison.Ordinal) || statRecipeSurfaceBuilder.Contains("public static AetheriaRuntimeStatRecipeSurfaceState ProjectState(", StringComparison.Ordinal) || tradeValuePolicySurfaceBuilder.Contains("Build(ProjectState(", StringComparison.Ordinal) || statRecipeSurfaceBuilder.Contains("Build(ProjectState(", StringComparison.Ordinal)) { throw new InvalidOperationException( - "Designer surface builders must build finished Eve documents from typed catalog input; do not re-expose public ProjectState helpers."); + "Designer surface builders must build finished Eve documents from typed catalog input; do not re-expose ProjectState or shadow SurfaceState helpers."); } var forbiddenCatalogStoreSurfaceProjectionSymbols = new[] diff --git a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeTradeValuePolicySurfaceBuilder.cs b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeTradeValuePolicySurfaceBuilder.cs index 0fd88bf24..18ca2f119 100644 --- a/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeTradeValuePolicySurfaceBuilder.cs +++ b/Packages/org.gamecult.aetheria.state/Runtime/AetheriaRuntimeTradeValuePolicySurfaceBuilder.cs @@ -7,21 +7,6 @@ using System.Linq; namespace GameCult.Aetheria.State.Verse { - public sealed class AetheriaRuntimeTradeValuePolicySurfaceState - { - public AetheriaRuntimeTradeValuePolicySurfaceState( - AetheriaRuntimeTradeValueSettings settings, - string updatedAtUtc) - { - Settings = settings ?? AetheriaRuntimeTradeValueSettings.Default; - UpdatedAtUtc = updatedAtUtc ?? ""; - } - - public AetheriaRuntimeTradeValueSettings Settings { get; } - - public string UpdatedAtUtc { get; } - } - public static class AetheriaRuntimeTradeValuePolicySurfaceBuilder { public const string SurfaceId = "aetheria.tradeValuePolicy"; @@ -30,40 +15,23 @@ namespace GameCult.Aetheria.State.Verse AetheriaRuntimeCatalogSnapshot? catalog, long version = 1) { - return Build(ComposeState(catalog), version); - } - - private static AetheriaRuntimeTradeValuePolicySurfaceState ComposeState( - AetheriaRuntimeCatalogSnapshot? catalog) - { - return new AetheriaRuntimeTradeValuePolicySurfaceState( - catalog?.TradeValueSettings ?? AetheriaRuntimeTradeValueSettings.Default, - DateTime.UtcNow.ToString("O")); - } - - public static AetheriaRuntimeSurfaceDocument Build( - AetheriaRuntimeTradeValuePolicySurfaceState state, - long version = 1) - { - state ??= new AetheriaRuntimeTradeValuePolicySurfaceState( - AetheriaRuntimeTradeValueSettings.Default, - ""); + var settings = catalog?.TradeValueSettings ?? AetheriaRuntimeTradeValueSettings.Default; return new AetheriaRuntimeSurfaceDocument( providerId: "aetheria", providerKind: "game.design", title: "Aetheria Trade Value Policy", version: version, - updatedAtUtc: state.UpdatedAtUtc, + updatedAtUtc: DateTime.UtcNow.ToString("O", CultureInfo.InvariantCulture), surface: new AetheriaRuntimeSurfaceTree( SurfaceId, Node( "aetheria.tradeValuePolicy.root", "surface", Array.Empty<(string Key, string Value)>(), - BuildSummaryCard(state.Settings), - BuildQualityCurveCard(state.Settings.QualityPriceModifier), - BuildTierList(state.Settings.Tiers)), + BuildSummaryCard(settings), + BuildQualityCurveCard(settings.QualityPriceModifier), + BuildTierList(settings.Tiers)), Array.Empty()), commands: BuildCommandTemplates()); }