diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index c95e211b5..3b11e2ad7 100644 Binary files a/.voidbot/state/aetheria.cc and b/.voidbot/state/aetheria.cc differ diff --git a/Assets/Scripts/UI/Menu/SectorRenderer.cs b/Assets/Scripts/UI/Menu/SectorRenderer.cs index dd89b0d7b..cbc015770 100644 --- a/Assets/Scripts/UI/Menu/SectorRenderer.cs +++ b/Assets/Scripts/UI/Menu/SectorRenderer.cs @@ -2,7 +2,6 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; -using GameCult.Aetheria.State.Unity; using UniRx; using UnityEngine; using UnityEngine.EventSystems; @@ -73,35 +72,37 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS var mass = GameManager.Settings.ZoneSettings.ZoneMass.Evaluate(density); Properties.AddProperty("Mass", () => ActionGameManager.RuntimePlayerSettings.Format(mass)); Properties.AddProperty("Radius", () => ActionGameManager.RuntimePlayerSettings.Format(radius)); - if (zone.RuntimeBlueprint == null) + if (zone.Contents == null) { Properties.AddProperty(() => "Has not been visited"); } else { - var planetCount = zone.RuntimeBlueprint.Planets.Count(body => body is PlanetData).ToString(); + var runtimeZone = zone.Contents; + + var planetCount = runtimeZone.PlanetInstances.Values.Count(body => !(body is GasGiant)).ToString(); Properties.AddProperty("Planets", () => planetCount); - var beltCount = zone.RuntimeBlueprint.Planets.Count(body => body is AsteroidBeltData).ToString(); + var beltCount = runtimeZone.AsteroidBelts.Count.ToString(); Properties.AddProperty("Asteroid Belts", () => beltCount); - var giantCount = zone.RuntimeBlueprint.Planets.Count(body => body is GasGiantData && !(body is SunData)).ToString(); + var giantCount = runtimeZone.PlanetInstances.Values.Count(body => body is GasGiant && !(body is Sun)).ToString(); Properties.AddProperty("Gas Giants", () => giantCount); - var starCount = zone.RuntimeBlueprint.Planets.Count(body => body is SunData).ToString(); + var starCount = runtimeZone.PlanetInstances.Values.Count(body => body is Sun).ToString(); Properties.AddProperty("Stars", () => starCount); - var stationCount = zone.RuntimeBlueprint.Entities + var stationCount = runtimeZone.Entities .Count(entity => HasHullType(entity, HullType.Station)) .ToString(); Properties.AddProperty("Stations", () => stationCount); - var turretCount = zone.RuntimeBlueprint.Entities + var turretCount = runtimeZone.Entities .Count(entity => HasHullType(entity, HullType.Turret)) .ToString(); Properties.AddProperty("Turrets", () => turretCount); - var shipCount = zone.RuntimeBlueprint.Entities + var shipCount = runtimeZone.Entities .Count(entity => HasHullType(entity, HullType.Ship)) .ToString(); Properties.AddProperty("Ships", () => shipCount); @@ -114,21 +115,13 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS // }); } - private bool HasHullType(RuntimeEntityBlueprint entity, HullType hullType) + private bool HasHullType(Entity entity, HullType hullType) { - var typedItem = FindTypedHull(entity); + var typedItem = entity?.ItemManager.GetRuntimeItem(entity.Hull); return typedItem != null && string.Equals(typedItem.HullType, hullType.ToString(), StringComparison.Ordinal); } - private static AetheriaRuntimeCatalogItem FindTypedHull(RuntimeEntityBlueprint entity) - { - var itemId = entity?.Hull?.ItemId ?? Guid.Empty; - return itemId == Guid.Empty - ? null - : ActionGameManager.RuntimeCatalog?.FindItemByLegacyId(itemId.ToString("D")); - } - // private IEnumerator AnimatePath() // { // var pathZones = ActionGameManager.CurrentSector.ExitPath; diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index dfca3e2bd..b1f0d9033 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -1041,6 +1041,10 @@ First Aetheria surfaces to publish: `AsteroidBeltData`; run checkpoint commits now project `Planet` and `AsteroidBelt` runtime wrappers, including body resources, asteroid runtime damage/respawn/miner accumulators, and gas/sun visual fields. + - Done: move visited-sector summary counts off `RuntimeZoneBlueprint` + body/entity DTOs; `SectorRenderer` now counts planets, belts, gas giants, + stars, stations, turrets, and ships from `GalaxyZone.Contents` runtime + wrappers and live entities. - Done: delete the legacy `Behaviors` lists from `ConsumableItemData` and `EquippableItemData`; item DTOs can no longer carry behavior config state. - Done: move runtime blueprint price aggregation and conductivity restore @@ -1336,6 +1340,9 @@ First Aetheria surfaces to publish: can apply them into canonical typed settings/run/zone/entity state, and commands are cleared after application. It also proves renderer-emitted Eve commands are queued as typed command envelopes separately from state commits. +- Current Unity batchmode compile probes are blocked while another Unity editor + instance has `E:/Projects/Aetheria` open; typed state builds and smokes remain + the available verification until the editor lock is released. - Unity batchmode compile with Editor `6000.4.2f1` returned cleanly after the runtime catalog resolver cut; `Logs/codex-unity-compile.log` has no compiler error hits.