Merge branch 'feature/falling-floor-trap-integration' into 'main'

falling floor traps integration

Closes #66

See merge request kernel-panic/revival!33

game/Assets/Prefabs/Player.prefab

@@ -100,7 +100,7 @@ GameObject:
   - component: {fileID: 2167937473989734407}
   m_Layer: 0
   m_Name: Player
-  m_TagString: Untagged
+  m_TagString: Player
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0

game/Assets/Prefabs/Traps/FallawayFloor.prefab

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!65 &9034355455690887775
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4864755999650917293}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1.7892379, y: 0.100711815, z: 1.7912163}
+  m_Center: {x: -0.88613075, y: 0.043598715, z: -0.895608}
 --- !u!1 &8773676356524340268
 GameObject:
   m_ObjectHideFlags: 0
@@ -10,10 +23,8 @@ GameObject:
   m_Component:
   - component: {fileID: 8144920974147422729}
   - component: {fileID: 980120856895548942}
-  - component: {fileID: 980120856895548941}
   - component: {fileID: 980120856895548940}
   - component: {fileID: 980120856895548939}
-  - component: {fileID: 980120856895548938}
   - component: {fileID: 980120856895548943}
   m_Layer: 0
   m_Name: FallawayFloor
@@ -30,12 +41,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8773676356524340268}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 11.74, y: 5.69, z: -0.92}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 3.1289, y: 0.13889, z: 6.7626376}
+  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 5244658790847279383}
   m_Father: {fileID: 0}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: -36.672, z: 0}
 --- !u!33 &980120856895548942
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -44,47 +56,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8773676356524340268}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &980120856895548941
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8773676356524340268}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 9f4d5da5d97ffda4a92ff6400046453f, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  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
-  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!65 &980120856895548940
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -96,8 +67,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 0.6}
+  m_Size: {x: 2, y: 1, z: 2}
-  m_Center: {x: 0, y: 5, z: 0}
+  m_Center: {x: 0, y: 0.63, z: 0}
 --- !u!114 &980120856895548939
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -111,20 +82,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   speed: 3
+  fallAwayTime: 1
+  destroyObjectTime: 0
   dissolve: {fileID: 2100000, guid: 98767dd77414bad44b23ef5332c1d8f1, type: 2}
---- !u!65 &980120856895548938
+  _renderer: {fileID: 6378198502367496824}
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8773676356524340268}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1.0000001}
-  m_Center: {x: 0, y: 0.0000009536743, z: 0.00000047683716}
 --- !u!54 &980120856895548943
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -141,3 +102,95 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
+--- !u!1001 &5711263752094586620
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8144920974147422729}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.0634918
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.3920045
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.0634918
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.958
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.974
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7511558181221131132, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2}
+    - target: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_Name
+      value: Floor_B (13)
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+--- !u!1 &4864755999650917293 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+  m_PrefabInstance: {fileID: 5711263752094586620}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &5244658790847279383 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+  m_PrefabInstance: {fileID: 5711263752094586620}
+  m_PrefabAsset: {fileID: 0}
+--- !u!23 &6378198502367496824 stripped
+MeshRenderer:
+  m_CorrespondingSourceObject: {fileID: -7511558181221131132, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+  m_PrefabInstance: {fileID: 5711263752094586620}
+  m_PrefabAsset: {fileID: 0}

game/Assets/Scenes/Main.unity

@@ -986,6 +986,68 @@ Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
   m_PrefabInstance: {fileID: 3060674078169976585}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &300150932
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1571618361}
+    m_Modifications:
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 3.676
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 3.053
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 4.435
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9497903
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.31288725
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -36.467
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8773676356524340268, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_Name
+      value: FallawayFloor
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+--- !u!4 &300150933 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+  m_PrefabInstance: {fileID: 300150932}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &300911337 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3}
@@ -2472,19 +2534,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.9898496
+      value: 0.9898497
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.1421185
+      value: 0.14211853
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.000000014749911
+      value: 1e-45
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.0000000021177309
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalPosition.x
@@ -2508,11 +2570,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.045199875
+      value: 0.04519987
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.0064896126
+      value: -0.0064896117
       objectReference: {fileID: 0}
     - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_Name
@@ -2588,23 +2650,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.107479095
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -0.014587402
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.9874955
+      value: 0.9898497
       objectReference: {fileID: 0}
     - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.15764758
+      value: 0.14211853
       objectReference: {fileID: 0}
     - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 1e-45
       objectReference: {fileID: 0}
     - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.z
@@ -2632,15 +2694,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.14197029
+      value: 0.14197028
       objectReference: {fileID: 0}
     - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.045199867
+      value: 0.04519986
       objectReference: {fileID: 0}
     - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.0064896094
+      value: -0.006489608
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
@@ -5279,6 +5341,68 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1511725762
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1571618361}
+    m_Modifications:
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 6.831
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 3.458
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 2.743
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9497903
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.31288725
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -36.467
+      objectReference: {fileID: 0}
+    - target: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8773676356524340268, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+      propertyPath: m_Name
+      value: FallawayFloor (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+--- !u!4 &1511725763 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8144920974147422729, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
+  m_PrefabInstance: {fileID: 1511725762}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1513493932 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: ef7a51de2c5c5c5438ce6fea733533b2, type: 3}
@@ -5503,6 +5627,38 @@ Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c05280569c267224f87de839cb102b18, type: 3}
   m_PrefabInstance: {fileID: 3060674077876947306}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1571618360
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1571618361}
+  m_Layer: 0
+  m_Name: Trap
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1571618361
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1571618360}
+  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: 300150933}
+  - {fileID: 1511725763}
+  m_Father: {fileID: 0}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1575274760 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4d8ab56378d07b54c9365d4e6fac8901, type: 3}
@@ -9811,6 +9967,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Floor_B (4)
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
 --- !u!65 &3060674077691964099
@@ -41921,6 +42081,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Floor_B (5)
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
 --- !u!136 &3060674078979980220
@@ -56650,6 +56814,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Floor_B (6)
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
 --- !u!65 &3060674079624820716

game/Assets/Scripts/Dialogue/DialogueSystem.cs

@@ -128,7 +128,6 @@ public partial class DialogueSystem : ScriptableObject
         dl.text = DialogueDatabase.ReadDialogue(key);
         
         var clip = _settings.GetDialogueClip(key);
-        Debug.Log(clip);
         dl.duration = clip.length;
 
         dialogueInstance.setCallback(_dialogueCallback);

game/Assets/Scripts/Traps/FallawayFloor.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -11,6 +12,9 @@ public class FallawayFloor : MonoBehaviour
     // Time taken for object to be destroyed.
     public float destroyObjectTime;
     public Material dissolve;
+
+    [SerializeField] private Renderer _renderer;
+    
     Rigidbody rb;
 
     private void Start()
@@ -21,11 +25,11 @@ public class FallawayFloor : MonoBehaviour
 
     private void OnTriggerEnter(Collider other)
     {
-        if (other.gameObject.CompareTag("Player"))
+        if (other.CompareTag("Player"))
         {
             // Start the Destroy floor coroutine and switch to the dissolve material.
             StartCoroutine(DestroyFloor());
-            GetComponent<Renderer>().material = dissolve;
+            _renderer.material = dissolve;
         }
     }