From a0231b6896566ce8595d1e2cd5d26b6792867ece Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Tue, 19 Dec 2023 00:02:24 +0000
Subject: [PATCH] Added pause panel
---
Assets/Scripts/PlayerController.cs | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs
index 4bf68d8..7d13b2e 100644
--- a/Assets/Scripts/PlayerController.cs
+++ b/Assets/Scripts/PlayerController.cs
@@ -8,6 +8,8 @@
{
public float moveSpeed = 5f;
public float maxFallSpeed = -20f;
+ public float maxFallSpeedDamge = -10f;
+ private float maxFallSpeedCurrent = 0f;
Vector2 moveInput;
Rigidbody2D rb;
@@ -15,6 +17,7 @@
Animator animator_rotor;
public GameObject rotorGO;
TouchingDirections touchingDirections;
+ Damageable health;
[SerializeField]
private bool _isMoving;
@@ -56,9 +59,12 @@
}
}
- public bool CanMove { get
+ public bool CanMove
+ {
+ get
{
- return animator.GetBool(AnimationStrings.canMove);
+ Debug.Log("gameIsPaused: " + PauseMenu.GameIsPaused);
+ return animator.GetBool(AnimationStrings.canMove) && !PauseMenu.GameIsPaused;
}
}
@@ -70,6 +76,7 @@
animator = GetComponent<Animator>();
animator_rotor = rotorGO.GetComponent<Animator>();
touchingDirections = GetComponent<TouchingDirections>();
+ health = GetComponent<Damageable>();
}
private void FixedUpdate()
@@ -98,6 +105,25 @@
{
// moving upwards no falling
rb.velocity = new Vector2(moveInput.x * moveSpeed, (moveInput.y * moveSpeed));
+ }
+ }
+ if (touchingDirections.IsGrounded)
+ {
+ if (maxFallSpeedCurrent < maxFallSpeedDamge)
+ {
+ TakeFallDamage(Math.Abs((int)maxFallSpeedCurrent));
+ maxFallSpeedCurrent = 0;
+ }
+ }
+ else if (IsFlying)
+ {
+ maxFallSpeedCurrent = rb.velocity.y;
+ }
+ else
+ {
+ if (maxFallSpeedCurrent > rb.velocity.y)
+ {
+ maxFallSpeedCurrent = rb.velocity.y;
}
}
}
@@ -134,6 +160,16 @@
}
}
+ public void TakeDamage(int damage)
+ {
+ health.Hit(damage);
+ }
+
+ public void TakeFallDamage(int fallDamage)
+ {
+ TakeDamage(fallDamage);
+ }
+
//public void OnRun(InputAction.CallbackContext context)
//{
// if (context.started) // Button pressed
--
Gitblit v1.9.3