From: Liza Carvelli <liza@carvel.li>
Date: Sun, 25 Aug 2024 14:24:54 +0000 (+0200)
Subject: Add default combat delay to all non-overworld enemy encounters
X-Git-Tag: v2.16~9
X-Git-Url: https://git.jacobcasper.com/?a=commitdiff_plain;h=0ac2fae4b960b2bd8946a4979772ff3e764874ce;p=Questionable.git

Add default combat delay to all non-overworld enemy encounters
---

diff --git a/Questionable/Controller/Steps/Interactions/Combat.cs b/Questionable/Controller/Steps/Interactions/Combat.cs
index 8776280a..10875126 100644
--- a/Questionable/Controller/Steps/Interactions/Combat.cs
+++ b/Questionable/Controller/Steps/Interactions/Combat.cs
@@ -41,6 +41,7 @@ internal static class Combat
                     ArgumentNullException.ThrowIfNull(step.DataId);
 
                     yield return interactFactory.Interact(step.DataId.Value, quest, EInteractionType.None, true);
+                    yield return new WaitAtEnd.WaitDelay(TimeSpan.FromSeconds(2));
                     yield return CreateTask(quest, sequence, step);
                     break;
                 }
@@ -52,11 +53,15 @@ internal static class Combat
 
                     yield return useItemFactory.OnObject(quest.Id, step.DataId.Value, step.ItemId.Value,
                         step.CompletionQuestVariablesFlags, true);
+                    yield return new WaitAtEnd.WaitDelay(TimeSpan.FromSeconds(2));
                     yield return CreateTask(quest, sequence, step);
                     break;
                 }
 
                 case EEnemySpawnType.AutoOnEnterArea:
+                    if (step.CombatDelaySecondsAtStart == null)
+                        yield return new WaitAtEnd.WaitDelay(TimeSpan.FromSeconds(2));
+
                     // automatically triggered when entering area, i.e. only unmount
                     yield return CreateTask(quest, sequence, step);
                     break;