Minor cleanup for ARR part 5/CT raids/primals
authorLiza Carvelli <liza@carvel.li>
Sun, 21 Jul 2024 19:33:38 +0000 (21:33 +0200)
committerLiza Carvelli <liza@carvel.li>
Sun, 21 Jul 2024 19:33:38 +0000 (21:33 +0200)
48 files changed:
QuestPathGenerator/QuestSourceGenerator.cs
QuestPathGenerator/RoslynShortcuts.cs
QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1050_Embracing the Beast.json
QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1054_How to Quit You.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1175_The Price of Principles.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1190_You Have Selected Regicide.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1192_The Gifted.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1346_A Final Temptation.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1347_The Mother of Exiles.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1352_Why We Adventure.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1358_Scouts in Distress.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1359_The Gift of Eternity.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1360_Into the Heart of the Whorl.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1361_Lord of the Whorl.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1363_Through the Maelstrom.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1442_The Great Divide.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1443_Desperate Times.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1448_Lord of Levin.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1456_Guardian of Eorzea.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1457_Recruiting the Realm.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1458_Heretical Harassment.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1459_When the Cold Sets In.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/1460_Brave New Companions.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/3874_Moving On.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/3883_Shock and Awe.json
QuestPaths/2.x - A Realm Reborn/MSQ-2/3885_Levin an Impression.json
QuestPaths/2.x - A Realm Reborn/Raid Quests/1201_A Performance for the Ages.json
QuestPaths/2.x - A Realm Reborn/Raid Quests/1474_Syrcus Tower.json
QuestPaths/2.x - A Realm Reborn/Raid Quests/1709_Legacy of Allag.json
QuestPaths/2.x - A Realm Reborn/Raid Quests/494_The World of Darkness.json
QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1129_Shadows Uncast (Twin Adder).json [new file with mode: 0644]
QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1130_Shadows Uncast (Immortal Flames).json [new file with mode: 0644]
QuestPaths/2.x - A Realm Reborn/Unlocks/PvP/1104_A Pup No Longer (Maelstrom).json
QuestPaths/2.x - A Realm Reborn/Unlocks/PvP/1105_A Pup No Longer (Twin Adder).json [new file with mode: 0644]
QuestPaths/2.x - A Realm Reborn/Unlocks/PvP/1106_A Pup No Longer (Immortal Flames).json [new file with mode: 0644]
QuestPaths/2.x - A Realm Reborn/Unlocks/Trials/1047_A Recurring Problem.json
QuestPaths/2.x - A Realm Reborn/Unlocks/Trials/1048_Ifrit Bleeds, We Can Kill It.json
QuestPaths/2.x - A Realm Reborn/Unlocks/Trials/1157_In for Garuda Awakening.json
QuestPaths/2.x - A Realm Reborn/Unlocks/Trials/1158_In a Titan Spot.json
QuestPaths/5.x - Shadowbringers/MSQ/A1-Crystarium 1/3279_The Syrcus Trench.json
QuestPaths/quest-v1.json
Questionable.Model/V1/ComplexCombatData.cs
Questionable.Model/V1/QuestStep.cs
Questionable/Controller/CombatController.cs
Questionable/Controller/NavigationOverrides/MovementOverrideController.cs
Questionable/Controller/Steps/Interactions/Combat.cs
Questionable/Questionable.csproj
Questionable/Windows/QuestComponents/ARealmRebornComponent.cs

index 5eb62a8838049cd3cd735bbce71ccbe2b85ba735..7184ebb0787b20142c7149baaf0f6686cb614972 100644 (file)
@@ -357,6 +357,9 @@ public class QuestSourceGenerator : ISourceGenerator
                                                 .AsSyntaxNodeOrToken(),
                                             AssignmentList(nameof(QuestStep.ComplexCombatData), step.ComplexCombatData)
                                                 .AsSyntaxNodeOrToken(),
+                                            Assignment(nameof(QuestStep.CombatDelaySecondsAtStart), step.CombatDelaySecondsAtStart,
+                                                    emptyStep.CombatDelaySecondsAtStart)
+                                                .AsSyntaxNodeOrToken(),
                                             Assignment(nameof(QuestStep.JumpDestination), step.JumpDestination,
                                                     emptyStep.JumpDestination)
                                                 .AsSyntaxNodeOrToken(),
index 6364dca93c2926808dfb21381c4103c58510497e..ecc3dd513a726656113eb5ab3a85ee25fd92dad3 100644 (file)
@@ -166,6 +166,7 @@ public static class RoslynShortcuts
         }
         else if (value is ComplexCombatData complexCombatData)
         {
+            var emptyData = new ComplexCombatData();
             return ObjectCreationExpression(
                     IdentifierName(nameof(ComplexCombatData)))
                 .WithInitializer(
@@ -173,18 +174,22 @@ public static class RoslynShortcuts
                         SyntaxKind.ObjectInitializerExpression,
                         SeparatedList<ExpressionSyntax>(
                             SyntaxNodeList(
-                                Assignment(nameof(ComplexCombatData.DataId), complexCombatData.DataId, default(uint))
+                                Assignment(nameof(ComplexCombatData.DataId), complexCombatData.DataId, emptyData.DataId)
                                     .AsSyntaxNodeOrToken(),
                                 Assignment(nameof(ComplexCombatData.MinimumKillCount),
-                                        complexCombatData.MinimumKillCount, null)
+                                        complexCombatData.MinimumKillCount, emptyData.MinimumKillCount)
                                     .AsSyntaxNodeOrToken(),
-                                Assignment(nameof(ComplexCombatData.RewardItemId), complexCombatData.RewardItemId, null)
+                                Assignment(nameof(ComplexCombatData.RewardItemId), complexCombatData.RewardItemId,
+                                        emptyData.RewardItemId)
                                     .AsSyntaxNodeOrToken(),
                                 Assignment(nameof(ComplexCombatData.RewardItemCount), complexCombatData.RewardItemCount,
-                                        null)
+                                        emptyData.RewardItemCount)
                                     .AsSyntaxNodeOrToken(),
                                 AssignmentList(nameof(ComplexCombatData.CompletionQuestVariablesFlags),
-                                        complexCombatData.CompletionQuestVariablesFlags)
+                                    complexCombatData.CompletionQuestVariablesFlags),
+                                Assignment(nameof(ComplexCombatData.IgnoreQuestMarker),
+                                        complexCombatData.IgnoreQuestMarker,
+                                        emptyData.IgnoreQuestMarker)
                                     .AsSyntaxNodeOrToken()))));
         }
         else if (value is QuestWorkValue qwv)
index 19b4c4c83e235833cf0f0db941bbc4a23a6bd176..c9e5fa05cc3cb321d52793c3339923a36155ba9c 100644 (file)
           "TerritoryId": 137,
           "InteractionType": "CompleteQuest",
           "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol",
-          "NextQuestId": 1050
+          "NextQuestId": 1051
         }
       ]
     }
index 8ccb2041288443b508bdfea112e78f183acb1e32..0938ae429b9116d637a90a78917502393d829d59 100644 (file)
@@ -62,7 +62,6 @@
           "TerritoryId": 137,
           "InteractionType": "CompleteQuest",
           "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol",
-          "NextQuestId": 1054,
           "Fly": true
         }
       ]
index b56feede21c2e896db390cf862139f81071e95c6..6ce9de3dafdbb0a52bf3938d582980a040f9ca7e 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1006693,
+          "Position": {
+            "X": 39.29187,
+            "Y": 1.2148079,
+            "Z": 0.8086548
+          },
+          "TerritoryId": 212,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1047
+        },
         {
           "DataId": 2001717,
           "Position": {
           },
           "TerritoryId": 212,
           "InteractionType": "Interact",
-          "TargetTerritoryId": 212
+          "TargetTerritoryId": 212,
+          "SkipIf": [
+            "WakingSandsMainArea"
+          ]
         },
         {
           "DataId": 1007533,
           },
           "TerritoryId": 212,
           "InteractionType": "Interact",
-          "$": "0 0  0 0  0 0 -> 17 0  0 0  0 128"
+          "$": "0 0  0 0  0 0 -> 17 0  0 0  0 128",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "DataId": 1007534,
           },
           "TerritoryId": 212,
           "InteractionType": "Interact",
-          "$": "17 0  0 0  0 128 -> 33 16  0 0  0 192"
+          "$": "17 0  0 0  0 128 -> 33 16  0 0  0 192",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         },
         {
           "DataId": 1007531,
             "Y": -3.0000012,
             "Z": -52.71997
           },
+          "StopDistance": 7,
           "TerritoryId": 212,
           "InteractionType": "Interact",
-          "$": "33 16  0 0  0 192 -> 49 17  0 0  0 224"
+          "$": "33 16  0 0  0 192 -> 49 17  0 0  0 224",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
         },
         {
           "DataId": 1007530,
             "Y": -3.0000012,
             "Z": -52.262207
           },
+          "StopDistance": 7,
           "TerritoryId": 212,
           "InteractionType": "Interact",
-          "$": "49 17  0 0  0 224 -> 65 17  16 0  0 240"
+          "$": "49 17  0 0  0 224 -> 65 17  16 0  0 240",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            16
+          ]
         },
         {
           "DataId": 1007478,
             "Z": -56.229553
           },
           "TerritoryId": 212,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            8
+          ]
         }
       ]
     },
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 4a134e87299e2a1896b4b401c7fdaeea970855ee..3a86ab3bdeb7c3f24460b17617930b8ebdfd2c4d 100644 (file)
@@ -1,6 +1,6 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
-  "Author": "JerryWester",
+  "Author": ["JerryWester", "liza"],
   "QuestSequence": [
     {
       "Sequence": 0,
@@ -46,6 +46,7 @@
             "Y": -2.3519497,
             "Z": -240.40594
           },
+          "StopDistance": 7,
           "TerritoryId": 133,
           "InteractionType": "Interact",
           "TargetTerritoryId": 152
       "Sequence": 4,
       "Steps": [
         {
+          "Position": {
+            "X": -496.3975,
+            "Y": 7.8566074,
+            "Z": 71.93724
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 152,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AutoOnEnterArea",
+          "ComplexCombatData": [
+            {
+              "DataId": 47,
+              "IgnoreQuestMarker": true,
+              "MinimumKillCount": 1
+            }
+          ],
+          "Mount": false,
+          "Sprint": false
+        },
+        {
+          "Position": {
+            "X": -393.63492,
+            "Y": -0.28167063,
+            "Z": 72.2678
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 152,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AutoOnEnterArea",
+          "ComplexCombatData": [
+            {
+              "DataId": 2483,
+              "IgnoreQuestMarker": true,
+              "MinimumKillCount": 3
+            }
+          ],
+          "Mount": false,
+          "Sprint": false
+        },
+        {
+          "Position": {
+            "X": -359.14633,
+            "Y": 4.4168873,
+            "Z": 63.1877
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 152,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AutoOnEnterArea",
+          "ComplexCombatData": [
+            {
+              "DataId": 2484,
+              "IgnoreQuestMarker": true,
+              "MinimumKillCount": 1
+            }
+          ],
+          "Mount": false,
+          "Sprint": false
+        },
+        {
+          "Position": {
+            "X": -324.51694,
+            "Y": 8.511529,
+            "Z": 69.76721
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 152,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AutoOnEnterArea",
+          "ComplexCombatData": [
+            {
+              "DataId": 2485,
+              "IgnoreQuestMarker": true,
+              "MinimumKillCount": 2
+            }
+          ],
+          "Mount": false,
+          "Sprint": false
+        },
+        {
+          "DataId": 2482,
+          "Position": {
+            "X": -238.72742,
+            "Y": 7.8999486,
+            "Z": 64.43884
+          },
+          "StopDistance": 0.25,
+          "TerritoryId": 152,
+          "InteractionType": "WaitForNpcAtPosition",
+          "NpcWaitDistance": 5,
+          "Mount": false,
+          "Sprint": false
+        },
+        {
+          "Position": {
+            "X": -242.57193,
+            "Y": 11.837363,
+            "Z": 19.533478
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 152,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AutoOnEnterArea",
+          "ComplexCombatData": [
+            {
+              "DataId": 2487,
+              "IgnoreQuestMarker": true,
+              "MinimumKillCount": 2
+            },
+            {
+              "DataId": 2488,
+              "IgnoreQuestMarker": true,
+              "MinimumKillCount": 1
+            }
+          ],
+          "Mount": false,
+          "Sprint": false,
+          "CombatDelaySecondsAtStart": 3
+        },
+        {
+          "DataId": 2482,
+          "Position": {
+            "X": -315.8217,
+            "Y": 11.905772,
+            "Z": -34.105675
+          },
+          "StopDistance": 0.25,
           "TerritoryId": 152,
-          "InteractionType": "WaitForManualProgress",
-          "Comment": "Yeah, no idea how to automate this, sorry :/"
+          "InteractionType": "WaitForNpcAtPosition",
+          "Mount": false,
+          "Sprint": false,
+          "NpcWaitDistance": 5
+        },
+        {
+          "DataId": 2003347,
+          "Position": {
+            "X": -318.62366,
+            "Y": 12.25293,
+            "Z": -35.05005
+          },
+          "StopDistance": 4,
+          "TerritoryId": 152,
+          "InteractionType": "Interact"
         }
       ]
     },
             "Y": 12.293127,
             "Z": -37.30841
           },
+          "StopDistance": 4,
           "TerritoryId": 152,
           "InteractionType": "Interact"
         }
             "Y": 12.25293,
             "Z": -35.080566
           },
+          "StopDistance": 4,
           "TerritoryId": 152,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DelaySecondsAtStart": 3
         }
       ]
     },
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 032341e6d68e18a9fe352e7486f507a29391a509..77ef99acff23da7e77edee311821f2749d995e63 100644 (file)
       "Steps": [
         {
           "Position": {
-            "X": -467.98248,
-            "Y": 23.0508,
-            "Z": -430.49655
-          },
-          "TerritoryId": 140,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
-        {
-          "Position": {
-            "X": -469.5506,
-            "Y": 22.867796,
-            "Z": -435.02985
+            "X": -470.87872,
+            "Y": 22.698383,
+            "Z": -439.40274
           },
+          "StopDistance": 0.25,
           "TerritoryId": 140,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
           "KillEnemyDataIds": [
             2477
-          ]
+          ],
+          "Fly": true
         }
       ]
     },
       "Steps": [
         {
           "Position": {
-            "X": -394.05176,
-            "Y": 25.249037,
-            "Z": -491.6281
-          },
-          "TerritoryId": 140,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
-        {
-          "Position": {
-            "X": -388.88654,
-            "Y": 24.894493,
-            "Z": -498.07654
+            "X": -386.44818,
+            "Y": 24.74541,
+            "Z": -501.20456
           },
+          "StopDistance": 0.25,
           "TerritoryId": 140,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
           "KillEnemyDataIds": [
             2478
-          ]
+          ],
+          "Fly": true
         }
       ]
     },
       "Steps": [
         {
           "Position": {
-            "X": -376.08395,
-            "Y": 19.192884,
-            "Z": -619.2925
-          },
-          "TerritoryId": 140,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
-        {
-          "Position": {
-            "X": -370.34174,
-            "Y": 17.37921,
-            "Z": -625.1368
+            "X": -366.75403,
+            "Y": 16.426182,
+            "Z": -628.9341
           },
+          "StopDistance": 0.25,
           "TerritoryId": 140,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
           "KillEnemyDataIds": [
             2479
-          ]
+          ],
+          "Fly": true
         }
       ]
     },
     {
       "Sequence": 6,
       "Steps": [
-        {
-          "Position": {
-            "X": -326.49905,
-            "Y": 14.853391,
-            "Z": -775.70575
-          },
-          "TerritoryId": 140,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
         {
           "Position": {
             "X": -327.01913,
             "Y": 14.785374,
             "Z": -780.03625
           },
+          "StopDistance": 0.25,
           "TerritoryId": 140,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
           "KillEnemyDataIds": [
             2480,
             2481
-          ]
+          ],
+          "Fly": true
         }
       ]
     },
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 499b31873b431c23b0f0fe6ae3a40e778ceca5fb..f1c8a3d9e506de4775563c167285f834c778fe70 100644 (file)
@@ -31,6 +31,7 @@
             "Y": 45.157562,
             "Z": -215.89996
           },
+          "StopDistance": 7,
           "TerritoryId": 140,
           "InteractionType": "Interact"
         }
     {
       "Sequence": 255,
       "Steps": [
-        {
-          "Position": {
-            "X": 62.218567,
-            "Y": 44.999996,
-            "Z": -214.81116
-          },
-          "TerritoryId": 140,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
         {
           "DataId": 1002058,
           "Position": {
             "Z": -215.89996
           },
           "TerritoryId": 140,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "Fly": true
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 0fcb15f707dc3e0c66080cf1d94d8d186101e1d8..199c7af109298122793e07580bb3137034c7efd2 100644 (file)
@@ -12,6 +12,7 @@
             "Y": 44.999996,
             "Z": -220.93542
           },
+          "StopDistance": 7,
           "TerritoryId": 140,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Western Thanalan - Horizon",
             "[Ul'dah] Adventurers' Guild",
             "[Ul'dah] Sapphire Avenue Exchange"
           ],
-          "$": "0 1  16 0  0 0 -> 17 1  0 0  0 64"
+          "$": "0 1  16 0  0 0 -> 17 1  0 0  0 64",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         },
         {
           "DataId": 1001966,
             "Z": -83.84839
           },
           "TerritoryId": 131,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         }
       ]
     },
       ]
     }
   ]
-}
\ No newline at end of file
+}
index ea350e02a62f1e4eed8a18c57c5c08a5bf77f9b3..c4d8eed22713378108531a437f9e570d41bff062 100644 (file)
     {
       "Sequence": 2,
       "Steps": [
-        {
-          "Position": {
-            "X": 182.90273,
-            "Y": 52.023964,
-            "Z": 29.854843
-          },
-          "TerritoryId": 140,
-          "InteractionType": "WalkTo",
-          "Fly": true,
-          "AetheryteShortcut": "Western Thanalan - Horizon"
-        },
         {
           "DataId": 2003573,
           "Position": {
             "Y": 52.140015,
             "Z": 29.06836
           },
+          "StopDistance": 0.25,
           "TerritoryId": 140,
           "InteractionType": "Combat",
           "EnemySpawnType": "AfterInteraction",
           "KillEnemyDataIds": [
             2848
-          ]
+          ],
+          "Fly": true,
+          "AetheryteShortcut": "Western Thanalan - Horizon"
         }
       ]
     },
     {
       "Sequence": 3,
       "Steps": [
-        {
-          "Position": {
-            "X": 125.38452,
-            "Y": 49.281586,
-            "Z": -172.1297
-          },
-          "TerritoryId": 140,
-          "InteractionType": "WalkTo",
-          "Fly": true,
-          "AetheryteShortcut": "Western Thanalan - Horizon"
-        },
         {
           "DataId": 1008640,
           "Position": {
@@ -98,7 +79,9 @@
             "Z": -173.23572
           },
           "TerritoryId": 140,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "Western Thanalan - Horizon"
         }
       ]
     },
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 0f7184be3b6f9a73ce84cd4fc7e0d5a6b0aed473..58878a1c496a24e36f27cc4a9bda3a12c7775a89 100644 (file)
       "Steps": [
         {
           "Position": {
-            "X": -444.11835,
-            "Y": -40.95807,
-            "Z": -242.13676
-          },
-          "TerritoryId": 138,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
-        {
-          "Position": {
-            "X": -448.5728,
-            "Y": -41.56529,
-            "Z": -240.29225
+            "X": -450.67154,
+            "Y": -41.88713,
+            "Z": -238.96031
           },
           "TerritoryId": 138,
           "InteractionType": "Combat",
@@ -69,7 +59,8 @@
             2861,
             2862,
             2863
-          ]
+          ],
+          "Fly": true
         }
       ]
     },
             "Y": -41.985073,
             "Z": -237.72034
           },
+          "StopDistance": 0.25,
           "TerritoryId": 138,
           "InteractionType": "Interact",
-          "$": "0 0  0 0  0 0 -> 1 16  0 0  0 128"
+          "$": "0 0  0 0  0 0 -> 1 16  0 0  0 128",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "DataId": 1008685,
             "Z": -240.13129
           },
           "TerritoryId": 138,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         }
       ]
     },
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 107e872a1798d7dc156af5a53715f305b0d326c1..df7ce9d7ef58809943dcc7a40f3201d1779df6bf 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "Position": {
-            "X": -214.06451,
-            "Y": -41.955135,
-            "Z": -249.15605
-          },
-          "TerritoryId": 138,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
         {
           "Position": {
             "X": -209.9414,
             "Y": -42.109043,
             "Z": -248.07559
           },
+          "StopDistance": 0.25,
           "TerritoryId": 138,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
           "KillEnemyDataIds": [
             2890,
             2891
-          ]
+          ],
+          "Fly": true
         }
       ]
     },
       "Steps": [
         {
           "Position": {
-            "X": -187.2772,
-            "Y": -41.886265,
-            "Z": -318.27036
-          },
-          "TerritoryId": 138,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
-        {
-          "Position": {
-            "X": -188.59572,
-            "Y": -41.69931,
-            "Z": -318.9667
+            "X": -194.26031,
+            "Y": -40.771305,
+            "Z": -323.02054
           },
+          "StopDistance": 0.25,
           "TerritoryId": 138,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
@@ -73,7 +56,8 @@
             2893,
             2894,
             2895
-          ]
+          ],
+          "Fly": true
         }
       ]
     },
       "Steps": [
         {
           "Position": {
-            "X": -299.29233,
-            "Y": -41.884323,
-            "Z": -336.04984
-          },
-          "TerritoryId": 138,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
-        {
-          "Position": {
-            "X": -297.88797,
-            "Y": -41.872128,
-            "Z": -334.79858
+            "X": -301.09625,
+            "Y": -41.52895,
+            "Z": -327.2867
           },
+          "StopDistance": 0.25,
           "TerritoryId": 138,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
             2896,
             2897,
             2898
-          ]
+          ],
+          "Fly": true
         }
       ]
     },
             "Y": -35.708496,
             "Z": -400.50354
           },
+          "StopDistance": 5,
           "TerritoryId": 138,
           "InteractionType": "CompleteQuest"
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
index aa33b3868fc82ec69e1acdbb899b35f11b0d0ace..467fc6f82972a9d5e8ce67e4824eefb79ebe7efc 100644 (file)
@@ -12,6 +12,7 @@
             "Y": -35.708496,
             "Z": -400.50354
           },
+          "StopDistance": 5,
           "TerritoryId": 138,
           "InteractionType": "AcceptQuest"
         }
             "Z": -286.78662
           },
           "TerritoryId": 135,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "Mount": true
         },
         {
           "Position": {
         {
           "TerritoryId": 135,
           "InteractionType": "AttuneAetheryte",
-          "Aetheryte": "Lower La Noscea - Moraby Drydocks",
-          "StopDistance": 5
+          "Aetheryte": "Lower La Noscea - Moraby Drydocks"
         },
         {
           "Position": {
       ]
     }
   ]
-}
\ No newline at end of file
+}
index dcf6b3cd84729734f8e86d19897a17e49da3334a..675d0f97a2e086b9b7b10fcd7cbb40f24da2a4a9 100644 (file)
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "JerryWester",
+  "TerritoryBlacklist": [
+    281
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,
@@ -65,4 +68,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 0138aff0e347e46615a0c8eb071718798c7751ce..b4b5d40d84ea970d710ed459c625bf02881394c9 100644 (file)
@@ -12,6 +12,7 @@
             "Y": 9.999781,
             "Z": 156.08447
           },
+          "StopDistance": 5,
           "TerritoryId": 129,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Limsa Lominsa",
@@ -60,4 +61,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
index dd69c5b3050970715a36f8c1ae3ff3c2508eb43a..e71b3d2f8a16b10e52a9214cdde8496edfbd1b04 100644 (file)
@@ -49,6 +49,7 @@
             "Y": 21.252728,
             "Z": -639.7345
           },
+          "StopDistance": 7,
           "TerritoryId": 156,
           "InteractionType": "Interact"
         }
@@ -75,4 +76,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 52a3faab2523e8765ef243377df0dd4a242ffdfe..310ab67a1466e9f32c9e5beb73e88dd28162a150 100644 (file)
       "Sequence": 3,
       "Steps": [
         {
+          "DataId": 1001484,
           "Position": {
-            "X": 94.5531,
-            "Y": 0.3407526,
-            "Z": -270.22217
+            "X": 93.247925,
+            "Y": 0.34075317,
+            "Z": -272.60242
           },
           "TerritoryId": 141,
-          "InteractionType": "WalkTo",
+          "InteractionType": "Interact",
           "AetheryteShortcut": "Central Thanalan - Black Brush Station",
-          "Fly": true
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "DataId": 1001605,
             null,
             null,
             64
-          ],
-          "$": "0 0  0 0  0 0 -> 1 0  0 0  0 64"
-        },
-        {
-          "DataId": 1001484,
-          "Position": {
-            "X": 93.247925,
-            "Y": 0.34075317,
-            "Z": -272.60242
-          },
-          "TerritoryId": 141,
-          "InteractionType": "Interact"
+          ]
         }
       ]
     },
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 12e5deb3095bd38b38e9c44ab05170901a70072c..263c6e62c2977d53b1897736fdbe0725dbc227d1 100644 (file)
     {
       "Sequence": 255,
       "Steps": [
-        {
-          "Position": {
-            "X": 21.35542,
-            "Y": -3.9001584,
-            "Z": 211.87386
-          },
-          "TerritoryId": 152,
-          "InteractionType": "WalkTo",
-          "Fly": true,
-          "AetheryteShortcut": "East Shroud - Hawthorne Hut"
-        },
         {
           "DataId": 1009097,
           "Position": {
             "Z": 211.16956
           },
           "TerritoryId": 152,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "Fly": true,
+          "AetheryteShortcut": "East Shroud - Hawthorne Hut"
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
index b368cf6f82e638bb7bccad51b1dc41711f449715..9112ad0ba24e9c32874c7d4e698570969e31abaa 100644 (file)
         },
         {
           "Position": {
-            "X": 30.79747,
-            "Y": 22.704006,
-            "Z": -655.94745
+            "X": 30.917934,
+            "Y": 20.495003,
+            "Z": -656.1909
           },
           "TerritoryId": 156,
           "InteractionType": "WalkTo",
-          "Fly": true
-        },
-        {
-          "Position": {
-            "X": 131.74095,
-            "Y": -2.513662,
-            "Z": -555.5502
-          },
-          "TerritoryId": 156,
-          "InteractionType": "WalkTo",
-          "Fly": true
+          "Mount": true,
+          "$": "Rising Stones Door"
         },
         {
           "DataId": 1009282,
             "Y": -2.2044632,
             "Z": -556.2372
           },
+          "StopDistance": 1,
           "TerritoryId": 156,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "Fly": true
         }
       ]
     },
       "Steps": [
         {
           "Position": {
-            "X": 29.987108,
-            "Y": 21.187704,
-            "Z": -654.1839
+            "X": 30.917934,
+            "Y": 20.495003,
+            "Z": -656.1909
           },
           "TerritoryId": 156,
           "InteractionType": "WalkTo",
-          "Fly": true
+          "Fly": true,
+          "$": "Rising Stones Door"
         },
         {
           "TerritoryId": 156,
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 1d40e03f8321cab2d2b48e759b975b3e3d80c3dd..f2a47585bb2b564485d1ab3a93fd99d82f1f19dd 100644 (file)
             "Z": 179.40027
           },
           "TerritoryId": 128,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         }
       ]
     },
           },
           "TerritoryId": 128,
           "InteractionType": "Interact",
+          "AetheryteShortcut": "Limsa Lominsa",
           "AethernetShortcut": [
-            "[Limsa Lominsa] The Aftcastle",
+            "[Limsa Lominsa] Aetheryte Plaza",
             "[Limsa Lominsa] Airship Landing"
           ]
         }
           },
           "TerritoryId": 133,
           "InteractionType": "Interact",
+          "AetheryteShortcut": "Gridania",
           "AethernetShortcut": [
             "[Gridania] Aetheryte Plaza",
             "[Gridania] Conjurers' Guild"
             "Z": -262.68408
           },
           "TerritoryId": 133,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         }
       ]
     },
       ]
     }
   ]
-}
\ No newline at end of file
+}
index a3dffbba312b309d160b2519af886b5b98b140aa..e47f40a741fa7e72a1ae408b527659397018d7c1 100644 (file)
@@ -12,6 +12,7 @@
             "Y": -1.9957249,
             "Z": -45.700806
           },
+          "StopDistance": 7,
           "TerritoryId": 351,
           "InteractionType": "AcceptQuest"
         }
@@ -81,4 +82,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 74736d8a82e8e736b7c0d7175c713c36fbb5eb4d..fcf2efb352eae8fb944738c874db98b84031f7c4 100644 (file)
             "Z": -288.4794
           },
           "TerritoryId": 155,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "Mount": true
         },
         {
           "Position": {
         },
         {
           "Position": {
-            "X": -693.89417,
-            "Y": 223.63544,
-            "Z": -36.510162
-          },
-          "TerritoryId": 155,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
-        {
-          "Position": {
-            "X": -696.762,
-            "Y": 223.81946,
-            "Z": -34.89058
+            "X": -701.3538,
+            "Y": 224.22969,
+            "Z": -31.912737
           },
+          "StopDistance": 0.25,
           "TerritoryId": 155,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
           "KillEnemyDataIds": [
             3119,
             3120
-          ]
+          ],
+          "Fly": true
         }
       ]
     },
     {
       "Sequence": 4,
       "Steps": [
-        {
-          "Position": {
-            "X": -866.228,
-            "Y": 225.90123,
-            "Z": 9.295383
-          },
-          "TerritoryId": 155,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
         {
           "DataId": 1009087,
           "Position": {
             "Z": 8.132996
           },
           "TerritoryId": 155,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "Fly": true
         }
       ]
     },
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 52d417ce94d0dc49ececaf0d31c8f87ab9b19249..cbe89597ab8f7c4abeb4ebe76133a42488b8c0ef 100644 (file)
           "TargetTerritoryId": 156,
           "CompletionQuestVariablesFlags": [
             null,
-            128,
             null,
             null,
             null,
-            null
+            null,
+            -2
           ]
         },
         {
           },
           "TerritoryId": 156,
           "InteractionType": "Interact",
-          "$": "0 128  0 0  0 0 -> 1 112  0 0  0 2"
-        },
-        {
-          "Position": {
-            "X": 84.4848,
-            "Y": 29.529366,
-            "Z": -625.9231
-          },
-          "TerritoryId": 156,
-          "InteractionType": "WalkTo",
-          "Fly": true
+          "$": "0 128  0 0  0 0 -> 1 112  0 0  0 2",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            2
+          ]
         },
         {
           "DataId": 1009143,
           },
           "TerritoryId": 156,
           "InteractionType": "Interact",
-          "$": "1 112  0 0  0 2 -> 2 96  0 0  0 34"
-        },
-        {
-          "Position": {
-            "X": 70.21658,
-            "Y": 33.066517,
-            "Z": -697.55524
-          },
-          "TerritoryId": 156,
-          "InteractionType": "WalkTo",
-          "Fly": true
+          "Fly": true,
+          "$": "1 112  0 0  0 2 -> 2 96  0 0  0 34",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
         },
         {
           "DataId": 1009148,
           },
           "TerritoryId": 156,
           "InteractionType": "Interact",
-          "$": "2 96  0 0  0 34 -> 3 80  0 0  0 35"
-        },
-        {
-          "Position": {
-            "X": 54.462944,
-            "Y": 25.628618,
-            "Z": -704.24084
-          },
-          "TerritoryId": 156,
-          "InteractionType": "WalkTo",
-          "Fly": true
+          "Fly": true,
+          "$": "2 96  0 0  0 34 -> 3 80  0 0  0 35",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            1
+          ]
         },
         {
           "DataId": 1009145,
           },
           "TerritoryId": 156,
           "InteractionType": "Interact",
-          "$": "3 80  0 0  0 35 -> 4 64  0 0  0 43"
-        },
-        {
-          "Position": {
-            "X": 45.96064,
-            "Y": 31.175581,
-            "Z": -745.2635
-          },
-          "TerritoryId": 156,
-          "InteractionType": "WalkTo",
-          "Fly": true
+          "Fly": true,
+          "$": "3 80  0 0  0 35 -> 4 64  0 0  0 43",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            8
+          ]
         },
         {
           "DataId": 1009146,
             "Y": 31.164318,
             "Z": -744.9912
           },
+          "StopDistance": 0.5,
           "TerritoryId": 156,
           "InteractionType": "Interact",
-          "$": "4 64  0 0  0 43 -> 5 48  0 0  0 47"
-        },
-        {
-          "Position": {
-            "X": 23.477123,
-            "Y": 28.999966,
-            "Z": -734.3218
-          },
-          "TerritoryId": 156,
-          "InteractionType": "WalkTo",
-          "Fly": true
+          "Fly": true,
+          "$": "4 64  0 0  0 43 -> 5 48  0 0  0 47",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            4
+          ]
         },
         {
           "DataId": 1009142,
           },
           "TerritoryId": 156,
           "InteractionType": "Interact",
-          "$": "5 48  0 0  0 47 -> 6 32  0 0  0 111"
+          "Mount": true,
+          "$": "5 48  0 0  0 47 -> 6 32  0 0  0 111",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         },
         {
           "Position": {
           },
           "TerritoryId": 156,
           "InteractionType": "Interact",
-          "$": "6 32  0 0  0 111 -> 7 16  0 0  0 239"
+          "$": "6 32  0 0  0 111 -> 7 16  0 0  0 239",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "Position": {
             "Z": -688.38025
           },
           "TerritoryId": 156,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            16
+          ]
         }
       ]
     },
       "Steps": [
         {
           "Position": {
-            "X": 29.328543,
-            "Y": 21.232033,
-            "Z": -652.5289
+            "X": 30.917934,
+            "Y": 20.495003,
+            "Z": -656.1909
           },
           "TerritoryId": 156,
           "InteractionType": "WalkTo",
-          "Fly": true
+          "Fly": true,
+          "$": "Rising Stones Door"
         },
         {
           "TerritoryId": 156,
             "Y": -1.9957249,
             "Z": -42.130188
           },
+          "StopDistance": 7,
           "TerritoryId": 351,
           "InteractionType": "Interact"
         }
             "Y": -1.9957249,
             "Z": -45.700806
           },
+          "StopDistance": 7,
           "TerritoryId": 351,
           "InteractionType": "CompleteQuest"
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
index c4cedaf726ace6694efc736e67663039fe40aeb2..d9807d0a7c10d23933bb749d81d40e9f7b3eee5a 100644 (file)
     {
       "Sequence": 2,
       "Steps": [
+        {
+          "DataId": 1007534,
+          "Position": {
+            "X": 1.4800415,
+            "Y": -3.0000014,
+            "Z": -48.722107
+          },
+          "TerritoryId": 212,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1048
+        },
         {
           "Position": {
             "X": 618.9289,
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 85ad26575e940427a2370fa4d8677f37a2610e04..549f11b5dfd9523eb865612eccfb5532fd99a163 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "Position": {
-            "X": 58.081802,
-            "Y": -5.4142065,
-            "Z": -3.134228
-          },
-          "TerritoryId": 141,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
         {
           "DataId": 1009050,
           "Position": {
@@ -50,7 +40,8 @@
             3115,
             3116,
             3117
-          ]
+          ],
+          "Fly": true
         }
       ]
     },
@@ -95,4 +86,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 5e214f30fac9db70c44ebda00229f6da03a2eea3..ef336e51f28815498a1d67116085e4e4c28d0ac4 100644 (file)
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "JerryWester",
+  "TerritoryBlacklist": [
+    374
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "Position": {
-            "X": 263.44794,
-            "Y": -8.98996,
-            "Z": -79.589424
-          },
-          "TerritoryId": 152,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
         {
           "DataId": 1009098,
           "Position": {
             "Z": -77.92786
           },
           "TerritoryId": 152,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "Fly": true
         }
       ]
     },
     {
       "Sequence": 2,
       "Steps": [
-        {
-          "Position": {
-            "X": 194.81087,
-            "Y": -22.105244,
-            "Z": -399.81537
-          },
-          "TerritoryId": 152,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
         {
           "DataId": 1033555,
           "Position": {
             "Z": -399.8932
           },
           "TerritoryId": 152,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "Fly": true
         }
       ]
     },
     {
       "Sequence": 3,
       "Steps": [
-        {
-          "Position": {
-            "X": 106.51002,
-            "Y": -27.645441,
-            "Z": -368.2198
-          },
-          "TerritoryId": 152,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
         {
           "DataId": 1009119,
           "Position": {
             "Z": -366.3844
           },
           "TerritoryId": 152,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "Fly": true
         }
       ]
     },
     {
       "Sequence": 4,
       "Steps": [
-        {
-          "Position": {
-            "X": 170.76953,
-            "Y": -30.99653,
-            "Z": -213.92703
-          },
-          "TerritoryId": 152,
-          "InteractionType": "WalkTo",
-          "Fly": true
-        },
         {
           "Position": {
             "X": 190.23474,
             "Y": -31.415636,
             "Z": -218.26653
           },
+          "StopDistance": 0.25,
           "TerritoryId": 152,
           "InteractionType": "WalkTo",
-          "Fly": false
+          "Fly": true
         }
       ]
     },
     {
       "Sequence": 255,
       "Steps": [
-        {
-          "Position": {
-            "X": 21.611284,
-            "Y": -3.9309695,
-            "Z": 212.53413
-          },
-          "TerritoryId": 152,
-          "InteractionType": "WalkTo",
-          "Fly": true,
-          "AetheryteShortcut": "East Shroud - Hawthorne Hut"
-        },
         {
           "DataId": 1009097,
           "Position": {
             "Z": 211.16956
           },
           "TerritoryId": 152,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "Fly": true,
+          "AetheryteShortcut": "East Shroud - Hawthorne Hut"
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 8c058df97a0e47a005bff62713ef9d8b5a1c0935..7885937d9b21c1bf0a8a798ce07c18f864f00215 100644 (file)
@@ -87,6 +87,7 @@
             "Y": -9.645816,
             "Z": -74.48335
           },
+          "StopDistance": 0.5,
           "TerritoryId": 154,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
       ]
     }
   ]
-}
\ No newline at end of file
+}
index c856fc84954a4317e26779c3054ada1f18dea832..b483da54e8d8675b902ebf6f83b58f28a19a2801 100644 (file)
@@ -67,6 +67,7 @@
             "Y": 15.330521,
             "Z": -55.832825
           },
+          "StopDistance": 7,
           "TerritoryId": 156,
           "InteractionType": "Interact"
         }
@@ -82,6 +83,7 @@
             "Y": 15.428448,
             "Z": -56.168518
           },
+          "StopDistance": 7,
           "TerritoryId": 156,
           "InteractionType": "Interact"
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 70f6f5afa5f478a814e797ad5b1e2b033b0598f9..8cac950f74393d0e08eecb71785c9a3df86538cc 100644 (file)
           "TerritoryId": 139,
           "InteractionType": "WalkTo",
           "Fly": true,
-          "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake"
+          "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
         },
         {
           "Position": {
           },
           "TerritoryId": 139,
           "InteractionType": "WalkTo",
-          "TargetTerritoryId": 180
+          "TargetTerritoryId": 180,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
         },
         {
           "Position": {
           },
           "TerritoryId": 180,
           "InteractionType": "WalkTo",
-          "Fly": true
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
         },
         {
           "TerritoryId": 180,
           "InteractionType": "AttuneAetheryte",
           "Aetheryte": "Outer La Noscea - Camp Overlook",
-          "StopDistance": 5
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
         },
         {
           "Position": {
           },
           "TerritoryId": 180,
           "InteractionType": "WalkTo",
-          "Fly": true
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
         },
         {
           "Position": {
           },
           "TerritoryId": 180,
           "InteractionType": "WalkTo",
-          "Fly": true
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
         },
         {
           "Position": {
           },
           "TerritoryId": 180,
           "InteractionType": "WalkTo",
-          "Fly": true
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -128
+          ]
         },
         {
           "DataId": 2000075,
           "KillEnemyDataIds": [
             9487
           ],
-          "$": "0 0  0 0  0 0 -> 16 17  0 0  0 128"
+          "$": "0 0  0 0  0 0 -> 16 17  0 0  0 128",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "Position": {
           "TerritoryId": 138,
           "InteractionType": "WalkTo",
           "Fly": true,
-          "AetheryteShortcut": "Western La Noscea - Aleport"
+          "AetheryteShortcut": "Western La Noscea - Aleport",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            -64
+          ]
         },
         {
           "DataId": 2000076,
           "KillEnemyDataIds": [
             9488
           ],
-          "$": "16 17  0 0  0 128 -> 0 17  0 0  0 0"
+          "$": "16 17  0 0  0 128 -> 0 17  0 0  0 0",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         }
       ]
     },
             "Z": -465.72064
           },
           "TerritoryId": 156,
-          "InteractionType": "CompleteQuest","NextQuestId": 1200
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 1200
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 8b77a60859537fabd37a8cb11c1f9f4b88f939ce..a095b136d1d4e50f49960f7232cf8c89fc032014 100644 (file)
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "JerryWester",
+  "TerritoryBlacklist": [
+    151
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,
@@ -67,6 +70,7 @@
             "Y": 15.33271,
             "Z": -68.65039
           },
+          "StopDistance": 7,
           "TerritoryId": 156,
           "InteractionType": "Interact"
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1129_Shadows Uncast (Twin Adder).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1129_Shadows Uncast (Twin Adder).json
new file mode 100644 (file)
index 0000000..1896a8f
--- /dev/null
@@ -0,0 +1,70 @@
+{
+  "$schema": "https://carvel.li/questionable/quest-1.0",
+  "Author": "liza",
+  "TerritoryBlacklist": [
+    171
+  ],
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1000168,
+          "Position": {
+            "X": -75.48645,
+            "Y": -0.5013741,
+            "Z": -5.081299
+          },
+          "TerritoryId": 132,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1006516,
+          "Position": {
+            "X": -82.68872,
+            "Y": 233.23743,
+            "Z": 317.1892
+          },
+          "TerritoryId": 155,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "TerritoryId": 155,
+          "InteractionType": "Duty",
+          "ContentFinderConditionId": 13
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1003281,
+          "Position": {
+            "X": 97.520386,
+            "Y": 40.248554,
+            "Z": 81.1322
+          },
+          "TerritoryId": 128,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] The Aftcastle"
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1130_Shadows Uncast (Immortal Flames).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1130_Shadows Uncast (Immortal Flames).json
new file mode 100644 (file)
index 0000000..4f408ce
--- /dev/null
@@ -0,0 +1,66 @@
+{
+  "$schema": "https://carvel.li/questionable/quest-1.0",
+  "Author": "liza",
+  "TerritoryBlacklist": [
+    171
+  ],
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1004576,
+          "Position": {
+            "X": -141.64954,
+            "Y": 4.1,
+            "Z": -114.67157
+          },
+          "TerritoryId": 130,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1006516,
+          "Position": {
+            "X": -82.68872,
+            "Y": 233.23743,
+            "Z": 317.1892
+          },
+          "TerritoryId": 155,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "TerritoryId": 155,
+          "InteractionType": "Duty",
+          "ContentFinderConditionId": 13
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1004576,
+          "Position": {
+            "X": -141.64954,
+            "Y": 4.1,
+            "Z": -114.67157
+          },
+          "TerritoryId": 128,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Ul'dah"
+        }
+      ]
+    }
+  ]
+}
index 51352849430fee138d6bf13e90738669419b5546..3ad221ac5d098b678b9de491ccf83c62313fa846 100644 (file)
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "Position": {
+            "X": 152.25397,
+            "Y": 14.095841,
+            "Z": 668.4288
+          },
+          "TerritoryId": 135,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AethernetShortcut": [
+            "[Limsa Lominsa] The Aftcastle",
+            "[Limsa Lominsa] Tempest Gate (Lower La Noscea)"
+          ]
+        },
+        {
+          "TerritoryId": 135,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "Lower La Noscea - Moraby Drydocks"
+        },
         {
           "DataId": 1002484,
           "Position": {
           },
           "TerritoryId": 135,
           "InteractionType": "Interact",
-          "TargetTerritoryId": 250,
-          "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks",
-          "SkipIf": [
-            "AetheryteShortcutIfInSameTerritory"
-          ]
+          "TargetTerritoryId": 250
         },
         {
           "TerritoryId": 250,
diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/PvP/1105_A Pup No Longer (Twin Adder).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/PvP/1105_A Pup No Longer (Twin Adder).json
new file mode 100644 (file)
index 0000000..dfb69cc
--- /dev/null
@@ -0,0 +1,72 @@
+{
+  "$schema": "https://carvel.li/questionable/quest-1.0",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1000168,
+          "Position": {
+            "X": -75.48645,
+            "Y": -0.5013741,
+            "Z": -5.081299
+          },
+          "TerritoryId": 132,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "Position": {
+            "X": 152.25397,
+            "Y": 14.095841,
+            "Z": 668.4288
+          },
+          "TerritoryId": 135,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Tempest Gate (Lower La Noscea)"
+          ]
+        },
+        {
+          "TerritoryId": 135,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "Lower La Noscea - Moraby Drydocks"
+        },
+        {
+          "DataId": 1002484,
+          "Position": {
+            "X": 270.71033,
+            "Y": 4.4031205,
+            "Z": 719.9968
+          },
+          "TerritoryId": 135,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 250
+        },
+        {
+          "TerritoryId": 250,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "Wolves' Den Pier"
+        },
+        {
+          "DataId": 1005184,
+          "Position": {
+            "X": 0.015197754,
+            "Y": 3.5836844,
+            "Z": -30.380737
+          },
+          "TerritoryId": 250,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}
diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/PvP/1106_A Pup No Longer (Immortal Flames).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/PvP/1106_A Pup No Longer (Immortal Flames).json
new file mode 100644 (file)
index 0000000..20c0561
--- /dev/null
@@ -0,0 +1,72 @@
+{
+  "$schema": "https://carvel.li/questionable/quest-1.0",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1004576,
+          "Position": {
+            "X": -141.64954,
+            "Y": 4.1,
+            "Z": -114.67157
+          },
+          "TerritoryId": 130,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "Position": {
+            "X": 152.25397,
+            "Y": 14.095841,
+            "Z": 668.4288
+          },
+          "TerritoryId": 135,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Tempest Gate (Lower La Noscea)"
+          ]
+        },
+        {
+          "TerritoryId": 135,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "Lower La Noscea - Moraby Drydocks"
+        },
+        {
+          "DataId": 1002484,
+          "Position": {
+            "X": 270.71033,
+            "Y": 4.4031205,
+            "Z": 719.9968
+          },
+          "TerritoryId": 135,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 250
+        },
+        {
+          "TerritoryId": 250,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "Wolves' Den Pier"
+        },
+        {
+          "DataId": 1005184,
+          "Position": {
+            "X": 0.015197754,
+            "Y": 3.5836844,
+            "Z": -30.380737
+          },
+          "TerritoryId": 250,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}
index 0ab8398b31dfa8d5bfeb9016473d0642e6f88ba2..668b37874b76bdf8fde05f73efb48d1ef08c65bf 100644 (file)
@@ -40,9 +40,9 @@
           },
           "TerritoryId": 212,
           "InteractionType": "CompleteQuest",
-          "NextQuestId": 1048
+          "Comment": "Next quest is picked up as part of 'Moving On'"
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 86e19fea687f12eea25a1e93802f98b926b3e911..3a35d216557f5dcf73773033faf54fad97cf63e2 100644 (file)
           "TerritoryId": 146,
           "Mount": false,
           "InteractionType": "CompleteQuest",
-          "StopDistance": 5,
-          "NextQuestId": 1157
+          "StopDistance": 5
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 68a2e9d1bf818ed88154ba93491747e3de511951..cff17c742af8393fdfb25466d202c117d57bd050 100644 (file)
             "Z": 175.34143
           },
           "TerritoryId": 155,
-          "InteractionType": "CompleteQuest",
-          "NextQuestId": 1158
+          "InteractionType": "CompleteQuest"
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 24efc941f75537f71593f57a227f3b583f808c9f..c827b7f8a85dadbd0958408f31d197abec1f680b 100644 (file)
         {
           "TerritoryId": 180,
           "InteractionType": "AttuneAetheryte",
-          "Aetheryte": "Outer La Noscea - Camp Overlook",
-          "StopDistance": 5
+          "Aetheryte": "Outer La Noscea - Camp Overlook"
         },
         {
           "Position": {
       ]
     }
   ]
-}
\ No newline at end of file
+}
index a81827260ae29583a1a8708f51abd1a973af05bb..ec81266390bae7dbd73430a4fd53cade3c6e9d61 100644 (file)
@@ -40,7 +40,8 @@
           },
           "TerritoryId": 156,
           "InteractionType": "WalkTo",
-          "Mount": true
+          "Mount": true,
+          "$": "Rising Stones Door"
         },
         {
           "DataId": 1029791,
index d49f4864124c42bdceaffd4227fd87f604aa05b6..4ed21953ae604fba35cb8709f78541f5da3ace91 100644 (file)
                             },
                             "CompletionQuestVariablesFlags": {
                               "$ref": "#/$defs/CompletionFlags"
+                            },
+                            "IgnoreQuestMarker": {
+                              "type": "boolean"
                             }
                           },
                           "required": [
                             "DataId"
                           ]
                         }
+                      },
+                      "CombatDelaySecondsAtStart": {
+                        "type": "number"
                       }
                     },
                     "required": [
index 69949ef7d11b44c958e4cd9b5f92d449539677a9..93a0d9d41373a1dfc43647ebb6cacecc213baa35 100644 (file)
@@ -12,4 +12,5 @@ public sealed class ComplexCombatData
     public uint? RewardItemId { get; set; }
     public int? RewardItemCount { get; set; }
     public IList<short?> CompletionQuestVariablesFlags { get; set; } = new List<short?>();
+    public bool IgnoreQuestMarker { get; }
 }
index 337f146ae923e715d827e936bc2461b9c500f9b2..3ecb8f39c681aa043cfa8e1c2446a0e94b1ad3b6 100644 (file)
@@ -59,6 +59,7 @@ public sealed class QuestStep
     public EEnemySpawnType? EnemySpawnType { get; set; }
     public IList<uint> KillEnemyDataIds { get; set; } = new List<uint>();
     public IList<ComplexCombatData> ComplexCombatData { get; set; } = new List<ComplexCombatData>();
+    public float? CombatDelaySecondsAtStart { get; set; }
 
     public JumpDestination? JumpDestination { get; set; }
     public uint? ContentFinderConditionId { get; set; }
index bb85caffd665c457342db8289c17ce51ecdba9b6..d269a061f2c1529ee6566ad28e236eee7359bdc1 100644 (file)
@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Dalamud.Game.ClientState.Conditions;
@@ -16,7 +16,7 @@ using Questionable.Model.V1;
 
 namespace Questionable.Controller;
 
-internal sealed class CombatController
+internal sealed class CombatController : IDisposable
 {
     private readonly List<ICombatModule> _combatModules;
     private readonly ITargetManager _targetManager;
@@ -39,6 +39,8 @@ internal sealed class CombatController
         _clientState = clientState;
         _gameFunctions = gameFunctions;
         _logger = logger;
+
+        _clientState.TerritoryChanged += TerritoryChanged;
     }
 
     public bool IsRunning => _currentFight != null;
@@ -198,7 +200,14 @@ internal sealed class CombatController
             if (battleNpc.BattleNpcKind is BattleNpcSubKind.BattleNpcPart or BattleNpcSubKind.Enemy)
             {
                 var gameObjectStruct = (GameObject*)gameObject.Address;
-                return gameObjectStruct->NamePlateIconId != 0;
+                if (gameObjectStruct->NamePlateIconId is 60093 or 60732) // npc that starts a fate or does turn-ins
+                    return false;
+
+                var enemyData = _currentFight?.Data.ComplexCombatDatas.FirstOrDefault(x => x.DataId == battleNpc.DataId);
+                if (enemyData is { IgnoreQuestMarker: true })
+                    return battleNpc.StatusFlags.HasFlag(StatusFlags.InCombat);
+                else
+                    return gameObjectStruct->NamePlateIconId != 0;
             }
             else
                 return false;
@@ -218,6 +227,14 @@ internal sealed class CombatController
         _currentFight = null;
     }
 
+    private void TerritoryChanged(ushort territoryId) => Stop();
+
+    public void Dispose()
+    {
+        _clientState.TerritoryChanged -= TerritoryChanged;
+        Stop();
+    }
+
     private sealed class CurrentFight
     {
         public required ICombatModule Module { get; init; }
index 0cb2b4f364ac06d05723e69427d4b1861e78dd57..ee46f639f663b13bd5e954580370c81987ba33e3 100644 (file)
@@ -20,6 +20,9 @@ internal sealed class MovementOverrideController
 
         new BlacklistedPoint(132, new(45.5f, -8f, 101f), new(50.53978f, -8.046954f, 101.06045f)),
 
+        // ul'dah lamp near adventuer's guild
+        new BlacklistedPoint(130, new(59.5f, 4.25f, -118f), new(60.551353f, 4f, -119.76446f)),
+
         // eastern thanalan
         new BlacklistedPoint(145, new(-139.75f, -32.25f, 75.25f), new(-139.57748f, -33.785175f, 77.87906f)),
 
@@ -32,6 +35,9 @@ internal sealed class MovementOverrideController
         // coerthas central highlands
         new BlacklistedPoint(155, new(-478.75f, 149.25f, -305.75f), new(-476.1802f, 149.06573f, -304.7811f)),
 
+        // rising stones, plant boxes
+        new BlacklistedPoint(351, new(3.25f, 0.75f, 8.5f),new(4f, 0f, 9.5f)),
+
         new BlacklistedPoint(1189, new(574f, -142.25f, 504.25f), new(574.44183f, -142.12766f, 507.60065f)),
 
         // heritage found: yyupye's halo (farm, npc: Mahuwsa)
index f52579c092af8091216f9474fad57c70cd3698a4..a26272486fda985aac47f5ee16dcd3b03d3b7d79 100644 (file)
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 using Questionable.Controller.Steps.Common;
+using Questionable.Controller.Steps.Shared;
 using Questionable.Controller.Utils;
 using Questionable.Model;
 using Questionable.Model.V1;
@@ -16,20 +17,28 @@ internal static class Combat
         public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, QuestStep step)
         {
             if (step.InteractionType != EInteractionType.Combat)
-                return [];
+                yield break;
 
             ArgumentNullException.ThrowIfNull(step.EnemySpawnType);
 
-            var unmount = serviceProvider.GetRequiredService<UnmountTask>();
+            yield return serviceProvider.GetRequiredService<UnmountTask>();
+
+            if (step.CombatDelaySecondsAtStart != null)
+            {
+                yield return serviceProvider.GetRequiredService<WaitAtStart.WaitDelay>()
+                    .With(TimeSpan.FromSeconds(step.CombatDelaySecondsAtStart.Value));
+            }
+
             switch (step.EnemySpawnType)
             {
                 case EEnemySpawnType.AfterInteraction:
                 {
                     ArgumentNullException.ThrowIfNull(step.DataId);
 
-                    var interaction = serviceProvider.GetRequiredService<Interact.DoInteract>()
+                    yield return serviceProvider.GetRequiredService<Interact.DoInteract>()
                         .With(step.DataId.Value, true);
-                    return [unmount, interaction, CreateTask(quest, sequence, step)];
+                    yield return CreateTask(quest, sequence, step);
+                    break;
                 }
 
                 case EEnemySpawnType.AfterItemUse:
@@ -37,17 +46,20 @@ internal static class Combat
                     ArgumentNullException.ThrowIfNull(step.DataId);
                     ArgumentNullException.ThrowIfNull(step.ItemId);
 
-                    var useItem = serviceProvider.GetRequiredService<UseItem.UseOnObject>()
+                    yield return serviceProvider.GetRequiredService<UseItem.UseOnObject>()
                         .With(step.DataId.Value, step.ItemId.Value);
-                    return [unmount, useItem, CreateTask(quest, sequence, step)];
+                    yield return CreateTask(quest, sequence, step);
+                    break;
                 }
 
                 case EEnemySpawnType.AutoOnEnterArea:
                     // automatically triggered when entering area, i.e. only unmount
-                    return [unmount, CreateTask(quest, sequence, step)];
+                    yield return CreateTask(quest, sequence, step);
+                    break;
 
                 case EEnemySpawnType.OverworldEnemies:
-                    return [unmount, CreateTask(quest, sequence, step)];
+                    yield return CreateTask(quest, sequence, step);
+                    break;
 
                 default:
                     throw new ArgumentOutOfRangeException(nameof(step), $"Unknown spawn type {step.EnemySpawnType}");
index 61be9589054b6954169f1ca92abf132032357b23..c6b79adf27d11a7c76362d9c250d3f848619a012 100644 (file)
@@ -1,6 +1,6 @@
 <Project Sdk="Dalamud.NET.Sdk/9.0.2">
     <PropertyGroup>
-        <Version>1.13</Version>
+        <Version>1.14</Version>
         <OutputPath>dist</OutputPath>
         <PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap>
     </PropertyGroup>
index a3b7e0694ac0a687b5646f8191acded1b9c9aa03..a8232905455ede1ffabdd9a025d3b9d50e593b72 100644 (file)
@@ -1,10 +1,8 @@
 using System.Linq;
 using Dalamud.Interface;
-using Dalamud.Interface.Colors;
 using Dalamud.Interface.Utility.Raii;
 using FFXIVClientStructs.FFXIV.Client.Game.UI;
 using FFXIVClientStructs.FFXIV.Common.Math;
-using ImGuiNET;
 using Questionable.Data;
 
 namespace Questionable.Windows.QuestComponents;
@@ -13,6 +11,7 @@ internal sealed class ARealmRebornComponent
 {
     private const ushort ATimeForEveryPurpose = 425;
     private const ushort TheUltimateWeapon = 524;
+    private const ushort GoodIntentions = 363;
     private static readonly ushort[] RequiredPrimalInstances = [20004, 20006, 20005];
     private static readonly ushort[] RequiredAllianceRaidQuests = [1709, 1200, 1201, 1202, 1203, 1474, 494, 495];
 
@@ -30,12 +29,14 @@ internal sealed class ARealmRebornComponent
         _uiUtils = uiUtils;
     }
 
-    public bool ShouldDraw => !_gameFunctions.IsQuestComplete(ATimeForEveryPurpose) &&
+    public bool ShouldDraw => !_gameFunctions.IsQuestAcceptedOrComplete(ATimeForEveryPurpose) &&
                               _gameFunctions.IsQuestComplete(TheUltimateWeapon);
 
     public void Draw()
     {
-        DrawPrimals();
+        if (!_gameFunctions.IsQuestAcceptedOrComplete(GoodIntentions))
+            DrawPrimals();
+
         DrawAllianceRaids();
     }