From 839a1710ecc42770ec39ea73e2f0baf99434ebf3 Mon Sep 17 00:00:00 2001
From: slevy14 <sammyglevy@gmail.com>
Date: Wed, 26 Apr 2023 16:05:43 -0700
Subject: [PATCH] added basic enemy collision

still need to figure out how to make the jumping on heads work, but we need a jump for that lol
---
 Assets/Prefabs/CaveOctopus.prefab | 4 ++--
 Assets/Scripts/PlayerBehavior.cs  | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Assets/Prefabs/CaveOctopus.prefab b/Assets/Prefabs/CaveOctopus.prefab
index 8fff1cf..d53618d 100644
--- a/Assets/Prefabs/CaveOctopus.prefab
+++ b/Assets/Prefabs/CaveOctopus.prefab
@@ -44,7 +44,7 @@ GameObject:
   - component: {fileID: 6465130401096595230}
   m_Layer: 0
   m_Name: CaveOctopus
-  m_TagString: Untagged
+  m_TagString: Enemy
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -63,7 +63,7 @@ Transform:
   m_Children:
   - {fileID: 7108139142192227224}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
 --- !u!212 &4957706768026546484
 SpriteRenderer:
diff --git a/Assets/Scripts/PlayerBehavior.cs b/Assets/Scripts/PlayerBehavior.cs
index a7e0c92..8b0aef3 100644
--- a/Assets/Scripts/PlayerBehavior.cs
+++ b/Assets/Scripts/PlayerBehavior.cs
@@ -166,4 +166,11 @@ public class PlayerBehavior : MonoBehaviour
             grappleSurface = null;
         }
     }
+
+    void OnCollisionEnter2D(Collision2D collision) {
+        if (collision.gameObject.tag == "Enemy") {
+            this.stateController.SetDeathCanvasActive(true);
+            Destroy(this.gameObject);
+        }
+    }
 }