diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index 429826dfb..82686b89f 100644 Binary files a/.voidbot/state/aetheria.cc and b/.voidbot/state/aetheria.cc differ diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 95968385d..92c765c52 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -820,7 +820,8 @@ static void RequireFactionKeyIdentity(string root) Path.Combine(root, "Assets", "Scripts", "ServerShared", "Zone.cs"), Path.Combine(root, "Assets", "Scripts", "ServerShared", "Narrative", "ZoneConstraints.cs"), Path.Combine(root, "Assets", "Scripts", "Gameplay", "ActionGameManager.cs"), - Path.Combine(root, "Assets", "Scripts", "UI", "Menu", "SectorRenderer.cs") + Path.Combine(root, "Assets", "Scripts", "UI", "Menu", "SectorRenderer.cs"), + Path.Combine(root, "Assets", "Scripts", "UI", "Menu", "SectorMap.cs") }; var forbiddenSymbols = new[] @@ -834,7 +835,9 @@ static void RequireFactionKeyIdentity(string root) ".ID != zone.Owner", "pair.Key.ID", "f.ID != zone.Owner", - "Owner.ID ==" + "Owner.ID ==", + "zone.Owner == adjacentZone.Owner", + "zone.Owner != mega" }; var hits = checkedFiles diff --git a/Aetheria.State/README.md b/Aetheria.State/README.md index 237475682..3006f63d9 100644 --- a/Aetheria.State/README.md +++ b/Aetheria.State/README.md @@ -115,9 +115,10 @@ The remaining temporary `Faction` shell also uses `GeonameFileKey` and `BossHullItemKey`; it no longer parses name-file or boss-hull legacy IDs into GUID link fields. `Faction` equality, hashing, narrative constraints, sector display filtering, -zone security ownership checks, and runtime faction-relationship ordering now -use `FactionKey`. The legacy `Faction.ID` remains projection residue only until -the temporary simulation shell is removed. +sector-map link/influence rendering, zone security ownership checks, and +runtime faction-relationship ordering now use `FactionKey`. The legacy +`Faction.ID` remains projection residue only until the temporary simulation +shell is removed. Run checkpoint commit DTOs carry typed `OrbitKey`, `ParentOrbitKey`, and `BodyKey` only for zone orbit/body snapshots. The old pending-command `OrbitLegacyId`, `ParentLegacyId`, and `BodyLegacyId` fallback fields are diff --git a/Assets/Scripts/UI/Menu/SectorMap.cs b/Assets/Scripts/UI/Menu/SectorMap.cs index 98cbefb9a..a0134bb70 100644 --- a/Assets/Scripts/UI/Menu/SectorMap.cs +++ b/Assets/Scripts/UI/Menu/SectorMap.cs @@ -130,7 +130,7 @@ public class SectorMap : MonoBehaviour var link = LinkPrototype.Instantiate(); var critical = isOnCriticalPath && (ActionGameManager.CurrentGalaxy.ExitPath?.Contains(adjacentZone) ?? false); linksToReveal.Add((zone.Position, adjacentZone.Position, link, critical)); - if (zone.Owner != null && zone.Owner == adjacentZone.Owner) + if (zone.Owner != null && zone.Owner.HasSameKey(adjacentZone.Owner)) link.GetComponent().sharedMaterial = _factionMaterials[zone.Owner].linkMaterial; var dir = normalize(zone.Position - adjacentZone.Position); @@ -326,7 +326,7 @@ public class SectorMap : MonoBehaviour if (zone.Factions.Contains(mega)) { influence = 10; - if (zone.Owner != mega) + if (!zone.Owner.HasSameKey(mega)) influence *= .5f; } else influence = -10; diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index e7f579fda..342b8d856 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -1023,9 +1023,10 @@ First Aetheria surfaces to publish: GUID link fields; galaxy name generation and boss-zone eligibility use `GeonameFileKey` and `BossHullItemKey`. - Done: move temporary `Faction` equality, hashing, narrative constraints, - sector display filtering, zone security ownership checks, and runtime - faction-relationship ordering to `FactionKey`. `Faction.ID` is now - projection residue rather than comparison/order authority. + sector display filtering, sector-map link/influence rendering, zone + security ownership checks, and runtime faction-relationship ordering to + `FactionKey`. `Faction.ID` is now projection residue rather than + comparison/order authority. - Done: move package and canonical manufacturer/corporation/name-file lookup to typed keys (`ManufacturerKey`, `CorporationKey`, `GeonameFileKey`, and `NameFileKey`), and move loadout manufacturer-distance weighting to @@ -1769,8 +1770,9 @@ First Aetheria surfaces to publish: - `Aetheria.State.Verify` guards temporary `Faction` shell links: geoname and boss-hull relationships use typed keys, not legacy GUID projection fields. - `Aetheria.State.Verify` guards temporary `Faction` identity: equality, - hashing, ordering, narrative checks, sector filtering, and zone security - checks must use `FactionKey`, leaving `Faction.ID` as projection residue only. + hashing, ordering, narrative checks, sector filtering/rendering, and zone + security checks must use `FactionKey`, leaving `Faction.ID` as projection + residue only. - Unity batchmode compile returned cleanly after the runtime blueprint rename; live Unity source has no `EntityPack`, `ShipPack`, `OrbitalEntityPack`, `ZonePack`, `PackedContents`, `PackZone`, `EntitySerializer.Pack`, or