Mini-YA II v0.4
authorLiza Carvelli <liza@carvel.li>
Fri, 7 Jun 2024 21:21:58 +0000 (23:21 +0200)
committerLiza Carvelli <liza@carvel.li>
Fri, 7 Jun 2024 21:21:58 +0000 (23:21 +0200)
19 files changed:
QuestPaths/Endwalker/AetherCurrents/Garlemald/4498_In Pursuit of Power.json
QuestPaths/Endwalker/AetherCurrents/Thavnair/4489_Steppe Child.json
QuestPaths/Endwalker/MSQ/C-MareLamentorum/4401_A Harey Situation.json
QuestPaths/Endwalker/MSQ/C-MareLamentorum/4407_Heart of the Matter.json
QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4443_Wise Guides.json
QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4449_Her Children One and All.json
QuestPaths/Endwalker/MSQ/G-UltimaThule/4450_A Bold Decision.json
QuestPaths/Endwalker/MSQ/G-UltimaThule/4451_Friends Gathered.json
QuestPaths/Endwalker/MSQ/G-UltimaThule/4452_Unto the Heavens.json
QuestPaths/Endwalker/MSQ/G-UltimaThule/4453_A Strange New World.json
QuestPaths/Endwalker/MSQ/G-UltimaThule/4459_Victory x Lost.json
QuestPaths/Endwalker/MSQ/G-UltimaThule/4460_x.json
QuestPaths/Endwalker/MSQ/G-UltimaThule/4462_Forge Ahead.json
QuestPaths/Endwalker/MSQ/G-UltimaThule/4463_Youre Not Alone.json
QuestPaths/Endwalker/MSQ/G-UltimaThule/4464_Endwalker.json
QuestPaths/Endwalker/MSQ/H-6.1/4527_Bountiful Ruins.json
QuestPaths/Endwalker/MSQ/H-6.1/4528_Friends for the Road.json
Questionable/Controller/QuestController.cs
Questionable/Questionable.csproj

index 71567a97a479c487ea838db6c37a237140be4f8b..629a0c69fa267678923c655b8a0847d0a539f8ee 100644 (file)
           },
           "TerritoryId": 958,
           "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ],
           "$.0": "[1]",
           "$.1": "QuestVariables if done first: 16 1 0 0 0 128"
         },
           },
           "TerritoryId": 958,
           "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ],
           "$.0": "[2]",
           "$.1": "QuestVariables if done first: 16 16 0 0 0 32",
           "$.2": "QuestVariables if done after [1]: 32 17 0 0 0 160"
           },
           "TerritoryId": 958,
           "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ],
           "$.0": "[3]",
           "$.1": "QuestVariables if done first: 17 0 0 0 0 64"
         }
index 87571b01407bed8545a643d591747520189f1ca0..258210c2f5baaed0956d34b69ed7441fd6091a46 100644 (file)
             "Z": 727.7484
           },
           "TerritoryId": 957,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKZA201_04489_Q1_000_004",
+              "Answer": "TEXT_AKTKZA201_04489_A1_000_002"
+            }
+          ],
+          "Comment": "TODO I don't think dialogue choices as part of accepting a quest are handled yet"
         }
       ]
     },
index edaf5084fecb4a7d53876903ddd6527b08e4c634..fec7609da88ddd4491a8231f76351492f64b6e8b 100644 (file)
@@ -1,7 +1,6 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
-  "Comment": "TODO add aether current (2818368) here since it can't be reached later with mount speed 0",
   "QuestSequence": [
     {
       "Sequence": 0,
       "Steps": [
         {
           "Position": {
-            "X": 1.131261,
-            "Y": -114.92335,
-            "Z": -418.2727
+            "X": 11.922524,
+            "Y": -105.8306,
+            "Z": -397.17743
           },
           "TerritoryId": 959,
           "InteractionType": "WalkTo",
           "Mount": true,
           "DisableNavmesh": true
         },
+        {
+          "Position": {
+            "X": 30.28816,
+            "Y": -133.50012,
+            "Z": -394.98798
+          },
+          "StopDistance": 5,
+          "TerritoryId": 959,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true
+        },
+        {
+          "DataId": 2012019,
+          "Position": {
+            "X": 21.7081,
+            "Y": -133.5001,
+            "Z": -385.7313
+          },
+          "TerritoryId": 959,
+          "InteractionType": "AttuneAetherCurrent",
+          "AetherCurrentId": 2818368
+        },
+        {
+          "DataId": 2012019,
+          "Position": {
+            "X": 23.67959,
+            "Y": -133.50012,
+            "Z": -399.96643
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 959,
+          "InteractionType": "Jump",
+          "JumpDestination": {
+            "Position": {
+              "X": 22.27572,
+              "Y": -137,
+              "Z": -416.6249
+            },
+            "StopDistance": 5
+          }
+        },
         {
           "DataId": 1038897,
           "Position": {
index a417052bf3293e17fa84c3a4bdbd9dc266b6e33e..68f939f2b8df35c748548611212499dc74ce1eec 100644 (file)
           "TerritoryId": 959,
           "InteractionType": "Interact",
           "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
-          "TargetTerritoryId": 959,
-          "SkipIf": [
-            "Never"
-          ]
+          "TargetTerritoryId": 959
         },
         {
           "Position": {
index 05ca4eb275eb36cf7e38d3a6af7ee65d2fb3ab81..be9b1f19bd6970cce65b1f8d94386c8c9345ccb0 100644 (file)
           },
           "TerritoryId": 956,
           "InteractionType": "Interact",
-          "TargetTerritoryId": 956,
-          "SkipIf": [
-            "Never"
-          ]
+          "TargetTerritoryId": 956
         },
         {
           "DataId": 1040397,
index 977c31288a1369e18fea3e97b51ce0ad5a39c398..8b8f0e25ef6920d8f0433ba68bfb3724d672a069 100644 (file)
@@ -1,6 +1,10 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
+  "TerritoryBlacklist": [
+    978,
+    995
+  ],
   "QuestSequence": [
     {
       "Sequence": 0,
           "AethernetShortcut": [
             "[Old Sharlayan] The Rostra",
             "[Old Sharlayan] The Baldesion Annex"
+          ],
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMF111_04449_Q4_000_344",
+              "Yes": true
+            }
           ]
         }
       ]
index d8f649c224fbb056c8d0131e31bd9d9e1a4cf046..053be914057a130cc29e74293f78df03179cb8ec 100644 (file)
             "Z": -62.485718
           },
           "TerritoryId": 962,
-          "InteractionType": "WaitForManualProgress",
-          "Comment": "Talk (2, 2, 2, N/A, 2)"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMG101_04450_Q2_000_221",
+              "Yes": true
+            },
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMG101_04450_Q3_000_240",
+              "Answer": "TEXT_AKTKMG101_04450_A3_000_241"
+            },
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMG101_04450_Q4_000_256",
+              "Answer": "TEXT_AKTKMG101_04450_A4_000_258"
+            },
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMG101_04450_Q5_000_276",
+              "Answer": "TEXT_AKTKMG101_04450_A5_000_278"
+            },
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMG101_04450_Q6_000_298",
+              "Answer": "TEXT_AKTKMG101_04450_A6_000_300"
+            },
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMG101_04450_Q7_000_305",
+              "Answer": "TEXT_AKTKMG101_04450_A7_000_307"
+            }
+          ]
         }
       ]
     },
index 2318361a5cd74c9f3e9fd1399643eb71684e14b5..5d7d5ad4a735750063f8cc9563c4a76fb37e9daa 100644 (file)
           "AethernetShortcut": [
             "[Old Sharlayan] The Leveilleur Estate",
             "[Old Sharlayan] The Baldesion Annex"
+          ],
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMG102_04451_Q1_000_143",
+              "Yes": true
+            }
           ]
         }
       ]
index 68e7201aede5296da6d388f5cd93959293154d9a..dfe0571cb731865ddc3b3c91aeaab0af6cfe603f 100644 (file)
@@ -33,7 +33,8 @@
           "AetheryteShortcut": "Labyrinthos - Aporia",
           "SkipIf": [
             "FlyingUnlocked"
-          ]
+          ],
+          "TargetTerritoryId": 956
         },
         {
           "DataId": 1039827,
             "Z": 311.9402
           },
           "TerritoryId": 956,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMG103_04452_Q1_000_183",
+              "Yes": true
+            }
+          ]
         }
       ]
     },
index bfadff4d96892590c48829fa43ff4ba9f82ee546..bed1e8d5547b5b9b1a40472fb41bec2a9b26c592 100644 (file)
           },
           "TerritoryId": 960,
           "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ],
           "$.0": "[1]",
           "$.1": "QuestVariables if done first: 16 1 0 0 0 128"
         },
           },
           "TerritoryId": 960,
           "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ],
           "$.0": "[2]",
           "$.1": "QuestVariables if done after [1]: 33 1 0 0 0 192"
         },
           },
           "TerritoryId": 960,
           "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ],
           "$.0": "[3]",
           "$.2": "QuestVariables if done first: 16 16 0 0 0 32"
         }
index 99b7938bb27270f55c6dec30731647c0c45390ef..7f563d33a6a13ee362093616f60b6d5eba9c0ae7 100644 (file)
             "Z": -319.50867
           },
           "TerritoryId": 960,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMG110_04459_Q1_000_041",
+              "Yes": true
+            }
+          ]
         },
         {
           "DataId": 2012286,
             "Z": 329.76257
           },
           "TerritoryId": 960,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         },
         {
           "DataId": 1038041,
             "Z": 345.44885
           },
           "TerritoryId": 960,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
         },
         {
           "DataId": 1038045,
             "Z": 347.64624
           },
           "TerritoryId": 960,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         }
       ]
     },
index 58b807186202ac91a50c8385a14604b3c6be7447..b320abf47d6bd184796e80ea50807082091ecaab 100644 (file)
             "Z": 241.77905
           },
           "TerritoryId": 960,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMG111_04460_Q1_000_135",
+              "Yes": true
+            }
+          ]
         },
         {
           "DataId": 1041157,
index 1681f9f124f7c3986f34e4f7829e533817a02120..6228801fa93739426a08dafef0a93a9cf8b2a471 100644 (file)
             "Z": 365.43823
           },
           "TerritoryId": 960,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMG113_04462_Q1_000_040",
+              "Yes": true
+            }
+          ]
         },
         {
           "DataId": 1041165,
index e30ef3b5ee868398c4ec9f3a962237a0c932cbc5..f831cdecf773fdf571f0537093afd6be1191124b 100644 (file)
             null,
             128
           ],
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMG114_04463_Q1_000_031",
+              "Answer": "TEXT_AKTKMG114_04463_A1_000_033"
+            }
+          ],
           "$.0": "[1]",
           "$.1": "QuestVariables if done first: 16 0 0 16 0 128"
         },
             null,
             64
           ],
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMG114_04463_Q2_000_061",
+              "Answer": "TEXT_AKTKMG114_04463_A2_000_063"
+            }
+          ],
           "$.0": "[6]",
           "$.1": "QuestVariables if done first: 16 0 1 0 0 64"
         }
index 9ce295c143aab20519ef41badc00f5ca24c3accd..ec74cea0cd6bb1b821e4e56a7421c4c715e2099f 100644 (file)
@@ -2,7 +2,9 @@
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
   "TerritoryBlacklist": [
-    973
+    973,
+    997,
+    1013
   ],
   "QuestSequence": [
     {
             "Z": -7.1870728
           },
           "TerritoryId": 351,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMG115_04464_Q13_000_391",
+              "Yes": true
+            }
+          ]
         }
       ]
     }
index cc0b7cc52b509f0592f68e6ef0c4d7db7b0e1171..4ea14ed276493754d980ba4782963bbed344020b 100644 (file)
             "Z": -225.42157
           },
           "TerritoryId": 963,
-          "InteractionType": "WaitForManualProgress",
-          "Comment": "Talk (1, 1, 1, 2)"
+          "InteractionType": "Interact",
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_AKTKMH102_04527_Q9_100_111",
+              "Yes": true
+            },
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMH102_04527_Q1_000_000",
+              "Answer": "TEXT_AKTKMH102_04527_A1_000_001"
+            },
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMH102_04527_Q2_000_000",
+              "Answer": "TEXT_AKTKMH102_04527_A2_000_001"
+            },
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMH102_04527_Q3_000_000",
+              "Answer": "TEXT_AKTKMH102_04527_A3_000_001"
+            },
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMH102_04527_Q4_000_000",
+              "Answer": "TEXT_AKTKMH102_04527_A4_000_001"
+            },
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKMH102_04527_Q5_000_000",
+              "Answer": "TEXT_AKTKMH102_04527_A5_000_002"
+            }
+          ]
         }
       ]
     },
index 1d8d4e3241692857b85628748ef3658639378e70..a75cdbb59f0e5291fe5a4d29684ac7a84b7269f9 100644 (file)
@@ -79,6 +79,7 @@
           "TerritoryId": 956,
           "InteractionType": "Interact",
           "AetheryteShortcut": "Labyrinthos - Aporia",
+          "TargetTerritoryId": 956,
           "SkipIf": [
             "FlyingUnlocked"
           ]
index 07d45f4252305607408e7f78cdcf036ab77359c7..378dbd7c37e1496195eece39354733878ea72baa 100644 (file)
@@ -444,7 +444,7 @@ internal sealed class QuestController
                     $"Aethernet shortcut not unlocked (from: {step.AethernetShortcut.From}, to: {step.AethernetShortcut.To}), walking manually");
         }
 
-        if (step.TargetTerritoryId == _clientState.TerritoryType && !step.SkipIf.Contains(ESkipCondition.Never))
+        if (step.TargetTerritoryId.HasValue && step.TerritoryId != step.TargetTerritoryId && step.TargetTerritoryId == _clientState.TerritoryType)
         {
             // we assume whatever e.g. interaction, walkto etc. we have will trigger the zone transition
             _pluginLog.Information("Zone transition, skipping rest of step");
index 1bc72708ef799817226afacb1423b408281bd513..2188bd533bfd29e6dc0ce7cd18f8e71430b36c7d 100644 (file)
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net8.0-windows</TargetFramework>
-        <Version>0.3</Version>
+        <Version>0.4</Version>
         <LangVersion>12</LangVersion>
         <Nullable>enable</Nullable>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>