From 83ee918fde40057368aff48ebba82f9287847d71 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 14 Jun 2026 01:13:49 +0100 Subject: [PATCH] Require typed hull rows for sector summaries --- .voidbot/state/aetheria.cc | Bin 56726 -> 56946 bytes Assets/Scripts/UI/Menu/SectorRenderer.cs | 7 ++----- docs/aetheria-perfect-machine-map.md | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index 298aa328e1174c95899e5f7cd3e84e51e4b1a133..6994eb2fe1eb3dc9bddb30ed8d7ca08ef9c83edf 100644 GIT binary patch delta 987 zcmZWoJ!lj`6o$JLNkC8t34(@KMMRVH4)spc2&PCt5i~X_gt^_>+cC2(2ZEc~At#5Yk4w97fX6C)`?>&B3{QJK6`gvinTsd1V zPn|gFZf=gbuZ6oq-NLDgYi}NMwrKj58dgT#;K1R+&uZt$z^xBw?q8vSkqS~JQ>qN3 z8nhvXNl`LZDQZeOW+?>H3Zp^D6;O1^GDY2=)v;D=IfsA~ty#o^?3)HAw4o#f89_ui zXQBah5-fs|z-fa7O_;@RGsKXoXZV*T+i$ucv`rGCnh1t!DsmY8_K3`n(-0|{fN7>Q zbpKWlw0yI9Jb@IvISmOzFgP-M07|YPp;%fTg0?Cm0R^IWJ@SO;TXyhDz@yqB$j7_01+Yf5+PL{7v-9+ z#8lzHx;1ch4sqqIjj|^0f%RY#q8CxkKqe`thIT2T%!JDZa%d{l%`#jQmcwP#_ zgrztuk;{J6F12^c>aFp%=xH#D5}dX}xXf9U3r)}T%4SIcA&oFF+M5}%8;A~aJkS7^ zq*9p@Ch0mpL5-$f5)s5wU8a$K)EWM=P;k&1cMoPKj$WH3x^G;bDvX=Jz6u$5Cjmtg zKzz)`(M5<6hKW79B}*}2VU{9qybHeluGKD*6z>A5LNsDerZYO-5c@_xJ(GTnE0xFG ztM!Tf-KD9N7oHl@&`;d2_1hzBd8bLs)_jLa|F5(7ecw=Tqbg*W9 jZz-#|l=u4A)$ID%R=ZcJ`4t`Q{Mh<5G~5MHJH7B9p$T!) delta 863 zcmZuvzl#$=6o%}f7eNsVgN5)aZE|~w$z9BW#i5?05JV1ySk3OfYzB5`ax=3R*W!ZM z1gvD#!rC9GjgnHuM)52J@eU;agH0@~o!#svDeQ*#zWLtweeeDGU_E(ny?s$ARvH^? z>vpqN(UXJI`b*(KURiIZ6>i;4D-F9+UrQ^?OJ@t;Z;#F|-T$~U+;kP?Y{el0T+U<^ z5+^`#DDx=uf$=^F+=-|_2}Do!N`nQIFkJ^bTp)B~PY{)SQC)-ped5M&c}Cb$7+xWY zfFr2qqy5|s2o1+-jsP+jf&ulZLj$T}pb~hWp$AS3D(<2FyLW2f5`{h&aoGq|NhcdP z8)N9Dq#bI2#-06AA(Q4Y9&Q_TJn+(KyJ-_PZ?q&xMS~!>`aj{uC19t6t^yp~K{rZ> z%iu)HI3`9!Y7D|is#KJRF7*)lT{M9RAPlI<074R{;o9$}ep_KL$W)GB-RdGU8hQb7 zlOz|CPQX*SWeE9T7vU;XCLViR#K{It4;QjjJk83R&NMnw@M@-CDuXtPJn%3;^GsGI zFeH>EW9K}xI59UowRr;V*MzxUE^cB+J{n#6+%D*iufMmpu9Kc&a=GwireMKDzBM4` zmgd{eZ;eFCFd9>OwOZ2A{<)LcX;+%(P)^zdE|tJg*k4}TSpW&Qfa_CJqpLI(f< diff --git a/Assets/Scripts/UI/Menu/SectorRenderer.cs b/Assets/Scripts/UI/Menu/SectorRenderer.cs index eee41cf9f..b2ca4433b 100644 --- a/Assets/Scripts/UI/Menu/SectorRenderer.cs +++ b/Assets/Scripts/UI/Menu/SectorRenderer.cs @@ -117,11 +117,8 @@ public class SectorRenderer : MonoBehaviour, IBeginDragHandler, IDragHandler, IS private bool HasHullType(RuntimeEntityBlueprint entity, HullType hullType) { var typedItem = FindTypedHull(entity); - if (typedItem != null) - return string.Equals(typedItem.HullType, hullType.ToString(), StringComparison.Ordinal); - - return GameManager.ItemManager.GetData(entity.Hull) is HullData hullData && - hullData.HullType == hullType; + return typedItem != null && + string.Equals(typedItem.HullType, hullType.ToString(), StringComparison.Ordinal); } private static AetheriaRuntimeCatalogItem FindTypedHull(RuntimeEntityBlueprint entity) diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index 96bcd8de7..c8783c149 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -143,8 +143,8 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted. applies typed row prefilters for size, hardpoint type, and behavior kind before hydrating `ItemData` projections for legacy commodity filters, columns, and buy actions. The sector properties UI also resolves station/turret/ship - counts through typed hull classifications from the runtime catalog before - falling back to legacy `HullData` projection for missing rows. Loot pickup + counts only through typed hull classifications from the runtime catalog; + missing typed hull rows no longer fall back to legacy `HullData`. Loot pickup presentation now uses typed catalog category/name rows to choose weapon-vs-gear pickup visuals and scan labels before falling back to legacy item projections. The item properties panel also reads typed catalog description, manufacturer,