From 12e5f4bc55b195e53ea020f906c431e3f438337c Mon Sep 17 00:00:00 2001
From: craftwill <william-gin1@hotmail.com>
Date: Sun, 13 Oct 2024 12:10:18 -0400
Subject: [PATCH 1/2] Added missing Ally tags and sorting order type for
 enemies

---
 Assets/Prefabs/Buildings/Castle.prefab               | 2 +-
 Assets/Prefabs/Buildings/House.prefab                | 2 +-
 Assets/Prefabs/Buildings/Mill.prefab                 | 2 +-
 Assets/Prefabs/Monsters/Basic_monster.prefab         | 4 ++--
 Assets/Prefabs/Monsters/ClawClawRough_monster.prefab | 4 ++--
 Assets/Prefabs/Monsters/SmolEye_monster.prefab       | 4 ++--
 Assets/Prefabs/Sticks/Harversters/farmerStick.prefab | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Assets/Prefabs/Buildings/Castle.prefab b/Assets/Prefabs/Buildings/Castle.prefab
index 0900d50..060bac2 100644
--- a/Assets/Prefabs/Buildings/Castle.prefab
+++ b/Assets/Prefabs/Buildings/Castle.prefab
@@ -16,7 +16,7 @@ GameObject:
   - component: {fileID: -2943795733505287777}
   m_Layer: 0
   m_Name: Castle
-  m_TagString: Untagged
+  m_TagString: Ally
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
diff --git a/Assets/Prefabs/Buildings/House.prefab b/Assets/Prefabs/Buildings/House.prefab
index f422974..ac30471 100644
--- a/Assets/Prefabs/Buildings/House.prefab
+++ b/Assets/Prefabs/Buildings/House.prefab
@@ -99,7 +99,7 @@ GameObject:
   - component: {fileID: 6252103591577139412}
   m_Layer: 0
   m_Name: House
-  m_TagString: Untagged
+  m_TagString: Ally
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
diff --git a/Assets/Prefabs/Buildings/Mill.prefab b/Assets/Prefabs/Buildings/Mill.prefab
index bb1a3ec..cab7325 100644
--- a/Assets/Prefabs/Buildings/Mill.prefab
+++ b/Assets/Prefabs/Buildings/Mill.prefab
@@ -15,7 +15,7 @@ GameObject:
   - component: {fileID: 1045236105932526234}
   m_Layer: 0
   m_Name: Mill
-  m_TagString: Untagged
+  m_TagString: Ally
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
diff --git a/Assets/Prefabs/Monsters/Basic_monster.prefab b/Assets/Prefabs/Monsters/Basic_monster.prefab
index cf08873..b6bfe3a 100644
--- a/Assets/Prefabs/Monsters/Basic_monster.prefab
+++ b/Assets/Prefabs/Monsters/Basic_monster.prefab
@@ -451,8 +451,8 @@ SortingGroup:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1531129202202440418}
   m_Enabled: 1
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
   m_SortingOrder: 5
 --- !u!114 &7161153261079215068
 MonoBehaviour:
diff --git a/Assets/Prefabs/Monsters/ClawClawRough_monster.prefab b/Assets/Prefabs/Monsters/ClawClawRough_monster.prefab
index e1f3847..809bd73 100644
--- a/Assets/Prefabs/Monsters/ClawClawRough_monster.prefab
+++ b/Assets/Prefabs/Monsters/ClawClawRough_monster.prefab
@@ -719,8 +719,8 @@ SortingGroup:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1531129202202440418}
   m_Enabled: 1
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
   m_SortingOrder: 5
 --- !u!114 &7161153261079215068
 MonoBehaviour:
diff --git a/Assets/Prefabs/Monsters/SmolEye_monster.prefab b/Assets/Prefabs/Monsters/SmolEye_monster.prefab
index 4feca32..3dfd345 100644
--- a/Assets/Prefabs/Monsters/SmolEye_monster.prefab
+++ b/Assets/Prefabs/Monsters/SmolEye_monster.prefab
@@ -365,8 +365,8 @@ SortingGroup:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1531129202202440418}
   m_Enabled: 1
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
   m_SortingOrder: 5
 --- !u!114 &7161153261079215068
 MonoBehaviour:
diff --git a/Assets/Prefabs/Sticks/Harversters/farmerStick.prefab b/Assets/Prefabs/Sticks/Harversters/farmerStick.prefab
index 0a5d081..59005ea 100644
--- a/Assets/Prefabs/Sticks/Harversters/farmerStick.prefab
+++ b/Assets/Prefabs/Sticks/Harversters/farmerStick.prefab
@@ -408,7 +408,7 @@ GameObject:
   - component: {fileID: -6187152107451925345}
   m_Layer: 0
   m_Name: farmerStick
-  m_TagString: Untagged
+  m_TagString: Ally
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0

From 507b2ce8e069ed105bb9bc6ac59a5aba39022750 Mon Sep 17 00:00:00 2001
From: craftwill <william-gin1@hotmail.com>
Date: Sun, 27 Oct 2024 15:57:26 -0400
Subject: [PATCH 2/2] Null check so that buildings dont need an animator

---
 Assets/Scripts/AnimationEntity.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Assets/Scripts/AnimationEntity.cs b/Assets/Scripts/AnimationEntity.cs
index e2018b7..63359d8 100644
--- a/Assets/Scripts/AnimationEntity.cs
+++ b/Assets/Scripts/AnimationEntity.cs
@@ -78,8 +78,13 @@ public class AnimationEntity : MonoBehaviour
 
     public void PlayDieAnim() 
     {
-        _animatorEntity.speed = 1;
-        _animatorEntity.Play("die", 0, 0f);
+        // Not every entity needs an animator
+        if (_animatorEntity != null)
+        {
+            _animatorEntity.speed = 1;
+            _animatorEntity.Play("die", 0, 0f);
+        }
+        
         entityState = EntityAnimationState.Dying;
         _doSomething = true;
         _isDead = true;