Merge branch 'main' of https://github.com/orsolya-st/gamejam_050626

Game/Assets/Scripts/DamageHandler.cs

@@ -14,6 +14,9 @@ public class DamageHandler : MonoBehaviour
 	public float minSize = 0.4f;
 
 	private float lastYVelocity;
+	private bool falling;
+	private float fallTime;
+	public float maxFallingTime = 2f;
 
 
 	private void Awake()
@@ -33,7 +36,26 @@ public class DamageHandler : MonoBehaviour
 
 	private void FixedUpdate()
 	{
-		lastYVelocity = rb.linearVelocityY;
+		float currentVelocity = rb.linearVelocityY;
+		if (lastYVelocity >= 0 && currentVelocity < 0)
+		{
+			falling = true;
+			Debug.Log("Started falling");
+			fallTime = 0f;
+		}
+		else if(lastYVelocity < 0 && currentVelocity < 0)
+		{
+			if (fallTime >= maxFallingTime)
+			{
+				Die();
+			}
+			fallTime += Time.deltaTime;
+		} else if(currentVelocity >= 0)
+		{
+			Debug.Log("Not falling");
+			falling = false;
+		}
+		lastYVelocity = currentVelocity;
 	}
 
 	private void OnCollisionEnter2D(Collision2D other)
@@ -42,13 +64,13 @@ public class DamageHandler : MonoBehaviour
 		if (fallSpeed < -threshold)
 		{
 			float fallDamage = (-fallSpeed - threshold) * multiplier;
-			Debug.Log($"Fell with velocity:{fallSpeed}. Fall damage{fallDamage}");
+			// Debug.Log($"Fell with velocity:{fallSpeed}. Fall damage{fallDamage}");
 			UpdateHealth(health - fallDamage);
 			// Debug.Log($"New health:{health - fallDamage}");
 		}
 		else
 		{
-			Debug.Log($"Fell with velocity:{fallSpeed}. No fall damage");
+			// Debug.Log($"Fell with velocity:{fallSpeed}. No fall damage");
 		}
 	}
 	
@@ -59,11 +81,11 @@ public class DamageHandler : MonoBehaviour
 		Transform transform = GetComponent<Transform>();
 		float healthScaling = minSize + (1 - minSize) * (this.health / maxHealth);
 		transform.localScale = new Vector3(healthScaling,healthScaling,healthScaling);
-		Debug.Log("UpdatedScale and health");
+		// Debug.Log("UpdatedScale and health");
 		
 		if(this.health <= 0f)
 		{
-			Debug.Log("Die");
+			// Debug.Log("Die");
 			Die();
 		}
 	}

Game/Assets/Scripts/DropletMovement.cs

@@ -55,6 +55,13 @@ public class DropletMovement : MonoBehaviour
         {
             rb.linearVelocity = new Vector2(rb.linearVelocity.x, jumpingPower);
         }
+        if (rb.linearVelocityY > 2)
+        {
+            animator.SetBool("Jumping", true);
+        } else if (rb.linearVelocityY < 2)
+        {
+            animator.SetBool("Jumping", false);
+        }
         if (movement.x > 0) {
             animator.SetBool("WalkingRight", true);
             animator.SetBool("WalkingLeft", false);
@@ -76,7 +83,6 @@ public class DropletMovement : MonoBehaviour
         if (!isGrounded){return;}
         if (Input.GetKeyDown(KeyCode.DownArrow) || Input.GetKeyDown(KeyCode.S))
         {
-          
             DropDown();
         }
 

Game/Assets/Scripts/MiniDroplet.cs

@@ -0,0 +1,16 @@
+using UnityEngine;
+
+public class MiniDroplet : MonoBehaviour
+{
+    // Start is called once before the first execution of Update after the MonoBehaviour is created
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Game/Assets/Scripts/MiniDroplet.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9e4bdf7e79782084cae014769845a30a