From 7731dd065898e98f06222dab9dfea7033ab5fadd Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Fri, 24 Jan 2025 19:40:36 +0100
Subject: [PATCH] Use Vesper Bay aetheryte tickets for 'Operation Archon' if
 you left the Waking Sands

---
 .../4521_Operation Archon.json                | 83 ++++++++++++++++++-
 QuestPaths/quest-v1.json                      |  1 +
 .../Converter/SkipConditionConverter.cs       |  1 +
 .../Questing/EExtraSkipCondition.cs           |  1 +
 .../Controller/Steps/Shared/SkipCondition.cs  |  1 +
 5 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4521_Operation Archon.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4521_Operation Archon.json
index 81c32c86..d470701a 100644
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4521_Operation Archon.json	
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4521_Operation Archon.json	
@@ -5,6 +5,71 @@
     {
       "Sequence": 0,
       "Steps": [
+        {
+          "TerritoryId": 132,
+          "InteractionType": "UseItem",
+          "ItemId": 30362,
+          "TargetTerritoryId": 140,
+          "SkipConditions": {
+            "StepIf": {
+              "InTerritory": [
+                140,
+                212
+              ]
+            }
+          }
+        },
+        {
+          "Position": {
+            "X": -492.96475,
+            "Y": 20.999884,
+            "Z": -380.82272
+          },
+          "TerritoryId": 140,
+          "InteractionType": "WalkTo",
+          "$": "Avoid walking around Waking Sands table",
+          "SkipConditions": {
+            "StepIf": {
+              "InTerritory": [
+                212
+              ]
+            }
+          }
+        },
+        {
+          "DataId": 2001715,
+          "Position": {
+            "X": 23.23944,
+            "Y": 2.090454,
+            "Z": -0.015319824
+          },
+          "TerritoryId": 212,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 212,
+          "SkipConditions": {
+            "StepIf": {
+              "ExtraCondition": "WakingSandsSolar"
+            }
+          }
+        },
+        {
+          "DataId": 2001711,
+          "Position": {
+            "X": -480.9181,
+            "Y": 18.00103,
+            "Z": -386.862
+          },
+          "TerritoryId": 140,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 212,
+          "SkipConditions": {
+            "StepIf": {
+              "InTerritory": [
+                212
+              ]
+            }
+          }
+        },
         {
           "DataId": 1006690,
           "Position": {
@@ -29,7 +94,14 @@
           },
           "TerritoryId": 212,
           "InteractionType": "Interact",
-          "TargetTerritoryId": 212
+          "TargetTerritoryId": 212,
+          "SkipConditions": {
+            "StepIf": {
+              "InTerritory": [
+                140
+              ]
+            }
+          }
         },
         {
           "DataId": 2001716,
@@ -40,7 +112,14 @@
           },
           "TerritoryId": 212,
           "InteractionType": "Interact",
-          "TargetTerritoryId": 140
+          "TargetTerritoryId": 140,
+          "SkipConditions": {
+            "StepIf": {
+              "InTerritory": [
+                140
+              ]
+            }
+          }
         },
         {
           "DataId": 1006578,
diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json
index f0f82637..d1c1b23c 100644
--- a/QuestPaths/quest-v1.json
+++ b/QuestPaths/quest-v1.json
@@ -292,6 +292,7 @@
                   "type": "string",
                   "enum": [
                     "WakingSandsMainArea",
+                    "WakingSandsSolar",
                     "RisingStonesSolar",
                     "RoguesGuild",
                     "DockStorehouse"
diff --git a/Questionable.Model/Questing/Converter/SkipConditionConverter.cs b/Questionable.Model/Questing/Converter/SkipConditionConverter.cs
index 3de919b9..eb917950 100644
--- a/Questionable.Model/Questing/Converter/SkipConditionConverter.cs
+++ b/Questionable.Model/Questing/Converter/SkipConditionConverter.cs
@@ -8,6 +8,7 @@ public sealed class SkipConditionConverter() : EnumConverter<EExtraSkipCondition
     private static readonly Dictionary<EExtraSkipCondition, string> Values = new()
     {
         { EExtraSkipCondition.WakingSandsMainArea, "WakingSandsMainArea" },
+        { EExtraSkipCondition.WakingSandsSolar, "WakingSandsSolar" },
         { EExtraSkipCondition.RisingStonesSolar, "RisingStonesSolar"},
         { EExtraSkipCondition.RoguesGuild, "RoguesGuild"},
         { EExtraSkipCondition.DockStorehouse, "DockStorehouse"},
diff --git a/Questionable.Model/Questing/EExtraSkipCondition.cs b/Questionable.Model/Questing/EExtraSkipCondition.cs
index d9d7b0be..8ec77d49 100644
--- a/Questionable.Model/Questing/EExtraSkipCondition.cs
+++ b/Questionable.Model/Questing/EExtraSkipCondition.cs
@@ -8,6 +8,7 @@ public enum EExtraSkipCondition
 {
     None,
     WakingSandsMainArea,
+    WakingSandsSolar,
     RisingStonesSolar,
 
     /// <summary>
diff --git a/Questionable/Controller/Steps/Shared/SkipCondition.cs b/Questionable/Controller/Steps/Shared/SkipCondition.cs
index ebf1dc1f..bd953539 100644
--- a/Questionable/Controller/Steps/Shared/SkipCondition.cs
+++ b/Questionable/Controller/Steps/Shared/SkipCondition.cs
@@ -307,6 +307,7 @@ internal static class SkipCondition
             return condition switch
             {
                 EExtraSkipCondition.WakingSandsMainArea => territoryType == 212 && position.X < 24,
+                EExtraSkipCondition.WakingSandsSolar => territoryType == 212 && position.X >= 24,
                 EExtraSkipCondition.RisingStonesSolar => territoryType == 351 && position.Z <= -28,
                 EExtraSkipCondition.RoguesGuild => territoryType == 129 && position.Y <= -115,
                 EExtraSkipCondition.DockStorehouse => territoryType == 137 && position.Y <= -20,