From d061b84e01761cd11a6203caa47e928bd3a4a0d1 Mon Sep 17 00:00:00 2001
From: Kah Wei <msntkw@msn.com>
Date: Fri, 10 Mar 2023 19:24:38 +0800
Subject: [PATCH 1/6] Added extra check to handle null assemblies when
 collecting script assemblies

---
 SHADE_Managed/src/Scripts/ScriptStore.cxx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SHADE_Managed/src/Scripts/ScriptStore.cxx b/SHADE_Managed/src/Scripts/ScriptStore.cxx
index 5d3a3bac..d1931c59 100644
--- a/SHADE_Managed/src/Scripts/ScriptStore.cxx
+++ b/SHADE_Managed/src/Scripts/ScriptStore.cxx
@@ -882,6 +882,8 @@ namespace SHADE
 
         System::Collections::Generic::IEnumerable<System::Type^>^ selectorFunc(System::Reflection::Assembly^ assembly)
         {
+            if (assembly == nullptr)
+                return nullptr;
             return assembly->GetExportedTypes();
         }
         Pair^ resultSelectorFunc(System::Reflection::Assembly^ assembly, System::Type^ type)

From dc0d947dfbbe14ec0554ca15518c9c029a7ed095 Mon Sep 17 00:00:00 2001
From: Glence <glence.low@digipen.edu>
Date: Fri, 10 Mar 2023 19:40:48 +0800
Subject: [PATCH 2/6] WIP for animations

---
 Assets/Scenes/Level1.shade                    | 12 +++++++++--
 .../Player/PlayerStates/UT_PlayerIdleState.cs | 18 ++++++++++++----
 .../Player/PlayerStates/UT_PlayerRunState.cs  |  4 +++-
 .../Player/PlayerStates/UT_PlayerWalkState.cs | 14 +++++++++----
 .../Gameplay/Player/SC_PlayerAnimations.cs    |  6 ++++--
 SHADE_CSharp/premake5.lua                     | 21 +++++++++++++------
 6 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade
index ca74f938..2f822812 100644
--- a/Assets/Scenes/Level1.shade
+++ b/Assets/Scenes/Level1.shade
@@ -7668,8 +7668,8 @@
       playerJumpStartClip: 223009573
       playerJumpLoopClip: 230974023
       playerJumpEndClip: 228134756
-      silhouettePlayer: 51000
-      silhouetteBag: 51000
+      silhouettePlayer: 462
+      silhouetteBag: 465
 - EID: 65733
   Name: HoldingPoint
   IsActive: true
@@ -7753,6 +7753,10 @@
       Mesh: 149697411
       Material: 126391182
       IsActive: true
+    Animator Component:
+      Rig: 77816045
+      AnimationController: 0
+      IsActive: true
   Scripts: ~
 - EID: 465
   Name: SilouetteBag
@@ -7768,6 +7772,10 @@
       Mesh: 144838771
       Material: 126391182
       IsActive: true
+    Animator Component:
+      Rig: 77816045
+      AnimationController: 0
+      IsActive: true
   Scripts: ~
 - EID: 65732
   Name: RespawnPoint
diff --git a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerIdleState.cs b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerIdleState.cs
index 589db690..893818a3 100644
--- a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerIdleState.cs
+++ b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerIdleState.cs
@@ -16,13 +16,23 @@ public class PlayerIdleState : BaseState
     {
       if (!holdItem)
       {
-        PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerIdleClip);
-        PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerIdleClip);
+        if (PlayerAnimations.Instance.playerIdleClip)
+        {
+          PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerIdleClip);
+          PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerIdleClip);
+          PlayerAnimations.Instance.silhoPlayerAnimator.Play(PlayerAnimations.Instance.playerIdleClip);
+          PlayerAnimations.Instance.silhoBagAnimator.Play(PlayerAnimations.Instance.playerIdleClip);
+        }
       }
       else 
       {
-        PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip);
-        PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip);
+        if (PlayerAnimations.Instance.playerCarryIdleClip)
+        {
+          PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip);
+          PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip);
+          PlayerAnimations.Instance.silhoPlayerAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip);
+          PlayerAnimations.Instance.silhoBagAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip);
+        }
       }
     }
   }
diff --git a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerRunState.cs b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerRunState.cs
index dc39c045..7f30effc 100644
--- a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerRunState.cs
+++ b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerRunState.cs
@@ -14,10 +14,12 @@ public class PlayerRunState : BaseState
   public override void OnEnter()
   {
     //Debug.Log("WALK ENTER");
-    if (PlayerAnimations.Instance)
+    if (PlayerAnimations.Instance && PlayerAnimations.Instance.playerRunClip)
     { 
       PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerRunClip);
       PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerRunClip);
+      PlayerAnimations.Instance.silhoPlayerAnimator.Play(PlayerAnimations.Instance.playerRunClip);
+      PlayerAnimations.Instance.silhoBagAnimator.Play(PlayerAnimations.Instance.playerRunClip);
     }
   }
   public override void update()
diff --git a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerWalkState.cs b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerWalkState.cs
index 12cdc860..c15fb5b1 100644
--- a/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerWalkState.cs
+++ b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerWalkState.cs
@@ -20,17 +20,23 @@ public class PlayerWalkState : BaseState
     {
       if (!holdItem)
       {
-        if(PlayerAnimations.Instance.playerWalkClip)
+        if (PlayerAnimations.Instance.playerWalkClip)
+        {
           PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerWalkClip);
-        if(PlayerAnimations.Instance.playerWalkClip)
           PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerWalkClip);
+          PlayerAnimations.Instance.silhoPlayerAnimator.Play(PlayerAnimations.Instance.playerWalkClip);
+          PlayerAnimations.Instance.silhoBagAnimator.Play(PlayerAnimations.Instance.playerWalkClip);
+        }
       }
       else 
       {
-        if(PlayerAnimations.Instance.playerCarryWalkClip)
+        if (PlayerAnimations.Instance.playerCarryWalkClip)
+        {
           PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerCarryWalkClip);
-        if(PlayerAnimations.Instance.playerCarryWalkClip)
           PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerCarryWalkClip);
+          PlayerAnimations.Instance.silhoPlayerAnimator.Play(PlayerAnimations.Instance.playerCarryWalkClip);
+          PlayerAnimations.Instance.silhoBagAnimator.Play(PlayerAnimations.Instance.playerCarryWalkClip);
+        }
       }
     }
   }
diff --git a/Assets/Scripts/Gameplay/Player/SC_PlayerAnimations.cs b/Assets/Scripts/Gameplay/Player/SC_PlayerAnimations.cs
index 22b87d55..2bda8938 100644
--- a/Assets/Scripts/Gameplay/Player/SC_PlayerAnimations.cs
+++ b/Assets/Scripts/Gameplay/Player/SC_PlayerAnimations.cs
@@ -57,17 +57,19 @@ public class PlayerAnimations : Script
     if (!BagAnimator)
       Debug.LogError("Bag Animator is MISSING!");
 
-    if(!silhouettePlayer)
+    if(silhouettePlayer)
       silhoPlayerAnimator = silhouettePlayer.GetComponent<Animator>();
     else
       Debug.LogError("Silho Player is MISSING!");
+
     if (!silhoPlayerAnimator)
       Debug.LogError("Silho Player Animator is MISSING!");
 
-    if(!silhouetteBag)
+    if(silhouetteBag)
       silhoBagAnimator = silhouetteBag.GetComponent<Animator>();
     else
       Debug.LogError("Silho bag is MISSING!");
+
     if (!silhoBagAnimator)
       Debug.LogError("Silho Player Animator is MISSING!");
   }
diff --git a/SHADE_CSharp/premake5.lua b/SHADE_CSharp/premake5.lua
index f735b515..c94bb438 100644
--- a/SHADE_CSharp/premake5.lua
+++ b/SHADE_CSharp/premake5.lua
@@ -26,24 +26,33 @@ project "SHADE_CSharp"
   }
 
   warnings 'Extra'
-  
-  postbuildcommands 
-  {
-    "xcopy  /r /y /q \"%{outputdir}\\net5.0\\SHADE_CSharp.xml\" \"%{outputdir}\"",
-    "xcopy  /r /y /q \"%{outputdir}\\net5.0\\SHADE_CSharp.pdb\" \"%{outputdir}\""
-  }
 
   filter "configurations:Debug"
     symbols "On"
     defines {"_DEBUG"}
+    postbuildcommands 
+    {
+      "xcopy  /r /y /q \"$(SolutionDir)\\bin\\Debug\\net5.0\\SHADE_CSharp.xml\" \"%{outputdir}\"",
+      "xcopy  /r /y /q \"$(SolutionDir)\\bin\\Debug\\net5.0\\SHADE_CSharp.pdb\" \"%{outputdir}\""
+    }
   
   filter "configurations:Release"
     optimize "On"
     defines{"_RELEASE"}
+    postbuildcommands 
+    {
+      "xcopy  /r /y /q \"$(SolutionDir)\\bin\\Release\\net5.0\\SHADE_CSharp.xml\" \"%{outputdir}\"",
+      "xcopy  /r /y /q \"$(SolutionDir)\\bin\\Release\\net5.0\\SHADE_CSharp.pdb\" \"%{outputdir}\""
+    }
 
   filter "configurations:Publish"
     optimize "On"
     defines{"_RELEASE"}
+    postbuildcommands 
+    {
+      "xcopy  /r /y /q \"$(SolutionDir)\\bin\\Release\\net5.0\\SHADE_CSharp.xml\" \"%{outputdir}\"",
+      "xcopy  /r /y /q \"$(SolutionDir)\\bin\\Release\\net5.0\\SHADE_CSharp.pdb\" \"%{outputdir}\""
+    }
 
   require "vstudio"
 

From 9315c08a69674ea8a97e239d1f08f7bcbf1a1ae3 Mon Sep 17 00:00:00 2001
From: mushgunAX <mushgun_ax@hotmail.com>
Date: Fri, 10 Mar 2023 21:37:54 +0800
Subject: [PATCH 3/6] Mouse centering velocity calculation corrected

---
 SHADE_Engine/src/Input/SHInputManager.cpp | 40 +++++++++++++++++++----
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/SHADE_Engine/src/Input/SHInputManager.cpp b/SHADE_Engine/src/Input/SHInputManager.cpp
index dd3cfe80..6645aa1b 100644
--- a/SHADE_Engine/src/Input/SHInputManager.cpp
+++ b/SHADE_Engine/src/Input/SHInputManager.cpp
@@ -798,17 +798,45 @@ namespace SHADE
 
     //Get cursor position, even when it is outside window
     POINT p;
-    GetCursorPos(&p);
+    GetCursorPos(&p); //This point is WRT the screen, not the window
+    //ScreenToClient(GetActiveWindow(), &p);
     mouseScreenX = p.x;
     mouseScreenY = p.y;
+    //SHLOGV_INFO("MouseScreenY = {}", mouseScreenY);
 
-    //Velocity
-    mouseVelocityX = static_cast<double>(mouseScreenX - mouseScreenXLast) / dt;
-    mouseVelocityY = static_cast<double>(mouseScreenY - mouseScreenYLast) / dt;
+    if (!mouseCentering)
+    {
+      //Velocity
+      mouseVelocityX = static_cast<double>(mouseScreenX - mouseScreenXLast) / dt;
+      mouseVelocityY = static_cast<double>(mouseScreenY - mouseScreenYLast) / dt;
+    }
+    else
+    {
+      //Mouse centering
+      //uint32_t width = SHADE::SHGraphicsSystemInterface::GetWindowWidth();
+      //uint32_t height = SHADE::SHGraphicsSystemInterface::GetWindowHeight();
+      int mouseCenterX = 0;
+      int mouseCenterY = 0;
+      RECT wndRect = { NULL }; //4th quadrant
+      if (GetWindowRect(GetActiveWindow(), &wndRect))
+      {
+        mouseCenterX = wndRect.left + (wndRect.right - wndRect.left) / 2;
+        mouseCenterY = wndRect.top + (wndRect.bottom - wndRect.top) / 2;
+        //SHLOGV_INFO("W: {0}, H: {1}", (wndRect.right - wndRect.left), (wndRect.bottom - wndRect.top));
+      }
 
+      //Velocity
+      mouseVelocityX = static_cast<double>(mouseScreenX - mouseCenterX) / dt;
+      mouseVelocityY = static_cast<double>(mouseScreenY - mouseCenterY) / dt;
 
+      //SHLOGV_INFO("mouseScreenY = {0:0}, mouseCenterY = {1:0}", mouseScreenY, mouseCenterY);
+      //SHLOGV_INFO("{0.0}", mouseVelocityY);
+
+      SetMouseScreenPosition(mouseCenterX, mouseCenterY);
+    }
+    
     //Mouse Centering
-    if (mouseCentering)
+    /*if (mouseCentering)
     {
       uint32_t width = SHADE::SHGraphicsSystemInterface::GetWindowWidth();
       uint32_t height = SHADE::SHGraphicsSystemInterface::GetWindowHeight();
@@ -819,7 +847,7 @@ namespace SHADE
       GetCursorPos(&p);
       mouseVelocityX -= static_cast<double>(p.x - mouseScreenX) / dt;
       mouseVelocityY -= static_cast<double>(p.y - mouseScreenY) / dt;
-    }
+    }*/
 
     if (mouseVelocityX != 0.0 || mouseVelocityY != 0.0)
       controllerInUse = false;

From 47621d743696a4f801d89774be318ab4ba1af5f9 Mon Sep 17 00:00:00 2001
From: Kah Wei <msntkw@msn.com>
Date: Fri, 10 Mar 2023 22:37:27 +0800
Subject: [PATCH 4/6] Added extra line to log an error if a null assembly is
 detected

---
 SHADE_Managed/src/Scripts/ScriptStore.cxx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SHADE_Managed/src/Scripts/ScriptStore.cxx b/SHADE_Managed/src/Scripts/ScriptStore.cxx
index d1931c59..9ef447bf 100644
--- a/SHADE_Managed/src/Scripts/ScriptStore.cxx
+++ b/SHADE_Managed/src/Scripts/ScriptStore.cxx
@@ -883,7 +883,10 @@ namespace SHADE
         System::Collections::Generic::IEnumerable<System::Type^>^ selectorFunc(System::Reflection::Assembly^ assembly)
         {
             if (assembly == nullptr)
+            {
+                Debug::LogError("[ScriptStore] Received null assembly while collecting Script types. This should not happen!");
                 return nullptr;
+            }
             return assembly->GetExportedTypes();
         }
         Pair^ resultSelectorFunc(System::Reflection::Assembly^ assembly, System::Type^ type)

From c31bb321adbe6856d391ca887a406ce34bb42b55 Mon Sep 17 00:00:00 2001
From: maverickdgg <danielcyc38@gmail.com>
Date: Fri, 10 Mar 2023 23:32:22 +0800
Subject: [PATCH 5/6] Camera Collision changes

---
 Assets/CollisionTags.SHConfig                 |   4 +-
 Assets/Scenes/Level1.shade                    | 210 ++++--------
 Assets/Scenes/Level2.shade                    | 324 +++++++++---------
 Assets/Scenes/Level3.shade                    | 268 ++++++++-------
 .../AIBehaviour/Implemented/Homeowner1.cs     |   4 +-
 5 files changed, 372 insertions(+), 438 deletions(-)

diff --git a/Assets/CollisionTags.SHConfig b/Assets/CollisionTags.SHConfig
index 3fb14287..d662b247 100644
--- a/Assets/CollisionTags.SHConfig
+++ b/Assets/CollisionTags.SHConfig
@@ -1,11 +1,11 @@
-0 StaticObject 1110000000000000
+0 StaticObject 1100000000000000
 1 Player 1100000000000000
 2 Food 1000000000000000
 3 Breakable 1100000000000000
 4 ScoringWallCollider 0110000000000000
 5 Homeowner 1100000000000000
 6 Camera 0010000000000000
-7 8 0000000000000000
+7 StaticWithCameraCollision 1110000000000000
 8 9 0000000000000000
 9 10 0000000000000000
 10 11 0000000000000000
diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade
index 0cce71b4..e1eeafc1 100644
--- a/Assets/Scenes/Level1.shade
+++ b/Assets/Scenes/Level1.shade
@@ -47,7 +47,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1.20000005, z: 1}
           Friction: 0.400000006
@@ -101,7 +101,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1.20000005, z: 1}
           Friction: 0.400000006
@@ -215,7 +215,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1.20000005, z: 1}
           Friction: 0.400000006
@@ -978,7 +978,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 1}
           Friction: 0.400000006
@@ -1059,7 +1059,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 1}
           Friction: 0.400000006
@@ -1356,7 +1356,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 1}
           Friction: 0.400000006
@@ -1421,7 +1421,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1448,7 +1448,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1475,7 +1475,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1484,7 +1484,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -1511,7 +1511,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1520,7 +1520,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -1547,7 +1547,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1556,7 +1556,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -1583,7 +1583,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1592,7 +1592,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -1619,7 +1619,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 0.200000003, z: 0.25}
           Friction: 0.400000006
@@ -1628,7 +1628,7 @@
           Position Offset: {x: 0, y: 2.0999999, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 0.899999976, z: 0.25}
           Friction: 0.400000006
@@ -1637,7 +1637,7 @@
           Position Offset: {x: 0, y: 0.449999988, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1646,7 +1646,7 @@
           Position Offset: {x: -0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1673,7 +1673,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.200000003, z: 0.25}
           Friction: 0.400000006
@@ -1682,7 +1682,7 @@
           Position Offset: {x: 0, y: 2.0999999, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.899999976, z: 0.25}
           Friction: 0.400000006
@@ -1691,7 +1691,7 @@
           Position Offset: {x: 0, y: 0.449999988, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1700,7 +1700,7 @@
           Position Offset: {x: -0.899999976, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1727,7 +1727,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.200000003, z: 0.25}
           Friction: 0.400000006
@@ -1736,7 +1736,7 @@
           Position Offset: {x: 0, y: 2.0999999, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.899999976, z: 0.25}
           Friction: 0.400000006
@@ -1745,7 +1745,7 @@
           Position Offset: {x: 0, y: 0.449999988, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1754,7 +1754,7 @@
           Position Offset: {x: -0.899999976, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1781,7 +1781,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1798,7 +1798,7 @@
   Components:
     Transform Component:
       Translate: {x: -5.5, y: 0, z: -3}
-      Rotate: {x: 0, y: 0, z: 0}
+      Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 0.999978602, y: 1, z: 0.999978602}
       IsActive: true
     Renderable Component:
@@ -1808,7 +1808,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.200000003, z: 0.25}
           Friction: 0.400000006
@@ -1817,7 +1817,7 @@
           Position Offset: {x: 0, y: 2.0999999, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.899999976, z: 0.25}
           Friction: 0.400000006
@@ -1826,7 +1826,7 @@
           Position Offset: {x: 0, y: 0.449999988, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1835,7 +1835,7 @@
           Position Offset: {x: -0.899999976, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1862,7 +1862,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1871,7 +1871,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -1898,7 +1898,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1907,7 +1907,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -1934,7 +1934,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1961,7 +1961,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1988,7 +1988,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2015,7 +2015,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2042,7 +2042,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2069,7 +2069,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.200000003, z: 0.25}
           Friction: 0.400000006
@@ -2078,7 +2078,7 @@
           Position Offset: {x: 0, y: 2.0999999, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.899999976, z: 0.25}
           Friction: 0.400000006
@@ -2087,7 +2087,7 @@
           Position Offset: {x: 0, y: 0.449999988, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2096,7 +2096,7 @@
           Position Offset: {x: -0.899999976, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2123,7 +2123,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2150,7 +2150,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2159,7 +2159,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -2186,7 +2186,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2195,7 +2195,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -2222,7 +2222,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2249,7 +2249,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2276,7 +2276,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2303,7 +2303,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2330,7 +2330,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2357,7 +2357,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2366,7 +2366,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -2393,7 +2393,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2402,7 +2402,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -2518,7 +2518,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -3338,7 +3338,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 15, y: 0.200000003, z: 15}
           Friction: 0.400000006
@@ -4107,7 +4107,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 1
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 20, y: 0.100000001, z: 20}
           Friction: 0.400000006
@@ -7491,88 +7491,6 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
-- EID: 217
-  Name: ===Anims===
-  IsActive: true
-  NumberOfChildren: 4
-  Components: ~
-  Scripts: ~
-- EID: 221
-  Name: Obj1
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0.301929057, y: 0.912136197, z: -9.20810795}
-      Rotate: {x: 0, y: 1.57079637, z: 0}
-      Scale: {x: 0.100000024, y: 0.100000024, z: 0.100000024}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141097368
-      Material: 117923942
-      IsActive: true
-    Animator Component:
-      Rig: 72178939
-      AnimationController: 0
-      IsActive: true
-  Scripts: ~
-- EID: 219
-  Name: Obj3
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 2.48987007, y: 0.868837833, z: -9.20810795}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 0.113750041, y: 0.113750041, z: 0.113750041}
-      IsActive: true
-    Renderable Component:
-      Mesh: 149723808
-      Material: 117923942
-      IsActive: true
-    Animator Component:
-      Rig: 80728853
-      AnimationController: 0
-      IsActive: true
-  Scripts: ~
-- EID: 218
-  Name: Obj2
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 1.47563028, y: 0.454107046, z: -9.20810795}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 0.0350000113, y: 0.0350000113, z: 0.0350000113}
-      IsActive: true
-    Renderable Component:
-      Mesh: 135102560
-      Material: 117923942
-      IsActive: true
-    Animator Component:
-      Rig: 80500944
-      AnimationController: 0
-      IsActive: true
-  Scripts: ~
-- EID: 220
-  Name: Obj4
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -0.050871402, y: -0.0112784812, z: -8.23628521}
-      Rotate: {x: 0, y: -1.57079601, z: 0}
-      Scale: {x: 0.318530291, y: 0.318552583, z: 0.318530291}
-      IsActive: true
-    Renderable Component:
-      Mesh: 134911040
-      Material: 117923942
-      IsActive: true
-    Animator Component:
-      Rig: 76715962
-      AnimationController: 0
-      IsActive: true
-  Scripts: ~
 - EID: 198
   Name: ====Raccoon====
   IsActive: true
diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade
index d8a4fc8c..4c2918a4 100644
--- a/Assets/Scenes/Level2.shade
+++ b/Assets/Scenes/Level2.shade
@@ -2892,7 +2892,7 @@
 - EID: 199
   Name: Gameplay Canvas
   IsActive: true
-  NumberOfChildren: 3
+  NumberOfChildren: 4
   Components:
     Canvas Component:
       Canvas Width: 1920
@@ -2903,7 +2903,7 @@
 - EID: 237
   Name: Score Text
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 0
   Components:
     Transform Component:
       Translate: {x: -800, y: 365, z: 0.600000024}
@@ -2921,27 +2921,15 @@
       Hovered: false
       Clicked: false
       IsActive: true
-  Scripts: ~
-- EID: 521
-  Name: Score BG
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0.300000012, y: 0.600000024, z: 0.98999995}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 3.45600009, y: 2, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 127527215
-      IsActive: true
-    UI Component:
-      Canvas ID: 199
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
+  Scripts:
+    - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning
+      Enabled: true
+      offsetPerDigit: 25
+    - Type: SHADE_Scripting.UI.SingleScaleBounce
+      Enabled: true
+      durationUp: 0.150000006
+      durationDown: 0.300000012
+      scaleSize: 1.20000005
 - EID: 206
   Name: Timer Text
   IsActive: true
@@ -3033,6 +3021,26 @@
   Scripts:
     - Type: FixRotation
       Enabled: true
+- EID: 521
+  Name: Score BG
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -770, y: 425, z: 59.9999962}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 345.600006, y: 200, z: 60}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 127527215
+      IsActive: true
+    UI Component:
+      Canvas ID: 199
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
 - EID: 198
   Name: ====Raccoon====
   IsActive: true
@@ -5469,7 +5477,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -3.45969725, y: 0, z: -2.61272359}
+      Translate: {x: 0, y: 0, z: -1.92464328}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
@@ -5549,9 +5557,9 @@
       Material: 129340704
       IsActive: true
     Button Component:
-      Default Texture: 63979907
-      Hovered Texture: 51379325
-      Clicked Texture: 66788278
+      Default Texture: 63738242
+      Hovered Texture: 58455648
+      Clicked Texture: 66776217
       IsActive: true
     UI Component:
       Canvas ID: 10
@@ -5561,10 +5569,10 @@
   Scripts:
     - Type: SHADE_Scripting.UI.ButtonFX
       Enabled: true
-      onHoverEnterSound: Empty
+      onHoverEnterSound: event:/UI/botton_hover
       onHoverExitSound: Empty
-      onClickSound: event:/UI/mouse_down_element
-      onReleaseSound: Empty
+      onClickSound: event:/UI/button_success
+      onReleaseSound: event:/UI/button_fail
       hoverScale: 1.10000002
       clickScale: 0.899999976
 - EID: 0
@@ -5574,7 +5582,7 @@
   Components:
     Transform Component:
       Translate: {x: 0, y: -300, z: 0}
-      Rotate: {x: -3.74789906, y: 1.43110418, z: 2.63486958}
+      Rotate: {x: 1.48352981, y: 0.5, z: 0.399993658}
       Scale: {x: 400, y: 100, z: 500}
       IsActive: true
     Renderable Component:
@@ -5594,10 +5602,10 @@
   Scripts:
     - Type: SHADE_Scripting.UI.ButtonFX
       Enabled: true
-      onHoverEnterSound: Empty
+      onHoverEnterSound: event:/UI/botton_hover
       onHoverExitSound: Empty
-      onClickSound: event:/UI/mouse_down_element
-      onReleaseSound: Empty
+      onClickSound: event:/UI/button_success
+      onReleaseSound: event:/UI/button_fail
       hoverScale: 1.10000002
       clickScale: 0.899999976
     - Type: FixRotation
@@ -5617,9 +5625,9 @@
       Material: 129340704
       IsActive: true
     Button Component:
-      Default Texture: 64806384
-      Hovered Texture: 58347825
-      Clicked Texture: 63234380
+      Default Texture: 64995894
+      Hovered Texture: 58109178
+      Clicked Texture: 60429179
       IsActive: true
     UI Component:
       Canvas ID: 10
@@ -5629,10 +5637,10 @@
   Scripts:
     - Type: SHADE_Scripting.UI.ButtonFX
       Enabled: true
-      onHoverEnterSound: Empty
+      onHoverEnterSound: event:/UI/botton_hover
       onHoverExitSound: Empty
-      onClickSound: event:/UI/mouse_down_element
-      onReleaseSound: Empty
+      onClickSound: event:/UI/button_success
+      onReleaseSound: event:/UI/button_fail
       hoverScale: 1.10000002
       clickScale: 0.899999976
 - EID: 11
@@ -6133,7 +6141,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 10, y: 1, z: 18}
           Friction: 0.400000006
@@ -6171,7 +6179,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 0.200000003, z: 0.25}
           Friction: 0.400000006
@@ -6180,7 +6188,7 @@
           Position Offset: {x: 0, y: 2.0999999, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 0.899999976, z: 0.25}
           Friction: 0.400000006
@@ -6189,7 +6197,7 @@
           Position Offset: {x: 0, y: 0.449999988, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6198,7 +6206,7 @@
           Position Offset: {x: -0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6225,7 +6233,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6234,7 +6242,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -6261,7 +6269,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6288,7 +6296,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6315,7 +6323,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6342,7 +6350,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6369,7 +6377,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6396,7 +6404,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6405,7 +6413,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -6432,7 +6440,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6459,7 +6467,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6486,7 +6494,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6513,7 +6521,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 0.150000006, z: 0.25}
           Friction: 0.400000006
@@ -6522,7 +6530,7 @@
           Position Offset: {x: 0, y: 2.125, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6531,7 +6539,7 @@
           Position Offset: {x: -0.455000013, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6576,7 +6584,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.800000012, y: 2, z: 0.0350000001}
           Friction: 0.400000006
@@ -6593,8 +6601,8 @@
   Components:
     Transform Component:
       Translate: {x: -5, y: 0, z: 3}
-      Rotate: {x: -0, y: 1.57079601, z: 0}
-      Scale: {x: 0.999980152, y: 1, z: 0.999980152}
+      Rotate: {x: 0, y: 1.57079601, z: 0}
+      Scale: {x: 0.999979854, y: 1, z: 0.999979854}
       IsActive: true
     Renderable Component:
       Mesh: 148351779
@@ -6603,7 +6611,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6630,7 +6638,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6639,7 +6647,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -6666,7 +6674,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6693,7 +6701,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6720,7 +6728,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6747,7 +6755,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6774,7 +6782,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6801,7 +6809,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 0.150000006, z: 0.25}
           Friction: 0.400000006
@@ -6810,7 +6818,7 @@
           Position Offset: {x: 0, y: 2.125, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6819,7 +6827,7 @@
           Position Offset: {x: -0.455000013, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6891,7 +6899,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6918,7 +6926,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6945,7 +6953,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6972,7 +6980,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -6999,7 +7007,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -7075,7 +7083,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7102,7 +7110,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7119,7 +7127,7 @@
   Components:
     Transform Component:
       Translate: {x: -2, y: 0, z: 0}
-      Rotate: {x: -0, y: 0, z: 0}
+      Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
     Renderable Component:
@@ -7129,7 +7137,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7156,7 +7164,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7194,7 +7202,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7221,7 +7229,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7248,7 +7256,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7265,7 +7273,7 @@
   Components:
     Transform Component:
       Translate: {x: -2, y: 0, z: 0}
-      Rotate: {x: -0, y: 0, z: 0}
+      Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
     Renderable Component:
@@ -7275,7 +7283,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7302,7 +7310,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7340,7 +7348,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7367,7 +7375,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7394,7 +7402,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7421,7 +7429,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7448,7 +7456,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7486,7 +7494,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7513,7 +7521,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7540,7 +7548,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7567,7 +7575,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7594,7 +7602,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7632,7 +7640,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7659,7 +7667,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7686,7 +7694,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7713,7 +7721,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7740,7 +7748,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7893,7 +7901,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7920,7 +7928,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7958,7 +7966,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -7985,7 +7993,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.0500000007, z: 2}
           Friction: 0.400000006
@@ -8023,7 +8031,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -8032,7 +8040,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -8059,7 +8067,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -8068,7 +8076,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -8095,7 +8103,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.200000003, z: 0.25}
           Friction: 0.400000006
@@ -8104,7 +8112,7 @@
           Position Offset: {x: 0, y: 2.0999999, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 0.899999976, z: 0.25}
           Friction: 0.400000006
@@ -8113,7 +8121,7 @@
           Position Offset: {x: 0, y: 0.449999988, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -8122,7 +8130,7 @@
           Position Offset: {x: -0.949999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.100000001, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -8149,7 +8157,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -8176,7 +8184,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -8203,7 +8211,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -8230,7 +8238,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -8638,8 +8646,8 @@
   Components:
     Transform Component:
       Translate: {x: -1.5, y: 0, z: -1.5}
-      Rotate: {x: 0, y: -1.57079601, z: 0}
-      Scale: {x: 0.999761641, y: 1, z: 0.999761641}
+      Rotate: {x: -0, y: -1.57079601, z: 0}
+      Scale: {x: 0.999761581, y: 1, z: 0.999761581}
       IsActive: true
     Renderable Component:
       Mesh: 136828790
@@ -10587,9 +10595,9 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -0.000432491302, y: 2, z: -1.14566433e-07}
+      Translate: {x: -0.000432729721, y: 2, z: -1.14566461e-07}
       Rotate: {x: -0, y: 1.57079601, z: 0}
-      Scale: {x: 0.99998945, y: 1, z: 0.99998945}
+      Scale: {x: 0.99998939, y: 1, z: 0.99998939}
       IsActive: true
     Renderable Component:
       Mesh: 147761585
@@ -10598,7 +10606,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.20000005, y: 0.100000001, z: 2.20000005}
           Friction: 0.400000006
@@ -10641,9 +10649,9 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0, y: 0.878599584, z: -1.57223099e-07}
+      Translate: {x: -2.38418579e-07, y: 0.878599584, z: -1.14514904e-07}
       Rotate: {x: -0, y: 1.57079601, z: 0}
-      Scale: {x: 0.999942183, y: 1, z: 0.999942183}
+      Scale: {x: 0.999942064, y: 1, z: 0.999942064}
       IsActive: true
     Renderable Component:
       Mesh: 142336524
@@ -10652,7 +10660,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 1
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.899999976, y: 0.100000001, z: 1.89999998}
           Friction: 0.400000006
@@ -10679,7 +10687,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 0.100000001}
           Friction: 0.400000006
@@ -10688,7 +10696,7 @@
           Position Offset: {x: 0, y: 0.5, z: -1.14999998}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 0.100000001}
           Friction: 0.400000006
@@ -10704,9 +10712,9 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -0.000432729721, y: 0, z: -1.14566461e-07}
+      Translate: {x: -0.00043296814, y: 0, z: -1.1456649e-07}
       Rotate: {x: -0, y: 1.57079601, z: 0}
-      Scale: {x: 0.99994278, y: 1, z: 0.99994278}
+      Scale: {x: 0.99994266, y: 1, z: 0.99994266}
       IsActive: true
     Renderable Component:
       Mesh: 140066298
@@ -10715,7 +10723,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 0.100000001}
           Friction: 0.400000006
@@ -10724,7 +10732,7 @@
           Position Offset: {x: 0, y: 0.5, z: -1.14999998}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 0.100000001}
           Friction: 0.400000006
@@ -10825,7 +10833,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.20000005, y: 0.100000001, z: 2.20000005}
           Friction: 0.400000006
@@ -10879,7 +10887,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 1
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.899999976, y: 0.100000001, z: 1.89999998}
           Friction: 0.400000006
@@ -10906,7 +10914,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 0.100000001}
           Friction: 0.400000006
@@ -10915,7 +10923,7 @@
           Position Offset: {x: 0, y: 0.5, z: -0.954999983}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 0.100000001}
           Friction: 0.400000006
@@ -10931,8 +10939,8 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0.000105836909, y: 0, z: 0.000872135162}
-      Rotate: {x: -0, y: 1.57079601, z: -0}
+      Translate: {x: 0.000105844418, y: 6.11775647e-07, z: 0.000879764557}
+      Rotate: {x: 0, y: 1.57079601, z: -0}
       Scale: {x: 0.999942899, y: 1, z: 0.999942899}
       IsActive: true
     Renderable Component:
@@ -10942,7 +10950,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 0.100000001}
           Friction: 0.400000006
@@ -10951,7 +10959,7 @@
           Position Offset: {x: 0, y: 0.5, z: -0.954999983}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 0.100000001}
           Friction: 0.400000006
@@ -11016,7 +11024,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.20000005, y: 0.100000001, z: 2.20000005}
           Friction: 0.400000006
@@ -11032,9 +11040,9 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0.000216073822, y: 1, z: -0.500002861}
-      Rotate: {x: 2.98023224e-08, y: 1.57079542, z: 1.57079542}
-      Scale: {x: 2, y: 0.999999523, z: 1.10000002}
+      Translate: {x: 0.000216193032, y: 1, z: -0.500002861}
+      Rotate: {x: 2.98022655e-08, y: 1.57079542, z: 1.5707953}
+      Scale: {x: 1.99999988, y: 0.999999464, z: 1.10000002}
       IsActive: true
     Renderable Component:
       Mesh: 139576452
@@ -11060,7 +11068,7 @@
   Components:
     Transform Component:
       Translate: {x: -2.49641334e-06, y: 1, z: -2.86102295e-06}
-      Rotate: {x: -0, y: 1.57079601, z: 0}
+      Rotate: {x: -0, y: 1.57079601, z: -0}
       Scale: {x: 0.999976516, y: 1, z: 0.999976516}
       IsActive: true
     Renderable Component:
@@ -11070,7 +11078,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 1
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.899999976, y: 0.100000001, z: 1.89999998}
           Friction: 0.400000006
@@ -11087,7 +11095,7 @@
   Components:
     Transform Component:
       Translate: {x: -2.49641334e-06, y: 1, z: -2.86102295e-06}
-      Rotate: {x: -0, y: 1.57079601, z: 0}
+      Rotate: {x: -0, y: 1.57079601, z: -0}
       Scale: {x: 0.999963403, y: 1, z: 0.999963403}
       IsActive: true
     Renderable Component:
@@ -11097,7 +11105,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 0.100000001}
           Friction: 0.400000006
@@ -11106,7 +11114,7 @@
           Position Offset: {x: 0, y: 0.5, z: -0.954999983}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 0.100000001}
           Friction: 0.400000006
@@ -11123,7 +11131,7 @@
   Components:
     Transform Component:
       Translate: {x: -2.49641334e-06, y: 0, z: -2.86102295e-06}
-      Rotate: {x: -0, y: 1.57079601, z: 0}
+      Rotate: {x: -0, y: 1.57079601, z: -0}
       Scale: {x: 0.999942899, y: 1, z: 0.999942899}
       IsActive: true
     Renderable Component:
@@ -11133,7 +11141,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 0.100000001}
           Friction: 0.400000006
@@ -11142,7 +11150,7 @@
           Position Offset: {x: 0, y: 0.5, z: -0.954999983}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 0.100000001}
           Friction: 0.400000006
@@ -11306,7 +11314,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.20000005, y: 0.100000001, z: 2.20000005}
           Friction: 0.400000006
@@ -11360,7 +11368,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 0.100000001}
           Friction: 0.400000006
@@ -11369,7 +11377,7 @@
           Position Offset: {x: 0, y: 0.5, z: -0.954999983}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 1, z: 0.100000001}
           Friction: 0.400000006
diff --git a/Assets/Scenes/Level3.shade b/Assets/Scenes/Level3.shade
index 16375e8e..69798992 100644
--- a/Assets/Scenes/Level3.shade
+++ b/Assets/Scenes/Level3.shade
@@ -73,7 +73,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -82,7 +82,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -109,7 +109,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -118,7 +118,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -145,7 +145,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 3.22600007, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -172,7 +172,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -181,7 +181,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -208,7 +208,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -217,7 +217,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -244,7 +244,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -271,7 +271,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005}
           Friction: 0.400000006
@@ -280,7 +280,7 @@
           Position Offset: {x: 0.660000026, y: -0.400000006, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005}
           Friction: 0.400000006
@@ -289,7 +289,7 @@
           Position Offset: {x: 1, y: -0.600000024, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005}
           Friction: 0.400000006
@@ -298,7 +298,7 @@
           Position Offset: {x: 1.36000001, y: -0.899999976, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005}
           Friction: 0.400000006
@@ -307,7 +307,7 @@
           Position Offset: {x: 1.70000005, y: -1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005}
           Friction: 0.400000006
@@ -316,7 +316,7 @@
           Position Offset: {x: 2.04999995, y: -1.39999998, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005}
           Friction: 0.400000006
@@ -325,7 +325,7 @@
           Position Offset: {x: 2.4000001, y: -1.64999998, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005}
           Friction: 0.400000006
@@ -334,7 +334,7 @@
           Position Offset: {x: 2.75, y: -1.86000001, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.400000006, y: 0.300000012, z: 1.70000005}
           Friction: 0.400000006
@@ -361,7 +361,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -388,7 +388,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -415,7 +415,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -424,7 +424,7 @@
           Position Offset: {x: 0.0500000007, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -451,7 +451,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -478,7 +478,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -505,7 +505,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -532,7 +532,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -541,7 +541,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.93700004}
           Friction: 0.400000006
@@ -568,7 +568,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -577,7 +577,7 @@
           Position Offset: {x: 0.0500000007, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -604,7 +604,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -613,7 +613,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -640,7 +640,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -667,7 +667,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -694,7 +694,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 4.05200005, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -736,7 +736,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -793,7 +793,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.883000016, y: 1.08800006, z: 0.232999995}
           Friction: 0.400000006
@@ -820,7 +820,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2.13700008, y: 1.028, z: 0.324999988}
           Friction: 0.400000006
@@ -847,7 +847,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.883000016, y: 1.08800006, z: 0.232999995}
           Friction: 0.400000006
@@ -874,7 +874,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1276,7 +1276,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1303,7 +1303,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1312,7 +1312,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -1792,7 +1792,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1801,7 +1801,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -1828,7 +1828,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1837,7 +1837,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -1864,7 +1864,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1873,7 +1873,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -1900,7 +1900,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1909,7 +1909,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -1926,8 +1926,8 @@
   Components:
     Transform Component:
       Translate: {x: 7, y: 0, z: 1}
-      Rotate: {x: 0, y: -1.57079601, z: 0}
-      Scale: {x: 0.999954402, y: 1, z: 0.999954402}
+      Rotate: {x: -0, y: -1.57079601, z: 0}
+      Scale: {x: 0.999954343, y: 1, z: 0.999954343}
       IsActive: true
     Renderable Component:
       Mesh: 142118787
@@ -1936,7 +1936,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1945,7 +1945,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.149000004, y: 2.20000005, z: 2.204}
           Friction: 0.400000006
@@ -1972,7 +1972,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1.10000002, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -1981,7 +1981,7 @@
           Position Offset: {x: 0.449999988, y: 1.10000002, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.25, y: 2.20000005, z: 1.10000002}
           Friction: 0.400000006
@@ -2008,7 +2008,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2025,7 +2025,7 @@
   Components:
     Transform Component:
       Translate: {x: 10, y: 0, z: 1}
-      Rotate: {x: 0, y: 0, z: 0}
+      Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 0.999952376, y: 1, z: 0.999952376}
       IsActive: true
     Renderable Component:
@@ -2035,7 +2035,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 3.93700004, y: 2.20000005, z: 0.224999994}
           Friction: 0.400000006
@@ -2062,7 +2062,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2089,7 +2089,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2116,7 +2116,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2143,7 +2143,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2170,7 +2170,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2197,7 +2197,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2239,7 +2239,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2266,7 +2266,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2293,7 +2293,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2320,7 +2320,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2.04500008, y: 0.896000028, z: 0.275000006}
           Friction: 0.400000006
@@ -2347,7 +2347,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2374,7 +2374,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2401,7 +2401,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2428,7 +2428,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2455,7 +2455,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2482,7 +2482,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2509,7 +2509,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 2, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2626,7 +2626,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 1, y: 2.20000005, z: 0.25}
           Friction: 0.400000006
@@ -2653,7 +2653,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 0.200000003, y: 2.20000005, z: 0.200000003}
           Friction: 0.400000006
@@ -5621,7 +5621,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 1
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 15, y: 1, z: 15}
           Friction: 0.400000006
@@ -5644,7 +5644,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 1
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 6, y: 0.200000003, z: 5}
           Friction: 0.400000006
@@ -5667,7 +5667,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 1
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 10, y: 0.200000003, z: 3}
           Friction: 0.400000006
@@ -5690,7 +5690,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 15, y: 1, z: 15}
           Friction: 0.400000006
@@ -5707,13 +5707,13 @@
   Components:
     Transform Component:
       Translate: {x: 1.93802273, y: 2.39508605, z: 4.01721716}
-      Rotate: {x: 0, y: 0, z: 0}
+      Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 1
+          Collision Tag: 0
           Type: Box
           Half Extents: {x: 6, y: 0.5, z: 0.150000006}
           Friction: 0.400000006
@@ -5730,13 +5730,13 @@
   Components:
     Transform Component:
       Translate: {x: 0, y: 0, z: 0}
-      Rotate: {x: 0, y: 0, z: 0}
+      Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 0
+          Collision Tag: 7
           Type: Box
           Half Extents: {x: 4.01900005, y: 1.10099995, z: 0.147}
           Friction: 0.400000006
@@ -5782,7 +5782,7 @@
     Collider Component:
       Colliders:
         - Is Trigger: false
-          Collision Tag: 1
+          Collision Tag: 0
           Type: Box
           Half Extents: {x: 0.200000003, y: 0.5, z: 2.5}
           Friction: 0.400000006
@@ -8430,9 +8430,9 @@
       Material: 129340704
       IsActive: true
     Button Component:
-      Default Texture: 63979907
-      Hovered Texture: 51379325
-      Clicked Texture: 66788278
+      Default Texture: 63738242
+      Hovered Texture: 58455648
+      Clicked Texture: 66776217
       IsActive: true
     UI Component:
       Canvas ID: 547
@@ -8442,10 +8442,10 @@
   Scripts:
     - Type: SHADE_Scripting.UI.ButtonFX
       Enabled: true
-      onHoverEnterSound: Empty
+      onHoverEnterSound: event:/UI/botton_hover
       onHoverExitSound: Empty
-      onClickSound: event:/UI/mouse_down_element
-      onReleaseSound: Empty
+      onClickSound: event:/UI/button_success
+      onReleaseSound: event:/UI/button_fail
       hoverScale: 1.10000002
       clickScale: 0.899999976
 - EID: 545
@@ -8475,10 +8475,10 @@
   Scripts:
     - Type: SHADE_Scripting.UI.ButtonFX
       Enabled: true
-      onHoverEnterSound: Empty
+      onHoverEnterSound: event:/UI/botton_hover
       onHoverExitSound: Empty
-      onClickSound: event:/UI/mouse_down_element
-      onReleaseSound: Empty
+      onClickSound: event:/UI/button_success
+      onReleaseSound: event:/UI/button_fail
       hoverScale: 1.10000002
       clickScale: 0.899999976
     - Type: FixRotation
@@ -8498,9 +8498,9 @@
       Material: 129340704
       IsActive: true
     Button Component:
-      Default Texture: 64806384
-      Hovered Texture: 58347825
-      Clicked Texture: 63234380
+      Default Texture: 64995894
+      Hovered Texture: 58109178
+      Clicked Texture: 60429179
       IsActive: true
     UI Component:
       Canvas ID: 547
@@ -8510,10 +8510,10 @@
   Scripts:
     - Type: SHADE_Scripting.UI.ButtonFX
       Enabled: true
-      onHoverEnterSound: Empty
+      onHoverEnterSound: event:/UI/botton_hover
       onHoverExitSound: Empty
-      onClickSound: event:/UI/mouse_down_element
-      onReleaseSound: Empty
+      onClickSound: event:/UI/button_success
+      onReleaseSound: event:/UI/button_fail
       hoverScale: 1.10000002
       clickScale: 0.899999976
 - EID: 543
@@ -8540,18 +8540,18 @@
   Scripts: ~
 - EID: 542
   Name: ====AI=====
-  IsActive: true
+  IsActive: false
   NumberOfChildren: 0
   Components:
     Transform Component:
       Translate: {x: 0.830674767, y: 0, z: 1.40718019}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
+      IsActive: false
     Renderable Component:
       Mesh: 140697366
       Material: 129495479
-      IsActive: true
+      IsActive: false
     RigidBody Component:
       Type: Dynamic
       Drag: 0.00999999978
@@ -8566,7 +8566,7 @@
       Freeze Rotation X: true
       Freeze Rotation Y: false
       Freeze Rotation Z: true
-      IsActive: true
+      IsActive: false
     Collider Component:
       Colliders:
         - Is Trigger: false
@@ -8578,7 +8578,7 @@
           Density: 1
           Position Offset: {x: 0, y: 0.899999976, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
+      IsActive: false
   Scripts:
     - Type: Homeowner1
       Enabled: true
@@ -8700,7 +8700,7 @@
 - EID: 526
   Name: Gameplay Canvas
   IsActive: true
-  NumberOfChildren: 3
+  NumberOfChildren: 4
   Components:
     Canvas Component:
       Canvas Width: 1920
@@ -8711,7 +8711,7 @@
 - EID: 237
   Name: Score Text
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 0
   Components:
     Transform Component:
       Translate: {x: -800, y: 365, z: 0.600000024}
@@ -8729,27 +8729,15 @@
       Hovered: false
       Clicked: false
       IsActive: true
-  Scripts: ~
-- EID: 521
-  Name: Score BG
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0.300000012, y: 0.600000024, z: 0.98999995}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 3.45600009, y: 2, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 127527215
-      IsActive: true
-    UI Component:
-      Canvas ID: 526
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
+  Scripts:
+    - Type: SHADE_Scripting.UI.ScoreTextDigitPositioning
+      Enabled: true
+      offsetPerDigit: 25
+    - Type: SHADE_Scripting.UI.SingleScaleBounce
+      Enabled: true
+      durationUp: 0.150000006
+      durationDown: 0.300000012
+      scaleSize: 1.20000005
 - EID: 525
   Name: Timer Text
   IsActive: true
@@ -8841,6 +8829,26 @@
   Scripts:
     - Type: FixRotation
       Enabled: true
+- EID: 521
+  Name: Score BG
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -770, y: 425, z: 59.9999962}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 345.600006, y: 200, z: 60}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 127527215
+      IsActive: true
+    UI Component:
+      Canvas ID: 526
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
 - EID: 238
   Name: ====GameManager====
   IsActive: true
diff --git a/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs
index b57e7fcd..552a6aad 100644
--- a/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs
+++ b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs
@@ -110,8 +110,8 @@ public partial class Homeowner1 : BehaviourTree
 
     //These should be somewhere else
     //Debug.Log("TESTING");
-    AudioHandler.audioClipHandlers["BGMUnalert"] = Audio.CreateAudioClip("event:/Music/player_undetected");
-    AudioHandler.audioClipHandlers["BGMAlert"] = Audio.CreateAudioClip("event:/Music/player_detected");
+    //AudioHandler.audioClipHandlers["BGMUnalert"] = Audio.CreateAudioClip("event:/Music/player_undetected");
+    //AudioHandler.audioClipHandlers["BGMAlert"] = Audio.CreateAudioClip("event:/Music/player_detected");
     AudioHandler.audioClipHandlers["BGMAdaptive"] = Audio.CreateAudioClip("event:/Music/bgm_adaptive");
 
     AudioHandler.audioClipHandlers["SFXFootstep"] = Audio.CreateAudioClip("event:/Homeowner/homeowner_footsteps");

From 0f8d841f89564cbec4804c71340e8b738c064460 Mon Sep 17 00:00:00 2001
From: maverickdgg <danielcyc38@gmail.com>
Date: Fri, 10 Mar 2023 23:33:59 +0800
Subject: [PATCH 6/6] Re-enabled ai in L3

---
 Assets/Scenes/Level3.shade | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Assets/Scenes/Level3.shade b/Assets/Scenes/Level3.shade
index 69798992..5753c783 100644
--- a/Assets/Scenes/Level3.shade
+++ b/Assets/Scenes/Level3.shade
@@ -8540,18 +8540,18 @@
   Scripts: ~
 - EID: 542
   Name: ====AI=====
-  IsActive: false
+  IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 0.830674767, y: 0, z: 1.40718019}
+      Translate: {x: 2.16695547, y: 0.0687829852, z: 0.574704885}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
-      IsActive: false
+      IsActive: true
     Renderable Component:
       Mesh: 140697366
       Material: 129495479
-      IsActive: false
+      IsActive: true
     RigidBody Component:
       Type: Dynamic
       Drag: 0.00999999978
@@ -8566,7 +8566,7 @@
       Freeze Rotation X: true
       Freeze Rotation Y: false
       Freeze Rotation Z: true
-      IsActive: false
+      IsActive: true
     Collider Component:
       Colliders:
         - Is Trigger: false
@@ -8578,7 +8578,7 @@
           Density: 1
           Position Offset: {x: 0, y: 0.899999976, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: false
+      IsActive: true
   Scripts:
     - Type: Homeowner1
       Enabled: true