From 0e16dc5f9f42ee4c80ee1f9d4f25444c5b058058 Mon Sep 17 00:00:00 2001
From: Giovani <giovani@boldquest.net>
Date: Sat, 1 Feb 2020 23:10:39 -0500
Subject: [PATCH] finally fixed player getting stuck

---
 Assets/Scenes/LevelOne.unity     | 20 +++++---------------
 Assets/Scripts/BugMovement.cs    |  4 ++--
 Assets/Scripts/Player.cs         | 10 +++++-----
 Assets/Sprites/Controls.meta     |  8 ++++++++
 Assets/Sprites/Hud/Controls.meta |  2 +-
 5 files changed, 21 insertions(+), 23 deletions(-)
 create mode 100644 Assets/Sprites/Controls.meta

diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity
index c147343..cd52986 100644
--- a/Assets/Scenes/LevelOne.unity
+++ b/Assets/Scenes/LevelOne.unity
@@ -48168,8 +48168,8 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 1
   m_Constraints: 4
---- !u!61 &1671840919
-BoxCollider2D:
+--- !u!70 &1671840919
+CapsuleCollider2D:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -48181,19 +48181,9 @@ BoxCollider2D:
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: -0.01, y: -0.62}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 4, y: 4}
-    newSize: {x: 1, y: 1}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 1
-  serializedVersion: 2
-  m_Size: {x: 0.9, y: 2.79}
-  m_EdgeRadius: 0
+  m_Offset: {x: 0, y: -0.64}
+  m_Size: {x: 0.9, y: 2.75}
+  m_Direction: 0
 --- !u!212 &1671840920
 SpriteRenderer:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/BugMovement.cs b/Assets/Scripts/BugMovement.cs
index c8b82ac..f9f26ef 100644
--- a/Assets/Scripts/BugMovement.cs
+++ b/Assets/Scripts/BugMovement.cs
@@ -7,7 +7,7 @@ public class BugMovement : MonoBehaviour
     [SerializeField] private float secondsGoingLeft = 1;
     [SerializeField] private float secondsGoingRight = 1;
     [SerializeField] private float movementSpeed = 10;
-    [SerializeField] BoxCollider2D playerCollider;
+    [SerializeField] Collider2D playerCollider;
     [SerializeField] EventControls eventControls;
     [SerializeField] Player player;
 
@@ -26,7 +26,7 @@ public class BugMovement : MonoBehaviour
     private void Update()
     {
         if (HasEncounteredPlayer())
-            eventControls.TriggerEvent(playerCollider, GetComponent<BoxCollider2D>(), player);
+            eventControls.TriggerEvent(playerCollider, GetComponent<Collider2D>(), player);
 
         var totalFramesGoingLeft = framesPerSecond * secondsGoingLeft;
         var totalFramesGoingRight = framesPerSecond * secondsGoingRight;
diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs
index a49d82c..538a178 100644
--- a/Assets/Scripts/Player.cs
+++ b/Assets/Scripts/Player.cs
@@ -27,14 +27,14 @@ public class Player : MonoBehaviour
 
 
     private Rigidbody2D rigidBody;
-    new private BoxCollider2D collider;
+    new private Collider2D collider;
     private Animator animator;
     private bool isMovementEnabled = true;
 
     private void Start()
     {
         rigidBody = GetComponent<Rigidbody2D>();
-        collider = GetComponent<BoxCollider2D>();
+        collider = GetComponent<Collider2D>();
         animator = GetComponent<Animator>();
         currentHealth = startHealth;
         currentStamina = startStamina;
@@ -173,10 +173,10 @@ public class Player : MonoBehaviour
 
     private bool IsPlayerOnWall(bool ignoreGround = false)
     {
-        return IsPointOnWall(transform.position + new Vector3(0, collider.bounds.extents.y * 0.6f, 0), ignoreGround) ||
-               IsPointOnWall(transform.position - new Vector3(0, collider.bounds.extents.y * 0.25f, 0), ignoreGround) ||
+        return IsPointOnWall(transform.position + new Vector3(0, collider.bounds.extents.y * 0.52f, 0), ignoreGround) ||
+               IsPointOnWall(transform.position - new Vector3(0, collider.bounds.extents.y * 0.24f, 0), ignoreGround) ||
                IsPointOnWall(transform.position - new Vector3(0, collider.bounds.extents.y * 0.8f, 0), ignoreGround) ||
-               IsPointOnWall(transform.position - new Vector3(0, collider.bounds.extents.y * 1.5f, 0), ignoreGround);
+               IsPointOnWall(transform.position - new Vector3(0, collider.bounds.extents.y * 1.45f, 0), ignoreGround);
     }
 
     private bool IsPointOnWall(Vector2 position, bool ignoreGround = false)
diff --git a/Assets/Sprites/Controls.meta b/Assets/Sprites/Controls.meta
new file mode 100644
index 0000000..ca48b25
--- /dev/null
+++ b/Assets/Sprites/Controls.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bf9fc495ca38d7d4d804ad1d2df0f4c5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Sprites/Hud/Controls.meta b/Assets/Sprites/Hud/Controls.meta
index ca48b25..4179f8a 100644
--- a/Assets/Sprites/Hud/Controls.meta
+++ b/Assets/Sprites/Hud/Controls.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bf9fc495ca38d7d4d804ad1d2df0f4c5
+guid: 93ff3d1c20b08c048a2ae60a4b35e73f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}