shb phys role quests

Minor starting quest adjustments
Pick up DT aether current quests (first four zones) during the MSQ
2024-08-26 01:46:57 +00:00 · 2024-08-25 19:23:29 +02:00 · 2024-08-25 19:23:15 +02:00 · 2024-08-25 16:51:52 +02:00 · 2024-08-25 16:01:02 +02:00 · 2024-08-25 14:45:08 +02:00
60 changed files with 1192 additions and 131 deletions
--- a/QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs
+++ b/QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs
@ -128,6 +128,10 @@ internal static class SkipConditionsExtensions
                                skipAetheryteCondition.InSameTerritory, emptyAetheryte.InSameTerritory),
                            AssignmentList(nameof(SkipAetheryteCondition.InTerritory),
                                skipAetheryteCondition.InTerritory),
+                            AssignmentList(nameof(SkipAetheryteCondition.QuestsAccepted),
+                                skipAetheryteCondition.QuestsAccepted),
+                            AssignmentList(nameof(skipAetheryteCondition.QuestsCompleted),
+                                skipAetheryteCondition.QuestsCompleted),
                            Assignment(nameof(SkipAetheryteCondition.AetheryteLocked),
                                    skipAetheryteCondition.AetheryteLocked, emptyAetheryte.AetheryteLocked)
                                .AsSyntaxNodeOrToken(),
--- a/Quests/ALC/190_So
+++ b/Quests/ALC/190_So
@ -13,7 +13,7 @@
            "Z": 118.88306
          },
          "TerritoryId": 131,
-          "InteractionType": "Interact",
+          "InteractionType": "AcceptQuest",
          "AetheryteShortcut": "Ul'dah",
          "AethernetShortcut": [
            "[Ul'dah] Aetheryte Plaza",
--- a/Quests/ARM/186_So
+++ b/Quests/ARM/186_So
@ -13,7 +13,7 @@
            "Z": 190.41736
          },
          "TerritoryId": 128,
-          "InteractionType": "Interact",
+          "InteractionType": "AcceptQuest",
          "AetheryteShortcut": "Limsa Lominsa",
          "AethernetShortcut": [
            "[Limsa Lominsa] Aetheryte Plaza",
--- a/Quests/ARM/273_Way
+++ b/Quests/ARM/273_Way
@ -35,8 +35,7 @@
              "Prompt": "TEXT_CLSARM011_00273_Q1_000_1",
              "Yes": true
            }
-          ],
-          "NextQuestId": 273
+          ]
        }
      ]
    }
--- a/Quests/BLM/183_So
+++ b/Quests/BLM/183_So
@ -13,7 +13,7 @@
            "Z": 59.952637
          },
          "TerritoryId": 130,
-          "InteractionType": "Interact",
+          "InteractionType": "AcceptQuest",
          "AetheryteShortcut": "Ul'dah",
          "AethernetShortcut": [
            "[Ul'dah] Aetheryte Plaza",
--- a/Quests/BRD/1085_A
+++ b/Quests/BRD/1085_A
@ -122,7 +122,7 @@
          "TerritoryId": 153,
          "InteractionType": "CompleteQuest",
          "Fly": true,
-          "NextQuestId": 1085
+          "NextQuestId": 1086
        }
      ]
    }
--- a/Quests/BSM/291_Way
+++ b/Quests/BSM/291_Way
@ -30,7 +30,7 @@
          "DialogueChoices": [
            {
              "Type": "YesNo",
-              "Prompt": "TEXT_CLSBSM001_00185_Q1_000_1",
+              "Prompt": "TEXT_CLSBSM011_00291_Q1_000_1",
              "Yes": true
            }
          ]
--- a/Quests/BTN/3_Way
+++ b/Quests/BTN/3_Way
@ -35,8 +35,7 @@
              "Prompt": "TEXT_CLSHRV001_00003_Q1_000_1",
              "Yes": true
            }
-          ],
-          "NextQuestId": 3
+          ]
        }
      ]
    }
--- a/Quests/CUL/191_So
+++ b/Quests/CUL/191_So
@ -13,7 +13,7 @@
            "Z": -164.0498
          },
          "TerritoryId": 128,
-          "InteractionType": "Interact",
+          "InteractionType": "AcceptQuest",
          "AetheryteShortcut": "Limsa Lominsa",
          "AethernetShortcut": [
            "[Limsa Lominsa] Aetheryte Plaza",
--- a/Quests/CUL/271_Way
+++ b/Quests/CUL/271_Way
@ -35,8 +35,7 @@
              "Prompt": "TEXT_CLSCUL011_00271_Q1_000_1",
              "Yes": true
            }
-          ],
-          "NextQuestId": 271
+          ]
        }
      ]
    }
--- a/Quests/DRG/180_So
+++ b/Quests/DRG/180_So
@ -24,7 +24,7 @@
              "Yes": true
            }
          ],
-          "InteractionType": "Interact"
+          "InteractionType": "AcceptQuest"
        }
      ]
    }
--- a/Quests/FSH/1107_Way
+++ b/Quests/FSH/1107_Way
@ -13,7 +13,7 @@
            "Z": 150.04187
          },
          "TerritoryId": 129,
-          "InteractionType": "Interact",
+          "InteractionType": "AcceptQuest",
          "AetheryteShortcut": "Limsa Lominsa",
          "AethernetShortcut": [
            "[Limsa Lominsa] Aetheryte Plaza",
--- a/Quests/FSH/1134_So
+++ b/Quests/FSH/1134_So
@ -38,22 +38,6 @@
          "InteractionType": "AcceptQuest"
        }
      ]
-    },
-    {
-      "Sequence": 255,
-      "Steps": [
-        {
-          "DataId": 1000857,
-          "Position": {
-            "X": -165.27051,
-            "Y": 5.2500057,
-            "Z": 164.29382
-          },
-          "TerritoryId": 129,
-          "InteractionType": "CompleteQuest",
-          "NextQuestId": 1108
-        }
-      ]
    }
  ]
 }
--- a/Quests/GSM/187_So
+++ b/Quests/GSM/187_So
@ -13,7 +13,7 @@
            "Z": 97.24573
          },
          "TerritoryId": 131,
-          "InteractionType": "Interact",
+          "InteractionType": "AcceptQuest",
          "AetheryteShortcut": "Ul'dah",
          "AethernetShortcut": [
            "[Ul'dah] Aetheryte Plaza",
--- a/Quests/GSM/608_Way
+++ b/Quests/GSM/608_Way
@ -35,8 +35,7 @@
              "Prompt": "TEXT_CLSGLD011_00608_A1_000_1",
              "Yes": true
            }
-          ],
-          "NextQuestId": 608
+          ]
        }
      ]
    }
--- a/Leatherworker.json
+++ b/Leatherworker.json
@ -35,8 +35,7 @@
              "Prompt": "TEXT_CLSTAN000_00105_Q1_000_1",
              "Yes": true
            }
-          ],
-          "NextQuestId": 105
+          ]
        }
      ]
    }
--- a/Leatherworker.json
+++ b/Leatherworker.json
@ -13,7 +13,7 @@
            "Z": -147.41742
          },
          "TerritoryId": 133,
-          "InteractionType": "Interact",
+          "InteractionType": "AcceptQuest",
          "AetheryteShortcut": "Gridania",
          "AethernetShortcut": [
            "[Gridania] Aetheryte Plaza",
--- a/Quests/MNK/178_So
+++ b/Quests/MNK/178_So
@ -13,7 +13,7 @@
            "Z": -51.163513
          },
          "TerritoryId": 130,
-          "InteractionType": "Interact",
+          "InteractionType": "AcceptQuest",
          "AetheryteShortcut": "Ul'dah",
          "SkipConditions": {
            "AetheryteShortcutIf": {
--- a/Quests/SMN/451_So
+++ b/Quests/SMN/451_So
@ -3,9 +3,10 @@
  "Author": "Cacahuetes",
  "QuestSequence": [
    {
-        "Sequence": 255,
+      "Sequence": 0,
      "Steps": [
-          { "DataId": 1000895,
+        {
+          "DataId": 1000895,
          "Position": {
            "X": -335.74432,
            "Y": 12.899764,
@ -39,4 +40,3 @@
    }
  ]
 }
-  
--- a/Quests/WAR/179_So
+++ b/Quests/WAR/179_So
@ -13,7 +13,7 @@
            "Z": -245.80762
          },
          "TerritoryId": 128,
-          "InteractionType": "Interact",
+          "InteractionType": "AcceptQuest",
          "AetheryteShortcut": "Limsa Lominsa",
          "AethernetShortcut": [
            "[Limsa Lominsa] Aetheryte Plaza",
--- a/Quests/WAR/310_Way
+++ b/Quests/WAR/310_Way
@ -28,7 +28,7 @@
            "Z": -255.8786
          },
          "TerritoryId": 128,
-          "InteractionType": "AcceptQuest",
+          "InteractionType": "CompleteQuest",
          "DialogueChoices": [
            {
              "Type": "YesNo",
--- a/Quests/WVR/189_So
+++ b/Quests/WVR/189_So
@ -13,7 +13,7 @@
            "Z": 98.039185
          },
          "TerritoryId": 131,
-          "InteractionType": "Interact",
+          "InteractionType": "AcceptQuest",
          "AetheryteShortcut": "Ul'dah",
          "AethernetShortcut": [
            "[Ul'dah] Aetheryte Plaza",
--- a/Quests/WVR/534_Way
+++ b/Quests/WVR/534_Way
@ -35,8 +35,7 @@
              "Prompt": "TEXT_CLSWVR011_00534_SYSTEM_Q0",
              "Yes": true
            }
-          ],
-          "NextQuestId": 534
+          ]
        }
      ]
    }
--- a/Quests/Physical/3273_No
+++ b/Quests/Physical/3273_No
@ -0,0 +1,120 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "Fifi",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1030126,
+          "Position": {
+            "X": -18.143005,
+            "Y": 3.9998174,
+            "Z": 235.40088
+          },
+          "TerritoryId": 819,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Crystarium",
+          "AethernetShortcut": [
+            "[Crystarium] Aetheryte Plaza",
+            "[Crystarium] The Pendants"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1030127,
+          "Position": {
+            "X": 200.12195,
+            "Y": -0.39141315,
+            "Z": 389.45593
+          },
+          "TerritoryId": 813,
+          "InteractionType": "Interact",
+          "AethernetShortcut": [
+            "[Crystarium] The Pendants",
+            "[Crystarium] Tessellation (Lakeland)"
+          ],
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 2010396,
+          "Position": {
+            "X": 195.48328,
+            "Y": -0.7477417,
+            "Z": 370.93152
+          },
+          "TerritoryId": 813,
+          "InteractionType": "UseItem",
+          "ItemId": 2002718
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 2010397,
+          "Position": {
+            "X": 203.90625,
+            "Y": -0.5340576,
+            "Z": 389.82214
+          },
+          "TerritoryId": 813,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [10872]
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1031013,
+          "Position": {
+            "X": 200.09155,
+            "Y": -0.39049676,
+            "Z": 389.4254
+          },
+          "TerritoryId": 813,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1030964,
+          "Position": {
+            "X": -18.143005,
+            "Y": 3.9998174,
+            "Z": 235.40088
+          },
+          "TerritoryId": 819,
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 3274,
+          "AetheryteShortcut": "Crystarium",
+          "AethernetShortcut": [
+            "[Crystarium] Aetheryte Plaza",
+            "[Crystarium] The Pendants"
+          ]
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/Physical/3274_Vengeance
+++ b/Quests/Physical/3274_Vengeance
@ -0,0 +1,119 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "Fifi",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1030964,
+          "Position": {
+            "X": -18.143005,
+            "Y": 3.9998174,
+            "Z": 235.40088
+          },
+          "TerritoryId": 819,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Crystarium",
+          "AethernetShortcut": [
+            "[Crystarium] Aetheryte Plaza",
+            "[Crystarium] The Pendants"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1030130,
+          "Position": {
+            "X": 469.0775,
+            "Y": -32.782784,
+            "Z": -288.44135
+          },
+          "TerritoryId": 815,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Amh Araeng - Mord Souq",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 2010399,
+          "Position": {
+            "X": 613.39734,
+            "Y": -33.585205,
+            "Z": -180.95679
+          },
+          "TerritoryId": 815,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 2010400,
+          "Position": {
+            "X": 536.9192,
+            "Y": -33.737732,
+            "Z": 38.83423
+          },
+          "TerritoryId": 815,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [10873],
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 2010401,
+          "Position": {
+            "X": 469.0775,
+            "Y": -32.791687,
+            "Z": -288.44135
+          },
+          "TerritoryId": 815,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1030964,
+          "Position": {
+            "X": -18.143005,
+            "Y": 3.9998174,
+            "Z": 235.40088
+          },
+          "TerritoryId": 819,
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 3275,
+          "AetheryteShortcut": "Crystarium",
+          "AethernetShortcut": [
+            "[Crystarium] Aetheryte Plaza",
+            "[Crystarium] The Pendants"
+          ]
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/Physical/3275_Freedom
+++ b/Quests/Physical/3275_Freedom
@ -0,0 +1,140 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "Fifi",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1030964,
+          "Position": {
+            "X": -18.143005,
+            "Y": 3.9998174,
+            "Z": 235.40088
+          },
+          "TerritoryId": 819,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Crystarium",
+          "AethernetShortcut": [
+            "[Crystarium] Aetheryte Plaza",
+            "[Crystarium] The Pendants"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1030135,
+          "Position": {
+            "X": -251.42291,
+            "Y": 22.19962,
+            "Z": 325.7953
+          },
+          "TerritoryId": 814,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Kholusia - Wright",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 2010402,
+          "Position": {
+            "X": -550.7744,
+            "Y": 29.160034,
+            "Z": 363.4851
+          },
+          "TerritoryId": 814,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 2010403,
+          "Position": {
+            "X": -550.98804,
+            "Y": 41.33667,
+            "Z": 252.24683
+          },
+          "TerritoryId": 814,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1030136,
+          "Position": {
+            "X": -192.58417,
+            "Y": 26.771265,
+            "Z": 248.46265
+          },
+          "TerritoryId": 814,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "DataId": 1030140,
+          "Position": {
+            "X": 67.64319,
+            "Y": 82.001656,
+            "Z": -53.330322
+          },
+          "TerritoryId": 820,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Eulmore"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1030964,
+          "Position": {
+            "X": -18.143005,
+            "Y": 3.9998174,
+            "Z": 235.40088
+          },
+          "TerritoryId": 819,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Crystarium",
+          "AethernetShortcut": [
+            "[Crystarium] Aetheryte Plaza",
+            "[Crystarium] The Pendants"
+          ],
+          "NextQuestId": 3276,
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_LUCKBA321_03275_Q1_000_000",
+              "Answer": "TEXT_LUCKBA321_03275_A1_000_001"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/Physical/3276_The
+++ b/Quests/Physical/3276_The
@ -0,0 +1,83 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "Fifi",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1030964,
+          "Position": {
+            "X": -18.143005,
+            "Y": 3.9998174,
+            "Z": 235.40088
+          },
+          "TerritoryId": 819,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Crystarium",
+          "AethernetShortcut": [
+            "[Crystarium] Aetheryte Plaza",
+            "[Crystarium] The Pendants"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1030144,
+          "Position": {
+            "X": 94.68213,
+            "Y": 37.377014,
+            "Z": 611.1085
+          },
+          "TerritoryId": 814,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "Kholusia - Wright"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1030146,
+          "Position": {
+            "X": -190.1427,
+            "Y": 12.748831,
+            "Z": 591.6686
+          },
+          "TerritoryId": 817,
+          "InteractionType": "SinglePlayerDuty",
+          "AetheryteShortcut": "Rak'tika - Slitherbough",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1030144,
+          "Position": {
+            "X": 94.68213,
+            "Y": 37.377014,
+            "Z": 611.1085
+          },
+          "TerritoryId": 814,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Kholusia - Wright",
+          "Fly": true,
+          "NextQuestId": 3277
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/Physical/3277_Fellowship
+++ b/Quests/Physical/3277_Fellowship
@ -0,0 +1,118 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "Fifi",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1030145,
+          "Position": {
+            "X": 93.461426,
+            "Y": 37.43559,
+            "Z": 611.50525
+          },
+          "TerritoryId": 814,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Kholusia - Wright",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          },
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 2010405,
+          "Position": {
+            "X": -33.707214,
+            "Y": 3.982544,
+            "Z": 205.70679
+          },
+          "TerritoryId": 819,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Crystarium",
+          "AethernetShortcut": [
+            "[Crystarium] Aetheryte Plaza",
+            "[Crystarium] The Pendants"
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1027323,
+          "Position": {
+            "X": -42.893127,
+            "Y": 3.9998171,
+            "Z": 242.08435
+          },
+          "TerritoryId": 819,
+          "InteractionType": "Interact"
+        },
+        {
+          "DataId": 1027238,
+          "Position": {
+            "X": -15.487976,
+            "Y": 3.9998171,
+            "Z": 215.3811
+          },
+          "TerritoryId": 819,
+          "InteractionType": "Interact"
+        },
+        {
+          "DataId": 1030147,
+          "Position": {
+            "X": 0.59503174,
+            "Y": 3.9998174,
+            "Z": 209.27734
+          },
+          "TerritoryId": 819,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1030148,
+          "Position": {
+            "X": -246.57056,
+            "Y": 10.152376,
+            "Z": 678.21765
+          },
+          "TerritoryId": 817,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Rak'tika - Slitherbough",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1030145,
+          "Position": {
+            "X": 93.461426,
+            "Y": 37.43559,
+            "Z": 611.50525
+          },
+          "TerritoryId": 814,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Kholusia - Wright",
+          "Fly": true,
+          "NextQuestId": 3278
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/Physical/3278_Courage
+++ b/Quests/Physical/3278_Courage
@ -0,0 +1,122 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "Fifi",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1030144,
+          "Position": {
+            "X": 94.68213,
+            "Y": 37.377014,
+            "Z": 611.1085
+          },
+          "TerritoryId": 814,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Kholusia - Wright",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          },
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1027253,
+          "Position": {
+            "X": 17.502075,
+            "Y": 19.999794,
+            "Z": -190.41736
+          },
+          "TerritoryId": 819,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Crystarium",
+          "AethernetShortcut": [
+            "[Crystarium] Aetheryte Plaza",
+            "[Crystarium] The Crystalline Mean"
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 2010406,
+          "Position": {
+            "X": -17.013855,
+            "Y": 4.470825,
+            "Z": 234.97363
+          },
+          "TerritoryId": 819,
+          "InteractionType": "Interact",
+          "AethernetShortcut": [
+            "[Crystarium] The Crystalline Mean",
+            "[Crystarium] The Pendants"
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1030990,
+          "Position": {
+            "X": -246.57056,
+            "Y": 10.152376,
+            "Z": 678.21765
+          },
+          "TerritoryId": 817,
+          "InteractionType": "SinglePlayerDuty",
+          "AetheryteShortcut": "Rak'tika - Slitherbough",
+          "Fly": true
+        }
+      ]
+    },
+    { "Sequence": 4, "Steps": [] },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "DataId": 1030145,
+          "Position": {
+            "X": 93.461426,
+            "Y": 37.43559,
+            "Z": 611.50525
+          },
+          "TerritoryId": 814,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "Kholusia - Wright"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1030964,
+          "Position": {
+            "X": -18.143005,
+            "Y": 3.9998174,
+            "Z": 235.40088
+          },
+          "TerritoryId": 819,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Crystarium",
+          "AethernetShortcut": [
+            "[Crystarium] Aetheryte Plaza",
+            "[Crystarium] The Pendants"
+          ]
+        }
+      ]
+    }
+  ]
+}
--- a/Currents/Kozama'uka/5085_All
+++ b/Currents/Kozama'uka/5085_All
@ -102,7 +102,8 @@
            "Z": 342.85498
          },
          "TerritoryId": 1188,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "Mount": true
        }
      ]
    }
--- a/Currents/Shaaloani/5138_Rroneek
+++ b/Currents/Shaaloani/5138_Rroneek
@ -20,6 +20,15 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "Position": {
+            "X": 323.5058,
+            "Y": -16.330368,
+            "Z": -254.18399
+          },
+          "TerritoryId": 1190,
+          "InteractionType": "WalkTo"
+        },
        {
          "DataId": 1050656,
          "Position": {
--- a/Currents/Shaaloani/5140_When
+++ b/Currents/Shaaloani/5140_When
@ -28,7 +28,8 @@
            "Z": 427.2068
          },
          "TerritoryId": 1190,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "Mount": true
        }
      ]
    },
@ -50,6 +51,27 @@
    {
      "Sequence": 3,
      "Steps": [
+        {
+          "Position": {
+            "X": 369.3906,
+            "Y": 5.9371996,
+            "Z": 417.16574
+          },
+          "TerritoryId": 1190,
+          "InteractionType": "WalkTo",
+          "$": "Shaaloani Hhusatahwi Saloon Stairs (top)"
+        },
+        {
+          "Position": {
+            "X": 359.11545,
+            "Y": 1.9823306,
+            "Z": 419.5714
+          },
+          "TerritoryId": 1190,
+          "InteractionType": "WalkTo",
+          "$": "Shaaloani Hhusatahwi Saloon Stairs (bottom)",
+          "DisableNavmesh": true
+        },
        {
          "DataId": 1051286,
          "Position": {
--- a/T'el/5094_Secrets
+++ b/T'el/5094_Secrets
@ -174,6 +174,17 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "DataId": 2013948,
+          "Position": {
+            "X": 610.7728,
+            "Y": 9.597839,
+            "Z": 233.05103
+          },
+          "TerritoryId": 1189,
+          "InteractionType": "AttuneAetherCurrent",
+          "AetherCurrentId": 2818440
+        },
        {
          "DataId": 1051073,
          "Position": {
--- a/Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4868_A
+++ b/Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4868_A
@ -151,13 +151,21 @@
      "Steps": [
        {
          "Position": {
-            "X": -510.96463,
-            "Y": -0.47684515,
-            "Z": -305.96155
+            "X": -510.37933,
+            "Y": -0.39999998,
+            "Z": -277.78192
          },
          "TerritoryId": 1188,
-          "InteractionType": "WalkTo",
-          "Comment": "Waypoint after swimming through the river"
+          "InteractionType": "WalkTo"
+        },
+        {
+          "Position": {
+            "X": -521.0261,
+            "Y": -0.40000004,
+            "Z": -329.19336
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "WalkTo"
        },
        {
          "DataId": 2013936,
--- a/Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4870_Knowing
+++ b/Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4870_Knowing
@ -12,7 +12,7 @@
            "Y": 9.773315,
            "Z": -533.135
          },
-          "StopDistance": 5,
+          "StopDistance": 7,
          "TerritoryId": 1188,
          "InteractionType": "AcceptQuest"
        }
@ -135,6 +135,28 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "DataId": 1048782,
+          "Position": {
+            "X": -68.52832,
+            "Y": 6.536739,
+            "Z": -486.53394
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 5064
+        },
+        {
+          "DataId": 1051237,
+          "Position": {
+            "X": -251.20929,
+            "Y": 5.5572896,
+            "Z": -554.89435
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 5081
+        },
        {
          "DataId": 1046537,
          "Position": {
--- a/Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4872_Traders
+++ b/Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4872_Traders
@ -21,6 +21,11 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "TerritoryId": 1187,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "Urqopacha - Wachunpelo"
+        },
        {
          "DataId": 1046557,
          "Position": {
@ -39,11 +44,6 @@
            128
          ]
        },
-        {
-          "TerritoryId": 1187,
-          "InteractionType": "AttuneAetheryte",
-          "Aetheryte": "Urqopacha - Wachunpelo"
-        },
        {
          "DataId": 1046559,
          "Position": {
--- a/Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4877_Knowing
+++ b/Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4877_Knowing
@ -52,6 +52,30 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "DataId": 1050684,
+          "Position": {
+            "X": 391.37854,
+            "Y": -156.07434,
+            "Z": -388.50995
+          },
+          "TerritoryId": 1187,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 5039,
+          "Comment": "Traveler to the Rescue"
+        },
+        {
+          "DataId": 1051195,
+          "Position": {
+            "X": 383.29138,
+            "Y": -154.50243,
+            "Z": -420.49292
+          },
+          "TerritoryId": 1187,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 5051,
+          "Comment": "Crisis of Corruption"
+        },
        {
          "DataId": 1046537,
          "Position": {
--- a/Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4878_The
+++ b/Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4878_The
@ -100,7 +100,7 @@
            "Y": -19.725424,
            "Z": 203.72314
          },
-          "StopDistance": 5,
+          "StopDistance": 7,
          "TerritoryId": 1185,
          "InteractionType": "CompleteQuest"
        }
--- a/Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4879_For
+++ b/Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4879_For
@ -15,6 +15,7 @@
            "Y": -19.725424,
            "Z": 203.72314
          },
+          "StopDistance": 7,
          "TerritoryId": 1185,
          "InteractionType": "AcceptQuest"
        }
--- a/Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4884_The
+++ b/Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4884_The
@ -63,6 +63,28 @@
    {
      "Sequence": 3,
      "Steps": [
+        {
+          "DataId": 1051263,
+          "Position": {
+            "X": -521.0193,
+            "Y": 121.63345,
+            "Z": 319.38647
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 5085
+        },
+        {
+          "DataId": 1048855,
+          "Position": {
+            "X": -491.63043,
+            "Y": 121.63846,
+            "Z": 271.50366
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 5074
+        },
        {
          "DataId": 1046876,
          "Position": {
--- a/Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4889_History's
+++ b/Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4889_History's
@ -12,6 +12,7 @@
            "Y": 119.49004,
            "Z": 190.72253
          },
+          "StopDistance": 5,
          "TerritoryId": 1188,
          "InteractionType": "AcceptQuest"
        }
@ -29,7 +30,8 @@
          },
          "TerritoryId": 1188,
          "InteractionType": "Interact",
-          "AetheryteShortcut": "Kozama'uka - Earthenshire"
+          "AetheryteShortcut": "Kozama'uka - Earthenshire",
+          "Fly": true
        }
      ]
    },
@ -44,7 +46,8 @@
          },
          "TerritoryId": 1188,
          "InteractionType": "WalkTo",
-          "TargetTerritoryId": 1187
+          "TargetTerritoryId": 1187,
+          "Fly": true
        },
        {
          "DataId": 1046814,
--- a/Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4896_The
+++ b/Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4896_The
@ -21,6 +21,30 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "DataId": 1051207,
+          "Position": {
+            "X": 425.07043,
+            "Y": 118.935005,
+            "Z": 606.13403
+          },
+          "StopDistance": 5,
+          "TerritoryId": 1187,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 5055
+        },
+        {
+          "DataId": 1048730,
+          "Position": {
+            "X": 399.0692,
+            "Y": 122.53533,
+            "Z": 542.9922
+          },
+          "StopDistance": 5,
+          "TerritoryId": 1187,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 5047
+        },
        {
          "DataId": 1046926,
          "Position": {
--- a/Dawntrail/MSQ/C-Yak
+++ b/Dawntrail/MSQ/C-Yak
@ -21,6 +21,36 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "DataId": 1050872,
+          "Position": {
+            "X": -408.71295,
+            "Y": 20.420113,
+            "Z": -398.8861
+          },
+          "TerritoryId": 1189,
+          "InteractionType": "AcceptQuest",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "ExcelSheet": "quest/051/KinGzd201_05110",
+              "Prompt": "TEXT_KINGZD201_05110_Q1_000_000",
+              "Answer": "TEXT_KINGZD201_05110_A1_000_001"
+            }
+          ],
+          "PickUpQuestId": 5110
+        },
+        {
+          "DataId": 1051073,
+          "Position": {
+            "X": 41.09253,
+            "Y": 8.205902,
+            "Z": -629.8467
+          },
+          "TerritoryId": 1189,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 5094
+        },
        {
          "DataId": 1047577,
          "Position": {
@ -36,28 +66,6 @@
    {
      "Sequence": 2,
      "Steps": [
-        {
-          "DataId": 2013948,
-          "Position": {
-            "X": 610.7728,
-            "Y": 9.597839,
-            "Z": 233.05103
-          },
-          "TerritoryId": 1189,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818440
-        },
-        {
-          "Position": {
-            "X": 614.25964,
-            "Y": -29.554798,
-            "Z": 202.75368
-          },
-          "TerritoryId": 1189,
-          "InteractionType": "WalkTo",
-          "DisableNavmesh": true,
-          "Mount": false
-        },
        {
          "DataId": 1048230,
          "Position": {
@ -66,8 +74,7 @@
            "Z": 214.83167
          },
          "TerritoryId": 1189,
-          "InteractionType": "Interact",
-          "DisableNavmesh": true
+          "InteractionType": "Interact"
        }
      ]
    },
--- a/Dawntrail/MSQ/C-Yak
+++ b/Dawntrail/MSQ/C-Yak
@ -24,6 +24,28 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "DataId": 1051052,
+          "Position": {
+            "X": 585.90063,
+            "Y": -142.49187,
+            "Z": 510.21594
+          },
+          "TerritoryId": 1189,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 5103
+        },
+        {
+          "DataId": 1050884,
+          "Position": {
+            "X": 531.0597,
+            "Y": -142.49185,
+            "Z": 492.0271
+          },
+          "TerritoryId": 1189,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 5114
+        },
        {
          "DataId": 1047701,
          "Position": {
--- a/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4919_And
+++ b/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4919_And
@ -52,6 +52,62 @@
    {
      "Sequence": 3,
      "Steps": [
+        {
+          "DataId": 1050655,
+          "Position": {
+            "X": 289.02112,
+            "Y": -15.566031,
+            "Z": -478.78235
+          },
+          "TerritoryId": 1190,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 5138
+        },
+        {
+          "Position": {
+            "X": 386.84927,
+            "Y": -0.84392637,
+            "Z": 435.0579
+          },
+          "TerritoryId": 1190,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Shaaloani - Hhusatahwi",
+          "SkipConditions": {
+            "StepIf": {
+              "QuestsCompleted": [
+                5140
+              ]
+            },
+            "AetheryteShortcutIf": {
+              "QuestsCompleted": [
+                5140
+              ]
+            }
+          }
+        },
+        {
+          "DataId": 1051283,
+          "Position": {
+            "X": 374.19702,
+            "Y": -0.24794838,
+            "Z": 437.2472
+          },
+          "StopDistance": 6,
+          "TerritoryId": 1190,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 5140
+        },
+        {
+          "DataId": 1049324,
+          "Position": {
+            "X": -108.659546,
+            "Y": 4.055336,
+            "Z": 319.5697
+          },
+          "TerritoryId": 1190,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 5130
+        },
        {
          "DataId": 1047001,
          "Position": {
@ -61,6 +117,7 @@
          },
          "TerritoryId": 1190,
          "InteractionType": "Interact",
+          "AetheryteShortcut": "Shaaloani - Sheshenewezi Springs",
          "DialogueChoices": [
            {
              "Type": "YesNo",
--- a/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4923_In
+++ b/Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4923_In
@ -161,6 +161,17 @@
    {
      "Sequence": 7,
      "Steps": [
+        {
+          "DataId": 1051316,
+          "Position": {
+            "X": -380.30066,
+            "Y": 18.718708,
+            "Z": -114.24432
+          },
+          "TerritoryId": 1190,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 5144
+        },
        {
          "DataId": 1047082,
          "Position": {
--- a/QuestPaths/quest-v1.json
+++ b/QuestPaths/quest-v1.json
@ -234,13 +234,13 @@
                "QuestsAccepted": {
                  "type": "array",
                  "items": {
-                    "type": "number"
+                    "type": ["number", "string"]
                  }
                },
                "QuestsCompleted": {
                  "type": "array",
                  "items": {
-                    "type": "number"
+                    "type": ["number", "string"]
                  }
                },
                "AetheryteLocked": {
@ -290,6 +290,18 @@
                    "type": "integer"
                  }
                },
+                "QuestsAccepted": {
+                  "type": "array",
+                  "items": {
+                    "type": ["number", "string"]
+                  }
+                },
+                "QuestsCompleted": {
+                  "type": "array",
+                  "items": {
+                    "type": ["number", "string"]
+                  }
+                },
                "AetheryteLocked": {
                  "$ref": "https://git.carvel.li/liza/Questionable/raw/branch/master/Questionable.Model/common-schema.json#/$defs/Aetheryte"
                },
--- a/Questionable.Model/Questing/Converter/ElementIdListConverter.cs
+++ b/Questionable.Model/Questing/Converter/ElementIdListConverter.cs
@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Questionable.Model.Questing.Converter;
+
+public sealed class ElementIdListConverter : JsonConverter<List<ElementId>>
+{
+    public override List<ElementId> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType != JsonTokenType.StartArray)
+            throw new JsonException();
+
+        reader.Read();
+
+        List<ElementId> values = [];
+        while (reader.TokenType != JsonTokenType.EndArray)
+        {
+
+            if (reader.TokenType == JsonTokenType.Number)
+                values.Add(new QuestId(reader.GetUInt16()));
+            else
+                values.Add(ElementId.FromString(reader.GetString() ?? throw new JsonException()));
+
+            reader.Read();
+        }
+
+        return values;
+    }
+
+    public override void Write(Utf8JsonWriter writer, List<ElementId> value, JsonSerializerOptions options)
+    {
+        throw new NotImplementedException();
+    }
+}
--- a/Questionable.Model/Questing/SkipAetheryteCondition.cs
+++ b/Questionable.Model/Questing/SkipAetheryteCondition.cs
@ -1,5 +1,7 @@
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 using Questionable.Model.Common;
+using Questionable.Model.Questing.Converter;

 namespace Questionable.Model.Questing;

@ -8,6 +10,13 @@ public sealed class SkipAetheryteCondition
    public bool Never { get; set; }
    public bool InSameTerritory { get; set; }
    public List<ushort> InTerritory { get; set; } = new();
+
+    [JsonConverter(typeof(ElementIdListConverter))]
+    public List<ElementId> QuestsAccepted { get; set; } = new();
+
+    [JsonConverter(typeof(ElementIdListConverter))]
+    public List<ElementId> QuestsCompleted { get; set; } = new();
+
    public EAetheryteLocation? AetheryteLocked { get; set; }
    public EAetheryteLocation? AetheryteUnlocked { get; set; }
    public bool RequiredQuestVariablesNotMet { get; set; }
--- a/Questionable.Model/Questing/SkipStepConditions.cs
+++ b/Questionable.Model/Questing/SkipStepConditions.cs
@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json.Serialization;
 using Questionable.Model.Common;
+using Questionable.Model.Questing.Converter;

 namespace Questionable.Model.Questing;

@ -14,8 +16,13 @@ public sealed class SkipStepConditions
    public List<ushort> InTerritory { get; set; } = new();
    public List<ushort> NotInTerritory { get; set; } = new();
    public SkipItemConditions? Item { get; set; }
+
+    [JsonConverter(typeof(ElementIdListConverter))]
    public List<ElementId> QuestsAccepted { get; set; } = new();
+
+    [JsonConverter(typeof(ElementIdListConverter))]
    public List<ElementId> QuestsCompleted { get; set; } = new();
+
    public EAetheryteLocation? AetheryteLocked { get; set; }
    public EAetheryteLocation? AetheryteUnlocked { get; set; }
    public NearPositionCondition? NearPosition { get; set; }
--- a/Questionable/Controller/Steps/Interactions/Combat.cs
+++ b/Questionable/Controller/Steps/Interactions/Combat.cs
@ -41,6 +41,7 @@ internal static class Combat
                    ArgumentNullException.ThrowIfNull(step.DataId);

                    yield return interactFactory.Interact(step.DataId.Value, quest, EInteractionType.None, true);
+                    yield return new WaitAtEnd.WaitDelay(TimeSpan.FromSeconds(2));
                    yield return CreateTask(quest, sequence, step);
                    break;
                }
@ -52,11 +53,15 @@ internal static class Combat

                    yield return useItemFactory.OnObject(quest.Id, step.DataId.Value, step.ItemId.Value,
                        step.CompletionQuestVariablesFlags, true);
+                    yield return new WaitAtEnd.WaitDelay(TimeSpan.FromSeconds(2));
                    yield return CreateTask(quest, sequence, step);
                    break;
                }

                case EEnemySpawnType.AutoOnEnterArea:
+                    if (step.CombatDelaySecondsAtStart == null)
+                        yield return new WaitAtEnd.WaitDelay(TimeSpan.FromSeconds(2));
+
                    // automatically triggered when entering area, i.e. only unmount
                    yield return CreateTask(quest, sequence, step);
                    break;
--- a/Questionable/Controller/Steps/Shared/AethernetShortcut.cs
+++ b/Questionable/Controller/Steps/Shared/AethernetShortcut.cs
@ -24,6 +24,7 @@ internal static class AethernetShortcut
        MovementController movementController,
        AetheryteFunctions aetheryteFunctions,
        GameFunctions gameFunctions,
+        QuestFunctions questFunctions,
        IClientState clientState,
        AetheryteData aetheryteData,
        TerritoryData territoryData,
@ -46,8 +47,8 @@ internal static class AethernetShortcut
        public ITask Use(EAetheryteLocation from, EAetheryteLocation to, SkipAetheryteCondition? skipConditions = null)
        {
            return new UseAethernetShortcut(from, to, skipConditions ?? new(),
-                loggerFactory.CreateLogger<UseAethernetShortcut>(), aetheryteFunctions, gameFunctions, clientState,
-                aetheryteData, territoryData, lifestreamIpc, movementController, condition);
+                loggerFactory.CreateLogger<UseAethernetShortcut>(), aetheryteFunctions, gameFunctions, questFunctions,
+                clientState, aetheryteData, territoryData, lifestreamIpc, movementController, condition);
        }
    }

@ -58,6 +59,7 @@ internal static class AethernetShortcut
        ILogger<UseAethernetShortcut> logger,
        AetheryteFunctions aetheryteFunctions,
        GameFunctions gameFunctions,
+        QuestFunctions questFunctions,
        IClientState clientState,
        AetheryteData aetheryteData,
        TerritoryData territoryData,
@ -90,6 +92,20 @@ internal static class AethernetShortcut
                    return false;
                }

+                if (skipConditions.QuestsCompleted.Count > 0 &&
+                    skipConditions.QuestsCompleted.All(questFunctions.IsQuestComplete))
+                {
+                    logger.LogInformation("Skipping aethernet shortcut, all prequisite quests are complete");
+                    return true;
+                }
+
+                if (skipConditions.QuestsAccepted.Count > 0 &&
+                    skipConditions.QuestsAccepted.All(questFunctions.IsQuestAccepted))
+                {
+                    logger.LogInformation("Skipping aethernet shortcut, all prequisite quests are accepted");
+                    return true;
+                }
+
                if (skipConditions.AetheryteLocked != null &&
                    !aetheryteFunctions.IsAetheryteUnlocked(skipConditions.AetheryteLocked.Value))
                {
--- a/Questionable/Controller/Steps/Shared/AetheryteShortcut.cs
+++ b/Questionable/Controller/Steps/Shared/AetheryteShortcut.cs
@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Numerics;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Application.Network.WorkDefinitions;
@ -93,6 +94,20 @@ internal static class AetheryteShortcut
                        return true;
                    }

+                    if (skipConditions.QuestsCompleted.Count > 0 &&
+                        skipConditions.QuestsCompleted.All(questFunctions.IsQuestComplete))
+                    {
+                        logger.LogInformation("Skipping aetheryte, all prequisite quests are complete");
+                        return true;
+                    }
+
+                    if (skipConditions.QuestsAccepted.Count > 0 &&
+                        skipConditions.QuestsAccepted.All(questFunctions.IsQuestAccepted))
+                    {
+                        logger.LogInformation("Skipping aetheryte, all prequisite quests are accepted");
+                        return true;
+                    }
+
                    if (skipConditions.AetheryteLocked != null &&
                        !aetheryteFunctions.IsAetheryteUnlocked(skipConditions.AetheryteLocked.Value))
                    {
--- a/Questionable/Data/QuestData.cs
+++ b/Questionable/Data/QuestData.cs
@ -8,7 +8,8 @@ using LLib.GameData;
 using Lumina.Excel.GeneratedSheets;
 using Questionable.Model;
 using Questionable.Model.Questing;
-using Quest = Lumina.Excel.GeneratedSheets.Quest;
+using Leve = Lumina.Excel.GeneratedSheets2.Leve;
+using Quest = Lumina.Excel.GeneratedSheets2.Quest;

 namespace Questionable.Data;

@ -62,7 +63,7 @@ internal sealed class QuestData

        // workaround because the game doesn't require completion of the CT questline through normal means
        QuestInfo aTimeToEveryPurpose = (QuestInfo)_quests[new QuestId(425)];
-        aTimeToEveryPurpose.AddPreviousQuest(new QuestId(495));
+        aTimeToEveryPurpose.AddPreviousQuest(new QuestInfo.PreviousQuestInfo(new QuestId(495)));
    }

    public IQuestInfo GetQuestInfo(ElementId elementId)
--- a/Questionable/Functions/GameFunctions.cs
+++ b/Questionable/Functions/GameFunctions.cs
@ -431,7 +431,8 @@ internal sealed unsafe class GameFunctions
        if (!AgentSatisfactionSupply.Instance()->IsAgentActive())
            return false;

-        var flags = _condition.AsReadOnlySet();
+        var flags = _condition.AsReadOnlySet().ToHashSet();
+        flags.Remove(ConditionFlag.InDutyQueue); // irrelevant
        return flags.Count == 2 &&
               flags.Contains(ConditionFlag.NormalConditions) &&
               flags.Contains(ConditionFlag.OccupiedInQuestEvent);
--- a/Questionable/Functions/QuestFunctions.cs
+++ b/Questionable/Functions/QuestFunctions.cs
@ -494,7 +494,8 @@ internal sealed unsafe class QuestFunctions
        if (questInfo.PreviousQuests.Count == 0)
            return true;

-        var completedQuests = questInfo.PreviousQuests.Count(x => IsQuestComplete(x) || x.Equals(extraCompletedQuest));
+        var completedQuests = questInfo.PreviousQuests.Count(x =>
+            HasEnoughProgressOnPreviousQuest(x) || x.QuestId.Equals(extraCompletedQuest));
        if (questInfo.PreviousQuestJoin == QuestInfo.QuestJoin.All &&
            questInfo.PreviousQuests.Count == completedQuests)
            return true;
@ -504,6 +505,20 @@ internal sealed unsafe class QuestFunctions
            return false;
    }

+    private bool HasEnoughProgressOnPreviousQuest(QuestInfo.PreviousQuestInfo previousQuestInfo)
+    {
+        if (IsQuestComplete(previousQuestInfo.QuestId))
+            return true;
+
+        if (previousQuestInfo.Sequence != 0 && IsQuestAccepted(previousQuestInfo.QuestId))
+        {
+            var progress = GetQuestProgressInfo(previousQuestInfo.QuestId);
+            return progress != null && progress.Sequence >= previousQuestInfo.Sequence;
+        }
+
+        return false;
+    }
+
    private static bool HasCompletedPreviousInstances(QuestInfo questInfo)
    {
        if (questInfo.PreviousInstanceContent.Count == 0)
--- a/Questionable/Model/LeveInfo.cs
+++ b/Questionable/Model/LeveInfo.cs
@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using LLib.GameData;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.GeneratedSheets2;
 using Questionable.Model.Questing;

 namespace Questionable.Model;
@ -14,7 +14,7 @@ internal sealed class LeveInfo : IQuestInfo
        Level = leve.ClassJobLevel;
        JournalGenre = leve.JournalGenre.Row;
        SortKey = QuestId.Value;
-        IssuerDataId = leve.LevelLevemete.Value!.Object;
+        IssuerDataId = leve.LevelLevemete.Value!.Object.Row;
        ClassJobs = QuestInfoUtils.AsList(leve.ClassJobCategory.Value!);
        Expansion = (EExpansionVersion)leve.LevelLevemete.Value.Territory.Value!.ExVersion.Row;
    }
--- a/Questionable/Model/QuestInfo.cs
+++ b/Questionable/Model/QuestInfo.cs
@ -5,7 +5,7 @@ using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using JetBrains.Annotations;
 using LLib.GameData;
 using Questionable.Model.Questing;
-using ExcelQuest = Lumina.Excel.GeneratedSheets.Quest;
+using ExcelQuest = Lumina.Excel.GeneratedSheets2.Quest;

 namespace Questionable.Model;

@ -31,12 +31,17 @@ internal sealed class QuestInfo : IQuestInfo
        };

        Name = $"{quest.Name}{suffix}";
-        Level = quest.ClassJobLevel0;
-        IssuerDataId = quest.IssuerStart;
+        Level = quest.ClassJobLevel[0];
+        IssuerDataId = quest.IssuerStart.Row;
        IsRepeatable = quest.IsRepeatable;
-        PreviousQuests = quest.PreviousQuest
-            .Select(x => new QuestId((ushort)(x.Row & 0xFFFF)))
-            .Where(x => x.Value != 0)
+        PreviousQuests =
+            new List<PreviousQuestInfo>
+                {
+                    new(new QuestId((ushort)(quest.PreviousQuest[0].Row & 0xFFFF)), quest.Unknown7),
+                    new(new QuestId((ushort)(quest.PreviousQuest[1].Row & 0xFFFF))),
+                    new(new QuestId((ushort)(quest.PreviousQuest[1].Row & 0xFFFF)))
+                }
+                .Where(x => x.QuestId.Value != 0)
                .ToImmutableList();
        PreviousQuestJoin = (QuestJoin)quest.PreviousQuestJoin;
        QuestLocks = quest.QuestLock
@ -47,7 +52,7 @@ internal sealed class QuestInfo : IQuestInfo
        JournalGenre = quest.JournalGenre?.Row;
        SortKey = quest.SortKey;
        IsMainScenarioQuest = quest.JournalGenre?.Value?.JournalCategory?.Value?.JournalSection?.Row is 0 or 1;
-        CompletesInstantly = quest.ToDoCompleteSeq[0] == 0;
+        CompletesInstantly = quest.TodoParams[0].ToDoCompleteSeq == 0;
        PreviousInstanceContent = quest.InstanceContent.Select(x => (ushort)x.Row).Where(x => x != 0).ToList();
        PreviousInstanceContentJoin = (QuestJoin)quest.InstanceContentJoin;
        GrandCompany = (GrandCompany)quest.GrandCompany.Row;
@ -64,7 +69,7 @@ internal sealed class QuestInfo : IQuestInfo
    public ushort Level { get; }
    public uint IssuerDataId { get; }
    public bool IsRepeatable { get; }
-    public ImmutableList<QuestId> PreviousQuests { get; set; }
+    public ImmutableList<PreviousQuestInfo> PreviousQuests { get; set; }
    public QuestJoin PreviousQuestJoin { get; }
    public ImmutableList<QuestId> QuestLocks { get; }
    public QuestJoin QuestLockJoin { get; }
@ -89,8 +94,10 @@ internal sealed class QuestInfo : IQuestInfo
        AtLeastOne = 2,
    }

-    public void AddPreviousQuest(QuestId questId)
+    public void AddPreviousQuest(PreviousQuestInfo questId)
    {
        PreviousQuests = [..PreviousQuests, questId];
    }
+
+    public sealed record PreviousQuestInfo(QuestId QuestId, byte Sequence = 0);
 }
--- a/Questionable/Model/QuestInfoUtils.cs
+++ b/Questionable/Model/QuestInfoUtils.cs
@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using LLib.GameData;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.GeneratedSheets2;

 namespace Questionable.Model;

@ -57,8 +57,8 @@ internal static class QuestInfoUtils
                { EClassJob.Dancer, classJobCategory.DNC },
                { EClassJob.Reaper, classJobCategory.RPR },
                { EClassJob.Sage, classJobCategory.SGE },
-                { EClassJob.Viper, classJobCategory.VPR },
-                { EClassJob.Pictomancer, classJobCategory.PCT }
+                { EClassJob.Viper, classJobCategory.Unknown1 },
+                { EClassJob.Pictomancer, classJobCategory.Unknown2 }
            }
            .Where(y => y.Value)
            .Select(y => y.Key)
--- a/Questionable/Windows/QuestComponents/QuestTooltipComponent.cs
+++ b/Questionable/Windows/QuestComponents/QuestTooltipComponent.cs
@ -19,19 +19,22 @@ internal sealed class QuestTooltipComponent
    private readonly TerritoryData _territoryData;
    private readonly QuestFunctions _questFunctions;
    private readonly UiUtils _uiUtils;
+    private readonly Configuration _configuration;

    public QuestTooltipComponent(
        QuestRegistry questRegistry,
        QuestData questData,
        TerritoryData territoryData,
        QuestFunctions questFunctions,
-        UiUtils uiUtils)
+        UiUtils uiUtils,
+        Configuration configuration)
    {
        _questRegistry = questRegistry;
        _questData = questData;
        _territoryData = territoryData;
        _questFunctions = questFunctions;
        _uiUtils = uiUtils;
+        _configuration = configuration;
    }

    public void Draw(IQuestInfo quest)
@ -105,13 +108,13 @@ internal sealed class QuestTooltipComponent

            foreach (var q in quest.PreviousQuests)
            {
-                if (_questData.TryGetQuestInfo(q, out var qInfo))
+                if (_questData.TryGetQuestInfo(q.QuestId, out var qInfo))
                {
-                    var (iconColor, icon, _) = _uiUtils.GetQuestStyle(q);
+                    var (iconColor, icon, _) = _uiUtils.GetQuestStyle(q.QuestId);
                    if (!_questRegistry.IsKnownQuest(qInfo.QuestId))
                        iconColor = ImGuiColors.DalamudGrey;

-                    _uiUtils.ChecklistItem(FormatQuestUnlockName(qInfo), iconColor, icon);
+                    _uiUtils.ChecklistItem(FormatQuestUnlockName(qInfo, _questFunctions.IsQuestComplete(q.QuestId) ? byte.MinValue : q.Sequence), iconColor, icon);

                    if (qInfo is QuestInfo qstInfo && (counter <= 2 || icon != FontAwesomeIcon.Check))
                        DrawQuestUnlocks(qstInfo, counter + 1);
@ -188,11 +191,17 @@ internal sealed class QuestTooltipComponent
            ImGui.Unindent();
    }

-    private static string FormatQuestUnlockName(IQuestInfo questInfo)
+    private string FormatQuestUnlockName(IQuestInfo questInfo, byte sequence = 0)
    {
+        string name = questInfo.Name;
+        if (_configuration.Advanced.AdditionalStatusInformation && sequence != 0)
+            name += $" {SeIconChar.ItemLevel.ToIconString()}";
+
        if (questInfo.IsMainScenarioQuest)
-            return $"{questInfo.Name} ({questInfo.QuestId}, MSQ)";
+            name += $" ({questInfo.QuestId}, MSQ)";
        else
-            return $"{questInfo.Name} ({questInfo.QuestId})";
+            name += $" {questInfo.Name} ({questInfo.QuestId})";
+
+        return name;
    }
 }
Author	SHA1	Message	Date
Fifi	9f737ee674	shb phys role quests	2024-08-26 01:46:57 +00:00
Liza	15c97d55f7	Minor starting quest adjustments	2024-08-25 19:23:29 +02:00
Liza	6eddca6931	Pick up DT aether current quests (first four zones) during the MSQ	2024-08-25 19:23:15 +02:00
Liza	0ac2fae4b9	Add default combat delay to all non-overworld enemy encounters	2024-08-25 16:51:52 +02:00
Liza	ca4bc07eeb	Allow weekly delivery turn-in while in duty queue	2024-08-25 16:01:02 +02:00
Liza	d310c9ff1b	Handle quests that are unlocked when a previous quest isn't complete yet	2024-08-25 14:45:08 +02:00