From 48dc8ae370cc8323658a68a582f5865172acdc2e Mon Sep 17 00:00:00 2001
From: Matthew Kalahiki <kalahikimw@hendrix.edu>
Date: Wed, 14 Apr 2021 12:19:48 -0500
Subject: [PATCH 1/2] pretty sure this will damage player if it get hit by
 projectile

---
 MuseumGame/Assets/Scripts/Health.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/MuseumGame/Assets/Scripts/Health.cs b/MuseumGame/Assets/Scripts/Health.cs
index 4da9854..0db0653 100644
--- a/MuseumGame/Assets/Scripts/Health.cs
+++ b/MuseumGame/Assets/Scripts/Health.cs
@@ -11,7 +11,10 @@ public class Health : MonoBehaviour
 
     void OnTriggerEnter2D(Collider2D collider2D)
     {
-
+        if (collider2D.gameObject.CompareTag("EnemyProjectile"))
+        {
+            DamagePlayer(10);
+        }
     }
 
     // Start is called before the first frame update

From 761c4def4c35399576a89930e9dc5071fac82796 Mon Sep 17 00:00:00 2001
From: thoopchuk26 <thoopchuk@gmail.com>
Date: Wed, 14 Apr 2021 12:24:54 -0500
Subject: [PATCH 2/2] Auto stash before merge of "main" and "origin/main"

---
 .../UserSettings/EditorUserSettings.asset     | 51 -------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 MuseumGame/UserSettings/EditorUserSettings.asset

diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset
deleted file mode 100644
index 1cbf25d..0000000
--- a/MuseumGame/UserSettings/EditorUserSettings.asset
+++ /dev/null
@@ -1,51 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!162 &1
-EditorUserSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 4
-  m_ConfigSettings:
-    RecentlyUsedScenePath-0:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620d183eedd43b2fe7f578fce9332b25
-      flags: 0
-    RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e52637edea78fce9332b25
-      flags: 0
-    RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b
-      flags: 0
-    RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c6b1505032b292926237e38271427fb
-      flags: 0
-    RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
-      flags: 0
-    RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0
-      flags: 0
-    RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0
-      flags: 0
-    RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
-      flags: 0
-    RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b
-      flags: 0
-    RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b
-      flags: 0
-    vcSharedLogLevel:
-      value: 0d5e400f0650
-      flags: 0
-  m_VCAutomaticAdd: 1
-  m_VCDebugCom: 0
-  m_VCDebugCmd: 0
-  m_VCDebugOut: 0
-  m_SemanticMergeMode: 2
-  m_VCShowFailedCheckout: 1
-  m_VCOverwriteFailedCheckoutAssets: 1
-  m_VCProjectOverlayIcons: 1
-  m_VCHierarchyOverlayIcons: 1
-  m_VCOtherOverlayIcons: 1
-  m_VCAllowAsyncUpdate: 1