From 9a8a7508882313b3a72f5f10da73f56f039336f4 Mon Sep 17 00:00:00 2001 From: AgentSchmisch Date: Thu, 19 Jun 2025 22:44:11 +0200 Subject: [PATCH] scene fixes & Dialog fixes --- blueberryPeak/Assets/Prefabs/Char/Fox.prefab | 16 +++ blueberryPeak/Assets/Scenes/Forest.unity | 90 +++++++++++- blueberryPeak/Assets/Scenes/Garden.unity | 108 ++++++++++++++ blueberryPeak/Assets/Scenes/Market.unity | 134 +++++++++++++++++- blueberryPeak/Assets/Scenes/Peak.unity | 1 + .../Scripts/Quests/DialogFiles/LunaBaker.json | 2 +- .../Quests/DialogFiles/LunaBeaver.json | 2 +- .../Scripts/Quests/DialogFiles/LunaBird.json | 2 +- .../Scripts/Quests/DialogFiles/LunaFish.json | 2 +- .../Quests/DialogFiles/LunaSquirrel.json | 2 +- .../DialogFiles/MomLunaStartDialog.json | 4 +- .../Assets/Scripts/Quests/QuestGiver.cs | 29 +++- 12 files changed, 379 insertions(+), 13 deletions(-) diff --git a/blueberryPeak/Assets/Prefabs/Char/Fox.prefab b/blueberryPeak/Assets/Prefabs/Char/Fox.prefab index 123d950..f1269a2 100644 --- a/blueberryPeak/Assets/Prefabs/Char/Fox.prefab +++ b/blueberryPeak/Assets/Prefabs/Char/Fox.prefab @@ -197,6 +197,7 @@ GameObject: - component: {fileID: 3740866600301396226} - component: {fileID: 4006268237752810497} - component: {fileID: 7028596464194032373} + - component: {fileID: 1459685699946668886} m_Layer: 0 m_Name: Fox m_TagString: Player @@ -3032,6 +3033,7 @@ MonoBehaviour: InteractAction: {fileID: -1432828127832100538, guid: be9004d90ff609fe6a33a9a4fbcfb30a, type: 3} DialogAction: {fileID: -9208633008695466252, guid: be9004d90ff609fe6a33a9a4fbcfb30a, type: 3} dialogManagerObject: {fileID: 0} + inventory: [] --- !u!143 &7486215183385803752 CharacterController: m_ObjectHideFlags: 0 @@ -3129,6 +3131,20 @@ MonoBehaviour: groupIdInternal: 0 valueGuidInternal: groupGuidInternal: +--- !u!114 &1459685699946668886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7563270112099016041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1c09e61be8049e4089c30fd8ea36a7f, type: 3} + m_Name: + m_EditorClassIdentifier: + uid: 10340ba2-f0ee-43f2-9f01-9c013903bb90 + type: 0 --- !u!1001 &2858351906991536319 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/blueberryPeak/Assets/Scenes/Forest.unity b/blueberryPeak/Assets/Scenes/Forest.unity index 49ddf58..9218870 100644 --- a/blueberryPeak/Assets/Scenes/Forest.unity +++ b/blueberryPeak/Assets/Scenes/Forest.unity @@ -398,6 +398,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3644914065091979672, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: twigReward + value: + objectReference: {fileID: 11400000, guid: 2ac23e8781840054c8a835df7fffe208, type: 2} + - target: {fileID: 6203737900798821036, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: uid + value: 230c87b1-2caa-4ba5-842b-29f706ce2961 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -760,6 +768,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3644914065091979672, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: twigReward + value: + objectReference: {fileID: 11400000, guid: 2ac23e8781840054c8a835df7fffe208, type: 2} + - target: {fileID: 6203737900798821036, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: uid + value: 5601021c-48d6-472a-ada8-768f3d492058 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -879,6 +895,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3644914065091979672, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: twigReward + value: + objectReference: {fileID: 11400000, guid: 2ac23e8781840054c8a835df7fffe208, type: 2} + - target: {fileID: 6203737900798821036, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: uid + value: 590653cf-351d-4de9-b7bb-6dfca8710a57 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1044,6 +1068,7 @@ GameObject: - component: {fileID: 274103192} - component: {fileID: 274103196} - component: {fileID: 274103195} + - component: {fileID: 274103197} m_Layer: 0 m_Name: Beaver m_TagString: Interactable @@ -1086,8 +1111,9 @@ MonoBehaviour: m_EditorClassIdentifier: questFile: {fileID: 4900000, guid: 0229d31aee1eb443783bbf30201078cb, type: 3} reward: {fileID: 0} - requiredItem: {fileID: 0} + requiredItem: {fileID: 11400000, guid: 6c18e61a86e4bd8498c238462ae9657e, type: 2} rewardFunction: {fileID: 11400000, guid: b425dfbbcbbf04242a5d863417e3314a, type: 2} + requiredBlueberries: 0 isActive: 0 isCompleted: 0 quest: @@ -1154,6 +1180,20 @@ MonoBehaviour: treePrefabToDelete: {fileID: 0} treeTagToFind: Tree treeNameToFind: MySpecificTree +--- !u!114 &274103197 +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: f1c09e61be8049e4089c30fd8ea36a7f, type: 3} + m_Name: + m_EditorClassIdentifier: + uid: 6eac3503-064d-40f5-a247-3302ed8d8a81 + type: 3 --- !u!4 &298169016 stripped Transform: m_CorrespondingSourceObject: {fileID: 2194414921720918247, guid: a18767e7dba904ad48463d5962ebab56, type: 3} @@ -1369,6 +1409,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3644914065091979672, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: twigReward + value: + objectReference: {fileID: 11400000, guid: 2ac23e8781840054c8a835df7fffe208, type: 2} + - target: {fileID: 6203737900798821036, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: uid + value: aad955af-74af-46e6-b82b-4d6967d115e1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1720,6 +1768,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3644914065091979672, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: twigReward + value: + objectReference: {fileID: 11400000, guid: 2ac23e8781840054c8a835df7fffe208, type: 2} + - target: {fileID: 6203737900798821036, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: uid + value: 2d7bc389-58dc-4cba-9522-7165fb3f1fa8 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -6072,6 +6128,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3644914065091979672, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: twigReward + value: + objectReference: {fileID: 11400000, guid: 2ac23e8781840054c8a835df7fffe208, type: 2} + - target: {fileID: 6203737900798821036, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: uid + value: 4f7f8ff9-a1a1-410e-a570-ec372c0d4a66 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -7558,6 +7622,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3644914065091979672, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: twigReward + value: + objectReference: {fileID: 11400000, guid: 2ac23e8781840054c8a835df7fffe208, type: 2} + - target: {fileID: 6203737900798821036, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: uid + value: c1152be0-e07b-49df-9c73-3445f688ef7a + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -8565,6 +8637,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3644914065091979672, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: twigReward + value: + objectReference: {fileID: 11400000, guid: 2ac23e8781840054c8a835df7fffe208, type: 2} + - target: {fileID: 6203737900798821036, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: uid + value: 02ec167b-4399-485f-90c3-67de66462352 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -8622,6 +8702,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3644914065091979672, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: twigReward + value: + objectReference: {fileID: 11400000, guid: 2ac23e8781840054c8a835df7fffe208, type: 2} + - target: {fileID: 6203737900798821036, guid: a18767e7dba904ad48463d5962ebab56, type: 3} + propertyPath: uid + value: 64215052-e3e1-477b-81c6-29af13d614ed + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/blueberryPeak/Assets/Scenes/Garden.unity b/blueberryPeak/Assets/Scenes/Garden.unity index ce31808..5374088 100644 --- a/blueberryPeak/Assets/Scenes/Garden.unity +++ b/blueberryPeak/Assets/Scenes/Garden.unity @@ -5472,6 +5472,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 54f1b6cd-0d72-49df-86c8-df97ccebcada + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (9) @@ -13911,6 +13915,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: e3784fb3-e1f6-4b7c-a890-1c46560182a4 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (1) @@ -15523,6 +15531,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: b9732337-87ce-4d9f-b8e8-aeda1860f862 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (12) @@ -19379,6 +19391,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 0214e408-140d-4a97-bafb-c15b2e24ef3a + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (17) @@ -21677,6 +21693,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 723b9732-dd7d-45bc-bd4c-301038199281 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (4) @@ -27141,6 +27161,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 6d0fb6fa-6a0a-415d-aa22-121c41eb7814 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (16) @@ -27823,6 +27847,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: eed527b1-29b0-4ac5-b21d-83a8382500ba + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (14) @@ -31419,6 +31447,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 9307a1b9-3623-4514-86ea-ce6fbd911431 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (25) @@ -35832,6 +35864,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: c546079f-53c2-4033-acba-c5505fc508fa + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (22) @@ -36328,6 +36364,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 7dd3cc9c-15e4-451b-95ed-928ec3bca407 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (7) @@ -40672,6 +40712,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: df7002fa-5186-4eef-9239-5a7c630de01e + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (6) @@ -54440,6 +54484,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: bf7577ff-272f-43c3-99ce-bbc8af8a0fe2 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (27) @@ -57238,6 +57286,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 760c557c-7a2b-458f-87aa-041924ef9453 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (23) @@ -59544,6 +59596,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 9fe56f36-94a4-4ef5-b445-f51500e9142e + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (5) @@ -71103,6 +71159,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 78236a8f-4571-4572-ad00-4b960dc162a9 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (18) @@ -79969,6 +80029,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: a6755c20-5462-4e34-b759-a73cb7f0c134 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (20) @@ -93280,6 +93344,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 152aa6a0-c925-4d3b-b22b-72db4ab4dc98 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (3) @@ -94214,6 +94282,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: d05dbb32-2e36-4c35-9790-beeeeda0b550 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (21) @@ -95082,6 +95154,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 3ccac207-f397-4b63-a1e9-217b19f8c0c7 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (2) @@ -100586,6 +100662,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: c4ae2974-cb46-42d3-9e8d-4429b16b1526 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (15) @@ -100834,6 +100914,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: c82133e1-77a8-4552-b26f-37b86e61e599 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (11) @@ -102760,6 +102844,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: b5611503-8ad2-4085-8105-4baf8fec5db8 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (24) @@ -103132,6 +103220,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 2fa5b7bc-329c-443b-96c0-00432b110b13 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (8) @@ -109402,6 +109494,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 9244d4fc-4345-4acd-86b6-7beaf23c6f7f + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (26) @@ -115548,6 +115644,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 68463770-d2d8-41c4-bafd-4434b55b579a + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (13) @@ -117388,6 +117488,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 5d30d18a-bb5a-4216-81bf-e7370802803b + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (19) @@ -117512,6 +117616,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1744853879} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 6d6db208-dbc8-4772-9622-3b3bdc5925b8 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (10) diff --git a/blueberryPeak/Assets/Scenes/Market.unity b/blueberryPeak/Assets/Scenes/Market.unity index 22e0fa1..fd26156 100644 --- a/blueberryPeak/Assets/Scenes/Market.unity +++ b/blueberryPeak/Assets/Scenes/Market.unity @@ -806,6 +806,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1955319718} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: bb1cda07-73a8-4458-99f4-05e8a12325e9 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess @@ -922,7 +926,7 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} m_PrefabInstance: {fileID: 2071877021} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 1485253165} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 23256d9e6183ca49ab546e357a0a1717, type: 3} @@ -936,6 +940,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1955319718} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 90a14e20-4e78-494e-8f61-be0010bcd0c2 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (13) @@ -1055,6 +1063,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1955319718} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: fd4486d5-bab3-4232-aff3-0e04969c216e + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (3) @@ -2421,6 +2433,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1955319718} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 0e1e528e-bde4-4ce0-bfe3-3cc1e0eb2da1 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (2) @@ -2483,6 +2499,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1955319718} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 040ff478-00b3-4f2e-9add-1886130cf3db + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (6) @@ -3399,6 +3419,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1955319718} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: aad198bc-af95-4395-8f8b-11f1f7c9aadd + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (10) @@ -3456,6 +3480,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1955319718} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 7fa807a1-59ed-4102-91b7-6b51ed992cb6 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (4) @@ -3575,6 +3603,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1955319718} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 28b89171-6b19-4760-af78-88e5bce321ef + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (12) @@ -3977,6 +4009,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1955319718} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 1fe8b273-6654-427d-9515-bbb44d6823f3 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (14) @@ -4037,6 +4073,7 @@ GameObject: - component: {fileID: 1330236064} - component: {fileID: 1330236066} - component: {fileID: 1330236065} + - component: {fileID: 1330236067} m_Layer: 0 m_Name: Bird m_TagString: Interactable @@ -4097,6 +4134,7 @@ MonoBehaviour: reward: {fileID: 0} requiredItem: {fileID: 0} rewardFunction: {fileID: 0} + requiredBlueberries: 0 isActive: 0 isCompleted: 0 quest: @@ -4105,6 +4143,20 @@ MonoBehaviour: reminder: [] success: [] repetition: [] +--- !u!114 &1330236067 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1330236063} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1c09e61be8049e4089c30fd8ea36a7f, type: 3} + m_Name: + m_EditorClassIdentifier: + uid: e8ba9273-a51f-47bd-927b-b6c320549019 + type: 1 --- !u!1001 &1358425461 PrefabInstance: m_ObjectHideFlags: 0 @@ -4175,6 +4227,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1955319718} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 644e920d-0502-426d-bb41-32c1bcd9b2c1 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (8) @@ -4286,6 +4342,25 @@ Transform: m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} m_PrefabInstance: {fileID: 1407981806} m_PrefabAsset: {fileID: 0} +--- !u!1 &1485253165 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7563270112099016041, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + m_PrefabInstance: {fileID: 2071877021} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1485253172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1485253165} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1c09e61be8049e4089c30fd8ea36a7f, type: 3} + m_Name: + m_EditorClassIdentifier: + uid: 2bbfab80-3777-4902-84fd-85ea17d40922 + type: 0 --- !u!1 &1558625455 GameObject: m_ObjectHideFlags: 0 @@ -4416,6 +4491,7 @@ GameObject: - component: {fileID: 1575696559} - component: {fileID: 1575696558} - component: {fileID: 1575696557} + - component: {fileID: 1575696560} m_Layer: 0 m_Name: Squirrel m_TagString: Interactable @@ -4460,6 +4536,7 @@ MonoBehaviour: reward: {fileID: 0} requiredItem: {fileID: 0} rewardFunction: {fileID: 0} + requiredBlueberries: 15 isActive: 0 isCompleted: 0 quest: @@ -4484,6 +4561,20 @@ Transform: - {fileID: 1075263069} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1575696560 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1575696556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1c09e61be8049e4089c30fd8ea36a7f, type: 3} + m_Name: + m_EditorClassIdentifier: + uid: 8abab880-4c86-43f8-916a-8d92409d781d + type: 3 --- !u!1 &1592753487 GameObject: m_ObjectHideFlags: 0 @@ -4815,6 +4906,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1955319718} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 65aa71b2-28fd-41e3-9a9b-12066da7c514 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (11) @@ -5354,6 +5449,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1955319718} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 6488bba0-c6ea-4197-aee5-4b543d334076 + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (1) @@ -5809,6 +5908,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1955319718} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: 03433b38-817b-4609-bc4a-804fad488aae + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (5) @@ -6076,6 +6179,7 @@ GameObject: - component: {fileID: 2021140265} - component: {fileID: 2021140264} - component: {fileID: 2021140263} + - component: {fileID: 2021140266} m_Layer: 0 m_Name: Fish m_TagString: Interactable @@ -6120,6 +6224,7 @@ MonoBehaviour: reward: {fileID: 0} requiredItem: {fileID: 0} rewardFunction: {fileID: 0} + requiredBlueberries: 0 isActive: 0 isCompleted: 0 quest: @@ -6144,6 +6249,20 @@ Transform: - {fileID: 705331249} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2021140266 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2021140262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1c09e61be8049e4089c30fd8ea36a7f, type: 3} + m_Name: + m_EditorClassIdentifier: + uid: 31b5de40-0b3e-4e69-ab09-138b20531441 + type: 3 --- !u!1001 &2056916129 PrefabInstance: m_ObjectHideFlags: 0 @@ -6152,6 +6271,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1955319718} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: f6deacf8-4e80-4281-a9ea-592aaa5644bf + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (15) @@ -6353,7 +6476,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7563270112099016041, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + insertIndex: 4 + addedObject: {fileID: 1485253172} m_SourcePrefab: {fileID: 100100000, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} --- !u!1001 &2120212726 PrefabInstance: @@ -6425,6 +6551,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1955319718} m_Modifications: + - target: {fileID: -7050144180352489672, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: uid + value: b94f4487-751a-4caa-86f1-c027e71047ea + objectReference: {fileID: 0} - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess (9) diff --git a/blueberryPeak/Assets/Scenes/Peak.unity b/blueberryPeak/Assets/Scenes/Peak.unity index c1c9b56..d28bb97 100644 --- a/blueberryPeak/Assets/Scenes/Peak.unity +++ b/blueberryPeak/Assets/Scenes/Peak.unity @@ -5089,6 +5089,7 @@ MonoBehaviour: reward: {fileID: 0} requiredItem: {fileID: 0} rewardFunction: {fileID: 0} + requiredBlueberries: 30 isActive: 0 isCompleted: 0 quest: diff --git a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBaker.json b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBaker.json index c714af8..044d3e3 100644 --- a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBaker.json +++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBaker.json @@ -73,7 +73,7 @@ "text": "IT'S DELICIOUS!" } ], - "successRepetition": [ + "repetition": [ { "speaker": "Baker", "text": "I hope you like your cake!" diff --git a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBeaver.json b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBeaver.json index 13e47a2..5a232ff 100644 --- a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBeaver.json +++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBeaver.json @@ -113,7 +113,7 @@ "text": "Now let's see about that log!" } ], - "successRepetition": [ + "repetition": [ { "speaker": "Beaver", "text": "Thanks again for helping me with those twigs!" diff --git a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBird.json b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBird.json index 4381440..c62d353 100644 --- a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBird.json +++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaBird.json @@ -221,7 +221,7 @@ "text": "I... see..." } ], - "successRepetition": [ + "repetition": [ { "speaker": "Bird", "text": "Hello hello hello" diff --git a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaFish.json b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaFish.json index 4087a7f..fcdffca 100644 --- a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaFish.json +++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaFish.json @@ -93,7 +93,7 @@ "text": "Man..." } ], - "successRepetition": [ + "repetition": [ { "speaker": "Fish", "text": "..." diff --git a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaSquirrel.json b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaSquirrel.json index 0c9bb77..a85e96c 100644 --- a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaSquirrel.json +++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/LunaSquirrel.json @@ -93,7 +93,7 @@ "text": "Yup got for you all 10 Berries you've asked me for!" } ], - "successRepetition": [ + "repetition": [ { "speaker": "Squirrel", "text": "See, thanks again for getting those Berries for me!" diff --git a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/MomLunaStartDialog.json b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/MomLunaStartDialog.json index 4fc7f1b..7794c76 100644 --- a/blueberryPeak/Assets/Scripts/Quests/DialogFiles/MomLunaStartDialog.json +++ b/blueberryPeak/Assets/Scripts/Quests/DialogFiles/MomLunaStartDialog.json @@ -1,7 +1,7 @@ { "initial": [ { - "speaker": "Mom", + "speaker": "Mom", "text": "Good Morning Luna!" }, { @@ -68,5 +68,5 @@ } ], "success": [], - "successRepetition": [] + "repetition": [] } \ No newline at end of file diff --git a/blueberryPeak/Assets/Scripts/Quests/QuestGiver.cs b/blueberryPeak/Assets/Scripts/Quests/QuestGiver.cs index 1ae4eba..c2e882e 100644 --- a/blueberryPeak/Assets/Scripts/Quests/QuestGiver.cs +++ b/blueberryPeak/Assets/Scripts/Quests/QuestGiver.cs @@ -8,6 +8,8 @@ public class QuestGiver : MonoBehaviour [SerializeField] private InventoryItem reward; [SerializeField] private ItemReward requiredItem; [SerializeField] public DeleteTreeReward rewardFunction; + [SerializeField] public int requiredBlueberries = 0; + public bool isActive; public bool isCompleted; @@ -57,7 +59,6 @@ public class QuestGiver : MonoBehaviour public void CheckInventory(List inventory) { InventoryItem item = inventory.Find(e => e.itemName == requiredItem.itemName); - print(item.itemName + item.quantity); // Check if the required item is in the player's inventory if (item != null && item.quantity >= requiredItem.quantity) { @@ -90,7 +91,21 @@ public class QuestGiver : MonoBehaviour { if (!isCompleted) { - CheckInventory(GameObject.FindGameObjectsWithTag("Player")[0].GetComponent().GetInventoryItems()); + if (requiredBlueberries > 0) + { + // Check if the player has enough blueberries + PlayerInteraction player = GameObject.Find("Fox").GetComponent(); + if (player.GetBlueberryCount() >= requiredBlueberries) + { + isCompleted = true; // Mark the quest as completed + FinishQuest(); + return quest.success; + } + } + else + { + CheckInventory(GameObject.FindGameObjectsWithTag("Player")[0].GetComponent().GetInventoryItems()); + } } // Re-check after CheckInventory potentially updates the quest @@ -112,7 +127,15 @@ public class QuestGiver : MonoBehaviour { // If the quest is active and completed, return the success dialog PlayerInteraction player = GameObject.Find("Fox").GetComponent(); - player.RemoveFromInventory(requiredItem); + if (requiredBlueberries > 0) + { + player.SetBlueberryCount(player.GetBlueberryCount() - requiredBlueberries); + Debug.Log("Removed " + requiredBlueberries + " blueberries from player."); + } + else + { + player.RemoveFromInventory(requiredItem); + } if (reward) { reward.giveReward(GameObject.Find("Fox")); // Give the reward to the player