fix: making key press 1 revive and pickup/drop pots [MTT-4802]

Assets/Prefabs/Character/PlayerAvatar.prefab

@@ -176,6 +176,10 @@ PrefabInstance:
       propertyPath: animator
       value: 
       objectReference: {fileID: 1829276847453002016}
+    - target: {fileID: 7420593339233078707, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
+      propertyPath: m_ClientCharacter
+      value: 
+      objectReference: {fileID: 7209204667172237188}
     - target: {fileID: 7420593339233078707, guid: 0d2d836e2e83b754fa1a1c4022d6d65d, type: 3}
       propertyPath: m_ClientVisualization
       value: 
@@ -278,6 +282,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 331c67f15523ad7419792662b9768f44, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_ServerCharacter: {fileID: 741733315856861890}
   m_PhysicsWrapper: {fileID: 6116655102486013040}
 --- !u!114 &4887850889182527394
 MonoBehaviour:

Assets/Scripts/Gameplay/GameplayObjects/RuntimeDataContainers/GameDataSource.cs

@@ -84,6 +84,21 @@ public Action GetActionPrototypeByID(ActionID index)
             return m_AllActions[index.ID];
         }
 
+        public bool TryGetActionPrototypeByID(ActionID index, out Action action)
+        {
+            for (int i = 0; i < m_AllActions.Count; i++)
+            {
+                if (m_AllActions[i].ActionID == index)
+                {
+                    action = m_AllActions[i];
+                    return true;
+                }
+            }
+
+            action = null;
+            return false;
+        }
+
         /// <summary>
         /// Contents of the CharacterData list, indexed by CharacterType for convenience.
         /// </summary>

Assets/Scripts/Gameplay/UI/HeroActionBar.cs

@@ -3,7 +3,6 @@
 using Unity.BossRoom.Gameplay.UserInput;
 using Unity.BossRoom.Gameplay.GameplayObjects;
 using Unity.BossRoom.Gameplay.GameplayObjects.Character;
-using Unity.Netcode;
 using UnityEngine;
 using Action = Unity.BossRoom.Gameplay.Actions.Action;
 using SkillTriggerStyle = Unity.BossRoom.Gameplay.UserInput.ClientInputSender.SkillTriggerStyle;
@@ -41,22 +40,6 @@ public class HeroActionBar : MonoBehaviour
         /// </summary>
         ClientInputSender m_InputSender;
 
-        /// <summary>
-        /// Cached reference to local player's net state.
-        /// We find the Sprites to use by checking the Skill1, Skill2, and Skill3 members of our chosen CharacterClass
-        /// </summary>
-        ServerCharacter m_ServerCharacter;
-
-        /// <summary>
-        /// If we have another player selected, this is a reference to their stats; if anything else is selected, this is null
-        /// </summary>
-        ServerCharacter m_SelectedPlayerServerCharacter;
-
-        /// <summary>
-        /// If m_SelectedPlayerNetState is non-null, this indicates whether we think they're alive. (Updated every frame)
-        /// </summary>
-        bool m_WasSelectedPlayerAliveDuringLastUpdate;
-
         /// <summary>
         /// Identifiers for the buttons on the action bar.
         /// </summary>
@@ -139,26 +122,46 @@ void RegisterInputSender(ClientPlayerAvatar clientPlayerAvatar)
             }
 
             m_InputSender = inputSender;
-            m_ServerCharacter = m_InputSender.GetComponent<ServerCharacter>();
-            m_ServerCharacter.TargetId.OnValueChanged += OnSelectionChanged;
-            m_ServerCharacter.HeldNetworkObject.OnValueChanged += OnHeldNetworkObjectChanged;
-            UpdateAllActionButtons();
+            m_InputSender.action1ModifiedCallback += Action1ModifiedCallback;
+
+            Action action1 = null;
+            if (m_InputSender.actionState1 != null)
+            {
+                GameDataSource.Instance.TryGetActionPrototypeByID(m_InputSender.actionState1.actionID, out action1);
+            }
+            UpdateActionButton(m_ButtonInfo[ActionButtonType.BasicAction], action1);
+
+            Action action2 = null;
+            if (m_InputSender.actionState2 != null)
+            {
+                GameDataSource.Instance.TryGetActionPrototypeByID(m_InputSender.actionState2.actionID, out action2);
+            }
+            UpdateActionButton(m_ButtonInfo[ActionButtonType.Special1], action2);
+
+            Action action3 = null;
+            if (m_InputSender.actionState3 != null)
+            {
+                GameDataSource.Instance.TryGetActionPrototypeByID(m_InputSender.actionState3.actionID, out action3);
+            }
+            UpdateActionButton(m_ButtonInfo[ActionButtonType.Special2], action3);
         }
 
-        void OnHeldNetworkObjectChanged(ulong previousValue, ulong newValue)
+        void Action1ModifiedCallback()
         {
-            UpdateAllActionButtons();
+            var action = GameDataSource.Instance.GetActionPrototypeByID(m_InputSender.actionState1.actionID);
+
+            UpdateActionButton(m_ButtonInfo[ActionButtonType.BasicAction],
+                action,
+                m_InputSender.actionState1.selectable);
         }
 
         void DeregisterInputSender()
         {
-            m_InputSender = null;
-            if (m_ServerCharacter != null)
+            if (m_InputSender)
             {
-                m_ServerCharacter.TargetId.OnValueChanged -= OnSelectionChanged;
-                m_ServerCharacter.HeldNetworkObject.OnValueChanged -= OnHeldNetworkObjectChanged;
+                m_InputSender.action1ModifiedCallback -= Action1ModifiedCallback;
             }
-            m_ServerCharacter = null;
+            m_InputSender = null;
         }
 
         void Awake()
@@ -201,29 +204,10 @@ void OnDestroy()
 
         void Update()
         {
-            // If we have another player selected, see if their aliveness state has changed,
-            // and if so, update the interactiveness of the basic-action button
-
-            if (UnityEngine.Input.GetKeyUp(KeyCode.Alpha4))
+            if (Input.GetKeyUp(KeyCode.Alpha4))
             {
                 m_ButtonInfo[ActionButtonType.EmoteBar].Button.OnPointerUpEvent.Invoke();
             }
-
-            if (!m_SelectedPlayerServerCharacter) { return; }
-
-            bool isAliveNow = m_SelectedPlayerServerCharacter.NetLifeState.LifeState.Value == LifeState.Alive;
-            if (isAliveNow != m_WasSelectedPlayerAliveDuringLastUpdate)
-            {
-                // this will update the icons so that the basic-action button's interactiveness is correct
-                UpdateAllActionButtons();
-            }
-
-            m_WasSelectedPlayerAliveDuringLastUpdate = isAliveNow;
-        }
-
-        void OnSelectionChanged(ulong oldSelectionNetworkId, ulong newSelectionNetworkId)
-        {
-            UpdateAllActionButtons();
         }
 
         void OnButtonClickedDown(ActionButtonType buttonType)
@@ -240,7 +224,7 @@ void OnButtonClickedDown(ActionButtonType buttonType)
             }
 
             // send input to begin the action associated with this button
-            m_InputSender.RequestAction(m_ButtonInfo[buttonType].CurAction, SkillTriggerStyle.UI);
+            m_InputSender.RequestAction(m_ButtonInfo[buttonType].CurAction.ActionID, SkillTriggerStyle.UI);
         }
 
         void OnButtonClickedUp(ActionButtonType buttonType)
@@ -258,61 +242,7 @@ void OnButtonClickedUp(ActionButtonType buttonType)
             }
 
             // send input to complete the action associated with this button
-            m_InputSender.RequestAction(m_ButtonInfo[buttonType].CurAction, SkillTriggerStyle.UIRelease);
-        }
-
-        /// <summary>
-        /// Updates all the action buttons and caches info about the currently-selected entity (when appropriate):
-        /// stores info in m_SelectedPlayerNetState and m_WasSelectedPlayerAliveDuringLastUpdate
-        /// </summary>
-        void UpdateAllActionButtons()
-        {
-            UpdateActionButton(m_ButtonInfo[ActionButtonType.BasicAction], m_ServerCharacter.CharacterClass.Skill1);
-            UpdateActionButton(m_ButtonInfo[ActionButtonType.Special1], m_ServerCharacter.CharacterClass.Skill2);
-            UpdateActionButton(m_ButtonInfo[ActionButtonType.Special2], m_ServerCharacter.CharacterClass.Skill3);
-
-            var isHoldingNetworkObject =
-                NetworkManager.Singleton.SpawnManager.SpawnedObjects.TryGetValue(m_ServerCharacter.HeldNetworkObject.Value,
-                    out var heldNetworkObject);
-
-            NetworkManager.Singleton.SpawnManager.SpawnedObjects.TryGetValue(m_ServerCharacter.TargetId.Value,
-                out var selection);
-
-            if (isHoldingNetworkObject)
-            {
-                // show drop!
-                UpdateActionButton(m_ButtonInfo[ActionButtonType.BasicAction], GameDataSource.Instance.DropActionPrototype, true);
-            }
-            if ((m_ServerCharacter.TargetId.Value != 0
-                    && selection != null
-                    && selection.TryGetComponent(out PickUpState pickUpState))
-               )
-            {
-                // special case: targeting a pickup-able item or holding a pickup object
-                UpdateActionButton(m_ButtonInfo[ActionButtonType.BasicAction], GameDataSource.Instance.PickUpActionPrototype, true);
-            }
-            else if (m_ServerCharacter.TargetId.Value != 0
-                && selection != null
-                && selection.NetworkObjectId != m_ServerCharacter.NetworkObjectId
-                && selection.TryGetComponent(out ServerCharacter charState)
-                && !charState.IsNpc)
-            {
-                // special case: when we have a player selected, we change the meaning of the basic action
-                // we have another player selected! In that case we want to reflect that our basic Action is a Revive, not an attack!
-                // But we need to know if the player is alive... if so, the button should be disabled (for better player communication)
-
-                bool isAlive = charState.NetLifeState.LifeState.Value == LifeState.Alive;
-                UpdateActionButton(m_ButtonInfo[ActionButtonType.BasicAction], GameDataSource.Instance.ReviveActionPrototype, !isAlive);
-
-                // we'll continue to monitor our selected player every frame to see if their life-state changes.
-                m_SelectedPlayerServerCharacter = charState;
-                m_WasSelectedPlayerAliveDuringLastUpdate = isAlive;
-            }
-            else
-            {
-                m_SelectedPlayerServerCharacter = null;
-                m_WasSelectedPlayerAliveDuringLastUpdate = false;
-            }
+            m_InputSender.RequestAction(m_ButtonInfo[buttonType].CurAction.ActionID, SkillTriggerStyle.UIRelease);
         }
 
         void UpdateActionButton(ActionButtonInfo buttonInfo, Action action, bool isClickable = true)

Assets/Scripts/Gameplay/UI/HeroEmoteBar.cs

@@ -55,10 +55,10 @@ public void OnButtonClicked(int buttonIndex)
             {
                 switch (buttonIndex)
                 {
-                    case 0: m_InputSender.RequestAction(GameDataSource.Instance.Emote1ActionPrototype, SkillTriggerStyle.UI); break;
-                    case 1: m_InputSender.RequestAction(GameDataSource.Instance.Emote2ActionPrototype, SkillTriggerStyle.UI); break;
-                    case 2: m_InputSender.RequestAction(GameDataSource.Instance.Emote3ActionPrototype, SkillTriggerStyle.UI); break;
-                    case 3: m_InputSender.RequestAction(GameDataSource.Instance.Emote4ActionPrototype, SkillTriggerStyle.UI); break;
+                    case 0: m_InputSender.RequestAction(GameDataSource.Instance.Emote1ActionPrototype.ActionID, SkillTriggerStyle.UI); break;
+                    case 1: m_InputSender.RequestAction(GameDataSource.Instance.Emote2ActionPrototype.ActionID, SkillTriggerStyle.UI); break;
+                    case 2: m_InputSender.RequestAction(GameDataSource.Instance.Emote3ActionPrototype.ActionID, SkillTriggerStyle.UI); break;
+                    case 3: m_InputSender.RequestAction(GameDataSource.Instance.Emote4ActionPrototype.ActionID, SkillTriggerStyle.UI); break;
                 }
             }
 

Assets/Scripts/Gameplay/UI/PartyHUD.cs

@@ -239,7 +239,8 @@ private void SetHeroSelectFX(ulong target, bool selected)
 
         public void SelectPartyMember(int slot)
         {
-            m_ClientSender.RequestAction(GameDataSource.Instance.GeneralTargetActionPrototype, ClientInputSender.SkillTriggerStyle.UI, m_PartyIds[slot]);
+            m_ClientSender.RequestAction(GameDataSource.Instance.GeneralTargetActionPrototype.ActionID,
+                ClientInputSender.SkillTriggerStyle.UI, m_PartyIds[slot]);
         }
 
         // helper to initialize the Allies array - safe to call multiple times