Merge pull request #276 from hackerspace-ntnu/fix/hat-barrel

Fix crouching being more visible, fix gamepad look sensitivity
hackerspace-ntnu · Nov 7, 2023 · 83d23b1 · 83d23b1
2 parents 0f05424 + c536632
commit 83d23b1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/Assets/Prefabs/Input/Player.prefab b/Assets/Prefabs/Input/Player.prefab
@@ -68,7 +68,7 @@ MonoBehaviour:
   leapForce: 12.5
   jumpTimeout: 0.5
   leapTimeout: 0.875
-  crouchedHeightOffset: 0.3
+  crouchedHeightOffset: 0.8
   airThreshold: 0.4
   slopeAngleThreshold: 50
   state: 1
@@ -177,6 +177,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   maxHitDistance: 100
   targetStartOffset: 0.9
+  overrideAimTarget: 0
   inputManager: {fileID: 0}
   identity: {fileID: 0}
   hudController: {fileID: 555885729091202788}

diff --git a/Assets/Scripts/Control&Input/InputManager.cs b/Assets/Scripts/Control&Input/InputManager.cs
@@ -43,6 +43,8 @@ public class InputManager : MonoBehaviour
 
     [SerializeField]
     private float mouseLookScale = 0.1f;
+    [SerializeField]
+    private float gamepadLookScale = 0.75f;
 
     private bool isMouseAndKeyboard = false;
 
@@ -130,7 +132,7 @@ private void LookInputPerformed(InputAction.CallbackContext ctx)
         }
         else
         {
-            lookInput = ctx.ReadValue<Vector2>();
+            lookInput = ctx.ReadValue<Vector2>() * gamepadLookScale;
         }
     }
 

diff --git a/Assets/Scripts/Control&Input/PlayerMovement.cs b/Assets/Scripts/Control&Input/PlayerMovement.cs
@@ -130,18 +130,18 @@ private void SetCrouch(InputAction.CallbackContext ctx)
 
         if (ctx.performed)
         {
+            if (IsInAir())
+                return;
             animator.SetBool("Crouching", true);
             strafeForce = strafeForceCrouched;
-            if (!IsInAir())
-                inputManager.gameObject.LeanMoveLocalY(localCameraHeight - crouchedHeightOffset, 0.2f);
+            inputManager.gameObject.LeanMoveLocalY(localCameraHeight - crouchedHeightOffset, 0.2f);
         }
 
         if (ctx.canceled)
         {
             animator.SetBool("Crouching", false);
             strafeForce = strafeForceGrounded;
-            if (!IsInAir())
-                inputManager.gameObject.LeanMoveLocalY(localCameraHeight, 0.2f);
+            inputManager.gameObject.LeanMoveLocalY(localCameraHeight, 0.2f);
         }
 
     }
@@ -200,6 +200,7 @@ private void UpdatePosition(Vector3 input)
                     var groundNormal = GroundNormal();
                     var direction = Vector3.ProjectOnPlane(input, groundNormal);
                     body.AddForce(direction * strafeForce, ForceMode.VelocityChange);
+                    body.AddForce(direction * strafeForce, ForceMode.Impulse);
                     if (IsInAir()) state = PlayerState.IN_AIR;
                     break;
                 }