Merge remote-tracking branch 'origin/cems-awesome-branch' into damage-handling

Game/Assets/Scenes/cems scene.unity

@@ -137,7 +137,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4266476263824402640, guid: d56297e435f8410a584581d73d99d2e4, type: 3}
       propertyPath: m_GravityScale
-      value: 10
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3}
       propertyPath: m_LocalPosition.x
@@ -202,11 +202,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -6.02
+      value: -3.39
       objectReference: {fileID: 0}
     - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.82
+      value: -1
       objectReference: {fileID: 0}
     - target: {fileID: 2163867978973577705, guid: 2f44dc6d6adb9ae7f9b4f644da0e3485, type: 3}
       propertyPath: m_LocalPosition.z

Game/Assets/Scripts/DropletMovement.cs

@@ -9,10 +9,11 @@ public class DropletMovement : MonoBehaviour
     private Animator playerAnim; //for animation
     private float xInput;
 
-    public float moveSpeed = 5f;
+    //helper variables
-    public float jumpingPower = 5f;
+    private bool isGrounded = true;
-
+    [SerializeField] private float dashSpeed;
-    private Vector2 movement;
+    [SerializeField] private float dashDuration;
+    private float dashTime;
 
     void Start()
     {
@@ -23,6 +24,8 @@ public class DropletMovement : MonoBehaviour
     {
         movement.x = Input.GetAxisRaw("Horizontal");
 
+
+
         if (isGrounded && Input.GetKeyDown(KeyCode.Space))
         {
             rb.linearVelocity = new Vector2(rb.linearVelocity.x, jumpingPower);