Merge remote-tracking branch 'origin/main'

# Conflicts: # blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
2025-06-18 10:24:02 +02:00 · 2025-06-18 10:24:02 +02:00 · b268752b0c
commit b268752b0c
parent 6c1e5d826e 29bb16f901
19 changed files with 1033 additions and 212 deletions
--- a/LunaBaker.json
+++ b/LunaBaker.json
@ -0,0 +1,86 @@
+{
+  "initial": [
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "Oh, hi deer!"
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "What can I do for you?"
+    },
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "Could you bake me a Blueberry Pie?"
+    },
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "My mom told me that it's your last day here!"
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "Oh, yes!"
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "I'd love to bake you one!"
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "But for the Cake I need 30 Blueberries."
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "I'll bake it for you if you'll get me them!"
+    },
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "Bet!"
+    }
+  ],
+  "reminder": [
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "Have you already found 30 Berries?"
+    },
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "Not yet!"
+    }
+  ],
+  "success": [
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "Here they are!"
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "Oh, that was fast!"
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "Give me a second"
+    },
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "Sure!"
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "I hope you like your cake!"
+    },
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "IT'S DELICIOUS!"
+    }
+  ],
+  "successRepetition": [
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "I hope you like your cake!"
+    },
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "IT'S DELICIOUS!"
+    }
+  ]
+}
--- a/blueberryPeak/Assets/Prefabs/Stick.prefab
+++ b/blueberryPeak/Assets/Prefabs/Stick.prefab
@ -11,6 +11,7 @@ GameObject:
  - component: {fileID: 2194414921720918247}
  - component: {fileID: 3644914065091979672}
  - component: {fileID: 5566268700457196979}
+  - component: {fileID: 6203737900798821036}
  m_Layer: 0
  m_Name: Stick
  m_TagString: Untagged
@ -72,6 +73,20 @@ BoxCollider:
  serializedVersion: 3
  m_Size: {x: 0.8, y: 0.6, z: 2.07}
  m_Center: {x: 0, y: 0, z: -0.37}
+--- !u!114 &6203737900798821036
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1735147224235397921}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1c09e61be8049e4089c30fd8ea36a7f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  uid: 744b16d2-d1bf-4074-a967-a3c2caf16ecc
+  type: 2
 --- !u!1001 &2343360094618611992
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/blueberryPeak/Assets/Scenes/Beach.unity
+++ b/blueberryPeak/Assets/Scenes/Beach.unity
@ -2343,31 +2343,31 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -0.068
+      value: -11.32159
      objectReference: {fileID: 0}
    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 1.84
+      value: 1.8400002
      objectReference: {fileID: 0}
    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
      propertyPath: m_LocalPosition.z
-      value: -1
+      value: 3.5285406
      objectReference: {fileID: 0}
    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0.7071068
      objectReference: {fileID: 0}
    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0.7071068
      objectReference: {fileID: 0}
    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@ -2381,6 +2381,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 3123357398500628543, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: dialogManagerObject
+      value: 
+      objectReference: {fileID: 1405120884}
    - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
      propertyPath: footstepEvent
      value: 
@ -3626,8 +3630,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 599894787}
  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -12.321591, y: 0, z: 3.5965385}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -5256,8 +5260,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 829142793}
  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -12.321591, y: 0, z: 3.5965385}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -6310,6 +6314,17 @@ Transform:
  m_Children: []
  m_Father: {fileID: 1272620836}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1070390764 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+  m_PrefabInstance: {fileID: 355138358}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 23256d9e6183ca49ab546e357a0a1717, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &1082384625
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -6724,9 +6739,9 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1183713118}
  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 5.5, z: 16.5}
-  m_LocalScale: {x: 2.31, y: 1, z: 1}
+  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -28.821592, y: 5.5, z: 3.5965376}
+  m_LocalScale: {x: 2.3100004, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 1530670983}
@ -6994,9 +7009,9 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1272620832}
  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.2426066, y: -0.09, z: -0.5304832}
-  m_LocalScale: {x: 9.02, y: 9.02, z: 9.02}
+  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -11.791107, y: -0.09000015, z: 3.3539343}
+  m_LocalScale: {x: 9.020002, y: 9.02, z: 9.020002}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 1570084567}
@ -7696,6 +7711,11 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 1158718667690615635, guid: 3e6739342356e4396b5214b3aa5a0864, type: 3}
  m_PrefabInstance: {fileID: 1398503368}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1405120884 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8080420989084569541, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+  m_PrefabInstance: {fileID: 2092541789}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1434359147
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -7784,7 +7804,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 10.06
+      value: -11.761592
      objectReference: {fileID: 0}
    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
      propertyPath: m_LocalPosition.y
@ -7792,23 +7812,23 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
      propertyPath: m_LocalPosition.z
-      value: -0.56
+      value: 13.656539
      objectReference: {fileID: 0}
    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.79863554
+      value: 0.13917308
      objectReference: {fileID: 0}
    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0.60181504
+      value: -0.99026805
      objectReference: {fileID: 0}
    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 364829294786518433, guid: 752d00c28e3278343b00df87a0486005, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@ -8491,31 +8511,31 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 0
+      value: -21.48159
      objectReference: {fileID: 0}
    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 0.01
+      value: 0.010000229
      objectReference: {fileID: 0}
    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 9.16
+      value: 3.5965395
      objectReference: {fileID: 0}
    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0.7071068
      objectReference: {fileID: 0}
    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0.7071068
      objectReference: {fileID: 0}
    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@ -8911,8 +8931,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1591857817}
  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -12.321591, y: 0, z: 3.5965385}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -9766,8 +9786,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1714858950}
  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -12.321591, y: 0, z: 3.5965385}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -10313,8 +10333,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1745342963}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
-  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_LocalRotation: {x: 0.2113091, y: -0.7848855, z: 0.36599812, w: 0.4531539}
+  m_LocalPosition: {x: -12.321591, y: 3, z: 3.5965385}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -12575,31 +12595,31 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 12.93
+      value: -16.941593
      objectReference: {fileID: 0}
    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 5.69
+      value: 5.6900005
      objectReference: {fileID: 0}
    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 4.62
+      value: 16.526543
      objectReference: {fileID: 0}
    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0.7071068
      objectReference: {fileID: 0}
    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0.7071068
      objectReference: {fileID: 0}
    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@ -12613,6 +12633,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 3506049021219160777, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+      propertyPath: playerMovement
+      value: 
+      objectReference: {fileID: 1070390764}
    - target: {fileID: 8080420989084569541, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
      propertyPath: m_Name
      value: Camera
@ -12733,8 +12757,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2120509413}
  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -15.918127, y: 15.914854, z: -12.321588}
+  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 15.914854, z: -12.321588}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -13130,7 +13154,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 15.41
+      value: -13.251594
      objectReference: {fileID: 0}
    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
      propertyPath: m_LocalPosition.y
@ -13138,23 +13162,23 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 0.93
+      value: 19.006542
      objectReference: {fileID: 0}
    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.8186512
+      value: 0.1727887
      objectReference: {fileID: 0}
    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0.5742911
+      value: -0.9849589
      objectReference: {fileID: 0}
    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 8722327694553805759, guid: 5af67f74f00e62c4b9e1067baf2605b6, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@ -13177,8 +13201,8 @@ PrefabInstance:
 SceneRoots:
  m_ObjectHideFlags: 0
  m_Roots:
-  - {fileID: 1272620836}
  - {fileID: 1745342965}
+  - {fileID: 1272620836}
  - {fileID: 355138358}
  - {fileID: 1591857820}
  - {fileID: 1183713119}
--- a/blueberryPeak/Assets/Scenes/Forest.unity
+++ b/blueberryPeak/Assets/Scenes/Forest.unity
@ -282,7 +282,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 119775285696500936, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3}
      propertyPath: m_Name
-      value: BarrierTree
+      value: Model
      objectReference: {fileID: 0}
    - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3}
      propertyPath: m_LocalScale.x
@ -1042,6 +1042,7 @@ GameObject:
  - component: {fileID: 274103194}
  - component: {fileID: 274103193}
  - component: {fileID: 274103192}
+  - component: {fileID: 274103196}
  - component: {fileID: 274103195}
  m_Layer: 0
  m_Name: Beaver
@ -1086,6 +1087,7 @@ MonoBehaviour:
  questFile: {fileID: 4900000, guid: 0229d31aee1eb443783bbf30201078cb, type: 3}
  reward: {fileID: 0}
  requiredItem: {fileID: 0}
+  rewardFunction: {fileID: 11400000, guid: b425dfbbcbbf04242a5d863417e3314a, type: 2}
  isActive: 0
  isCompleted: 0
  quest:
@ -1137,6 +1139,21 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 0
  m_CollisionDetection: 0
+--- !u!114 &274103196
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 274103191}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6f685bc1f7dc742009faac6ea2a3db68, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  treePrefabToDelete: {fileID: 0}
+  treeTagToFind: Tree
+  treeNameToFind: MySpecificTree
 --- !u!4 &298169016 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 2194414921720918247, guid: a18767e7dba904ad48463d5962ebab56, type: 3}
--- a/blueberryPeak/Assets/Scenes/Peak.unity
+++ b/blueberryPeak/Assets/Scenes/Peak.unity
@ -438,63 +438,6 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 36ba7f99c754f45c0b7f382f63c8b54c, type: 3}
  m_PrefabInstance: {fileID: 64232371}
  m_PrefabAsset: {fileID: 0}
--- !u!1001 &109876465
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 12.93
-      objectReference: {fileID: 0}
-    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 5.69
-      objectReference: {fileID: 0}
-    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 4.62
-      objectReference: {fileID: 0}
-    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8080420989084569541, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
-      propertyPath: m_Name
-      value: Camera
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
 --- !u!1001 &128192142
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -1379,6 +1322,79 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 40f1ff2a9b7ed447d95885bbefdd1f5f, type: 3}
  m_PrefabInstance: {fileID: 519407393}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &571911162
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 29.51
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2264011724657500812, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_Name
+      value: SceneSwitcher (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 2620713896011995392, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_Size.y
+      value: 7.89
+      objectReference: {fileID: 0}
+    - target: {fileID: 7419702660099155392, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: switchToScene
+      value: Garden
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 157ff23549611354485c3446833dc2bf, type: 3}
 --- !u!1001 &591585794
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -1797,6 +1813,90 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 36ba7f99c754f45c0b7f382f63c8b54c, type: 3}
  m_PrefabInstance: {fileID: 640478586}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &670796094
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 24.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.04
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2264011724657500812, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_Name
+      value: SceneSwitcher
+      objectReference: {fileID: 0}
+    - target: {fileID: 2620713896011995392, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_Size.y
+      value: 7.89
+      objectReference: {fileID: 0}
+    - target: {fileID: 7419702660099155392, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: switchToScene
+      value: Forest
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+--- !u!114 &671190192 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+  m_PrefabInstance: {fileID: 831158166}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 23256d9e6183ca49ab546e357a0a1717, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &698953582
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2107,6 +2207,103 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 40f1ff2a9b7ed447d95885bbefdd1f5f, type: 3}
  m_PrefabInstance: {fileID: 823171940}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &831158166
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 12.59
+      objectReference: {fileID: 0}
+    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.63
+      objectReference: {fileID: 0}
+    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1.67
+      objectReference: {fileID: 0}
+    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1700798004617451800, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: windSpeedStep
+      value: 40
+      objectReference: {fileID: 0}
+    - target: {fileID: 3123357398500628543, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: dialogManagerObject
+      value: 
+      objectReference: {fileID: 1005792855}
+    - target: {fileID: 3243503616957313541, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: initWindSpeed
+      value: 40
+      objectReference: {fileID: 0}
+    - target: {fileID: 3243503616957313541, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: windSpeedStep
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: cameraTransform
+      value: 
+      objectReference: {fileID: 1536580818}
+    - target: {fileID: 4006268237752810497, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_positionOffsetData.positionOffset.x
+      value: -0.20454216
+      objectReference: {fileID: 0}
+    - target: {fileID: 4006268237752810497, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_positionOffsetData.positionOffset.z
+      value: -0.09521139
+      objectReference: {fileID: 0}
+    - target: {fileID: 5083671953233951116, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5083671953233951116, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5083671953233951116, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7563270112099016041, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: m_Name
+      value: Fox
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
 --- !u!1001 &884726648
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2231,6 +2428,11 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 36ba7f99c754f45c0b7f382f63c8b54c, type: 3}
  m_PrefabInstance: {fileID: 931172133}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1005792855 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8080420989084569541, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+  m_PrefabInstance: {fileID: 1356107834}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1027602858
 GameObject:
  m_ObjectHideFlags: 0
@ -2645,6 +2847,116 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 40f1ff2a9b7ed447d95885bbefdd1f5f, type: 3}
  m_PrefabInstance: {fileID: 1256869175}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1262050695
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1262050696}
+  - component: {fileID: 1262050699}
+  - component: {fileID: 1262050698}
+  - component: {fileID: 1262050697}
+  m_Layer: 0
+  m_Name: Capsule
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1262050696
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1262050695}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.45, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1359041926}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &1262050697
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1262050695}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.5
+  m_Height: 2
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &1262050698
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1262050695}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1262050699
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1262050695}
+  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1001 &1280161261
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2707,6 +3019,146 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 36ba7f99c754f45c0b7f382f63c8b54c, type: 3}
  m_PrefabInstance: {fileID: 1280161261}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1356107834
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 55.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 5.69
+      objectReference: {fileID: 0}
+    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 4.62
+      objectReference: {fileID: 0}
+    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3506049021219160777, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+      propertyPath: playerMovement
+      value: 
+      objectReference: {fileID: 671190192}
+    - target: {fileID: 8080420989084569541, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+      propertyPath: m_Name
+      value: Manager
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+--- !u!1 &1359041925
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1359041926}
+  - component: {fileID: 1359041928}
+  - component: {fileID: 1359041927}
+  m_Layer: 0
+  m_Name: Baker
+  m_TagString: Interactable
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1359041926
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1359041925}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.31999993, y: 0, z: -10.29}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1262050696}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &1359041927
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1359041925}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Radius: 1.54
+  m_Center: {x: 0, y: 1.8, z: 0}
+--- !u!114 &1359041928
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1359041925}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a504573bd52d6f5dfa9a6c6fd707e406, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  questFile: {fileID: 4900000, guid: ffeea50feaf2c4d9aa37a030fab5dfe7, type: 3}
+  reward: {fileID: 0}
+  requiredItem: {fileID: 0}
+  rewardFunction: {fileID: 0}
+  isActive: 0
+  isCompleted: 0
+  quest:
+    id: 0
+    initial: []
+    reminder: []
+    success: []
+    repetition: []
 --- !u!1001 &1362756967
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2793,7 +3245,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1380718710}
  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -3183,8 +3635,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1491684655}
  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1.79, y: 0.5, z: 14.45}
+  m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
+  m_LocalPosition: {x: 1.79, y: 0.5, z: -14.45}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -3239,6 +3691,11 @@ Transform:
  - {fileID: 1362756968}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &1536580818 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8538518650932330681, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3}
+  m_PrefabInstance: {fileID: 1356107834}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1548321048
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -4213,7 +4670,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 370773082187417307, guid: dd90c84612da946b4b6d2456ad3e4c87, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 3.06
+      value: -3.06
      objectReference: {fileID: 0}
    - target: {fileID: 370773082187417307, guid: dd90c84612da946b4b6d2456ad3e4c87, type: 3}
      propertyPath: m_LocalPosition.y
@ -4221,23 +4678,23 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 370773082187417307, guid: dd90c84612da946b4b6d2456ad3e4c87, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 12.31
+      value: -12.31
      objectReference: {fileID: 0}
    - target: {fileID: 370773082187417307, guid: dd90c84612da946b4b6d2456ad3e4c87, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.9233109
+      value: 0.3840535
      objectReference: {fileID: 0}
    - target: {fileID: 370773082187417307, guid: dd90c84612da946b4b6d2456ad3e4c87, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 370773082187417307, guid: dd90c84612da946b4b6d2456ad3e4c87, type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0.3840535
+      value: 0.9233109
      objectReference: {fileID: 0}
    - target: {fileID: 370773082187417307, guid: dd90c84612da946b4b6d2456ad3e4c87, type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 370773082187417307, guid: dd90c84612da946b4b6d2456ad3e4c87, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@ -4262,8 +4719,12 @@ SceneRoots:
  m_Roots:
  - {fileID: 21705131}
  - {fileID: 1097348981}
+  - {fileID: 1359041926}
  - {fileID: 1380718711}
-  - {fileID: 109876465}
  - {fileID: 1491684656}
  - {fileID: 1933470188998383616}
  - {fileID: 1027602859}
+  - {fileID: 1356107834}
+  - {fileID: 831158166}
+  - {fileID: 670796094}
+  - {fileID: 571911162}
--- a/blueberryPeak/Assets/Scripts/Player/PlayerInteraction.cs
+++ b/blueberryPeak/Assets/Scripts/Player/PlayerInteraction.cs
@ -1,26 +1,25 @@
- using System;
 using System.Collections.Generic;
-using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.InputSystem;

-
-
 public class PlayerInteraction : MonoBehaviour
 {
    public float interactRange = 3f;
-    private int blueberryCount = 0;
-    private List<InventoryItem> inventory = new List<InventoryItem>();
    public Dialog[] dialog;
-    int dialogIndex = 0;

    [SerializeField] private InputActionReference InteractAction;
    [SerializeField] private InputActionReference DialogAction;
    [SerializeField] private GameObject dialogManagerObject;
+    private readonly List<GameObject> interactableObjects = new();
+    private int blueberryCount;
+    private int dialogIndex;

    private DialogManager dialogManager;
-    private List<GameObject> interactableObjects = new List<GameObject>();
-    void Start()
+    private List<InventoryItem> inventory = new();
+
+    private bool talking;
+
+    private void Start()
    {
        InteractAction.action.Enable();
        InteractAction.action.performed += OnInteract;
@ -31,21 +30,34 @@ public class PlayerInteraction : MonoBehaviour
        dialogManager = dialogManagerObject.GetComponent<DialogManager>();
    }

-    private bool talking = false;
-    void OnInteract(InputAction.CallbackContext context)
+    private void OnTriggerEnter(Collider other)
    {
+        print("outside");
+        if (other.gameObject.tag == "Interactable")
+        {
+            print("inside");
+            interactableObjects.Add(other.gameObject);
+        }
+    }
+
+    private void OnTriggerExit(Collider other)
+    {
+        if (other.gameObject.tag == "Interactable") interactableObjects.Remove(other.gameObject);
+    }
+
+    private void OnInteract(InputAction.CallbackContext context)
+    {
+        print("talking: " + talking);
        if (context.performed && !talking)
        {
-            GameObject speaker = interactableObjects.Count > 0 ?  ColliderInteractable() : PhysicsRaycastInteractable();
-            
+            var speaker = interactableObjects.Count > 0 ? ColliderInteractable() : PhysicsRaycastInteractable();
+
            dialog = speaker.GetComponent<QuestGiver>().Talk();
-            if (dialog == null)
-            {
-                return;
-            }
-            
+            if (dialog == null) return;
+
            // immedeately start the dialog
            dialogManager.ShowDialog("<b>" + dialog[dialogIndex].speaker + ": " + dialog[dialogIndex].text);
+            print("testo");
            talking = true;
            // skip the 0th dialog entry since it has already been shown
            dialogIndex++;
@ -55,46 +67,41 @@ public class PlayerInteraction : MonoBehaviour
                dialogIndex = 0;
                // reset the dialog to be null so it cannot be scrolled through when not in an interaction
                dialog = null;
+                talking = false;
                dialogManager.HideDialog();
            }
        }
    }
-    
+
    private GameObject PhysicsRaycastInteractable()
    {
-        Ray ray = new Ray(transform.position, transform.forward);
+        var ray = new Ray(transform.position, transform.forward);
        RaycastHit hit;

        if (Physics.Raycast(ray, out hit, interactRange))
-        {
            if (hit.collider.CompareTag("Interactable"))
-            {
                //Debug.Log("Interacted with: " + hit.collider.name);
                // You can add more actions here
                return hit.collider.gameObject;
-            }
-        }

        return null;
    }
-    
+
    private GameObject ColliderInteractable()
    {
-        float closestDistance = float.MaxValue;
-        int pos = -1;
-        for (int i = 0; i < interactableObjects.Count; i++)
-        {
+        var closestDistance = float.MaxValue;
+        var pos = -1;
+        for (var i = 0; i < interactableObjects.Count; i++)
            if ((interactableObjects[i].transform.position - transform.position).magnitude < closestDistance)
            {
                closestDistance = (interactableObjects[i].transform.position - transform.position).magnitude;
                pos = i;
            }
-        }

        return interactableObjects[pos];
    }

-    void onDialogContinue(InputAction.CallbackContext context)
+    private void onDialogContinue(InputAction.CallbackContext context)
    {
        if (context.performed && dialog != null)
        {
@ -110,33 +117,20 @@ public class PlayerInteraction : MonoBehaviour
                dialogIndex = 0;
                // reset the dialog to be null so it cannot be scrolled through when not in an interaction
                dialog = null;
+                print("Dialog ended");
+                print(" " + talking);
                talking = false;
+                print(" " + talking);
                dialogManager.HideDialog();
            }
        }
    }

-    private void OnTriggerEnter(Collider other)
-    {
-        print("outside");
-        if (other.gameObject.tag == "Interactable")
-        {
-            print("inside");
-            interactableObjects.Add(other.gameObject);
-        }
-    }
-
-    private void OnTriggerExit(Collider other)
-    {
-        if (other.gameObject.tag == "Interactable")
-        {
-            interactableObjects.Remove(other.gameObject);
-        }
-    }
    public int GetBlueberryCount()
    {
        return blueberryCount;
    }
+
    public void SetBlueberryCount(int count)
    {
        blueberryCount = count;
@ -170,7 +164,7 @@ public class PlayerInteraction : MonoBehaviour

    public int GetItemQuantity(string itemName)
    {
-        InventoryItem item = inventory.Find(i => i.itemName == itemName);
+        var item = inventory.Find(i => i.itemName == itemName);
        return item != null ? item.quantity : 0;
    }

@ -183,4 +177,4 @@ public class PlayerInteraction : MonoBehaviour
    {
        inventory = items;
    }
-}
+}
--- a/blueberryPeak/Assets/Scripts/Player/TwigInteraction.cs
+++ b/blueberryPeak/Assets/Scripts/Player/TwigInteraction.cs
@ -16,13 +16,16 @@ public class TwigInteraction : MonoBehaviour

    void Start()
    {
+        if (collected)
+        {
+            Destroy(gameObject);
+        }
    }

    void OnTriggerEnter(Collider other)
    {
        if (!collected)
        {
-
            // Play the "Play_BerryWithBush" event if bush has berries
            // PlayBerryWithBushEvent.Post(gameObject);

@ -34,7 +37,6 @@ public class TwigInteraction : MonoBehaviour

            collected = true;
        }
-
    }

    public void SetCollected(bool picked)
--- a/blueberryPeak/Assets/Scripts/Quests/DeleteTreeReward.cs
+++ b/blueberryPeak/Assets/Scripts/Quests/DeleteTreeReward.cs
@ -0,0 +1,51 @@
+// DeleteTreeReward.cs
+
+using UnityEngine;
+
+[CreateAssetMenu(menuName = "Rewards/Delete Specific Tree")]
+public class DeleteTreeReward : RewardFunction
+{
+    // You'd need a way to identify the tree.
+    // Option A: Reference the GameObject directly (if it's a persistent object or a prefab)
+    public GameObject treePrefabToDelete; // If deleting an instance based on a prefab
+
+    // Option B: Find by tag or name
+    public string treeTagToFind = "Tree";
+    public string treeNameToFind = "MySpecificTree"; // If you have unique names
+
+    public override void RewardPlayer()
+    {
+        GameObject targetTree = null;
+
+        if (treePrefabToDelete != null)
+        {
+            // If the reward means destroying any instance of this prefab
+            var sceneObjects = GameObject.FindGameObjectsWithTag(treeTagToFind); // Or just iterate all
+            foreach (var obj in sceneObjects)
+                if (obj.name.Contains(treePrefabToDelete.name)) // Check if it's an instance of the prefab
+                {
+                    targetTree = obj;
+                    break;
+                }
+        }
+        else if (!string.IsNullOrEmpty(treeNameToFind))
+        {
+            targetTree = GameObject.Find(treeNameToFind);
+        }
+        else if (!string.IsNullOrEmpty(treeTagToFind))
+        {
+            targetTree =
+                GameObject.FindWithTag(treeTagToFind); // Finds only one, for multiple you need FindGameObjectsWithTag
+        }
+
+        if (targetTree != null)
+        {
+            Destroy(targetTree);
+            Debug.Log($"Tree '{targetTree.name}' has been deleted as a reward.");
+        }
+        else
+        {
+            Debug.LogWarning("No tree found to delete with the specified criteria.");
+        }
+    }
+}
--- a/blueberryPeak/Assets/Scripts/Quests/DeleteTreeReward.cs.meta
+++ b/blueberryPeak/Assets/Scripts/Quests/DeleteTreeReward.cs.meta
@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 6f685bc1f7dc742009faac6ea2a3db68
--- a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBaker.json
+++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBaker.json
@ -0,0 +1,86 @@
+{
+  "initial": [
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "Oh, hi deer!"
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "What can I do for you?"
+    },
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "Could you bake me a Blueberry Pie?"
+    },
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "My mom told me that it's your last day here!"
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "Oh, yes!"
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "I'd love to bake you one!"
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "But for the Cake I need 30 Blueberries."
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "I'll bake it for you if you'll get me them!"
+    },
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "Bet!"
+    }
+  ],
+  "reminder": [
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "Have you already found 30 Berries?"
+    },
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "Not yet!"
+    }
+  ],
+  "success": [
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "Here they are!"
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "Oh, that was fast!"
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "Give me a second"
+    },
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "Sure!"
+    },
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "I hope you like your cake!"
+    },
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "IT'S DELICIOUS!"
+    }
+  ],
+  "successRepetition": [
+    {
+      "speaker": "<b>Baker</b>",
+      "text": "I hope you like your cake!"
+    },
+    {
+      "speaker": "<b>Luna</b>",
+      "text": "IT'S DELICIOUS!"
+    }
+  ]
+}
--- a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBaker.json.meta
+++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBaker.json.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ffeea50feaf2c4d9aa37a030fab5dfe7
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBeaver.json
+++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBeaver.json
@ -117,6 +117,10 @@
    {
      "speaker": "Beaver",
      "text": "Thanks again for helping me with those twigs!"
+    },
+    {
+      "speaker": "Luna",
+      "text": "No Problem!"
    }
  ]
 }
--- a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaFish.json
+++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaFish.json
@ -77,18 +77,30 @@
    {
      "speaker": "<b>Fish</b>",
      "text": "..."
+    },
+    {
+      "speaker": "<b>Fish</b>",
+      "text": "Man..."
    }
  ],
  "success": [
    {
      "speaker": "<b>Fish</b>",
      "text": "..."
+    },
+    {
+      "speaker": "<b>Fish</b>",
+      "text": "Man..."
    }
  ],
  "successRepetition": [
    {
      "speaker": "<b>Fish</b>",
      "text": "..."
+    },
+    {
+      "speaker": "<b>Fish</b>",
+      "text": "Man..."
    }
  ]
 }
--- a/blueberryPeak/Assets/Scripts/Quests/QuestGiver.cs
+++ b/blueberryPeak/Assets/Scripts/Quests/QuestGiver.cs
@ -1,45 +1,48 @@
+using System;
 using System.Collections.Generic;
 using UnityEngine;

 public class QuestGiver : MonoBehaviour
 {
-
    [SerializeField] private TextAsset questFile;
    [SerializeField] private InventoryItem reward;
    [SerializeField] private InventoryItem requiredItem;
-    public bool isActive = false;
-    public bool isCompleted = false;
+    [SerializeField] private DeleteTreeReward rewardFunction;
+    public bool isActive;
+    public bool isCompleted;

    public QuestData quest;
+
+
    // Start is called once before the first execution of Update after the MonoBehaviour is created
-    void Awake()
+    private void Awake()
    {
        if (questFile == null)
        {
            Debug.LogError("Quest file is not assigned in the inspector.");
            return;
        }
+
        // Load the quest data from the TextAsset
        try
        {
            quest = JsonUtility.FromJson<QuestData>(questFile.text);
        }
-        catch (System.Exception e)
+        catch (Exception e)
        {
            Debug.LogError("Failed to parse quest data: " + e.Message);
-            return;
        }
    }
-    void Start()
-    {

+    private void Start()
+    {
    }

    // Update is called once per frame
-    void Update()
+    private void Update()
    {
-
    }
+
    public QuestData GetCurrentQuest()
    {
        return quest;
@ -58,42 +61,37 @@ public class QuestGiver : MonoBehaviour
            isCompleted = false; // Mark the quest as not completed
        }
    }
+
    public Dialog[] Talk()
    {
        Debug.Log("Talking to quest giver: " + quest.id);
        if (!isActive && isCompleted)
-        {
            // If the quest is completed, return the repetition dialog
            return quest.repetition;
-        }

-        else
+        if (!isActive)
        {
-            if (!isActive)
-            {
-                // Initialize the quest
-                isActive = true;
-                return quest.initial;
-            }
-
-            else if (isActive && isCompleted)
-            {
-                isActive = false; // reset the quest
-                isCompleted = true;
-                // take the Requireditem from the player inventory
-
-                // If the quest is active and completed, return the success dialog
-                return quest.success;
-            }
-
-            else
-            {
-                // If the quest is active but not completed, return the reminder dialog
-                CheckInventory(GameObject.FindGameObjectsWithTag("Player")[0].GetComponent<PlayerInteraction>().GetInventoryItems());
-                return quest.reminder;
-            }
+            // Initialize the quest
+            isActive = true;
+            return quest.initial;
        }
+
+        if (isActive && isCompleted)
+        {
+            isActive = false; // reset the quest
+            isCompleted = true;
+            // take the Requireditem from the player inventory
+
+            // If the quest is active and completed, return the success dialog
+            return quest.success;
+        }
+
+        // If the quest is active but not completed, return the reminder dialog
+        CheckInventory(GameObject.FindGameObjectsWithTag("Player")[0].GetComponent<PlayerInteraction>()
+            .GetInventoryItems());
+        return quest.reminder;
    }
+
    public Dialog[] FinishQuest()
    {
        // If the quest is active and completed, return the success dialog
@ -102,6 +100,8 @@ public class QuestGiver : MonoBehaviour
        GameObject.Find("Player").GetComponent<PlayerInteraction>().RemoveFromInventory(requiredItem);

        reward.giveReward(GameObject.Find("Player")); // Give the reward to the player
+        rewardFunction.RewardPlayer();
+        if (rewardFunction != null) rewardFunction.RewardPlayer();
        return quest.success;
    }
-}
+}
--- a/blueberryPeak/Assets/Scripts/Quests/Reward.cs
+++ b/blueberryPeak/Assets/Scripts/Quests/Reward.cs
@ -1,5 +1,4 @@
 using UnityEngine;
-using UnityEngine.Events;


 // base class for all rewards
@ -10,7 +9,6 @@ public abstract class InventoryItem : ScriptableObject


    public abstract void giveReward(GameObject player);
-
 }

 [CreateAssetMenu(menuName = "GameItems/ItemReward")]
@ -24,7 +22,7 @@ public class ItemReward : InventoryItem

    public override void giveReward(GameObject player)
    {
-        ItemReward reward = ScriptableObject.CreateInstance<ItemReward>();
+        var reward = CreateInstance<ItemReward>();
        reward.itemName = itemName;
        reward.quantity = quantity;
        player.GetComponent<PlayerInteraction>().AddToInventory(reward);
@ -32,3 +30,32 @@ public class ItemReward : InventoryItem
        Debug.Log($"You have received {quantity} {itemName}(s)!");
    }
 }
+
+[CreateAssetMenu(menuName = "GameItems/ItemRewardWithScript")]
+public class ItemRewardWithScript : InventoryItem
+{
+    public ItemRewardWithScript(string itemName, int quantity)
+
+    {
+        this.itemName = itemName;
+
+        this.quantity = quantity;
+    }
+
+
+    public override void giveReward(GameObject player)
+
+    {
+        var reward = CreateInstance<ItemReward>();
+
+        reward.itemName = itemName;
+
+        reward.quantity = quantity;
+
+        player.GetComponent<PlayerInteraction>().AddToInventory(reward);
+
+// Add logic to give an item to the player
+
+        Debug.Log($"You have received {quantity} {itemName}(s)!");
+    }
+}
--- a/blueberryPeak/Assets/Scripts/Quests/RewardFunction.cs
+++ b/blueberryPeak/Assets/Scripts/Quests/RewardFunction.cs
@ -0,0 +1,6 @@
+using UnityEngine;
+
+public abstract class RewardFunction : ScriptableObject
+{
+    public abstract void RewardPlayer();
+}
--- a/blueberryPeak/Assets/Scripts/Quests/RewardFunction.cs.meta
+++ b/blueberryPeak/Assets/Scripts/Quests/RewardFunction.cs.meta
@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 6d6caefd926ac4d49bf69aa7a6d6b5fc
--- a/blueberryPeak/Assets/Scripts/Quests/Rewards/DeleteTree.asset
+++ b/blueberryPeak/Assets/Scripts/Quests/Rewards/DeleteTree.asset
@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6f685bc1f7dc742009faac6ea2a3db68, type: 3}
+  m_Name: DeleteTree
+  m_EditorClassIdentifier: 
+  treePrefabToDelete: {fileID: 0}
+  treeTagToFind: 
+  treeNameToFind: BarrierTree
--- a/blueberryPeak/Assets/Scripts/Quests/Rewards/DeleteTree.asset.meta
+++ b/blueberryPeak/Assets/Scripts/Quests/Rewards/DeleteTree.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b425dfbbcbbf04242a5d863417e3314a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: