From: Liza Carvelli <liza@carvel.li>
Date: Tue, 27 Aug 2024 19:14:22 +0000 (+0200)
Subject: Support 'ChatMessage' in CompleteQuest steps
X-Git-Tag: v2.18~23
X-Git-Url: https://git.jacobcasper.com/?a=commitdiff_plain;h=b9061b31909d0171d64c4e066276926e60823021;p=Questionable.git

Support 'ChatMessage' in CompleteQuest steps
---

diff --git a/Questionable/Controller/Steps/Interactions/Interact.cs b/Questionable/Controller/Steps/Interactions/Interact.cs
index c826fef5..b79fa904 100644
--- a/Questionable/Controller/Steps/Interactions/Interact.cs
+++ b/Questionable/Controller/Steps/Interactions/Interact.cs
@@ -28,6 +28,9 @@ internal static class Interact
                 if (step.Emote != null)
                     yield break;
 
+                if (step.ChatMessage != null)
+                    yield break;
+
                 if (step.DataId == null)
                     yield break;
             }
diff --git a/Questionable/Controller/Steps/Interactions/Say.cs b/Questionable/Controller/Steps/Interactions/Say.cs
index 7b8855a1..3d917b33 100644
--- a/Questionable/Controller/Steps/Interactions/Say.cs
+++ b/Questionable/Controller/Steps/Interactions/Say.cs
@@ -17,7 +17,12 @@ internal static class Say
     {
         public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, QuestStep step)
         {
-            if (step.InteractionType != EInteractionType.Say)
+            if (step.InteractionType is EInteractionType.AcceptQuest or EInteractionType.CompleteQuest)
+            {
+                if (step.ChatMessage == null)
+                    return [];
+            }
+            else if (step.InteractionType != EInteractionType.Say)
                 return [];