From ea50359594a16991e49c5d3d841a7b12c87fffaf Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sat, 13 Jun 2026 09:32:24 +0100 Subject: [PATCH] Import typed item shape masks --- .voidbot/state/aetheria.cc | Bin 21528 -> 22125 bytes Aetheria.State.Import/Program.cs | 35 ++++++++++++++---- Aetheria.State.Unity.Smoke/Program.cs | 14 +++++++ .../AetheriaRuntimeCatalogSnapshot.cs | 22 +++++++++++ Aetheria.State.Verify/Program.cs | 22 +++++++++++ .../Documents/AetheriaItemDefinition.cs | 13 +++++++ Aetheria.State/README.md | 19 ++++++---- GameData/aetheria-world.cc | Bin 16352 -> 16592 bytes ...6bcb5217c5fee889541667442528a98491.msgpack | 4 +- ...a275af9147897cd1f60b23a18cc48b7fee.msgpack | 4 +- ...3921217d7ba077f48246e0b33fc1493431.msgpack | 4 +- ...3fbff428c15ab389a42d0d2aa0e75980fd.msgpack | 2 +- ...6b93b4259541f580967a52464d9686f3aa.msgpack | 4 +- ...fdee0c7ff471c8bb4b4e0b2067eb36da09.msgpack | 4 +- ...cc1c87e1e40afcab2bb8dd8f889fe0918b.msgpack | 2 +- ...1ac1edd3dffac04996b12d9f9d0e8304f1.msgpack | 2 +- ...1368ec2948a11425e377fa92a71d575637.msgpack | 4 +- ...8858c36442af01034165db67b886e94ce3.msgpack | 4 +- ...2cd5bdbf86136a558044079cba7a029ac8.msgpack | 4 +- ...6ba52bd445978bb0cb399047cf64aa722f.msgpack | 4 +- ...3e8ff05893f872c2437a5621f2a2eec71b.msgpack | 4 +- ...9bb06b3f45a746ac5f7739b1cbd896443f.msgpack | 4 +- ...07d0fb3e1d5d58fbc176520a100614f404.msgpack | 2 +- ...48df04cfa2250b7101fc00f9c6f2c1317c.msgpack | 4 +- ...06e97680a29efe7d1436947e3a8eba4c95.msgpack | 4 +- ...2ccd793983d2af31967b7d70a977fd2e02.msgpack | 4 +- ...f91cb8ca685ea96318a795771ae6d911eb.msgpack | 4 +- ...db27aa2b805705e823bed4877c4623cf88.msgpack | 4 +- ...5eead201bac20496fa5a2649e4b1522a37.msgpack | 4 +- ...fa0290206edd7b2e0dc08b0f9842dea0f2.msgpack | 4 +- ...dd6eeb3d8311f3753af60c2b5596719b15.msgpack | 4 +- ...d7e3a5d8fa1509efb8a9249d0e48891299.msgpack | 2 +- ...c76a739617023ffa2c2aeb091cf5580b7d.msgpack | 2 +- ...f5bd89832b6e55959ea4902bfa15bc8117.msgpack | 4 +- ...d52fa612f479ccbad76307db432c0b6147.msgpack | 2 +- ...268eff507c40681c6b1955fa786f99066c.msgpack | 2 +- ...ad0cb1b8ec9229ee0525bb8571edb6ea32.msgpack | 4 +- ...616a532f076ae0a66f2257f9c7899100a9.msgpack | 4 +- ...ae26acc72f64a9ca536b895d59a8675c66.msgpack | 4 +- ...44c85439d1f3caa1caaf24beb34e7d8d50.msgpack | 2 +- ...9500e6c9192f76c38393eb84bee3345ee0.msgpack | 4 +- ...dd6ef83562c3b82a0e03c21a37c241f5b8.msgpack | 4 +- ...5cdcddbcded4980427149dc10ba9eb08a1.msgpack | 2 +- ...baf1c52a76a0e7adce5acb06a2d7f5bd79.msgpack | 4 +- ...79872da971faf89ceef4c395a64f1b5e88.msgpack | 4 +- ...60257125aef40381db5877aa16c02b39e4.msgpack | 4 +- ...ea1ff3e3f204925bb28ccb1d45d2b3d732.msgpack | 4 +- ...786b7af0cd4f808a703d5f242c9b0fd372.msgpack | 2 +- ...05ae7658005ee7019c3810650baf8e6c4f.msgpack | 4 +- ...d65f26dcd9e6b2bc9ef89cb16dd16e4b07.msgpack | 4 +- ...4187f90237d4386c76e3b847376b466dd3.msgpack | 4 +- ...042b3f00710055061bb4b6d9b2306d14c3.msgpack | 2 +- ...36ce1066ae558fc09801457a30674f515b.msgpack | 4 +- ...e298fc6ceb8352b047986733e405d6006b.msgpack | 4 +- ...7cb628668b9e3842a59c0e2dd106a820bb.msgpack | 4 +- ...b30b7614eb776ee14b16bed525675b67b8.msgpack | 4 +- ...6321b14e59b2b62a7e914e74771273097a.msgpack | 4 +- ...d39c7f7412772d7ad9adc1f1db3f39cc10.msgpack | 4 +- ...e152a6e77f714229898548c45b02cc72d6.msgpack | 4 +- ...0ecea7ff27435bd9e9d534bcb0c1b892ef.msgpack | 4 +- ...daf7ada6d75ceaa0a07f1e0dc46d65003f.msgpack | 4 +- ...25c2c88303bdbc1a54a178c895086e6c55.msgpack | 4 +- ...320b70986559345e184297437f13bcae7d.msgpack | 4 +- ...1f7c425775d76ba34c55a9ae879e27b3d8.msgpack | 2 +- ...8181b2c9794fa3a70f803c67de8d0dcff0.msgpack | 4 +- ...918704bf6ad447ce7a4733664d3888359d.msgpack | 4 +- ...9358f522e1794e5a675f77b06e99ee061e.msgpack | 2 +- ...72d6a82431bf8c842bc57b1c7f3bae4876.msgpack | 4 +- ...78de0d154287774728c30a461ed0d9e334.msgpack | 4 +- ...5a77b77ba285ba04fa6e1c678d86988867.msgpack | 4 +- ...cb33184e1aade105b24afaba265b148ce4.msgpack | 4 +- ...92a3874ff91d1e08024120231bb836c2bb.msgpack | 4 +- ...30a284a5876d9f55597d457cebba6a2226.msgpack | 4 +- ...04c4d886f2bf72ae35b733603966e28d61.msgpack | 4 +- ...a65e76836067e0661b91eb2fa4cc5c2b3f.msgpack | 4 +- ...6550ff7ce20b046a653debb4e7bc10e047.msgpack | 2 +- ...2888041296cc8e256b3774e29b1b969c4b.msgpack | 4 +- ...eb069ff9e1ed707a2590cedcffc835ac23.msgpack | 4 +- ...199f861a6986234742cd7d603c9d8cbe86.msgpack | 4 +- ...699d5fc930104242470efeddc8f9500222.msgpack | 4 +- ...ef7f34c156794d697606252db56928e23b.msgpack | 4 +- ...d30298201bd0eced6bfa9c3b7e01d9448c.msgpack | 4 +- ...946ba31ec32b37bfe4b0829825c4e85029.msgpack | 2 +- ...cb793e7bcf5f7afa2c328d12d6561d0f1e.msgpack | 4 +- ...56919b8dd915d9fef8f2361b77d9bf6b99.msgpack | 4 +- ...386b0b8e8f80cfe0ad311061b682ecff95.msgpack | 4 +- ...1c82be1f818ee634833d6e3e637e694344.msgpack | 4 +- ...4f2a1a72a54f72c42a4e4c1d0f231586ba.msgpack | 4 +- ...34144722b989cf3cf2f03431cabc1f3929.msgpack | 4 +- ...a34a37e5fcb7892a29eb02cf5da1c338de.msgpack | 4 +- ...c97b1604f21df8132d6305f350e80ba5b7.msgpack | 4 +- ...c595e7f3aea98935f9e9a6aafdf8b4d9d2.msgpack | 4 +- ...1539aa45529f4c740066eb5301ed36edfd.msgpack | 4 +- ...2e4971d71ab5b8b38ac0c89c3f9a764764.msgpack | 2 +- ...79e8b3e7a51e9d5145e08f639a88de38be.msgpack | 4 +- ...cb2be74c711de0d5b22f9160aba0ee7ee9.msgpack | 2 +- ...65d32cdc881f54a82297e048ac6adff8ff.msgpack | 4 +- ...0336d40c18572d3f6ed6318a4008af5a89.msgpack | 4 +- ...fcd8fa1e9858c270d58ccf5d2170a3842c.msgpack | 4 +- ...d2064953cbde740647c3a820bacf9c27c3.msgpack | 4 +- ...33d98be75491a3b1b3af0d080505b31b21.msgpack | 4 +- ...76f8e8486ae0dd84c256d8c672c54837ec.msgpack | 4 +- ...7dd3b2bd29116afbf8857d8b5afdc85c8f.msgpack | 4 +- ...26af1122625e375d29d192aacad668e2a7.msgpack | 4 +- ...0d87791a49bb911b2e7ab294e1303e180c.msgpack | 4 +- ...85198b8b38c36fc5417df965fe098c7523.msgpack | 4 +- ...fdf046f5a7951655cf83dc22938e7563b2.msgpack | 4 +- ...f4651415e50cce4eb13240370a1394b928.msgpack | 4 +- ...52a044e5c42314b43945ded225f3009bf9.msgpack | 4 +- ...b76604f01f891d11f6bc9c079621d2b45c.msgpack | 4 +- ...dd6056bad45424aaadc0ed86534053fd43.msgpack | 2 +- ...6a84bb1ad648c6e3f72452f8ee47f98cb5.msgpack | 4 +- ...28230b2636da2c91d4e12ec6c804c8a04a.msgpack | 4 +- ...480afdb5047dee177edeac207ce337e083.msgpack | 4 +- ...7f81911af70edf42cb5275ce8f96dee707.msgpack | 2 +- ...07128f325b6f8981e61bf216400dd09f8e.msgpack | 4 +- ...f4dc349da455027ef5db10f14d88553894.msgpack | 4 +- ...1ade7f7e67031a1f69bec307690212bb53.msgpack | 4 +- ...3ff4da3985d54c314bcaf6ceca29a0d80e.msgpack | 4 +- ...1b1a624f836079caf3f9c892cbc94d0aae.msgpack | 4 +- ...01600dd1985f3e1ddeeb16b10593afc5ab.msgpack | 2 +- ...08e1a83f1dc14096339f67d56c0e0869ff.msgpack | 4 +- ...06d60f0e24b919fdf36a025cfddee87011.msgpack | 4 +- ...0f1c261fbbb7f1961d8acd057a3b287e38.msgpack | 4 +- ...5b07b6b9ec7bba75debf9915460dbe3e1a.msgpack | 4 +- ...2762b088b45c2b873b2816cc7dd4e7672c.msgpack | 4 +- ...e79aecf53d9558fd48290599da73065788.msgpack | 4 +- ...3dd2a11f08fa54e6ffc699ee7ff032399d.msgpack | 2 +- ...36c731b877c242d1dd966801858145a431.msgpack | 4 +- ...8668f9d2c05806983d89a8e9227a63871e.msgpack | 4 +- ...e2540502e68596a3603f76389e57028805.msgpack | 4 +- ...9ab8ab7bd5c5792eaffa4226a6c04eb105.msgpack | 4 +- ...b464103bd76e410747a9c9b7ff24e3c4e1.msgpack | 4 +- ...5ee0f0a8c3001293f5702aa2424e24427e.msgpack | 2 +- ...731eadcb421407c89d781610905a20f024.msgpack | 2 +- ...4a3699e1985d69a91cf8dcb7f4c66bddf5.msgpack | 4 +- ...25da6d94408d6a3d1d9118f6ee39b59f6b.msgpack | 4 +- ...27c780283d518bb03ec1796d41885bd88a.msgpack | 4 +- ...0f473896745b146e5990046afe53ac54b8.msgpack | 2 +- ...e9c2093d642b67286400600a6215e90683.msgpack | 4 +- ...8f723d3a0a7f48de7e52fe545a530c2559.msgpack | 4 +- ...3f7d34327c64a8a33c3dfb1809131717a1.msgpack | 4 +- ...42f2cef8f92eb11513d698d60a8ad234c4.msgpack | 4 +- ...d4f7d77f094191b2e9d7590b6795950780.msgpack | 4 +- ...c4bd13b358f1ffb0937b14289d35ab2d53.msgpack | 4 +- ...6b87f1ba0566a44f3d381b757edb40d25d.msgpack | 4 +- ...e4f0b2d619dceb69ec354fe56f99488b42.msgpack | 2 +- ...beb23a1fa47461adda98ef10295021480f.msgpack | 4 +- ...d3f4d154424deaf2f21dd15d213684d46f.msgpack | 4 +- ...8da4a63ef12a1dc5126b11ebba43840395.msgpack | 2 +- docs/aetheria-perfect-machine-map.md | 33 +++++++++-------- 151 files changed, 384 insertions(+), 288 deletions(-) diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index 876056dddbb20e4ba2c784daf7095c711c53a9ca..da42f64d1b523da140c333ba41c6074efe5ce1cb 100644 GIT binary patch delta 1554 zcma)6&yN&E6m|vzEJiWLkq|{57ZBW;+3o!?D;rF3VV5g1KYm|7I5Tx-_RZG(Y_M^+*08_Uzo;q;)4n42d{S0AGgH2DVDHiTaxgl%_sX&1 zy>n>#s07>6S&}f7?_8@YAPgp;`)q)aFnv=4QwXWt1d|Ui1kMbLWe>Dr1}Ets24ouN z5Mz(=96m^e$>DwfTy}3DH@fv5kC{k*s~xR+*v}T9f6qZCY@k8LAzVhSSr6A3zga#` zm{EeG29X*G)yq{PcOD}_U4%?qzRwcIv7WSl&Ar?Kg&$`^(W|+jm?13YDJIzzrcZdy zuFTR<1NRSsrS_*2hlhB3Ahqk4B$;8|7(r#J5eb%J_^%<73Zl$pq)9Pq%yO9-0tq1! z#)z~BT&5%|D&5*Lm}(-r^Qib(izJJgqfYvXI3~V~h&b(rBwit#=_{G_`rv0Jwc8hn zhRNHPBnzq43Z|%-As&t%L6j^DwS9A=GVYrQO&vB#kZ=;T{D-TBqmBcx*E7?X%9+=t zah$C=8laRE_U2}ddPGwXe zQZo5(vtcL**U^>{4cN~^62vKgp5*E>jii{$fx2Dtsaz^DyTo`O7a^2>JcX3LVz`i8 z_CD!0r)W@Q@3WMX99J>YkDqzv({B_;+gv7zFlV~m?)2#T$sJ{?SoB1f;8lq7;%)QiUR=mD2Xlxu!j`*ce?qJ$qokZ@m-Pwf4&D zIiGxr=x*$RX&5j?I~aMd3P=44hvPM&i8lb`9n-Swq zLHfl)g#WV)KD>~~5M$kXfVV`5DaS&x#^~$d%Y!BRckPvhM!ofsJ$|}T^FQ~uxE?5Z z!@jT#r;e{Nt?9D(?fkdBEopyP!8rDZf_(&4{`E9mr}H#il}kOoXP{X!pyi%-hek?6 zVV$`hv;+I>O3Pk9d+5dTvIf%|-x}5<`(GX1IUCpBxbHEV?viYmu+1{=+lAB35EJR5 zFnaRVa}yI|Ap6I~BjaPd;E(a*#fMd;JmGTBK6`9cj;kI2-4CmGs>Z1U5M?(}6k9?`t;?$8mBYwy}^CE8)Yw_*OepyVG%hOuBpQ zOcZH_Q0_s)fh(UukOR{G0E9Slfuj-p1KxO(d>ws$RWUucrTc()#q9*7skx z7kj;Hy{pMe@5=tit#kFG8)xdD+Ye{x@^VDYsrz%}azxIaeyP3r$K>_X@4Y-eesi6C zPF7&@fk#ito)*3WTWT*9L5d!w8Nm=!%;>Qzl|ow`-<&l;jt&rFQx;rC%N{J~*J79^RSRU(?;y$zCRCV{rSeYeh z3eFo#Txd->%He4)K%D_8;T;I2N{<6cQRf9vCL`%!Xe}_ z`wkD+CHwQGCEJ12*uq%!!st%q)~KjE6wG?JWRc_&*ydqQnF9ip&ctcaM}2+cm2m>Q z?5No)WQH7Q;~^tAa|n_~m{#yM2QWZKTiV+S%-{~C%p2^?yN)aiXZs<&$DX&vs*eBM z%>|nc;e8GFc_OsXB=cFjt$ElmQpq`o@8J85MMHdofll9i82?n+!2F| zTZg>H>8Uj2;Q)d>E-%!q^JR-@V4?dYv>10#z??jX>}>8%VX$3wx96j(`v z+!i>aMweqjY(6a&XbU~eQ|cxsnLAV zWH}degtq?d)$`+_u#WRS%0rk3L`87)A2+OjCq}c`{2Ck6RsO&JxQeJ4OP?D~ssiLQ z4Wg>#Thu9o@6*uz{>;)xUsxJW{(h})_m|%(MV4%-g3C=2&J5-3BDjbw>6AD-tHSRP z*IfU)+NmF`o|`Pav2ymgCv+&XP}FcgKY7^yWU(); + for (var x = 0; x < columns.Length; x++) { + var column = columns[x]; if (column is not object?[] cells) { if (column is bool occupiedCell) @@ -658,7 +660,7 @@ internal static class LegacyCatalogReader height = Math.Max(height, 1); if (occupiedCell) { - occupied++; + cellsByRow.Add(new AetheriaShapeCell { X = x, Y = 0 }); } } @@ -666,10 +668,22 @@ internal static class LegacyCatalogReader } height = Math.Max(height, cells.Length); - occupied += cells.Count(cell => cell is true); + for (var y = 0; y < cells.Length; y++) + { + if (cells[y] is true) + { + cellsByRow.Add(new AetheriaShapeCell { X = x, Y = y }); + } + } } - return new ShapeFacts(width, height, occupied); + return new ShapeFacts( + width, + height, + cellsByRow + .OrderBy(cell => cell.Y) + .ThenBy(cell => cell.X) + .ToArray()); } private static object? UnwrapShapeMatrix(object? value) @@ -684,4 +698,9 @@ internal sealed record LegacyCatalogEntry( AetheriaCorporation? Corporation, AetheriaNameFile? NameFile); -internal readonly record struct ShapeFacts(int Width, int Height, int OccupiedCells); +internal readonly record struct ShapeFacts(int Width, int Height, AetheriaShapeCell[] Cells) +{ + public static ShapeFacts Empty { get; } = new(0, 0, []); + + public int OccupiedCells => Cells.Length; +} diff --git a/Aetheria.State.Unity.Smoke/Program.cs b/Aetheria.State.Unity.Smoke/Program.cs index 690fe91c5..ea2a561d3 100644 --- a/Aetheria.State.Unity.Smoke/Program.cs +++ b/Aetheria.State.Unity.Smoke/Program.cs @@ -25,6 +25,19 @@ if (catalog.EquipmentItems.Count == 0) throw new InvalidOperationException("Runtime catalog has no equipment items."); } +var shaped = catalog.Items.FirstOrDefault(item => item.ShapeCells.Count > 0) + ?? throw new InvalidOperationException("Runtime catalog has no typed shape masks."); +if (shaped.ShapeCells.Count != shaped.OccupiedCells) +{ + throw new InvalidOperationException( + $"Runtime shape mask count mismatch for {shaped.Name}: cells={shaped.ShapeCells.Count}, occupied={shaped.OccupiedCells}."); +} + +if (shaped.ShapeCells.Any(cell => cell.X < 0 || cell.Y < 0 || cell.X >= shaped.ShapeWidth || cell.Y >= shaped.ShapeHeight)) +{ + throw new InvalidOperationException($"Runtime shape mask has out-of-bounds cells for {shaped.Name}."); +} + var behaviorKind = catalog.Items.SelectMany(item => item.BehaviorKinds).FirstOrDefault() ?? throw new InvalidOperationException("Runtime catalog has no behavior kind fingerprints."); if (!catalog.FindItemsByBehavior(behaviorKind).Any()) @@ -53,5 +66,6 @@ if (surface?.Schema != "gamecult.eve.surface.v1" || Console.WriteLine($"Aetheria Unity runtime catalog smoke passed: {statePath}"); Console.WriteLine($"Items/trade/equipment: {catalog.Items.Count}/{catalog.TradeItems.Count}/{catalog.EquipmentItems.Count}"); +Console.WriteLine($"Shape mask sample: {shaped.Name} {shaped.ShapeWidth}x{shaped.ShapeHeight}/{shaped.ShapeCells.Count}"); Console.WriteLine($"Behavior sample: {behaviorKind}"); Console.WriteLine($"Eve surface: {surface.Surface.Id}"); diff --git a/Aetheria.State.Unity/AetheriaRuntimeCatalogSnapshot.cs b/Aetheria.State.Unity/AetheriaRuntimeCatalogSnapshot.cs index ee10febc2..aebef747f 100644 --- a/Aetheria.State.Unity/AetheriaRuntimeCatalogSnapshot.cs +++ b/Aetheria.State.Unity/AetheriaRuntimeCatalogSnapshot.cs @@ -107,6 +107,7 @@ public sealed class AetheriaRuntimeCatalogItem int shapeWidth, int shapeHeight, int occupiedCells, + IReadOnlyList shapeCells, string hardpointType, string hullType, IReadOnlyList behaviorKinds, @@ -129,6 +130,7 @@ public sealed class AetheriaRuntimeCatalogItem ShapeWidth = shapeWidth; ShapeHeight = shapeHeight; OccupiedCells = occupiedCells; + ShapeCells = shapeCells; HardpointType = hardpointType; HullType = hullType; BehaviorKinds = behaviorKinds; @@ -152,6 +154,7 @@ public sealed class AetheriaRuntimeCatalogItem public int ShapeWidth { get; } public int ShapeHeight { get; } public int OccupiedCells { get; } + public IReadOnlyList ShapeCells { get; } public string HardpointType { get; } public string HullType { get; } public IReadOnlyList BehaviorKinds { get; } @@ -177,6 +180,7 @@ public sealed class AetheriaRuntimeCatalogItem item.ShapeWidth, item.ShapeHeight, item.OccupiedCells, + item.ShapeCells.Select(AetheriaRuntimeShapeCell.FromState).ToArray(), item.HardpointType, item.HullType, item.BehaviorKinds, @@ -190,6 +194,24 @@ public sealed class AetheriaRuntimeCatalogItem } } +public sealed class AetheriaRuntimeShapeCell +{ + public AetheriaRuntimeShapeCell(int x, int y) + { + X = x; + Y = y; + } + + public int X { get; } + + public int Y { get; } + + public static AetheriaRuntimeShapeCell FromState(AetheriaShapeCell cell) + { + return new AetheriaRuntimeShapeCell(cell.X, cell.Y); + } +} + public sealed class AetheriaRuntimeCorporation { public AetheriaRuntimeCorporation( diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index 13cb6ba00..117080ff9 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -43,6 +43,7 @@ if (nameFiles.Length == 0) var pricedItems = items.Count(item => item.Price > 0); var manufacturedItems = items.Count(item => !string.IsNullOrWhiteSpace(item.ManufacturerLegacyId)); var shapedItems = items.Count(item => item.ShapeWidth > 0 && item.ShapeHeight > 0 && item.OccupiedCells > 0); +var shapedMaskItems = items.Count(item => item.ShapeCells.Length > 0); var behaviorItems = items.Count(item => item.BehaviorCount > 0 && item.BehaviorKinds.Length > 0); var hardpointItems = items.Count(item => !string.IsNullOrWhiteSpace(item.HardpointType)); var hullItems = items.Count(item => !string.IsNullOrWhiteSpace(item.HullType)); @@ -68,6 +69,26 @@ if (shapedItems == 0) throw new InvalidOperationException("Typed item definitions did not import any shape dimensions."); } +if (shapedMaskItems != shapedItems) +{ + throw new InvalidOperationException( + $"Typed item shape mask import mismatch: masks={shapedMaskItems}, shaped={shapedItems}."); +} + +foreach (var item in items.Where(item => item.ShapeCells.Length > 0)) +{ + if (item.ShapeCells.Length != item.OccupiedCells) + { + throw new InvalidOperationException( + $"Typed item shape mask cell count mismatch for {item.Name}: cells={item.ShapeCells.Length}, occupied={item.OccupiedCells}."); + } + + if (item.ShapeCells.Any(cell => cell.X < 0 || cell.Y < 0 || cell.X >= item.ShapeWidth || cell.Y >= item.ShapeHeight)) + { + throw new InvalidOperationException($"Typed item shape mask has out-of-bounds cells for {item.Name}."); + } +} + if (behaviorItems == 0) { throw new InvalidOperationException("Typed item definitions did not import any behavior fingerprints."); @@ -179,6 +200,7 @@ Console.WriteLine($"Aetheria typed state verify passed: {statePath}"); Console.WriteLine($"Catalog fingerprint: {quarantine.CatalogFingerprint}"); Console.WriteLine($"Item definitions: {items.Length}"); Console.WriteLine($"Priced/manufactured/shaped items: {pricedItems}/{manufacturedItems}/{shapedItems}"); +Console.WriteLine($"Shape masks: {shapedMaskItems}"); Console.WriteLine($"Behavior/hardpoint/hull/weapon items: {behaviorItems}/{hardpointItems}/{hullItems}/{weaponItems}"); Console.WriteLine($"Typed catalog trade items: {tradeItems.Length}"); Console.WriteLine($"Eve catalog surface: {surface.Surface.Id} ({surface.Surface.Root.Children.Length} root children)"); diff --git a/Aetheria.State/Documents/AetheriaItemDefinition.cs b/Aetheria.State/Documents/AetheriaItemDefinition.cs index 90d5ad3c0..00e904ba1 100644 --- a/Aetheria.State/Documents/AetheriaItemDefinition.cs +++ b/Aetheria.State/Documents/AetheriaItemDefinition.cs @@ -87,4 +87,17 @@ public sealed class AetheriaItemDefinition [Key(24)] public string WeaponModifiers { get; set; } = ""; + + [Key(25)] + public AetheriaShapeCell[] ShapeCells { get; set; } = []; +} + +[MessagePackObject] +public sealed class AetheriaShapeCell +{ + [Key(0)] + public int X { get; set; } + + [Key(1)] + public int Y { get; set; } } diff --git a/Aetheria.State/README.md b/Aetheria.State/README.md index a222c9f6c..61dd20130 100644 --- a/Aetheria.State/README.md +++ b/Aetheria.State/README.md @@ -46,15 +46,16 @@ raw MessagePack union pass that maps stable catalog fields into typed item/faction/name-file documents without compiling Unity's legacy domain model into `Aetheria.State`. The current checked-in catalog maps to 115 item definitions, 12 factions, and 12 name files. Typed item definitions include -legacy manufacturer IDs, price, shape dimensions, occupied cell counts, and +legacy manufacturer IDs, price, shape dimensions, occupied cell counts, full +shape-cell masks, and stable equipment facets: hardpoint type, hull type, behavior kind fingerprints, stack size, durability, and weapon range/caliber/type/fire/modifier classifications. Typed corporation documents include the legacy short name, the true description field from key 3, name-file and boss-hull legacy IDs, influence distance, -allegiance count, and music bank IDs. Runtime object graphs, behaviors, full -Unity shape masks, and simulation state remain legacy until dedicated typed -documents exist. +allegiance count, and music bank IDs. Runtime object graphs, full behavior +payloads, and simulation state remain legacy until dedicated typed documents +exist. Legacy GUID references that are `Guid.Empty` are imported as absent references, not as resolvable catalog links. @@ -73,16 +74,18 @@ Unity UI Toolkit lowering package exists. `Aetheria.State.Unity` is the Unity-facing runtime read facade over typed state. It opens `aetheria-world.cc`, emits immutable catalog read models for trade, equipment, behavior, hardpoint, manufacturer, corporation, and name-file -queries, and can read the published Eve catalog surface. It does not deserialize -legacy `DatabaseEntry` objects and does not write state. Unity can use this as -the first package boundary once CultLib/Eve runtime packaging is available. +queries, exposes typed item shape masks for layout and fitting consumers, and +can read the published Eve catalog surface. It does not deserialize legacy +`DatabaseEntry` objects and does not write state. Unity can use this as the +first package boundary once CultLib/Eve runtime packaging is available. `Aetheria.State.Verify` opens a materialized state file and checks that the typed migration ledger matches the actual item, corporation, and name-file records in the `.cc` store. It also verifies the canonical legacy-ID lookup API for one migrated record of each catalog kind and checks that expanded item and corporation catalog facts survived materialization. The verifier also exercises -the typed catalog snapshot query surface and the published Eve catalog surface. +the typed catalog snapshot query surface, shape-mask invariants, and the +published Eve catalog surface. Use it after import when `GameData/aetheria-world.cc` changes. `Aetheria.State.Unity.Smoke` opens the materialized state through the runtime diff --git a/GameData/aetheria-world.cc b/GameData/aetheria-world.cc index 1424539f578af68a753339a1766ff299cfc60402..b50b9e2a43c1a2881fffb554b479af0d8652ee0e 100644 GIT binary patch delta 319 zcmbu4y-EW?6h;k_VidBCg^_Kt5p1@&^FJd&gna?QQbgw7nMFbrL98W@Ak$b_Sc^qq zU&K~PVP&mvV5;~4Rv+gS2fokyw|Q^z#E!KC%h4$>5ENM+rBH@Y*a$w!Btrll#A*mF zw?R1tM2TCjxriWmUb3Uc6L=F)8ZcInA>MlDQ?OCU1g(#V&Z71PO`r&*TLihvqvsSz zOZq4-^3VQm{$fS$_sZ^hYdXl^eYPWXU0sK(R2^2Qm*FNgX*SD?gPQ%(Ni}W$dt$k< gm*=AF?uL`i;&J%0uHU}b`C&BLUW>Ey?zL3oU&0w-cK`qY delta 251 zcmbu(v28*z5CG7ih~lFNY7kV>?|o&++U8}j$?G@&=*NXKm*m{vgJY5V*pG6y>KqhidCjTnW9OEo`eK3TYGdL zpTmG2j0_ck91seI8l!0f$dbHrVx^iWE1RvTQ$oJ@%{ZYrD#9Ja78