Merge branch 'master' into omicron

QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/510_A Wild Rose By Any Other Name.json

@@ -44,15 +44,33 @@
       "Sequence": 255,
       "Steps": [
         {
+          "Position": {
+            "X": -64.84354,
+            "Y": -3.6581912,
+            "Z": 186.08156
+          },
           "TerritoryId": 141,
-          "InteractionType": "AttuneAetheryte",
+          "InteractionType": "WalkTo",
-          "Aetheryte": "Central Thanalan - Black Brush Station",
           "AetheryteShortcut": "Ul'dah",
           "AethernetShortcut": [
             "[Ul'dah] Aetheryte Plaza",
             "[Ul'dah] Gate of Nald (Central Thanalan)"
           ]
         },
+        {
+          "Position": {
+            "X": -62.2836,
+            "Y": -3.6582258,
+            "Z": 144.35869
+          },
+          "TerritoryId": 141,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "TerritoryId": 141,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "Central Thanalan - Black Brush Station"
+        },
         {
           "Position": {
             "X": 454.0109,

QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/574_Dressed to Deceive.json

@@ -190,6 +190,10 @@
           "ItemId": 30362,
           "TargetTerritoryId": 140
         },
+        {
+          "TerritoryId": 140,
+          "InteractionType": "EquipRecommended"
+        },
         {
           "Position": {
             "X": -492.96475,

QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/621_For the Children.json

@@ -41,6 +41,7 @@
             "Y": -0.48849356,
             "Z": -278.41507
           },
+          "StopDistance": 0.5,
           "TerritoryId": 145,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",

Questionable.Model/Common/Converter/AetheryteConverter.cs

@@ -35,8 +35,8 @@ public sealed class AetheryteConverter() : EnumConverter<EAetheryteLocation>(Val
 
         { EAetheryteLocation.CoerthasCentralHighlandsCampDragonhead, "Coerthas Central Highlands - Camp Dragonhead" },
         { EAetheryteLocation.MorDhona, "Mor Dhona" },
-        { EAetheryteLocation.GoldSaucer, "Gold Saucer" },
         { EAetheryteLocation.WolvesDenPier, "Wolves' Den Pier" },
+        { EAetheryteLocation.GoldSaucer, "Gold Saucer" },
 
         { EAetheryteLocation.Ishgard, "Ishgard" },
         { EAetheryteLocation.Idyllshire, "Idyllshire" },

Questionable.Model/Common/EAetheryteLocation.cs

@@ -72,9 +72,17 @@ public enum EAetheryteLocation
 
     CoerthasCentralHighlandsCampDragonhead = 23,
     MorDhona = 24,
-    GoldSaucer = 62,
     WolvesDenPier = 55,
 
+    GoldSaucer = 62,
+    GoldSaucerEntranceCardSquares = 63,
+    GoldSaucerWonderSquareEast = 64,
+    GoldSaucerWonderSquareWest = 65,
+    GoldSaucerEventSquare = 66,
+    GoldSaucerCactpotBoard = 67,
+    GoldSaucerRoundSquare = 68,
+    GoldSaucerChocoboSquare = 69,
+
     Ishgard = 70,
     IshgardForgottenKnight = 80,
     IshgardSkysteelManufactory = 81,

Questionable.Model/Questing/Converter/AethernetShardConverter.cs

@@ -46,6 +46,15 @@ public sealed class AethernetShardConverter() : EnumConverter<EAetheryteLocation
         { EAetheryteLocation.LimsaTempestGate, "[Limsa Lominsa] Tempest Gate (Lower La Noscea)" },
         { EAetheryteLocation.LimsaAirship, "[Limsa Lominsa] Airship Landing" },
 
+        { EAetheryteLocation.GoldSaucer, "[Gold Saucer] Aetheryte Plaza" },
+        { EAetheryteLocation.GoldSaucerEntranceCardSquares, "[Gold Saucer] Entrance & Card Squares" },
+        { EAetheryteLocation.GoldSaucerWonderSquareEast, "[Gold Saucer] Wonder Square East" },
+        { EAetheryteLocation.GoldSaucerWonderSquareWest, "[Gold Saucer] Wonder Square West" },
+        { EAetheryteLocation.GoldSaucerEventSquare, "[Gold Saucer] Event Square" },
+        { EAetheryteLocation.GoldSaucerCactpotBoard, "[Gold Saucer] Cactpot Board" },
+        { EAetheryteLocation.GoldSaucerRoundSquare, "[Gold Saucer] Round Square" },
+        { EAetheryteLocation.GoldSaucerChocoboSquare, "[Gold Saucer] Chocobo Square" },
+
         { EAetheryteLocation.Ishgard, "[Ishgard] Aetheryte Plaza" },
         { EAetheryteLocation.IshgardForgottenKnight, "[Ishgard] The Forgotten Knight" },
         { EAetheryteLocation.IshgardSkysteelManufactory, "[Ishgard] Skysteel Manufactory" },

Questionable.Model/common-schema.json

@@ -50,8 +50,8 @@
         "Outer La Noscea - Camp Overlook",
         "Coerthas Central Highlands - Camp Dragonhead",
         "Mor Dhona",
-        "Gold Saucer",
         "Wolves' Den Pier",
+        "Gold Saucer",
         "Ishgard",
         "Idyllshire",
         "Coerthas Western Highlands - Falcon's Nest",
@@ -171,6 +171,14 @@
         "[Limsa Lominsa] Zephyr Gate (Middle La Noscea)",
         "[Limsa Lominsa] Tempest Gate (Lower La Noscea)",
         "[Limsa Lominsa] Airship Landing",
+        "[Gold Saucer] Aetheryte Plaza",
+        "[Gold Saucer] Entrance & Card Squares",
+        "[Gold Saucer] Wonder Square East",
+        "[Gold Saucer] Wonder Square West",
+        "[Gold Saucer] Event Square",
+        "[Gold Saucer] Cactpot Board",
+        "[Gold Saucer] Round Square",
+        "[Gold Saucer] Chocobo Square",
         "[Ishgard] Aetheryte Plaza",
         "[Ishgard] The Forgotten Knight",
         "[Ishgard] Skysteel Manufactory",