From a6f684248fb582e06172b334ac0ffc4589f6769f Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Fri, 23 Aug 2024 17:16:15 +0200
Subject: [PATCH] Add Gold Saucer unlock

---
 .../434_It Could Happen to You.json           |  49 ++++
 .../Gold Saucer/435_World of Wonders.json     | 243 ++++++++++++++++++
 .../MSQ/B-4.1/2968_A Sultana's Duty.json      |  20 +-
 .../Common/EAetheryteLocation.cs              |   1 +
 .../Converter/AethernetShardConverter.cs      |   1 +
 Questionable.Model/common-schema.json         |   1 +
 Questionable/Data/AetheryteData.cs            |  11 +-
 7 files changed, 311 insertions(+), 15 deletions(-)
 create mode 100644 QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/434_It Could Happen to You.json
 create mode 100644 QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/435_World of Wonders.json

diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/434_It Could Happen to You.json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/434_It Could Happen to You.json
new file mode 100644
index 000000000..97124065c
--- /dev/null
+++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/434_It Could Happen to You.json	
@@ -0,0 +1,49 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1011565,
+          "Position": {
+            "X": -78.8739,
+            "Y": 4,
+            "Z": -110.429565
+          },
+          "TerritoryId": 130,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 434
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1004433,
+          "Position": {
+            "X": -23.605713,
+            "Y": 83.19999,
+            "Z": -2.3041382
+          },
+          "TerritoryId": 130,
+          "InteractionType": "CompleteQuest",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Airship Landing"
+          ],
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_SUBGSC001_00434_Q1_000_000",
+              "Yes": true
+            }
+          ],
+          "NextQuestId": 435
+        }
+      ]
+    }
+  ]
+}
diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/435_World of Wonders.json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/435_World of Wonders.json
new file mode 100644
index 000000000..71199ea04
--- /dev/null
+++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Gold Saucer/435_World of Wonders.json	
@@ -0,0 +1,243 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": ["liza", "JerryWester"],
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1011022,
+          "Position": {
+            "X": -38.895264,
+            "Y": -2.7930364E-06,
+            "Z": 97.33728
+          },
+          "StopDistance": 7,
+          "TerritoryId": 144,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "TerritoryId": 144,
+          "InteractionType": "AttuneAethernetShard",
+          "AethernetShard": "[Gold Saucer] Entrance & Card Squares"
+        },
+        {
+          "DataId": 1010448,
+          "Position": {
+            "X": -54.00177,
+            "Y": 1.6000003,
+            "Z": 30.685791
+          },
+          "StopDistance": 5,
+          "TerritoryId": 144,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1011038,
+          "Position": {
+            "X": -58.884644,
+            "Y": 1.6000003,
+            "Z": 27.634033
+          },
+          "StopDistance": 5,
+          "TerritoryId": 144,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1010478,
+          "Position": {
+            "X": -99.19891,
+            "Y": -0.86297023,
+            "Z": 66.11731
+          },
+          "TerritoryId": 144,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1011044,
+          "Position": {
+            "X": -84.45868,
+            "Y": 3.7690625E-06,
+            "Z": 29.06836
+          },
+          "TerritoryId": 144,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 388
+        },
+        {
+          "TerritoryId": 388,
+          "InteractionType": "AttuneAethernetShard",
+          "AethernetShard": "[Gold Saucer] Minion Square"
+        },
+        {
+          "TerritoryId": 388,
+          "InteractionType": "AttuneAethernetShard",
+          "AethernetShard": "[Gold Saucer] Chocobo Square"
+        },
+        {
+          "TerritoryId": 144,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "Gold Saucer",
+          "AethernetShortcut": [
+            "[Gold Saucer] Chocobo Square",
+            "[Gold Saucer] Entrance & Card Squares"
+          ]
+        },
+        {
+          "DataId": 1011080,
+          "Position": {
+            "X": 21.530457,
+            "Y": 3.9997296,
+            "Z": 39.902344
+          },
+          "TerritoryId": 144,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "Position": {
+            "X": 12.5078335,
+            "Y": 4.1552944,
+            "Z": 45.718685
+          },
+          "TerritoryId": 144,
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": 12.60962,
+              "Y": 4.2181597,
+              "Z": 49.651253
+            }
+          }
+        },
+        {
+          "TerritoryId": 144,
+          "InteractionType": "AttuneAethernetShard",
+          "AethernetShard": "[Gold Saucer] Wonder Square West",
+          "DelaySecondsAtStart": 3
+        },
+        {
+          "TerritoryId": 144,
+          "InteractionType": "AttuneAethernetShard",
+          "AethernetShard": "[Gold Saucer] Wonder Square East"
+        },
+        {
+          "TerritoryId": 144,
+          "InteractionType": "None",
+          "AethernetShortcut": [
+            "[Gold Saucer] Wonder Square East",
+            "[Gold Saucer] Aetheryte Plaza"
+          ]
+        },
+        {
+          "TerritoryId": 144,
+          "InteractionType": "AttuneAethernetShard",
+          "AethernetShard": "[Gold Saucer] Event Square"
+        },
+        {
+          "Position": {
+            "X": 89.128395,
+            "Y": -5.000001,
+            "Z": -66.6124
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 144,
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": 85.47148,
+              "Y": -4.7818403,
+              "Z": -63.892
+            },
+            "DelaySeconds": 0.1
+          }
+        },
+        {
+          "TerritoryId": 144,
+          "InteractionType": "AttuneAethernetShard",
+          "AethernetShard": "[Gold Saucer] Cactpot Board",
+          "DelaySecondsAtStart": 3
+        },
+        {
+          "DataId": 1011079,
+          "Position": {
+            "X": 125.078125,
+            "Y": 13.000635,
+            "Z": -13.778931
+          },
+          "StopDistance": 4,
+          "TerritoryId": 144,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 6,
+      "Steps": [
+        {
+          "DataId": 1011084,
+          "Position": {
+            "X": -12.527649,
+            "Y": 3.2546434,
+            "Z": -73.16705
+          },
+          "TerritoryId": 144,
+          "InteractionType": "Interact",
+          "AethernetShortcut": [
+            "[Gold Saucer] Cactpot Board",
+            "[Gold Saucer] Aetheryte Plaza"
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "TerritoryId": 144,
+          "InteractionType": "AttuneAethernetShard",
+          "AethernetShard": "[Gold Saucer] Round Square"
+        },
+        {
+          "DataId": 1010448,
+          "Position": {
+            "X": -54.00177,
+            "Y": 1.6000003,
+            "Z": 30.685791
+          },
+          "StopDistance": 5,
+          "TerritoryId": 144,
+          "InteractionType": "CompleteQuest",
+          "AethernetShortcut": [
+            "[Gold Saucer] Round Square",
+            "[Gold Saucer] Entrance & Card Squares"
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2968_A Sultana's Duty.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2968_A Sultana's Duty.json
index db940a8b3..4b430f944 100644
--- a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2968_A Sultana's Duty.json	
+++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2968_A Sultana's Duty.json	
@@ -85,20 +85,12 @@
       "Sequence": 255,
       "Steps": [
         {
-          "Position": {
-            "X": 12.5078335,
-            "Y": 4.1552944,
-            "Z": 45.718685
-          },
           "TerritoryId": 144,
-          "InteractionType": "Jump",
-          "JumpDestination": {
-            "Position": {
-              "X": 12.60962,
-              "Y": 4.2181597,
-              "Z": 49.651253
-            }
-          }
+          "AethernetShortcut": [
+            "[Gold Saucer] Entrance & Card Squares",
+            "[Gold Saucer] Wonder Square West"
+          ],
+          "InteractionType": "None"
         },
         {
           "DataId": 1024043,
@@ -113,4 +105,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Questionable.Model/Common/EAetheryteLocation.cs b/Questionable.Model/Common/EAetheryteLocation.cs
index 7142cfe79..c17030170 100644
--- a/Questionable.Model/Common/EAetheryteLocation.cs
+++ b/Questionable.Model/Common/EAetheryteLocation.cs
@@ -82,6 +82,7 @@ public enum EAetheryteLocation
     GoldSaucerCactpotBoard = 67,
     GoldSaucerRoundSquare = 68,
     GoldSaucerChocoboSquare = 69,
+    GoldSaucerMinionSquare = 89,
 
     Ishgard = 70,
     IshgardForgottenKnight = 80,
diff --git a/Questionable.Model/Questing/Converter/AethernetShardConverter.cs b/Questionable.Model/Questing/Converter/AethernetShardConverter.cs
index 6367c9d77..efd2a9bd2 100644
--- a/Questionable.Model/Questing/Converter/AethernetShardConverter.cs
+++ b/Questionable.Model/Questing/Converter/AethernetShardConverter.cs
@@ -54,6 +54,7 @@ public sealed class AethernetShardConverter() : EnumConverter<EAetheryteLocation
         { EAetheryteLocation.GoldSaucerCactpotBoard, "[Gold Saucer] Cactpot Board" },
         { EAetheryteLocation.GoldSaucerRoundSquare, "[Gold Saucer] Round Square" },
         { EAetheryteLocation.GoldSaucerChocoboSquare, "[Gold Saucer] Chocobo Square" },
+        { EAetheryteLocation.GoldSaucerMinionSquare, "[Gold Saucer] Minion Square" },
 
         { EAetheryteLocation.Ishgard, "[Ishgard] Aetheryte Plaza" },
         { EAetheryteLocation.IshgardForgottenKnight, "[Ishgard] The Forgotten Knight" },
diff --git a/Questionable.Model/common-schema.json b/Questionable.Model/common-schema.json
index dad297666..b41b12b09 100644
--- a/Questionable.Model/common-schema.json
+++ b/Questionable.Model/common-schema.json
@@ -179,6 +179,7 @@
         "[Gold Saucer] Cactpot Board",
         "[Gold Saucer] Round Square",
         "[Gold Saucer] Chocobo Square",
+        "[Gold Saucer] Minion Square",
         "[Ishgard] Aetheryte Plaza",
         "[Ishgard] The Forgotten Knight",
         "[Ishgard] Skysteel Manufactory",
diff --git a/Questionable/Data/AetheryteData.cs b/Questionable/Data/AetheryteData.cs
index 002f186e6..f921972fd 100644
--- a/Questionable/Data/AetheryteData.cs
+++ b/Questionable/Data/AetheryteData.cs
@@ -126,9 +126,18 @@ internal sealed class AetheryteData
 
                 { EAetheryteLocation.CoerthasCentralHighlandsCampDragonhead, new(223.98718f, 315.7854f, -234.85168f) },
                 { EAetheryteLocation.MorDhona, new(40.024292f, 24.002441f, -668.0247f) },
-                { EAetheryteLocation.GoldSaucer, new(-0.015319824f, 3.4942627f, -0.015319824f) },
                 { EAetheryteLocation.WolvesDenPier, new(40.93994f, 5.4779663f, -14.816589f) },
 
+                { EAetheryteLocation.GoldSaucer, new(-0.015319824f, 3.4942627f, -0.015319824f) },
+                { EAetheryteLocation.GoldSaucerEntranceCardSquares, new(-64.74408f, 2.8839111f, 54.33728f) },
+                { EAetheryteLocation.GoldSaucerWonderSquareEast, new(59.067627f, 23.88031f, 63.035034f) },
+                { EAetheryteLocation.GoldSaucerWonderSquareWest, new(-0.38153076f, 23.88031f, 58.609863f) },
+                { EAetheryteLocation.GoldSaucerEventSquare, new(95.47571f, -2.1210327f, -72.3125f) },
+                { EAetheryteLocation.GoldSaucerCactpotBoard, new(114.42737f, 13.595764f, -38.864807f) },
+                { EAetheryteLocation.GoldSaucerRoundSquare, new(-24.765442f, 6.1798096f, -85.67944f) },
+                { EAetheryteLocation.GoldSaucerChocoboSquare, new(-16.037292f, 2.8839111f, -33.432617f) },
+                { EAetheryteLocation.GoldSaucerMinionSquare, new(50.736206f, 2.8839111f, 19.912964f) },
+
                 { EAetheryteLocation.Ishgard, new(-63.98114f, 11.154297f, 43.9917f) },
                 { EAetheryteLocation.IshgardForgottenKnight, new(45.792236f, 24.551636f, 0.99176025f) },
                 { EAetheryteLocation.IshgardSkysteelManufactory, new(-111.436646f, 16.128723f, -27.054321f) },