Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a

# Conflicts:
#	Assets/Data/Inventory/BaseInventory.asset
#	Assets/Data/Logic Blocks/Wait.asset

Assets/Data/Inventory/BaseInventory.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31bcb03e89c49243d69bfc167fd90af5bb5049527578ee3a08d1a2b88227bc50
+oid sha256:826ec5d0a327952a321ea2e04fd0bf0bb28619e1f6b1861a4765eddcec2019d6
 size 1186

Assets/Data/Logic Blocks/Wait.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e3247335361537209fe03e310e255934e8bc61e54fd3bae6baca2e4e61a18c1
-size 598
+oid sha256:5b1381e41f5ac83abac527a3f5027da86df42fb91ca17392b26d58ab7c219bba
+size 580

Assets/Plugins/IngameDebugConsole/Scripts.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 860c08388401a6d4e858fe4910ea9337
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f6caae32d463529478f2186f47c2e3fe
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/IngameDebugConsole/Prefabs.meta → Assets/Prefabs/Map Sections/Snaking Turntables 3-1.prefab.meta

@@ -1,7 +1,6 @@
 fileFormatVersion: 2
-guid: 7dbc36665bc0d684db9a4447e27a7a4b
-folderAsset: yes
-DefaultImporter:
+guid: 8f995a98597429f4b830739f7618685b
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/Prefabs/Map Sections/Width 7/Spiked Beltplex 7-1.prefab

@@ -640,7 +640,7 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -1121,7 +1121,7 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -1870,7 +1870,7 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -2427,7 +2427,7 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -2786,7 +2786,7 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -4155,7 +4155,7 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -4230,7 +4230,7 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -5221,11 +5221,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3733143707459234553}
     m_Modifications:
-    - target: {fileID: 9119206199061355249, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9,
-        type: 3}
-      propertyPath: m_Name
-      value: CubeWithCrystals (1)
-      objectReference: {fileID: 0}
     - target: {fileID: 9119206199061355250, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -5281,6 +5276,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9119206199061355249, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9,
+        type: 3}
+      propertyPath: m_Name
+      value: CubeWithCrystals (1)
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9, type: 3}
 --- !u!4 &4425286209431250034 stripped
@@ -5437,7 +5437,7 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -6514,11 +6514,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3733143707459234553}
     m_Modifications:
-    - target: {fileID: 9119206199061355249, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9,
-        type: 3}
-      propertyPath: m_Name
-      value: CubeWithCrystals (3)
-      objectReference: {fileID: 0}
     - target: {fileID: 9119206199061355250, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -6574,6 +6569,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9119206199061355249, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9,
+        type: 3}
+      propertyPath: m_Name
+      value: CubeWithCrystals (3)
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9, type: 3}
 --- !u!4 &3326778788768402529 stripped
@@ -6939,7 +6939,7 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -7014,7 +7014,7 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -7089,7 +7089,7 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -7705,7 +7705,7 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -7959,11 +7959,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3733143707459234553}
     m_Modifications:
-    - target: {fileID: 9119206199061355249, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9,
-        type: 3}
-      propertyPath: m_Name
-      value: CubeWithCrystals (2)
-      objectReference: {fileID: 0}
     - target: {fileID: 9119206199061355250, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -8019,6 +8014,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9119206199061355249, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9,
+        type: 3}
+      propertyPath: m_Name
+      value: CubeWithCrystals (2)
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9, type: 3}
 --- !u!4 &1576803635366104531 stripped
@@ -8633,11 +8633,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3733143707459234553}
     m_Modifications:
-    - target: {fileID: 9119206199061355249, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9,
-        type: 3}
-      propertyPath: m_Name
-      value: CubeWithCrystals
-      objectReference: {fileID: 0}
     - target: {fileID: 9119206199061355250, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -8693,6 +8688,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9119206199061355249, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9,
+        type: 3}
+      propertyPath: m_Name
+      value: CubeWithCrystals
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9, type: 3}
 --- !u!4 &968667811583345056 stripped

Assets/Prefabs/Map Sections/Width 7/Two-part 7-1.prefab

@@ -380,7 +380,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7822107785046188488}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -1, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2040935596398897612}
@@ -502,12 +502,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 6
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -1043,12 +1043,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 5
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -1383,11 +1383,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3264658026752372929}
     m_Modifications:
-    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
-        type: 3}
-      propertyPath: m_Name
-      value: ShootingCannon + Block (10)
-      objectReference: {fileID: 0}
     - target: {fileID: 6179448856766749153, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -1443,10 +1438,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
-      propertyPath: countdowntimer
-      value: 2
+      propertyPath: m_Name
+      value: ShootingCannon + Block (10)
       objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
@@ -1463,6 +1458,11 @@ PrefabInstance:
       propertyPath: m_isInputParsingRequired
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdowntimer
+      value: 2
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 72b0336b2f8509045b92eadaecbc885b, type: 3}
 --- !u!4 &4991664881066961931 stripped
@@ -1910,12 +1910,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 9
+      value: 7.9999995
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -2548,12 +2548,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 4
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -2760,11 +2760,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3264658026752372929}
     m_Modifications:
-    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
-        type: 3}
-      propertyPath: m_Name
-      value: ShootingCannon + Block (1)
-      objectReference: {fileID: 0}
     - target: {fileID: 6179448856766749153, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -2820,10 +2815,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
-      propertyPath: countdowntimer
-      value: 2
+      propertyPath: m_Name
+      value: ShootingCannon + Block (1)
       objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
@@ -2840,6 +2835,11 @@ PrefabInstance:
       propertyPath: m_isInputParsingRequired
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdowntimer
+      value: 2
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 72b0336b2f8509045b92eadaecbc885b, type: 3}
 --- !u!4 &5514418615898884579 stripped
@@ -3067,12 +3067,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 4
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -3268,11 +3268,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3264658026752372929}
     m_Modifications:
-    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
-        type: 3}
-      propertyPath: m_Name
-      value: ShootingCannon + Block (7)
-      objectReference: {fileID: 0}
     - target: {fileID: 6179448856766749153, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -3328,10 +3323,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
-      propertyPath: countdowntimer
-      value: 2
+      propertyPath: m_Name
+      value: ShootingCannon + Block (7)
       objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
@@ -3348,6 +3343,11 @@ PrefabInstance:
       propertyPath: m_isInputParsingRequired
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdowntimer
+      value: 2
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 72b0336b2f8509045b92eadaecbc885b, type: 3}
 --- !u!4 &5405674494540673566 stripped
@@ -3371,12 +3371,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 7
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -3650,12 +3650,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 9
+      value: 7.9999995
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -3792,11 +3792,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3264658026752372929}
     m_Modifications:
-    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
-        type: 3}
-      propertyPath: m_Name
-      value: ShootingCannon + Block (5)
-      objectReference: {fileID: 0}
     - target: {fileID: 6179448856766749153, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -3852,6 +3847,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: m_Name
+      value: ShootingCannon + Block (5)
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
@@ -3954,12 +3954,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 12
+      value: 11
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -4029,12 +4029,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 7
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -4104,12 +4104,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 8
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -4305,11 +4305,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3264658026752372929}
     m_Modifications:
-    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
-        type: 3}
-      propertyPath: m_Name
-      value: ShootingCannon + Block (6)
-      objectReference: {fileID: 0}
     - target: {fileID: 6179448856766749153, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -4365,10 +4360,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
-      propertyPath: countdowntimer
-      value: 1
+      propertyPath: m_Name
+      value: ShootingCannon + Block (6)
       objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
@@ -4385,6 +4380,11 @@ PrefabInstance:
       propertyPath: m_isInputParsingRequired
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdowntimer
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 72b0336b2f8509045b92eadaecbc885b, type: 3}
 --- !u!4 &8942225022575706626 stripped
@@ -4826,12 +4826,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 5
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -5180,12 +5180,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -5319,12 +5319,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 10
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -5520,11 +5520,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3264658026752372929}
     m_Modifications:
-    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
-        type: 3}
-      propertyPath: m_Name
-      value: ShootingCannon + Block (4)
-      objectReference: {fileID: 0}
     - target: {fileID: 6179448856766749153, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -5580,10 +5575,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
-      propertyPath: countdowntimer
-      value: 2
+      propertyPath: m_Name
+      value: ShootingCannon + Block (4)
       objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
@@ -5600,6 +5595,11 @@ PrefabInstance:
       propertyPath: m_isInputParsingRequired
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdowntimer
+      value: 2
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 72b0336b2f8509045b92eadaecbc885b, type: 3}
 --- !u!4 &7124211597884433131 stripped
@@ -5832,12 +5832,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 13
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -6266,12 +6266,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -6550,12 +6550,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 14
+      value: 13
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -6695,12 +6695,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 12
+      value: 11
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -6762,11 +6762,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3264658026752372929}
     m_Modifications:
-    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
-        type: 3}
-      propertyPath: m_Name
-      value: ShootingCannon + Block
-      objectReference: {fileID: 0}
     - target: {fileID: 6179448856766749153, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -6822,10 +6817,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
-      propertyPath: countdowntimer
-      value: 1
+      propertyPath: m_Name
+      value: ShootingCannon + Block
       objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
@@ -6842,6 +6837,11 @@ PrefabInstance:
       propertyPath: m_isInputParsingRequired
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdowntimer
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 72b0336b2f8509045b92eadaecbc885b, type: 3}
 --- !u!4 &1366389639811960789 stripped
@@ -7340,11 +7340,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3264658026752372929}
     m_Modifications:
-    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
-        type: 3}
-      propertyPath: m_Name
-      value: ShootingCannon + Block (11)
-      objectReference: {fileID: 0}
     - target: {fileID: 6179448856766749153, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -7400,6 +7395,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: m_Name
+      value: ShootingCannon + Block (11)
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
@@ -7653,12 +7653,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 11
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -7867,12 +7867,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 6
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -8221,12 +8221,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 11
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -8430,12 +8430,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 8
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -9631,12 +9631,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -9768,11 +9768,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3264658026752372929}
     m_Modifications:
-    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
-        type: 3}
-      propertyPath: m_Name
-      value: ShootingCannon + Block (8)
-      objectReference: {fileID: 0}
     - target: {fileID: 6179448856766749153, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -9828,6 +9823,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: m_Name
+      value: ShootingCannon + Block (8)
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
@@ -10137,11 +10137,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3264658026752372929}
     m_Modifications:
-    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
-        type: 3}
-      propertyPath: m_Name
-      value: ShootingCannon + Block (2)
-      objectReference: {fileID: 0}
     - target: {fileID: 6179448856766749153, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -10197,6 +10192,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: m_Name
+      value: ShootingCannon + Block (2)
+      objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_Mesh
@@ -10772,11 +10772,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3264658026752372929}
     m_Modifications:
-    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
-        type: 3}
-      propertyPath: m_Name
-      value: ShootingCannon + Block (9)
-      objectReference: {fileID: 0}
     - target: {fileID: 6179448856766749153, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -10832,10 +10827,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
-      propertyPath: countdowntimer
-      value: 1
+      propertyPath: m_Name
+      value: ShootingCannon + Block (9)
       objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
@@ -10852,6 +10847,11 @@ PrefabInstance:
       propertyPath: m_isInputParsingRequired
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdowntimer
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 72b0336b2f8509045b92eadaecbc885b, type: 3}
 --- !u!4 &2451225546229959598 stripped
@@ -10867,11 +10867,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3264658026752372929}
     m_Modifications:
-    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
-        type: 3}
-      propertyPath: m_Name
-      value: ShootingCannon + Block (3)
-      objectReference: {fileID: 0}
     - target: {fileID: 6179448856766749153, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -10927,10 +10922,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+    - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
-      propertyPath: countdowntimer
-      value: 1
+      propertyPath: m_Name
+      value: ShootingCannon + Block (3)
       objectReference: {fileID: 0}
     - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b,
         type: 3}
@@ -10947,6 +10942,11 @@ PrefabInstance:
       propertyPath: m_isInputParsingRequired
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8314131447071905225, guid: 72b0336b2f8509045b92eadaecbc885b,
+        type: 3}
+      propertyPath: countdowntimer
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 72b0336b2f8509045b92eadaecbc885b, type: 3}
 --- !u!4 &2464648790698717850 stripped
@@ -10970,12 +10970,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -11045,12 +11045,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 13
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -11195,12 +11195,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 10
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
@@ -11345,12 +11345,12 @@ PrefabInstance:
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 14
+      value: 13
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524,
         type: 3}

Assets/Prefabs/Traps/Conveyor Belt with Cube.prefab

@@ -1,5 +1,120 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1141755146290067
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4490968977809283}
+  - component: {fileID: 33922994427887733}
+  - component: {fileID: 23937057364958257}
+  - component: {fileID: 3845129242341207909}
+  - component: {fileID: 5867501616828889193}
+  m_Layer: 0
+  m_Name: Cube_GroundWGrass
+  m_TagString: Coloured
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 4294967295
+  m_IsActive: 1
+--- !u!4 &4490968977809283
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4721099854274309}
+  - {fileID: 4721099527720510}
+  m_Father: {fileID: 437627090}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &33922994427887733
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Mesh: {fileID: 4300000, guid: d73f25ac0bcef5b469863e30ce33634b, type: 3}
+--- !u!23 &23937057364958257
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a12203d8d2df33d4f814e1a381ba565f, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!65 &3845129242341207909
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1.0000005, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &5867501616828889193
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6692f0c965cb4fa41b616ba0991653a3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  VisualOffset: {x: 0, y: 0, z: 0}
+  is_Walkable: 1
+  isWater: 0
+  isPit: 0
+  isCrystals: 0
+  isRock: 0
+  isSpawnable: 0
+  SpawnDirection: 2
+  Action: {fileID: 11400000, guid: 0b1bcd75cb7dade4fb598ee3412594c2, type: 2}
 --- !u!1 &2430657395993931422
 GameObject:
   m_ObjectHideFlags: 0
@@ -9,7 +124,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 437627090}
-  - component: {fileID: 859222414598846322}
   m_Layer: 0
   m_Name: Conveyor Belt with Cube
   m_TagString: Untagged
@@ -33,23 +147,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &859222414598846322
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2430657395993931422}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6692f0c965cb4fa41b616ba0991653a3, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  clientData: {fileID: 11400000, guid: ded0b21c3ef1e7049a1128c12e9401fe, type: 2}
-  Names: []
-  left: 0
-  forward: 0
-  triggeranimate: 0
 --- !u!1 &3424486742927057916
 GameObject:
   m_ObjectHideFlags: 0
@@ -61,7 +158,6 @@ GameObject:
   - component: {fileID: 7287252781365539386}
   - component: {fileID: 1376194202737726602}
   - component: {fileID: 7909594284434926968}
-  - component: {fileID: 1386403355058630248}
   m_Layer: 0
   m_Name: Plane
   m_TagString: Untagged
@@ -128,20 +224,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!64 &1386403355058630248
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3424486742927057916}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 14
-  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1001 &589977586
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -203,6 +285,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+--- !u!4 &4721099527720510 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
+    type: 3}
+  m_PrefabInstance: {fileID: 589977586}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &816154313
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -264,82 +352,9 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
---- !u!1001 &1100376119
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 437627090}
-    m_Modifications:
-    - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundWGrass
-      objectReference: {fileID: 0}
-    - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_TagString
-      value: Coloured
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
---- !u!4 &4490968977809283 stripped
+--- !u!4 &4721099854274309 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291,
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
     type: 3}
-  m_PrefabInstance: {fileID: 1100376119}
+  m_PrefabInstance: {fileID: 816154313}
   m_PrefabAsset: {fileID: 0}

Assets/Prefabs/Traps/CrushingBoulder.prefab

@@ -257,6 +257,8 @@ MonoBehaviour:
   is_Walkable: 0
   isWater: 0
   isPit: 0
+  isCrystals: 0
+  isRock: 1
   isSpawnable: 0
   SpawnDirection: 2
   countdowntimer: 3
@@ -390,6 +392,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 6745622317302131140}
     m_Modifications:
+    - target: {fileID: 1252527896654764, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3}
+      propertyPath: m_Name
+      value: Rock_2 (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 1252527896654764, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4614242176542224, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -442,14 +452,6 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 1.2289
       objectReference: {fileID: 0}
-    - target: {fileID: 1252527896654764, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3}
-      propertyPath: m_Name
-      value: Rock_2 (2)
-      objectReference: {fileID: 0}
-    - target: {fileID: 1252527896654764, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3}
 --- !u!4 &6741087515541790872 stripped

Assets/Prefabs/Traps/CubeWithCrystals.prefab

@@ -82,9 +82,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 80f123a8ae7c42549bd1daccb6fe61e0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  VisualOffset: {x: 0, y: 0, z: 0}
+  is_Walkable: 1
+  isWater: 0
+  isPit: 0
+  isCrystals: 1
+  isRock: 0
+  isSpawnable: 0
+  SpawnDirection: 2
   crystals: {fileID: 7009033047396183185}
-  triggeranimate: 0
-  triggeranimate1: 0
 --- !u!65 &1952366153
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -114,6 +120,8 @@ MonoBehaviour:
   is_Walkable: 1
   isWater: 0
   isPit: 0
+  isCrystals: 0
+  isRock: 0
   isSpawnable: 0
   SpawnDirection: 2
 --- !u!1001 &9119206197491717339
@@ -123,6 +131,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 6222932897940046940}
     m_Modifications:
+    - target: {fileID: 1351645074694886, guid: 01b136a21d4d344429b829a7b1a12661, type: 3}
+      propertyPath: m_Name
+      value: Crystal2_Blue
+      objectReference: {fileID: 0}
+    - target: {fileID: 1351645074694886, guid: 01b136a21d4d344429b829a7b1a12661, type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4025485266255164, guid: 01b136a21d4d344429b829a7b1a12661, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0.234
@@ -167,14 +183,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1351645074694886, guid: 01b136a21d4d344429b829a7b1a12661, type: 3}
-      propertyPath: m_Name
-      value: Crystal2_Blue
-      objectReference: {fileID: 0}
-    - target: {fileID: 1351645074694886, guid: 01b136a21d4d344429b829a7b1a12661, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 01b136a21d4d344429b829a7b1a12661, type: 3}
 --- !u!4 &9116306614291212775 stripped
@@ -190,6 +198,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 6222932897940046940}
     m_Modifications:
+    - target: {fileID: 1582377522939474, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3}
+      propertyPath: m_Name
+      value: Crystal2
+      objectReference: {fileID: 0}
+    - target: {fileID: 1582377522939474, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4461811097192420, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0.276
@@ -234,14 +250,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1582377522939474, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3}
-      propertyPath: m_Name
-      value: Crystal2
-      objectReference: {fileID: 0}
-    - target: {fileID: 1582377522939474, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3}
 --- !u!4 &9115906075035381432 stripped
@@ -324,6 +332,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 6222932897940046940}
     m_Modifications:
+    - target: {fileID: 1834177709595652, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3}
+      propertyPath: m_Name
+      value: Crystal2_Orange
+      objectReference: {fileID: 0}
+    - target: {fileID: 1834177709595652, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4315419121807260, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0.208
@@ -368,14 +384,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1834177709595652, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3}
-      propertyPath: m_Name
-      value: Crystal2_Orange
-      objectReference: {fileID: 0}
-    - target: {fileID: 1834177709595652, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3}
 --- !u!4 &9116052424124833850 stripped
@@ -391,6 +399,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 9119206199061355250}
     m_Modifications:
+    - target: {fileID: 1681195754145498, guid: a44f9b5b803069b4ba7b244f59aac09c, type: 3}
+      propertyPath: m_Name
+      value: Cube_GroundWGrass_6
+      objectReference: {fileID: 0}
     - target: {fileID: 4128166634420518, guid: a44f9b5b803069b4ba7b244f59aac09c, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -435,10 +447,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1681195754145498, guid: a44f9b5b803069b4ba7b244f59aac09c, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundWGrass_6
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a44f9b5b803069b4ba7b244f59aac09c, type: 3}
 --- !u!4 &9116208357191883012 stripped

Assets/Prefabs/Traps/ShootingCannon + Block.prefab

@@ -1,5 +1,98 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4265838743719489735
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4546202105378142430}
+  - component: {fileID: 6378600946085240914}
+  - component: {fileID: 111341246151501818}
+  - component: {fileID: 3488332760092905348}
+  m_Layer: 0
+  m_Name: Cube_GroundWGrass
+  m_TagString: Coloured
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 4294967295
+  m_IsActive: 1
+--- !u!4 &4546202105378142430
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4265838743719489735}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4541774030144991256}
+  - {fileID: 4541774030055075990}
+  m_Father: {fileID: 6179448856766749153}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6378600946085240914
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4265838743719489735}
+  m_Mesh: {fileID: 4300000, guid: d73f25ac0bcef5b469863e30ce33634b, type: 3}
+--- !u!23 &111341246151501818
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4265838743719489735}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a12203d8d2df33d4f814e1a381ba565f, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!65 &3488332760092905348
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4265838743719489735}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1.0000005, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &6179448856766749154
 GameObject:
   m_ObjectHideFlags: 0
@@ -51,6 +144,8 @@ MonoBehaviour:
   is_Walkable: 0
   isWater: 0
   isPit: 0
+  isCrystals: 0
+  isRock: 0
   isSpawnable: 0
   SpawnDirection: 2
   shootingRight: 1
@@ -254,13 +349,13 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7559508468311915786}
-  m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: 0.134}
+  m_LocalRotation: {x: -0, y: -0.8055902, z: -0, w: 0.5924732}
+  m_LocalPosition: {x: 0, y: 0, z: 0.166}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6179448856766749153}
   m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: -107.33501, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0.262, y: 1.321}
@@ -339,7 +434,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_text: 5
+  m_text: 3
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -367,8 +462,8 @@ MonoBehaviour:
   m_outlineColor:
     serializedVersion: 2
     rgba: 4278190080
-  m_fontSize: 3
-  m_fontSizeBase: 3
+  m_fontSize: 5
+  m_fontSizeBase: 5
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -385,7 +480,7 @@ MonoBehaviour:
   m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
-  m_firstOverflowCharacterIndex: -1
+  m_firstOverflowCharacterIndex: 0
   m_linkedTextComponent: {fileID: 0}
   m_isLinkedTextComponent: 0
   m_isTextTruncated: 0
@@ -434,67 +529,137 @@ MonoBehaviour:
   - {fileID: 0}
   - {fileID: 0}
   m_maskType: 0
---- !u!1001 &4546202105798836939
+--- !u!1001 &4546202104718436698
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 6179448856766749153}
+    m_TransformParent: {fileID: 4546202105378142430}
     m_Modifications:
-    - target: {fileID: 298388790206689804, guid: bb9ffc1c11072174694465b720cdb319,
-        type: 3}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_Name
-      value: Cube_GroundWGrass
+      value: Cube_GroundL
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.y
+      value: -2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+--- !u!4 &4541774030055075990 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
+    type: 3}
+  m_PrefabInstance: {fileID: 4546202104718436698}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4546202104896956884
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 4546202105378142430}
+    m_Modifications:
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_Name
+      value: Cube_GroundU
+      objectReference: {fileID: 0}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalRotation.x
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalRotation.y
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalRotation.z
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
+    - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: bb9ffc1c11072174694465b720cdb319, type: 3}
---- !u!4 &4546202105378142430 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+--- !u!4 &4541774030144991256 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 427276821, guid: bb9ffc1c11072174694465b720cdb319,
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
     type: 3}
-  m_PrefabInstance: {fileID: 4546202105798836939}
+  m_PrefabInstance: {fileID: 4546202104896956884}
   m_PrefabAsset: {fileID: 0}

Assets/Prefabs/Traps/Turntable L with Cube.prefab

@@ -1,5 +1,99 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1141755146290067
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4490968977809283}
+  - component: {fileID: 33922994427887733}
+  - component: {fileID: 23937057364958257}
+  - component: {fileID: 3845129242341207909}
+  - component: {fileID: 8900644542252474285}
+  m_Layer: 0
+  m_Name: Cube_GroundWGrass
+  m_TagString: Coloured
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 4294967295
+  m_IsActive: 1
+--- !u!4 &4490968977809283
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4721099854274309}
+  - {fileID: 4721099527720510}
+  m_Father: {fileID: 437627090}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &33922994427887733
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Mesh: {fileID: 4300000, guid: d73f25ac0bcef5b469863e30ce33634b, type: 3}
+--- !u!23 &23937057364958257
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a12203d8d2df33d4f814e1a381ba565f, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!65 &3845129242341207909
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1.0000005, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &8900644542252474285
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -16,6 +110,8 @@ MonoBehaviour:
   is_Walkable: 1
   isWater: 0
   isPit: 0
+  isCrystals: 0
+  isRock: 0
   isSpawnable: 0
   SpawnDirection: 2
   Action: {fileID: 11400000, guid: aa238796cf1886244951ec8c2fed1855, type: 2}
@@ -150,6 +246,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4490968977809283}
     m_Modifications:
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_Name
+      value: Cube_GroundL
+      objectReference: {fileID: 0}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -194,16 +298,14 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundL
-      objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+--- !u!4 &4721099527720510 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
+    type: 3}
+  m_PrefabInstance: {fileID: 589977586}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &816154313
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -211,6 +313,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4490968977809283}
     m_Modifications:
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_Name
+      value: Cube_GroundU
+      objectReference: {fileID: 0}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -255,98 +365,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundU
-      objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
---- !u!1001 &1100376119
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 437627090}
-    m_Modifications:
-    - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundWGrass
-      objectReference: {fileID: 0}
-    - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_TagString
-      value: Coloured
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
---- !u!1 &1141755146290067 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291,
-    type: 3}
-  m_PrefabInstance: {fileID: 1100376119}
-  m_PrefabAsset: {fileID: 0}
---- !u!4 &4490968977809283 stripped
+--- !u!4 &4721099854274309 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291,
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
     type: 3}
-  m_PrefabInstance: {fileID: 1100376119}
+  m_PrefabInstance: {fileID: 816154313}
   m_PrefabAsset: {fileID: 0}

Assets/Prefabs/Traps/Turntable R with Cube.prefab

@@ -1,5 +1,99 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1141755146290067
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4490968977809283}
+  - component: {fileID: 33922994427887733}
+  - component: {fileID: 23937057364958257}
+  - component: {fileID: 3845129242341207909}
+  - component: {fileID: 8900644542252474285}
+  m_Layer: 0
+  m_Name: Cube_GroundWGrass
+  m_TagString: Coloured
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 4294967295
+  m_IsActive: 1
+--- !u!4 &4490968977809283
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4721099854274309}
+  - {fileID: 4721099527720510}
+  m_Father: {fileID: 437627090}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &33922994427887733
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Mesh: {fileID: 4300000, guid: d73f25ac0bcef5b469863e30ce33634b, type: 3}
+--- !u!23 &23937057364958257
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a12203d8d2df33d4f814e1a381ba565f, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!65 &3845129242341207909
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1141755146290067}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1.0000005, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &8900644542252474285
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -16,6 +110,8 @@ MonoBehaviour:
   is_Walkable: 1
   isWater: 0
   isPit: 0
+  isCrystals: 0
+  isRock: 0
   isSpawnable: 0
   SpawnDirection: 2
   Action: {fileID: 11400000, guid: 41f4cb946475b2849a802a8297d81e25, type: 2}
@@ -150,6 +246,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4490968977809283}
     m_Modifications:
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_Name
+      value: Cube_GroundL
+      objectReference: {fileID: 0}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -194,16 +298,14 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundL
-      objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+--- !u!4 &4721099527720510 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
+    type: 3}
+  m_PrefabInstance: {fileID: 589977586}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &816154313
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -211,6 +313,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4490968977809283}
     m_Modifications:
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_Name
+      value: Cube_GroundU
+      objectReference: {fileID: 0}
+    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -255,98 +365,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundU
-      objectReference: {fileID: 0}
-    - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3}
---- !u!1001 &1100376119
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 437627090}
-    m_Modifications:
-    - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_Name
-      value: Cube_GroundWGrass
-      objectReference: {fileID: 0}
-    - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_TagString
-      value: Coloured
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3}
---- !u!1 &1141755146290067 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291,
-    type: 3}
-  m_PrefabInstance: {fileID: 1100376119}
-  m_PrefabAsset: {fileID: 0}
---- !u!4 &4490968977809283 stripped
+--- !u!4 &4721099854274309 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291,
+  m_CorrespondingSourceObject: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07,
     type: 3}
-  m_PrefabInstance: {fileID: 1100376119}
+  m_PrefabInstance: {fileID: 816154313}
   m_PrefabAsset: {fileID: 0}

Assets/Scenes/Client Scenes/LobbyWait.unity

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75d1d366515f1ee9c5accad4e0c3de25a3d68b0391bc31921d7a89d58c8029c7
+size 45836

Assets/Plugins/IngameDebugConsole/Android.meta → Assets/Scenes/Client Scenes/LobbyWait.unity.meta

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: 3d7d7a61a5341904eb3c65af025b1d86
-folderAsset: yes
+guid: bd7b77db655c8c44b85cdd06e9ce9bae
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scenes/Client Scenes/LoginScreen.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8db303555f2b5039989ee896f62f0d295bd6448dddc4bbe893977bd85a65d6ea
-size 260334
+oid sha256:483604a02c8a92d1ac923e970b4e0bc203385ea51d6a516367cc39fc26648333
+size 260494

Assets/Scenes/Levels/RaceTrack Beta.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8be6d12cb624b41bbec4263d925f0ff9c62f13f2a60df314dae7bfa3c3132aeb
-size 33586
+oid sha256:dd7c1363d42eae1aa8086b72ecf7e2ed28f926aaaaa1fd5562c12d6d1fcb5edd
+size 33424

Assets/Scenes/Menus/Lobby.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6f20ea3050a82f28cd55b2c1ff133057d302ec2ecec14f3f0b59477598461b08
-size 45816
+oid sha256:2884d7c10378352a9a3863aa21382541b6fb45a0d4b69c9c59ca99352d6555f8
+size 45893

Assets/Scenes/Menus/MainMenu Server.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:159c761b5e6cd07723112cccb7f6cd3c7160f84327b1ca89967ad80b68a60404
-size 142635
+oid sha256:0b221d228eb4be8b6130a49b01f3b31a24e745acb7b73620669ce045b050af24
+size 142636

Assets/Scripts/Character.cs

@@ -15,6 +15,8 @@ public class Character : MonoBehaviour
 
     public bool inWater = false; //Am I in the water?
     public bool inPit = false; //Did I fall into a pit?
+    public bool onCrystal = false; 
+    public bool underRock = false;
     public bool stuck = false; //Am I still stuck?
     public bool justMoved = false; //Was the logic block I just executed a move command?
     Vector3 death = new Vector3(-50, 0, 0);
@@ -142,7 +144,7 @@ public class Character : MonoBehaviour
 
         StartAnimation(animation, time);
 
-        Debug.Log("Rotating by: " + angles);
+        //Debug.Log("Rotating by: " + angles);
         yield return StartCoroutine(Rotate(direction,angles,  time * 0.8f, yFunction));
 
         StopAnimation(animation);

Assets/Models.meta → Assets/Scripts/Components.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 296bd90e667df1f4697823a0aa45acf0
+guid: 8d7394d70ec233849a60a26da5f23b75
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Scripts/GameMode/ColorGameMode/ColorGameMode.cs

@@ -206,4 +206,9 @@ public class ColorGameMode : GameMode
             OnPlayerMoved(allPlayers[i].character, allPlayers[i].client, allPlayers[i].character.CurrentBlock);
         }
     }
+
+    public override PlayerData[] getPlayerOrder(PlayerData[] AllPlayers)
+    {
+        throw new System.NotImplementedException();
+    }
 }

Assets/Scripts/GameMode/ColorGameMode/RacetrackGameMode.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 using Networking.Server;
 using TMPro;
 using UnityEngine.UI;
+using System.Linq;
 
 [CreateAssetMenu(menuName = "Major Project/GameModes/Racetrack", order = 201)]
 public class RacetrackGameMode : GameMode
@@ -19,7 +20,7 @@ public class RacetrackGameMode : GameMode
 
     public int RoundCount { get; private set; }
     private Dictionary<ClientData, List<Block>> BlocksOwned;
-
+    int currentBoulderCount;
 
     /// <summary>
     /// Called once before any players have spawned
@@ -192,6 +193,8 @@ public class RacetrackGameMode : GameMode
         //If a character has fallen in the water or into a pit, we mark that fact, and they lose the rest of their turn
         character.inWater = currentBlock.isWater;
         character.inPit = currentBlock.isPit;
+        character.onCrystal = currentBlock.isCrystals;
+        character.underRock = currentBlock.isRock;
 
         if (didMove && (character.inWater || character.inPit))
         {
@@ -202,11 +205,17 @@ public class RacetrackGameMode : GameMode
 
     protected override void OnPlayerKilled(Character character, ClientData client)
     {
-        if (character.inPit)
+        if (character.inPit || character.onCrystal)
+        {
+            character.lives -= 1;
+            character.ClientLink.Lives = character.lives;
+        }
+        if(character.underRock && currentBoulderCount < 1)
         {
             character.lives -= 1;
             character.ClientLink.Lives = character.lives;
         }
+        
     }
 
     private IEnumerator AnimateBlock(Material mat, float time)
@@ -225,13 +234,20 @@ public class RacetrackGameMode : GameMode
         mat.SetFloat("_Multiplier", 1);
     }
 
-    protected override void OnGameStart(PlayerData[] allPlayers)
+    protected override void OnGameStart(PlayerData[] AllPlayers)
     {
         BlocksOwned = new Dictionary<ClientData, List<Block>>();
         RoundCount = 0;
-        for(int i = 0; i < allPlayers.Length; i++)
+        AllPlayers = getPlayerOrder(AllPlayers);
+        for (int i = 0; i < AllPlayers.Length; i++)
         {
-            OnPlayerMoved(allPlayers[i].character, allPlayers[i].client, allPlayers[i].character.CurrentBlock);
+            OnPlayerMoved(AllPlayers[i].character, AllPlayers[i].client, AllPlayers[i].character.CurrentBlock);
         }
     }
+
+    public override PlayerData[] getPlayerOrder(PlayerData[] AllPlayers)
+    {
+        AllPlayers = AllPlayers.ToArray().OrderBy(unit => unit.character.CurrentBlock.transform.position.x).ToArray();
+        return AllPlayers;
+    }
 }

Assets/Scripts/GameMode/GameMode.cs

@@ -147,6 +147,8 @@ public abstract class GameMode : ScriptableObject
 
     }
 
+    public abstract PlayerData[] getPlayerOrder(PlayerData[] AllPlayers);
+
     public void RoundStart(PlayerData[] allPlayers)
     {
         OnRoundStart(allPlayers);

Assets/Scripts/LevelBlocks/Block.cs

@@ -24,6 +24,9 @@ public class Block : MonoBehaviour
     [Tooltip("Is this block at the bottom of a pit?")]
     public bool isPit = false;
 
+    public bool isCrystals = false;
+    public bool isRock = false;
+
     [Header("Spawn Settings")]
     [Tooltip("Can this block be spawned on")]
     public bool isSpawnable = false;

Assets/Scripts/Logic/BlockReader.cs

@@ -58,9 +58,12 @@ public class BlockReader
     /// <returns>Returns false if other readers should wait for this one to run again</returns>
     public IEnumerator Read(Character character, float speedMultiplier)
     {
-
+        if(currentBlockIndex >= LogicChain.Count)
+        {
+            yield break;
+        }
         LogicBlock currentBlock = LogicChain[currentBlockIndex];
-
+        
         //If the character has become stuck, they forfeit their remaining moves - we skip directly to their end of their chain
         if (character.stuck == true)
         {
@@ -77,8 +80,9 @@ public class BlockReader
         //(it might not be finished if it is a for loop or something)
         if (currentBlock.isFinished())
         {
-            currentBlock.Reset();
             currentBlockIndex++;
+            currentBlock.Reset();
+            
         }
 
         //Should other readers wait for this one

Assets/Scripts/Logic/Blocks/Rotate.cs

@@ -31,7 +31,7 @@ public class Rotate : LogicBlock
     {
         //player.Rotate(direction, animationTime);
 
-        Debug.Log("Rotating by: " + Angle);
+        //Debug.Log("Rotating by: " + Angle);
         yield return player.StartCoroutine(player.RotateInDirection(direction,Angle,  Character.Animation.Jump, animationTime));
     }
 

Assets/Scripts/LogicBlocks.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8936b441d7647f74884c94f97bfb8931
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Managers/GameManager.cs

@@ -34,7 +34,7 @@ public class GameManager : MonoBehaviour
     #endregion Inspector Field
 
     #region Private Variables
-    private Dictionary<int, PlayerData> playerData;
+    public Dictionary<int, PlayerData> playerData;
     private ActiveBlock[] EnvironmentBlocks;
     #endregion Private Variables
 
@@ -104,7 +104,7 @@ public class GameManager : MonoBehaviour
 
             //I hate having to do this
             EnvironmentBlocks = FindObjectsOfType<ActiveBlock>();
-            //Debug.Log("Active blocks found: " + EnvironmentBlocks.Length);
+            ////Debug.Log("Active blocks found: " + EnvironmentBlocks.Length);
 
             //Routine for players movement
             yield return StartCoroutine(RoundRoutine()); //it's pretty long so it gets it's own coroutine;
@@ -125,12 +125,14 @@ public class GameManager : MonoBehaviour
         //Tell the gamemode that we are starting a round
         gameMode.RoundStart(playerDataAsArray);
 
+        //playerDataAsArray.OrderByDescending(unit => unit.character.transform.position.x);
+        //playerDataAsArray = playerDataAsArray.OrderBy(unit => unit.character.CurrentBlock.transform.position.x).ToArray();
+        playerData = playerData.OrderBy(unit => unit.Value.character.CurrentBlock.transform.position.x).ToDictionary(unit => unit.Key, unit => unit.Value);
+
         //Loop until all players have finished moving
         while (playerDataAsArray.Any(p => !p.blockReader.Finished))
         {
 
-
-
             //Loop through all players
             foreach (PlayerData player in playerDataAsArray)
             {
@@ -169,7 +171,7 @@ public class GameManager : MonoBehaviour
         {
             if (player.client.Lives == 0)
             {
-                Debug.Log("Remove: " + player.client.characterAnimal);
+                //Debug.Log("Remove: " + player.client.characterAnimal);
                 removePlayer(player);
             }
         }
@@ -254,7 +256,7 @@ public class GameManager : MonoBehaviour
         int blockIndex = 0;
         foreach (Block block in SpawnBlocks)
         {
-            //Debug.Log("Block #" + blockIndex++ + " (" + block.transform.position.x + ", " + block.transform.position.y + ", " + block.transform.position.z + ")");
+            ////Debug.Log("Block #" + blockIndex++ + " (" + block.transform.position.x + ", " + block.transform.position.y + ", " + block.transform.position.z + ")");
         }
 
         //int spawnIndex = 0;
@@ -266,7 +268,7 @@ public class GameManager : MonoBehaviour
 
         foreach (ClientData client in ClientList)
         {
-            //Debug.Log("spawnIndex = " + spawnIndex);
+            ////Debug.Log("spawnIndex = " + spawnIndex);
             Character newChar = Instantiate(characterPrefab);
             //Block startingBlock = SpawnBlocks[(spawnIndex++ % ClientList.ConnectedClients.Count)];
             Block startingBlock = SpawnBlocks[spawnIndex++];
@@ -339,8 +341,8 @@ public class GameManager : MonoBehaviour
         if (!msg.TryRead(out logicMsg))
             return;
 
-        //Debug that we have recieved it
-        Debug.Log("Recieved function from " + ClientList[msg.conn.connectionId].Name);
+        ////Debug that we have recieved it
+        ////Debug.Log("Recieved function from " + ClientList[msg.conn.connectionId].Name);
 
         //Update player Data with recieved list
         playerData[msg.conn.connectionId].blockReader.LogicChain = new List<LogicBlock>(logicMsg.elements);

Assets/Scripts/Map Generation/MapManager.cs

@@ -20,7 +20,8 @@ public class MapManager : ScriptableObject
     
     public List<MapSection> activeSections; //The list of sections that have been placed on the map (and not removed)
     MapSection lastSection; //Which map-section was most recently added?
-    float startX = -16.0f; //The x-position of the current start of the track
+    float startX; //The x-position of the current start of the track
+    float startXinit = -16.0f;
     float endX; //The x-position of the current end of the track
     int totalSections; //How many sections have been added? Including ones that have been deleted
 
@@ -44,6 +45,7 @@ public class MapManager : ScriptableObject
     public void init()
     {
         sections = new List<MapSection>();
+        startX = startXinit;
         endX = startX;
         totalSections = 0;
 

Assets/Scripts/Networking/Client/ClientObject.cs

@@ -30,7 +30,7 @@ namespace Networking.Client
 
 		[SerializeField]
 		[Tooltip("Player Animal")]
-		private string PlayerAnimal;
+		public string PlayerAnimal;
 
         [SerializeField]
         [Tooltip("Player Color")]

Assets/Scripts/Networking/Core/Protocols/LogicProtocols.cs

@@ -152,5 +152,10 @@ namespace Networking
                 String = reader.ReadSingle();
             }
         }
+
+        public class EmptyMsg : MessageBase
+        {
+
+        }
     }
 }

Assets/Scripts/Networking/Core/Protocols/LoginProtocols.cs

@@ -13,6 +13,7 @@ public class LoginProtocols
     public const short SceneChange = 104;
     public const short OtherClientConnected = 105;
     public const short OtherClientDisconnected = 106;
+    public const short StartGame = 107;
 
     public class EmptyMsg : MessageBase { }
 

Assets/Scripts/Networking/Server/ClientList.cs

@@ -143,9 +143,10 @@ namespace Networking.Server
             newClient.Name = loginMsg.Name;
             newClient.conn = msg.conn;
 
-            ConnectedClients.ForEach(p => p.conn.Send(LoginProtocols.OtherClientConnected, new LoginProtocols.LoginMsg(newClient.Name, newClient.Color, newClient.characterAnimal)));
+            
 
             ConnectedClients.Add(newClient);
+            ConnectedClients.ForEach(p => p.conn.Send(LoginProtocols.OtherClientConnected, new LoginProtocols.LoginMsg(newClient.Name, newClient.Color, newClient.characterAnimal)));
             PotentialClients.RemoveAll(p => p == newClient.conn);
             PotentialClients.ForEach(p => p.Send(LoginProtocols.OtherClientConnected, new LoginProtocols.LoginMsg(newClient.Name, newClient.Color, newClient.characterAnimal)));
 
@@ -153,7 +154,7 @@ namespace Networking.Server
             OnClientsChange.Invoke(ConnectedClients);
             newClient.SendInventory();
             newClient.SendLives();
-            newClient.ChangeScene("WaitScene");
+            newClient.ChangeScene("LobbyWait");
         }
 
      

Assets/Scripts/Networking/Server/ServerManager.cs

@@ -27,7 +27,9 @@ namespace Networking.Server
         private void Awake()
         {
             if (StartServerOnAwake)
-                Server.StartServer(Port);
+            {
+                Server.StartServer(Port);    
+            }
         }
 
         private void Update()
@@ -36,6 +38,8 @@ namespace Networking.Server
         }
 
 
+        
+
 
     }
 

Assets/Scripts/Traps/ConveyorBelt.cs

@@ -20,11 +20,8 @@ public class ConveyorBelt : ActiveBlock
     {
         if (CurrentPlayer != null)
         {
-            //Debug.Log("currentPlayer: " + CurrentPlayer);
             yield return StartCoroutine(Action.Run(CurrentPlayer, 1,true));
-
         }
-
         isFinished = true;
     }
 }

Assets/Scripts/Traps/CrushingBoulder.cs

@@ -27,7 +27,7 @@ public class CrushingBoulder : ActiveBlock
         if (countdown == 0)
         {
             StartCoroutine(FallRaiseCoroutine(-2.0f));
-            yield return new WaitForSeconds(5);
+            yield return new WaitForSeconds(0.5f);
             StartCoroutine(FallRaiseCoroutine(2.0f));
             countdown = countdowntimer;
         }

Assets/Scripts/Traps/CubeWithCrystals.cs

@@ -14,7 +14,7 @@ public class CubeWithCrystals : ActiveBlock
     public override IEnumerator OnRoundEnd(PlayerData[] allPlayers)
     {
         StartCoroutine(GrowCoroutine());
-        yield return new WaitForSeconds(5);
+        yield return new WaitForSeconds(0.5f);
         StartCoroutine(ShrinkCoroutine());
         isFinished = true;
         //yield break;

Assets/Scripts/UI/Client/LobbyWaitManager.cs

@@ -0,0 +1,48 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using Networking.Client;
+
+public class LobbyWaitManager : MonoBehaviour
+{
+    [SerializeField]
+    private ConnectedClients AllClients;
+    [SerializeField]
+    private ClientObject localClient;
+
+    [SerializeField]
+    private UnityEngine.UI.Button StartButton;
+
+    private void OnEnable()
+    {
+        AllClients.OnClientsChange += UpdateButton;
+    }
+
+    private void OnDisable()
+    {
+        AllClients.OnClientsChange -= UpdateButton;
+    }
+
+    private void Start()
+    {
+        UpdateButton(AllClients.AllClients);
+    }
+
+    public void OnClick_Start()
+    {
+        localClient.client.Send(LoginProtocols.StartGame, new Networking.LogicProtocols.EmptyMsg());
+    }
+
+    private void UpdateButton(List<ClientData> AllClients)
+    {
+        if (AllClients.Count > 0 && AllClients[0].characterAnimal == localClient.PlayerAnimal)
+        {
+            StartButton.gameObject.SetActive(true);
+        }
+        else
+        {
+            StartButton.gameObject.SetActive(false);
+        }
+    }
+
+}

Assets/Scripts/UI/Client/LobbyWaitManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 80436e4e0645dd64fbeb765b080e04ce
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/Client/LoginUIManager.cs

@@ -155,7 +155,7 @@ public class LoginUIManager : MonoBehaviour
 
     public void OnClick_Done()
     {
-        if(conn <= maxPlayers)
+        if(conn < maxPlayers)
         {
             if (colorSelected == true && animalSelected == true && playerName != "")
             {

Assets/Scripts/UI/Lobby/LobbyUIController.cs

@@ -23,6 +23,9 @@ public class LobbyUIController : MonoBehaviour
     [SerializeField]
     private GameObject ClientTag;
 
+    [SerializeField]
+    private ServerObject Server;
+
     // Start is called before the first frame update
     void Start()
     {
@@ -33,11 +36,19 @@ public class LobbyUIController : MonoBehaviour
     {
         Clients.OnClientsChange += DisplayClients;
         DisplayClients(Clients.ConnectedClients);
+
+        if (Server.server != null)
+            Server.server.RegisterHandler(LoginProtocols.StartGame, RecieveStartMsg);
+        else
+            Debug.LogWarning("Server not started yet");
     }
 
     private void OnDisable()
     {
         Clients.OnClientsChange -= DisplayClients;
+
+        if (Server.server != null)
+            Server.server.UnregisterHandler(LoginProtocols.StartGame);
     }
 		
     private void DisplayClients(List<ClientData> data)
@@ -75,4 +86,9 @@ public class LobbyUIController : MonoBehaviour
 		}
 #endif
     }
+
+    public void RecieveStartMsg(UnityEngine.Networking.NetworkMessage msg)
+    {
+        OnClick_StartGame();
+    }
 }

Assets/Scripts/UI/LogicElementUI.cs

@@ -67,7 +67,15 @@ public class LogicElementUI : Dragable
             nameText.outlineWidth = 0.1f;
 
             icon.GetComponent<Image>().color = LogicElement.Color;
-            background.GetComponent<Image>().sprite = LogicElement.icon;
+            if(logicElement.icon != null)
+            {
+                background.GetComponent<Image>().sprite = LogicElement.icon;
+            }
+            else
+            {
+                background.GetComponent<Image>().enabled = false;
+            }
+            
         }
     }
 

Assets/Scripts/blockSpawn.cs

@@ -109,7 +109,7 @@ public class blockSpawn : MonoBehaviour
         block.GetComponent<LogicCollectable_Multiplayer>().Collectable.element = spawnLogicList[number].element;
         block.GetComponent<LogicCollectable_Multiplayer>().Collectable.Count = spawnLogicList[number].Count;
         block.transform.position = spawnposition;
-        Debug.Log("Instantiated new logic block: " + spawnLogicList[number].element + " at position: " + block.transform.position);
+        //Debug.Log("Instantiated new logic block: " + spawnLogicList[number].element + " at position: " + block.transform.position);
         spawnedLocations.Add(spawnposition);
     }
 }

ProjectSettings/EditorBuildSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9684c54f3409168ac466768434a8b3cda25add5043399384e073903491a1a49a
-size 2120
+oid sha256:1890d8b9d4cb6c52f70ca8e818b21a7f57189e3c35841758de9fc21b4fd1bbe0
+size 2232

ProjectSettings/GraphicsSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:758221ccdd8ed2b386a3367cc69cc6c5466fe975c0b4a77ac65f68abcdaa7ffd
-size 2428
+oid sha256:06f2c9c42c3e01f1143d4c15cfe4f316cfab490aba17fde694e466c130d4e3a4
+size 2359

ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45555b93e6e1b3667258c30533eaa4d4888438fda1d1d8df0f3acaa19ed9aebc
-size 19545
+oid sha256:3227dc2661fccc064a73220d2846fe530fb7aafdffe3b10140f080c84310528d
+size 20392