From c5626561a7a50596421a536e30d0396f11a38548 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Tue, 16 Jun 2026 12:00:34 +0100 Subject: [PATCH] Use faction keys in sector map rendering --- .voidbot/state/aetheria.cc | Bin 170452 -> 172616 bytes Aetheria.State.Verify/Program.cs | 7 +++++-- Aetheria.State/README.md | 7 ++++--- Assets/Scripts/UI/Menu/SectorMap.cs | 4 ++-- docs/aetheria-perfect-machine-map.md | 12 +++++++----- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index 429826dfb57d445256ae7b71e770e33f15a324ec..82686b89f052ea5aa6e0a2d8b3fb1763a27f2620 100644 GIT binary patch delta 2158 zcmai$ZEGA=6vsQ0G~@vv2yL2*HYWwaV0My?ZqiMOk~YMw5*lo(5F+Ge_U`UYX6J6_ z-bviL?GkEfX^Beb#n2ampjD{~g2MVr5JUt)5EKlppnd{Bg6Gb|&a|=kW_RcAeK_ZT z{^xh+*ROhi{J!_gkM*A1iRtmYF@9po|7%x&()&rj(j5)u{Xcj0BOdR#5KqbnlLox* z&LRC~-{q0c)<~!JV)s*PXQ?T<165Lk5-}y?HaOHSQis`P|DQ$eu)lg$?`ZFQM zn&I0vb--fwrT}6Wft|EVmK&T!q@=b>fidoC;?m@m!>cW zObTk1j61|OE8KaNmc+dSZ?)zh(~fp%V?l)u*?c=Jkw_A1ecrEKnep`V$GjIX6Ve!ijSG=J!6y{iS6v_ePo@`q^Ry|0}z z99OEW{Qm(OTU~(w+GI7dOMhQ2f@957)DYR((SR>3?HP8tYYNSyL#&N^c z{*A)is__z)XzI#oUZlriRtPG^m{GgMRIz-sf$M_Vy;z{oh~HS#vQgmRi3bF~9`I zggt}FtkY3v%*CkdO`Ti8m(mN8=fP8@)#THG#U|DYsdADx=*Mho~7D-!rdR9Fo? z9^uXa1(5ylX#v=?Fv+gc$f1)p2X zs7uY^0e3^#nAoZT9U`yAdEW;f#m+YfSlHucJr-6uHrh+k9wW1gqae^QA=e*5A%X@& zI1))m!BTE_z;tB@q#u?rX6kIw|1TgA)8RtExk4g5LIk!I`tZAqCBQqQZosLB(quHa zt{kfHs3^7EPP#r8CXoq~NW%#u$2$oFBsOr{sw2c4b&Vy=7im1*^e%li;5|Chod(ab zVGLXOxb2zHb5Ys->~;N=w&2a2J8C3dke;lZ7S|zd@YV;{^@gtH{KwaHIGD{&=cfGK zfS9Pd55d-2|xb?)4?6-v^= zmL5a|r^muFi5`L;F7#qjLG&i{QWW?X1ikju-0SYX^!m*?-}%1p%=z*u{_S1-?FNpg zl7oFIW1u%Zv4W1Qe#TEKNHQ5Ayk@S7q#~p~)`d%Iu_qSv#L!Uv{G~B)^IT9-BqP+6 zHfO}kf#VR{0w!%)B#h4zle>8;z$27dBu90HN2aPBSD|RUG#zTYKTz96kU0=GB`z<3 zMdW|VaXh45I*}N6vby5 z2rp;niJ1d)+S3%Aoeq0IsNYk#CB7%w_Bd1iW1JY`nGA6tOU%%;P1=vgqZuuq<$1Z^CUcjyMM908|6}dOah%bEsWR{C* zy&vv7RzxHrEX(+gQzSZ8LG{XXOyx~R1~WQ9BEY3K(>a!xtJRB86LC1p>URcuRkk!< zQ)cG4xCxn<_jBJ|FmwpD*P!d_b_42Y%IX1@{sLJ|jxbpf4hO7#vVlSVp~o_HZ?R#V*#VvA_J_TZ)quAUAW>RJ*d z6o?Wo>{qchd;<3ms8egWyK)1m{_qCW^cvo(LIdSPsa2y2^9p=6x*zpR;RjVHI(); 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