ARR journal adjustments + some basic gridania quests

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/3860_Never Forget.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/3860_Never Forget.json
index 02861da38e82a694318111a67f7d5b0db21ec216..c54a4a627708d3c4457c81a44e7075eaf80b5ce5 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/3860_Never Forget.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/3860_Never Forget.json
@@ -80,16 +80,60 @@
       "Sequence": 4,
       "Steps": [
         {
-          "DataId": 1000868,
-          "Position": {
-            "X": -192.00433,
-            "Y": 0.9999907,
-            "Z": 211.68835
-          },
-          "StopDistance": 7,
-          "TerritoryId": 129,
-          "InteractionType": "Interact",
-          "TargetTerritoryId": 138
+          "TerritoryId": 135,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "Lower La Noscea - Moraby Drydocks",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Tempest Gate (Lower La Noscea)"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "AetheryteUnlocked": "Lower La Noscea - Moraby Drydocks"
+            },
+            "AethernetShortcutIf": {
+              "AetheryteUnlocked": "Lower La Noscea - Moraby Drydocks"
+            },
+            "StepIf": {
+              "AetheryteUnlocked": "Lower La Noscea - Moraby Drydocks"
+            }
+          }
+        },
+        {
+          "TerritoryId": 134,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "Middle La Noscea - Summerford Farms",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Zephyr Gate (Middle La Noscea)"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "AetheryteUnlocked": "Middle La Noscea - Summerford Farms"
+            },
+            "AethernetShortcutIf": {
+              "AetheryteUnlocked": "Middle La Noscea - Summerford Farms"
+            },
+            "StepIf": {
+              "AetheryteUnlocked": "Middle La Noscea - Summerford Farms"
+            }
+          }
+        },
+        {
+          "TerritoryId": 138,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "Western La Noscea - Swiftperch",
+          "AetheryteShortcut": "Western La Noscea - Aleport",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "AetheryteUnlocked": "Western La Noscea - Swiftperch"
+            },
+            "StepIf": {
+              "AetheryteUnlocked": "Western La Noscea - Swiftperch"
+            }
+          }
         },
         {
           "DataId": 1003393,
@@ -99,7 +143,8 @@
             "Z": 351.76624
           },
           "TerritoryId": 138,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Western La Noscea - Aleport"
         }
       ]
     },

diff --git a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Gridania/24_Coarse Correspondence.json b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Gridania/24_Coarse Correspondence.json
new file mode 100644 (file)
index 0000000..d626066
--- /dev/null
+++ b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Gridania/24_Coarse Correspondence.json
@@ -0,0 +1,40 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1000206,
+          "Position": {
+            "X": 193.59119,
+            "Y": -0.015319824,
+            "Z": 42.160645
+          },
+          "TerritoryId": 132,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1000233,
+          "Position": {
+            "X": 168.65796,
+            "Y": 15.5,
+            "Z": -95.99457
+          },
+          "TerritoryId": 133,
+          "InteractionType": "CompleteQuest",
+          "AethernetShortcut": [
+            "[Gridania] Archers' Guild",
+            "[Gridania] Leatherworkers' Guild & Shaded Bower"
+          ]
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Gridania/25_Quarrels with Squirrels.json b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Gridania/25_Quarrels with Squirrels.json
new file mode 100644 (file)
index 0000000..716e201
--- /dev/null
+++ b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Gridania/25_Quarrels with Squirrels.json
@@ -0,0 +1,85 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1000263,
+          "Position": {
+            "X": 141.55786,
+            "Y": 15.5,
+            "Z": -274.43353
+          },
+          "TerritoryId": 133,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": 112.12561,
+            "Y": 16.504576,
+            "Z": -268.8553
+          },
+          "TerritoryId": 148,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "ComplexCombatData": [
+            {
+              "DataId": 37,
+              "MinimumKillCount": 6,
+              "CompletionQuestVariablesFlags": [
+                {
+                  "Low": 6
+                },
+                null,
+                null,
+                null,
+                null,
+                null
+              ]
+            }
+          ],
+          "AethernetShortcut": [
+            "[Gridania] Lancers' Guild",
+            "[Gridania] Blue Badger Gate (Central Shroud)"
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "Position": {
+            "X": 129.21268,
+            "Y": 25.16017,
+            "Z": -318.4288
+          },
+          "TerritoryId": 148,
+          "InteractionType": "WalkTo",
+          "TargetTerritoryId": 132
+        },
+        {
+          "DataId": 1000263,
+          "Position": {
+            "X": 141.55786,
+            "Y": 15.5,
+            "Z": -274.43353
+          },
+          "TerritoryId": 133,
+          "InteractionType": "CompleteQuest",
+          "AethernetShortcut": [
+            "[Gridania] Aetheryte Plaza",
+            "[Gridania] Lancers' Guild"
+          ]
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Gridania/38_Parsemontrenomics.json b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Gridania/38_Parsemontrenomics.json
new file mode 100644 (file)
index 0000000..2cc4b90
--- /dev/null
+++ b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Gridania/38_Parsemontrenomics.json
@@ -0,0 +1,142 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1000768,
+          "Position": {
+            "X": 172.35059,
+            "Y": 15.5,
+            "Z": -89.951965
+          },
+          "TerritoryId": 133,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": 157.92119,
+            "Y": 15.700001,
+            "Z": -122.177925
+          },
+          "TerritoryId": 133,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "CompletionQuestVariablesFlags": [
+                null,
+                null,
+                null,
+                null,
+                null,
+                32
+              ]
+            }
+          }
+        },
+        {
+          "DataId": 1000238,
+          "Position": {
+            "X": 155.41309,
+            "Y": 15.700001,
+            "Z": -121.812805
+          },
+          "TerritoryId": 133,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
+        },
+        {
+          "Position": {
+            "X": 162.74281,
+            "Y": 15.699926,
+            "Z": -59.43834
+          },
+          "TerritoryId": 133,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "CompletionQuestVariablesFlags": [
+                null,
+                null,
+                null,
+                null,
+                null,
+                64
+              ]
+            }
+          }
+        },
+        {
+          "DataId": 1000218,
+          "Position": {
+            "X": 164.72107,
+            "Y": 15.699947,
+            "Z": -58.18268
+          },
+          "TerritoryId": 133,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        },
+        {
+          "DataId": 1000214,
+          "Position": {
+            "X": 151.4762,
+            "Y": 15.699964,
+            "Z": -63.920105
+          },
+          "StopDistance": 5,
+          "TerritoryId": 133,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1000248,
+          "Position": {
+            "X": 143.05322,
+            "Y": 14.250365,
+            "Z": -250.72101
+          },
+          "TerritoryId": 133,
+          "InteractionType": "CompleteQuest",
+          "AethernetShortcut": [
+            "[Gridania] Leatherworkers' Guild & Shaded Bower",
+            "[Gridania] Lancers' Guild"
+          ]
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Gridania/42_Sylphic Gratitude.json b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Gridania/42_Sylphic Gratitude.json
new file mode 100644 (file)
index 0000000..7118b6c
--- /dev/null
+++ b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Gridania/42_Sylphic Gratitude.json
@@ -0,0 +1,149 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1000286,
+          "Position": {
+            "X": -53.574463,
+            "Y": 7.2025366,
+            "Z": -118.36426
+          },
+          "TerritoryId": 133,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 2000022,
+          "Position": {
+            "X": -52.71997,
+            "Y": 6.7596436,
+            "Z": -109.9718
+          },
+          "TerritoryId": 133,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
+        },
+        {
+          "DataId": 2000020,
+          "Position": {
+            "X": -63.09613,
+            "Y": 6.94281,
+            "Z": -110.85681
+          },
+          "TerritoryId": 133,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
+        },
+        {
+          "DataId": 2000021,
+          "Position": {
+            "X": -37.979797,
+            "Y": 5.996765,
+            "Z": -101.76245
+          },
+          "TerritoryId": 133,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        },
+        {
+          "DataId": 2000025,
+          "Position": {
+            "X": -47.80658,
+            "Y": 5.722107,
+            "Z": -99.4126
+          },
+          "TerritoryId": 133,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            4
+          ]
+        },
+        {
+          "DataId": 2000024,
+          "Position": {
+            "X": -53.75763,
+            "Y": 6.4850464,
+            "Z": -89.52472
+          },
+          "TerritoryId": 133,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            8
+          ]
+        },
+        {
+          "DataId": 2000023,
+          "Position": {
+            "X": -43.808716,
+            "Y": 6.4850464,
+            "Z": -85.80151
+          },
+          "TerritoryId": 133,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            16
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1000286,
+          "Position": {
+            "X": -53.574463,
+            "Y": 7.2025366,
+            "Z": -118.36426
+          },
+          "TerritoryId": 133,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Gridania/49_I Am Millicent, Hear Me Roar.json b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Gridania/49_I Am Millicent, Hear Me Roar.json
new file mode 100644 (file)
index 0000000..a7260e2
--- /dev/null
+++ b/QuestPaths/2.x - A Realm Reborn/Side Quests/Black Shroud/Gridania/49_I Am Millicent, Hear Me Roar.json
@@ -0,0 +1,36 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1000788,
+          "Position": {
+            "X": -43.90027,
+            "Y": 7.0877223,
+            "Z": -136.70563
+          },
+          "TerritoryId": 133,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1000429,
+          "Position": {
+            "X": 56.50415,
+            "Y": 7.9990244,
+            "Z": -132.12793
+          },
+          "TerritoryId": 133,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

diff --git a/Questionable/Data/QuestData.cs b/Questionable/Data/QuestData.cs
index ed3a1c29a7d580d3881811196a09a6acb0c04875..e74f28e5dab96c599e6bf53215bab83d4dd1422e 100644 (file)
--- a/Questionable/Data/QuestData.cs
+++ b/Questionable/Data/QuestData.cs
@@ -59,7 +59,8 @@ internal sealed class QuestData
                 .Where(x => x.RowId > 0)
                 .Where(x => x.IssuerLocation.Row > 0)
                 .Select(x => new QuestInfo(x, questChapters.GetValueOrDefault(x.RowId),
-                    startingCities.GetValueOrDefault(x.RowId))),
+                    startingCities.GetValueOrDefault(x.RowId)))
+                .Where(x => x.QuestId.Value != 1428),
             ..dataManager.GetExcelSheet<SatisfactionNpc>()!
                 .Where(x => x.RowId > 0)
                 .Select(x => new SatisfactionSupplyInfo(x)),
@@ -161,9 +162,22 @@ internal sealed class QuestData
         */
 
         // initial city quests are side quests
-        ((QuestInfo)_quests[new QuestId(107)]).StartingCity = 1;
-        ((QuestInfo)_quests[new QuestId(39)]).StartingCity = 2;
-        ((QuestInfo)_quests[new QuestId(594)]).StartingCity = 3;
+        // unclear if 470 can be started as the required quest isn't available anymore
+        ushort[] limsaSideQuests =
+            [107, 111, 112, 122, 663, 475, 472, 476, 470, 473, 474, 477, 486, 478, 479, 487, 59, 400, 401, 693, 405];
+        foreach (var questId in limsaSideQuests)
+            ((QuestInfo)_quests[new QuestId(questId)]).StartingCity = 1;
+
+        ushort[] gridaniaQuests =
+            [39, 1, 32, 34, 37, 172, 127, 130, 60, 220, 378];
+        foreach (var questId in gridaniaQuests)
+            ((QuestInfo)_quests[new QuestId(questId)]).StartingCity = 2;
+
+        ushort[] uldahSideQuests =
+            [594, 389, 390, 321, 304, 322, 388, 308, 326, 1429, 58, 687, 341, 504, 531, 506, 530, 573, 342, 505];
+        foreach (var questId in uldahSideQuests)
+            ((QuestInfo)_quests[new QuestId(questId)]).StartingCity = 3;
+
 
         // follow-up quests to picking a GC
         AddGcFollowUpQuests();