From fed07590742ae5a884f2524a7b8ad05653d907ba Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Wed, 17 Jun 2026 02:39:13 +0100 Subject: [PATCH] Delete dead inventory weapon group shell --- Aetheria.State.Verify/Program.cs | 69 ++- .../Fancy/Weapon Group.prefab | 397 ------------------ .../Fancy/Weapon Group.prefab.meta | 7 - .../Fancy/Weapon Groups.prefab | 330 --------------- .../Fancy/Weapon Groups.prefab.meta | 7 - .../UI/Properties Panel/Properties.prefab | 2 - Assets/Scenes/ARPG.unity | 4 - Assets/Scripts/Gameplay/ActionGameManager.cs | 16 - .../Scripts/UI/Menu/WeaponGroupAssignment.cs | 56 --- .../UI/Menu/WeaponGroupAssignment.cs.meta | 11 - Assets/Scripts/UI/Menu/WeaponGroupElement.cs | 15 - .../UI/Menu/WeaponGroupElement.cs.meta | 11 - .../UI/Properties Panel/PropertiesPanel.cs | 82 ---- docs/aetheria-perfect-machine-map.md | 7 +- 14 files changed, 31 insertions(+), 983 deletions(-) delete mode 100644 Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Group.prefab delete mode 100644 Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Group.prefab.meta delete mode 100644 Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Groups.prefab delete mode 100644 Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Groups.prefab.meta delete mode 100644 Assets/Scripts/UI/Menu/WeaponGroupAssignment.cs delete mode 100644 Assets/Scripts/UI/Menu/WeaponGroupAssignment.cs.meta delete mode 100644 Assets/Scripts/UI/Menu/WeaponGroupElement.cs delete mode 100644 Assets/Scripts/UI/Menu/WeaponGroupElement.cs.meta diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs index f6bf7a801..99f7d6b74 100644 --- a/Aetheria.State.Verify/Program.cs +++ b/Aetheria.State.Verify/Program.cs @@ -3315,6 +3315,7 @@ static void RequirePropertiesPanelReadOnlyInspector(string root) { "Inspect(object obj", "Inspect(object obj, FieldInfo field", + "public void Inspect(EquippedItem item)", "GetCustomAttribute", "type.GetCustomAttribute()", "field.GetValue(obj)", @@ -3322,7 +3323,12 @@ static void RequirePropertiesPanelReadOnlyInspector(string root) "field.SetValue", "f => field.SetValue", "i => field.SetValue", - "b => field.SetValue" + "b => field.SetValue", + "public WeaponGroupAssignment WeaponGroupAssignment;", + "public RectTransform DragParent;", + "CommitEquippedItemOverrideShutdown(", + "CommitThermotoggleTargetTemperature(", + "WeaponGroupDragObject" }; var hits = forbiddenSymbols @@ -3582,33 +3588,32 @@ static void RequireWeaponGroupCommitAuthority(string root) "Weapon group membership no longer has a gameplay-owned checkpoint commit primitive."); } - var assignmentPath = Path.Combine(root, "Assets", "Scripts", "UI", "Menu", "WeaponGroupAssignment.cs"); - var assignment = File.Exists(assignmentPath) - ? File.ReadAllText(assignmentPath) - : throw new InvalidOperationException("Cannot verify weapon group authority; WeaponGroupAssignment.cs is missing."); - - var forbiddenSymbols = new[] - { - ".WeaponGroups[i1].items.Add", - ".WeaponGroups[i1].items.Remove", - ".WeaponGroups[i1].weapons.Add", - ".WeaponGroups[i1].weapons.Remove" - }; - - var hits = forbiddenSymbols - .Where(symbol => assignment.Contains(symbol, StringComparison.Ordinal)) - .ToArray(); - - if (hits.Length > 0) + if (actionGameManager.Contains("WeaponGroupDragObject", StringComparison.Ordinal)) { throw new InvalidOperationException( - "WeaponGroupAssignment still mutates weapon groups directly: " + - string.Join(", ", hits)); + "Weapon-group action-bar binding still keeps the dead drag-object path alive instead of routing through live gameplay APIs."); } - if (!assignment.Contains("CommitWeaponGroupMembership", StringComparison.Ordinal)) + var assignmentPath = Path.Combine(root, "Assets", "Scripts", "UI", "Menu", "WeaponGroupAssignment.cs"); + var elementPath = Path.Combine(root, "Assets", "Scripts", "UI", "Menu", "WeaponGroupElement.cs"); + var weaponGroupsPrefabPath = Path.Combine(root, "Assets", "Prefabs", "UI", "Properties Panel", "Fancy", "Weapon Groups.prefab"); + var weaponGroupPrefabPath = Path.Combine(root, "Assets", "Prefabs", "UI", "Properties Panel", "Fancy", "Weapon Group.prefab"); + + var survivingLegacyPaths = new[] { - throw new InvalidOperationException("WeaponGroupAssignment no longer routes membership changes through ActionGameManager."); + assignmentPath, + elementPath, + weaponGroupsPrefabPath, + weaponGroupPrefabPath + } + .Where(File.Exists) + .ToArray(); + + if (survivingLegacyPaths.Length > 0) + { + throw new InvalidOperationException( + "Legacy inventory weapon-group uGUI shells still survive after the Eve surface cut: " + + string.Join(", ", survivingLegacyPaths.Select(path => Path.GetRelativePath(root, path)))); } } @@ -4102,24 +4107,6 @@ static bool ContainsBehaviorValueKind(AetheriaBehaviorValue value, string kind) value.MapEntries.Any(entry => ContainsBehaviorValueKind(entry.Value, kind)); } -static int CountOccurrences(string source, string pattern) -{ - if (string.IsNullOrEmpty(source) || string.IsNullOrEmpty(pattern)) - { - return 0; - } - - var count = 0; - var index = 0; - while ((index = source.IndexOf(pattern, index, StringComparison.Ordinal)) >= 0) - { - count++; - index += pattern.Length; - } - - return count; -} - static int CountRequiredBehaviorItemRefsMissingItemKeys(AetheriaBehaviorPayload payload) { return payload.Fields.Count(field => diff --git a/Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Group.prefab b/Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Group.prefab deleted file mode 100644 index 95677030e..000000000 --- a/Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Group.prefab +++ /dev/null @@ -1,397 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &8854537499097178561 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8854537499097178562} - - component: {fileID: 8854537499097178565} - - component: {fileID: 8854537499097178564} - - component: {fileID: 8854537499097178563} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8854537499097178562 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8854537499097178561} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7093141058661617964} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8854537499097178565 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8854537499097178561} - m_CullTransparentMesh: 1 ---- !u!114 &8854537499097178564 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8854537499097178561} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: G1 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 53555f7a2d5e745428813f1b1118734f, type: 2} - m_sharedMaterial: {fileID: -2804126062856497447, guid: 53555f7a2d5e745428813f1b1118734f, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294964185 - m_fontColor: {r: 0.85, g: 0.95199996, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 12 - m_fontSizeBase: 12 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 10 - m_fontSizeMax: 14 - m_fontStyle: 33 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &8854537499097178563 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8854537499097178561} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 8854537499097178564} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &8854537499952373069 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8854537499952373070} - - component: {fileID: 8854537499952373056} - - component: {fileID: 8854537499952373071} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8854537499952373070 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8854537499952373069} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7093141058661617964} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8854537499952373056 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8854537499952373069} - m_CullTransparentMesh: 1 ---- !u!114 &8854537499952373071 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8854537499952373069} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.8, g: 0.9333333, b: 1, a: 0.03137255} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7ed12bf887e951949bd02894a21fb3ff, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &9223028044370770576 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7093141058661617964} - - component: {fileID: 5236190267576759953} - - component: {fileID: 9223028044370770578} - - component: {fileID: 9223028044370770577} - - component: {fileID: 3575432560508143777} - - component: {fileID: 2103399013588393016} - - component: {fileID: 8960961965027693801} - - component: {fileID: 2070497072283402020} - m_Layer: 5 - m_Name: Weapon Group - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7093141058661617964 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9223028044370770576} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 8854537499952373070} - - {fileID: 8854537499097178562} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 12, y: -12} - m_SizeDelta: {x: 24, y: 24} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5236190267576759953 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9223028044370770576} - m_CullTransparentMesh: 1 ---- !u!114 &9223028044370770578 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9223028044370770576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: 1080 - m_PreferredHeight: 1080 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &9223028044370770577 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9223028044370770576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a588f4b3f3e229540a82e5f976b08e2d, type: 3} - m_Name: - m_EditorClassIdentifier: - aspectRatio: 1 - updateMin: 0 - updatePreferred: 1 ---- !u!114 &3575432560508143777 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9223028044370770576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 27f5673ad060b834489cad765159cb84, type: 3} - m_Name: - m_EditorClassIdentifier: - Label: {fileID: 8854537499097178564} - Button: {fileID: 8854537499097178563} - BeginDragTrigger: {fileID: 2103399013588393016} - DragTrigger: {fileID: 8960961965027693801} - EndDragTrigger: {fileID: 2070497072283402020} ---- !u!114 &2103399013588393016 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9223028044370770576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3a81a9b6bec6b4f4fba7e0047cd989f6, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &8960961965027693801 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9223028044370770576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 79db090dc9e4db245821e8b89b0e208e, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2070497072283402020 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9223028044370770576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b8ce8424f238d6842bd8b09c0cca1ac4, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Group.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Group.prefab.meta deleted file mode 100644 index da7d6e862..000000000 --- a/Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Group.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b987fd2e2a9af93459f01eed2609a58b -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Groups.prefab b/Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Groups.prefab deleted file mode 100644 index 77e704a12..000000000 --- a/Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Groups.prefab +++ /dev/null @@ -1,330 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &913394255187743890 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7044292112900681436} - - component: {fileID: 835890040255913825} - - component: {fileID: 4589204584295863281} - m_Layer: 5 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7044292112900681436 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 913394255187743890} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7017012055636029233} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -2} - m_SizeDelta: {x: -16, y: -4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &835890040255913825 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 913394255187743890} - m_CullTransparentMesh: 1 ---- !u!114 &4589204584295863281 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 913394255187743890} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Weapon Groups - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 53555f7a2d5e745428813f1b1118734f, type: 2} - m_sharedMaterial: {fileID: -2804126062856497447, guid: 53555f7a2d5e745428813f1b1118734f, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4279071487 - m_fontColor: {r: 1, g: 0.44583336, b: 0.050000012, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 16 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4617351576505393965 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4617351576505394386} - - component: {fileID: 4617351576505394387} - m_Layer: 5 - m_Name: Group Container - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4617351576505394386 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4617351576505393965} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7017012055636029233} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 8} - m_SizeDelta: {x: -16, y: 24} - m_Pivot: {x: 0.5, y: 0} ---- !u!114 &4617351576505394387 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4617351576505393965} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 8 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!1 &6173357060473159663 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7017012055636029233} - - component: {fileID: 1187566180789453781} - - component: {fileID: 9198057411594340877} - - component: {fileID: 2147666021289938829} - - component: {fileID: 6173357060473159660} - - component: {fileID: 8654742830357802168} - m_Layer: 5 - m_Name: Weapon Groups - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7017012055636029233 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6173357060473159663} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7044292112900681436} - - {fileID: 4617351576505394386} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1187566180789453781 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6173357060473159663} - m_CullTransparentMesh: 1 ---- !u!114 &9198057411594340877 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6173357060473159663} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.45402354, g: 0.45402354, b: 0.603, a: 0.039215688} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 84d126f984de5fd42ac66361c00f830c, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2147666021289938829 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6173357060473159663} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b403db1d8980f544099fedf5735cf364, type: 3} - m_Name: - m_EditorClassIdentifier: - Label: {fileID: 4589204584295863281} - Value: {fileID: 0} ---- !u!114 &6173357060473159660 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6173357060473159663} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: -1 - m_PreferredHeight: 64 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 ---- !u!114 &8654742830357802168 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6173357060473159663} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b9b213fc96d20d848819b8159412680c, type: 3} - m_Name: - m_EditorClassIdentifier: - Container: {fileID: 4617351576505394386} - GroupPrefab: {fileID: 3575432560508143777, guid: b987fd2e2a9af93459f01eed2609a58b, - type: 3} - ActiveColor: {r: 1, g: 0.44583336, b: 0.050000012, a: 1} - InactiveColor: {r: 0.6037736, g: 0.6037736, b: 0.6037736, a: 1} diff --git a/Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Groups.prefab.meta b/Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Groups.prefab.meta deleted file mode 100644 index 58ffebfef..000000000 --- a/Assets/Prefabs/UI/Properties Panel/Fancy/Weapon Groups.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: fbe6efeb205a68946af7a6f1cb8b9904 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/UI/Properties Panel/Properties.prefab b/Assets/Prefabs/UI/Properties Panel/Properties.prefab index 29d281e03..69df4a505 100644 --- a/Assets/Prefabs/UI/Properties Panel/Properties.prefab +++ b/Assets/Prefabs/UI/Properties Panel/Properties.prefab @@ -787,8 +787,6 @@ MonoBehaviour: CurveField: {fileID: 3018914896466881005, guid: 168887bbd3de8c74eb3f06d3d46dda4e, type: 3} Content: {fileID: 257019179596293679} - WeaponGroupAssignment: {fileID: 8654742830357802168, guid: fbe6efeb205a68946af7a6f1cb8b9904, - type: 3} SelectedChild: {fileID: 0} GameManager: {fileID: 0} --- !u!222 &7131821417165215473 diff --git a/Assets/Scenes/ARPG.unity b/Assets/Scenes/ARPG.unity index b554e6477..294e22584 100644 --- a/Assets/Scenes/ARPG.unity +++ b/Assets/Scenes/ARPG.unity @@ -9890,9 +9890,7 @@ MonoBehaviour: type: 3} StatSheet: {fileID: 0} CurveField: {fileID: 0} - WeaponGroupAssignment: {fileID: 0} Content: {fileID: 620555923} - DragParent: {fileID: 0} GameManager: {fileID: 0} CancelClickCatcher: {fileID: 1420548305} ButtonGroup: {fileID: 947321577} @@ -36898,9 +36896,7 @@ MonoBehaviour: type: 3} StatSheet: {fileID: 0} CurveField: {fileID: 0} - WeaponGroupAssignment: {fileID: 0} Content: {fileID: 3255828831356619720} - DragParent: {fileID: 0} GameManager: {fileID: 0} --- !u!114 &5496444666756201237 MonoBehaviour: diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 7c4d99c76..ba12b14bc 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -865,12 +865,6 @@ public class ActionGameManager : MonoBehaviour return consumable == null ? null : new ActionBarConsumableBinding(entity, slot, consumable); - case WeaponGroupDragObject weaponGroupDragAction: - return entity.WeaponGroups != null && - weaponGroupDragAction.Group >= 0 && - weaponGroupDragAction.Group < entity.WeaponGroups.Length - ? new ActionBarWeaponGroupBinding(entity, slot, weaponGroupDragAction.Group) - : null; default: return null; } @@ -3689,16 +3683,6 @@ public class ActionGameManager : MonoBehaviour public abstract class DragObject{} -public class WeaponGroupDragObject : DragObject -{ - public WeaponGroupDragObject(int group) - { - Group = group; - } - - public int Group { get; } -} - public abstract class ItemDragObject : DragObject { protected ItemDragObject(int2 originCellOffset, ItemInstance item) diff --git a/Assets/Scripts/UI/Menu/WeaponGroupAssignment.cs b/Assets/Scripts/UI/Menu/WeaponGroupAssignment.cs deleted file mode 100644 index 874a96368..000000000 --- a/Assets/Scripts/UI/Menu/WeaponGroupAssignment.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UniRx; -using UnityEngine; -using UnityEngine.EventSystems; - -public class WeaponGroupAssignment : MonoBehaviour -{ - public RectTransform Container; - public WeaponGroupElement GroupPrefab; - public Color ActiveColor; - public Color InactiveColor; - - Subject<(PointerEventData pointerEventData, int group)> _onBeginDrag; - Subject<(PointerEventData pointerEventData, int group)> _onDrag; - Subject<(PointerEventData pointerEventData, int group)> _onEndDrag; - - public List Groups { get; } = new List(); - - public void Inspect(EquippedItem item) - { - var weapon = item.GetBehavior(); - if (weapon == null) throw new ArgumentException($"Attempted to inspect weapon groups on item \"{item.RuntimeItem?.Name ?? "Unknown item"}\" but no weapon is present!"); - var groupCount = ActionGameManager.Instance.Settings.GameplaySettings.WeaponGroupCount; - for (int i = 0; i < groupCount; i++) - { - var i1 = i; - bool groupContainsItem() => item.Entity.WeaponGroups[i1].items.Contains(item); - var group = Instantiate(GroupPrefab, Container); - Groups.Add(group); - group.Label.text = $"G{i+1}"; - group.Label.color = groupContainsItem() ? ActiveColor : InactiveColor; - group.Button.onClick.AddListener(() => - { - var assigned = !groupContainsItem(); - if (ActionGameManager.Instance.CommitWeaponGroupMembership(item, i1, assigned)) - group.Label.color = assigned ? ActiveColor : InactiveColor; - }); - - group.BeginDragTrigger.OnBeginDragAsObservable() - .Subscribe(data => _onBeginDrag?.OnNext((data, i1))); - group.DragTrigger.OnDragAsObservable() - .Subscribe(data => _onDrag?.OnNext((data, i1))); - group.EndDragTrigger.OnEndDragAsObservable() - .Subscribe(data => _onEndDrag?.OnNext((data, i1))); - } - } - - public UniRx.IObservable<(PointerEventData pointerEventData, int group)> OnBeginDragAsObservable() => - _onBeginDrag ?? (_onBeginDrag = new Subject<(PointerEventData pointerEventData, int group)>()); - public UniRx.IObservable<(PointerEventData pointerEventData, int group)> OnDragAsObservable() => - _onDrag ?? (_onDrag = new Subject<(PointerEventData pointerEventData, int group)>()); - public UniRx.IObservable<(PointerEventData pointerEventData, int group)> OnEndDragAsObservable() => - _onEndDrag ?? (_onEndDrag = new Subject<(PointerEventData pointerEventData, int group)>()); -} diff --git a/Assets/Scripts/UI/Menu/WeaponGroupAssignment.cs.meta b/Assets/Scripts/UI/Menu/WeaponGroupAssignment.cs.meta deleted file mode 100644 index 4ba983332..000000000 --- a/Assets/Scripts/UI/Menu/WeaponGroupAssignment.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b9b213fc96d20d848819b8159412680c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/UI/Menu/WeaponGroupElement.cs b/Assets/Scripts/UI/Menu/WeaponGroupElement.cs deleted file mode 100644 index 495267974..000000000 --- a/Assets/Scripts/UI/Menu/WeaponGroupElement.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using TMPro; -using UniRx.Triggers; -using UnityEngine; -using UnityEngine.UI; - -public class WeaponGroupElement : MonoBehaviour -{ - public TextMeshProUGUI Label; - public Button Button; - public ObservableBeginDragTrigger BeginDragTrigger; - public ObservableDragTrigger DragTrigger; - public ObservableEndDragTrigger EndDragTrigger; -} diff --git a/Assets/Scripts/UI/Menu/WeaponGroupElement.cs.meta b/Assets/Scripts/UI/Menu/WeaponGroupElement.cs.meta deleted file mode 100644 index 99c6e5e1b..000000000 --- a/Assets/Scripts/UI/Menu/WeaponGroupElement.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 27f5673ad060b834489cad765159cb84 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs b/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs index 69fbf29a5..27a8f8d71 100644 --- a/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs +++ b/Assets/Scripts/UI/Properties Panel/PropertiesPanel.cs @@ -3,7 +3,6 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ using System; -using System.Collections; using System.Collections.Generic; using System.Globalization; using System.Linq; @@ -11,7 +10,6 @@ using GameCult.Aetheria.State.Unity; using TMPro; using UniRx; using UnityEngine; -using UnityEngine.EventSystems; using UnityEngine.UI; using Unity.Mathematics; using static Unity.Mathematics.math; @@ -36,9 +34,7 @@ public class PropertiesPanel : MonoBehaviour public IncrementField IncrementField; public StatSheet StatSheet; public CurveField CurveField; - public WeaponGroupAssignment WeaponGroupAssignment; public RectTransform Content; - public RectTransform DragParent; [HideInInspector] public ActionGameManager GameManager; @@ -46,9 +42,6 @@ public class PropertiesPanel : MonoBehaviour protected event Action RefreshPropertyValues; protected bool RadioSelection = false; - private RectTransform _dragObject; - - protected event Action OnPropertyAdded; protected Action OnPropertiesChanged; @@ -570,81 +563,6 @@ public class PropertiesPanel : MonoBehaviour $"{name} ({tier.Name}{new string('+', upgrades)})"; } - public void Inspect(EquippedItem item) - { - Clear(); - if (item?.EquippableItem == null) return; - - Title.text = GetTitle(item.EquippableItem); - - AddItemProperties(item.EquippableItem); - AddSpacer(); - - if (item.GetBehavior() != null) - { - var weaponGroups = Instantiate(WeaponGroupAssignment, Content ?? transform); - weaponGroups.Inspect(item); - var dragOffset = Vector2.zero; - Transform dragObject = null; - weaponGroups.OnBeginDragAsObservable().Subscribe(x => - { - //Debug.Log($"Began dragging weapon group {x.group}"); - GameManager.BeginDrag(new WeaponGroupDragObject(x.group)); - dragObject = Instantiate(weaponGroups.Groups[x.group], DragParent, true).transform; - dragOffset = (Vector2)dragObject.position - x.pointerEventData.position; - }); - weaponGroups.OnDragAsObservable().Subscribe(x => - { - dragObject.position = x.pointerEventData.position + dragOffset; - }); - weaponGroups.OnEndDragAsObservable().Subscribe(x => - { - //Debug.Log($"Ended dragging weapon group {x.group}"); - GameManager.EndDrag(); - Destroy(dragObject.gameObject); - }); - Properties.Add(weaponGroups.gameObject); - OnPropertyAdded?.Invoke(weaponGroups.gameObject); - } - - var typedItem = FindTypedPropertyItem(item.EquippableItem); - var thermalRange = GetThermalRange(typedItem); - var thermalCurve = GetThermalPerformanceCurve(typedItem); - var statusSheet = AddStatSheet(); - if (item.EquippableItem.Durability < .01f) - statusSheet.AddStat("Durability", () => "Item Destroyed!"); - else statusSheet.AddStat("Durability", () => $"{(int)(item.EquippableItem.Durability / GetMaxDurability(item.EquippableItem) * 100)}%"); - statusSheet.AddStat("Temperature", () => ActionGameManager.RuntimePlayerSettings.FormatTemperature(item.Temperature)); - - var heatCurve = AddCurveField(); - heatCurve.Show( - "Thermal Performance", - thermalCurve, - t => ActionGameManager.RuntimePlayerSettings.FormatTemperature(lerp(thermalRange.minimum, thermalRange.maximum, t)), - true); - RefreshPropertyValues += () => heatCurve.SetCurrent(unlerp(thermalRange.minimum, thermalRange.maximum, item.Temperature)); - AddEquippableItemProperties(item.EquippableItem, item.Evaluate); - AddSpacer(); - - AddField("Override Shutdown", - () => item.EquippableItem.OverrideShutdown, - b => ActionGameManager.Instance?.CommitEquippedItemOverrideShutdown(item, b)); - - foreach (var behavior in item.Behaviors) - { - switch (behavior) - { - case Thermotoggle thermotoggle when thermotoggle.Adjustable: - AddField("Target Temperature", - () => thermotoggle.TargetTemperature, - temp => ActionGameManager.Instance?.CommitThermotoggleTargetTemperature(thermotoggle, temp)); - break; - } - } - - RefreshValues(); - } - public void Inspect(ItemInstance item) { Clear(); diff --git a/docs/aetheria-perfect-machine-map.md b/docs/aetheria-perfect-machine-map.md index bc0eddd82..3e58b0645 100644 --- a/docs/aetheria-perfect-machine-map.md +++ b/docs/aetheria-perfect-machine-map.md @@ -1521,10 +1521,9 @@ First Aetheria surfaces to publish: in a dialog, but gameplay owns the entity `Name` mutation and queues the typed entity snapshot checkpoint. - Done: route weapon group membership changes through - `ActionGameManager.CommitWeaponGroupMembership`. `WeaponGroupAssignment` - remains a uGUI control for now, but it no longer adds/removes items or - weapons from `Entity.WeaponGroups` directly; gameplay owns the membership - mutation and typed checkpoint. + `ActionGameManager.CommitWeaponGroupMembership`. The old + `WeaponGroupAssignment` uGUI shell and its prefab chain have been deleted; + gameplay owns the membership mutation and typed checkpoint outright. - Done: route action-bar drag/drop bindings through `ActionGameManager.CommitActionBarBinding`, and restore them from typed run-state descriptors when the current entity changes or a typed continue