Schema validation for single interaction complete

QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs

@@ -128,10 +128,6 @@ 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(),

QuestPaths/2.x - A Realm Reborn/Class Quests/ACN/451_So You Want to Be an Arcanist.json

@@ -3,10 +3,9 @@
     "Author": "Cacahuetes",
     "QuestSequence": [
       {
-      "Sequence": 0,
+        "Sequence": 255,
         "Steps": [
-        {
+          { "DataId": 1000895,
-          "DataId": 1000895,
 "Position": {
     "X": -335.74432,
     "Y": 12.899764,
@@ -40,3 +39,4 @@
       }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/190_So You Want to Be an Alchemist.json

@@ -5,20 +5,17 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1002281,
-          "DataId": 1002281,
 "Position": {
     "X": -115.739685,
     "Y": 41.600117,
     "Z": 118.88306
 },
 "TerritoryId": 131,
-          "InteractionType": "AcceptQuest",
+"InteractionType": "Interact",
           "AetheryteShortcut": "Ul'dah",
-          "AethernetShortcut": [
+          "AethernetShortcut": ["[Ul'dah] Aetheryte Plaza", 
-            "[Ul'dah] Aetheryte Plaza",
+          "[Ul'dah] Alchemists' Guild"],
-            "[Ul'dah] Alchemists' Guild"
-          ],
           "SkipConditions": {
             "AetheryteShortcutIf": {
               "InSameTerritory": true,
@@ -33,9 +30,9 @@
               "Prompt": "TEXT_CLSALC001_00190_Q1_1",
               "Yes": true
             }
+          ]}
         ]
       }
     ]
   }
-  ]
+  
-}

QuestPaths/2.x - A Realm Reborn/Class Quests/ALC/575_Way of the Alchemist.json

@@ -5,23 +5,20 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1002281,
-          "DataId": 1002281,
 "Position": {
     "X": -115.739685,
     "Y": 41.600117,
     "Z": 118.88306
 },
 "TerritoryId": 131,
-          "InteractionType": "AcceptQuest"
+"InteractionType": "AcceptQuest"}
-        }
         ]
       },
       {
         "Sequence": 255,
         "Steps": [
-        {
+          { "DataId": 1002299,
-          "DataId": 1002299,
 "Position": {
     "X": -98.8938,
     "Y": 40.200146,
@@ -35,9 +32,11 @@
                               "Prompt": "TEXT_CLSALC011_00575_Q1_1",
                               "Yes": true
                           }
-          ]
+                      ],
+  "NextQuestId": 575
   }
         ]
       }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/186_So You Want to Be an Armorer.json

@@ -5,15 +5,14 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1000998,
-          "DataId": 1000998,
 "Position": {
     "X": -51.651794,
     "Y": 42.79979,
     "Z": 190.41736
 },
 "TerritoryId": 128,
-          "InteractionType": "AcceptQuest",
+"InteractionType": "Interact",
           "AetheryteShortcut": "Limsa Lominsa",
           "AethernetShortcut": [
             "[Limsa Lominsa] Aetheryte Plaza",
@@ -23,7 +22,7 @@
             "AetheryteShortcutIf": {
               "InSameTerritory": true,
               "InTerritory": [
-                128
+                129
               ]
             }
           },
@@ -33,9 +32,9 @@
               "Prompt": "TEXT_CLSARM001_00186_Q1_000_1",
               "Yes": true
             }
+          ]}
         ]
       }
     ]
   }
-  ]
+  
-}

QuestPaths/2.x - A Realm Reborn/Class Quests/ARM/273_Way of the Armorer.json

@@ -5,23 +5,20 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+            { "DataId": 1000998,
-          "DataId": 1000998,
             "Position": {
                 "X": -51.651794,
                 "Y": 42.79979,
                 "Z": 190.41736
             },
             "TerritoryId": 128,
-          "InteractionType": "AcceptQuest"
+            "InteractionType": "AcceptQuest"}
-        }
                     ]
                   },
                   {
                     "Sequence": 255,
                     "Steps": [
-        {
+                      { "DataId": 1001000,
-          "DataId": 1001000,
             "Position": {
                 "X": -32.028687,
                 "Y": 41.499985,
@@ -35,9 +32,11 @@
                                           "Prompt": "TEXT_CLSARM011_00273_Q1_000_1",
                                           "Yes": true
                                       }
-          ]
+                                  ],
+              "NextQuestId": 273
               }
                     ]
                   }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/183_So You Want to Be a Thaumaturge.json

@@ -5,23 +5,23 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1002279,
-          "DataId": 1002279,
 "Position": {
     "X": -196.8872,
     "Y": 18.459997,
     "Z": 59.952637
 },
 "TerritoryId": 130,
-          "InteractionType": "AcceptQuest",
+"InteractionType": "Interact",
           "AetheryteShortcut": "Ul'dah",
-          "AethernetShortcut": [
+          "AethernetShortcut": ["[Ul'dah] Aetheryte Plaza", 
-            "[Ul'dah] Aetheryte Plaza",
+          "[Ul'dah] Thaumaturges' Guild"],
-            "[Ul'dah] Thaumaturges' Guild"
-          ],
           "SkipConditions": {
             "AetheryteShortcutIf": {
-              "InSameTerritory": true
+              "InSameTerritory": true,
+              "InTerritory": [
+                130
+              ]
             }
           },
           "DialogueChoices": [
@@ -30,9 +30,9 @@
               "Prompt": "TEXT_CLSTHM001_00183_Q1_000_1",
               "Yes": true
             }
+          ]}
         ]
       }
     ]
   }
-  ]
+  
-}

QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json

@@ -5,23 +5,20 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1002279,
-          "DataId": 1002279,
 "Position": {
     "X": -196.8872,
     "Y": 18.459997,
     "Z": 59.952637
 },
 "TerritoryId": 130,
-          "InteractionType": "AcceptQuest"
+"InteractionType": "AcceptQuest"}
-        }
         ]
       },
       {
         "Sequence": 255,
         "Steps": [
-        {
+          { "DataId": 1001709,
-          "DataId": 1001709,
 "Position": {
     "X": -240.4975,
     "Y": 18.7,
@@ -42,3 +39,4 @@
       }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1085_A Song of Bards and Bowmen.json

@@ -122,7 +122,7 @@
           "TerritoryId": 153,
           "InteractionType": "CompleteQuest",
           "Fly": true,
-          "NextQuestId": 1086
+          "NextQuestId": 1085
         }
       ]
     }

QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/131_Way of the Archer.json

@@ -5,31 +5,28 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1000197,
-          "DataId": 1000197,
 "Position": {
     "X": 201.31226,
     "Y": -3.1634123E-15,
     "Z": 43.900146
 },
 "TerritoryId": 132,
-          "InteractionType": "AcceptQuest"
+  "InteractionType": "AcceptQuest"}
-        }
         ]
       },
       {
         "Sequence": 255,
         "Steps": [
-        {
+          { "DataId": 1000200,
-          "DataId": 1000200,
 "Position": {
     "X": 209.55212,
     "Y": 0.9999819,
     "Z": 35.01941
 },
-          "StopDistance": 5,
 "TerritoryId": 132,
 "InteractionType": "CompleteQuest",
+  
   "DialogueChoices": [
                           {
                               "Type": "YesNo",
@@ -42,3 +39,4 @@
       }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/181_So You Want to Be an Archer.json

@@ -5,8 +5,7 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1000197,
-          "DataId": 1000197,
 "Position": {
     "X": 201.31226,
     "Y": -3.1634123E-15,
@@ -29,7 +28,10 @@
   "InteractionType": "AcceptQuest",
   "SkipConditions": {
             "AetheryteShortcutIf": {
-              "InSameTerritory": true
+              "InSameTerritory": true,
+              "InTerritory": [
+                132
+              ]
             }
           }
                   }
@@ -37,3 +39,4 @@
       }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/185_So You Want to Be a Blacksmith.json

@@ -5,8 +5,7 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1000995,
-          "DataId": 1000995,
 "Position": {
     "X": -52.018066,
     "Y": 42.799637,
@@ -23,7 +22,7 @@
             "AetheryteShortcutIf": {
               "InSameTerritory": true,
               "InTerritory": [
-                128
+                129
               ]
             }
           },
@@ -40,3 +39,4 @@
       }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/BSM/291_Way of the Blacksmith.json

@@ -5,8 +5,7 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1000995,
-          "DataId": 1000995,
 "Position": {
     "X": -52.018066,
     "Y": 42.799637,
@@ -23,25 +22,23 @@
             "AetheryteShortcutIf": {
               "InSameTerritory": true,
               "InTerritory": [
-                128
+                129
               ]
             }
           },
           "DialogueChoices": [
             {
               "Type": "YesNo",
-              "Prompt": "TEXT_CLSBSM011_00291_Q1_000_1",
+              "Prompt": "TEXT_CLSBSM001_00185_Q1_000_1",
               "Yes": true
             }
-          ]
+          ]}
-        }
         ]
       },
       {
         "Sequence": 255,
         "Steps": [
-        {
+          { "DataId": 1000997,
-          "DataId": 1000997,
 "Position": {
     "X": -31.265808,
     "Y": 44.49997,
@@ -62,3 +59,4 @@
       }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/193_So You Want to Be a Botanist.json

@@ -5,8 +5,7 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1000294,
-          "DataId": 1000294,
 "Position": {
     "X": -238.05603,
     "Y": 8,
@@ -14,10 +13,7 @@
 },
 "TerritoryId": 133,
 "AetheryteShortcut": "Gridania",
-          "AethernetShortcut": [
+"AethernetShortcut": ["[Gridania] Aetheryte Plaza", "[Gridania] Botanists' Guild"],
-            "[Gridania] Aetheryte Plaza",
-            "[Gridania] Botanists' Guild"
-          ],
   "DialogueChoices": [
                           {
                               "Type": "YesNo",
@@ -30,12 +26,14 @@
             "AetheryteShortcutIf": {
               "InSameTerritory": true,
               "InTerritory": [
-                133
+                132,133
               ]
             }
           }
+                  
 }
         ]
       }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/3_Way of the Botanist.json

@@ -5,23 +5,20 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1000294,
-          "DataId": 1000294,
 "Position": {
     "X": -238.05603,
     "Y": 8,
     "Z": -142.93127
 },
 "TerritoryId": 133,
-          "InteractionType": "AcceptQuest"
+"InteractionType": "AcceptQuest"}
-        }
         ]
       },
       {
         "Sequence": 255,
         "Steps": [
-        {
+          { "DataId": 1000815,
-          "DataId": 1000815,
 "Position": {
     "X": -233.9361,
     "Y": 6.668152,
@@ -35,9 +32,11 @@
                               "Prompt": "TEXT_CLSHRV001_00003_Q1_000_1",
                               "Yes": true
                           }
-          ]
+                      ],
+  "NextQuestId": 3
   }
         ]
       }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/CRP/184_So You Want to Be a Carpenter.json

@@ -5,8 +5,7 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1000148,
-          "DataId": 1000148,
 "Position": {
     "X": -20.279297,
     "Y": -3.25,
@@ -24,7 +23,10 @@
   "InteractionType": "AcceptQuest",
   "SkipConditions": {
             "AetheryteShortcutIf": {
-              "InSameTerritory": true
+              "InSameTerritory": true,
+              "InTerritory": [
+                132
+              ]
             }
           }
                   }
@@ -32,3 +34,4 @@
       }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/191_So You Want to Be a Culinarian.json

@@ -5,15 +5,14 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1000946,
-          "DataId": 1000946,
 "Position": {
     "X": -61.142883,
     "Y": 42.299698,
     "Z": -164.0498
 },
 "TerritoryId": 128,
-          "InteractionType": "AcceptQuest",
+"InteractionType": "Interact",
           "AetheryteShortcut": "Limsa Lominsa",
           "AethernetShortcut": [
             "[Limsa Lominsa] Aetheryte Plaza",
@@ -23,7 +22,7 @@
             "AetheryteShortcutIf": {
               "InSameTerritory": true,
               "InTerritory": [
-                128
+                129
               ]
             }
           },
@@ -33,9 +32,9 @@
               "Prompt": "TEXT_CLSCUL001_00191_Q1_000_1",
               "Yes": true
             }
+          ]}
         ]
       }
     ]
   }
-  ]
+  
-}

QuestPaths/2.x - A Realm Reborn/Class Quests/CUL/271_Way of the Culinarian.json

@@ -5,23 +5,20 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1000946,
-          "DataId": 1000946,
 "Position": {
     "X": -61.142883,
     "Y": 42.299698,
     "Z": -164.0498
 },
 "TerritoryId": 128,
-          "InteractionType": "AcceptQuest"
+"InteractionType": "AcceptQuest"}
-        }
         ]
       },
       {
         "Sequence": 255,
         "Steps": [
-        {
+          { "DataId": 1000947,
-          "DataId": 1000947,
 "Position": {
     "X": -54.64258,
     "Y": 44,
@@ -35,9 +32,11 @@
                               "Prompt": "TEXT_CLSCUL011_00271_Q1_000_1",
                               "Yes": true
                           }
-          ]
+                      ],
+  "NextQuestId": 271
   }
         ]
       }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/DRG/180_So You Want to Be a Lancer.json

@@ -5,8 +5,7 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1000251,
-          "DataId": 1000251,
   "Position": {
       "X": 147.08167,
       "Y": 15.5,
@@ -24,9 +23,10 @@
                               "Yes": true
                           }
                       ],
-          "InteractionType": "AcceptQuest"
+  "InteractionType": "Interact"
                   }
         ]
       }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1107_Way of the Fisher.json

@@ -13,7 +13,7 @@
     "Z": 150.04187
 },
 "TerritoryId": 129,
-          "InteractionType": "AcceptQuest",
+"InteractionType": "Interact",
 "AetheryteShortcut": "Limsa Lominsa",
 "AethernetShortcut": [
                         "[Limsa Lominsa] Aetheryte Plaza",
@@ -21,7 +21,10 @@
                     ],
                     "SkipConditions": {
             "AetheryteShortcutIf": {
-              "InSameTerritory": true
+              "InSameTerritory": true,
+              "InTerritory": [
+                129
+              ]
             }
           }
                 }
@@ -30,15 +33,6 @@
         {
             "Sequence": 255,
             "Steps": [
-        {
-          "Position": {
-            "X": -167.60791,
-            "Y": 4.550005,
-            "Z": 165.35986
-          },
-          "TerritoryId": 129,
-          "InteractionType": "WalkTo"
-        },
                 {
                     "DataId": 1000857,
 "Position": {

QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1108_My First Fishing Rod.json

@@ -21,6 +21,7 @@
                     "TerritoryId": 129,
                     "InteractionType": "EquipRecommended"
                   },
+
                 {
                     "DataId": 1000857,
 "Position": {
@@ -33,6 +34,24 @@
                 }
             ]
         },
+        {
+            "Sequence": 1,
+            "Steps": [
+                {
+"Position": {
+    "X": -42.679565,
+    "Y": 39.999966,
+    "Z": 119.920654
+},
+"TerritoryId": 128,
+"InteractionType": "WaitForManualProgress",
+                    "AethernetShortcut": [
+                        "[Limsa Lominsa] Fishermens' Guild",
+                        "[Limsa Lominsa] The Aftcastle"
+                    ]
+                }
+            ]
+        },
         {
             "Sequence": 255,
             "Steps": [
@@ -49,9 +68,7 @@
                         "[Limsa Lominsa] The Aftcastle",
                         "[Limsa Lominsa] Fishermens' Guild"
                     ],
-          "NextQuestId": 3843,
+                    "NextQuestId": 3843
-          "Disabled": true,
-          "Comment": "Catch/turn in fish manually"
                 }
             ]
         }

QuestPaths/2.x - A Realm Reborn/Class Quests/FSH/1134_So You Want to Be a Fisher.json

@@ -13,7 +13,6 @@
     "Z": 150.04187
 },
 "TerritoryId": 129,
-          "AetheryteShortcut": "Limsa Lominsa",
 "AethernetShortcut": [
                         "[Limsa Lominsa] Aetheryte Plaza",
                         "[Limsa Lominsa] Fishermens' Guild"
@@ -22,7 +21,8 @@
                         {
                             "Type": "YesNo",
                             "Prompt": "TEXT_CLSFSH001_01134_Q1_000_1",
-              "Yes": true
+                            "Yes": true,
+                            "$": "Need to find real prompt in godbert"
                         }
                     ],
 "InteractionType": "Interact"
@@ -38,6 +38,30 @@
 "InteractionType": "AcceptQuest"
                 }
             ]
+        },
+        {
+            "Sequence": 255,
+            "Steps": [
+                {
+                    "DataId": 1000857,
+"Position": {
+    "X": -165.27051,
+    "Y": 5.2500057,
+    "Z": 164.29382
+},
+"TerritoryId": 129,
+"DialogueChoices": [
+                        {
+                            "Type": "YesNo",
+                            "Prompt": "TEXT_CLSGLA020_00253_Q1_000_1",
+                            "Yes": true,
+                            "$": "Need to find real prompt in godbert"
+                        }
+                    ],
+"InteractionType": "CompleteQuest",
+"NextQuestId": 1108
+                }
+            ]
         }
     ]
 }

QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/187_So You Want to Be a Goldsmith.json

@@ -5,20 +5,17 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1002280,
-          "DataId": 1002280,
 "Position": {
     "X": -35.385742,
     "Y": 13.599962,
     "Z": 97.24573
 },
 "TerritoryId": 131,
-          "InteractionType": "AcceptQuest",
+"InteractionType": "Interact",
           "AetheryteShortcut": "Ul'dah",
-          "AethernetShortcut": [
+          "AethernetShortcut": ["[Ul'dah] Aetheryte Plaza", 
-            "[Ul'dah] Aetheryte Plaza",
+          "[Ul'dah] Goldsmiths' Guild"],
-            "[Ul'dah] Goldsmiths' Guild"
-          ],
           "SkipConditions": {
             "AetheryteShortcutIf": {
               "InSameTerritory": true,
@@ -33,9 +30,9 @@
               "Prompt": "TEXT_CLSGLD001_00187_Q1_000_1",
               "Yes": true
             }
+          ]}
         ]
       }
     ]
   }
-  ]
+  
-}

QuestPaths/2.x - A Realm Reborn/Class Quests/GSM/608_Way of the Goldsmith.json

@@ -5,23 +5,20 @@
     {
       "Sequence": 0,
       "Steps": [
-        {
+        { "DataId": 1002280,
-          "DataId": 1002280,
 "Position": {
   "X": -35.385742,
   "Y": 13.599962,
   "Z": 97.24573
 },
 "TerritoryId": 131,
-          "InteractionType": "AcceptQuest"
+"InteractionType": "AcceptQuest"}
-        }
       ]
     },
     {
       "Sequence": 255,
       "Steps": [
-        {
+        { "DataId": 1004093,
-          "DataId": 1004093,
 "Position": {
   "X": -25.162231,
   "Y": 12.200003,
@@ -35,7 +32,8 @@
                             "Prompt": "TEXT_CLSGLD011_00608_A1_000_1",
                             "Yes": true
                         }
-          ]
+                    ],
+"NextQuestId": 608
 }
       ]
     }

QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/105_Way of the Leatherworker.json

@@ -5,23 +5,20 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1000352,
-          "DataId": 1000352,
 "Position": {
     "X": 65.69006,
     "Y": 8,
     "Z": -147.41742
 },
 "TerritoryId": 133,
-          "InteractionType": "AcceptQuest"
+"InteractionType": "AcceptQuest"}
-        }
         ]
       },
       {
         "Sequence": 255,
         "Steps": [
-        {
+          { "DataId": 1000691,
-          "DataId": 1000691,
 "Position": {
     "X": 71.97681,
     "Y": 8,
@@ -35,9 +32,11 @@
                               "Prompt": "TEXT_CLSTAN000_00105_Q1_000_1",
                               "Yes": true
                           }
-          ]
+                      ],
+  "NextQuestId": 105
   }
         ]
       }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/LTW/188_So You Want to Be a Leatherworker.json

@@ -5,15 +5,14 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1000352,
-          "DataId": 1000352,
 "Position": {
     "X": 65.69006,
     "Y": 8,
     "Z": -147.41742
 },
 "TerritoryId": 133,
-          "InteractionType": "AcceptQuest",
+"InteractionType": "Interact",
           "AetheryteShortcut": "Gridania",
           "AethernetShortcut": [
             "[Gridania] Aetheryte Plaza",
@@ -33,9 +32,9 @@
               "Prompt": "TEXT_CLSTAN999_00188_Q1_000_1",
               "Yes": true
             }
+          ]}
         ]
       }
     ]
   }
-  ]
+  
-}

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/178_So You Want to Be a Pugilist.json

@@ -5,19 +5,21 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1001286,
-          "DataId": 1001286,
 "Position": {
     "X": -88.9754,
     "Y": 2.55,
     "Z": -51.163513
 },
 "TerritoryId": 130,
-          "InteractionType": "AcceptQuest",
+"InteractionType": "Interact",
           "AetheryteShortcut": "Ul'dah",
           "SkipConditions": {
             "AetheryteShortcutIf": {
-              "InSameTerritory": true
+              "InSameTerritory": true,
+              "InTerritory": [
+                130
+              ]
             }
           },
           "DialogueChoices": [
@@ -26,9 +28,9 @@
               "Prompt": "TEXT_CLSPGL001_00178_Q1_000_1",
               "Yes": true
             }
+          ]}
         ]
       }
     ]
   }
-  ]
+  
-}

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/532_Way of the Pugilist.json

@@ -5,23 +5,20 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1001286,
-          "DataId": 1001286,
 "Position": {
     "X": -88.9754,
     "Y": 2.55,
     "Z": -51.163513
 },
 "TerritoryId": 130,
-          "InteractionType": "AcceptQuest"
+"InteractionType": "AcceptQuest"}
-        }
         ]
       },
       {
         "Sequence": 255,
         "Steps": [
-        {
+          { "DataId": 1003817,
-          "DataId": 1003817,
 "Position": {
     "X": -74.57086,
     "Y": 1.9999951,
@@ -42,3 +39,4 @@
       }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/101_So You Want to Be a Rogue.json

@@ -3,10 +3,9 @@
     "Author": "Cacahuetes",
     "QuestSequence": [
       {
-      "Sequence": 0,
+        "Sequence": 255,
         "Steps": [
-        {
+          { "DataId": 1009944,
-          "DataId": 1009944,
 "Position": {
     "X": -152.66656,
     "Y": 2.8562405,
@@ -16,12 +15,14 @@
 "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Limsa Lominsa",
           "AethernetShortcut": [
-            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Aetheryte Plaza","[Limsa Lominsa] Fishermens' Guild"
-            "[Limsa Lominsa] Fishermens' Guild"
           ],
           "SkipConditions": {
             "AetheryteShortcutIf": {
-              "InSameTerritory": true
+              "InSameTerritory": true,
+              "InTerritory": [
+                129
+              ]
             }
           },
           "DialogueChoices": [
@@ -31,9 +32,10 @@
               "Yes": true
             }
           ],
-          "NextQuestId": 102
+          "NextQuestID": 102
         }
     ]
   }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/102_My First Dagger.json

@@ -1,61 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
-  "Author": "Cacahuetes",
-  "QuestSequence": [
-    {
-      "Sequence": 0,
-      "Steps": [
-        {
-          "DataId": 1009944,
-          "Position": {
-            "X": -152.66656,
-            "Y": 2.8562405,
-            "Z": 243.18298
-          },
-          "TerritoryId": 129,
-          "InteractionType": "AcceptQuest"
-        }
-      ]
-    },
-    {
-      "Sequence": 255,
-      "Steps": [
-        {
-          "DataId": 1009944,
-          "Position": {
-            "X": -152.66656,
-            "Y": 2.8562405,
-            "Z": 243.18298
-          },
-          "TerritoryId": 129,
-          "InteractionType": "Interact",
-          "DialogueChoices": [
-            {
-              "Type": "YesNo",
-              "Prompt": "TEXT_CLSROG011_00102_Q9_000_901",
-              "Yes": true
-            }
-          ]
-        },
-        {
-          "DataId": 1009943,
-          "Position": {
-            "X": -153.36847,
-            "Y": -129.4397,
-            "Z": 265.88843
-          },
-          "StopDistance": 7,
-          "TerritoryId": 129,
-          "InteractionType": "CompleteQuest",
-          "DialogueChoices": [
-            {
-              "Type": "YesNo",
-              "Prompt": "TEXT_CLSROG011_00102_Q1_000_030",
-              "Yes": true
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

QuestPaths/2.x - A Realm Reborn/Class Quests/NIN/102_Way of the Rogue.json

@@ -0,0 +1,50 @@
+{
+    "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+    "Author": "Cacahuetes",
+    "QuestSequence": [
+      {
+        "Sequence": 0,
+        "Steps": [
+          { "DataId": 1009944,
+"Position": {
+    "X": -152.66656,
+    "Y": 2.8562405,
+    "Z": 243.18298
+},
+"TerritoryId": 129,
+"InteractionType": "AcceptQuest"}
+        ]
+      },
+      {
+        "Sequence": 255,
+        "Steps": [
+            { "DataId": 1009944,
+"Position": {
+    "X": -152.66656,
+    "Y": 2.8562405,
+    "Z": 243.18298
+},
+"TerritoryId": 129,
+"InteractionType": "Interact"
+},
+          { "DataId": 1009943,
+"Position": {
+    "X": -153.36847,
+    "Y": -129.4397,
+    "Z": 265.88843
+},
+"TerritoryId": 129,
+"InteractionType": "CompleteQuest",
+  "DialogueChoices": [
+                          {
+                              "Type": "YesNo",
+                              "Prompt": "TEXT_CLSROG011_00102_Q1_000_030",
+                              "Yes": true
+                          }
+                      ]
+  }
+        ]
+      }
+    ]
+  }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/1055_Paladin's Pledge.json

@@ -62,16 +62,11 @@
 "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo",
 "InteractionType": "Combat",
 "EnemySpawnType": "AfterInteraction",
-          "KillEnemyDataIds": [
+"KillEnemyDataIds": [18,19]
-            18,
-            19
-          ],
-          "Fly": true
           }
       ]
     },
-    {
+    { "Sequence": 3,
-      "Sequence": 3,
     "Steps": [
         {
             "DataId": 2002345,
@@ -84,10 +79,8 @@
 "InteractionType": "UseItem",
 "ItemId": 2000821
         }
-      ]
+    ]},
-    },
+    { "Sequence": 4,
-    {
-      "Sequence": 4,
     "Steps": [
         {
     "DataId": 1006747,
@@ -104,10 +97,9 @@
             "[Ul'dah] The Chamber of Rule"
             ]
         }
-      ]
+    ]}
-    },
+    ,
-    {
+    { "Sequence": 255,
-      "Sequence": 255,
     "Steps": [
         {
             "DataId": 1006747,
@@ -120,7 +112,6 @@
 "InteractionType": "CompleteQuest",
             "NextQuestId": 1056
         }
-      ]
+    ]}
-    }
   ]
 }

QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/177_So You Want to Be a Gladiator.json

@@ -1,41 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
-  "Author": "liza",
-  "QuestSequence": [
-    {
-      "Sequence": 0,
-      "Steps": [
-        {
-          "DataId": 1002277,
-          "Position": {
-            "X": -97.550964,
-            "Y": 7.05,
-            "Z": 23.605652
-          },
-          "TerritoryId": 131,
-          "InteractionType": "AcceptQuest",
-          "AetheryteShortcut": "Ul'dah",
-          "AethernetShortcut": [
-            "[Ul'dah] Aetheryte Plaza",
-            "[Ul'dah] Gladiators' Guild"
-          ],
-          "DialogueChoices": [
-            {
-              "Type": "YesNo",
-              "Prompt": "TEXT_CLSGLA001_00177_Q1_000_1",
-              "Yes": true
-            }
-          ],
-          "SkipConditions": {
-            "AetheryteShortcutIf": {
-              "InSameTerritory": true,
-              "InTerritory": [
-                131
-              ]
-            }
-          }
-        }
-      ]
-    }
-  ]
-}

QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/253_Way of the Gladiator.json

@@ -84,7 +84,8 @@
               "MinimumKillCount": 3,
               "CompletionQuestVariablesFlags": [
                 {
-                  "Low": 3
+                  "Low": 3,
+                  "Mode": "Exact"
                 },
                 null,
                 null,
@@ -99,7 +100,8 @@
               "CompletionQuestVariablesFlags": [
                 null,
                 {
-                  "High": 3
+                  "High": 3,
+                  "Mode": "Exact"
                 },
                 null,
                 null,
@@ -110,10 +112,12 @@
           ],
           "CompletionQuestVariablesFlags": [
             {
-              "Low": 3
+              "Low": 3,
+              "Mode": "Exact"
             },
             {
-              "High": 3
+              "High": 3,
+              "Mode": "Exact"
             },
             null,
             null,
@@ -137,7 +141,8 @@
               "CompletionQuestVariablesFlags": [
                 null,
                 {
-                  "Low": 3
+                  "Low": 3,
+                  "Mode": "Exact"
                 },
                 null,
                 null,
@@ -149,7 +154,8 @@
           "CompletionQuestVariablesFlags": [
             null,
             {
-              "Low": 3
+              "Low": 3,
+              "Mode": "Exact"
             },
             null,
             null,

QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/261_Ul'dah's Most Wanted.json

@@ -47,9 +47,7 @@
             "[Ul'dah] Gladiators' Guild",
             "[Ul'dah] Gate of Nald (Central Thanalan)"
           ],
-          "KillEnemyDataIds": [
+          "KillEnemyDataIds": [1245]
-            1245
-          ]
         }
       ]
     },
@@ -115,8 +113,8 @@
           }
         ]
       },
-    {
+
-      "Sequence": 5,
+      { "Sequence": 5,
       "Steps": [
           {
               "DataId": 1003945,
@@ -125,14 +123,12 @@
     "Y": 13,
     "Z": 50.156372
 },
-          "StopDistance": 5,
 "TerritoryId": 141,
 "InteractionType": "Interact"
           }
-      ]
+      ]},
-    },
+
-    {
+    { "Sequence": 255,
-      "Sequence": 255,
     "Steps": [
         {
             "DataId": 1001739,
@@ -157,7 +153,6 @@
             ],
             "NextQuestId": 262
         }
-      ]
+    ]}
-    }
   ]
 }

QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/262_That Old Familiar Feeling.json

@@ -44,9 +44,7 @@
 "InteractionType": "Combat",
 "AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
 "EnemySpawnType":"AfterInteraction",
-          "KillEnemyDataIds": [
+"KillEnemyDataIds":[1244]
-            1244
-          ]
         }
       ]
     },
@@ -112,8 +110,7 @@
           }
         ]
       },
-    {
+    { "Sequence": 255,
-      "Sequence": 255,
     "Steps": [
         {
             "DataId": 1001739,
@@ -125,12 +122,11 @@
           "TerritoryId": 131,
 "InteractionType": "CompleteQuest",
 "AethernetShortcut": [
-            "[Ul'dah] Adventurers' Guild",
+            "[Ul'dah] Aetheryte Plaza",
             "[Ul'dah] Gladiators' Guild"
             ],
             "NextQuestId": 263
         }
-      ]
+    ]}
-    }
   ]
 }

QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/263_The Face of Thal.json

@@ -57,15 +57,7 @@
     "Z": -41.397766
 },
 "TerritoryId": 141,
-          "InteractionType": "Interact",
+"InteractionType": "Interact"
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            64
-          ]
         },
         {
           "DataId": 1001438,
@@ -75,41 +67,23 @@
     "Z": -145.67792
 },
 "TerritoryId": 141,
-          "InteractionType": "Interact",
+"InteractionType": "Interact"  
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            128
-          ]
         },
-        {
+        {"DataId": 2001434,
-          "DataId": 2001434,
 "Position": {
     "X": -115.77026,
     "Y": 0.015197754,
     "Z": -149.24854
 },
 "TerritoryId": 141,
-          "InteractionType": "Interact",
+"InteractionType": "Interact"
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            32
-          ]
 }
       ]
     },
     {
       "Sequence": 3,
       "Steps": [
-        {
+        {"DataId": 1004140,
-          "DataId": 1004140,
 "Position": {
     "X": -72.34308,
     "Y": -12.372956,
@@ -136,8 +110,7 @@
           }
         ]
       },
-    {
+    { "Sequence": 5,
-      "Sequence": 5,
     "Steps": [
         {
             "DataId": 1001739,
@@ -160,10 +133,8 @@
             }
           ]
         }
-      ]
+    ]},
-    },
+    { "Sequence": 6,
-    {
-      "Sequence": 6,
     "Steps": [
         {
     "DataId": 1004092,
@@ -177,13 +148,10 @@
 "AethernetShortcut": [
             "[Ul'dah] Gladiators' Guild",
             "[Ul'dah] Gate of the Sultana (Western Thanalan)"
-          ],
-          "Fly": true
-        }
             ]
-    },
+        }
-    {
+    ]},
-      "Sequence": 255,
+    { "Sequence": 255,
     "Steps": [
         {
             "DataId": 1001739,
@@ -201,7 +169,6 @@
             ],
             "NextQuestId": 264
         }
-      ]
+    ]}
-    }
   ]
 }

QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/264_On Holy Ground.json

@@ -43,14 +43,11 @@
 "TerritoryId": 140,
 "InteractionType": "Combat",
 "EnemySpawnType": "AfterInteraction",
-          "KillEnemyDataIds": [
+"KillEnemyDataIds": [1243],
-            1243
-          ],
 "AethernetShortcut": [
             "[Ul'dah] Gladiators' Guild",
             "[Ul'dah] Gate of the Sultana (Western Thanalan)"
-          ],
+            ]
-          "Fly": true
         }
       ]
     },
@@ -69,8 +66,7 @@
         }
       ]
     },
-    {
+    { "Sequence": 3,
-      "Sequence": 3,
     "Steps": [
         {
             "DataId": 1001739,
@@ -87,10 +83,8 @@
             "[Ul'dah] Gladiators' Guild"
             ]
         }
-      ]
+    ]},
-    },
+    { "Sequence": 4,
-    {
-      "Sequence": 4,
     "Steps": [
         {
     "DataId": 1002277,
@@ -102,10 +96,9 @@
 "TerritoryId": 131,
 "InteractionType": "Interact"
         }
-      ]
+    ]}
-    },
+    ,
-    {
+    { "Sequence": 5,
-      "Sequence": 5,
     "Steps": [
         {
     "DataId": 1004141,
@@ -125,10 +118,9 @@
             }
           ]
         }
-      ]
+    ]}
-    },
+    ,
-    {
+    { "Sequence": 255,
-      "Sequence": 255,
     "Steps": [
         {
             "DataId": 1001739,
@@ -146,7 +138,6 @@
             ],
             "NextQuestId": 265
         }
-      ]
+    ]}
-    }
   ]
 }

QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/265_The Rematch.json

@@ -67,41 +67,20 @@
 },
 "TerritoryId": 141,
 "InteractionType": "WalkTo",
-          "AethernetShortcut": [
+"AethernetShortcut": ["[Ul'dah] Aetheryte Plaza", "[Ul'dah] Gate of Thal (Central Thanalan)"]
-            "[Ul'dah] Aetheryte Plaza",
-            "[Ul'dah] Gate of Thal (Central Thanalan)"
-          ],
-          "SkipConditions": {
-            "StepIf": {
-              "AetheryteUnlocked": "Southern Thanalan - Little Ala Mhigo"
-            }
-          }
         },
 {
 "TerritoryId": 146,
 "Aetheryte": "Southern Thanalan - Little Ala Mhigo",
-          "InteractionType": "AttuneAetheryte",
+"InteractionType": "AttuneAetheryte"
-          "SkipConditions": {
-            "StepIf": {
-              "AetheryteUnlocked": "Southern Thanalan - Little Ala Mhigo"
-            }
-          }
 },
-        {
+{"Position": {
-          "Position": {
     "X": 140.30618,
     "Y": 4.2185926,
     "Z": -585.2695
 },
 "TerritoryId": 146,
-          "InteractionType": "WalkTo",
+"InteractionType": "WalkTo"},
-          "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo",
-          "SkipConditions": {
-            "AetheryteShortcutIf": {
-              "AetheryteLocked": "Southern Thanalan - Little Ala Mhigo"
-            }
-          }
-        },
         {
             "DataId": 2001455,
 "Position": {
@@ -110,15 +89,7 @@
     "Z": -611.2917
 },
 "TerritoryId": 146,
-          "InteractionType": "Interact",
+"InteractionType": "Interact"
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            64
-          ]
           },
           {
             "DataId": 2001435,
@@ -128,21 +99,8 @@
     "Z": -534.56934
 },
 "TerritoryId": 146,
-          "InteractionType": "Interact",
+"InteractionType": "Interact"
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            128
-          ]
-        }
-      ]
           },
-    {
-      "Sequence": 3,
-      "Steps": [
         {
 "Position": {
     "X": 164.75665,
@@ -151,7 +109,12 @@
 },
 "TerritoryId": 146,
 "InteractionType": "WalkTo"
+
+        }
+      ]
     },
+    { "Sequence": 3,
+    "Steps": [
         {
             "DataId": 1001739,
           "Position": {
@@ -167,10 +130,8 @@
             "[Ul'dah] Gladiators' Guild"
             ]
         }
-      ]
+    ]},
-    },
+    { "Sequence": 4,
-    {
-      "Sequence": 4,
     "Steps": [
         {
     "DataId": 1004142,
@@ -183,10 +144,9 @@
 "InteractionType": "SinglePlayerDuty",
 "AetheryteShortcut": "Eastern Thanalan - Camp Drybone"
         }
-      ]
+    ]}
-    },
+    ,
-    {
+    { "Sequence": 255,
-      "Sequence": 255,
     "Steps": [
         {
             "DataId": 1001739,
@@ -204,7 +164,6 @@
             ],
             "NextQuestId": 1055
         }
-      ]
+    ]}
-    }
   ]
 }

QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/285_Way of the Gladiator.json

@@ -1,44 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
-  "Author": "liza",
-  "QuestSequence": [
-    {
-      "Sequence": 0,
-      "Steps": [
-        {
-          "DataId": 1002277,
-          "Position": {
-            "X": -97.550964,
-            "Y": 7.05,
-            "Z": 23.605652
-          },
-          "TerritoryId": 131,
-          "InteractionType": "AcceptQuest"
-        }
-      ]
-    },
-    {
-      "Sequence": 255,
-      "Steps": [
-        {
-          "DataId": 1001739,
-          "Position": {
-            "X": -94.529724,
-            "Y": 6.4999976,
-            "Z": 39.81079
-          },
-          "TerritoryId": 131,
-          "InteractionType": "CompleteQuest",
-          "DialogueChoices": [
-            {
-              "Type": "YesNo",
-              "Prompt": "TEXT_CLSGLA011_00285_Q2_000_1",
-              "Yes": true
-            }
-          ],
-          "NextQuestId": 286
-        }
-      ]
-    }
-  ]
-}

QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/286_My First Gladius.json

@@ -1,154 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
-  "Author": "liza",
-  "QuestSequence": [
-    {
-      "Sequence": 0,
-      "Steps": [
-        {
-          "DataId": 1001739,
-          "Position": {
-            "X": -94.529724,
-            "Y": 6.4999976,
-            "Z": 39.81079
-          },
-          "TerritoryId": 131,
-          "InteractionType": "AcceptQuest"
-        }
-      ]
-    },
-    {
-      "Sequence": 1,
-      "Steps": [
-        {
-          "Position": {
-            "X": 45.13088,
-            "Y": 3.889354,
-            "Z": -166.51999
-          },
-          "TerritoryId": 130,
-          "InteractionType": "WalkTo",
-          "AethernetShortcut": [
-            "[Ul'dah] Gladiators' Guild",
-            "[Ul'dah] Adventurers' Guild"
-          ],
-          "SkipConditions": {
-            "StepIf": {
-              "InTerritory": [
-                141
-              ]
-            }
-          }
-        },
-        {
-          "Position": {
-            "X": -116.10664,
-            "Y": 10.801613,
-            "Z": 276.979
-          },
-          "TerritoryId": 141,
-          "InteractionType": "Combat",
-          "EnemySpawnType": "OverworldEnemies",
-          "ComplexCombatData": [
-            {
-              "DataId": 351,
-              "MinimumKillCount": 3,
-              "CompletionQuestVariablesFlags": [
-                {
-                  "Low": 3
-                },
-                null,
-                null,
-                null,
-                null,
-                null
-              ]
-            },
-            {
-              "DataId": 141,
-              "MinimumKillCount": 3,
-              "CompletionQuestVariablesFlags": [
-                null,
-                {
-                  "High": 3
-                },
-                null,
-                null,
-                null,
-                null
-              ]
-            }
-          ],
-          "CompletionQuestVariablesFlags": [
-            {
-              "Low": 3
-            },
-            {
-              "High": 3
-            },
-            null,
-            null,
-            null,
-            null
-          ]
-        },
-        {
-          "Position": {
-            "X": 39.635372,
-            "Y": 3.2401803,
-            "Z": 273.41232
-          },
-          "TerritoryId": 141,
-          "InteractionType": "Combat",
-          "EnemySpawnType": "OverworldEnemies",
-          "ComplexCombatData": [
-            {
-              "DataId": 205,
-              "MinimumKillCount": 3,
-              "CompletionQuestVariablesFlags": [
-                null,
-                {
-                  "Low": 3
-                },
-                null,
-                null,
-                null,
-                null
-              ]
-            }
-          ],
-          "CompletionQuestVariablesFlags": [
-            null,
-            {
-              "Low": 3
-            },
-            null,
-            null,
-            null,
-            null
-          ]
-        }
-      ]
-    },
-    {
-      "Sequence": 255,
-      "Steps": [
-        {
-          "DataId": 1001739,
-          "Position": {
-            "X": -94.529724,
-            "Y": 6.4999976,
-            "Z": 39.81079
-          },
-          "TerritoryId": 131,
-          "InteractionType": "CompleteQuest",
-          "AetheryteShortcut": "Ul'dah",
-          "AethernetShortcut": [
-            "[Ul'dah] Aetheryte Plaza",
-            "[Ul'dah] Gladiators' Guild"
-          ]
-        }
-      ]
-    }
-  ]
-}

QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/288_Ul'dah's Most Wanted.json

@@ -1,163 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
-  "Author": "Cacahuetes",
-  "QuestSequence": [
-    {
-      "Sequence": 0,
-      "Steps": [
-        {
-          "DataId": 1001739,
-          "Position": {
-            "X": -94.529724,
-            "Y": 6.4999976,
-            "Z": 39.81079
-          },
-          "TerritoryId": 131,
-          "InteractionType": "AcceptQuest",
-          "AetheryteShortcut": "Ul'dah",
-          "AethernetShortcut": [
-            "[Ul'dah] Aetheryte Plaza",
-            "[Ul'dah] Gladiators' Guild"
-          ],
-          "SkipConditions": {
-            "AetheryteShortcutIf": {
-              "InSameTerritory": true,
-              "InTerritory": [
-                131
-              ]
-            }
-          }
-        }
-      ]
-    },
-    {
-      "Sequence": 1,
-      "Steps": [
-        {
-          "DataId": 1002296,
-          "Position": {
-            "X": -139.42175,
-            "Y": 4.019726,
-            "Z": 205.0354
-          },
-          "TerritoryId": 141,
-          "InteractionType": "Combat",
-          "EnemySpawnType": "AfterInteraction",
-          "AethernetShortcut": [
-            "[Ul'dah] Gladiators' Guild",
-            "[Ul'dah] Gate of Nald (Central Thanalan)"
-          ],
-          "KillEnemyDataIds": [
-            1245
-          ]
-        }
-      ]
-    },
-    {
-      "Sequence": 2,
-      "Steps": [
-        {
-          "DataId": 1002296,
-          "Position": {
-            "X": -139.42175,
-            "Y": 4.019726,
-            "Z": 205.0354
-          },
-          "TerritoryId": 141,
-          "InteractionType": "Interact"
-        }
-      ]
-    },
-    {
-      "Sequence": 3,
-      "Steps": [
-        {
-          "DataId": 1001739,
-          "Position": {
-            "X": -94.529724,
-            "Y": 6.4999976,
-            "Z": 39.81079
-          },
-          "TerritoryId": 131,
-          "InteractionType": "Interact",
-          "AetheryteShortcut": "Ul'dah",
-          "AethernetShortcut": [
-            "[Ul'dah] Aetheryte Plaza",
-            "[Ul'dah] Gladiators' Guild"
-          ],
-          "SkipConditions": {
-            "AetheryteShortcutIf": {
-              "InSameTerritory": true,
-              "InTerritory": [
-                131
-              ]
-            }
-          }
-        }
-      ]
-    },
-    {
-      "Sequence": 4,
-      "Steps": [
-        {
-          "DataId": 2001756,
-          "Position": {
-            "X": 27.206787,
-            "Y": 12.985352,
-            "Z": 51.83484
-          },
-          "TerritoryId": 141,
-          "InteractionType": "SinglePlayerDuty",
-          "AethernetShortcut": [
-            "[Ul'dah] Gladiators' Guild",
-            "[Ul'dah] Gate of Nald (Central Thanalan)"
-          ]
-        }
-      ]
-    },
-    {
-      "Sequence": 5,
-      "Steps": [
-        {
-          "DataId": 1003945,
-          "Position": {
-            "X": 24.917969,
-            "Y": 13,
-            "Z": 50.156372
-          },
-          "StopDistance": 5,
-          "TerritoryId": 141,
-          "InteractionType": "Interact"
-        }
-      ]
-    },
-    {
-      "Sequence": 255,
-      "Steps": [
-        {
-          "DataId": 1001739,
-          "Position": {
-            "X": -94.529724,
-            "Y": 6.4999976,
-            "Z": 39.81079
-          },
-          "TerritoryId": 131,
-          "InteractionType": "CompleteQuest",
-          "AetheryteShortcut": "Ul'dah",
-          "DialogueChoices": [
-            {
-              "Type": "List",
-              "Prompt": "TEXT_CLSGLA101_00288_Q1_000_160",
-              "Answer": "TEXT_CLSGLA101_00288_A1_000_161"
-            }
-          ],
-          "AethernetShortcut": [
-            "[Ul'dah] Aetheryte Plaza",
-            "[Ul'dah] Gladiators' Guild"
-          ],
-          "NextQuestId": 262
-        }
-      ]
-    }
-  ]
-}

QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/179_So You Want to Be a Marauder.json

@@ -5,15 +5,14 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1000926,
-          "DataId": 1000926,
 "Position": {
     "X": -10.055725,
     "Y": 44.999794,
     "Z": -245.80762
 },
 "TerritoryId": 128,
-          "InteractionType": "AcceptQuest",
+"InteractionType": "Interact",
           "AetheryteShortcut": "Limsa Lominsa",
           "AethernetShortcut": [
             "[Limsa Lominsa] Aetheryte Plaza",
@@ -23,7 +22,7 @@
             "AetheryteShortcutIf": {
               "InSameTerritory": true,
               "InTerritory": [
-                128
+                129, 128
               ]
             }
           },
@@ -33,9 +32,9 @@
               "Prompt": "TEXT_CLSEXC001_00179_Q1_000_1",
               "Yes": true
             }
+          ]}
         ]
       }
     ]
   }
-  ]
+  
-}

QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/310_Way of the Marauder.json

@@ -5,30 +5,27 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1000926,
-          "DataId": 1000926,
 "Position": {
     "X": -10.055725,
     "Y": 44.999794,
     "Z": -245.80762
 },
 "TerritoryId": 128,
-          "InteractionType": "AcceptQuest"
+"InteractionType": "AcceptQuest"}
-        }
         ]
       },
       {
         "Sequence": 255,
         "Steps": [
-        {
+          { "DataId": 1000927,
-          "DataId": 1000927,
 "Position": {
     "X": -1.2055054,
     "Y": 44.999886,
     "Z": -255.8786
 },
 "TerritoryId": 128,
-          "InteractionType": "CompleteQuest",
+"InteractionType": "AcceptQuest",
   "DialogueChoices": [
                           {
                               "Type": "YesNo",
@@ -42,3 +39,4 @@
       }
     ]
   }
+  

QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/189_So You Want to Be a Weaver.json

@@ -5,20 +5,17 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1002283,
-          "DataId": 1002283,
 "Position": {
     "X": 134.90503,
     "Y": 7.5919275,
     "Z": 98.039185
 },
 "TerritoryId": 131,
-          "InteractionType": "AcceptQuest",
+"InteractionType": "Interact",
           "AetheryteShortcut": "Ul'dah",
-          "AethernetShortcut": [
+          "AethernetShortcut": ["[Ul'dah] Aetheryte Plaza", 
-            "[Ul'dah] Aetheryte Plaza",
+          "[Ul'dah] Weavers' Guild"],
-            "[Ul'dah] Weavers' Guild"
-          ],
           "SkipConditions": {
             "AetheryteShortcutIf": {
               "InSameTerritory": true,
@@ -33,9 +30,9 @@
               "Prompt": "TEXT_CLSWVR001_00189_Q1_000_1",
               "Yes": true
             }
+          ]}
         ]
       }
     ]
   }
-  ]
+  
-}

QuestPaths/2.x - A Realm Reborn/Class Quests/WVR/534_Way of the Weaver.json

@@ -5,23 +5,20 @@
       {
         "Sequence": 0,
         "Steps": [
-        {
+          { "DataId": 1002283,
-          "DataId": 1002283,
 "Position": {
     "X": 134.90503,
     "Y": 7.5919275,
     "Z": 98.039185
 },
 "TerritoryId": 131,
-          "InteractionType": "AcceptQuest"
+"InteractionType": "AcceptQuest"}
-        }
         ]
       },
       {
         "Sequence": 255,
         "Steps": [
-        {
+          { "DataId": 1003818,
-          "DataId": 1003818,
 "Position": {
     "X": 157.36621,
     "Y": 7.7920074,
@@ -35,9 +32,11 @@
                               "Prompt": "TEXT_CLSWVR011_00534_SYSTEM_Q0",
                               "Yes": true
                           }
-          ]
+                      ],
+  "NextQuestId": 534
   }
         ]
       }
     ]
   }
+  

QuestPaths/5.x - Shadowbringers/Allied Societies/Pixies/Story/3684_Sustenance for the Soul.json

@@ -88,14 +88,7 @@
           "TerritoryId": 814,
           "InteractionType": "Interact",
           "AetheryteShortcut": "Kholusia - Wright",
-          "Fly": true,
+          "Fly": true
-          "DialogueChoices": [
-            {
-              "Type": "List",
-              "Prompt": "TEXT_BANPIX002_03684_Q1_000_000",
-              "Answer": "TEXT_BANPIX002_03684_A1_000_001"
-            }
-          ]
         }
       ]
     },

QuestPaths/7.x - Dawntrail/Aether Currents/Kozama'uka/5085_All Good Potpacts Must Come to an End.json

@@ -102,8 +102,7 @@
             "Z": 342.85498
           },
           "TerritoryId": 1188,
-          "InteractionType": "CompleteQuest",
+          "InteractionType": "CompleteQuest"
-          "Mount": true
         }
       ]
     }

QuestPaths/7.x - Dawntrail/Aether Currents/Shaaloani/5138_Rroneek Seeker.json

@@ -20,15 +20,6 @@
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "Position": {
-            "X": 323.5058,
-            "Y": -16.330368,
-            "Z": -254.18399
-          },
-          "TerritoryId": 1190,
-          "InteractionType": "WalkTo"
-        },
         {
           "DataId": 1050656,
           "Position": {

QuestPaths/7.x - Dawntrail/Aether Currents/Shaaloani/5140_When the Bill Comes Due.json

@@ -28,8 +28,7 @@
             "Z": 427.2068
           },
           "TerritoryId": 1190,
-          "InteractionType": "Interact",
+          "InteractionType": "Interact"
-          "Mount": true
         }
       ]
     },
@@ -51,27 +50,6 @@
     {
       "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": {

QuestPaths/7.x - Dawntrail/Aether Currents/Yak T'el/5094_Secrets in the Cinderfield.json

@@ -174,17 +174,6 @@
     {
       "Sequence": 255,
       "Steps": [
-        {
-          "DataId": 2013948,
-          "Position": {
-            "X": 610.7728,
-            "Y": 9.597839,
-            "Z": 233.05103
-          },
-          "TerritoryId": 1189,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818440
-        },
         {
           "DataId": 1051073,
           "Position": {

QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4868_A Well-mannered Shipwright.json

@@ -151,21 +151,13 @@
       "Steps": [
         {
           "Position": {
-            "X": -510.37933,
+            "X": -510.96463,
-            "Y": -0.39999998,
+            "Y": -0.47684515,
-            "Z": -277.78192
+            "Z": -305.96155
           },
           "TerritoryId": 1188,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
-        },
+          "Comment": "Waypoint after swimming through the river"
-        {
-          "Position": {
-            "X": -521.0261,
-            "Y": -0.40000004,
-            "Z": -329.19336
-          },
-          "TerritoryId": 1188,
-          "InteractionType": "WalkTo"
         },
         {
           "DataId": 2013936,

QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4870_Knowing the Hanuhanu.json

@@ -12,7 +12,7 @@
             "Y": 9.773315,
             "Z": -533.135
           },
-          "StopDistance": 7,
+          "StopDistance": 5,
           "TerritoryId": 1188,
           "InteractionType": "AcceptQuest"
         }
@@ -135,28 +135,6 @@
     {
       "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": {

QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4872_Traders of Happiness.json

@@ -21,11 +21,6 @@
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "TerritoryId": 1187,
-          "InteractionType": "AttuneAetheryte",
-          "Aetheryte": "Urqopacha - Wachunpelo"
-        },
         {
           "DataId": 1046557,
           "Position": {
@@ -44,6 +39,11 @@
             128
           ]
         },
+        {
+          "TerritoryId": 1187,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "Urqopacha - Wachunpelo"
+        },
         {
           "DataId": 1046559,
           "Position": {

QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4877_Knowing the Pelupelu.json

@@ -52,30 +52,6 @@
     {
       "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": {

QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4878_The Success of Others.json

@@ -100,7 +100,7 @@
             "Y": -19.725424,
             "Z": 203.72314
           },
-          "StopDistance": 7,
+          "StopDistance": 5,
           "TerritoryId": 1185,
           "InteractionType": "CompleteQuest"
         }

QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4879_For All Turali.json

@@ -15,7 +15,6 @@
             "Y": -19.725424,
             "Z": 203.72314
           },
-          "StopDistance": 7,
           "TerritoryId": 1185,
           "InteractionType": "AcceptQuest"
         }

QuestPaths/7.x - Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4884_The Shape of Peace.json

@@ -63,28 +63,6 @@
     {
       "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": {

QuestPaths/7.x - Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4889_History's Keepers.json

@@ -12,7 +12,6 @@
             "Y": 119.49004,
             "Z": 190.72253
           },
-          "StopDistance": 5,
           "TerritoryId": 1188,
           "InteractionType": "AcceptQuest"
         }
@@ -30,8 +29,7 @@
           },
           "TerritoryId": 1188,
           "InteractionType": "Interact",
-          "AetheryteShortcut": "Kozama'uka - Earthenshire",
+          "AetheryteShortcut": "Kozama'uka - Earthenshire"
-          "Fly": true
         }
       ]
     },
@@ -46,8 +44,7 @@
           },
           "TerritoryId": 1188,
           "InteractionType": "WalkTo",
-          "TargetTerritoryId": 1187,
+          "TargetTerritoryId": 1187
-          "Fly": true
         },
         {
           "DataId": 1046814,

QuestPaths/7.x - Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4896_The Promise of Peace.json

@@ -21,30 +21,6 @@
     {
       "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": {

QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4903_Into the Traverse.json

@@ -21,36 +21,6 @@
     {
       "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": {
@@ -66,6 +36,28 @@
     {
       "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": {
@@ -74,7 +66,8 @@
             "Z": 214.83167
           },
           "TerritoryId": 1189,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DisableNavmesh": true
         }
       ]
     },

QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4909_Road to the Golden City.json

@@ -24,28 +24,6 @@
     {
       "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": {

QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4919_And the Land Would Tremble.json

@@ -52,62 +52,6 @@
     {
       "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": {
@@ -117,7 +61,6 @@
           },
           "TerritoryId": 1190,
           "InteractionType": "Interact",
-          "AetheryteShortcut": "Shaaloani - Sheshenewezi Springs",
           "DialogueChoices": [
             {
               "Type": "YesNo",

QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4923_In Yyasulani's Shadow.json

@@ -161,17 +161,6 @@
     {
       "Sequence": 7,
       "Steps": [
-        {
-          "DataId": 1051316,
-          "Position": {
-            "X": -380.30066,
-            "Y": 18.718708,
-            "Z": -114.24432
-          },
-          "TerritoryId": 1190,
-          "InteractionType": "AcceptQuest",
-          "PickUpQuestId": 5144
-        },
         {
           "DataId": 1047082,
           "Position": {

QuestPaths/quest-v1.json

@@ -234,13 +234,13 @@
                 "QuestsAccepted": {
                   "type": "array",
                   "items": {
-                    "type": ["number", "string"]
+                    "type": "number"
                   }
                 },
                 "QuestsCompleted": {
                   "type": "array",
                   "items": {
-                    "type": ["number", "string"]
+                    "type": "number"
                   }
                 },
                 "AetheryteLocked": {
@@ -290,18 +290,6 @@
                     "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"
                 },

Questionable.Model/Questing/Converter/ElementIdListConverter.cs

@@ -1,36 +0,0 @@
-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();
-    }
-}

Questionable.Model/Questing/SkipAetheryteCondition.cs

@@ -1,7 +1,5 @@
 using System.Collections.Generic;
-using System.Text.Json.Serialization;
 using Questionable.Model.Common;
-using Questionable.Model.Questing.Converter;
 
 namespace Questionable.Model.Questing;
 
@@ -10,13 +8,6 @@ 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; }

Questionable.Model/Questing/SkipStepConditions.cs

@@ -1,8 +1,6 @@
 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;
 
@@ -16,13 +14,8 @@ 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; }

Questionable/Controller/QuestController.cs

@@ -138,8 +138,6 @@ internal sealed class QuestController : MiniTaskController<QuestController>, IDi
     /// </summary>
     public QuestProgress? PendingQuest => _pendingQuest;
 
-    public List<Quest> ManualPriorityQuests { get; } = [];
-
     public string? DebugState { get; private set; }
 
     public void Reload()
@@ -293,13 +291,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>, IDi
             }
             else
             {
-                (ElementId? currentQuestId, currentSequence) =
+                (ElementId? currentQuestId, currentSequence) = _questFunctions.GetCurrentQuest();
-                    ManualPriorityQuests
-                        .Where(x => _questFunctions.IsReadyToAcceptQuest(x.Id) || _questFunctions.IsQuestAccepted(x.Id))
-                        .Select(x =>
-                            ((ElementId?, byte)?)(x.Id, _questFunctions.GetQuestProgressInfo(x.Id)?.Sequence ?? 0))
-                        .FirstOrDefault() ??
-                    _questFunctions.GetCurrentQuest();
                 if (currentQuestId == null || currentQuestId.Value == 0)
                 {
                     if (_startedQuest != null)
@@ -727,9 +719,6 @@ internal sealed class QuestController : MiniTaskController<QuestController>, IDi
         if (type != ECurrentQuestType.Normal)
             return false;
 
-        if (currentQuest.Quest.Info.AlliedSociety != EAlliedSociety.None)
-            return false;
-
         QuestSequence? currentSequence = currentQuest.Quest.FindSequence(currentQuest.Sequence);
         if (currentQuest.Step > 0)
             return false;

Questionable/Controller/Steps/Common/Mount.cs

@@ -29,7 +29,7 @@ internal static class Mount
 
         public ITask Unmount()
         {
-            return new UnmountTask(condition, loggerFactory.CreateLogger<UnmountTask>(), gameFunctions, clientState);
+            return new UnmountTask(condition, loggerFactory.CreateLogger<UnmountTask>(), gameFunctions);
         }
     }
 
@@ -119,11 +119,7 @@ internal static class Mount
         public override string ToString() => "Mount";
     }
 
-    private sealed class UnmountTask(
+    private sealed class UnmountTask(ICondition condition, ILogger<UnmountTask> logger, GameFunctions gameFunctions)
-        ICondition condition,
-        ILogger<UnmountTask> logger,
-        GameFunctions gameFunctions,
-        IClientState clientState)
         : ITask
     {
         private bool _unmountTriggered;
@@ -152,9 +148,6 @@ internal static class Mount
             if (_continueAt >= DateTime.Now)
                 return ETaskResult.StillRunning;
 
-            if (IsUnmounting())
-                return ETaskResult.StillRunning;
-
             if (!_unmountTriggered)
             {
                 // if still flying, we still need to land
@@ -179,8 +172,6 @@ internal static class Mount
                 : ETaskResult.TaskComplete;
         }
 
-        private unsafe bool IsUnmounting() => **(byte**)(clientState.LocalPlayer!.Address + 1432) == 1;
-
         public override string ToString() => "Unmount";
     }
 

Questionable/Controller/Steps/Interactions/Combat.cs

@@ -41,7 +41,6 @@ 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;
                 }
@@ -53,15 +52,11 @@ 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;

Questionable/Controller/Steps/Shared/AethernetShortcut.cs

@@ -24,7 +24,6 @@ internal static class AethernetShortcut
         MovementController movementController,
         AetheryteFunctions aetheryteFunctions,
         GameFunctions gameFunctions,
-        QuestFunctions questFunctions,
         IClientState clientState,
         AetheryteData aetheryteData,
         TerritoryData territoryData,
@@ -47,8 +46,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, questFunctions,
+                loggerFactory.CreateLogger<UseAethernetShortcut>(), aetheryteFunctions, gameFunctions, clientState,
-                clientState, aetheryteData, territoryData, lifestreamIpc, movementController, condition);
+                aetheryteData, territoryData, lifestreamIpc, movementController, condition);
         }
     }
 
@@ -59,7 +58,6 @@ internal static class AethernetShortcut
         ILogger<UseAethernetShortcut> logger,
         AetheryteFunctions aetheryteFunctions,
         GameFunctions gameFunctions,
-        QuestFunctions questFunctions,
         IClientState clientState,
         AetheryteData aetheryteData,
         TerritoryData territoryData,
@@ -92,20 +90,6 @@ 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))
                 {

Questionable/Controller/Steps/Shared/AetheryteShortcut.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Numerics;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Application.Network.WorkDefinitions;
@@ -94,20 +93,6 @@ 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))
                     {

Questionable/DalamudInitializer.cs

@@ -36,7 +36,6 @@ internal sealed class DalamudInitializer : IDisposable
         QuestSelectionWindow questSelectionWindow,
         QuestValidationWindow questValidationWindow,
         JournalProgressWindow journalProgressWindow,
-        PriorityWindow priorityWindow,
         IToastGui toastGui,
         ILogger<DalamudInitializer> logger)
     {
@@ -56,7 +55,6 @@ internal sealed class DalamudInitializer : IDisposable
         _windowSystem.AddWindow(questSelectionWindow);
         _windowSystem.AddWindow(questValidationWindow);
         _windowSystem.AddWindow(journalProgressWindow);
-        _windowSystem.AddWindow(priorityWindow);
 
         _pluginInterface.UiBuilder.Draw += _windowSystem.Draw;
         _pluginInterface.UiBuilder.OpenMainUi += _questWindow.Toggle;

Questionable/Data/QuestData.cs

@@ -8,8 +8,7 @@ using LLib.GameData;
 using Lumina.Excel.GeneratedSheets;
 using Questionable.Model;
 using Questionable.Model.Questing;
-using Leve = Lumina.Excel.GeneratedSheets2.Leve;
+using Quest = Lumina.Excel.GeneratedSheets.Quest;
-using Quest = Lumina.Excel.GeneratedSheets2.Quest;
 
 namespace Questionable.Data;
 
@@ -63,7 +62,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 QuestInfo.PreviousQuestInfo(new QuestId(495)));
+        aTimeToEveryPurpose.AddPreviousQuest(new QuestId(495));
     }
 
     public IQuestInfo GetQuestInfo(ElementId elementId)

Questionable/Functions/GameFunctions.cs

@@ -431,8 +431,7 @@ internal sealed unsafe class GameFunctions
         if (!AgentSatisfactionSupply.Instance()->IsAgentActive())
             return false;
 
-        var flags = _condition.AsReadOnlySet().ToHashSet();
+        var flags = _condition.AsReadOnlySet();
-        flags.Remove(ConditionFlag.InDutyQueue); // irrelevant
         return flags.Count == 2 &&
                flags.Contains(ConditionFlag.NormalConditions) &&
                flags.Contains(ConditionFlag.OccupiedInQuestEvent);

Questionable/Functions/QuestFunctions.cs

@@ -449,18 +449,6 @@ internal sealed unsafe class QuestFunctions
     }
 
     public bool IsQuestLocked(QuestId questId, ElementId? extraCompletedQuest = null)
-    {
-        if (IsQuestUnobtainable(questId, extraCompletedQuest))
-            return true;
-
-        var questInfo = (QuestInfo)_questData.GetQuestInfo(questId);
-        if (questInfo.GrandCompany != GrandCompany.None && questInfo.GrandCompany != GetGrandCompany())
-            return true;
-
-        return !HasCompletedPreviousQuests(questInfo, extraCompletedQuest) || !HasCompletedPreviousInstances(questInfo);
-    }
-
-    public bool IsQuestUnobtainable(QuestId questId, ElementId? extraCompletedQuest = null)
     {
         var questInfo = (QuestInfo)_questData.GetQuestInfo(questId);
         if (questInfo.QuestLocks.Count > 0)
@@ -472,10 +460,13 @@ internal sealed unsafe class QuestFunctions
                 return true;
         }
 
+        if (questInfo.GrandCompany != GrandCompany.None && questInfo.GrandCompany != GetGrandCompany())
+            return true;
+
         if (_questData.GetLockedClassQuests().Contains(questId))
             return true;
 
-        return false;
+        return !HasCompletedPreviousQuests(questInfo, extraCompletedQuest) || !HasCompletedPreviousInstances(questInfo);
     }
 
     public bool IsQuestLocked(LeveId leveId)
@@ -494,8 +485,7 @@ internal sealed unsafe class QuestFunctions
         if (questInfo.PreviousQuests.Count == 0)
             return true;
 
-        var completedQuests = questInfo.PreviousQuests.Count(x =>
+        var completedQuests = questInfo.PreviousQuests.Count(x => IsQuestComplete(x) || x.Equals(extraCompletedQuest));
-            HasEnoughProgressOnPreviousQuest(x) || x.QuestId.Equals(extraCompletedQuest));
         if (questInfo.PreviousQuestJoin == QuestInfo.QuestJoin.All &&
             questInfo.PreviousQuests.Count == completedQuests)
             return true;
@@ -505,20 +495,6 @@ 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)

Questionable/Model/LeveInfo.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using LLib.GameData;
-using Lumina.Excel.GeneratedSheets2;
+using Lumina.Excel.GeneratedSheets;
 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.Row;
+        IssuerDataId = leve.LevelLevemete.Value!.Object;
         ClassJobs = QuestInfoUtils.AsList(leve.ClassJobCategory.Value!);
         Expansion = (EExpansionVersion)leve.LevelLevemete.Value.Territory.Value!.ExVersion.Row;
     }

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.GeneratedSheets2.Quest;
+using ExcelQuest = Lumina.Excel.GeneratedSheets.Quest;
 
 namespace Questionable.Model;
 
@@ -31,17 +31,12 @@ internal sealed class QuestInfo : IQuestInfo
         };
 
         Name = $"{quest.Name}{suffix}";
-        Level = quest.ClassJobLevel[0];
+        Level = quest.ClassJobLevel0;
-        IssuerDataId = quest.IssuerStart.Row;
+        IssuerDataId = quest.IssuerStart;
         IsRepeatable = quest.IsRepeatable;
-        PreviousQuests =
+        PreviousQuests = quest.PreviousQuest
-            new List<PreviousQuestInfo>
+            .Select(x => new QuestId((ushort)(x.Row & 0xFFFF)))
-                {
+            .Where(x => x.Value != 0)
-                    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
@@ -52,7 +47,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.TodoParams[0].ToDoCompleteSeq == 0;
+        CompletesInstantly = quest.ToDoCompleteSeq[0] == 0;
         PreviousInstanceContent = quest.InstanceContent.Select(x => (ushort)x.Row).Where(x => x != 0).ToList();
         PreviousInstanceContentJoin = (QuestJoin)quest.InstanceContentJoin;
         GrandCompany = (GrandCompany)quest.GrandCompany.Row;
@@ -69,7 +64,7 @@ internal sealed class QuestInfo : IQuestInfo
     public ushort Level { get; }
     public uint IssuerDataId { get; }
     public bool IsRepeatable { get; }
-    public ImmutableList<PreviousQuestInfo> PreviousQuests { get; set; }
+    public ImmutableList<QuestId> PreviousQuests { get; set; }
     public QuestJoin PreviousQuestJoin { get; }
     public ImmutableList<QuestId> QuestLocks { get; }
     public QuestJoin QuestLockJoin { get; }
@@ -94,10 +89,8 @@ internal sealed class QuestInfo : IQuestInfo
         AtLeastOne = 2,
     }
 
-    public void AddPreviousQuest(PreviousQuestInfo questId)
+    public void AddPreviousQuest(QuestId questId)
     {
         PreviousQuests = [..PreviousQuests, questId];
     }
-
-    public sealed record PreviousQuestInfo(QuestId QuestId, byte Sequence = 0);
 }

Questionable/Model/QuestInfoUtils.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using LLib.GameData;
-using Lumina.Excel.GeneratedSheets2;
+using Lumina.Excel.GeneratedSheets;
 
 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.Unknown1 },
+                { EClassJob.Viper, classJobCategory.VPR },
-                { EClassJob.Pictomancer, classJobCategory.Unknown2 }
+                { EClassJob.Pictomancer, classJobCategory.PCT }
             }
             .Where(y => y.Value)
             .Select(y => y.Key)

Questionable/QuestionablePlugin.cs

@@ -208,7 +208,6 @@ public sealed class QuestionablePlugin : IDalamudPlugin
         serviceCollection.AddSingleton<QuestSelectionWindow>();
         serviceCollection.AddSingleton<QuestValidationWindow>();
         serviceCollection.AddSingleton<JournalProgressWindow>();
-        serviceCollection.AddSingleton<PriorityWindow>();
     }
 
     private static void AddQuestValidators(ServiceCollection serviceCollection)

Questionable/Windows/PriorityWindow.cs

@@ -1,223 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using Dalamud.Interface;
-using Dalamud.Interface.Colors;
-using Dalamud.Interface.Components;
-using Dalamud.Plugin;
-using ImGuiNET;
-using LLib.ImGui;
-using Questionable.Controller;
-using Questionable.Functions;
-using Questionable.Model;
-using Questionable.Model.Questing;
-using Questionable.Windows.QuestComponents;
-
-namespace Questionable.Windows;
-
-internal sealed class PriorityWindow : LWindow
-{
-    private readonly QuestController _questController;
-    private readonly QuestRegistry _questRegistry;
-    private readonly QuestFunctions _questFunctions;
-    private readonly QuestTooltipComponent _questTooltipComponent;
-    private readonly UiUtils _uiUtils;
-    private readonly IDalamudPluginInterface _pluginInterface;
-
-    private string _searchString = string.Empty;
-    private ElementId? _draggedItem;
-
-    public PriorityWindow(QuestController questController, QuestRegistry questRegistry, QuestFunctions questFunctions,
-        QuestTooltipComponent questTooltipComponent, UiUtils uiUtils, IDalamudPluginInterface pluginInterface)
-        : base("Quest Priority###QuestionableQuestPriority")
-    {
-        _questController = questController;
-        _questRegistry = questRegistry;
-        _questFunctions = questFunctions;
-        _questTooltipComponent = questTooltipComponent;
-        _uiUtils = uiUtils;
-        _pluginInterface = pluginInterface;
-
-        Size = new Vector2(400, 400);
-        SizeCondition = ImGuiCond.Once;
-        SizeConstraints = new WindowSizeConstraints
-        {
-            MinimumSize = new Vector2(400, 400),
-            MaximumSize = new Vector2(400, 999)
-        };
-    }
-
-    public override void Draw()
-    {
-        ImGui.Text("Quests to do first:");
-        DrawQuestFilter();
-        DrawQuestList();
-        ImGui.Spacing();
-
-        ImGui.Separator();
-        ImGui.Spacing();
-        ImGui.TextWrapped(
-            "If you have an active MSQ quest, Questionable will generally try to do:");
-        ImGui.BulletText("'Priority' quests: class quests, ARR primals, ARR raids");
-        ImGui.BulletText(
-            "Supported quests in your 'To-Do list'\n(quests from your Journal that are always on-screen)");
-        ImGui.BulletText("MSQ quest (if available, unless it is marked as 'ignored'\nin your Journal)");
-        ImGui.TextWrapped(
-            "If you don't have any active MSQ quest, it will always try to pick up the next quest in the MSQ first.");
-    }
-
-    private void DrawQuestFilter()
-    {
-        ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X);
-        if (ImGui.BeginCombo($"##QuestSelection", "Add Quest...", ImGuiComboFlags.HeightLarge))
-        {
-            ImGui.SetNextItemWidth(ImGui.GetContentRegionAvail().X);
-            bool addFirst = ImGui.InputTextWithHint("", "Filter...", ref _searchString, 256,
-                ImGuiInputTextFlags.AutoSelectAll | ImGuiInputTextFlags.EnterReturnsTrue);
-
-            IEnumerable<Quest> foundQuests;
-            if (!string.IsNullOrEmpty(_searchString))
-            {
-                foundQuests = _questRegistry.AllQuests
-                    .Where(x => x.Info.Name.Contains(_searchString, StringComparison.CurrentCultureIgnoreCase))
-                    .Where(x => x.Id is not QuestId questId || !_questFunctions.IsQuestUnobtainable(questId));
-            }
-            else
-            {
-                foundQuests = _questRegistry.AllQuests.Where(x => _questFunctions.IsQuestAccepted(x.Id));
-            }
-
-            foreach (var quest in foundQuests)
-            {
-                if (quest.Info.IsMainScenarioQuest || _questController.ManualPriorityQuests.Contains(quest))
-                    continue;
-
-                bool addThis = ImGui.Selectable(quest.Info.Name);
-                if (addThis || addFirst)
-                {
-                    _questController.ManualPriorityQuests.Add(quest);
-
-                    if (addFirst)
-                    {
-                        ImGui.CloseCurrentPopup();
-                        addFirst = false;
-                    }
-                }
-            }
-
-            ImGui.EndCombo();
-        }
-
-        ImGui.Spacing();
-    }
-
-    private void DrawQuestList()
-    {
-        List<Quest> priorityQuests = _questController.ManualPriorityQuests;
-        Quest? itemToRemove = null;
-        Quest? itemToAdd = null;
-        int indexToAdd = 0;
-
-        float width = ImGui.GetContentRegionAvail().X;
-        List<(Vector2 TopLeft, Vector2 BottomRight)> itemPositions = [];
-
-        for (int i = 0; i < priorityQuests.Count; ++i)
-        {
-            Vector2 topLeft = ImGui.GetCursorScreenPos() +
-                              new Vector2(0, -ImGui.GetStyle().ItemSpacing.Y / 2);
-            var quest = priorityQuests[i];
-            ImGui.PushID($"Quest{quest.Id}");
-
-            var style = _uiUtils.GetQuestStyle(quest.Id);
-            bool hovered;
-            using (var _ = _pluginInterface.UiBuilder.IconFontFixedWidthHandle.Push())
-            {
-                ImGui.AlignTextToFramePadding();
-                ImGui.TextColored(style.Color, style.Icon.ToIconString());
-                hovered = ImGui.IsItemHovered();
-            }
-
-            ImGui.SameLine();
-            ImGui.AlignTextToFramePadding();
-            ImGui.Text(quest.Info.Name);
-            hovered |= ImGui.IsItemHovered();
-
-            if (hovered)
-                _questTooltipComponent.Draw(quest.Info);
-
-            if (priorityQuests.Count > 1)
-            {
-                ImGui.PushFont(UiBuilder.IconFont);
-                ImGui.SameLine(ImGui.GetContentRegionAvail().X +
-                               ImGui.GetStyle().WindowPadding.X -
-                               ImGui.CalcTextSize(FontAwesomeIcon.ArrowsUpDown.ToIconString()).X -
-                               ImGui.CalcTextSize(FontAwesomeIcon.Times.ToIconString()).X -
-                               ImGui.GetStyle().FramePadding.X * 4 -
-                               ImGui.GetStyle().ItemSpacing.X);
-                ImGui.PopFont();
-
-                if (_draggedItem == quest.Id)
-                {
-                    ImGuiComponents.IconButton("##Move", FontAwesomeIcon.ArrowsUpDown,
-                        ImGui.ColorConvertU32ToFloat4(ImGui.GetColorU32(ImGuiCol.ButtonActive)));
-                }
-                else
-                    ImGuiComponents.IconButton("##Move", FontAwesomeIcon.ArrowsUpDown);
-
-                if (_draggedItem == null && ImGui.IsItemActive() && ImGui.IsMouseDragging(ImGuiMouseButton.Left))
-                    _draggedItem = quest.Id;
-
-                ImGui.SameLine();
-            }
-            else
-            {
-                ImGui.PushFont(UiBuilder.IconFont);
-                ImGui.SameLine(ImGui.GetContentRegionAvail().X +
-                               ImGui.GetStyle().WindowPadding.X -
-                               ImGui.CalcTextSize(FontAwesomeIcon.Times.ToIconString()).X -
-                               ImGui.GetStyle().FramePadding.X * 2);
-                ImGui.PopFont();
-            }
-
-            if (ImGuiComponents.IconButton($"##Remove{i}", FontAwesomeIcon.Times))
-                itemToRemove = quest;
-
-            ImGui.PopID();
-
-            Vector2 bottomRight = new Vector2(topLeft.X + width,
-                ImGui.GetCursorScreenPos().Y - ImGui.GetStyle().ItemSpacing.Y + 2);
-            itemPositions.Add((topLeft, bottomRight));
-        }
-
-        if (!ImGui.IsMouseDragging(ImGuiMouseButton.Left))
-            _draggedItem = null;
-        else if (_draggedItem != null)
-        {
-            var draggedItem = priorityQuests.Single(x => x.Id == _draggedItem);
-            int oldIndex = priorityQuests.IndexOf(draggedItem);
-
-            var (topLeft, bottomRight) = itemPositions[oldIndex];
-            ImGui.GetWindowDrawList().AddRect(topLeft, bottomRight, ImGui.GetColorU32(ImGuiColors.DalamudGrey), 3f,
-                ImDrawFlags.RoundCornersAll);
-
-            int newIndex = itemPositions.FindIndex(x => ImGui.IsMouseHoveringRect(x.TopLeft, x.BottomRight, true));
-            if (newIndex >= 0 && oldIndex != newIndex)
-            {
-                itemToAdd = priorityQuests.Single(x => x.Id == _draggedItem);
-                indexToAdd = newIndex;
-            }
-        }
-
-        if (itemToRemove != null)
-        {
-            priorityQuests.Remove(itemToRemove);
-        }
-
-        if (itemToAdd != null)
-        {
-            priorityQuests.Remove(itemToAdd);
-            priorityQuests.Insert(indexToAdd, itemToAdd);
-        }
-    }
-}

Questionable/Windows/QuestComponents/ActiveQuestComponent.cs

@@ -31,7 +31,6 @@ internal sealed partial class ActiveQuestComponent
     private readonly ICommandManager _commandManager;
     private readonly Configuration _configuration;
     private readonly QuestRegistry _questRegistry;
-    private readonly PriorityWindow _priorityWindow;
     private readonly IChatGui _chatGui;
 
     public ActiveQuestComponent(
@@ -43,7 +42,6 @@ internal sealed partial class ActiveQuestComponent
         ICommandManager commandManager,
         Configuration configuration,
         QuestRegistry questRegistry,
-        PriorityWindow priorityWindow,
         IChatGui chatGui)
     {
         _questController = questController;
@@ -54,7 +52,6 @@ internal sealed partial class ActiveQuestComponent
         _commandManager = commandManager;
         _configuration = configuration;
         _questRegistry = questRegistry;
-        _priorityWindow = priorityWindow;
         _chatGui = chatGui;
     }
 
@@ -114,10 +111,6 @@ internal sealed partial class ActiveQuestComponent
                 _questController.Stop("Manual (no active quest)");
                 _gatheringController.Stop("Manual (no active quest)");
             }
-
-            ImGui.SameLine();
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.SortAmountDown))
-                _priorityWindow.Toggle();
         }
     }
 
@@ -300,10 +293,6 @@ internal sealed partial class ActiveQuestComponent
                 ImGui.PopStyleColor();
             ImGui.EndDisabled();
 
-            ImGui.SameLine();
-            if (ImGuiComponents.IconButton(FontAwesomeIcon.SortAmountDown))
-                _priorityWindow.Toggle();
-
             if (_commandManager.Commands.TryGetValue("/questinfo", out var commandInfo))
             {
                 ImGui.SameLine();

Questionable/Windows/QuestComponents/QuestTooltipComponent.cs

@@ -19,22 +19,19 @@ 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)
@@ -108,13 +105,13 @@ internal sealed class QuestTooltipComponent
 
             foreach (var q in quest.PreviousQuests)
             {
-                if (_questData.TryGetQuestInfo(q.QuestId, out var qInfo))
+                if (_questData.TryGetQuestInfo(q, out var qInfo))
                 {
-                    var (iconColor, icon, _) = _uiUtils.GetQuestStyle(q.QuestId);
+                    var (iconColor, icon, _) = _uiUtils.GetQuestStyle(q);
                     if (!_questRegistry.IsKnownQuest(qInfo.QuestId))
                         iconColor = ImGuiColors.DalamudGrey;
 
-                    _uiUtils.ChecklistItem(FormatQuestUnlockName(qInfo, _questFunctions.IsQuestComplete(q.QuestId) ? byte.MinValue : q.Sequence), iconColor, icon);
+                    _uiUtils.ChecklistItem(FormatQuestUnlockName(qInfo), iconColor, icon);
 
                     if (qInfo is QuestInfo qstInfo && (counter <= 2 || icon != FontAwesomeIcon.Check))
                         DrawQuestUnlocks(qstInfo, counter + 1);
@@ -191,17 +188,11 @@ internal sealed class QuestTooltipComponent
             ImGui.Unindent();
     }
 
-    private string FormatQuestUnlockName(IQuestInfo questInfo, byte sequence = 0)
+    private static string FormatQuestUnlockName(IQuestInfo questInfo)
     {
-        string name = questInfo.Name;
-        if (_configuration.Advanced.AdditionalStatusInformation && sequence != 0)
-            name += $" {SeIconChar.ItemLevel.ToIconString()}";
-
         if (questInfo.IsMainScenarioQuest)
-            name += $" ({questInfo.QuestId}, MSQ)";
+            return $"{questInfo.Name} ({questInfo.QuestId}, MSQ)";
         else
-            name += $" {questInfo.Name} ({questInfo.QuestId})";
+            return $"{questInfo.Name} ({questInfo.QuestId})";
-
-        return name;
     }
 }