Add missing teleport prompts, add remaining EW story prompts; fix mare aether current...

diff --git a/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4402_A Taste of the Moon.json b/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4402_A Taste of the Moon.json
index ed304e3a892e8555512d130548b32e974ea52db1..b77ddfba724491463c30d663d4b7e646deb9483f 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4402_A Taste of the Moon.json
+++ b/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4402_A Taste of the Moon.json
@@ -31,37 +31,6 @@
           "InteractionType": "AttuneAetherCurrent",
           "AetherCurrentId": 2818362
         },
-        {
-          "Position": {
-            "X": 62.71022,
-            "Y": -46.99965,
-            "Z": -433.81802
-          },
-          "TerritoryId": 959,
-          "InteractionType": "WalkTo"
-        },
-        {
-          "Position": {
-            "X": 47.394165,
-            "Y": -133.50012,
-            "Z": -397.90225
-          },
-          "TerritoryId": 959,
-          "InteractionType": "WalkTo",
-          "DisableNavmesh": true
-        },
-        {
-          "DataId": 2012019,
-          "Position": {
-            "X": 21.7081,
-            "Y": -133.5001,
-            "Z": -385.7313
-          },
-          "TerritoryId": 959,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818368,
-          "DisableNavmesh": true
-        },
         {
           "DataId": 1038908,
           "Position": {
@@ -139,9 +108,7 @@
             "Z": -620.05035
           },
           "TerritoryId": 959,
-          "InteractionType": "Interact",
-          "DialogueChoices": [
-          ]
+          "InteractionType": "Interact"
         }
       ]
     },

diff --git a/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4405_Back to Old Tricks.json b/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4405_Back to Old Tricks.json
index a75f5f0e8d4e67fdcb938ec90bd1b7685d33c1b8..4e91502c7bbd2e7ce8538ec6c4ebee71b2e56602 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4405_Back to Old Tricks.json
+++ b/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4405_Back to Old Tricks.json
@@ -34,22 +34,6 @@
         }
       ]
     },
-    {
-      "Sequence": 2,
-      "Steps": [
-        {
-          "DataId": 2012185,
-          "Position": {
-            "X": -5.416992,
-            "Y": -49.05786,
-            "Z": -269.24548
-          },
-          "TerritoryId": 959,
-          "InteractionType": "SinglePlayerDuty",
-          "Comment": "Follow Urianger (TODO is this sequence used?)"
-        }
-      ]
-    },
     {
       "Sequence": 3,
       "Steps": [

diff --git a/QuestPaths/Endwalker/MSQ/D-Thavnair2/4416_Simple Pleasures.json b/QuestPaths/Endwalker/MSQ/D-Thavnair2/4416_Simple Pleasures.json
index 2b93258daa2710e1ada912c40fb1653249a1b912..e923edd201ce537b7c6f07d14a61e7cda5cadd68 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/D-Thavnair2/4416_Simple Pleasures.json
+++ b/QuestPaths/Endwalker/MSQ/D-Thavnair2/4416_Simple Pleasures.json
@@ -52,7 +52,6 @@
     },
     {
       "Sequence": 3,
-      "Comment": "TODO Check flags",
       "Steps": [
         {
           "DataId": 1037628,

diff --git a/QuestPaths/Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json b/QuestPaths/Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json
index 8dff4e72a4cf7aceec95f53be5b315ac4c5d77ea..50facbd7fb8e8b770151d76792f4a208aaed9d26 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json
+++ b/QuestPaths/Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    1014
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,

diff --git a/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json b/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json
index f0dcc64fa1b4afddf420c86293af70bc8f6cd72f..f7cec200094b12a8f8e661bfae7afa49ae359dd9 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json
+++ b/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    1012
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,

diff --git a/QuestPaths/Endwalker/MSQ/H-6.1/4530_A Brothers Grief.json b/QuestPaths/Endwalker/MSQ/H-6.1/4530_A Brothers Grief.json
index 65b557ac481495e00e8f060601e1f8fb8676d5c3..45803ce07dbc1bb766837bde6f10452ef87cff6c 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/H-6.1/4530_A Brothers Grief.json
+++ b/QuestPaths/Endwalker/MSQ/H-6.1/4530_A Brothers Grief.json
@@ -28,6 +28,7 @@
             "Y": -350,
             "Z": -84.82495
           },
+          "StopDistance": 5,
           "TerritoryId": 1056,
           "InteractionType": "Interact"
         }
@@ -60,7 +61,14 @@
             "Z": -148.57715
           },
           "TerritoryId": 963,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMH105_04530_Q2_000_000",
+              "Answer": "TEXT_AKTKMH105_04530_A2_000_001"
+            }
+          ]
         }
       ]
     }

diff --git a/QuestPaths/Endwalker/MSQ/H-6.1/4531_Sharing the Wealth.json b/QuestPaths/Endwalker/MSQ/H-6.1/4531_Sharing the Wealth.json
index e7efd53a29d684fe80053d2c5e9d5171505990b9..66b8685cb2baf580e890ea6b4e6365e54fb1b9ba 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/H-6.1/4531_Sharing the Wealth.json
+++ b/QuestPaths/Endwalker/MSQ/H-6.1/4531_Sharing the Wealth.json
@@ -55,7 +55,15 @@
           },
           "TerritoryId": 957,
           "InteractionType": "WalkTo",
-          "Fly": true
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "DataId": 1037631,
@@ -74,6 +82,13 @@
             null,
             null,
             128
+          ],
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMH106_04531_Q1_000_000",
+              "Answer": "TEXT_AKTKMH106_04531_A1_000_002"
+            }
           ]
         },
         {
@@ -84,7 +99,15 @@
             "Z": 561.27246
           },
           "TerritoryId": 957,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         }
       ]
     },

diff --git a/QuestPaths/Endwalker/MSQ/H-6.1/4533_Restricted Reading.json b/QuestPaths/Endwalker/MSQ/H-6.1/4533_Restricted Reading.json
index da7d334f1bd411ed93d08d0db53d8579c2c050d1..f4355ad699fe40a86cdce2efcae8c3b825f949a4 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/H-6.1/4533_Restricted Reading.json
+++ b/QuestPaths/Endwalker/MSQ/H-6.1/4533_Restricted Reading.json
@@ -126,7 +126,23 @@
           },
           "TerritoryId": 957,
           "InteractionType": "Interact",
-          "Mount": false
+          "Mount": false,
+          "SkipIf": [
+            "FlyingLocked"
+          ]
+        },
+        {
+          "DataId": 2012847,
+          "Position": {
+            "X": 242.08435,
+            "Y": 0.3508911,
+            "Z": 119.43237
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Interact",
+          "SkipIf": [
+            "FlyingUnlocked"
+          ]
         }
       ]
     },

diff --git a/QuestPaths/Endwalker/MSQ/H-6.1/4534_Void Theory.json b/QuestPaths/Endwalker/MSQ/H-6.1/4534_Void Theory.json
index b42471b8d094749cd6f929206fea4dd07c9f8ff6..c215c70e5d0d2b47fe761eec3cb03b6ef190bad6 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/H-6.1/4534_Void Theory.json
+++ b/QuestPaths/Endwalker/MSQ/H-6.1/4534_Void Theory.json
@@ -29,7 +29,14 @@
           },
           "TerritoryId": 957,
           "InteractionType": "Interact",
-          "Fly": true
+          "Fly": true,
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMH109_04534_Q2_000_120",
+              "Yes": true
+            }
+          ]
         }
       ]
     },

diff --git a/QuestPaths/Endwalker/MSQ/H-6.1/4535_A Satraps Duty.json b/QuestPaths/Endwalker/MSQ/H-6.1/4535_A Satraps Duty.json
index 88d18b130c162662645a72b245fc9c0813442bc9..6d356e1867ad34b1cfed626bfbfb6b0c2be7d792 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/H-6.1/4535_A Satraps Duty.json
+++ b/QuestPaths/Endwalker/MSQ/H-6.1/4535_A Satraps Duty.json
@@ -60,7 +60,14 @@
             "Z": 106.06543
           },
           "TerritoryId": 957,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMH110_04535_Q2_000_000",
+              "Answer": "TEXT_AKTKMH110_04535_A2_000_001"
+            }
+          ]
         }
       ]
     },

diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json b/QuestPaths/Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json
index 61f0623cad04e3041e3cfeda48a12d0788029a65..51b2de681889b0e8f0f39dc81fca92bf5b824f39 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json
+++ b/QuestPaths/Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    1070
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,
@@ -45,7 +48,8 @@
           },
           "StopDistance": 5,
           "TerritoryId": 957,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 1056
         }
       ]
     },

diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4593_Shadowed Remnants.json b/QuestPaths/Endwalker/MSQ/I-6.2/4593_Shadowed Remnants.json
index 80552cbdf4938309a72244eb5241fc7da610243c..af9e9d7c577d042b7338e42b4298f3dde037a2f1 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/I-6.2/4593_Shadowed Remnants.json
+++ b/QuestPaths/Endwalker/MSQ/I-6.2/4593_Shadowed Remnants.json
@@ -127,7 +127,8 @@
             "Z": 14.389221
           },
           "TerritoryId": 1089,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 1089
         },
         {
           "DataId": 2013113,
@@ -137,7 +138,8 @@
             "Z": 133.95886
           },
           "TerritoryId": 1089,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 1089
         },
         {
           "Position": {

diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4594_Where Everything Begins.json b/QuestPaths/Endwalker/MSQ/I-6.2/4594_Where Everything Begins.json
index fd2435b95799e75334e422e55b430c9c4b5cbd8a..ee0289bb73bea74e6db0abcc3d6f4890084f8cb3 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/I-6.2/4594_Where Everything Begins.json
+++ b/QuestPaths/Endwalker/MSQ/I-6.2/4594_Where Everything Begins.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    1091
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,
@@ -59,7 +62,8 @@
             "Z": 90.01325
           },
           "TerritoryId": 1089,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 1089
         },
         {
           "DataId": 1043808,

diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4595_Groping in the Dark.json b/QuestPaths/Endwalker/MSQ/I-6.2/4595_Groping in the Dark.json
index f60e2a87b0945fb385df519d78bd3966b724a392..0d12f93af72d74e1ab13cfca31dc3ae6a4abcc40 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/I-6.2/4595_Groping in the Dark.json
+++ b/QuestPaths/Endwalker/MSQ/I-6.2/4595_Groping in the Dark.json
@@ -29,7 +29,8 @@
             "Z": -232.4083
           },
           "TerritoryId": 1089,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 1089
         },
         {
           "DataId": 1043792,
@@ -103,7 +104,8 @@
             "Z": 14.389221
           },
           "TerritoryId": 1089,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 1089
         },
         {
           "DataId": 1043814,
@@ -128,7 +130,8 @@
             "Z": -232.41016
           },
           "TerritoryId": 1089,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 1089
         },
         {
           "DataId": 1043816,
@@ -138,7 +141,14 @@
             "Z": -110.12439
           },
           "TerritoryId": 1089,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMI104_04595_SYSTEM_000_322",
+              "Yes": true
+            }
+          ]
         }
       ]
     },

diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4596_Nowhere to Run.json b/QuestPaths/Endwalker/MSQ/I-6.2/4596_Nowhere to Run.json
index d9c09fc8db7b57c528ec3ce0fbd6c4932307a64f..51627a8f89a54e79ca5b91afe4d88b150df7d7b4 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/I-6.2/4596_Nowhere to Run.json
+++ b/QuestPaths/Endwalker/MSQ/I-6.2/4596_Nowhere to Run.json
@@ -114,7 +114,14 @@
             "Z": -22.62915
           },
           "TerritoryId": 1077,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMI105_04596_Q1_000_000",
+              "Answer": "TEXT_AKTKMI105_04596_A1_000_002"
+            }
+          ]
         }
       ]
     },
@@ -159,7 +166,14 @@
             "Z": 60.501953
           },
           "TerritoryId": 1077,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMI105_04596_Q2_000_000",
+              "Answer": "TEXT_AKTKMI105_04596_A2_000_001"
+            }
+          ]
         }
       ]
     },

diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4597_The Wind Rises.json b/QuestPaths/Endwalker/MSQ/I-6.2/4597_The Wind Rises.json
index 4410c0f00f5e95e9c782ad5a106d7f4ded940176..49339349798b1bfc83c2ffdea32f256f9c7916ea 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/I-6.2/4597_The Wind Rises.json
+++ b/QuestPaths/Endwalker/MSQ/I-6.2/4597_The Wind Rises.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    1071
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,
@@ -14,7 +17,14 @@
           },
           "StopDistance": 7,
           "TerritoryId": 1077,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMI106_04597_Q1_000_000",
+              "Answer": "TEXT_AKTKMI106_04597_A1_000_002"
+            }
+          ]
         }
       ]
     },
@@ -29,7 +39,14 @@
             "Z": -74.87604
           },
           "TerritoryId": 1077,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMI106_04597_SYSTEM_000_120",
+              "Yes": true
+            }
+          ]
         }
       ]
     },

diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4598_Return from the Void.json b/QuestPaths/Endwalker/MSQ/I-6.2/4598_Return from the Void.json
index 90d21c5e0e54f8d7185d0daae298b4ae43a56e30..e77fe0180e8067d45fb2ea8bb6abd08eca7fac8d 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/I-6.2/4598_Return from the Void.json
+++ b/QuestPaths/Endwalker/MSQ/I-6.2/4598_Return from the Void.json
@@ -44,7 +44,14 @@
             "Z": 51.499146
           },
           "TerritoryId": 1077,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMI107_04598_SYSTEM_000_221",
+              "Yes": true
+            }
+          ]
         }
       ]
     },
@@ -59,7 +66,14 @@
             "Z": -81.28485
           },
           "TerritoryId": 963,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMI107_04598_SYSTEM_000_401",
+              "Yes": true
+            }
+          ]
         }
       ]
     }

diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4599_A World with Light and Life.json b/QuestPaths/Endwalker/MSQ/I-6.2/4599_A World with Light and Life.json
index 68e8801b4a63ce5cec265119f23f75696d2b5729..ab3d48d22fa9c873085ccc9545c3d1a44d98311f 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/I-6.2/4599_A World with Light and Life.json
+++ b/QuestPaths/Endwalker/MSQ/I-6.2/4599_A World with Light and Life.json
@@ -14,7 +14,14 @@
           },
           "StopDistance": 7,
           "TerritoryId": 1078,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMI108_04599_Q1_000_000",
+              "Answer": "TEXT_AKTKMI108_04599_A1_000_002"
+            }
+          ]
         }
       ]
     },
@@ -30,7 +37,8 @@
           },
           "StopDistance": 4,
           "TerritoryId": 1078,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 963
         },
         {
           "DataId": 1037381,
@@ -45,6 +53,13 @@
           "AethernetShortcut": [
             "[Radz-at-Han] Meghaduta",
             "[Radz-at-Han] Mehryde's Meyhane"
+          ],
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMI108_04599_Q3_000_000",
+              "Answer": "TEXT_AKTKMI108_04599_A3_000_002"
+            }
           ]
         }
       ]
@@ -64,6 +79,13 @@
           "AethernetShortcut": [
             "[Radz-at-Han] Mehryde's Meyhane",
             "[Radz-at-Han] Meghaduta"
+          ],
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMI108_04599_SYSTEM_000_211",
+              "Yes": true
+            }
           ]
         }
       ]

diff --git a/QuestPaths/Endwalker/MSQ/I-6.2/4600_Buried Memory.json b/QuestPaths/Endwalker/MSQ/I-6.2/4600_Buried Memory.json
index 3b0bf4534823905d51b09354bd8ee9bfac5e9727..c061510dd2d2121faf14365edb48963f137d501a 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/I-6.2/4600_Buried Memory.json
+++ b/QuestPaths/Endwalker/MSQ/I-6.2/4600_Buried Memory.json
@@ -32,6 +32,13 @@
           "AethernetShortcut": [
             "[Radz-at-Han] Ruveydah Fibers",
             "[Radz-at-Han] Meghaduta"
+          ],
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMI109_04600_SYSTEM_000_020",
+              "Yes": true
+            }
           ]
         }
       ]

diff --git a/QuestPaths/Endwalker/MSQ/J-6.3/4673_An Unforeseen Bargain.json b/QuestPaths/Endwalker/MSQ/J-6.3/4673_An Unforeseen Bargain.json
index ab047982344c54b1dc234ef8f1a199c24d8dc56b..06fc6e1f446576f643b9639b0c7374313fd41d41 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/J-6.3/4673_An Unforeseen Bargain.json
+++ b/QuestPaths/Endwalker/MSQ/J-6.3/4673_An Unforeseen Bargain.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    1120
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,
@@ -44,6 +47,7 @@
             "Y": -36.65,
             "Z": -246.44855
           },
+          "StopDistance": 5,
           "TerritoryId": 958,
           "InteractionType": "Interact"
         }

diff --git a/QuestPaths/Endwalker/MSQ/J-6.3/4674_King of the Mountain.json b/QuestPaths/Endwalker/MSQ/J-6.3/4674_King of the Mountain.json
index dee5098f4e65017e0ab3606f8815513f4228d719..315aa1b927e024dbf3282708a90bb04668fc4889 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/J-6.3/4674_King of the Mountain.json
+++ b/QuestPaths/Endwalker/MSQ/J-6.3/4674_King of the Mountain.json
@@ -15,6 +15,7 @@
             "Y": -36.65,
             "Z": -242.90839
           },
+          "StopDistance": 5,
           "TerritoryId": 958,
           "InteractionType": "Interact"
         }

diff --git a/QuestPaths/Endwalker/MSQ/J-6.3/4675_A Dragons Resolve.json b/QuestPaths/Endwalker/MSQ/J-6.3/4675_A Dragons Resolve.json
index 97ce377956b0e72a50f2e112c9ebee379330cda4..cbe77febd698d091fb2c7597daaa8f4d77354955 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/J-6.3/4675_A Dragons Resolve.json
+++ b/QuestPaths/Endwalker/MSQ/J-6.3/4675_A Dragons Resolve.json
@@ -29,7 +29,8 @@
             "Z": 371.96924
           },
           "TerritoryId": 1119,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 1119
         },
         {
           "DataId": 1044274,
@@ -69,7 +70,8 @@
             "Z": -433.95135
           },
           "TerritoryId": 1119,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 1119
         },
         {
           "DataId": 2013233,

diff --git a/QuestPaths/Endwalker/MSQ/J-6.3/4676_Paths Barred.json b/QuestPaths/Endwalker/MSQ/J-6.3/4676_Paths Barred.json
index a730dfa45ca2ba3e8673c3b900b2fd4ab2d1fba8..d1e686360eb8f7878ee1f1a7f1cfdbf3475e4302 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/J-6.3/4676_Paths Barred.json
+++ b/QuestPaths/Endwalker/MSQ/J-6.3/4676_Paths Barred.json
@@ -49,7 +49,14 @@
             "Z": 460.34937
           },
           "TerritoryId": 957,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMJ107_04676_Q1_000_000",
+              "Answer": "TEXT_AKTKMJ107_04676_A1_000_002"
+            }
+          ]
         }
       ]
     },

diff --git a/QuestPaths/Endwalker/MSQ/J-6.3/4677_Desires Untold.json b/QuestPaths/Endwalker/MSQ/J-6.3/4677_Desires Untold.json
index ce4256b1df93878f72a4c173b12eefb6d1427e2b..9fc75d52fbcc0a400bb039a462929b58f29f0872 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/J-6.3/4677_Desires Untold.json
+++ b/QuestPaths/Endwalker/MSQ/J-6.3/4677_Desires Untold.json
@@ -16,7 +16,14 @@
             "Z": -569.8787
           },
           "TerritoryId": 957,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMJ108_04677_Q1_000_000",
+              "Answer": "TEXT_AKTKMJ108_04677_A1_000_001"
+            }
+          ]
         }
       ]
     },
@@ -48,7 +55,14 @@
           },
           "TerritoryId": 957,
           "InteractionType": "Interact",
-          "Fly": true
+          "Fly": true,
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMJ108_04677_Q2_000_063",
+              "Yes": true
+            }
+          ]
         }
       ]
     },

diff --git a/QuestPaths/Endwalker/MSQ/J-6.3/4678_Gods Revel Lands Tremble.json b/QuestPaths/Endwalker/MSQ/J-6.3/4678_Gods Revel Lands Tremble.json
index 2af3b071efc7041c223648d44b8b179f95f65ff9..0629b9cf765c4a388b3539ca2682fcc716e2c022 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/J-6.3/4678_Gods Revel Lands Tremble.json
+++ b/QuestPaths/Endwalker/MSQ/J-6.3/4678_Gods Revel Lands Tremble.json
@@ -34,6 +34,13 @@
           "AethernetShortcut": [
             "[Radz-at-Han] Aetheryte Plaza",
             "[Radz-at-Han] Meghaduta"
+          ],
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMJ109_04678_SYSTEM_000_021",
+              "Yes": true
+            }
           ]
         }
       ]

diff --git a/QuestPaths/Endwalker/MSQ/K-6.4/4735_Currying Flavor.json b/QuestPaths/Endwalker/MSQ/K-6.4/4735_Currying Flavor.json
index 2c9dc168978f9f5530a61044f3974b7098e901e0..194b51fb6fa6829fe82f58c3dcc81ad6b451a6bc 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/K-6.4/4735_Currying Flavor.json
+++ b/QuestPaths/Endwalker/MSQ/K-6.4/4735_Currying Flavor.json
@@ -48,7 +48,19 @@
           },
           "StopDistance": 5,
           "TerritoryId": 963,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMK101_04735_Q1_000_000",
+              "Answer": "TEXT_AKTKMK101_04735_A1_000_003"
+            },
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMK101_04735_Q1_000_065",
+              "Yes": true
+            }
+          ]
         }
       ]
     },
@@ -97,6 +109,13 @@
           "AethernetShortcut": [
             "[Radz-at-Han] Mehryde's Meyhane",
             "[Radz-at-Han] Meghaduta"
+          ],
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMK101_04735_Q2_000_182",
+              "Yes": true
+            }
           ]
         }
       ]

diff --git a/QuestPaths/Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json b/QuestPaths/Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json
index c6d94c9bd035ca1192e03279d0a7680181ca1170..b7b4a500aed00a5b5c5468e64fee603417370612 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json
+++ b/QuestPaths/Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json
@@ -34,7 +34,8 @@
           "KillEnemyDataIds": [
             16332
           ],
-          "Fly": true
+          "Fly": true,
+          "Comment": "TODO Verify that navmesh can still get you here if flying is locked, and doesn't get stuck on rubble"
         }
       ]
     },

diff --git a/QuestPaths/Endwalker/MSQ/K-6.4/4740_Lunar Rendezvous.json b/QuestPaths/Endwalker/MSQ/K-6.4/4740_Lunar Rendezvous.json
index 347b99f388e4147b8ec81015d84a4168e42f5a74..2ac6347c62f3d2c55bdd03b655c17d8b246fa734 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/K-6.4/4740_Lunar Rendezvous.json
+++ b/QuestPaths/Endwalker/MSQ/K-6.4/4740_Lunar Rendezvous.json
@@ -64,6 +64,7 @@
           "TerritoryId": 959,
           "InteractionType": "Interact",
           "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
+          "TargetTerritoryId": 959,
           "SkipIf": [
             "FlyingUnlocked"
           ]
@@ -194,8 +195,7 @@
             16
           ]
         }
-      ],
-      "Comment": "TODO Check Flags (32)"
+      ]
     },
     {
       "Sequence": 255,

diff --git a/QuestPaths/Endwalker/MSQ/K-6.4/4741_The Red Side of the Moon.json b/QuestPaths/Endwalker/MSQ/K-6.4/4741_The Red Side of the Moon.json
index d1d08aa6c0eb533d53a1b10d9007078cdd340b2c..ef00913d327766aa0a2e6309fa5d0676d7aa6af7 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/K-6.4/4741_The Red Side of the Moon.json
+++ b/QuestPaths/Endwalker/MSQ/K-6.4/4741_The Red Side of the Moon.json
@@ -12,6 +12,7 @@
             "Y": -49.589592,
             "Z": -618.46344
           },
+          "StopDistance": 7,
           "TerritoryId": 959,
           "InteractionType": "Interact"
         }

diff --git a/QuestPaths/Endwalker/MSQ/K-6.4/4743_The Dark Throne.json b/QuestPaths/Endwalker/MSQ/K-6.4/4743_The Dark Throne.json
index ae89437887b4ce2f3c7d9fc10d1ceb36fa93fb1c..eed27d89eee516b8d753e68ef9245608e6181e07 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/K-6.4/4743_The Dark Throne.json
+++ b/QuestPaths/Endwalker/MSQ/K-6.4/4743_The Dark Throne.json
@@ -31,6 +31,7 @@
           "TerritoryId": 959,
           "InteractionType": "Interact",
           "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
+          "TargetTerritoryId": 959,
           "SkipIf": [
             "FlyingUnlocked"
           ]

diff --git a/QuestPaths/Endwalker/MSQ/L-6.5/4745_Appealing the Masses.json b/QuestPaths/Endwalker/MSQ/L-6.5/4745_Appealing the Masses.json
index d45f6f2f8467256f369e9dd63b74c19c124b6ce0..ad01c0dfff9cc0886683eff06b7968e76759028c 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/L-6.5/4745_Appealing the Masses.json
+++ b/QuestPaths/Endwalker/MSQ/L-6.5/4745_Appealing the Masses.json
@@ -144,6 +144,7 @@
             "Y": 82.05,
             "Z": -5.661133
           },
+          "StopDistance": 7,
           "TerritoryId": 820,
           "InteractionType": "Interact"
         }

diff --git a/QuestPaths/Endwalker/MSQ/L-6.5/4746_In Defiance of Fate.json b/QuestPaths/Endwalker/MSQ/L-6.5/4746_In Defiance of Fate.json
index 2d0f4d99c793f581e0da2b2cc65c65fb05f3e142..eddfd321cb11ed29b767abfa6a247c4688543e70 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/L-6.5/4746_In Defiance of Fate.json
+++ b/QuestPaths/Endwalker/MSQ/L-6.5/4746_In Defiance of Fate.json
@@ -12,6 +12,7 @@
             "Y": 82.05,
             "Z": -5.661133
           },
+          "StopDistance": 7,
           "TerritoryId": 820,
           "InteractionType": "Interact"
         }

diff --git a/QuestPaths/Endwalker/MSQ/L-6.5/4747_Back to Action.json b/QuestPaths/Endwalker/MSQ/L-6.5/4747_Back to Action.json
index 39df81daa4e5a3d95d4e315f1d2797f843cafa3b..092c429eb8c88749e4b09612844b6d171956a5d6 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/L-6.5/4747_Back to Action.json
+++ b/QuestPaths/Endwalker/MSQ/L-6.5/4747_Back to Action.json
@@ -32,7 +32,8 @@
           "AethernetShortcut": [
             "[Crystarium] Aetheryte Plaza",
             "[Crystarium] The Dossal Gate"
-          ]
+          ],
+          "TargetTerritoryId": 844
         },
         {
           "DataId": 1033888,

diff --git a/QuestPaths/Endwalker/MSQ/M-6.55/4753_The Coming Dawn.json b/QuestPaths/Endwalker/MSQ/M-6.55/4753_The Coming Dawn.json
index 5d1dec8b876799f7a2c966fef059b0958ce9be05..dd348edfb23038a812fa82a65d145e7e9bd11c4c 100644 (file)
--- a/QuestPaths/Endwalker/MSQ/M-6.55/4753_The Coming Dawn.json
+++ b/QuestPaths/Endwalker/MSQ/M-6.55/4753_The Coming Dawn.json
@@ -14,7 +14,14 @@
           },
           "StopDistance": 5,
           "TerritoryId": 962,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMM103_04753_Q1_000_000",
+              "Answer": "TEXT_AKTKMM103_04753_A1_000_001"
+            }
+          ]
         }
       ]
     },

diff --git a/QuestPaths/Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json b/QuestPaths/Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json
index ab3cba3e2cc21a26804d6c548584f268a0fc102f..54015211fdcdbda427a643d0d57c4457c980f4d7 100644 (file)
--- a/QuestPaths/Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json
+++ b/QuestPaths/Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    884
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,

diff --git a/QuestPaths/Shadowbringers/MSQ/G-5.1/3682_Vows of Virtue, Deeds of Cruelty.json b/QuestPaths/Shadowbringers/MSQ/G-5.1/3682_Vows of Virtue, Deeds of Cruelty.json
index d2c46e2240bff213ae4a383a44ca53f7d3423ebe..a6a376446a5de0ab96527538d9bf8555049674ee 100644 (file)
--- a/QuestPaths/Shadowbringers/MSQ/G-5.1/3682_Vows of Virtue, Deeds of Cruelty.json
+++ b/QuestPaths/Shadowbringers/MSQ/G-5.1/3682_Vows of Virtue, Deeds of Cruelty.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    893
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,

diff --git a/QuestPaths/Shadowbringers/MSQ/H-5.2/3769_Beneath the Surface.json b/QuestPaths/Shadowbringers/MSQ/H-5.2/3769_Beneath the Surface.json
index 0f4dc39bab952bb902a4ade5d0af3ddd4a1f84d4..a2aa8d224f2bb3a86d233346770c55e8881bb49e 100644 (file)
--- a/QuestPaths/Shadowbringers/MSQ/H-5.2/3769_Beneath the Surface.json
+++ b/QuestPaths/Shadowbringers/MSQ/H-5.2/3769_Beneath the Surface.json
@@ -2,6 +2,9 @@
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
   "Comment": "TODO Missing quest end",
+  "TerritoryBlacklist": [
+    898
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,

diff --git a/QuestPaths/Shadowbringers/MSQ/I-5.3/3775_Faded Memories.json b/QuestPaths/Shadowbringers/MSQ/I-5.3/3775_Faded Memories.json
index f9aa5e012a8e2a2a9a831046c1c04c88edbf290a..b8dec55b4076a65c2b905f9fd7f9494c5369b9b1 100644 (file)
--- a/QuestPaths/Shadowbringers/MSQ/I-5.3/3775_Faded Memories.json
+++ b/QuestPaths/Shadowbringers/MSQ/I-5.3/3775_Faded Memories.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    932
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,

diff --git a/QuestPaths/Shadowbringers/MSQ/I-5.3/3777_The Converging Light.json b/QuestPaths/Shadowbringers/MSQ/I-5.3/3777_The Converging Light.json
index 1e3ca335610b589abc00c85b3fdd55be1039a619..158b93b3e449261bf46c285e5db9ece7d70f3f84 100644 (file)
--- a/QuestPaths/Shadowbringers/MSQ/I-5.3/3777_The Converging Light.json
+++ b/QuestPaths/Shadowbringers/MSQ/I-5.3/3777_The Converging Light.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    916
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,

diff --git a/QuestPaths/Shadowbringers/MSQ/I-5.3/3778_Hope's Confluence.json b/QuestPaths/Shadowbringers/MSQ/I-5.3/3778_Hope's Confluence.json
index 2b8055a385059be97495e14790f8360543cdec31..4cc3791bf1708b932c8d966e6e0f9d954a51122f 100644 (file)
--- a/QuestPaths/Shadowbringers/MSQ/I-5.3/3778_Hope's Confluence.json
+++ b/QuestPaths/Shadowbringers/MSQ/I-5.3/3778_Hope's Confluence.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    922
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,

diff --git a/QuestPaths/Shadowbringers/MSQ/J-5.4/4011_Like Master, Like Pupil.json b/QuestPaths/Shadowbringers/MSQ/J-5.4/4011_Like Master, Like Pupil.json
index cd78e3707e5fa8c6ee9c08665bd7cc928525a123..73e231d7685282ce668264b220cb70ea67ef55dc 100644 (file)
--- a/QuestPaths/Shadowbringers/MSQ/J-5.4/4011_Like Master, Like Pupil.json
+++ b/QuestPaths/Shadowbringers/MSQ/J-5.4/4011_Like Master, Like Pupil.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    933
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,

diff --git a/QuestPaths/Shadowbringers/MSQ/J-5.4/4015_The Great Ship Vylbrand.json b/QuestPaths/Shadowbringers/MSQ/J-5.4/4015_The Great Ship Vylbrand.json
index 73340762169115c2cf5660e1bcb77c1f69518696..f03429017d61d74cb30e4fc094ee5e34ebac3cd8 100644 (file)
--- a/QuestPaths/Shadowbringers/MSQ/J-5.4/4015_The Great Ship Vylbrand.json
+++ b/QuestPaths/Shadowbringers/MSQ/J-5.4/4015_The Great Ship Vylbrand.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    954
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,

diff --git a/QuestPaths/Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json b/QuestPaths/Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json
index 266b873217365e16f64002c2ba4e00c3e7bdb482..3ed6784fd2fc950e8e894789cb61af9f8ce3769e 100644 (file)
--- a/QuestPaths/Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json
+++ b/QuestPaths/Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    938
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,

diff --git a/QuestPaths/Shadowbringers/MSQ/L-5.55/4066_Death Unto Dawn.json b/QuestPaths/Shadowbringers/MSQ/L-5.55/4066_Death Unto Dawn.json
index 62c256897682cc7dee2bc2a99c4471e49d5daf6b..3244074e350aa4225563abf192a55235cc1decee 100644 (file)
--- a/QuestPaths/Shadowbringers/MSQ/L-5.55/4066_Death Unto Dawn.json
+++ b/QuestPaths/Shadowbringers/MSQ/L-5.55/4066_Death Unto Dawn.json
@@ -1,6 +1,9 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    977
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,

diff --git a/Questionable/Controller/MovementController.cs b/Questionable/Controller/MovementController.cs
index 839ac4531e29254708c41e7749bd9ceabc1c3599..0c58119dfe1c96931be59286b2c0627fd9de4832 100644 (file)
--- a/Questionable/Controller/MovementController.cs
+++ b/Questionable/Controller/MovementController.cs
@@ -11,6 +11,7 @@ using Dalamud.Game.ClientState.Objects.SubKinds;
 using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game;
+using FFXIVClientStructs.FFXIV.Client.Game.Control;
 using Questionable.External;
 using Questionable.Model;
 using Questionable.Model.V1;
@@ -159,7 +160,8 @@ internal sealed class MovementController : IDisposable
     {
         ResetPathfinding();
 
-        _gameFunctions.ExecuteCommand("/automove off");
+        if (InputManager.IsAutoRunning())
+            _gameFunctions.ExecuteCommand("/automove off");
 
         Destination = new DestinationData(dataId, to, stopDistance ?? (DefaultStopDistance - 0.2f), fly, sprint);
     }
@@ -207,6 +209,9 @@ internal sealed class MovementController : IDisposable
     {
         _navmeshIpc.Stop();
         ResetPathfinding();
+
+        if (InputManager.IsAutoRunning())
+            _gameFunctions.ExecuteCommand("/automove off");
     }
 
     public void Dispose()

diff --git a/Questionable/Controller/QuestController.cs b/Questionable/Controller/QuestController.cs
index 378dbd7c37e1496195eece39354733878ea72baa..9c9778586600fe618bd7a128ba308ebe20cded1a 100644 (file)
--- a/Questionable/Controller/QuestController.cs
+++ b/Questionable/Controller/QuestController.cs
@@ -29,7 +29,6 @@ internal sealed class QuestController
     private readonly ICondition _condition;
     private readonly IChatGui _chatGui;
     private readonly IFramework _framework;
-    private readonly IGameGui _gameGui;
     private readonly AetheryteData _aetheryteData;
     private readonly LifestreamIpc _lifestreamIpc;
     private readonly TerritoryData _territoryData;
@@ -37,8 +36,7 @@ internal sealed class QuestController
 
     public QuestController(DalamudPluginInterface pluginInterface, IDataManager dataManager, IClientState clientState,
         GameFunctions gameFunctions, MovementController movementController, IPluginLog pluginLog, ICondition condition,
-        IChatGui chatGui, IFramework framework, IGameGui gameGui, AetheryteData aetheryteData,
-        LifestreamIpc lifestreamIpc)
+        IChatGui chatGui, IFramework framework, AetheryteData aetheryteData, LifestreamIpc lifestreamIpc)
     {
         _pluginInterface = pluginInterface;
         _dataManager = dataManager;
@@ -49,7 +47,6 @@ internal sealed class QuestController
         _condition = condition;
         _chatGui = chatGui;
         _framework = framework;
-        _gameGui = gameGui;
         _aetheryteData = aetheryteData;
         _lifestreamIpc = lifestreamIpc;
         _territoryData = new TerritoryData(dataManager);
@@ -358,7 +355,7 @@ internal sealed class QuestController
 
         if (!step.SkipIf.Contains(ESkipCondition.Never))
         {
-            _pluginLog.Information("Checking skip conditions");
+            _pluginLog.Information($"Checking skip conditions; {string.Join(",", step.SkipIf)}");
 
             if (step.SkipIf.Contains(ESkipCondition.FlyingUnlocked) &&
                 _gameFunctions.IsFlyingUnlocked(step.TerritoryId))

diff --git a/Questionable/Questionable.csproj b/Questionable/Questionable.csproj
index 2188bd533bfd29e6dc0ce7cd18f8e71430b36c7d..e6bf8f84640c938f46ef07e3369768e5177fd5f8 100644 (file)
--- a/Questionable/Questionable.csproj
+++ b/Questionable/Questionable.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net8.0-windows</TargetFramework>
-        <Version>0.4</Version>
+        <Version>0.5</Version>
         <LangVersion>12</LangVersion>
         <Nullable>enable</Nullable>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

diff --git a/Questionable/QuestionablePlugin.cs b/Questionable/QuestionablePlugin.cs
index 56eeea992e24ee6a7b5d9409e67efcd80872669a..8ed248e5598fcd326e9ed3f9e684d8569726df28 100644 (file)
--- a/Questionable/QuestionablePlugin.cs
+++ b/Questionable/QuestionablePlugin.cs
@@ -56,7 +56,7 @@ public sealed class QuestionablePlugin : IDalamudPlugin
         _movementController =
             new MovementController(navmeshIpc, clientState, _gameFunctions, condition, pluginLog);
         _questController = new QuestController(pluginInterface, dataManager, _clientState, _gameFunctions,
-            _movementController, pluginLog, condition, chatGui, framework, gameGui, aetheryteData, lifestreamIpc);
+            _movementController, pluginLog, condition, chatGui, framework, aetheryteData, lifestreamIpc);
         _gameUiController =
             new GameUiController(addonLifecycle, dataManager, _gameFunctions, _questController, gameGui, pluginLog);