Integrating Cutscenes and Questlines in final scenes

3 年前 · b1c2f634
--- a/UOP1_Project/Assets/Prefabs/Droppable/Collectable_GoldenEgg.prefab
+++ b/UOP1_Project/Assets/Prefabs/Droppable/Collectable_GoldenEgg.prefab
    type: 3}
  m_PrefabInstance: {fileID: 3188807241090914430}
  m_PrefabAsset: {fileID: 0}
--- !u!1001 &4659187227949348480
+--- !u!1001 &7631477949038211733
 PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
-    - target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
+    - target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
-    - target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
+    - target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
-      value: 5.020923
+      value: 1.2583
-    - target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
+    - target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
-      value: 5.020923
+      value: 1.2583
-    - target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
+    - target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
-      value: 5.020923
+      value: 1.2583
-    - target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
+    - target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
-      value: 0
+      value: 0.0025351
-    - target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
+    - target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
-      value: 0.1533
+      value: -0.030774
-    - target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
+    - target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
-      value: 0.0001
+      value: 0.00071667
-    - target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
+    - target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
-    - target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
+    - target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
-    - target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
+    - target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
-      value: -0
+      value: 0
-    - target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
+    - target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
-      value: -0
+      value: 0
-    - target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
+    - target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
-    - target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
+    - target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
-    - target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
+    - target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
-    - target: {fileID: -7511558181221131132, guid: 39c4f10d38fdc744e932e20b293735b8,
-        type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 2b4f625958f22ee47bfd4483b881a085, type: 2}
-    - target: {fileID: 919132149155446097, guid: 39c4f10d38fdc744e932e20b293735b8,
+    - target: {fileID: 6596338561138946282, guid: b3a646508a4a1764a98eabb43a74671b,
-      value: rockCritterEgg
+      value: RockCritter_GoldenEgg
-  m_SourcePrefab: {fileID: 100100000, guid: 39c4f10d38fdc744e932e20b293735b8, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: b3a646508a4a1764a98eabb43a74671b, type: 3}
--- a/UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Cave.prefab
+++ b/UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Cave.prefab
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5422772742601145822}
-  m_LocalRotation: {x: -0, y: 0.32241195, z: -0, w: 0.9465995}
+  m_LocalRotation: {x: 0, y: 0.32241437, z: 0, w: 0.9465986}
  m_LocalPosition: {x: -34.21, y: -14.4, z: 120.48}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1981787520678023078}
  m_Father: {fileID: 0}
  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 37.618, z: 0}
 --- !u!1001 &5422772742535092266
 PrefabInstance:
  m_ObjectHideFlags: 0
    m_Modifications:
+    - target: {fileID: 1419279369, guid: b4583a7f005d6724798206eee4608f75, type: 3}
+      propertyPath: _droppableRewardSO
+      value: 
+      objectReference: {fileID: 11400000, guid: 7b5acbea6cb73ba4fb8e73103dbf326d,
+        type: 2}
    - target: {fileID: 2603716432372836042, guid: b4583a7f005d6724798206eee4608f75,
        type: 3}
      propertyPath: m_RootOrder
  m_Modification:
    m_TransformParent: {fileID: 5422772742601145823}
    m_Modifications:
+    - target: {fileID: 1419279369, guid: b4583a7f005d6724798206eee4608f75, type: 3}
+      propertyPath: _droppableRewardSO
+      value: 
+      objectReference: {fileID: 11400000, guid: 7b5acbea6cb73ba4fb8e73103dbf326d,
+        type: 2}
    - target: {fileID: 2603716432372836042, guid: b4583a7f005d6724798206eee4608f75,
        type: 3}
      propertyPath: m_RootOrder
  m_Modification:
    m_TransformParent: {fileID: 5422772742601145823}
    m_Modifications:
+    - target: {fileID: 1419279369, guid: b4583a7f005d6724798206eee4608f75, type: 3}
+      propertyPath: _droppableRewardSO
+      value: 
+      objectReference: {fileID: 11400000, guid: 7b5acbea6cb73ba4fb8e73103dbf326d,
+        type: 2}
    - target: {fileID: 2603716432372836042, guid: b4583a7f005d6724798206eee4608f75,
        type: 3}
      propertyPath: m_RootOrder
  m_Modification:
    m_TransformParent: {fileID: 5422772742601145823}
    m_Modifications:
+    - target: {fileID: 1419279369, guid: b4583a7f005d6724798206eee4608f75, type: 3}
+      propertyPath: _droppableRewardSO
+      value: 
+      objectReference: {fileID: 11400000, guid: 5bbd8876e11015c4abb5280e97c1615b,
+        type: 2}
    - target: {fileID: 2603716432372836042, guid: b4583a7f005d6724798206eee4608f75,
        type: 3}
      propertyPath: m_RootOrder
  m_Modification:
    m_TransformParent: {fileID: 5422772742601145823}
    m_Modifications:
+    - target: {fileID: 1419279369, guid: b4583a7f005d6724798206eee4608f75, type: 3}
+      propertyPath: _droppableRewardSO
+      value: 
+      objectReference: {fileID: 11400000, guid: 7b5acbea6cb73ba4fb8e73103dbf326d,
+        type: 2}
    - target: {fileID: 2603716432372836042, guid: b4583a7f005d6724798206eee4608f75,
        type: 3}
      propertyPath: m_RootOrder
        type: 3}
      propertyPath: m_Name
      value: RockCritter_GoldenEgg
+      objectReference: {fileID: 0}
+    - target: {fileID: 6596338561138946282, guid: b3a646508a4a1764a98eabb43a74671b,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: b3a646508a4a1764a98eabb43a74671b, type: 3}
--- a/UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Farms.prefab
+++ b/UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Farms.prefab
  - {fileID: 8040769610452317586}
  - {fileID: 8040769610564248312}
  - {fileID: 8040769609122690780}
+  - {fileID: 67130411264315143}
+  - {fileID: 67130411297963406}
  m_Father: {fileID: 8032437784309596759}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_CorrespondingSourceObject: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
    type: 3}
  m_PrefabInstance: {fileID: 799974963}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1350318932
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8032437784199091367}
+    m_Modifications:
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 55.41
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 2.166
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -123.78
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.5733645
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.8193005
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 110.03
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 839268684819471456, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_Name
+      value: Gluecose_FarmAttack (4)
+      objectReference: {fileID: 0}
+    - target: {fileID: 3641242757122071620, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: _npcMovementConfig
+      value: 
+      objectReference: {fileID: 11400000, guid: fa5d257c17e2c2a49bcaad7e13ade621,
+        type: 2}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 56a7aec3927ab6a4e85add83fc22eabb, type: 3}
+--- !u!4 &67130411297963406 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+    type: 3}
+  m_PrefabInstance: {fileID: 1350318932}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1384073693
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8032437784199091367}
+    m_Modifications:
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 37.910084
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 2.445
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -140.48
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.4177068
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.908582
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 130.62
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 839268684819471456, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_Name
+      value: Gluecose_FarmAttack (3)
+      objectReference: {fileID: 0}
+    - target: {fileID: 3641242757122071620, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: _npcMovementConfig
+      value: 
+      objectReference: {fileID: 11400000, guid: fa5d257c17e2c2a49bcaad7e13ade621,
+        type: 2}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 56a7aec3927ab6a4e85add83fc22eabb, type: 3}
+--- !u!4 &67130411264315143 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+    type: 3}
+  m_PrefabInstance: {fileID: 1384073693}
  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8032437782536457977
 PrefabInstance:
--- a/UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Forest.prefab
+++ b/UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Forest.prefab
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4015860654515517919}
+  - {fileID: 1463222398651152044}
+  - {fileID: 1051014580829548450}
+  - {fileID: 4973758847336935020}
+  - {fileID: 5641457846647023787}
+--- !u!1001 &1043580509972572536
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 993180660820098450}
+    m_Modifications:
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -263.96585
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -6.716504
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -34.9725
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 839268684819471456, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_Name
+      value: Gluecose_FarmAttack
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 56a7aec3927ab6a4e85add83fc22eabb, type: 3}
+--- !u!4 &1051014580829548450 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+    type: 3}
+  m_PrefabInstance: {fileID: 1043580509972572536}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4668114763655102845
 PrefabInstance:
  m_ObjectHideFlags: 0
    type: 3}
  m_PrefabInstance: {fileID: 4668114763655102845}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4770873872200068915
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 993180660820098450}
+    m_Modifications:
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -271.2822
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -7.8037753
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -62.518143
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.92614466
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.3771686
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 44.317
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6714925499130446629, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_Name
+      value: PotOverFire
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6494d957e2f12413faed3836aad6c425, type: 3}
+--- !u!4 &1463222398651152044 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+    type: 3}
+  m_PrefabInstance: {fileID: 4770873872200068915}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5037321887077574838
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 993180660820098450}
+    m_Modifications:
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -263.96585
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -6.202
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 5.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 839268684819471456, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_Name
+      value: Gluecose_FarmAttack (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 56a7aec3927ab6a4e85add83fc22eabb, type: 3}
+--- !u!4 &4973758847336935020 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+    type: 3}
+  m_PrefabInstance: {fileID: 5037321887077574838}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5666657276736974449
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 993180660820098450}
+    m_Modifications:
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -233.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -6.716504
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 8.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 839268684819471456, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+        type: 3}
+      propertyPath: m_Name
+      value: Gluecose_FarmAttack (2)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 56a7aec3927ab6a4e85add83fc22eabb, type: 3}
+--- !u!4 &5641457846647023787 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
+    type: 3}
+  m_PrefabInstance: {fileID: 5666657276736974449}
+  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Hill.prefab
+++ b/UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Hill.prefab
  - {fileID: 3376932760188287399}
  - {fileID: 3376932760434810086}
  - {fileID: 3376932760853863416}
-  - {fileID: 4273265230307784822}
+  - {fileID: 7197274884837044307}
+  - {fileID: 360371595985007953}
--- !u!1001 &166061934370443770
+--- !u!1001 &1294432349254505422
 PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
-    - target: {fileID: 3624158316787725110, guid: 84b94d5606a31ac41b60b7bac16ad314,
+    - target: {fileID: 5224987954583862020, guid: 9f7b0cb7955c190418da560e89736c38,
-      propertyPath: m_Name
-      value: Townsfolk_HillCave
-      objectReference: {fileID: 0}
-    - target: {fileID: 4107362458846931340, guid: 84b94d5606a31ac41b60b7bac16ad314,
+      propertyPath: _droppableRewardSO
+      value: 
+      objectReference: {fileID: 11400000, guid: d931c8048a12ddc42abba9e390bd608f,
+        type: 2}
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
-    - target: {fileID: 4107362458846931340, guid: 84b94d5606a31ac41b60b7bac16ad314,
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
-      value: -75.731
+      value: -69.27
-    - target: {fileID: 4107362458846931340, guid: 84b94d5606a31ac41b60b7bac16ad314,
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
-      value: 17.062862
+      value: 9.35
-    - target: {fileID: 4107362458846931340, guid: 84b94d5606a31ac41b60b7bac16ad314,
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
-      value: -254.336
+      value: -332.29
-    - target: {fileID: 4107362458846931340, guid: 84b94d5606a31ac41b60b7bac16ad314,
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
-      value: 0.25882143
+      value: 0.5250054
-    - target: {fileID: 4107362458846931340, guid: 84b94d5606a31ac41b60b7bac16ad314,
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
-      value: -0
+      value: -0.011900145
-    - target: {fileID: 4107362458846931340, guid: 84b94d5606a31ac41b60b7bac16ad314,
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
-      value: -0.9659252
+      value: 0.8510111
-    - target: {fileID: 4107362458846931340, guid: 84b94d5606a31ac41b60b7bac16ad314,
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
-      value: -0
+      value: -0.0028231714
-    - target: {fileID: 4107362458846931340, guid: 84b94d5606a31ac41b60b7bac16ad314,
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
-      value: 0
+      value: -0.441
-    - target: {fileID: 4107362458846931340, guid: 84b94d5606a31ac41b60b7bac16ad314,
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
-      value: -150
+      value: 116.663
-    - target: {fileID: 4107362458846931340, guid: 84b94d5606a31ac41b60b7bac16ad314,
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
-      value: 0
+      value: -1.33
+      objectReference: {fileID: 0}
+    - target: {fileID: 8745063237678790951, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: m_Name
+      value: PlantCritter (4)
-  m_SourcePrefab: {fileID: 100100000, guid: 84b94d5606a31ac41b60b7bac16ad314, type: 3}
--- !u!4 &4273265230307784822 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: 9f7b0cb7955c190418da560e89736c38, type: 3}
+--- !u!4 &7197274884837044307 stripped
-  m_CorrespondingSourceObject: {fileID: 4107362458846931340, guid: 84b94d5606a31ac41b60b7bac16ad314,
+  m_CorrespondingSourceObject: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
-  m_PrefabInstance: {fileID: 166061934370443770}
+  m_PrefabInstance: {fileID: 1294432349254505422}
  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6686194490129328214
 PrefabInstance:
    m_TransformParent: {fileID: 6686194489267194838}
    m_Modifications:
+    - target: {fileID: 5224987954583862020, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: _droppableRewardSO
+      value: 
+      objectReference: {fileID: 11400000, guid: d931c8048a12ddc42abba9e390bd608f,
+        type: 2}
    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
        type: 3}
      propertyPath: m_RootOrder
  m_Modification:
    m_TransformParent: {fileID: 6686194489267194838}
    m_Modifications:
+    - target: {fileID: 5224987954583862020, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: _droppableRewardSO
+      value: 
+      objectReference: {fileID: 11400000, guid: d931c8048a12ddc42abba9e390bd608f,
+        type: 2}
    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
        type: 3}
      propertyPath: m_RootOrder
  m_Modification:
    m_TransformParent: {fileID: 6686194489267194838}
    m_Modifications:
+    - target: {fileID: 5224987954583862020, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: _droppableRewardSO
+      value: 
+      objectReference: {fileID: 11400000, guid: d931c8048a12ddc42abba9e390bd608f,
+        type: 2}
    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
        type: 3}
      propertyPath: m_RootOrder
    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 10.546227
+      value: 10.49
      objectReference: {fileID: 0}
    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
        type: 3}
  m_Modification:
    m_TransformParent: {fileID: 6686194489267194838}
    m_Modifications:
+    - target: {fileID: 5224987954583862020, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: _droppableRewardSO
+      value: 
+      objectReference: {fileID: 11400000, guid: d931c8048a12ddc42abba9e390bd608f,
+        type: 2}
    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
        type: 3}
      propertyPath: m_RootOrder
    type: 3}
  m_PrefabInstance: {fileID: 6686194490610113082}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8581371648379721420
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6686194489267194838}
+    m_Modifications:
+    - target: {fileID: 5224987954583862020, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: _droppableRewardSO
+      value: 
+      objectReference: {fileID: 11400000, guid: d931c8048a12ddc42abba9e390bd608f,
+        type: 2}
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -84.53
+      objectReference: {fileID: 0}
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 9.13
+      objectReference: {fileID: 0}
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -329.12
+      objectReference: {fileID: 0}
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.6384693
+      objectReference: {fileID: 0}
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.0014273771
+      objectReference: {fileID: 0}
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.76955014
+      objectReference: {fileID: 0}
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.012146885
+      objectReference: {fileID: 0}
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 1.176
+      objectReference: {fileID: 0}
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 100.63
+      objectReference: {fileID: 0}
+    - target: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -0.763
+      objectReference: {fileID: 0}
+    - target: {fileID: 8745063237678790951, guid: 9f7b0cb7955c190418da560e89736c38,
+        type: 3}
+      propertyPath: m_Name
+      value: PlantCritter (5)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 9f7b0cb7955c190418da560e89736c38, type: 3}
+--- !u!4 &360371595985007953 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8221149608678237085, guid: 9f7b0cb7955c190418da560e89736c38,
+    type: 3}
+  m_PrefabInstance: {fileID: 8581371648379721420}
+  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Upper.prefab
+++ b/UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Upper.prefab
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 2375018072514904116}
+  - {fileID: 396809881865893011}
+--- !u!1001 &6051190807777078540
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 3699402050188268108}
+    m_Modifications:
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -18.211788
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 30.036457
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -4.2133093
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.8698046
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.49339634
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -59.128
+      objectReference: {fileID: 0}
+    - target: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6714925499130446629, guid: 6494d957e2f12413faed3836aad6c425,
+        type: 3}
+      propertyPath: m_Name
+      value: PotOverFire
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6494d957e2f12413faed3836aad6c425, type: 3}
+--- !u!4 &396809881865893011 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6231826875607570847, guid: 6494d957e2f12413faed3836aad6c425,
+    type: 3}
+  m_PrefabInstance: {fileID: 6051190807777078540}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8090231183223432013
 PrefabInstance:
  m_ObjectHideFlags: 0
    - target: {fileID: 5483711007322561919, guid: 27c7b99622d41f04ba08f0f122783c20,
        type: 3}
      propertyPath: m_Lens.m_SensorSize.x
-      value: 1.7769947
+      value: 1.6020408
      objectReference: {fileID: 0}
    - target: {fileID: 5815136950816891769, guid: 27c7b99622d41f04ba08f0f122783c20,
        type: 3}
--- a/UOP1_Project/Assets/ScriptableObjects/SaveSystem/SaveSystem.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/SaveSystem/SaveSystem.asset
  m_Name: SaveSystem
  m_EditorClassIdentifier: 
  _loadLocation: {fileID: 11400000, guid: 00e3063edc5902e40832ea618644c597, type: 2}
-  _playerInventory: {fileID: 11400000, guid: d0238f5fb055027499af8e4c6961e01b, type: 2}
+  _playerInventory: {fileID: 11400000, guid: 59c84467f7726dc4587a8373b0936f03, type: 2}
  _questManagerSO: {fileID: 11400000, guid: dacb138678b7c2344b59c68de5dc18db, type: 2}
  saveFilename: save.chop
  backupSaveFilename: save.chop.bak
-    _finishedQuestlineItemsGUIds:
-    - 7b43c62a4fa974bbc82d5af43cc173ca
-    - 2419d670f41b60f45939ba1637631315
-    - 2187c1f18f6f9ae4bbd10f33a1871d8e
-    - 2c804c0ebb31e6a48af992dacd5db830
-    - c0990e60e5858ed48b0add09c1895572
+    _finishedQuestlineItemsGUIds: []
--- a/UOP1_Project/Assets/Scripts/Cutscenes/CutsceneManager.cs
+++ b/UOP1_Project/Assets/Scripts/Cutscenes/CutsceneManager.cs

 	void CutsceneEnded()
 	{
-		_gameState.ResetToPreviousGameState();
+
+		_gameState.UpdateGameState(GameState.Gameplay);
 		_inputReader.EnableGameplayInput();
 		_dialogueManager.CutsceneDialogueEnded();
 	}
--- a/UOP1_Project/Assets/Scripts/Dialogues/DialogueManager.cs
+++ b/UOP1_Project/Assets/Scripts/Dialogues/DialogueManager.cs
 		//raise end dialogue event 
 		if (_endDialogueWithTypeEvent != null)
 			_endDialogueWithTypeEvent.RaiseEvent((int)_currentDialogue.DialogueType);
-		_gameState.ResetToPreviousGameState();
+
-		_inputReader.EnableGameplayInput();
+		_gameState.ResetToPreviousGameState();
+		if (_gameState.CurrentGameState == GameState.Gameplay || _gameState.CurrentGameState == GameState.Combat)
+			_inputReader.EnableGameplayInput();



--- a/UOP1_Project/Assets/Scripts/UI/UIManager.cs
+++ b/UOP1_Project/Assets/Scripts/UI/UIManager.cs

 		_pauseScreen.gameObject.SetActive(false);

-		_inputReader.EnableGameplayInput();
+		_gameState.ResetToPreviousGameState();
+		if (_gameState.CurrentGameState == GameState.Gameplay || _gameState.CurrentGameState == GameState.Combat)
+			_inputReader.EnableGameplayInput();
-		_gameState.ResetToPreviousGameState();
 	}

 	void OpenSettingScreen()

 		}
 		_selectionHandler.Unselect();
-		_inputReader.EnableGameplayInput();
+		if (_gameState.CurrentGameState == GameState.Gameplay || _gameState.CurrentGameState == GameState.Combat)
+			_inputReader.EnableGameplayInput();
 	}