Air-Maneuver Actuates on Button Up

Updated the maneuver system so the character is launched with an air
maneuver if the character actuates the maneuver a second time (button
up) during their ascent. This system needs refinement as NPC character
will have to actuate manuver twice to simulate button Up & Down to
do consecutive jumps.

Author: TCPHijinks

Ranma Game/.vs/Ranma Game/v16/Server/sqlite3/storage.ide

@@ -280,25 +280,25 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: Damage
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: ChargedAttack
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: MoveSpeedPenaltyPercentage
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -348,9 +348,9 @@ AnimatorStateTransition:
   m_PrefabAsset: {fileID: 0}
   m_Name: 
   m_Conditions:
-  - m_ConditionMode: 6
+  - m_ConditionMode: 7
     m_ConditionEvent: AttackType
-    m_EventTreshold: 0
+    m_EventTreshold: 1
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 477146616253968979}
   m_Solo: 0

Ranma Game/.vs/Ranma Game/v16/Server/sqlite3/storage.ide-shm

@@ -23,36 +23,54 @@ public abstract class Character : MonoBehaviour
     /// <param name="moveDir"></param>
     protected void MoveAndRotate(Vector3 moveDir)
     {
-        if (!groundedCheck.IsGrounded || _knockbackRequest.doingRequest) return;
-        _moving = !animManager.DoingAttack;
-        if (!_moving) _moving = animManager.InAttkComboAndCanMove;
+        if (_knockbackRequest.doingRequest) return;
+
+        // Update if can move in current animation state.
+        _moving = !animManager.DoingAttack || animManager.InAttkComboAndCanMove;
 
-        var (rotationDir, speed) = GetMoveAndRotate(moveDir);
+        // Get updated rotation and speed based on requested direction.
+        var (rotationDir, speed) = GetRotationAndSpeed(moveDir);
+        ApplyRotation(rotationDir);
+
+        if (!groundedCheck.IsGrounded)
+        {
+            _speed = 0;
+            return;
+        }
 
         if (animManager.InAttkComboAndCanMove)
             _speed = speed * animManager.AnimMoveSpeedPenalty;
         else
             _speed = speed;
-
-        ApplyRotation(rotationDir);
     }
 
     /// <summary>
     /// Request maneuver start.
     /// </summary>
     protected void Maneuver()
     {
+        // Stop attack animations when maneuver.
         animManager.SetCancelChargedAttack();
-        if (groundedCheck.IsGrounded) _doingAirManeuver = false;
 
-        if (!groundedCheck.IsGrounded && !_doingJump && !_doingAirManeuver)
+        // Do mid-air maneuver if register jump again while ascending up in the air.
+        if (!groundedCheck.IsGrounded && !_doingAirManeuver && !doJumpToggle && rb.velocity.y >= 0)
             InAirManeuver();
 
-        _doingJump = true;
+        // If normal jump.
+        if (doJumpToggle)
+        {
+            _doingJump = true;
+        }
+
+        // Flip toggle.
+        doJumpToggle = !doJumpToggle;
     }
 
+    private bool doJumpToggle = true;
+
     private void InAirManeuver()
     {
+        Debug.Log("CALLED");
         animManager.SetCancelChargedAttack();
         _doingAirManeuver = true;
         var target = transform.forward * 10 + transform.up * 5;
@@ -67,7 +85,6 @@ private void InAirManeuver()
     protected void ManeuverEnd()
     {
         animManager.SetCancelChargedAttack();
-        _doingJump = false;
     }
 
     private bool _doingJump = false;
@@ -104,7 +121,7 @@ protected void Interact()
     /// Move character and rotate to move direction.
     /// </summary>
     /// <param name="moveDirRequest"></param>
-    private (Vector3 rotationDir, float speed) GetMoveAndRotate(Vector2 moveDirRequest)
+    private (Vector3 rotationDir, float speed) GetRotationAndSpeed(Vector2 moveDirRequest)
     {
         // No moving or rotation during attacks or not moving.
         if (!_moving || moveDirRequest == Vector2.zero)
@@ -194,6 +211,12 @@ private void HandleMovingAndJump()
         bool IsGrounded = groundedCheck.IsGrounded;
         var (newKnockbackRequest, _, _, doingKnockback) = _knockbackRequest;
 
+        // Set not air-maneuvering if grounded.
+        if (groundedCheck.IsGrounded)
+        {
+            _doingAirManeuver = false;
+        }
+
         // If trying to move & able to.
         if (_moving && !newKnockbackRequest && IsGrounded && !doingKnockback)
         {
@@ -234,6 +257,12 @@ private void FixedUpdate()
         HandleKnockback();
 
         HandleMovingAndJump();
+
+        // Stop manuever after landing again.
+        if ((_doingJump || _doingAirManeuver) && groundedCheck.IsGrounded)
+        {
+            //       ManeuverEnd();
+        }
     }
 
     /// <summary>

Ranma Game/.vs/Ranma Game/v16/Server/sqlite3/storage.ide-wal

@@ -6,29 +6,28 @@ public class PlayerChar : Character
 {
     private PlayerControls controls;
     private Vector2 moveDir = Vector2.zero;
+
     private void Awake()
     {
         rb = GetComponent<Rigidbody>();
         animManager = GetComponent<CharacterAnimManager>();
         groundedCheck = GetComponent<GroundedCheck>();
 
         controls = new PlayerControls();
-
-        
     }
 
     private void Update()
     {
         // Don't move if attacking.
-        MoveAndRotate(moveDir);    
+        MoveAndRotate(moveDir);
     }
 
     private void OnEnable()
     {
         controls.Gameplay.Enable();
 
-        controls.Gameplay.Maneuver.started += ctx => Maneuver();
-        controls.Gameplay.Maneuver.performed += ctx => ManeuverEnd();
+        controls.Gameplay.Maneuver.performed += ctx => Maneuver();
+        // controls.Gameplay.Maneuver.performed += ctx => ManeuverEnd();
         controls.Gameplay.AttackStd.performed += ctx => AttackStd();
         controls.Gameplay.AttackHeavy.performed += ctx => AttackHeavy();
         controls.Gameplay.Interact.performed += ctx => Interact();
@@ -40,5 +39,5 @@ private void OnEnable()
     private void OnDisable()
     {
         controls.Gameplay.Disable();
-    }   
-}
+    }
+}

Ranma Game/Assets/Character.controller

@@ -48,7 +48,7 @@ public @PlayerControls()
                     ""id"": ""ff53ebcb-5a75-4308-bef4-325c08e9e9e8"",
                     ""expectedControlType"": """",
                     ""processors"": """",
-                    ""interactions"": """"
+                    ""interactions"": ""Press,Press(behavior=1)""
                 },
                 {
                     ""name"": ""Interact"",

Ranma Game/Assets/Scripts/Character/Character.cs

@@ -35,7 +35,7 @@
                     "id": "ff53ebcb-5a75-4308-bef4-325c08e9e9e8",
                     "expectedControlType": "",
                     "processors": "",
-                    "interactions": ""
+                    "interactions": "Press,Press(behavior=1)"
                 },
                 {
                     "name": "Interact",