diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index 405aabdf7..467db1d83 100644 Binary files a/.voidbot/state/aetheria.cc and b/.voidbot/state/aetheria.cc differ diff --git a/Aetheria.State/README.md b/Aetheria.State/README.md index 745978f9d..330cf3ee6 100644 --- a/Aetheria.State/README.md +++ b/Aetheria.State/README.md @@ -20,7 +20,7 @@ or weapon-group index. They also include current faction relationship rows as typed corporation references plus relationship tokens and numeric standings. Zone checkpoints include typed orbit and body rows for generated celestial state: orbit IDs, parent IDs, distance, phase, fixed positions, body kind, -resources, gravity/body multipliers, asteroid entries, and gas/sun visual +typed resource item keys, gravity/body multipliers, asteroid entries, and gas/sun visual parameters. Entity checkpoints include typed simulation stat grids for temperature, thermal mass, armor, max armor, and hull-conductivity axes. Player settings include player name, tutorial flag, diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index dc988d891..bc0157aa1 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -674,7 +674,7 @@ public class ActionGameManager : MonoBehaviour .OrderBy(pair => pair.Key) .Select(pair => new AetheriaRuntimeBodyResourceCommit { - ItemKey = AetheriaRuntimeItemReference.FromLegacyId(pair.Key), + ItemKey = pair.Key ?? "", Amount = pair.Value }) .ToArray() ?? Array.Empty(), @@ -705,7 +705,7 @@ public class ActionGameManager : MonoBehaviour .OrderBy(pair => pair.Key) .Select(pair => new AetheriaRuntimeBodyResourceCommit { - ItemKey = AetheriaRuntimeItemReference.FromLegacyId(pair.Key), + ItemKey = pair.Key ?? "", Amount = pair.Value }) .ToArray() ?? Array.Empty(), diff --git a/Assets/Scripts/ServerShared/Zone.cs b/Assets/Scripts/ServerShared/Zone.cs index e953e1ff8..95c4c24c8 100644 --- a/Assets/Scripts/ServerShared/Zone.cs +++ b/Assets/Scripts/ServerShared/Zone.cs @@ -370,7 +370,7 @@ public class Planet public string Name { get; } public Guid OrbitId { get; } public float Mass { get; } - public IReadOnlyDictionary Resources { get; } + public IReadOnlyDictionary Resources { get; } public float BodyRadiusMultiplier { get; } public float GravityRadiusMultiplier { get; } public float GravityDepthMultiplier { get; } @@ -475,7 +475,7 @@ public class AsteroidBelt public string Name { get; } public Guid Orbit { get; } public float Mass { get; } - public IReadOnlyDictionary Resources { get; } + public IReadOnlyDictionary Resources { get; } public float BodyRadiusMultiplier { get; } public float GravityRadiusMultiplier { get; } public float GravityDepthMultiplier { get; } diff --git a/Assets/Scripts/ServerShared/ZoneConstructionData.cs b/Assets/Scripts/ServerShared/ZoneConstructionData.cs index 5535cfaf7..65c123549 100644 --- a/Assets/Scripts/ServerShared/ZoneConstructionData.cs +++ b/Assets/Scripts/ServerShared/ZoneConstructionData.cs @@ -31,7 +31,7 @@ public abstract class BodyConstructionData : INamedEntry public float Mass = 0; - public Dictionary Resources = new Dictionary(); + public Dictionary Resources = new Dictionary(); public float BodyRadiusMultiplier = 1; diff --git a/Assets/Scripts/ServerShared/ZoneGenerator.cs b/Assets/Scripts/ServerShared/ZoneGenerator.cs index eb9acc030..de2dab171 100644 --- a/Assets/Scripts/ServerShared/ZoneGenerator.cs +++ b/Assets/Scripts/ServerShared/ZoneGenerator.cs @@ -124,7 +124,7 @@ public static class ZoneGenerator blueprint.Bodies = planets.Where(p=>!p.Empty).Select(planet => { - // Dictionary planetResources = new Dictionary(); + // Dictionary planetResources = new Dictionary(); BodyType bodyType = planet.Belt ? BodyType.Asteroid : planet.Mass > zoneSettings.SunMass ? BodyType.Sun : planet.Mass > zoneSettings.GasGiantMass ? BodyType.GasGiant : diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index 2d2469649..f6d85f723 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -1238,6 +1238,9 @@ First Aetheria surfaces to publish: - Done: move action-bar consumable bindings off `Target.LegacyId` parsing; they read the typed runtime row `ItemKey` directly for HUD fill/count and runtime commit projection. + - Done: move zone body resource dictionaries from legacy item GUID keys to + typed item-key strings; runtime body resource commit projection no longer + calls `FromLegacyId`. - Remove runtime dependency on `ItemData` DTOs as item instance owners. 5. Mesh host