Update 67 - post-SB paths/include aehter currents v2.20
authorLiza Carvelli <liza@carvel.li>
Wed, 4 Sep 2024 10:05:17 +0000 (12:05 +0200)
committerLiza Carvelli <liza@carvel.li>
Wed, 4 Sep 2024 10:05:17 +0000 (12:05 +0200)
22 files changed:
Directory.Build.targets
QuestPaths/4.x - Stormblood/Aether Currents/The Fringes/2821_Eyes Bigger than Her Stomach.json
QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2881_If I Were a Fish.json
QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2842_Out of Sight.json
QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2524_The Die Is Cast.json
QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2525_The World Turned Upside Down.json
QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2526_A Swift and Secret Departure.json
QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2530_Rising Fortunes, Rising Spirits.json
QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2531_The Lure of the Dream.json
QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2532_The Lady of Bliss.json
QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2542_With Tired Hands We Toil.json
QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2549_The Key to Victory.json
QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2550_The Resonant.json
QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2552_The Measure of His Reach.json
QuestPaths/4.x - Stormblood/MSQ/B-4.1/2964_The Mad King's Trove.json
QuestPaths/4.x - Stormblood/MSQ/B-4.1/2971_A Blissful Arrival.json
QuestPaths/4.x - Stormblood/MSQ/C-4.2/3023_The Sword in the Store.json
QuestPaths/4.x - Stormblood/MSQ/C-4.2/3027_His Forgotten Home.json
QuestPaths/4.x - Stormblood/MSQ/C-4.2/3028_A Guilty Conscience.json
QuestPaths/4.x - Stormblood/MSQ/C-4.2/3029_Rise of a New Sun.json
QuestPaths/4.x - Stormblood/MSQ/H-4.55/3185_A Requiem for Heroes.json
Questionable/Windows/UiUtils.cs

index c6651601896a7016e9652c8cc30933daebd1d548..b6de8ec4f77fcbae798cc7589fdd13340285f7ac 100644 (file)
@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <Version>2.19</Version>
+        <Version>2.20</Version>
     </PropertyGroup>
 </Project>
index 2eac6e18a640cec82dd7edd55b2237678ec4b83e..b1c257276ad03d2f9b9219a76a649de05e977dcb 100644 (file)
@@ -28,9 +28,9 @@
       "Steps": [
         {
           "Position": {
-            "X": 370.87048,
-            "Y": 73.22009,
-            "Z": 118.791504
+            "X": 385.1642,
+            "Y": 74.01643,
+            "Z": 135.44316
           },
           "TerritoryId": 612,
           "InteractionType": "WaitForManualProgress",
@@ -55,4 +55,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 3cf36eae9d647f06b82722143db9222c4837c79b..bf7b8e8509a299244889294412c104d59bbc6f3a 100644 (file)
@@ -76,7 +76,8 @@
           "TerritoryId": 621,
           "InteractionType": "WalkTo",
           "DisableNavmesh": true,
-          "Mount": true
+          "Mount": true,
+          "RestartNavigationIfCancelled": false
         },
         {
           "DataId": 1023174,
index 7599354ff69bdbb4c0d6906ade6a969af8873057..2874d2b3582e4185552eea0ed2558568b5ca641b 100644 (file)
@@ -48,7 +48,8 @@
             "Z": 786.1918
           },
           "TerritoryId": 620,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "Mount": true
         },
         {
           "DataId": 1023259,
index f99aa383434a4e23b84f425febfcbc0da59ca7d2..2811433e505e4efb6fcdce8ac0e05641ea2e9579 100644 (file)
     {
       "Sequence": 3,
       "Steps": [
+        {
+          "Position": {
+            "X": -364.42896,
+            "Y": 1.2300289,
+            "Z": -363.52563
+          },
+          "TerritoryId": 614,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
         {
           "DataId": 1020247,
           "Position": {
             "Z": -362.5086
           },
           "TerritoryId": 614,
-          "InteractionType": "Interact",
-          "Fly": true
+          "InteractionType": "Interact"
         }
       ]
     },
index 55f2b8ebf1a8ffc8116e534870828197613bc365..aeb5fba9995051aed49a677364cbc31e5780f392 100644 (file)
             "Y": -7.0001082,
             "Z": 53.81848
           },
-          "StopDistance": 7,
+          "StopDistance": 4,
           "TerritoryId": 628,
           "InteractionType": "CompleteQuest"
         }
index 1312ff5b9ea907bcc734a49bd446614c8c757cd8..c6d579758fdfe7862b93ef508139ba4b4e8ae2f9 100644 (file)
@@ -31,8 +31,9 @@
           "TerritoryId": 628,
           "InteractionType": "Interact",
           "TargetTerritoryId": 639,
+          "AetheryteShortcut": "Kugane",
           "AethernetShortcut": [
-            "[Kugane] Kogane Dori Markets",
+            "[Kugane] Aetheryte Plaza",
             "[Kugane] The Ruby Bazaar"
           ]
         }
index 0315248c76163fffd78635d94d86772e7de31474..ff60e8f064238282b66d2e599eda6581a97357b5 100644 (file)
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "TerritoryId": 612,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "Fringes - Peering Stones"
+        },
         {
           "DataId": 1020578,
           "Position": {
index 9fa4d564a9e718a66fab20225d539bd270fe197d..1ff762319ca6e5c3e086d31a0fd3ffe47e771323 100644 (file)
       "Sequence": 1,
       "Steps": [
         {
+          "DataId": 1020807,
+          "Position": {
+            "X": 433.9818,
+            "Y": 114.48304,
+            "Z": 233.29517
+          },
           "TerritoryId": 612,
-          "InteractionType": "AttuneAetheryte",
-          "Aetheryte": "Fringes - Peering Stones"
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2821
         },
         {
           "DataId": 2007971,
@@ -44,7 +50,8 @@
           },
           "TerritoryId": 612,
           "InteractionType": "WalkTo",
-          "DisableNavmesh": true
+          "DisableNavmesh": true,
+          "Mount": true
         },
         {
           "DataId": 1020817,
index ef161cde34184e9b90c48c10d3ee5ab034deef68..ccc351dfac4d6f451fbe24f4295e6f7497a692b3 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1020821,
+          "Position": {
+            "X": 276.7223,
+            "Y": 76.853935,
+            "Z": -23.51416
+          },
+          "TerritoryId": 612,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2816
+        },
         {
           "DataId": 1020589,
           "Position": {
index 451ae480f3f400e371859751f26e4086a04f8e7d..25b70b6a1428ea9ef1a25dce42843804bce1b08e 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1020873,
+          "Position": {
+            "X": -327.96222,
+            "Y": 258.90652,
+            "Z": 757.3815
+          },
+          "TerritoryId": 620,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2842
+        },
         {
           "DataId": 2009008,
           "Position": {
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 659248b9f3e37ab5bf5f74b004cd1c9b7543692f..426b491ed7d1d0a68aa0108278732633b5a8f29e 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "Position": {
+            "X": -791.2012,
+            "Y": 46.3994,
+            "Z": -15.904689
+          },
+          "TerritoryId": 621,
+          "InteractionType": "WalkTo",
+          "TargetTerritoryId": 620,
+          "SkipConditions": {
+            "StepIf": {
+              "InTerritory": [
+                620
+              ],
+              "QuestsCompleted": [
+                2860
+              ]
+            }
+          }
+        },
+        {
+          "DataId": 1023167,
+          "Position": {
+            "X": 313.28296,
+            "Y": 324.51355,
+            "Z": 362.4475
+          },
+          "TerritoryId": 620,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2851
+        },
+        {
+          "DataId": 1020893,
+          "Position": {
+            "X": 283.77197,
+            "Y": 322.87146,
+            "Z": 752.34607
+          },
+          "TerritoryId": 620,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2860
+        },
         {
           "DataId": 1021705,
           "Position": {
@@ -35,7 +77,8 @@
           },
           "StopDistance": 7,
           "TerritoryId": 621,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "AetheryteShortcut": "Lochs - Porta Praetoria"
         }
       ]
     },
@@ -49,6 +92,7 @@
             "Y": 45.410225,
             "Z": 766.47595
           },
+          "StopDistance": 5,
           "TerritoryId": 621,
           "InteractionType": "CompleteQuest"
         }
index fe1034c1be8a30a6a8d0670b0f2ac77f059a6ea9..ccda8a09189c7d46111f90357fc2d95d52554231 100644 (file)
@@ -12,6 +12,7 @@
             "Y": 45.410225,
             "Z": 766.47595
           },
+          "StopDistance": 5,
           "TerritoryId": 621,
           "InteractionType": "AcceptQuest"
         }
           },
           "TerritoryId": 621,
           "InteractionType": "WalkTo",
-          "StopDistance": 0.25
+          "StopDistance": 0.25,
+          "RestartNavigationIfCancelled": false
         },
         {
           "Position": {
index edb33ea0bf1950a9d60700ec943e7e5349a565e0..5c01d821106865a1facf2530222667daab5bc3c7 100644 (file)
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1022987,
+          "Position": {
+            "X": -662.13477,
+            "Y": 49.999794,
+            "Z": -48.874695
+          },
+          "TerritoryId": 621,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2881
+        },
+        {
+          "DataId": 1022992,
+          "Position": {
+            "X": -506.6148,
+            "Y": 8.7,
+            "Z": -40.299072
+          },
+          "TerritoryId": 621,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2877
+        },
+        {
+          "DataId": 1022990,
+          "Position": {
+            "X": -524.58997,
+            "Y": 8.688546,
+            "Z": -19.424805
+          },
+          "TerritoryId": 621,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2880
+        },
+        {
+          "DataId": 1022991,
+          "Position": {
+            "X": -539.6353,
+            "Y": 7.6119823,
+            "Z": 52.140015
+          },
+          "TerritoryId": 621,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2883
+        },
         {
           "DataId": 2007993,
           "Position": {
       ]
     }
   ]
-}
\ No newline at end of file
+}
index 6f3c9c7fe6fd18a382b0a2202d26bcbe26a8a0f3..d23fe19c2827189e530e513df9bee80dde49f55e 100644 (file)
     {\r
       "Sequence": 1,\r
       "Steps": [\r
+        {\r
+          "DataId": 1023048,\r
+          "Position": {\r
+            "X": 497.76453,\r
+            "Y": 69.99941,\r
+            "Z": 583.7339\r
+          },\r
+          "TerritoryId": 621,\r
+          "InteractionType": "Interact",\r
+          "TargetTerritoryId": 621,\r
+          "Fly": true\r
+        },\r
         {\r
           "DataId": 1024134,\r
           "Position": {\r
             "Y": 70,\r
             "Z": 576.0128\r
           },\r
-          "StopDistance": 5,\r
+          "StopDistance": 6,\r
           "TerritoryId": 621,\r
           "InteractionType": "CompleteQuest"\r
         }\r
index 1241d40fa14c8762bd2ebec5cd8f6a993d77e19f..ad3f298d5cbe723774b8b61e2336b660ea2819b3 100644 (file)
@@ -29,7 +29,8 @@
           },\r
           "TerritoryId": 621,\r
           "InteractionType": "WalkTo",\r
-          "Fly": true\r
+          "Fly": true,\r
+          "AetheryteShortcut": "Lochs - Ala Mhigan Quarter"\r
         },\r
         {\r
           "DataId": 2009047,\r
@@ -40,8 +41,7 @@
           },\r
           "StopDistance": 4,\r
           "TerritoryId": 621,\r
-          "InteractionType": "Interact",\r
-          "AetheryteShortcut": "Lochs - Ala Mhigan Quarter"\r
+          "InteractionType": "Interact"\r
         }\r
       ]\r
     },\r
     {\r
       "Sequence": 255,\r
       "Steps": [\r
+        {\r
+          "DataId": 1023048,\r
+          "Position": {\r
+            "X": 497.76453,\r
+            "Y": 69.99941,\r
+            "Z": 583.7339\r
+          },\r
+          "TerritoryId": 621,\r
+          "InteractionType": "Interact",\r
+          "TargetTerritoryId": 621,\r
+          "SkipConditions": {\r
+            "StepIf": {\r
+              "Flying": "Unlocked"\r
+            }\r
+          }\r
+        },\r
         {\r
           "DataId": 1024057,\r
           "Position": {\r
index 125abad66ecfbe49e80c61860fa9c56d3dcfc571..e71bf895ac322e61e7b63a21195d9d51e0ff91fb 100644 (file)
@@ -12,7 +12,7 @@
             "Y": 10.503965,\r
             "Z": -213.76367\r
           },\r
-          "StopDistance": 4,\r
+          "StopDistance": 5,\r
           "TerritoryId": 628,\r
           "InteractionType": "AcceptQuest",\r
           "AetheryteShortcut": "Kugane",\r
index 5e94b93a0b3ded25d2389bbde2b0cefaf20f837a..480b6717f941937be89324fea36ba23a08f56d4f 100644 (file)
     {\r
       "Sequence": 3,\r
       "Steps": [\r
+        {\r
+          "Position": {\r
+            "X": -347.07507,\r
+            "Y": 1.2300062,\r
+            "Z": -345.90344\r
+          },\r
+          "TerritoryId": 614,\r
+          "InteractionType": "WalkTo",\r
+          "Fly": true\r
+        },\r
         {\r
           "DataId": 1024986,\r
           "Position": {\r
@@ -67,8 +77,7 @@
             "Z": -344.13672\r
           },\r
           "TerritoryId": 614,\r
-          "InteractionType": "SinglePlayerDuty",\r
-          "Fly": true\r
+          "InteractionType": "SinglePlayerDuty"\r
         }\r
       ]\r
     },\r
             "Y": 17.720512,\r
             "Z": 301.59448\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 614,\r
           "InteractionType": "CompleteQuest"\r
         }\r
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r
index b99143fcf2199384d82cdea849854fea0fa56f66..ae2caa3b6a08e508d3be61a759c5c15e82857b59 100644 (file)
@@ -12,6 +12,7 @@
             "Y": 17.720512,\r
             "Z": 301.59448\r
           },\r
+          "StopDistance": 5,\r
           "TerritoryId": 614,\r
           "InteractionType": "AcceptQuest"\r
         }\r
@@ -67,4 +68,4 @@
       ]\r
     }\r
   ]\r
-}
\ No newline at end of file
+}\r
index e7a12a1619d1d4b2d2f0e933dc1be1cb7d858c0c..1a3edd6556c40a8b6127359e6b40d309367767ed 100644 (file)
             "Z": -2.7619019\r
           },\r
           "TerritoryId": 744,\r
-          "InteractionType": "AcceptQuest"\r
+          "InteractionType": "AcceptQuest",\r
+          "DelaySecondsAtStart": 3,\r
+          "StopDistance": 1,\r
+          "$": "This may skip movement as the game thinks we're close enough at the start; unsure if delay helps"\r
         }\r
       ]\r
     },\r
index 87faa68af561c2c055de4cd491c9bf3e306b20f5..fdb4747b5d46fe8f56a01c0975ce46521fe6293a 100644 (file)
@@ -34,6 +34,7 @@
           "StopDistance": 7,
           "TerritoryId": 621,
           "InteractionType": "Interact",
+          "TargetTerritoryId": 829,
           "DialogueChoices": [
             {
               "Type": "YesNo",
index 4e1fb9c3acce77e143c680ef8f52470a5eeb6dc4..e0155816c17f4c91620519533bcc77b05876f846 100644 (file)
@@ -56,6 +56,7 @@ internal sealed class UiUtils
         if (extraPadding > 0)
             ImGui.SetCursorPosX(ImGui.GetCursorPosX() + extraPadding);
         ImGui.TextUnformatted(text);
+        hover |= ImGui.IsItemHovered();
         return hover;
     }