From b9061b31909d0171d64c4e066276926e60823021 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 27 Aug 2024 21:14:22 +0200 Subject: [PATCH] Support 'ChatMessage' in CompleteQuest steps --- Questionable/Controller/Steps/Interactions/Interact.cs | 3 +++ Questionable/Controller/Steps/Interactions/Say.cs | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Questionable/Controller/Steps/Interactions/Interact.cs b/Questionable/Controller/Steps/Interactions/Interact.cs index c826fef..b79fa90 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 7b8855a..3d917b3 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 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 [];