From: Liza Carvelli <liza@carvel.li>
Date: Mon, 24 Mar 2025 19:34:01 +0000 (+0100)
Subject: Fix skip condition stuff
X-Git-Tag: v5.0~8
X-Git-Url: https://git.jacobcasper.com/?a=commitdiff_plain;h=c775b8fc27ddce833f51bdba9a585eae57926ffd;p=Questionable.git

Fix skip condition stuff
---

diff --git a/QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs b/QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs
index 3ddda6df..38cc0627 100644
--- a/QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs
+++ b/QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs
@@ -79,6 +79,9 @@ internal static class SkipConditionsExtensions
                             Assignment(nameof(SkipStepConditions.NearPosition),
                                     skipStepConditions.NearPosition, emptyStep.NearPosition)
                                 .AsSyntaxNodeOrToken(),
+                            Assignment(nameof(SkipStepConditions.NotNearPosition),
+                                    skipStepConditions.NotNearPosition, emptyStep.NotNearPosition)
+                                .AsSyntaxNodeOrToken(),
                             Assignment(nameof(SkipStepConditions.ExtraCondition),
                                     skipStepConditions.ExtraCondition, emptyStep.ExtraCondition)
                                 .AsSyntaxNodeOrToken()))));
@@ -154,6 +157,9 @@ internal static class SkipConditionsExtensions
                             Assignment(nameof(skipAetheryteCondition.NearPosition), skipAetheryteCondition.NearPosition,
                                 emptyAetheryte.NearPosition)
                                 .AsSyntaxNodeOrToken(),
+                            Assignment(nameof(skipAetheryteCondition.NotNearPosition), skipAetheryteCondition.NotNearPosition,
+                                    emptyAetheryte.NotNearPosition)
+                                .AsSyntaxNodeOrToken(),
                             Assignment(nameof(skipAetheryteCondition.ExtraCondition), skipAetheryteCondition.ExtraCondition,
                                 emptyAetheryte.ExtraCondition)
                                 .AsSyntaxNodeOrToken()))));
diff --git a/Questionable.Model/Questing/SkipAetheryteCondition.cs b/Questionable.Model/Questing/SkipAetheryteCondition.cs
index 70f0facb..b6e0a9ca 100644
--- a/Questionable.Model/Questing/SkipAetheryteCondition.cs
+++ b/Questionable.Model/Questing/SkipAetheryteCondition.cs
@@ -21,5 +21,6 @@ public sealed class SkipAetheryteCondition
     public EAetheryteLocation? AetheryteUnlocked { get; set; }
     public bool RequiredQuestVariablesNotMet { get; set; }
     public NearPositionCondition? NearPosition { get; set; }
+    public NearPositionCondition? NotNearPosition { get; set; }
     public EExtraSkipCondition? ExtraCondition { get; set; }
 }
diff --git a/Questionable.Model/Questing/SkipStepConditions.cs b/Questionable.Model/Questing/SkipStepConditions.cs
index 08d5c268..7714afb4 100644
--- a/Questionable.Model/Questing/SkipStepConditions.cs
+++ b/Questionable.Model/Questing/SkipStepConditions.cs
@@ -29,6 +29,7 @@ public sealed class SkipStepConditions
     public EAetheryteLocation? AetheryteLocked { get; set; }
     public EAetheryteLocation? AetheryteUnlocked { get; set; }
     public NearPositionCondition? NearPosition { get; set; }
+    public NearPositionCondition? NotNearPosition { get; set; }
     public EExtraSkipCondition? ExtraCondition { get; set; }
 
     public bool HasSkipConditions()
@@ -49,6 +50,7 @@ public sealed class SkipStepConditions
                AetheryteLocked != null ||
                AetheryteUnlocked != null ||
                NearPosition != null ||
+               NotNearPosition != null ||
                ExtraCondition != null;
     }