From ad79d9ca49274cc660fc2030a071b24314f0f210 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Sat, 29 Mar 2025 21:33:41 +0000
Subject: [PATCH] added flexalon UI and reworked inventoryUI

---
 Assets/Scripts/PlayerController.cs |   69 +++++++++++++++++++++++++---------
 1 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs
index 953e277..4447e1b 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;
 
@@ -25,6 +26,7 @@
     TouchingDirections touchingDirections;
 
     // Time it takes to drill
+    [SerializeField]
     private float drillingTime = 1f;
     private float timeSinceDrill = 0f;
     private bool drillToPosition;
@@ -141,15 +143,21 @@
     private void OnEnable()
     {
         CharacterEvents.characterDrillingToPosition += (DrillingToPosition);
+        //CharacterEvents.characterDrillingToPositionAbort += (DrillingToPositionAbort);
     }
 
     private void OnDisable()
     {
         CharacterEvents.characterDrillingToPosition -= (DrillingToPosition);
+        //CharacterEvents.characterDrillingToPositionAbort -= (DrillingToPositionAbort);
     }
 
     private void Awake()
     {
+        if(Debug.isDebugBuild)
+        {
+            moveSpeed = 25f;
+        }
         rb = GetComponent<Rigidbody2D>();
         animator = GetComponent<Animator>();
         animator_rotor = rotorGO.GetComponent<Animator>();
@@ -263,18 +271,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);
         }
     }
 
@@ -285,9 +301,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:
@@ -298,28 +316,28 @@
                 break;
         }
         //Debug.Log(contactPoints[0].otherRigidbody?.gameObject.name);
-        if (contactPoints[0].otherRigidbody?.name == "Tilemap")
+        if (contactPoints.Any(x => x.otherRigidbody?.name == "Tilemap"))
         {
-            boxCollider.enabled = false;
-            switch (drillDirection)
-            {
-                case DrillDirection.Left:
-                case DrillDirection.Right:
-                    IsDrillingLeftRight = true;
-                    break;
-                case DrillDirection.Down:
-                    IsDrillingDown = true;
-                    break;
-                default:
-                    Debug.Assert(false, "Add DrillDirection here!");
-                    break;
-            }
-            CharacterEvents.characterDrill.Invoke(contactPoints[0], drillDirection);
+            CharacterEvents.characterDrill.Invoke(contactPoints.Single(x => x.otherRigidbody?.name == "Tilemap"), drillDirection);
         }
     }
 
-    private void DrillingToPosition(Vector3 tilePosition)
+    private void DrillingToPosition(Vector3 tilePosition, DrillDirection drillDirection)
     {
+        boxCollider.enabled = false;
+        switch (drillDirection)
+        {
+            case DrillDirection.Left:
+            case DrillDirection.Right:
+                IsDrillingLeftRight = true;
+                break;
+            case DrillDirection.Down:
+                IsDrillingDown = true;
+                break;
+            default:
+                Debug.Assert(false, "Add DrillDirection here!");
+                break;
+        }
         //Debug.Log("DrillingToPosition() called");
         //Debug.Log(gameObject.transform.position);
         drillToPosition = true;
@@ -328,6 +346,17 @@
         drillOriginalPosition = gameObject.transform.position;
         //Debug.Log("drillOriginalPosition: " + drillOriginalPosition);
     }
+    //private void DrillingToPositionAbort()
+    //{
+    //    IsDrilling = false;
+    //    //Debug.Log("DrillingToPosition() called");
+    //    //Debug.Log(gameObject.transform.position);
+    //    drillToPosition = false;
+    //    //drillTilePosition = null;
+    //    //Debug.Log("drillTilePosition: " + drillTilePosition);
+    //    drillOriginalPosition = gameObject.transform.position;
+    //    //Debug.Log("drillOriginalPosition: " + drillOriginalPosition);
+    //}
 
     //private void DrillLeftOrRight()
     //{
@@ -351,6 +380,10 @@
     public void TakeDamage(int damage)
     {
         health.Hit(damage);
+        if (!health.IsAlive)
+        {
+            rb.velocity = Vector3.zero;
+        }
     }
 
     public void TakeFallDamage(int fallDamage)

--
Gitblit v1.9.3