Merge branch 'pr-bash' into whiteboxing

# Conflicts:
#	UOP1_Project/Assets/Samples.meta

UOP1_Project/.gitignore

 ProjectSettings/Packages/com.unity.polybrush/Settings.json
 /ProjectSettings/Packages/com.unity.progrids/Settings.json
 Assets/Polybrush Data*
-Assets/PolybrushData*
+Assets/PolybrushData*
+
+# Asset Bundles folder
+/StreamingAssets/

UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset

     m_SerializedLabels: []
     m_MainAsset: {fileID: 0}
     m_TargetAsset: {fileID: 0}
+  - m_GUID: 753c1cc38ecdc5a4b93227e74555c8d7
+    m_Address: Critters Shared Data
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    m_MainAsset: {fileID: 0}
+    m_TargetAsset: {fileID: 0}
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
   m_SchemaSet:

UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Localization-StringTables.asset

     - Locale-fr
     m_MainAsset: {fileID: 0}
     m_TargetAsset: {fileID: 0}
+  - m_GUID: 8d4813fc8788c4949b7fda8395a3840b
+    m_Address: Critters_en
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-en
+    m_MainAsset: {fileID: 0}
+    m_TargetAsset: {fileID: 0}
+  - m_GUID: 379b9ca9db427c74bb0cd504865dea33
+    m_Address: Critters_fr
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-fr
+    m_MainAsset: {fileID: 0}
+    m_TargetAsset: {fileID: 0}
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
   m_SchemaSet:

UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare_idle.fbx.meta

 guid: 397ae3410a140c04091159b107d04d37
 ModelImporter:
   serializedVersion: 19301
-  internalIDToNameTable: []
+  internalIDToNameTable:
+  - first:
+      74: -5252816984213320552
+    second: idle
   externalObjects: {}
   materials:
     materialImportMode: 0
     importLights: 1
     fileIdsGeneration: 2
     swapUVChannels: 0
-    generateSecondaryUV: 1
+    generateSecondaryUV: 0
     useFileUnits: 1
     keepQuads: 0
     weldVertices: 1
     blendShapeNormalImportMode: 1
     normalSmoothingSource: 0
   referencedClips: []
-  importAnimation: 0
+  importAnimation: 1
   humanDescription:
     serializedVersion: 3
     human: []

UOP1_Project/Assets/Art/Characters/BardHare/Animation/BardHare_talk.fbx.meta

 guid: 2b50843411b30f942b12b4eb3f5d3d88
 ModelImporter:
   serializedVersion: 19301
-  internalIDToNameTable: []
+  internalIDToNameTable:
+  - first:
+      74: 1720936854327583921
+    second: talk
   externalObjects: {}
   materials:
     materialImportMode: 0
     importLights: 1
     fileIdsGeneration: 2
     swapUVChannels: 0
-    generateSecondaryUV: 1
+    generateSecondaryUV: 0
     useFileUnits: 1
     keepQuads: 0
     weldVertices: 1
     blendShapeNormalImportMode: 1
     normalSmoothingSource: 0
   referencedClips: []
-  importAnimation: 0
+  importAnimation: 1
   humanDescription:
     serializedVersion: 3
     human: []

UOP1_Project/Assets/Art/Characters/FryKing/Animation/FryKing.controller

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-8205877888296167064
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 7462806247995721579}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9563953
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-5142550071235473073
 AnimatorState:
   serializedVersion: 5
   - serializedVersion: 1
     m_State: {fileID: -5142550071235473073}
     m_Position: {x: 510, y: 320, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 5822758316023152075}
+    m_Position: {x: 310, y: 150, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
+  - m_Name: Emote
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1102 &5822758316023152075
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: eat_emoting
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -8205877888296167064}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7480669504824360106, guid: 77f46436e0bd6c74fb62e9c4d11da834,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &6642229856091307334
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Emote
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 5822758316023152075}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9906133
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &7462806247995721579
 AnimatorState:
   serializedVersion: 5
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 1164620430434744873}
+  - {fileID: 6642229856091307334}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0

UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef.controller

   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 0.1
+  m_TransitionDuration: 0.2
   m_TransitionOffset: 0
   m_ExitTime: 0.8076923
   m_HasExitTime: 0
   m_CanTransitionToSelf: 1
+--- !u!1102 &-8631220269515084183
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: idle
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: -5252816984213320552, guid: c478a391cfbc4b74ebda3f9a57283705,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1101 &-8057009673609800356
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_TransitionDuration: 0.1
   m_TransitionOffset: 0
   m_ExitTime: 0.7580645
-  m_HasExitTime: 1
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-6490502190932390817
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: IsTalking
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -5136259595334157278}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.3
+  m_TransitionOffset: 0
+  m_ExitTime: 0.70000005
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: -5252816984213320552, guid: c478a391cfbc4b74ebda3f9a57283705,
-    type: 3}
+  m_Motion: {fileID: 7400000, guid: e75fc203107f62d4cb7bdf94806fcc25, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
     m_Position: {x: 30, y: 300, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 5995182924539841906}
-    m_Position: {x: 270, y: 130, z: 0}
+    m_Position: {x: 310, y: 130, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 440317740882946628}
     m_Position: {x: 270, y: 490, z: 0}
     m_Position: {x: 450, y: 300, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 2346626782594886847}
-    m_Position: {x: -250, y: 160, z: 0}
+    m_Position: {x: -360, y: 180, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -1201266896763842996}
+    m_Position: {x: 400, y: -150, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -8631220269515084183}
+    m_Position: {x: 180, y: -150, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -2659933639228989045}
+    m_Position: {x: 620, y: -150, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -2603974551121430470}
+    m_Position: {x: 840, y: -150, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -450912674566187584}
+    m_Position: {x: 670, y: -60, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions:
   - {fileID: -5538795969231381003}
   m_AnyStatePosition: {x: -340, y: 490, z: 0}
-  m_EntryPosition: {x: 50, y: 40, z: 0}
+  m_EntryPosition: {x: 50, y: 0, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: -5457889688521372895}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: 
-  m_Conditions: []
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: IsWalking
+    m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 3444333041856388052}
   m_Solo: 0
-  m_TransitionDuration: 0.1
+  m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_ExitTime: 0.8943662
   m_HasExitTime: 1
   m_CanTransitionToSelf: 1
+--- !u!1102 &-2659933639228989045
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: run
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 6200578666267062213, guid: 1da1da422bdf1a54788013b6f1edbd45,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &-2603974551121430470
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GrabLantern
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: d279f31e479c9a8408eaa547c0673ae9, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1101 &-1634290405553964278
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: 
-  m_Conditions: []
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: IsWalking
+    m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: -5457889688521372895}
   m_Solo: 0
-  m_TransitionDuration: 0.1
+  m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_ExitTime: 0.8943662
   m_HasExitTime: 1
   m_CanTransitionToSelf: 1
+--- !u!1102 &-1201266896763842996
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: walk
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: -3419257869308726280, guid: d7866876f824fdd439187217dc8684f0,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &-450912674566187584
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: cane_hit2
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: -7615664969998887413, guid: 6b30ba958236e834e8e7ccec6f00f90c,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
   - {fileID: 7941493872309352012}
   - {fileID: 3525189850006141372}
   - {fileID: -8057009673609800356}
+  - {fileID: 5684728565472367712}
+  - {fileID: -6490502190932390817}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &5684728565472367712
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: PickUp
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 2346626782594886847}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.1
+  m_TransitionOffset: 0
+  m_ExitTime: 0.8161291
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &5756345702403356428
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 0.1
+  m_TransitionDuration: 0.2
   m_TransitionOffset: 0
   m_ExitTime: 0.8076923
   m_HasExitTime: 0
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: CaneHit
-  m_Speed: 1
+  m_Speed: 2
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: -3235251470832908421}
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 0.1
+  m_TransitionDuration: 0.2
   m_TransitionOffset: 0
   m_ExitTime: 0.98747915
   m_HasExitTime: 0
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 0.1
+  m_TransitionDuration: 0.2
   m_TransitionOffset: 0
   m_ExitTime: 0.7580645
   m_HasExitTime: 0
   m_Name: Blend Tree
   m_Childs:
   - serializedVersion: 2
-    m_Motion: {fileID: -3419257869308726280, guid: d7866876f824fdd439187217dc8684f0,
-      type: 3}
-    m_Threshold: 0
+    m_Motion: {fileID: 7400000, guid: 5976cd6b402e9564c9451dbdae1c5871, type: 2}
+    m_Threshold: 0.2
-    m_TimeScale: 1
+    m_TimeScale: 1.2
-    m_Motion: {fileID: 6200578666267062213, guid: 1da1da422bdf1a54788013b6f1edbd45,
-      type: 3}
+    m_Motion: {fileID: 7400000, guid: f2c6830f0e8743443a792b8ed6663b59, type: 2}
-    m_TimeScale: 1
+    m_TimeScale: 1.2
-  m_MinThreshold: 0
+  m_MinThreshold: 0.2
   m_MaxThreshold: 0.8
   m_UseAutomaticThresholds: 0
   m_NormalizedBlendValues: 0

UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_CaneHit.fbx.meta

       mirror: 0
       bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
       curves: []
-      events: []
+      events:
+      - time: 0.2607143
+        functionName: PlayCaneSwing
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
-      additiveReferencePoseFrame: 0
+      additiveReferencePoseFrame: 1
     isReadable: 0
   meshes:
     lODScreenPercentages: []
     useSRGBMaterialColor: 1
     sortHierarchyByName: 1
-    importVisibility: 1
+    importVisibility: 0
     importBlendShapes: 1
     importCameras: 1
     importLights: 1

UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Collect.fbx.meta

     animationWrapMode: 0
     extraExposedTransformPaths: []
     extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: Collect
+      takeName: Collect
+      internalID: 0
+      firstFrame: 1
+      lastFrame: 88
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events:
+      - time: 0.29464287
+        functionName: PlayObjectPickup
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 1
     isReadable: 0
   meshes:
     lODScreenPercentages: []
     useSRGBMaterialColor: 1
     sortHierarchyByName: 1
-    importVisibility: 1
+    importVisibility: 0
     importBlendShapes: 1
     importCameras: 1
     importLights: 1

UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Idle.fbx.meta

     addColliders: 0
     useSRGBMaterialColor: 1
     sortHierarchyByName: 1
-    importVisibility: 1
+    importVisibility: 0
     importBlendShapes: 1
     importCameras: 1
     importLights: 1

UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Jump.fbx.meta

     animationWrapMode: 0
     extraExposedTransformPaths: []
     extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: jump
+      takeName: jump
+      internalID: 0
+      firstFrame: 1
+      lastFrame: 40
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events:
+      - time: 0.5125
+        functionName: PlayFootstep
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 1
     isReadable: 0
   meshes:
     lODScreenPercentages: []
     useSRGBMaterialColor: 1
     sortHierarchyByName: 1
-    importVisibility: 1
+    importVisibility: 0
     importBlendShapes: 1
     importCameras: 1
     importLights: 1

UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_Walk.fbx.meta

     addColliders: 0
     useSRGBMaterialColor: 1
     sortHierarchyByName: 1
-    importVisibility: 1
+    importVisibility: 0
     importBlendShapes: 1
     importCameras: 1
     importLights: 1

UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_faint.fbx.meta

     addColliders: 0
     useSRGBMaterialColor: 1
     sortHierarchyByName: 1
-    importVisibility: 1
+    importVisibility: 0
-    generateSecondaryUV: 1
+    generateSecondaryUV: 0
     useFileUnits: 1
     keepQuads: 0
     weldVertices: 1

UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef_run.fbx.meta

       mirror: 0
       bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
       curves: []
-      events: []
+      events:
+      - time: 0.15386683
+        functionName: PlayFootstep
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
+      - time: 0.59838706
+        functionName: PlayFootstep
+        data: 
+        objectReferenceParameter: {instanceID: 0}
+        floatParameter: 0
+        intParameter: 0
+        messageOptions: 0
-      additiveReferencePoseFrame: 0
+      additiveReferencePoseFrame: 1
     isReadable: 0
   meshes:
     lODScreenPercentages: []
     useSRGBMaterialColor: 1
     sortHierarchyByName: 1
-    importVisibility: 1
+    importVisibility: 0
     importBlendShapes: 1
     importCameras: 1
     importLights: 1

UOP1_Project/Assets/Art/Characters/PlantCritter/Animation/PlantCritter.controller

   m_Transitions:
   - {fileID: 1304842204124139703}
   - {fileID: -6117320398294166135}
-  - {fileID: 3149742496627694283}
   - {fileID: 1218776814813949288}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: 
-  m_Conditions: []
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: IsDead
+    m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: -5704565605198617748}
   m_Solo: 0
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &-4558656106610778546
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: IsDead
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -1129748727142868905}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.70000005
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-4130062669359518069
 AnimatorState:
   serializedVersion: 5
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &-3863499363013708062
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: GetHit
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -3077816066201406678}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.70000005
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-3077816066201406678
 AnimatorState:
   serializedVersion: 5
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: -5220075001053048283}
+  - {fileID: -4558656106610778546}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 0}
-  - m_Name: Killed
-    m_Type: 9
+  - m_Name: IsDead
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: IsMoving
+    m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
---- !u!1101 &3149742496627694283
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: Killed
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -1129748727142868905}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.89830506
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1102 &3282315440550505860
 AnimatorState:
   serializedVersion: 5
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 2566808087933946074}
+  - {fileID: -3863499363013708062}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0

UOP1_Project/Assets/Art/Characters/RockCritter/Animation/RockCritter.controller

   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1102 &-4654726434700575078
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Idle 2
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1622210301392266449}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 665853745831072719, guid: 2b442a7421b8e6240b7e4f1ea1761eae, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &-4474394442163369061
+AnimatorStateTransition:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Attack
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -3875671591756103490}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-3875671591756103490
 AnimatorState:
   serializedVersion: 5
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -3875671591756103490}
-    m_Position: {x: 530, y: 90, z: 0}
+    m_Position: {x: 650, y: 60, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 4720089668450380841}
     m_Position: {x: 650, y: -60, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -4654726434700575078}
+    m_Position: {x: 350, y: 60, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: 4415866510221228954}
+--- !u!1101 &-3532735128843974909
+AnimatorStateTransition:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: IsWalking
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 4720089668450380841}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-3139007417172559688
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -4654726434700575078}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.8469388
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &-1747885104869998874
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1101 &1622210301392266449
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 4415866510221228954}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.8469388
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &4146217194883196354
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_Transitions:
   - {fileID: 5149628747913953404}
   - {fileID: 4146217194883196354}
+  - {fileID: -3139007417172559688}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 0}
+  m_Motion: {fileID: -5252816984213320552, guid: 7ded5f0996b0fce4688147fd67a029e5,
+    type: 3}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 

UOP1_Project/Assets/Art/Characters/RockCritter/Animation/RockCritter_Attack.fbx.meta

     isReadable: 0
   meshes:
     lODScreenPercentages: []
-    globalScale: 1
+    globalScale: 1.2
     meshCompression: 0
     addColliders: 0
     useSRGBMaterialColor: 1
     armStretch: 0.05
     legStretch: 0.05
     feetSpacing: 0
-    globalScale: 1
+    globalScale: 0.012
     rootMotionBoneName: 
     hasTranslationDoF: 0
     hasExtraRoot: 0

UOP1_Project/Assets/Art/Characters/RockCritter/Animation/RockCritter_Walk.fbx.meta

     isReadable: 0
   meshes:
     lODScreenPercentages: []
-    globalScale: 1
+    globalScale: 1.2
     meshCompression: 0
     addColliders: 0
     useSRGBMaterialColor: 1
     armStretch: 0.05
     legStretch: 0.05
     feetSpacing: 0
-    globalScale: 1
+    globalScale: 0.012
     rootMotionBoneName: 
     hasTranslationDoF: 0
     hasExtraRoot: 0

UOP1_Project/Assets/Art/Characters/RockCritter/RockCritter.fbx.meta

     isReadable: 0
   meshes:
     lODScreenPercentages: []
-    globalScale: 1
+    globalScale: 1.2
     meshCompression: 0
     addColliders: 0
     useSRGBMaterialColor: 1
     armStretch: 0.05
     legStretch: 0.05
     feetSpacing: 0
-    globalScale: 1
+    globalScale: 0.012
     rootMotionBoneName: 
     hasTranslationDoF: 0
     hasExtraRoot: 0

UOP1_Project/Assets/Art/Characters/SlimeCritter/Animation/SlimeCritter.fbx.meta

     isReadable: 0
   meshes:
     lODScreenPercentages: []
-    globalScale: 1
+    globalScale: 1.3
     meshCompression: 0
     addColliders: 0
     useSRGBMaterialColor: 1
     armStretch: 0.05
     legStretch: 0.05
     feetSpacing: 0
-    globalScale: 1
+    globalScale: 0.012999999
     rootMotionBoneName: 
     hasTranslationDoF: 0
     hasExtraRoot: 0

UOP1_Project/Assets/Art/Nature/FlatTree/FlatTree.mat

     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _Surface: 0
-    - _Wind_Density: 0.06
+    - _Wind_Density: 0.5
-    - _Wind_Speed: 1.63
-    - _Wind_Strength: 0.56
+    - _Wind_Speed: 1
+    - _Wind_Strength: 0.2
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:

UOP1_Project/Assets/Art/Nature/Grass/Grass.mat

     type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}

UOP1_Project/Assets/Art/Nature/Tree/Tree.mat

   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Tree
-  m_Shader: {fileID: -6465566751694194690, guid: 7fdaae2b9572343449616bd7b38bce5a,
+  m_Shader: {fileID: -6465566751694194690, guid: ae3bf80ddd78f3e4aa77c149858aab01,
     type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _Surface: 0
-    - _Wind_Density: 0.2
+    - _Wind_Density: 0.3
-    - _Wind_Speed: 2
-    - _Wind_Strength: 0.1
+    - _Wind_Speed: 1
+    - _Wind_Strength: 0.2
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:

UOP1_Project/Assets/Art/Nature/Tree/Tree2.mat

   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Tree2
-  m_Shader: {fileID: -6465566751694194690, guid: 7fdaae2b9572343449616bd7b38bce5a,
+  m_Shader: {fileID: -6465566751694194690, guid: ae3bf80ddd78f3e4aa77c149858aab01,
     type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4

UOP1_Project/Assets/Prefabs/Characters/FryKing.prefab

     - target: {fileID: -8679921383154817045, guid: 499877971136c0e42ba83dae6746f47d,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 10
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 499877971136c0e42ba83dae6746f47d,
         type: 3}

UOP1_Project/Assets/Prefabs/Characters/Pig/Interaction.prefab

   m_EditorClassIdentifier: 
   currentInteraction: 0
   _inputReader: {fileID: 11400000, guid: 945ec0365077176418488737deed54be, type: 2}
-  _onObjectPickUp: {fileID: 11400000, guid: f3027c4528b8e794f940a4696506f0c3, type: 2}
+  _onObjectPickUp: {fileID: 11400000, guid: 582b52ca2b84a41528fe274eea1ced6a, type: 2}
   _onCookingStart: {fileID: 11400000, guid: 146c579dca5c2f248a607ef66a36d765, type: 2}
   _startTalking: {fileID: 11400000, guid: bff3df361fa61684386f84b5b062875a, type: 2}
   _toggleInteractionUI: {fileID: 11400000, guid: 818cc55cb05226248bdb15ace58eab84,

UOP1_Project/Assets/Prefabs/Characters/PlantCritter.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!136 &236781474
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8745063237678790951}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.5180242
+  m_Height: 5
+  m_Direction: 1
+  m_Center: {x: -0.01654327, y: 2, z: 0.03308654}
+--- !u!136 &1330865802894030747
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8745063237678790951}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  m_Radius: 0.38419735
+  m_Height: 0.9338093
+  m_Direction: 1
+  m_Center: {x: 0, y: 0.50470877, z: 0.03308642}
 --- !u!95 &950100416
 Animator:
   serializedVersion: 3
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &-1101864067322258500
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8745063237678790951}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1eeda163c70b3cb4ebb88ba92f608fd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _transitionTableSO: {fileID: 11400000, guid: c106e88137c90384bb4b18ba46869b64, type: 2}
+  _debugger:
+    debugTransitions: 0
+    appendConditionsInfo: 1
+    appendActionsInfo: 1
+    currentState: 
+--- !u!114 &443910769
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8745063237678790951}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d83d74df43f0a0b42afeaffe5c3e02cc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _critterSO: {fileID: 11400000, guid: 301a61db8a2a4ef408992e723f0b6b53, type: 2}
+  _collectibleItemPrefab: {fileID: 2126586097156616357, guid: 0f60adbc96570cb4e9898a0409956f1d,
+    type: 3}
+--- !u!1001 &4629040063581857200
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8221149608678237085}
+    m_Modifications:
+    - target: {fileID: 96998187169542720, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_Radius
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 443910769}
+    - target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: set_isPlayerInAttackZone
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542727, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_Name
+      value: TriggerZone_Attack
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c823b09b59e206649a8779a78929fa2d, type: 3}
+--- !u!1001 &5714929754622545917
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8221149608678237085}
+    m_Modifications:
+    - target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 443910769}
+    - target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: set_isPlayerInAlertZone
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542727, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_Name
+      value: TriggerZone_Alert
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c823b09b59e206649a8779a78929fa2d, type: 3}
 --- !u!1001 &8475173613595968630
 PrefabInstance:
   m_ObjectHideFlags: 0
     - target: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: 1.09
-      value: 0
+      value: 9.556302e-17
-      value: 0
+      value: -7.58
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
         type: 3}
     type: 3}
   m_PrefabInstance: {fileID: 8475173613595968630}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &8221149608678237085 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}

UOP1_Project/Assets/Prefabs/Characters/SlimeCritter_Base.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1001 &8680699781471670696
+--- !u!135 &4665385715536349190
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8687264390989375961}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.45
+  m_Center: {x: 0, y: 0.32, z: 0}
+--- !u!135 &6188918218575104391
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8687264390989375961}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0.32, z: 0}
+--- !u!114 &-4815453607611708844
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8687264390989375961}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1eeda163c70b3cb4ebb88ba92f608fd8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _transitionTableSO: {fileID: 11400000, guid: c106e88137c90384bb4b18ba46869b64, type: 2}
+  _debugger:
+    debugTransitions: 0
+    appendConditionsInfo: 1
+    appendActionsInfo: 1
+    currentState: 
+--- !u!195 &-4755876077494293666
+NavMeshAgent:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8687264390989375961}
+  m_Enabled: 1
+  m_AgentTypeID: 0
+  m_Radius: 0.5
+  m_Speed: 3.5
+  m_Acceleration: 8
+  avoidancePriority: 50
+  m_AngularSpeed: 240
+  m_StoppingDistance: 0
+  m_AutoTraverseOffMeshLink: 1
+  m_AutoBraking: 1
+  m_AutoRepath: 1
+  m_Height: 2
+  m_BaseOffset: 0
+  m_WalkableMask: 4294967295
+  m_ObstacleAvoidanceType: 4
+--- !u!114 &-2448911175244354893
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8687264390989375961}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d83d74df43f0a0b42afeaffe5c3e02cc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _critterSO: {fileID: 11400000, guid: fd7717100e602c446847524419231170, type: 2}
+  _collectibleItemPrefab: {fileID: 2126586097156616357, guid: 0f60adbc96570cb4e9898a0409956f1d,
+    type: 3}
+--- !u!114 &2038924309811281612
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8687264390989375961}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 95216bcd641df05419665f7db9aed05b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _playerTransform: {fileID: 11400000, guid: 35fc4039342b6ba458d0d4429e89ee74, type: 2}
+  _propelFactor: 1
+  _propelDuration: 0.2
+--- !u!1001 &2135821800440209491
-    m_TransformParent: {fileID: 0}
+    m_TransformParent: {fileID: 8341946629798114147}
-    - target: {fileID: -8679921383154817045, guid: e5ad878f221720f478a554baa6eefc13,
+    - target: {fileID: 96998187169542720, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_Radius
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: -2448911175244354893}
+    - target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: set_isPlayerInAttackZone
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
-    - target: {fileID: -8679921383154817045, guid: e5ad878f221720f478a554baa6eefc13,
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
-    - target: {fileID: -8679921383154817045, guid: e5ad878f221720f478a554baa6eefc13,
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
-    - target: {fileID: -8679921383154817045, guid: e5ad878f221720f478a554baa6eefc13,
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
-    - target: {fileID: -8679921383154817045, guid: e5ad878f221720f478a554baa6eefc13,
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
-    - target: {fileID: -8679921383154817045, guid: e5ad878f221720f478a554baa6eefc13,
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
-    - target: {fileID: -8679921383154817045, guid: e5ad878f221720f478a554baa6eefc13,
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542727, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_Name
+      value: TriggerZone_Attack
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c823b09b59e206649a8779a78929fa2d, type: 3}
+--- !u!1001 &4844929329272712131
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8341946629798114147}
+    m_Modifications:
+    - target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: -2448911175244354893}
+    - target: {fileID: 96998187169542721, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: _enterZone.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: set_isPlayerInAlertZone
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
-    - target: {fileID: -8679921383154817045, guid: e5ad878f221720f478a554baa6eefc13,
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
-      propertyPath: m_RootOrder
+      propertyPath: m_LocalRotation.x
-    - target: {fileID: -8679921383154817045, guid: e5ad878f221720f478a554baa6eefc13,
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
-    - target: {fileID: -8679921383154817045, guid: e5ad878f221720f478a554baa6eefc13,
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
-    - target: {fileID: -8679921383154817045, guid: e5ad878f221720f478a554baa6eefc13,
+    - target: {fileID: 96998187169542726, guid: c823b09b59e206649a8779a78929fa2d,
-    - target: {fileID: -8679921383154817045, guid: e5ad878f221720f478a554baa6eefc13,
+    - target: {fileID: 96998187169542727, guid: c823b09b59e206649a8779a78929fa2d,
+        type: 3}
+      propertyPath: m_Name
+      value: TriggerZone_Alert
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c823b09b59e206649a8779a78929fa2d, type: 3}
+--- !u!1001 &8380694498511901832
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 63937395ff7a888419d4b8fe450d3c91,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63937395ff7a888419d4b8fe450d3c91,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63937395ff7a888419d4b8fe450d3c91,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63937395ff7a888419d4b8fe450d3c91,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63937395ff7a888419d4b8fe450d3c91,
-      propertyPath: m_LocalScale.x
+      propertyPath: m_LocalRotation.w
-    - target: {fileID: -8679921383154817045, guid: e5ad878f221720f478a554baa6eefc13,
+    - target: {fileID: -8679921383154817045, guid: 63937395ff7a888419d4b8fe450d3c91,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63937395ff7a888419d4b8fe450d3c91,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63937395ff7a888419d4b8fe450d3c91,
-      propertyPath: m_LocalScale.y
-      value: 1
+      propertyPath: m_LocalRotation.z
+      value: 0
-    - target: {fileID: -8679921383154817045, guid: e5ad878f221720f478a554baa6eefc13,
+    - target: {fileID: -8679921383154817045, guid: 63937395ff7a888419d4b8fe450d3c91,
-      propertyPath: m_LocalScale.z
-      value: 1
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
-    - target: {fileID: -7511558181221131132, guid: e5ad878f221720f478a554baa6eefc13,
+    - target: {fileID: -8679921383154817045, guid: 63937395ff7a888419d4b8fe450d3c91,
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: b4c2a4fb9b8764842a6214f9c1db556e, type: 2}
-    - target: {fileID: -7511558181221131132, guid: e5ad878f221720f478a554baa6eefc13,
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63937395ff7a888419d4b8fe450d3c91,
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 90947f09ca22f984898b016a197efedb, type: 2}
-    - target: {fileID: 919132149155446097, guid: e5ad878f221720f478a554baa6eefc13,
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 63937395ff7a888419d4b8fe450d3c91,
+    - target: {fileID: 1430996729439901540, guid: 63937395ff7a888419d4b8fe450d3c91,
+        type: 3}
+      propertyPath: m_RootBone
+      value: 
+      objectReference: {fileID: 6359161719296748449}
+    - target: {fileID: 5866666021909216657, guid: 63937395ff7a888419d4b8fe450d3c91,
+        type: 3}
+      propertyPath: m_Controller
+      value: 
+      objectReference: {fileID: 9100000, guid: 4a56ed1b5c13c544c8a4e238c15808ba, type: 2}
-  m_SourcePrefab: {fileID: 100100000, guid: e5ad878f221720f478a554baa6eefc13, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: 63937395ff7a888419d4b8fe450d3c91, type: 3}
+--- !u!1 &8687264390989375961 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 63937395ff7a888419d4b8fe450d3c91,
+    type: 3}
+  m_PrefabInstance: {fileID: 8380694498511901832}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &8341946629798114147 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 63937395ff7a888419d4b8fe450d3c91,
+    type: 3}
+  m_PrefabInstance: {fileID: 8380694498511901832}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &6359161719296748449 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -6048770967118889175, guid: 63937395ff7a888419d4b8fe450d3c91,
+    type: 3}
+  m_PrefabInstance: {fileID: 8380694498511901832}
+  m_PrefabAsset: {fileID: 0}

UOP1_Project/Assets/Prefabs/Characters/SlimeCritter_Base.prefab.meta

 fileFormatVersion: 2
-guid: 437e6f1763af95e47b2f913253f76c95
+guid: 0b4e286cfc4c6e943841c36cc5529b22
 PrefabImporter:
   externalObjects: {}
   userData: 

UOP1_Project/Assets/Prefabs/Effects/DustParticles/JumpParticle.prefab

     startSize:
       serializedVersion: 2
       minMaxState: 1
-      scalar: 0.16
+      scalar: 0.06
       minScalar: 0.16
       maxCurve:
         serializedVersion: 2

UOP1_Project/Assets/Prefabs/Effects/DustParticles/LandingParticle.prefab

   - component: {fileID: 8442424470799517435}
   - component: {fileID: 8525369151793231701}
   m_Layer: 0
-  m_Name: LandingPuffParticle
+  m_Name: LandingParticle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
     startSize:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 0.12
-      minScalar: 0.04
+      scalar: 0.2
+      minScalar: 0.03
       maxCurve:
         serializedVersion: 2
         m_Curve:
       countCurve:
         serializedVersion: 2
         minMaxState: 0
-        scalar: 10
+        scalar: 7
         minScalar: 30
         maxCurve:
           serializedVersion: 2

UOP1_Project/Assets/Prefabs/Effects/DustParticles/WalkingParticle.prefab

     startSize:
       serializedVersion: 2
       minMaxState: 3
-      scalar: 0.09
-      minScalar: 0.05
+      scalar: 0.07
+      minScalar: 0.02
       maxCurve:
         serializedVersion: 2
         m_Curve:
     gravityModifier:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 0
+      scalar: -0.2
       minScalar: 0
       maxCurve:
         serializedVersion: 2
   ShapeModule:
     serializedVersion: 6
     enabled: 1
-    type: 0
+    type: 12
     angle: 25
     length: 5
     boxThickness: {x: 0, y: 0, z: 0}
     sphericalDirectionAmount: 1
     randomPositionAmount: 0
     radius:
-      value: 0.07
+      value: 0.14
       mode: 0
       spread: 0
       speed:
     serializedVersion: 4
     rateOverTime:
       serializedVersion: 2
-      minMaxState: 0
+      minMaxState: 3
-      minScalar: 10
+      minScalar: 0
       maxCurve:
         serializedVersion: 2
         m_Curve:
         m_RotationOrder: 4
     rateOverDistance:
       serializedVersion: 2
-      minMaxState: 0
+      minMaxState: 3
       scalar: 0
       minScalar: 0
       maxCurve:
           m_PreInfinity: 2
           m_PostInfinity: 2
           m_RotationOrder: 4
-      cycleCount: 1
-      repeatInterval: 1
-      probability: 1
+      cycleCount: 3
+      repeatInterval: 0.1
+      probability: 0.7
   SizeModule:
     enabled: 1
     curve:

UOP1_Project/Assets/Prefabs/Furniture/LinenRoundChair.prefab

       propertyPath: m_Name
       value: LinenRoundChair
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 4a3a9ff36fc83054e92377c5d19d8b8c,
+        type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 4294967295
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4a3a9ff36fc83054e92377c5d19d8b8c, type: 3}
 --- !u!1 &4916672299026840286 stripped

UOP1_Project/Assets/Prefabs/Furniture/RoundTable.prefab

       propertyPath: m_Name
       value: RoundTable
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: f6229270de600de43988496f212ee05a,
+        type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 4294967295
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: f6229270de600de43988496f212ee05a, type: 3}
 --- !u!1 &1361401871558226816 stripped

UOP1_Project/Assets/Prefabs/Furniture/WoodenChair.prefab

       propertyPath: m_Name
       value: WoodenChair
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 2828e4decae56ce49ab172678a17cad5,
+        type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 4294967295
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 2828e4decae56ce49ab172678a17cad5, type: 3}
 --- !u!1 &8499599955814031790 stripped

UOP1_Project/Assets/Prefabs/Furniture/WoodenTable.prefab

       propertyPath: m_Name
       value: WoodenTable
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 3ecf234f9612ea44b994cb79d406e461,
+        type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 4294967295
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3ecf234f9612ea44b994cb79d406e461, type: 3}
 --- !u!1 &2200193680915662420 stripped

UOP1_Project/Assets/Prefabs/GameplayEssentials/CameraSystem.prefab

   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1988373824387590796}
-  m_LocalRotation: {x: 0.22975291, y: -0, z: -0, w: 0.973249}
+  m_LocalRotation: {x: 0.22975291, y: 1e-45, z: -0, w: 0.973249}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5457523176376150323}
-  m_LocalRotation: {x: 0.22975291, y: -9.602319e-22, z: 2.8636668e-22, w: 0.973249}
+  m_LocalRotation: {x: 0.22975291, y: -2.274687e-15, z: 4.0599975e-16, w: 0.973249}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   m_EditorClassIdentifier: 
   m_CollideAgainst:
     serializedVersion: 2
-    m_Bits: 2049
+    m_Bits: 10241
   m_IgnoreTag: 
   m_TransparentLayers:
     serializedVersion: 2
   m_DistanceLimit: 0
-  m_MinimumOcclusionTime: 0.1
-  m_CameraRadius: 0.3
+  m_MinimumOcclusionTime: 0
+  m_CameraRadius: 0.5
-  m_Damping: 0.2
-  m_DampingWhenOccluded: 0.2
+  m_Damping: 2
+  m_DampingWhenOccluded: 0
   m_OptimalTargetDistance: 0
 --- !u!1 &8745341642014614487
 GameObject:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8745341642014614487}
-  m_LocalRotation: {x: 0.22975294, y: -0, z: -0, w: 0.973249}
+  m_LocalRotation: {x: 0.22975294, y: 1e-45, z: -0, w: 0.973249}
   m_LocalPosition: {x: 0, y: 7, z: -12}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []

UOP1_Project/Assets/Prefabs/GameplayEssentials/SpawnSystem.prefab

   _defaultSpawnIndex: 0
   _playerPrefab: {fileID: 5557640735889932260, guid: 062b3805bf6784e4d9c599ee60eaa002,
     type: 3}
+  _playerTransformAnchor: {fileID: 11400000, guid: 35fc4039342b6ba458d0d4429e89ee74,
+    type: 2}
-  _spawnLocations:
-  - {fileID: 2125786286893897154}
+  _pathTaken: {fileID: 11400000, guid: a9ec09853cba047a8a58f5881053cfc6, type: 2}
+  _OnSceneReady: {fileID: 11400000, guid: b729e40fc41dd8b4ea7aaf5c857f7186, type: 2}
 --- !u!1 &2125786286893897213
 GameObject:
   m_ObjectHideFlags: 0
   - component: {fileID: 4671891876261113940}
   m_Layer: 0
   m_Name: Location 01
-  m_TagString: Untagged
+  m_TagString: SpawnLocation
   m_Icon: {fileID: 3936346786652291628, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0

UOP1_Project/Assets/Prefabs/GameplayEssentials/MenuEditorInitializer.prefab

   - component: {fileID: 40564194958535909}
   - component: {fileID: 40564194958535908}
   m_Layer: 0
-  m_Name: EditorInitializer
+  m_Name: MenuEditorInitializer
   m_TagString: EditorOnly
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_Script: {fileID: 11500000, guid: afdc0d26809578642bceb401301d2a8a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  initializationScene: {fileID: 11400000, guid: c2119785ce96367428081d6eee0d932b,
+  scenesToLoad:
+  - {fileID: 11400000, guid: c2119785ce96367428081d6eee0d932b, type: 2}
+  targetFramerate: 0
+  _isEditorInitializerMode: 0
+  _OnEditorInitializer: {fileID: 11400000, guid: 13c350be03ed8f54cbc7630aa33b3d7b,
     type: 2}

UOP1_Project/Assets/Prefabs/Items/WalkingCane.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!136 &969440480837226763
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4112729716880871686}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.091426246
+  m_Height: 1.1348616
+  m_Direction: 1
+  m_Center: {x: -0.01, y: -0.011085637, z: -0.02}
 --- !u!1001 &3878215223713049687
 PrefabInstance:
   m_ObjectHideFlags: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: c5d242d6bd84e46af8b2bb85418929ef, type: 3}
+--- !u!1 &4112729716880871686 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c5d242d6bd84e46af8b2bb85418929ef,
+    type: 3}
+  m_PrefabInstance: {fileID: 3878215223713049687}
+  m_PrefabAsset: {fileID: 0}

UOP1_Project/Assets/Prefabs/Nature/FernPlant.prefab

     m_Modifications:
     - target: {fileID: -8679921383154817045, guid: ec5a160871e67443eb9563c09f453693,
         type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ec5a160871e67443eb9563c09f453693,
+        type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: ec5a160871e67443eb9563c09f453693,
         type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ec5a160871e67443eb9563c09f453693,
+        type: 3}
       propertyPath: m_LocalRotation.x
       value: 0.000000021855694
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: ec5a160871e67443eb9563c09f453693,
         type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ec5a160871e67443eb9563c09f453693,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: ec5a160871e67443eb9563c09f453693,
-        type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: 6bb7eeb060c74453e886544567b846a3, type: 2}
+    - target: {fileID: -7511558181221131132, guid: ec5a160871e67443eb9563c09f453693,
+        type: 3}
+      propertyPath: m_SelectedEditorRenderState
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -5754084199372789682, guid: ec5a160871e67443eb9563c09f453693,
+        type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 4300000, guid: b4e26e1db17302b4aacefe9c3818293d, type: 2}
     - target: {fileID: 919132149155446097, guid: ec5a160871e67443eb9563c09f453693,
         type: 3}
       propertyPath: m_Name

UOP1_Project/Assets/Prefabs/Nature/Trees/Tree.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5988098909633967672
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1196795063792243136}
+  - component: {fileID: 2615550872687207979}
+  m_Layer: 13
+  m_Name: Leaves
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1196795063792243136
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5988098909633967672}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.53, y: 3.43, z: 0.24}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6434799244096359547}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &2615550872687207979
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5988098909633967672}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 1.89
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!136 &4744890041706611347
 CapsuleCollider:
   m_ObjectHideFlags: 0
     m_Modifications:
     - target: {fileID: -8679921383154817045, guid: 0cc589ab20a19e14c9b7c52965ebd4eb,
         type: 3}
-      propertyPath: m_LocalPosition.x
+      propertyPath: m_RootOrder
-      propertyPath: m_LocalPosition.y
-      value: 0
+      propertyPath: m_LocalScale.x
+      value: 1
-      propertyPath: m_LocalPosition.z
-      value: 0
+      propertyPath: m_LocalScale.y
+      value: 1
-      propertyPath: m_LocalRotation.x
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 0cc589ab20a19e14c9b7c52965ebd4eb,
+        type: 3}
+      propertyPath: m_LocalPosition.x
-      propertyPath: m_LocalRotation.y
+      propertyPath: m_LocalPosition.y
-      propertyPath: m_LocalRotation.z
+      propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 0cc589ab20a19e14c9b7c52965ebd4eb,
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 0cc589ab20a19e14c9b7c52965ebd4eb,
         type: 3}
-      propertyPath: m_RootOrder
+      propertyPath: m_LocalRotation.x
-      propertyPath: m_LocalEulerAnglesHint.x
+      propertyPath: m_LocalRotation.y
-      propertyPath: m_LocalEulerAnglesHint.y
+      propertyPath: m_LocalRotation.z
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 3.1490002
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 0cc589ab20a19e14c9b7c52965ebd4eb,
-        type: 3}
-      propertyPath: m_LocalScale.x
-      value: 1
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
-      propertyPath: m_LocalScale.y
-      value: 1
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
-      propertyPath: m_LocalScale.z
-      value: 1
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 3.1490002
       objectReference: {fileID: 0}
     - target: {fileID: -7511558181221131132, guid: 0cc589ab20a19e14c9b7c52965ebd4eb,
         type: 3}
       propertyPath: m_Materials.Array.data[1]
       value: 
       objectReference: {fileID: 2100000, guid: 5ac3e6a034cf09849b9956bc922813e3, type: 2}
+    - target: {fileID: -7511558181221131132, guid: 0cc589ab20a19e14c9b7c52965ebd4eb,
+        type: 3}
+      propertyPath: m_SelectedEditorRenderState
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -5754084199372789682, guid: 0cc589ab20a19e14c9b7c52965ebd4eb,
+        type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 4300000, guid: b5a5e4f841b9c4c40b3af05f245c9b47, type: 2}
     - target: {fileID: 919132149155446097, guid: 0cc589ab20a19e14c9b7c52965ebd4eb,
         type: 3}
       propertyPath: m_Name
         type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 123
+      propertyPath: m_Layer
+      value: 11
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 0cc589ab20a19e14c9b7c52965ebd4eb,
         type: 3}
     - target: {fileID: 919132149155446097, guid: 0cc589ab20a19e14c9b7c52965ebd4eb,
         type: 3}
-      propertyPath: m_Layer
-      value: 11
+      propertyPath: m_StaticEditorFlags
+      value: 123
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 0cc589ab20a19e14c9b7c52965ebd4eb, type: 3}
     type: 3}
   m_PrefabInstance: {fileID: 6829223592588061584}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &6434799244096359547 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0cc589ab20a19e14c9b7c52965ebd4eb,
+    type: 3}
+  m_PrefabInstance: {fileID: 6829223592588061584}
+  m_PrefabAsset: {fileID: 0}

UOP1_Project/Assets/Prefabs/Nature/Trees/Tree2.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!136 &7582380651766892676
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3206009959637394402}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.38
+  m_Height: 3.96
+  m_Direction: 1
+  m_Center: {x: 0, y: 1.48, z: 0}
+--- !u!1 &5085729515796560085
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8341260179520600969}
+  - component: {fileID: 3891764386928688621}
+  m_Layer: 13
+  m_Name: Leaves
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8341260179520600969
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5085729515796560085}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 3.6, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2825403755275319640}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &3891764386928688621
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5085729515796560085}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 1.79
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &2359711122858188467
 PrefabInstance:
   m_ObjectHideFlags: 0
     - target: {fileID: 919132149155446097, guid: d1ad4c1691331f84483ea7dda70828ec,
         type: 3}
       propertyPath: m_Name
-      value: TreeMedium
+      value: Tree2
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: d1ad4c1691331f84483ea7dda70828ec,
         type: 3}
+    - target: {fileID: 919132149155446097, guid: d1ad4c1691331f84483ea7dda70828ec,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+--- !u!1 &3206009959637394402 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d1ad4c1691331f84483ea7dda70828ec,
+    type: 3}
+  m_PrefabInstance: {fileID: 2359711122858188467}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &2825403755275319640 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d1ad4c1691331f84483ea7dda70828ec,
+    type: 3}
+  m_PrefabInstance: {fileID: 2359711122858188467}
+  m_PrefabAsset: {fileID: 0}

UOP1_Project/Assets/Prefabs/Nature/Trees/TreeBig.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!136 &2688065103303381318
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3985924782578800889}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 1.3
+  m_Height: 6.41
+  m_Direction: 1
+  m_Center: {x: 0.25, y: 1.83, z: 0}
+--- !u!135 &6407317570148378413
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3985924782578800889}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 2.15
+  m_Center: {x: 0.19, y: 0, z: 0}
+--- !u!1 &7410546550891089040
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 736270486309377558}
+  - component: {fileID: 5957174725726031327}
+  - component: {fileID: 6239691750743247801}
+  - component: {fileID: 287855975843352950}
+  m_Layer: 13
+  m_Name: Leaves
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &736270486309377558
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7410546550891089040}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.06, y: 5.79, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4331066273685914179}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &5957174725726031327
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7410546550891089040}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 1.26
+  m_Height: 7.17
+  m_Direction: 0
+  m_Center: {x: 0, y: 0, z: -0.19}
+--- !u!136 &6239691750743247801
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7410546550891089040}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 1.26
+  m_Height: 7.17
+  m_Direction: 0
+  m_Center: {x: 0, y: 0, z: -2.69}
+--- !u!136 &287855975843352950
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7410546550891089040}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 1.26
+  m_Height: 7.17
+  m_Direction: 0
+  m_Center: {x: 0, y: 0, z: 2.11}
 --- !u!1001 &4292406161015317928
 PrefabInstance:
   m_ObjectHideFlags: 0
       propertyPath: m_StaticEditorFlags
       value: 123
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: ad449e335a49648d592056fd8b67a926,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+--- !u!1 &3985924782578800889 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: ad449e335a49648d592056fd8b67a926,
+    type: 3}
+  m_PrefabInstance: {fileID: 4292406161015317928}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &4331066273685914179 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ad449e335a49648d592056fd8b67a926,
+    type: 3}
+  m_PrefabInstance: {fileID: 4292406161015317928}
+  m_PrefabAsset: {fileID: 0}

UOP1_Project/Assets/Prefabs/Nature/Trees/Tree_Flat.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3013778605057033789
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2008671436872607390}
+  - component: {fileID: 7645374413127756968}
+  m_Layer: 13
+  m_Name: Leaves
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2008671436872607390
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3013778605057033789}
+  m_LocalRotation: {x: -0, y: -0.34964705, z: -0, w: 0.93688154}
+  m_LocalPosition: {x: 1.66, y: 3.81, z: 1.03}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4331684663147366858}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: -40.931004, z: 0}
+--- !u!136 &7645374413127756968
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3013778605057033789}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.63
+  m_Height: 3.23
+  m_Direction: 0
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!136 &6240547564398072750
 CapsuleCollider:
   m_ObjectHideFlags: 0
   m_Radius: 0.46
   m_Height: 6.24
   m_Direction: 1
-  m_Center: {x: -0.03, y: 3.042519, z: -0.015630126}
+  m_Center: {x: -0.03, y: 2.42, z: -0.015630126}
+--- !u!1 &7636967023563285346
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 928237527671357369}
+  - component: {fileID: 4498040627373945602}
+  m_Layer: 13
+  m_Name: Leaves (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &928237527671357369
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7636967023563285346}
+  m_LocalRotation: {x: -0, y: 0.11348279, z: -0, w: 0.99354}
+  m_LocalPosition: {x: -0.89, y: 5.25, z: -0.57}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4331684663147366858}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 13.032001, z: 0}
+--- !u!136 &4498040627373945602
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7636967023563285346}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 1.12
+  m_Height: 5.5
+  m_Direction: 0
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &4294047267957337633
 PrefabInstance:
   m_ObjectHideFlags: 0
     m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 5a7f9fabb0c51e946ab0cfc2cd5b8151,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 5a7f9fabb0c51e946ab0cfc2cd5b8151,
         type: 3}
       propertyPath: m_LocalPosition.x
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 5a7f9fabb0c51e946ab0cfc2cd5b8151,
         type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 5a7f9fabb0c51e946ab0cfc2cd5b8151,
+        type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 5a7f9fabb0c51e946ab0cfc2cd5b8151,
         type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 5a7f9fabb0c51e946ab0cfc2cd5b8151,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 5a7f9fabb0c51e946ab0cfc2cd5b8151,
-        type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: 6d6bf88987b55324dbe11350f2b8a69a, type: 2}
+    - target: {fileID: -5754084199372789682, guid: 5a7f9fabb0c51e946ab0cfc2cd5b8151,
+        type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 4300000, guid: 4ae7a98c2fb8b8843b17095a410105a4, type: 2}
     - target: {fileID: 919132149155446097, guid: 5a7f9fabb0c51e946ab0cfc2cd5b8151,
         type: 3}
       propertyPath: m_Name
         type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 123
+      propertyPath: m_Layer
+      value: 11
-      propertyPath: m_Layer
-      value: 11
+      propertyPath: m_StaticEditorFlags
+      value: 123
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5a7f9fabb0c51e946ab0cfc2cd5b8151, type: 3}
     type: 3}
   m_PrefabInstance: {fileID: 4294047267957337633}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &4331684663147366858 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5a7f9fabb0c51e946ab0cfc2cd5b8151,
+    type: 3}
+  m_PrefabInstance: {fileID: 4294047267957337633}
+  m_PrefabAsset: {fileID: 0}

UOP1_Project/Assets/Prefabs/Nature/Trees/Tree_Mushroom.prefab

   m_IsTrigger: 0
   m_Enabled: 1
   m_Radius: 0.31
-  m_Height: 3
+  m_Height: 3.46
-  m_Center: {x: 0.06454709, y: 1.4155546, z: 0.036566973}
+  m_Center: {x: 0, y: 1.26, z: 0}
+--- !u!1 &9201311995933557795
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6319162084336413156}
+  - component: {fileID: 7369160983686299425}
+  m_Layer: 13
+  m_Name: Leaves
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6319162084336413156
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9201311995933557795}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 3.26, z: -0.05}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8271441551491845698}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &7369160983686299425
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9201311995933557795}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 2.09
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &8448938963756820905
 PrefabInstance:
   m_ObjectHideFlags: 0
     type: 3}
   m_PrefabInstance: {fileID: 8448938963756820905}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &8271441551491845698 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 23d0d9d63e18d7b49b634970d337728e,
+    type: 3}
+  m_PrefabInstance: {fileID: 8448938963756820905}
+  m_PrefabAsset: {fileID: 0}

UOP1_Project/Assets/Prefabs/Nature/Trees/Tree_Swirl.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4056575592252912706
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8392565229279509421}
+  - component: {fileID: 6594023889645658588}
+  m_Layer: 13
+  m_Name: Leaves (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8392565229279509421
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4056575592252912706}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.14, y: 1.39, z: 1.06}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5915946319903924327}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &6594023889645658588
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4056575592252912706}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.44
+  m_Height: 1.18
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &5859954024079497084
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4246285384286348339}
+  - component: {fileID: 6423932013603045291}
+  m_Layer: 13
+  m_Name: Leaves
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4246285384286348339
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5859954024079497084}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.43, y: 3.46, z: -0.24}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5915946319903924327}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &6423932013603045291
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5859954024079497084}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 1.56
+  m_Height: 4.3
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!136 &4770059545182144234
 CapsuleCollider:
   m_ObjectHideFlags: 0
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  m_Radius: 0.53
-  m_Height: 4.707387
+  m_Radius: 0.16
+  m_Height: 3.1
-  m_Center: {x: -0, y: 2.2526865, z: -0.03677708}
+  m_Center: {x: -0, y: 1.22, z: 0}
 --- !u!1001 &6166290628584556428
 PrefabInstance:
   m_ObjectHideFlags: 0
     type: 3}
   m_PrefabInstance: {fileID: 6166290628584556428}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &5915946319903924327 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 19a41c41dbe106b438436bf1ac788e53,
+    type: 3}
+  m_PrefabInstance: {fileID: 6166290628584556428}
+  m_PrefabAsset: {fileID: 0}

UOP1_Project/Assets/Prefabs/Props/Collectible Item.prefab

   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2126586097156616357}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.05, z: -3.708}
+  m_LocalPosition: {x: 0, y: 0.5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2126586096464319708}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2126586097156616357}
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Script: {fileID: 11500000, guid: 49f5b1dd052cb44c895e54e5b56c5cfa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  currentItem: {fileID: 11400000, guid: 8aff2c01ad67b48d0a0627754d613415, type: 2}
-  itemImages:
+  _currentItem: {fileID: 11400000, guid: 8aff2c01ad67b48d0a0627754d613415, type: 2}
+  _itemImages:
   - {fileID: 2126586096464319711}
   - {fileID: 2126586096979771816}
   - {fileID: 2126586097710057018}

UOP1_Project/Assets/Prefabs/Props/FryingPan.prefab

   - component: {fileID: 3516024816309364338}
   - component: {fileID: 532751197952338391}
   - component: {fileID: 2341943470874959133}
+  - component: {fileID: 5014624704208733057}
+  - component: {fileID: 5113541021563803720}
+  - component: {fileID: 8314518154369723250}
   m_Layer: 0
   m_Name: FryingPan
   m_TagString: Untagged
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+--- !u!65 &5014624704208733057
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4287635054787804360}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.5486597, y: 0.13224906, z: 0.54617786}
+  m_Center: {x: 0, y: -0.07155061, z: 0.5646882}
+--- !u!54 &5113541021563803720
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4287635054787804360}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 0
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!114 &8314518154369723250
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4287635054787804360}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 37d3da059d8e76b439a7bd852dfb1f1f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _attackStrength: 5

UOP1_Project/Assets/Prefabs/Props/PotOverFire.prefab

   serializedVersion: 2
   m_Size: {x: 0.40427768, y: 1.4107802, z: 1.6053772}
   m_Center: {x: -0.0019025655, y: 0.65265596, z: 0.010700406}
+--- !u!114 &3281708333923348028
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6714925499130446629}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 54f92f965dbe44449b252b814ddc7137, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _audioCue: {fileID: 11400000, guid: 7d37fa2008a49c94caaedbb075cc665c, type: 2}
+  _playOnStart: 1
+  _audioCueEventChannel: {fileID: 11400000, guid: c3c796b7c31ad3647a3fbae42e74764e,
+    type: 2}
+  _audioConfiguration: {fileID: 11400000, guid: 8d4217c8fabf9824490196f34baf326a,
+    type: 2}
 --- !u!1001 &5904602823473970804
 PrefabInstance:
   m_ObjectHideFlags: 0
     - target: {fileID: -8679921383154817045, guid: b0825167a36e54267b89182911d1164a,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -12.29
+      value: -8.53
-      value: 0
+      value: 0.01
-      value: -4.82
+      value: -3.16
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: b0825167a36e54267b89182911d1164a,
         type: 3}
     - target: {fileID: -8679921383154817045, guid: b0825167a36e54267b89182911d1164a,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.9728086
+      value: 0.3771686
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: b0825167a36e54267b89182911d1164a,
         type: 3}
     - target: {fileID: -8679921383154817045, guid: b0825167a36e54267b89182911d1164a,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.23161076
+      value: 0.92614466
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: b0825167a36e54267b89182911d1164a,
         type: 3}
     - target: {fileID: -8679921383154817045, guid: b0825167a36e54267b89182911d1164a,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 153.216
+      value: 44.317
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: b0825167a36e54267b89182911d1164a,
         type: 3}
     - target: {fileID: 919132149155446097, guid: b0825167a36e54267b89182911d1164a,
         type: 3}
       propertyPath: m_Name
-      value: PotOverFire (1)
+      value: PotOverFire
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: b0825167a36e54267b89182911d1164a,
         type: 3}

UOP1_Project/Assets/Scenes/Examples/InteractionExample.unity

     - target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.03563515
+      value: 0.03581318
-      value: -0.009175836
+      value: -0.008454343
-      value: 0.24919106
+      value: 0.22959732
+      objectReference: {fileID: 0}
+    - target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.97258985
-      value: 0.035795752
+      value: 0.03581318
-      value: -0.0085278535
+      value: -0.008454343
-      value: 0.23159355
+      value: 0.22959732
+      objectReference: {fileID: 0}
+    - target: {fileID: 2808035858438402709, guid: 45632f0a227c860489bcba0eb1f4ec3e,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.97258985
-      value: 0.2295973
+      value: 0.22959732
-      value: 0.03581321
+      value: 0.03581318
-      value: -0.00845435
+      value: -0.008454343
+      objectReference: {fileID: 0}
+    - target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.97258985
       objectReference: {fileID: 0}
     - target: {fileID: 8745341640208226293, guid: 45632f0a227c860489bcba0eb1f4ec3e,
         type: 3}
     - target: {fileID: 8745341641394998850, guid: 45632f0a227c860489bcba0eb1f4ec3e,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -0.73545265
+      value: -0.88254315
-      value: -9.9729185
+      value: -11.967503
-      value: 0.24919108
+      value: 0.22959733
-      value: 0.03563516
+      value: 0.03581318
-      value: -0.009175838
+      value: -0.008454344
-      value: -0.73545265
+      value: -0.88254315
-      value: -9.9729185
+      value: -11.967503
-      value: 0.967755
+      value: 0.97258985
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3}

UOP1_Project/Assets/Scenes/Initialization.unity

     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 1
+  m_UseShadowmask: 0
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!1 &363619424
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 363619425}
-  - component: {fileID: 363619427}
-  - component: {fileID: 363619426}
-  m_Layer: 5
-  m_Name: LoadingInterface
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &363619425
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 363619424}
-  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: 841012434}
-  m_Father: {fileID: 1387982343}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &363619426
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 363619424}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Texture: {fileID: 0}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
---- !u!222 &363619427
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 363619424}
-  m_CullTransparentMesh: 0
---- !u!1 &447650313
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 447650316}
-  - component: {fileID: 447650314}
-  m_Layer: 0
-  m_Name: GameExitListener
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &447650314
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 447650313}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0ba826e9d52310a43b98dffc289c71b2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _channel: {fileID: 11400000, guid: c499d87f35465124f8fb2751b150430d, type: 2}
-  OnEventRaised:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 1242953036}
-        m_MethodName: ExitGame
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
---- !u!4 &447650316
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 447650313}
-  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: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &610459580
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 610459581}
-  - component: {fileID: 610459582}
-  m_Layer: 0
-  m_Name: AudioManager
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &610459581
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 610459580}
-  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: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &610459582
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 610459580}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7dcf69f82f8783049ab749ba8f527f89, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _factory: {fileID: 11400000, guid: 0f82d558a11c88d458625502b6708251, type: 2}
-  _pool: {fileID: 11400000, guid: 4b2ed98efabac4446a90c61932acf933, type: 2}
-  _initialSize: 10
-  _SFXEventChannel: {fileID: 11400000, guid: c3c796b7c31ad3647a3fbae42e74764e, type: 2}
-  _musicEventChannel: {fileID: 11400000, guid: 51854f522e1d88442a90b878b27ea839, type: 2}
-  audioMixer: {fileID: 24100000, guid: 548a7f001ca6d3d4cb67c8edf84f62a3, type: 2}
-  _masterVolume: 1
-  _musicVolume: 1
-  _sfxVolume: 1
---- !u!1 &841012433
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 841012434}
-  - component: {fileID: 841012436}
-  - component: {fileID: 841012435}
-  m_Layer: 5
-  m_Name: ProgressBar
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &841012434
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 841012433}
-  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: []
-  m_Father: {fileID: 363619425}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 40}
-  m_Pivot: {x: 0.5, y: 0}
---- !u!114 &841012435
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 841012433}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.6193977, g: 0.8207547, b: 0, a: 1}
-  m_RaycastTarget: 1
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 6b74140a78e7b334e8dae0ca62472463, type: 3}
-  m_Type: 3
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 0
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &841012436
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 841012433}
-  m_CullTransparentMesh: 0
---- !u!1 &1242953035
+--- !u!1 &1266309719
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_Component:
-  - component: {fileID: 1242953037}
-  - component: {fileID: 1242953036}
+  - component: {fileID: 1266309721}
+  - component: {fileID: 1266309720}
-  m_Name: LocationLoader
+  m_Name: Initializer
---- !u!114 &1242953036
+--- !u!114 &1266309720
-  m_GameObject: {fileID: 1242953035}
+  m_GameObject: {fileID: 1266309719}
-  m_Script: {fileID: 11500000, guid: b6b928d1d6f59854499ed82bdeef2305, type: 3}
+  m_Script: {fileID: 11500000, guid: 43bf3a70578af0044a7af79dd1c44ea6, type: 3}
-  _initializationScene: {fileID: 11400000, guid: c2119785ce96367428081d6eee0d932b,
+  _PersistentManagersScene: {fileID: 11400000, guid: c2119785ce96367428081d6eee0d932b,
-  _mainMenuScenes:
+  _MenuToLoad:
-  _loadingInterface: {fileID: 363619424}
-  _loadingProgressBar: {fileID: 841012435}
-  _loadEventChannel: {fileID: 11400000, guid: 00e3063edc5902e40832ea618644c597, type: 2}
---- !u!4 &1242953037
+  _showLoadScreen: 0
+  _MenuLoadChannel: {fileID: 11400000, guid: 33cec85652903d245b99985f9cec9841, type: 2}
+--- !u!4 &1266309721
-  m_GameObject: {fileID: 1242953035}
+  m_GameObject: {fileID: 1266309719}
-  m_LocalPosition: {x: 10.11, y: 5.3500004, z: 29.12}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1387982339
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1387982343}
-  - component: {fileID: 1387982342}
-  - component: {fileID: 1387982341}
-  - component: {fileID: 1387982340}
-  m_Layer: 5
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1387982340
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1387982339}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &1387982341
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1387982339}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 1
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 1920, y: 1080}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 1
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
---- !u!223 &1387982342
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1387982339}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 0
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!224 &1387982343
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1387982339}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_Children:
-  - {fileID: 363619425}
-  m_Father: {fileID: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}

UOP1_Project/Assets/Scenes/Locations/Forest.unity

       objectReference: {fileID: 0}
     - target: {fileID: 2125786285293829334, guid: e978d53d440e0814086759404585ac32,
         type: 3}
+      propertyPath: _spawnLocations.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2125786285293829334, guid: e978d53d440e0814086759404585ac32,
+        type: 3}
+    - target: {fileID: 2125786285293829334, guid: e978d53d440e0814086759404585ac32,
+        type: 3}
+      propertyPath: _spawnLocations.Array.data[1]
+      value: 
+      objectReference: {fileID: 0}
     - target: {fileID: 2125786285293829335, guid: e978d53d440e0814086759404585ac32,
         type: 3}
       propertyPath: m_LocalPosition.x
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2125786286893897213, guid: e978d53d440e0814086759404585ac32,
+        type: 3}
+      propertyPath: m_TagString
+      value: SpawnLocation
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e978d53d440e0814086759404585ac32, type: 3}
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: e6df0864f2dccac4f93025eba0cd643d, type: 2}
+  - {fileID: 2100000, guid: 5f5129265f34a9b409029d1e565f1895, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
     - target: {fileID: 40564194958535835, guid: 54d1f8b93400ea64d97c276fab375df3,
         type: 3}
       propertyPath: m_Name
-      value: EditorInitializer
+      value: LocationEditorInitializer
       objectReference: {fileID: 0}
     - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
         type: 3}
   _locationsToLoad:
   - {fileID: 11400000, guid: 2f386bbc670c05145834a0f9c7d55798, type: 2}
   _showLoadScreen: 0
+  _pathTaken: {fileID: 11400000, guid: a9ec09853cba047a8a58f5881053cfc6, type: 2}
+  _exitPath: {fileID: 11400000, guid: 050fcf2d8a1044670b51fc2358167588, type: 2}
   _locationExitLoadChannel: {fileID: 11400000, guid: 00e3063edc5902e40832ea618644c597,
     type: 2}
 --- !u!65 &1406036542
     type: 3}
   m_PrefabInstance: {fileID: 1526974243}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1596812572
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 5540501665159811849, guid: 3b5498e27a52ce243b2ce35ba305d864,
+        type: 3}
+      propertyPath: m_Name
+      value: EntranceFromBeach
+      objectReference: {fileID: 0}
+    - target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3b5498e27a52ce243b2ce35ba305d864, type: 3}
+--- !u!1 &1596812573 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5540501665159811849, guid: 3b5498e27a52ce243b2ce35ba305d864,
+    type: 3}
+  m_PrefabInstance: {fileID: 1596812572}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1596812574
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1596812573}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f7b70693d4d664e7bb07286b6d0d981d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _entrancePath: {fileID: 11400000, guid: 050fcf2d8a1044670b51fc2358167588, type: 2}
 --- !u!1001 &1685989698
 PrefabInstance:
   m_ObjectHideFlags: 0
     - target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.03563515
+      value: 0.03581318
-      value: -0.009175836
+      value: -0.008454343
-      value: 0.24919106
+      value: 0.22959732
+      objectReference: {fileID: 0}
+    - target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.97258985
-      value: 0.035795752
+      value: 0.03581318
-      value: -0.0085278535
+      value: -0.008454343
-      value: 0.23159355
+      value: 0.22959732
+      objectReference: {fileID: 0}
+    - target: {fileID: 2808035858438402709, guid: 45632f0a227c860489bcba0eb1f4ec3e,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.97258985
-      value: 0.2295973
+      value: 0.22959732
-      value: 0.03581321
+      value: 0.03581318
       objectReference: {fileID: 0}
     - target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e,
         type: 3}
     - target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.00845435
+      value: -0.008454343
       objectReference: {fileID: 0}
     - target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e,
         type: 3}
     - target: {fileID: 8745341641394998850, guid: 45632f0a227c860489bcba0eb1f4ec3e,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -0.73545265
+      value: -0.88254315
-      value: -9.9729185
+      value: -11.967503
-      value: 0.1
+      value: 0.01
       objectReference: {fileID: 0}
     - target: {fileID: 8745341642014614481, guid: 45632f0a227c860489bcba0eb1f4ec3e,
         type: 3}
     - target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.24919108
+      value: 0.22959733
-      value: 0.03563516
+      value: 0.03581318
-      value: -0.009175838
+      value: -0.008454344
-      value: 0.967755
+      value: 0.97258985
-      value: -0.73545265
+      value: -0.88254315
-      value: 6
+      value: 7
-      value: -9.9729185
+      value: -11.967503
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 45632f0a227c860489bcba0eb1f4ec3e, type: 3}

UOP1_Project/Assets/Scenes/Menus/MainMenu.unity

     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!1001 &107902538
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 40564194958535835, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_Name
-      value: EditorInitializer
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 54d1f8b93400ea64d97c276fab375df3, type: 3}
 --- !u!1 &384578945
 GameObject:
   m_ObjectHideFlags: 0
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 11400000, guid: c499d87f35465124f8fb2751b150430d, type: 2}
-        m_MethodName: Raise
+      - m_Target: {fileID: 11400000, guid: d570e16f713770a4a94310999866e0e0, type: 2}
+        m_MethodName: RaiseEvent
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 403475996}
   m_CullTransparentMesh: 0
+--- !u!1001 &599522224
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 40564194958535835, guid: 0fa3e82c4006e714e8023cbf85cc999e,
+        type: 3}
+      propertyPath: m_Name
+      value: MenuEditorInitializer
+      objectReference: {fileID: 0}
+    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 40564194958535909, guid: 0fa3e82c4006e714e8023cbf85cc999e,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0fa3e82c4006e714e8023cbf85cc999e, type: 3}
 --- !u!1 &622178817
 GameObject:
   m_ObjectHideFlags: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -39.3}
+  m_AnchoredPosition: {x: 0, y: -39.30005}
   m_SizeDelta: {x: 0, y: 441.28995}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &1228641981

UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/SFX_Fire_looping.asset

   m_EditorClassIdentifier: 
   looping: 1
   _audioClipGroups:
-  - sequenceMode: 0
+  - sequenceMode: 2
-    - {fileID: 8300000, guid: 9ecce15a7e9fa5e4eb19a867283bfe70, type: 3}
+    - {fileID: 8300000, guid: f49cdea4e85b04641945385e5107c1c1, type: 3}

UOP1_Project/Assets/ScriptableObjects/SceneData/Initialization.asset

   m_Script: {fileID: 11500000, guid: 7eabf0d1b44567046bb98dff8a1cd7ac, type: 3}
   m_Name: Initialization
   m_EditorClassIdentifier: 
-  sceneName: Initialization
-  shortDescription: 
+  sceneAsset: {fileID: 102900000, guid: e8df4c5a458acc5489b2865e6b789224, type: 3}
+  scenePath: Assets/Scenes/Initialization.unity
+  shortDescription: The scene from where the game starts and it is responsible for
+    loading PersistentManagers scene and raises the event to load the main menu.
-  musicVolume: 0

UOP1_Project/Assets/ScriptableObjects/SceneData/Initialization.asset.meta

 fileFormatVersion: 2
-guid: c2119785ce96367428081d6eee0d932b
+guid: abfc6b5ef9fe68048bae8ffe84afa7a0
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 0

UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Beach.asset

   m_Script: {fileID: 11500000, guid: 8db63739a6674d74e8e232347422172f, type: 3}
   m_Name: Beach
   m_EditorClassIdentifier: 
-  sceneName: Beach
+  sceneAsset: {fileID: 102900000, guid: dfaf60263d5c5dc4e80e2793f4328b32, type: 3}
+  scenePath: Assets/Scenes/Locations/Beach.unity
   shortDescription: The level to find X
   music: {fileID: 0}
   locationName:

UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/Forest.asset

   m_Script: {fileID: 11500000, guid: 8db63739a6674d74e8e232347422172f, type: 3}
   m_Name: Forest
   m_EditorClassIdentifier: 
-  sceneName: Forest
+  sceneAsset: {fileID: 102900000, guid: 3a816f06c17361b4398583570bcbf8eb, type: 3}
+  scenePath: Assets/Scenes/Locations/Forest.unity
   shortDescription: Find Y
   music: {fileID: 0}
   locationName:

UOP1_Project/Assets/ScriptableObjects/SceneData/Locations/TestingGround.asset

   m_Script: {fileID: 11500000, guid: 8db63739a6674d74e8e232347422172f, type: 3}
   m_Name: TestingGround
   m_EditorClassIdentifier: 
-  sceneName: TestingGround
+  sceneAsset: {fileID: 102900000, guid: 1e57caa7d7ed5e24a88cb3b5c309cc65, type: 3}
+  scenePath: Assets/Scenes/TestingGround.unity
   shortDescription: 
   music: {fileID: 0}
   locationName:

UOP1_Project/Assets/ScriptableObjects/SceneData/Menus/MainMenu.asset

   m_Script: {fileID: 11500000, guid: 3546e1f9ebb6f054fb677b86f543542b, type: 3}
   m_Name: MainMenu
   m_EditorClassIdentifier: 
-  sceneName: MainMenu
+  sceneAsset: {fileID: 102900000, guid: df490f8a21305b549b67b8301af79724, type: 3}
+  scenePath: Assets/Scenes/Menus/MainMenu.unity
-  musicVolume: 0
-  type: 0
+  menuType: 0

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/PlaySound_PickUp.asset

   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 7fe1333f4a744134ebafe667cc9f1e1a, type: 3}
-  m_Name: PlayPickUpSound
+  m_Name: PlaySound_PickUp
   m_EditorClassIdentifier: 
   audioCue: {fileID: 11400000, guid: 802be3a8bc6d3064e84c781cad59cb68, type: 2}
   audioCueEventChannel: {fileID: 11400000, guid: c3c796b7c31ad3647a3fbae42e74764e,

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Actions/PlaySound_Jump.asset

   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 7fe1333f4a744134ebafe667cc9f1e1a, type: 3}
-  m_Name: PlayJumpSound
+  m_Name: PlaySound_Jump
   m_EditorClassIdentifier: 
   audioCue: {fileID: 11400000, guid: 5977d168e99dd5443a497ed77990980f, type: 2}
   audioCueEventChannel: {fileID: 11400000, guid: c3c796b7c31ad3647a3fbae42e74764e,

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset

   m_EditorClassIdentifier: 
   _transitions:
   - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
-    ToState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
+    ToState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: c5090b215e4f1594f9d1ef6680cd15bb, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
+    ToState: {fileID: 11400000, guid: 0aa906b71b1b4504d950f5ee8e1f06e8, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
+    ToState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: c5090b215e4f1594f9d1ef6680cd15bb, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
+    ToState: {fileID: 11400000, guid: 0aa906b71b1b4504d950f5ee8e1f06e8, type: 2}
-      Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
+      Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
       Operator: 0
   - FromState: {fileID: 11400000, guid: 0aa906b71b1b4504d950f5ee8e1f06e8, type: 2}
     ToState: {fileID: 11400000, guid: c57ed1dc57a890943b2648ca8a581075, type: 2}
       Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
       Operator: 0
   - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
-    ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
+    ToState: {fileID: 11400000, guid: c57ed1dc57a890943b2648ca8a581075, type: 2}
-      Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
+      Condition: {fileID: 11400000, guid: c7258bdb2558a214f916c8b5b3c0fa1f, type: 2}
-    ToState: {fileID: 11400000, guid: 0aa906b71b1b4504d950f5ee8e1f06e8, type: 2}
+    ToState: {fileID: 11400000, guid: bda8bfafdf35e3e4092bb96279d4894c, type: 2}
-      Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
+      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
+  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
+    ToState: {fileID: 11400000, guid: c57ed1dc57a890943b2648ca8a581075, type: 2}
+    Conditions:
-      Condition: {fileID: 11400000, guid: c5090b215e4f1594f9d1ef6680cd15bb, type: 2}
+      Condition: {fileID: 11400000, guid: c7258bdb2558a214f916c8b5b3c0fa1f, type: 2}
-  - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
-    ToState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
+  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
+    ToState: {fileID: 11400000, guid: bda8bfafdf35e3e4092bb96279d4894c, type: 2}
+      Condition: {fileID: 11400000, guid: ac445a33a0d072a4b96458c8ea343d49, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
+    ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
+    Conditions:
+    - ExpectedResult: 1
-  - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
-    ToState: {fileID: 11400000, guid: c57ed1dc57a890943b2648ca8a581075, type: 2}
+  - FromState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
+    ToState: {fileID: 11400000, guid: 0aa906b71b1b4504d950f5ee8e1f06e8, type: 2}
-      Condition: {fileID: 11400000, guid: c7258bdb2558a214f916c8b5b3c0fa1f, type: 2}
+      Condition: {fileID: 11400000, guid: ddd205b8cff23bc48b47aa5538d549be, type: 2}
-  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
-    ToState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
+    ToState: {fileID: 11400000, guid: ecc888784b4f5fd4db9430a844819e2b, type: 2}
+      Operator: 0
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: c7258bdb2558a214f916c8b5b3c0fa1f, type: 2}
-    ToState: {fileID: 11400000, guid: 0aa906b71b1b4504d950f5ee8e1f06e8, type: 2}
+    ToState: {fileID: 11400000, guid: 78675b2bf031c3f4a9c28dda969298e2, type: 2}
-      Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
+      Condition: {fileID: 11400000, guid: 9c4a0f8b97247c643aef1b1284f21ebc, type: 2}
-    - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: c5090b215e4f1594f9d1ef6680cd15bb, type: 2}
+  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
+    ToState: {fileID: 11400000, guid: ff92a93d8a8694247b507d811c88e402, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: b33fba8c83df19f4ead430fbcc728687, type: 2}
-    ToState: {fileID: 11400000, guid: c57ed1dc57a890943b2648ca8a581075, type: 2}
+    ToState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
-    - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: c7258bdb2558a214f916c8b5b3c0fa1f, type: 2}
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
-  - FromState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
+  - FromState: {fileID: 11400000, guid: ecc888784b4f5fd4db9430a844819e2b, type: 2}
-  - FromState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
+  - FromState: {fileID: 11400000, guid: ecc888784b4f5fd4db9430a844819e2b, type: 2}
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: ecc888784b4f5fd4db9430a844819e2b, type: 2}
+    ToState: {fileID: 11400000, guid: c57ed1dc57a890943b2648ca8a581075, type: 2}
+    Conditions:
-      Condition: {fileID: 11400000, guid: 620f4efd93744084a8ac9ba272f093dc, type: 2}
+      Condition: {fileID: 11400000, guid: b5cf328bcf17e41469fda079c80b3c84, type: 2}
-  - FromState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
-    ToState: {fileID: 11400000, guid: c57ed1dc57a890943b2648ca8a581075, type: 2}
-    Conditions:
+  - FromState: {fileID: 11400000, guid: ff92a93d8a8694247b507d811c88e402, type: 2}
+    ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
+    Conditions:
-      Condition: {fileID: 11400000, guid: ddd205b8cff23bc48b47aa5538d549be, type: 2}
+      Condition: {fileID: 11400000, guid: 2bfa25e0277246b4ba0ea0117c40c18b, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 78675b2bf031c3f4a9c28dda969298e2, type: 2}
+    ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 0222b854529fb8f418abda000d3b9b32, type: 2}
-  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
-    ToState: {fileID: 11400000, guid: ff92a93d8a8694247b507d811c88e402, type: 2}
+  - FromState: {fileID: 11400000, guid: bda8bfafdf35e3e4092bb96279d4894c, type: 2}
+    ToState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
-      Condition: {fileID: 11400000, guid: b33fba8c83df19f4ead430fbcc728687, type: 2}
+      Condition: {fileID: 11400000, guid: 373ff606aeb23834eb964bdf9a6f6e3c, type: 2}
+      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
-  - FromState: {fileID: 11400000, guid: ff92a93d8a8694247b507d811c88e402, type: 2}
+  - FromState: {fileID: 11400000, guid: bda8bfafdf35e3e4092bb96279d4894c, type: 2}
-      Condition: {fileID: 11400000, guid: 2bfa25e0277246b4ba0ea0117c40c18b, type: 2}
+      Condition: {fileID: 11400000, guid: 373ff606aeb23834eb964bdf9a6f6e3c, type: 2}
-  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
-  - FromState: {fileID: 11400000, guid: 78675b2bf031c3f4a9c28dda969298e2, type: 2}
+  - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
+    ToState: {fileID: 11400000, guid: ff92a93d8a8694247b507d811c88e402, type: 2}
+    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: b33fba8c83df19f4ead430fbcc728687, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: a79b812272ab8314aa305b39f9a2740a, type: 2}
+      Operator: 0
+  - FromState: {fileID: 11400000, guid: ecc888784b4f5fd4db9430a844819e2b, type: 2}
+    ToState: {fileID: 11400000, guid: 4c2c0dc4f7ee62b4d95b20ac3dce281e, type: 2}
+    Conditions:
-      Condition: {fileID: 11400000, guid: 0222b854529fb8f418abda000d3b9b32, type: 2}
+      Condition: {fileID: 11400000, guid: b5cf328bcf17e41469fda079c80b3c84, type: 2}
       Operator: 0

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Idle.asset

   m_EditorClassIdentifier: 
   _actions:
   - {fileID: 11400000, guid: c0d0573a78e4c6245ab9676e7af35880, type: 2}
+  - {fileID: 11400000, guid: bcf4edc006209d54da9cd4c18329bb43, type: 2}
   - {fileID: 11400000, guid: bd85c54d16eb60c4c99504f1679af851, type: 2}
   - {fileID: 11400000, guid: 47d9da417e68970419335f80f4395239, type: 2}

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpAscending.asset

   _actions:
   - {fileID: 11400000, guid: 4984500e131bbe34594c4ab0e2c409f3, type: 2}
   - {fileID: 11400000, guid: 00abdcc5c2b7e3d4d8855f1a84801fae, type: 2}
-  - {fileID: 11400000, guid: f1f9b67c2b957d74dae6555b3598ae49, type: 2}
+  - {fileID: 11400000, guid: b099300f484e1344487cc666f75825cc, type: 2}
   - {fileID: 11400000, guid: 5d9c1bbe4ffcb2146a540998d17b665d, type: 2}
   - {fileID: 11400000, guid: 47d9da417e68970419335f80f4395239, type: 2}
   - {fileID: 11400000, guid: 096d532f9a47f3145892efa1c4322e72, type: 2}

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/JumpDescending.asset

   m_Name: JumpDescending
   m_EditorClassIdentifier: 
   _actions:
-  - {fileID: 11400000, guid: f1f9b67c2b957d74dae6555b3598ae49, type: 2}
+  - {fileID: 11400000, guid: b099300f484e1344487cc666f75825cc, type: 2}
   - {fileID: 11400000, guid: 5d442cfcb78da8b418d6ae3e93e5748e, type: 2}
   - {fileID: 11400000, guid: 47d9da417e68970419335f80f4395239, type: 2}
   - {fileID: 11400000, guid: 096d532f9a47f3145892efa1c4322e72, type: 2}

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/PickUp.asset

   m_Name: PickUp
   m_EditorClassIdentifier: 
   _actions:
-  - {fileID: 11400000, guid: 671ae817f7a7f7840b24f748edf91bfe, type: 2}
   - {fileID: 11400000, guid: c59d2da85947b33468828f95284faec4, type: 2}

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Sliding.asset

   _actions:
   - {fileID: 11400000, guid: 99b804881a9d5744fb4784c30000c0b5, type: 2}
   - {fileID: 11400000, guid: c0d0573a78e4c6245ab9676e7af35880, type: 2}
-  - {fileID: 11400000, guid: 088f3e34793299349983d53aaf39e5e3, type: 2}
   - {fileID: 11400000, guid: 9e558dc250163db40a4e1f7241ee15c2, type: 2}
   - {fileID: 11400000, guid: 47d9da417e68970419335f80f4395239, type: 2}
   - {fileID: 11400000, guid: 4badb7afa3370ba4d8a229584c5c744f, type: 2}

UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/States/Walking.asset

   - {fileID: 11400000, guid: 096d532f9a47f3145892efa1c4322e72, type: 2}
   - {fileID: 11400000, guid: fa0ce5b895dcf17499819f0d6f2dce96, type: 2}
   - {fileID: 11400000, guid: 5aac41c53e47f1040a52303b2000ceb5, type: 2}
+  - {fileID: 11400000, guid: 74800142628360a42bb516b1e5c630e1, type: 2}

UOP1_Project/Assets/Scripts/Audio/AudioCue.cs

 	private void Start()
 	{
 		if (_playOnStart)
-			PlayAudioCue();
+			StartCoroutine(PlayDelayed());
+	}
+
+	private IEnumerator PlayDelayed()
+	{
+		yield return new WaitForSeconds(.1f);
+
+		PlayAudioCue();
 	}
 
 	public void PlayAudioCue()

UOP1_Project/Assets/Scripts/CameraManager.cs

 
 	private void OnCameraMove(Vector2 cameraMovement, bool isDeviceMouse)
 	{
-		Debug.Log(cameraMovement);
-
 		if (_cameraMovementLock)
 			return;
 

UOP1_Project/Assets/Scripts/Characters/Protagonist.cs

 	[SerializeField] private InputReader _inputReader = default;
 	public TransformAnchor gameplayCameraTransform;
 
+	[SerializeField] private VoidEventChannelSO _openInventoryChannel = default;
+
-	[HideInInspector] public bool jumpInput;
-	[HideInInspector] public bool extraActionInput;
-	[HideInInspector] public Vector3 movementInput; //Initial input coming from the Protagonist script
-	[HideInInspector] public Vector3 movementVector; //Final movement vector, manipulated by the StateMachine actions
-	[HideInInspector] public ControllerColliderHit lastHit;
-	[HideInInspector] public bool isRunning; // Used when using the keyboard to run, brings the normalised speed to 1
+	[NonSerialized] public bool jumpInput;
+	[NonSerialized] public bool extraActionInput;
+	[NonSerialized] public bool attackInput;
+	[NonSerialized] public Vector3 movementInput; //Initial input coming from the Protagonist script
+	[NonSerialized] public Vector3 movementVector; //Final movement vector, manipulated by the StateMachine actions
+	[NonSerialized] public ControllerColliderHit lastHit;
+	[NonSerialized] public bool isRunning; // Used when using the keyboard to run, brings the normalised speed to 1
+
+	public const float GRAVITY_MULTIPLIER = 5f;
+	public const float MAX_FALL_SPEED = -50f;
+	public const float MAX_RISE_SPEED = 100f;
+	public const float GRAVITY_COMEBACK_MULTIPLIER = .03f;
+	public const float GRAVITY_DIVIDER = .6f;
+	public const float AIR_RESISTANCE = 5f;
 
 	private void OnControllerColliderHit(ControllerColliderHit hit)
 	{
 		_inputReader.jumpEvent += OnJumpInitiated;
 		_inputReader.jumpCanceledEvent += OnJumpCanceled;
 		_inputReader.moveEvent += OnMove;
-		_inputReader.extraActionEvent += OnExtraAction;
+		_inputReader.openInventoryEvent += OnOpenInventory;
+		_inputReader.attackEvent += OnAttack;
 		//...
 	}
 
 		_inputReader.jumpEvent -= OnJumpInitiated;
 		_inputReader.jumpCanceledEvent -= OnJumpCanceled;
 		_inputReader.moveEvent -= OnMove;
-		_inputReader.extraActionEvent -= OnExtraAction;
+		_inputReader.openInventoryEvent -= OnOpenInventory;
 		_inputReader.startedRunning -= OnStartedRunning;
 		_inputReader.stoppedRunning -= OnStoppedRunning;
 		//...
 
 	private void OnStartedRunning() => isRunning = true;
 
-	// This handler is just used for debug, for now
-	private void OnExtraAction()
+	private void OnOpenInventory()
-		extraActionInput = true;
+		_openInventoryChannel.RaiseEvent();
+
+	private void OnAttack() => attackInput = true;
 }

UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/ApplyMovementVectorActionSO.cs

 	public override void OnUpdate()
 	{
 		_characterController.Move(_protagonistScript.movementVector * Time.deltaTime);
+		_protagonistScript.movementVector = _characterController.velocity;
 	}
 }

UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/AscendActionSO.cs

 
 	private float _verticalMovement;
 	private float _gravityContributionMultiplier;
-	private const float GRAVITY_COMEBACK_MULTIPLIER = .03f;
-	private const float GRAVITY_DIVIDER = .6f;
-	private const float GRAVITY_MULTIPLIER = 5f;
 	private AscendActionSO _originSO => (AscendActionSO)base.OriginSO; // The SO this StateAction spawned from
 
 	public override void Awake(StateMachine stateMachine)
 
 	public override void OnUpdate()
 	{
-		_gravityContributionMultiplier += GRAVITY_COMEBACK_MULTIPLIER;
-		_gravityContributionMultiplier *= GRAVITY_DIVIDER; //Reduce the gravity effect
-		_verticalMovement += Physics.gravity.y * GRAVITY_MULTIPLIER * Time.deltaTime * _gravityContributionMultiplier;
+		_gravityContributionMultiplier += Protagonist.GRAVITY_COMEBACK_MULTIPLIER;
+		_gravityContributionMultiplier *= Protagonist.GRAVITY_DIVIDER; //Reduce the gravity effect
+		_verticalMovement += Physics.gravity.y * Protagonist.GRAVITY_MULTIPLIER * Time.deltaTime * _gravityContributionMultiplier;
 		//Note that even if it's added, the above value is negative due to Physics.gravity.y
 
 		_protagonistScript.movementVector.y = _verticalMovement;

UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/DescendActionSO.cs

 	private Protagonist _protagonistScript;
 
 	private float _verticalMovement;
-	private const float GRAVITY_MULTIPLIER = 5f;
-	private const float MAX_FALL_SPEED = -50f;
-	private const float MAX_RISE_SPEED = 100f;
 
 	public override void Awake(StateMachine stateMachine)
 	{
 
 	public override void OnUpdate()
 	{
-		_verticalMovement += Physics.gravity.y * GRAVITY_MULTIPLIER * Time.deltaTime;
+		_verticalMovement += Physics.gravity.y * Protagonist.GRAVITY_MULTIPLIER * Time.deltaTime;
-		_verticalMovement = Mathf.Clamp(_verticalMovement, MAX_FALL_SPEED, MAX_RISE_SPEED);
+		_verticalMovement = Mathf.Clamp(_verticalMovement, Protagonist.MAX_FALL_SPEED, Protagonist.MAX_RISE_SPEED);
 
 		_protagonistScript.movementVector.y = _verticalMovement;
 	}

UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/PlayLandParticlesActionSO.cs

 {
 	//Component references
 	private DustParticlesController _dustController;
+	private Transform _transform;
+
+	private float _fallStartY = 0f;
+	private float _fallEndY = 0f;
+	private float _maxFallDistance = 4f; //Used to adjust particle emission intensity
+		_transform = stateMachine.transform;
+	}
+
+	public override void OnStateEnter()
+	{
+		_fallStartY = _transform.position.y;
+		_fallEndY = _transform.position.y;
+		float dY = Mathf.Abs(_fallStartY - _fallEndY);
+		float fallIntensity = Mathf.InverseLerp(0, _maxFallDistance, dY);
+
-			_dustController.PlayLandParticles();
+			_dustController.PlayLandParticles(fallIntensity);
 			t = Time.time;
 		}
 	}

UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/SlideActionSO.cs

 using UOP1.StateMachine.ScriptableObjects;
 
 [CreateAssetMenu(fileName = "SlideAction", menuName = "State Machines/Actions/Slide")]
-public class SlideActionSO : StateActionSO<SlideAction>
-{
-	[Tooltip("Sliding speed on the XZ plane.")]
-	public float slideSpeed = 10f;
-}
+public class SlideActionSO : StateActionSO<SlideAction> { }
-	//Component references
-	private SlideActionSO _originSO => (SlideActionSO)base.OriginSO; // The SO this StateAction spawned from
 
 	public override void Awake(StateMachine stateMachine)
 	{
 	public override void OnUpdate()
 	{
+		Vector3 velocity = _protagonistScript.movementVector;
+		float speed = -Physics.gravity.y * Protagonist.GRAVITY_MULTIPLIER * Time.deltaTime;
+
-		_protagonistScript.movementVector.x = (1f - hitNormal.y) * hitNormal.x * _originSO.slideSpeed;
-		_protagonistScript.movementVector.z = (1f - hitNormal.y) * hitNormal.z * _originSO.slideSpeed;
-	}
+		var vector = new Vector3(hitNormal.x, -hitNormal.y, hitNormal.z);
+		Vector3.OrthoNormalize(ref hitNormal, ref vector);
-	public override void OnStateExit()
-	{
-		_protagonistScript.movementVector = Vector3.zero;
+		// Cheap way to avoid overshooting the character, which causes it to move away from the slope
+		if (Mathf.Sign(vector.x) == Mathf.Sign(velocity.x))
+			vector.x *= 0.5f;
+		if (Mathf.Sign(vector.z) == Mathf.Sign(velocity.z))
+			vector.z *= 0.5f;
+
+		velocity += vector * speed;
+
+		_protagonistScript.movementVector = velocity;
 	}
 }

UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsMovingConditionSO.cs

 		movementVector.y = 0f;
 		return movementVector.sqrMagnitude > _originSO.treshold;
 	}
-
-	public override void OnStateExit()
-	{
-		_protagonistScript.movementVector = Vector3.zero;
-	}
 }

UOP1_Project/Assets/Scripts/Editor/ReplaceTool.cs

 	/// <param name="replaceObject">Prefab that will be instantiated in place of the objects to replace.</param>
 	internal static void ReplaceSelectedObjects(GameObject[] objectToReplace, GameObject replaceObject)
 	{
-		//Debug.Log("[Replace Tool] Replace process");
+		var newInstances = new int[objectToReplace.Length];
+
+
+
+			var sibling = go.transform.GetSiblingIndex();
+			newInstances[i] = inst.GetInstanceID();
+
-
+			inst.transform.SetSiblingIndex(sibling);
+
 			Undo.RegisterCreatedObjectUndo(inst, "Replacement creation.");
 			foreach (Transform child in go.transform)
 			{
 		}
-		//Debug.LogFormat("[Replace Tool] {0} objects replaced on scene with {1}", objectToReplace.Length, replaceObject.name);
+
+		Selection.instanceIDs = newInstances;
 	}
 }
 

UOP1_Project/Assets/Scripts/EditorTools/ClickToPlaceHelper.cs

-using UnityEngine;
+using UnityEngine;
+#if UNITY_EDITOR
+using UnityEditor;
+#endif
 
 [ExecuteInEditMode]
 [AddComponentMenu("UOP1/Tools/Click to Place")]
 	public void EndTargeting()
 	{
 		IsTargeting = false;
+#if UNITY_EDITOR
+		Undo.RecordObject(transform, $"{gameObject.name} moved by ClickToPlaceHelper");
+#endif
 		transform.position = _targetPosition;
 	}
 }

UOP1_Project/Assets/Scripts/Effects/DustParticlesController.cs

 	{
 		_landParticles.Play();
 	}
+
+	public void PlayLandParticles(float intensity)
+	{
+		// make sure intensity is always between 0 and 1
+		intensity = Mathf.Clamp01(intensity);
+
+		ParticleSystem.MainModule main = _landParticles.main;
+		ParticleSystem.MinMaxCurve origCurve = main.startSize; //save original curve to be assigned back to particle system
+		ParticleSystem.MinMaxCurve newCurve = main.startSize; //Make a new minMax curve and make our changes to the new copy
+
+		float minSize = newCurve.constantMin;
+		float maxSize = newCurve.constantMax;
+
+		// use the intensity to change the maximum size of the particle curve
+		newCurve.constantMax = Mathf.Lerp(minSize, maxSize, intensity);
+		main.startSize = newCurve;
+
+		_landParticles.Play();
+
+		// Put the original startSize back where you found it
+		StartCoroutine(ResetMinMaxCurve(_landParticles, origCurve));
+
+		// Note: We don't necessarily need to reset the curve, as it will be overridden
+	}
+
+	private IEnumerator ResetMinMaxCurve(ParticleSystem ps, ParticleSystem.MinMaxCurve curve)
+	{
+		while (ps.isEmitting)
+		{
+			yield return null;
+		}
+
+		ParticleSystem.MainModule main = ps.main;
+		main.startSize = curve;
+	}
 }

UOP1_Project/Assets/Scripts/Events/ScriptableObjects/BoolEventChannelSO.cs

 using UnityEngine;
 
 /// <summary>
-/// This class is used for Events that have one int argument.
-/// Example: An Achievement unlock event, where the int is the Achievement ID.
+/// This class is used for Events that have a bool argument.
+/// Example: An event to toggle a UI interface
 /// </summary>
 
 [CreateAssetMenu(menuName = "Events/Bool Event Channel")]
 	public void RaiseEvent(bool value)
 	{
-		OnEventRaised.Invoke(value);
+		if (OnEventRaised != null)
+			OnEventRaised.Invoke(value);
 	}
 }

UOP1_Project/Assets/Scripts/Input/GameInput.cs

                     ""interactions"": """"
                 },
                 {
-                    ""name"": ""ExtraAction"",
+                    ""name"": ""OpenInventory"",
                     ""type"": ""Button"",
                     ""id"": ""1b6ae4df-f5e6-42fc-92b6-3dcc2e126563"",
                     ""expectedControlType"": ""Button"",
                 {
                     ""name"": """",
                     ""id"": ""91ce58d8-88e1-4ade-945b-59c4f0939828"",
-                    ""path"": ""<Keyboard>/j"",
+                    ""path"": ""<Keyboard>/f"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": ""KeyboardOrGamepad"",
+                    ""action"": ""Attack"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
+                },
+                {
+                    ""name"": """",
+                    ""id"": ""4c248131-d3fe-4545-b4dc-ba0690c01312"",
+                    ""path"": ""<Mouse>/leftButton"",
                     ""interactions"": """",
                     ""processors"": """",
                     ""groups"": ""KeyboardOrGamepad"",
                 {
                     ""name"": """",
                     ""id"": ""937b421c-9467-4b47-a1fd-445b9b44d5c9"",
-                    ""path"": ""<Keyboard>/l"",
+                    ""path"": ""<Keyboard>/q"",
-                    ""action"": ""ExtraAction"",
+                    ""action"": ""OpenInventory"",
                     ""isComposite"": false,
                     ""isPartOfComposite"": false
                 },
                     ""interactions"": """",
                     ""processors"": """",
                     ""groups"": ""KeyboardOrGamepad"",
-                    ""action"": ""ExtraAction"",
+                    ""action"": ""OpenInventory"",
                     ""isComposite"": false,
                     ""isPartOfComposite"": false
                 },
                     ""isPartOfComposite"": false
                 },
                 {
-                    ""name"": ""Keyboard TFGH"",
+                    ""name"": ""Keyboard IJKL"",
                     ""id"": ""8e17360e-f036-4963-93f6-05d14787dfb5"",
                     ""path"": ""2DVector(mode=1)"",
                     ""interactions"": """",
                 {
                     ""name"": ""up"",
                     ""id"": ""9a4ec3f5-78bf-4f42-b7d7-f1edd7ce12dc"",
-                    ""path"": ""<Keyboard>/t"",
+                    ""path"": ""<Keyboard>/i"",
                     ""interactions"": """",
                     ""processors"": """",
                     ""groups"": ""KeyboardOrGamepad"",
                 {
                     ""name"": ""down"",
                     ""id"": ""5d82874e-55d8-4d54-84f5-c4d59dc3b39c"",
-                    ""path"": ""<Keyboard>/g"",
+                    ""path"": ""<Keyboard>/k"",
                     ""interactions"": """",
                     ""processors"": """",
                     ""groups"": ""KeyboardOrGamepad"",
                 {
                     ""name"": ""left"",
                     ""id"": ""13a13bd5-f4ec-4f5b-9a8e-ef1165cc9f5f"",
-                    ""path"": ""<Keyboard>/f"",
+                    ""path"": ""<Keyboard>/j"",
                     ""interactions"": """",
                     ""processors"": """",
                     ""groups"": ""KeyboardOrGamepad"",
                 {
                     ""name"": ""right"",
                     ""id"": ""78626b57-196b-4f24-9a3f-af2477d3633b"",
-                    ""path"": ""<Keyboard>/h"",
-                    ""interactions"": """",
-                    ""processors"": """",
-                    ""groups"": ""KeyboardOrGamepad"",
-                    ""action"": ""RotateCamera"",
-                    ""isComposite"": false,
-                    ""isPartOfComposite"": true
-                },
-                {
-                    ""name"": ""up"",
-                    ""id"": ""4e483eb2-4460-4dc1-af9f-9bcb31ebe837"",
-                    ""path"": ""<Gamepad>/rightStick/up"",
+                    ""path"": ""<Keyboard>/l"",
                     ""interactions"": """",
                     ""processors"": """",
                     ""groups"": ""KeyboardOrGamepad"",
                     ""expectedControlType"": ""Button"",
                     ""processors"": """",
                     ""interactions"": """"
+                },
+                {
+                    ""name"": ""MouseMove"",
+                    ""type"": ""PassThrough"",
+                    ""id"": ""df62b304-145b-43af-9a21-8cfd14f72fdb"",
+                    ""expectedControlType"": ""Vector2"",
+                    ""processors"": """",
+                    ""interactions"": """"
+                },
+                {
+                    ""name"": ""Unpause"",
+                    ""type"": ""Button"",
+                    ""id"": ""a33f8309-65f3-4f8a-8671-c7cb90ef798e"",
+                    ""expectedControlType"": ""Button"",
+                    ""processors"": """",
+                    ""interactions"": """"
                 }
             ],
             ""bindings"": [
                     ""name"": """",
                     ""id"": ""77bc3cae-36d6-4cda-bbf3-5f245a50eca2"",
                     ""path"": ""<Keyboard>/enter"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": ""KeyboardOrGamepad"",
+                    ""action"": ""Confirm"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
+                },
+                {
+                    ""name"": """",
+                    ""id"": ""b03f649e-d5ec-4fad-8614-6a69620c5345"",
+                    ""path"": ""<Mouse>/leftButton"",
                     ""interactions"": """",
                     ""processors"": """",
                     ""groups"": ""KeyboardOrGamepad"",
                     ""action"": ""Cancel"",
                     ""isComposite"": false,
                     ""isPartOfComposite"": false
+                },
+                {
+                    ""name"": """",
+                    ""id"": ""10a96123-fa2f-43f5-b596-4ed4c93fd4b3"",
+                    ""path"": ""<Gamepad>/start"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": ""KeyboardOrGamepad"",
+                    ""action"": ""Unpause"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
+                },
+                {
+                    ""name"": """",
+                    ""id"": ""b8857ec1-9a5c-4cd2-af29-276683c9151e"",
+                    ""path"": ""<Keyboard>/escape"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": ""KeyboardOrGamepad"",
+                    ""action"": ""Unpause"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
+                },
+                {
+                    ""name"": """",
+                    ""id"": ""23583bb1-6dd5-4287-94bd-3028199fc088"",
+                    ""path"": ""<Mouse>/position"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": ""Keyboard&Mouse;KeyboardOrGamepad"",
+                    ""action"": ""MouseMove"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
                 }
             ]
         },
 		m_Gameplay_Attack = m_Gameplay.FindAction("Attack", throwIfNotFound: true);
 		m_Gameplay_Interact = m_Gameplay.FindAction("Interact", throwIfNotFound: true);
 		m_Gameplay_Pause = m_Gameplay.FindAction("Pause", throwIfNotFound: true);
-		m_Gameplay_ExtraAction = m_Gameplay.FindAction("ExtraAction", throwIfNotFound: true);
+		m_Gameplay_OpenInventory = m_Gameplay.FindAction("OpenInventory", throwIfNotFound: true);
 		m_Gameplay_RotateCamera = m_Gameplay.FindAction("RotateCamera", throwIfNotFound: true);
 		m_Gameplay_MouseControlCamera = m_Gameplay.FindAction("MouseControlCamera", throwIfNotFound: true);
 		m_Gameplay_Run = m_Gameplay.FindAction("Run", throwIfNotFound: true);
 		m_Menus_Confirm = m_Menus.FindAction("Confirm", throwIfNotFound: true);
 		m_Menus_Cancel = m_Menus.FindAction("Cancel", throwIfNotFound: true);
+		m_Menus_MouseMove = m_Menus.FindAction("MouseMove", throwIfNotFound: true);
+		m_Menus_Unpause = m_Menus.FindAction("Unpause", throwIfNotFound: true);
 		// Dialogues
 		m_Dialogues = asset.FindActionMap("Dialogues", throwIfNotFound: true);
 		m_Dialogues_MoveSelection = m_Dialogues.FindAction("MoveSelection", throwIfNotFound: true);
 	private readonly InputAction m_Gameplay_Attack;
 	private readonly InputAction m_Gameplay_Interact;
 	private readonly InputAction m_Gameplay_Pause;
-	private readonly InputAction m_Gameplay_ExtraAction;
+	private readonly InputAction m_Gameplay_OpenInventory;
 	private readonly InputAction m_Gameplay_RotateCamera;
 	private readonly InputAction m_Gameplay_MouseControlCamera;
 	private readonly InputAction m_Gameplay_Run;
 		public InputAction @Attack => m_Wrapper.m_Gameplay_Attack;
 		public InputAction @Interact => m_Wrapper.m_Gameplay_Interact;
 		public InputAction @Pause => m_Wrapper.m_Gameplay_Pause;
-		public InputAction @ExtraAction => m_Wrapper.m_Gameplay_ExtraAction;
+		public InputAction @OpenInventory => m_Wrapper.m_Gameplay_OpenInventory;
 		public InputAction @RotateCamera => m_Wrapper.m_Gameplay_RotateCamera;
 		public InputAction @MouseControlCamera => m_Wrapper.m_Gameplay_MouseControlCamera;
 		public InputAction @Run => m_Wrapper.m_Gameplay_Run;
 				@Pause.started -= m_Wrapper.m_GameplayActionsCallbackInterface.OnPause;
 				@Pause.performed -= m_Wrapper.m_GameplayActionsCallbackInterface.OnPause;
 				@Pause.canceled -= m_Wrapper.m_GameplayActionsCallbackInterface.OnPause;
-				@ExtraAction.started -= m_Wrapper.m_GameplayActionsCallbackInterface.OnExtraAction;
-				@ExtraAction.performed -= m_Wrapper.m_GameplayActionsCallbackInterface.OnExtraAction;
-				@ExtraAction.canceled -= m_Wrapper.m_GameplayActionsCallbackInterface.OnExtraAction;
+				@OpenInventory.started -= m_Wrapper.m_GameplayActionsCallbackInterface.OnOpenInventory;
+				@OpenInventory.performed -= m_Wrapper.m_GameplayActionsCallbackInterface.OnOpenInventory;
+				@OpenInventory.canceled -= m_Wrapper.m_GameplayActionsCallbackInterface.OnOpenInventory;
 				@RotateCamera.started -= m_Wrapper.m_GameplayActionsCallbackInterface.OnRotateCamera;
 				@RotateCamera.performed -= m_Wrapper.m_GameplayActionsCallbackInterface.OnRotateCamera;
 				@RotateCamera.canceled -= m_Wrapper.m_GameplayActionsCallbackInterface.OnRotateCamera;
 				@Pause.started += instance.OnPause;
 				@Pause.performed += instance.OnPause;
 				@Pause.canceled += instance.OnPause;
-				@ExtraAction.started += instance.OnExtraAction;
-				@ExtraAction.performed += instance.OnExtraAction;
-				@ExtraAction.canceled += instance.OnExtraAction;
+				@OpenInventory.started += instance.OnOpenInventory;
+				@OpenInventory.performed += instance.OnOpenInventory;
+				@OpenInventory.canceled += instance.OnOpenInventory;
 				@RotateCamera.started += instance.OnRotateCamera;
 				@RotateCamera.performed += instance.OnRotateCamera;
 				@RotateCamera.canceled += instance.OnRotateCamera;
 	private readonly InputAction m_Menus_MoveSelection;
 	private readonly InputAction m_Menus_Confirm;
 	private readonly InputAction m_Menus_Cancel;
+	private readonly InputAction m_Menus_MouseMove;
+	private readonly InputAction m_Menus_Unpause;
 	public struct MenusActions
 	{
 		private @GameInput m_Wrapper;
 		public InputAction @Cancel => m_Wrapper.m_Menus_Cancel;
+		public InputAction @MouseMove => m_Wrapper.m_Menus_MouseMove;
+		public InputAction @Unpause => m_Wrapper.m_Menus_Unpause;
 		public InputActionMap Get() { return m_Wrapper.m_Menus; }
 		public void Enable() { Get().Enable(); }
 		public void Disable() { Get().Disable(); }
 				@Cancel.started -= m_Wrapper.m_MenusActionsCallbackInterface.OnCancel;
 				@Cancel.performed -= m_Wrapper.m_MenusActionsCallbackInterface.OnCancel;
 				@Cancel.canceled -= m_Wrapper.m_MenusActionsCallbackInterface.OnCancel;
+				@MouseMove.started -= m_Wrapper.m_MenusActionsCallbackInterface.OnMouseMove;
+				@MouseMove.performed -= m_Wrapper.m_MenusActionsCallbackInterface.OnMouseMove;
+				@MouseMove.canceled -= m_Wrapper.m_MenusActionsCallbackInterface.OnMouseMove;
+				@Unpause.started -= m_Wrapper.m_MenusActionsCallbackInterface.OnUnpause;
+				@Unpause.performed -= m_Wrapper.m_MenusActionsCallbackInterface.OnUnpause;
+				@Unpause.canceled -= m_Wrapper.m_MenusActionsCallbackInterface.OnUnpause;
 			}
 			m_Wrapper.m_MenusActionsCallbackInterface = instance;
 			if (instance != null)
 				@Cancel.started += instance.OnCancel;
 				@Cancel.performed += instance.OnCancel;
 				@Cancel.canceled += instance.OnCancel;
+				@MouseMove.started += instance.OnMouseMove;
+				@MouseMove.performed += instance.OnMouseMove;
+				@MouseMove.canceled += instance.OnMouseMove;
+				@Unpause.started += instance.OnUnpause;
+				@Unpause.performed += instance.OnUnpause;
+				@Unpause.canceled += instance.OnUnpause;
 			}
 		}
 	}
 		void OnAttack(InputAction.CallbackContext context);
 		void OnInteract(InputAction.CallbackContext context);
 		void OnPause(InputAction.CallbackContext context);
-		void OnExtraAction(InputAction.CallbackContext context);
+		void OnOpenInventory(InputAction.CallbackContext context);
 		void OnRotateCamera(InputAction.CallbackContext context);
 		void OnMouseControlCamera(InputAction.CallbackContext context);
 		void OnRun(InputAction.CallbackContext context);
 		void OnMoveSelection(InputAction.CallbackContext context);
 		void OnConfirm(InputAction.CallbackContext context);
 		void OnCancel(InputAction.CallbackContext context);
+		void OnMouseMove(InputAction.CallbackContext context);
+		void OnUnpause(InputAction.CallbackContext context);
 	}
 	public interface IDialoguesActions
 	{

UOP1_Project/Assets/Scripts/Input/InputReader.cs

 using UnityEngine.Events;
 
 [CreateAssetMenu(fileName = "InputReader", menuName = "Game/Input Reader")]
-public class InputReader : ScriptableObject, GameInput.IGameplayActions, GameInput.IDialoguesActions
+public class InputReader : ScriptableObject, GameInput.IGameplayActions, GameInput.IDialoguesActions, GameInput.IMenusActions
+	// Assign delegate{} to events to initialise them with an empty delegate
+	// so we can skip the null check when we use them
+
-	public event UnityAction jumpEvent;
-	public event UnityAction jumpCanceledEvent;
-	public event UnityAction attackEvent;
-	public event UnityAction interactEvent; // Used to talk, pickup objects, interact with tools like the cooking cauldron
-	public event UnityAction extraActionEvent; // Used to bring up the inventory
-	public event UnityAction pauseEvent;
-	public event UnityAction<Vector2> moveEvent;
-	public event UnityAction<Vector2, bool> cameraMoveEvent;
-	public event UnityAction enableMouseControlCameraEvent;
-	public event UnityAction disableMouseControlCameraEvent;
-	public event UnityAction startedRunning;
-	public event UnityAction stoppedRunning;
+	public event UnityAction jumpEvent = delegate { };
+	public event UnityAction jumpCanceledEvent = delegate { };
+	public event UnityAction attackEvent = delegate { };
+	public event UnityAction interactEvent = delegate { }; // Used to talk, pickup objects, interact with tools like the cooking cauldron
+	public event UnityAction openInventoryEvent = delegate { }; // Used to bring up the inventory
+	public event UnityAction pauseEvent = delegate { };
+	public event UnityAction<Vector2> moveEvent = delegate { };
+	public event UnityAction<Vector2, bool> cameraMoveEvent = delegate { };
+	public event UnityAction enableMouseControlCameraEvent = delegate { };
+	public event UnityAction disableMouseControlCameraEvent = delegate { };
+	public event UnityAction startedRunning = delegate { };
+	public event UnityAction stoppedRunning = delegate { };
-	// Dialogue
-	public event UnityAction advanceDialogueEvent;
-	public event UnityAction onMoveSelectionEvent;
+	// Shared between menus and dialogues
+	public event UnityAction moveSelectionEvent = delegate { };
+
+	// Dialogues
+	public event UnityAction advanceDialogueEvent = delegate { };
+
+	// Menus
+	public event UnityAction menuMouseMoveEvent = delegate { };
+	public event UnityAction menuConfirmEvent = delegate { };
+	public event UnityAction menuCancelEvent = delegate { };
+	public event UnityAction menuUnpauseEvent = delegate { };
+
 
 	private GameInput gameInput;
 
 		{
 			gameInput = new GameInput();
+			gameInput.Menus.SetCallbacks(this);
 			gameInput.Gameplay.SetCallbacks(this);
 			gameInput.Dialogues.SetCallbacks(this);
 		}
 
 	public void OnAttack(InputAction.CallbackContext context)
 	{
-		if (attackEvent != null
-			&& context.phase == InputActionPhase.Performed)
+		if (context.phase == InputActionPhase.Performed)
-	public void OnExtraAction(InputAction.CallbackContext context)
+	public void OnOpenInventory(InputAction.CallbackContext context)
-		if (extraActionEvent != null
-			&& context.phase == InputActionPhase.Performed)
-			extraActionEvent.Invoke();
+		if (context.phase == InputActionPhase.Performed)
+			openInventoryEvent.Invoke();
-		if (interactEvent != null
-			&& context.phase == InputActionPhase.Performed)
+		if (context.phase == InputActionPhase.Performed)
-		if (jumpEvent != null
-			&& context.phase == InputActionPhase.Performed)
+		if (context.phase == InputActionPhase.Performed)
-		if (jumpCanceledEvent != null
-			&& context.phase == InputActionPhase.Canceled)
+		if (context.phase == InputActionPhase.Canceled)
-		if (moveEvent != null)
-		{
-			moveEvent.Invoke(context.ReadValue<Vector2>());
-		}
+		moveEvent.Invoke(context.ReadValue<Vector2>());
 	}
 
 	public void OnRun(InputAction.CallbackContext context)
 			case InputActionPhase.Performed:
-				startedRunning?.Invoke();
+				startedRunning.Invoke();
-				stoppedRunning?.Invoke();
+				stoppedRunning.Invoke();
 				break;
 		}
 	}
-		if (pauseEvent != null
-			&& context.phase == InputActionPhase.Performed)
+		if (context.phase == InputActionPhase.Performed)
-		if (cameraMoveEvent != null)
-		{
-			cameraMoveEvent.Invoke(context.ReadValue<Vector2>(), IsDeviceMouse(context));
-		}
+		cameraMoveEvent.Invoke(context.ReadValue<Vector2>(), IsDeviceMouse(context));
-			enableMouseControlCameraEvent?.Invoke();
+			enableMouseControlCameraEvent.Invoke();
-			disableMouseControlCameraEvent?.Invoke();
+			disableMouseControlCameraEvent.Invoke();
 	}
 
 	private bool IsDeviceMouse(InputAction.CallbackContext context) => context.control.device.name == "Mouse";
 		if (context.phase == InputActionPhase.Performed)
-			onMoveSelectionEvent();
+			moveSelectionEvent();
 	}
 
 	public void OnAdvanceDialogue(InputAction.CallbackContext context)
 	}
 
+	public void OnConfirm(InputAction.CallbackContext context)
+	{
+		if (context.phase == InputActionPhase.Performed)
+			menuConfirmEvent();
+	}
+
+	public void OnCancel(InputAction.CallbackContext context)
+	{
+		if (context.phase == InputActionPhase.Performed)
+			menuCancelEvent();
+	}
+
+	public void OnMouseMove(InputAction.CallbackContext context)
+	{
+		if (context.phase == InputActionPhase.Performed)
+			menuMouseMoveEvent();
+	}
+
+	public void OnUnpause(InputAction.CallbackContext context)
+	{
+		if (context.phase == InputActionPhase.Performed)
+			menuUnpauseEvent();
+	}
-		gameInput.Dialogues.Enable();
-		gameInput.Gameplay.Disable();
+		gameInput.Gameplay.Disable();
+
+		gameInput.Dialogues.Enable();
-		gameInput.Gameplay.Enable();
-		gameInput.Dialogues.Disable();
+		gameInput.Dialogues.Disable();
+
+		gameInput.Gameplay.Enable();
-	public void EnableUIInput()
+	public void EnableMenuInput()
-		gameInput.Gameplay.Disable();
+		gameInput.Gameplay.Disable();
+
 		gameInput.Menus.Enable();
 	}
 
+		gameInput.Menus.Disable();
+
+	public bool LeftMouseDown() => Mouse.current.leftButton.isPressed;
 }

UOP1_Project/Assets/Scripts/Interaction/InteractionManager.cs

 					_onCookingStart.RaiseEvent();
 					Debug.Log("Cooking event raised");
 					//Change the action map
-					_inputReader.EnableUIInput();
+					_inputReader.EnableMenuInput();
 					//set current interaction for state machine
 					currentInteraction = InteractionType.Cook;
 				}
 		if (other.CompareTag("Pickable"))
 		{
 			_potentialInteraction = InteractionType.PickUp;
-			Debug.Log("I triggered a pickable object!");
+			//Debug.Log("I triggered a pickable object!");
-			Debug.Log("I triggered a cooking pot!");
+			//Debug.Log("I triggered a cooking pot!");
-			Debug.Log("I triggered an NPC!");
+			//Debug.Log("I triggered an NPC!");
 			DisplayInteractionUI();
 		}
 		_currentInteractableObject = other.gameObject;
 
 	private void OnTriggerExit(Collider other)
 	{
-
-
 		ResetInteraction();
 	}
 

UOP1_Project/Assets/Scripts/Inventory/CollectibleItem.cs

 using UnityEngine;
 public class CollectibleItem : MonoBehaviour
 {
+	[SerializeField] private Item _currentItem;
+	[SerializeField] private SpriteRenderer[] _itemImages;
-	[SerializeField]
-	private Item currentItem;
+	public Item CurrentItem
+	{
+		set => _currentItem = value;
+	}
-	[SerializeField]
-	private SpriteRenderer[] itemImages;
 	private void Start()
 	{
 		SetItem();
 	{
 
-
-		Debug.Log("current item " + currentItem);
-		return currentItem;
-
+		Debug.Log("current item " + _currentItem);
+		return _currentItem;
-	//this function is only for testing 
+	// TODO: This function is only for testing 
-		for (int i = 0; i < itemImages.Length; i++)
+		for (int i = 0; i < _itemImages.Length; i++)
-			itemImages[i].sprite = currentItem.PreviewImage;
+			_itemImages[i].sprite = _currentItem.PreviewImage;
+	}
-	}
-			if (other.gameObject.GetComponent<ItemPicker>())
+			if (other.gameObject.TryGetComponent<ItemPicker>(out ItemPicker itemPickerComp))
-				other.gameObject.GetComponent<ItemPicker>().PickItem(currentItem);
-
+				itemPickerComp.PickItem(_currentItem);
-
 		}
 	}
 }

UOP1_Project/Assets/Scripts/Inventory/ItemPicker.cs

 
 public class ItemPicker : MonoBehaviour
 {
-
-	[SerializeField]
-	ItemEventChannelSo AddItemEvent;
+	[SerializeField] private ItemEventChannelSo _addItemEvent;
-		if (AddItemEvent != null)
-			AddItemEvent.RaiseEvent(item);
+		if (_addItemEvent != null)
+			_addItemEvent.RaiseEvent(item);
 	}
 }

UOP1_Project/Assets/Scripts/Inventory/UIInventoryManager.cs

 		if (ActionButtonClicked != null)
 		{
 			//find the selected Item
-			if (instantiatedGameObjects.Count > selectedItemId)
+			if (instantiatedGameObjects.Count > selectedItemId && selectedItemId > -1)
 			{
 				//find the item 
 				Item itemToActOn = new Item();

UOP1_Project/Assets/Scripts/SceneManagement/EditorInitialisationLoader.cs

 using UnityEngine.SceneManagement;
 
 /// <summary>
-/// This script loads the initial Scene, to allow to start the game from any gameplay Scene
+/// This script loads the persistent managers and gameplay Scenes, to allow to start the game from any gameplay Scene
+/// It can also be used for menu scene by just adding the persistent managers scene on the inspector
-	public GameSceneSO initializationScene;
+	public GameSceneSO[] scenesToLoad;
+	//bool to know if we are coming from editor initializer mode
+	[HideInInspector] public bool _isEditorInitializerMode=false;
-	private void Awake()
+	private void Start()
 	{
 		Application.targetFrameRate = targetFramerate; // For debugging purposes
 
-			if (scene.name == initializationScene.sceneName)
-			{
-				return;
-			}
+			for (int j = 0; j < scenesToLoad.Length; ++j)
+				if (scene.path == scenesToLoad[j].scenePath)
+				{
+					return;
+				}
+				else
+				{
+					SceneManager.LoadSceneAsync(scenesToLoad[j].scenePath, LoadSceneMode.Additive);
+					//Inform that we are pressing play from a location or menu
+					_isEditorInitializerMode = true;
+				}
-		SceneManager.LoadSceneAsync(initializationScene.sceneName, LoadSceneMode.Additive);
 	}
 #endif
 }

UOP1_Project/Assets/Scripts/SceneManagement/LocationExit.cs

 	[Header("Loading settings")]
 	[SerializeField] private GameSceneSO[] _locationsToLoad = default;
 	[SerializeField] private bool _showLoadScreen = default;
+	[SerializeField] private PathAnchor _pathTaken = default;
+	[SerializeField] private PathSO _exitPath = default;
 
 	[Header("Broadcasting on")]
 	[SerializeField] private LoadEventChannelSO _locationExitLoadChannel = default;
 		if (other.CompareTag("Player"))
 		{
+			UpdatePathTaken();
+	}
+
+	private void UpdatePathTaken()
+	{
+		if (_pathTaken != null)
+			_pathTaken.Path = _exitPath;
 	}
 }