Added more quest stuff including dialogic quest condition

scripts/CSharp/Common/Inventory/InventoryInstance.cs

@@ -2,6 +2,7 @@
 using System;
 using Godot;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Babushka.scripts.CSharp.Common.Inventory;
 
@@ -120,12 +121,29 @@ public partial class InventoryInstance : Node
     {
         if (destinationSlot < 0 || destinationSlot >= _slots.Count)
             return InventoryActionResult.DestinationDoesNotExists;
-        
+
         if (!_slots[destinationSlot].IsEmpty())
             return InventoryActionResult.DestinationFull;
-        
+
         _slots[destinationSlot].itemInstance = itemInstance;
         EmitSignal(SignalName.InventoryContentsChanged);
         return InventoryActionResult.Success;
     }
-}
+
+    public int TotalItemsOfBlueprint(ItemResource blueprint)
+    {
+        return _slots
+            .Where(i => !i.IsEmpty() && i.itemInstance!.blueprint == blueprint)
+            .Sum(i => i.itemInstance!.amount);
+    }
+
+    public bool HasItems(ItemInstance item)
+    {
+        return TotalItemsOfBlueprint(item.blueprint) >= item.amount;
+    }
+
+    public bool HasItems(IEnumerable<ItemInstance> items)
+    {
+        return items.All(HasItems);
+    }
+}

scripts/CSharp/Common/Inventory/ItemInstance.cs

@@ -1,9 +1,13 @@
-namespace Babushka.scripts.CSharp.Common.Inventory;
+using Godot;
+namespace Babushka.scripts.CSharp.Common.Inventory;
 
-public class ItemInstance
+// Do not instantiate this resource
+// But it has to be a resource because Godot
+[GlobalClass]
+public partial class ItemInstance: Resource 
 {
-    public ItemResource blueprint;
-    public int amount = 1;
+    [Export] public ItemResource blueprint;
+    [Export] public int amount = 1;
 
     public ItemInstance Clone()
     {

scripts/CSharp/Common/Quest/QuestManager.cs

@@ -19,9 +19,6 @@ public partial class QuestManager : Node
     [Signal]
     public delegate void DialogicActiveQuestEventHandler(string value);
 
-    [Export(PropertyHint.ArrayType)]
-    public QuestResource[] questsAccessibleFromDialogic;
-
     public override void _EnterTree()
     {
         Instance = this;
@@ -81,12 +78,4 @@ public partial class QuestManager : Node
         EmitSignalQuestsChanged();
         EmitSignalDialogicActiveQuest(_followQuest?.id ?? "none");
     }
-
-    // functions to call from Dialogic
-    public void DlSetQuestActiveAndFollow(string questId)
-    {
-        var resource = questsAccessibleFromDialogic.First(qr => qr.id == questId);
-        ChangeQuestStatus(resource, QuestStatus.Status.Active);
-        SetFollowQuest(resource);
-    }
 }

scripts/CSharp/Common/Quest/QuestTestingScript.cs

@@ -1,20 +1,22 @@
 using Godot;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using Babushka.scripts.CSharp.Common.Quest;
 using Godot.Collections;
 
 public partial class QuestTestingScript : Node
 {
     [Export(PropertyHint.ArrayType)]
-    private Array<QuestResource> _questsToActivate;
+    private Array<QuestResource>? _questsToActivate;
 
     public override void _EnterTree()
     {
+        Debug.Assert(_questsToActivate != null);
+        
         foreach (var questResource in _questsToActivate)
         {
-            QuestManager.Instance.ChangeQuestStatus(questResource, QuestStatus.Status.Active);
+            QuestManager.Instance!.ChangeQuestStatus(questResource, QuestStatus.Status.Active);
         }
-
     }
 }

scripts/CSharp/Common/QuestBehaviour/DetectInventoryContains.cs

@@ -0,0 +1,33 @@
+using Godot;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Babushka.scripts.CSharp.Common.Inventory;
+using Babushka.scripts.CSharp.Common.Quest;
+
+public partial class DetectInventoryContains : QuestFulfillmentBase
+{
+    [Export(PropertyHint.ArrayType)] private ItemInstance[] _itemsToContain = null!;
+
+    public override void _Ready()
+    {
+        QuestManager.Instance!.QuestsChanged += CheckInventory;
+        InventoryManager.Instance.playerInventory.InventoryContentsChanged += CheckInventory;
+
+        CheckInventory();
+    }
+
+    public override void _ExitTree()
+    {
+        QuestManager.Instance!.QuestsChanged -= CheckInventory;
+        InventoryManager.Instance.playerInventory.InventoryContentsChanged -= CheckInventory;
+    }
+
+    private void CheckInventory()
+    {
+        if (IsQuestActive() && InventoryManager.Instance.playerInventory.HasItems(_itemsToContain))
+        {
+            Fulfill();
+        }
+    }
+}

scripts/CSharp/Common/QuestBehaviour/DetectInventoryContains.cs.uid

@@ -0,0 +1 @@
+uid://c741nyedy26mx

scripts/CSharp/Common/QuestBehaviour/DetectToolCollection.cs

@@ -0,0 +1,6 @@
+using Godot;
+using System;
+
+public partial class DetectToolCollection : Node
+{
+}

scripts/CSharp/Common/QuestBehaviour/DetectToolCollection.cs.uid

@@ -0,0 +1 @@
+uid://caohn76m3n3nm

scripts/CSharp/Common/QuestBehaviour/QuestFulfillmentBase.cs

@@ -0,0 +1,35 @@
+using Godot;
+using System;
+using System.Linq;
+using Babushka.scripts.CSharp.Common.Quest;
+
+public abstract partial class QuestFulfillmentBase : Node
+{
+    [Export] private QuestResource _onActiveQuest;
+    [Export] private QuestResource _toNextQuest;
+    
+    [Export] private bool _whenFulfilledSetActiveQuestToDone = true;
+    [Export] private bool _whenFulfilledSetNextQuestToActive = true;
+    [Export] private bool _whenFulfilledSetNextQuestToFollow = true;
+
+    protected void Fulfill()
+    {
+        if (_whenFulfilledSetActiveQuestToDone)
+        {
+            QuestManager.Instance!.ChangeQuestStatus(_onActiveQuest, QuestStatus.Status.Done);
+        }
+        if (_whenFulfilledSetNextQuestToActive)
+        {
+            QuestManager.Instance!.ChangeQuestStatus(_toNextQuest, QuestStatus.Status.Active);
+        }
+        if (_whenFulfilledSetNextQuestToFollow)
+        {
+            QuestManager.Instance!.SetFollowQuest(_toNextQuest);
+        }
+    }
+
+    protected bool IsQuestActive()
+    {
+        return QuestManager.Instance!.GetActiveQuests().Any(q => q.Key == _onActiveQuest);
+    }
+}

scripts/CSharp/Common/QuestBehaviour/QuestFulfillmentBase.cs.uid

@@ -0,0 +1 @@
+uid://dw158xraniqkd