From 7084b8137e697a7fc669f9fa2b1c317141476aa3 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Sun, 14 Jun 2026 06:09:23 +0100 Subject: [PATCH] Use typed behavior kinds for weapon articulation --- .voidbot/state/aetheria.cc | Bin 68793 -> 68753 bytes Assets/Scripts/Gameplay/ActionGameManager.cs | 17 ++++++++++++++++- docs/aetheria-perfect-machine-map.md | 11 ++++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.voidbot/state/aetheria.cc b/.voidbot/state/aetheria.cc index c2f628ab8a0a3a87fa3dfa535a95caba0aa6fb6e..23f25f9ee49f48a1fdebc4cc50e7d27331dac052 100644 GIT binary patch delta 1091 zcmaJ=O=uHA7y)(c0* zt`CpewXx`D@oesJ?6tkaP!KI&blJhDZn==jULCAxEwGbB-kA#A{$k1UVkV1oT@tNa- z=_Xg2%q2@)s>&i4El{$f?U&=o#r^H=354e5lrY?MA=Jp+AbLDkz*_fG#)%%oAaq<# zT~Lg)qWf>pMO#y)<;&bK-=0bZk*3F{aeKwipWMU(8VDBli9wMXxF1MmP*_MWII^~481}Ra!z}a7y>$MCWb7dXnWl-q0z7H54S`7i_i9vYr{PcWCz{x z_!0x+`?5-<^je5j6%h`rB2z*FZ9#=GkN!Ahe#?DuK)Rkp?~|ZF8_)a2$FH^qj?K+Y$QFK+1gM`% zg)QzU&$5QrGNoM}WIPAtJ3hbjz1V0RV8UKtc4s2ZYk%GJQ#uykW>1~S#&D#z@WK#B z?;NVdUw(ZoT#T{1*yW0Yaw>i{d#{`S&WMhm{XSkkn!k^>iUYlwzBZK1^z$8SBL_x$ jLw3G(ho!TMCrp|OR(V(ySa delta 1023 zcmaJ=J!lj`6n5`|8Uh9(CK!x9Y&4)pa{1A-5%MERA&QC3SUzh=^^Uh2na<%W z!=t&&h4JF5b;5kjtRxSGp?v%xvJa2M8HFM9D?4T_HqLd}-v*w~X{N6W$1S@kfr}bQ zWR3z|5703W_6J6xEF_e$$`)Muka$0ICHly<0>+(IL{THqOjb}U^J1%)Pg7d+~kCJIua0nF|w$*pOS#?v2 zyJ$xtbpd>)?W)TwpsSeh0<-z9cc~;@r-I;eErk=>=m0Y5kqo&Fja*Uj?)Mf4aESy2 zC`k^VaT_59L$Y}!m(s51fh~N5vJ^geSYdWOshOI;0YM8;4ic1RX1lwK0d)<8WU_9G z+XDp%Idy7@N-8OZ3T(!yJ6A+Gr9gjWw*n5CVQa5$mZy7`eoP6nP?JeY3yIJ!Zt81{ z?tm9?Ez}{U$AoG^-UC$?q33`v7D%7}@fKW*6p##W6L!KUMU7M^u_MTy#{z{ZWg(-< zP>VvP=0-Is(t;h}CTbj|YOL(^cb&d7A)Go{84wR!NRqsroLS!Q8H6Oi>IU)B(2_Ej zN4`f4lGRBpH?PHD`8A{%}0wq8A}_jD%e%D?d1 zxlcKCBRcAA-YoW;XZ%#->d$=7@#Fw6jTc{PR#AJ0h8vH6f5|k;e~xt?ZN|(_wm&`0 s{7`h5PqwVj&4 ArticulatedWeaponBehaviorKinds = new HashSet(StringComparer.Ordinal) + { + "GuidedWeapon", + "InstantWeapon", + "ConstantWeapon", + "ChargedWeapon", + "AutoWeapon" + }; + // Always check for null if accessing from anywhere that might not be in-game (e.g. menu UI) public static ActionGameManager Instance { get; private set; } private static DirectoryInfo _gameDataDirectory; @@ -1253,7 +1262,7 @@ public class ActionGameManager : MonoBehaviour FollowCamera.LookAt = ZoneRenderer.EntityInstances[CurrentEntity].LookAtPoint; FollowCamera.Follow = ZoneRenderer.EntityInstances[CurrentEntity].transform; _articulationGroups = CurrentEntity.Equipment - .Where(item => item.Behaviors.Any(x => x.Data is WeaponData && !(x.Data is LauncherData))) + .Where(HasArticulatedWeaponBehavior) .GroupBy(item => ZoneRenderer.EntityInstances[CurrentEntity] .GetBarrel(CurrentEntity.Hardpoints[item.Position.x, item.Position.y]) .GetComponentInParent()?.Group ?? -1) @@ -1353,6 +1362,12 @@ public class ActionGameManager : MonoBehaviour }).ToArray(); } + private bool HasArticulatedWeaponBehavior(EquippedItem item) + { + var typedItem = ItemManager.GetRuntimeItem(item.EquippableItem); + return typedItem?.BehaviorKinds.Any(ArticulatedWeaponBehaviorKinds.Contains) == true; + } + private void UpdatePlayerPanel() { ShipPanel.Display(CurrentEntity, true); diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index 42e219800..f859af94f 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -89,9 +89,11 @@ legacy catalog cache, and legacy UI paths should be migration-only or deleted. Gear action-bar bindings use typed weapon and hardpoint facets for fallback icon selection and fall back to a generic tool icon when typed facets are incomplete; legacy custom action-bar icon paths remain fallback projection - data because typed icon fields are not yet present. Unity boot reads typed - player settings back through the package-owned CultCache reader before falling - back to defaults. + data because typed icon fields are not yet present. Player camera articulation + grouping now classifies equipped non-launcher weapons through typed behavior + kind rows instead of inspecting runtime `BehaviorData` subclasses. Unity boot + reads typed player settings back through the package-owned CultCache reader + before falling back to defaults. - The combat schematic HUD uses typed runtime catalog weapon facets for its static weapon icon strip; missing typed weapon facets no longer fall back to legacy `WeaponItemData`. @@ -684,6 +686,9 @@ First Aetheria surfaces to publish: - Done: move action-bar consumable drop binding onto typed catalog rows; legacy `ConsumableItemData` resolution is lazy and bounded to activation and active-duration fill until typed consumable effect execution exists. + - Done: move player camera articulation grouping for equipped non-launcher + weapons onto typed behavior-kind rows instead of runtime `BehaviorData` + type inspection. - Done: import typed thermal bounds and move schematic HUD heat-fill ranges onto typed catalog rows. - Done: import typed item specific heat and move `ItemManager` generic mass,