From f684297232dcade5775d94f05a59de159e63bd2f Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Fri, 29 Dec 2023 03:24:16 +0000
Subject: [PATCH] Added background
---
Assets/Scripts/PlayerController.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs
index 4d7ab47..5edb404 100644
--- a/Assets/Scripts/PlayerController.cs
+++ b/Assets/Scripts/PlayerController.cs
@@ -1,6 +1,7 @@
using Assets.Scripts.Enums;
using Assets.Scripts.Helpers;
using System;
+using System.Linq;
using UnityEngine;
using UnityEngine.InputSystem;
@@ -266,18 +267,26 @@
public void OnMove(InputAction.CallbackContext context)
{
+ if (!health.IsAlive)
+ {
+ return;
+ }
moveInput = context.ReadValue<Vector2>();
IsMoving = moveInput.x != 0;
IsFlying = (moveInput.y != 0);
- SetFacingDirection(moveInput);
+
if (IsDrilling)
{
IsMoving = false;
IsFlying = false;
//moveInput = Vector2.zero;
+ }
+ else
+ {
+ SetFacingDirection(moveInput);
}
}
@@ -288,9 +297,11 @@
switch (drillDirection)
{
case DrillDirection.Left:
+ SetFacingDirection(Vector2.left);
touchingDirections.wallHitsLeft[0].collider.GetContacts(contactPoints);
break;
case DrillDirection.Right:
+ SetFacingDirection(Vector2.right);
touchingDirections.wallHitsRight[0].collider.GetContacts(contactPoints);
break;
case DrillDirection.Down:
@@ -301,9 +312,9 @@
break;
}
//Debug.Log(contactPoints[0].otherRigidbody?.gameObject.name);
- if (contactPoints[0].otherRigidbody?.name == "Tilemap")
+ if (contactPoints.Any(x => x.otherRigidbody?.name == "Tilemap"))
{
- CharacterEvents.characterDrill.Invoke(contactPoints[0], drillDirection);
+ CharacterEvents.characterDrill.Invoke(contactPoints.Single(x => x.otherRigidbody?.name == "Tilemap"), drillDirection);
}
}
@@ -365,6 +376,10 @@
public void TakeDamage(int damage)
{
health.Hit(damage);
+ if (!health.IsAlive)
+ {
+ rb.velocity = Vector3.zero;
+ }
}
public void TakeFallDamage(int fallDamage)
--
Gitblit v1.10.0