Code cleanup

miepzerino

2025-01-20 9ac1377fd0ea4eee5606ee659662acd58634c2b2

 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;
@@ -265,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);
        }
    }

@@ -287,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:
@@ -300,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);
        }
    }

@@ -364,6 +376,10 @@
    public void TakeDamage(int damage)
    {
        health.Hit(damage);
        if (!health.IsAlive)
        {
            rb.velocity = Vector3.zero;
        }
    }

    public void TakeFallDamage(int fallDamage)