From b8dc5fa8e3b3c4b6cec842c1ef26a8bf4b1f7acf Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 15 Aug 2024 02:09:01 +0200 Subject: [PATCH] Minor cleanup for SB part 2 --- Directory.Build.targets | 2 +- .../The Azim Steppe/2771_Sheep Snatcher.json | 5 +- .../2791_Mauci of the Seven Worries.json | 41 ++++- .../The Lochs/2880_A Rite to Rest.json | 20 ++- .../The Lochs/2881_If I Were a Fish.json | 45 ++--- .../The Peaks/2842_Out of Sight.json | 41 ++++- .../The Peaks/2851_A Hunger for Trade.json | 50 +++++- .../The Peaks/2860_Closing Up Shop.json | 71 +++++++- .../2500_The Search for Lord Hien.json | 53 +++++- .../A4-Azim Steppe/2501_A Season for War.json | 24 ++- .../2504_A Warrior's Welcome.json | 64 ++++++-- .../2505_The Heart of Nations.json | 42 ++++- .../2509_The Labors of Magnai.json | 109 ++++++++++--- .../2510_For Love of the Moon.json | 46 +++++- .../2511_Sworn Enemies of the Sun.json | 13 +- .../A4-Azim Steppe/2512_The Undying Ones.json | 33 +++- .../MSQ/A4-Azim Steppe/2515_Naadam.json | 42 ++++- .../2516_Glory to the Khagan.json | 7 +- .../2517_In Crimson They Walked.json | 3 +- .../A5-Yanxia 2/2520_Seeds of Despair.json | 23 ++- .../MSQ/A5-Yanxia 2/2522_The Doma Within.json | 39 ++++- .../2523_On the Eve of Destiny.json | 32 +++- .../MSQ/A5-Yanxia 2/2524_The Die Is Cast.json | 25 ++- .../2525_The World Turned Upside Down.json | 4 +- .../2526_A Swift and Secret Departure.json | 3 +- .../2947_Broken Steel, Broken Men.json | 154 +++++++++++++++--- .../2527_While You Were Away.json | 3 +- .../A6.1-Fringes 2/2528_Rhalgr's Beacon.json | 33 +++- .../2529_The Fortunes of War.json | 21 ++- .../2530_Rising Fortunes, Rising Spirits.json | 3 +- .../2531_The Lure of the Dream.json | 3 +- .../2532_The Lady of Bliss.json | 4 +- .../2533_The Silence of the Gods.json | 3 +- .../2534_The First of Many.json | 16 +- .../MSQ/A6.2-Peaks 2/2536_Hells Open.json | 18 +- .../MSQ/A6.2-Peaks 2/2537_Heavens Weep.json | 32 +++- .../MSQ/A6.2-Peaks 2/2538_The Road Home.json | 32 +++- .../2539_For the Living and the Dead.json | 17 +- .../2540_Above the Churning Waters.json | 4 +- .../A6.2-Peaks 2/2541_The Path Forward.json | 18 +- .../2544_The Price of Freedom.json | 4 +- .../A6.2-Peaks 2/2546_Liberty or Death.json | 4 +- .../A6.2-Peaks 2/2547_The Lady in Red.json | 3 +- .../2548_Upon the Great Loch's Shore.json | 17 +- .../MSQ/A7-Lochs/2549_The Key to Victory.json | 3 +- .../MSQ/A7-Lochs/2550_The Resonant.json | 22 ++- .../2551_The Legacy of Our Fathers.json | 46 +++++- .../MSQ/A7-Lochs/2553_Stormblood.json | 55 ++++++- QuestPaths/quest-v1.json | 3 +- .../Questing/Converter/EmoteConverter.cs | 1 + Questionable.Model/Questing/EEmote.cs | 1 + Questionable/Controller/CombatController.cs | 2 +- 52 files changed, 1140 insertions(+), 219 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 61c30fda4..0696c5f87 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,5 @@ - 2.8 + 2.9 diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/The Azim Steppe/2771_Sheep Snatcher.json b/QuestPaths/4.x - Stormblood/Aether Currents/The Azim Steppe/2771_Sheep Snatcher.json index beffe6624..923643c0d 100644 --- a/QuestPaths/4.x - Stormblood/Aether Currents/The Azim Steppe/2771_Sheep Snatcher.json +++ b/QuestPaths/4.x - Stormblood/Aether Currents/The Azim Steppe/2771_Sheep Snatcher.json @@ -28,7 +28,8 @@ "Z": -210.22363 }, "TerritoryId": 622, - "InteractionType": "Interact" + "InteractionType": "WaitForManualProgress", + "Comment": "Snipe sheep" } ] }, @@ -63,4 +64,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/The Azim Steppe/2791_Mauci of the Seven Worries.json b/QuestPaths/4.x - Stormblood/Aether Currents/The Azim Steppe/2791_Mauci of the Seven Worries.json index 31976ce69..ab9488a5f 100644 --- a/QuestPaths/4.x - Stormblood/Aether Currents/The Azim Steppe/2791_Mauci of the Seven Worries.json +++ b/QuestPaths/4.x - Stormblood/Aether Currents/The Azim Steppe/2791_Mauci of the Seven Worries.json @@ -29,7 +29,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128" + "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1022222, @@ -40,7 +48,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "QW: 1 0 0 0 0 128 -> QW: 2 0 0 0 0 192" + "$": "QW: 1 0 0 0 0 128 -> QW: 2 0 0 0 0 192", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1022228, @@ -50,7 +66,15 @@ "Z": 573.4187 }, "TerritoryId": 622, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] } ] }, @@ -65,9 +89,16 @@ "Z": 650.01904 }, "TerritoryId": 622, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_STMBDZ613_02791_Q1_000_000", + "Answer": "TEXT_STMBDZ613_02791_A1_000_002" + } + ] } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2880_A Rite to Rest.json b/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2880_A Rite to Rest.json index c5fc35f60..e1395d29d 100644 --- a/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2880_A Rite to Rest.json +++ b/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2880_A Rite to Rest.json @@ -26,6 +26,24 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": -64.335396, + "Y": -0.3, + "Z": -341.21475 + }, + "TerritoryId": 621, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": 2.4417508, + "Y": 0.14104319, + "Z": -387.06744 + }, + "TerritoryId": 621, + "InteractionType": "WalkTo" + }, { "Position": { "X": -89.3111, @@ -61,4 +79,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2881_If I Were a Fish.json b/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2881_If I Were a Fish.json index e734a048c..3cf36eae9 100644 --- a/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2881_If I Were a Fish.json +++ b/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2881_If I Were a Fish.json @@ -43,19 +43,11 @@ "Steps": [ { "Position": { - "X": -42.96752, - "Y": 0.06842625, - "Z": -240.69255 - }, - "TerritoryId": 621, - "InteractionType": "WalkTo" - }, - { - "Position": { - "X": -62.360443, + "X": -90.963715, "Y": -0.6, - "Z": -104.08483 + "Z": -263.12756 }, + "StopDistance": 0.5, "TerritoryId": 621, "InteractionType": "Dive" }, @@ -67,8 +59,7 @@ "Z": -103.89868 }, "TerritoryId": 621, - "InteractionType": "Interact", - "DisableNavmesh": true + "InteractionType": "Interact" } ] }, @@ -77,31 +68,15 @@ "Steps": [ { "Position": { - "X": -62.360443, + "X": -90.963715, "Y": -0.6, - "Z": -104.08483 + "Z": -263.12756 }, + "StopDistance": 0.5, "TerritoryId": 621, "InteractionType": "WalkTo", - "DisableNavmesh": true - }, - { - "Position": { - "X": -50.288544, - "Y": -0.3, - "Z": -115.21235 - }, - "TerritoryId": 621, - "InteractionType": "WalkTo" - }, - { - "Position": { - "X": -42.96752, - "Y": 0.06842625, - "Z": -240.69255 - }, - "TerritoryId": 621, - "InteractionType": "WalkTo" + "DisableNavmesh": true, + "Mount": true }, { "DataId": 1023174, @@ -132,4 +107,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2842_Out of Sight.json b/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2842_Out of Sight.json index 288284e44..7599354ff 100644 --- a/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2842_Out of Sight.json +++ b/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2842_Out of Sight.json @@ -41,6 +41,15 @@ { "Sequence": 2, "Steps": [ + { + "Position": { + "X": -245.80753, + "Y": 258.90652, + "Z": 786.1918 + }, + "TerritoryId": 620, + "InteractionType": "WalkTo" + }, { "DataId": 1023259, "Position": { @@ -50,7 +59,15 @@ }, "TerritoryId": 620, "InteractionType": "Interact", - "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 32" + "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 32", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1020871, @@ -61,7 +78,15 @@ }, "TerritoryId": 620, "InteractionType": "Interact", - "$": "QW: 1 0 0 0 0 32 -> QW: 2 0 0 0 0 160" + "$": "QW: 1 0 0 0 0 32 -> QW: 2 0 0 0 0 160", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1020870, @@ -71,7 +96,15 @@ "Z": 737.1786 }, "TerritoryId": 620, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, @@ -91,4 +124,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2851_A Hunger for Trade.json b/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2851_A Hunger for Trade.json index 5697acdc4..b81687063 100644 --- a/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2851_A Hunger for Trade.json +++ b/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2851_A Hunger for Trade.json @@ -60,7 +60,44 @@ }, "TerritoryId": 620, "InteractionType": "Interact", - "TargetTerritoryId": 620 + "TargetTerritoryId": 620, + "SkipConditions": { + "StepIf": { + "AetheryteUnlocked": "Lochs - Porta Praetoria" + } + } + }, + { + "Position": { + "X": 1.7183262, + "Y": 317.60666, + "Z": 141.11252 + }, + "TerritoryId": 620, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "AetheryteUnlocked": "Lochs - Porta Praetoria" + } + } + }, + { + "Position": { + "X": -791.2012, + "Y": 46.3994, + "Z": -15.904689 + }, + "TerritoryId": 621, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Lochs - Porta Praetoria", + "SkipConditions": { + "AetheryteShortcutIf": { + "AetheryteLocked": "Lochs - Porta Praetoria" + }, + "StepIf": { + "AetheryteLocked": "Lochs - Porta Praetoria" + } + } }, { "DataId": 1023168, @@ -77,6 +114,15 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 364.314, + "Y": 326.0898, + "Z": 338.17725 + }, + "TerritoryId": 620, + "InteractionType": "WalkTo" + }, { "DataId": 1023167, "Position": { @@ -90,4 +136,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2860_Closing Up Shop.json b/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2860_Closing Up Shop.json index 5b877ef59..49e10f38d 100644 --- a/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2860_Closing Up Shop.json +++ b/QuestPaths/4.x - Stormblood/Aether Currents/The Peaks/2860_Closing Up Shop.json @@ -29,7 +29,15 @@ }, "TerritoryId": 620, "InteractionType": "Interact", - "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 32" + "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 32", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1020886, @@ -40,7 +48,15 @@ }, "TerritoryId": 620, "InteractionType": "Interact", - "$": "QW: 1 0 0 0 0 32 -> QW: 2 0 0 0 0 160" + "$": "QW: 1 0 0 0 0 32 -> QW: 2 0 0 0 0 160", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1020887, @@ -50,7 +66,15 @@ "Z": 328.51135 }, "TerritoryId": 620, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, @@ -82,7 +106,44 @@ }, "TerritoryId": 620, "InteractionType": "Interact", - "TargetTerritoryId": 620 + "TargetTerritoryId": 620, + "SkipConditions": { + "StepIf": { + "AetheryteUnlocked": "Lochs - Porta Praetoria" + } + } + }, + { + "Position": { + "X": 1.7183262, + "Y": 317.60666, + "Z": 141.11252 + }, + "TerritoryId": 620, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "AetheryteUnlocked": "Lochs - Porta Praetoria" + } + } + }, + { + "Position": { + "X": -791.2012, + "Y": 46.3994, + "Z": -15.904689 + }, + "TerritoryId": 621, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Lochs - Porta Praetoria", + "SkipConditions": { + "AetheryteShortcutIf": { + "AetheryteLocked": "Lochs - Porta Praetoria" + }, + "StepIf": { + "AetheryteLocked": "Lochs - Porta Praetoria" + } + } }, { "DataId": 1020893, @@ -97,4 +158,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2500_The Search for Lord Hien.json b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2500_The Search for Lord Hien.json index e4a85190c..954762069 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2500_The Search for Lord Hien.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2500_The Search for Lord Hien.json @@ -29,7 +29,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "0 0 0 0 0 0 -> 1 0 0 0 0 128" + "$": "0 0 0 0 0 0 -> 1 0 0 0 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1019353, @@ -41,7 +49,36 @@ "TerritoryId": 622, "InteractionType": "Interact", "StopDistance": 7, - "$": "1 0 0 0 0 128 -> 2 0 0 0 0 192" + "$": "1 0 0 0 0 128 -> 2 0 0 0 0 192", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "Position": { + "X": 547.51385, + "Y": -19.505655, + "Z": 355.95413 + }, + "TerritoryId": 622, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + } }, { "DataId": 1019349, @@ -52,7 +89,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "StopDistance": 7 + "StopDistance": 7, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] } ] }, @@ -110,4 +155,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2501_A Season for War.json b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2501_A Season for War.json index 4d2bba8b4..f48043a49 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2501_A Season for War.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2501_A Season for War.json @@ -26,6 +26,16 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": 553.1567, + "Y": -19.505648, + "Z": 306.37933 + }, + "TerritoryId": 622, + "InteractionType": "WalkTo", + "Mount": true + }, { "Position": { "X": 259.30197, @@ -40,7 +50,17 @@ "DataId": 6626, "MinimumKillCount": 2, "RewardItemId": 2002204, - "RewardItemCount": 2 + "RewardItemCount": 2, + "CompletionQuestVariablesFlags": [ + null, + { + "High": 2 + }, + null, + null, + null, + null + ] } ] } @@ -63,4 +83,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2504_A Warrior's Welcome.json b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2504_A Warrior's Welcome.json index 547222b09..e18c4e3e2 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2504_A Warrior's Welcome.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2504_A Warrior's Welcome.json @@ -49,7 +49,15 @@ "KillEnemyDataIds": [ 7546 ], - "$": "0 0 0 3 0 0 -> 18 0 0 2 0 8" + "$": "0 0 0 3 0 0 -> 18 0 0 2 0 8", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] }, { "DataId": 2008456, @@ -66,18 +74,15 @@ 7546, 7562 ], - "$": "18 0 0 2 0 8 -> 34 0 32 17 0 24" - }, - { - "DataId": 2008017, - "Position": { - "X": 231.98291, - "Y": 93.36987, - "Z": -515.8008 - }, - "TerritoryId": 622, - "InteractionType": "AttuneAetherCurrent", - "AetherCurrentId": 2818210 + "$": "18 0 0 2 0 8 -> 34 0 32 17 0 24", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "DataId": 2008131, @@ -92,6 +97,15 @@ "ItemId": 2002199, "KillEnemyDataIds": [ 7562 + ], + "$": "If skipping the step before: 34 2 0 33 0 40", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 ] } ] @@ -99,6 +113,28 @@ { "Sequence": 3, "Steps": [ + { + "DataId": 2008017, + "Position": { + "X": 231.98291, + "Y": 93.36987, + "Z": -515.8008 + }, + "TerritoryId": 622, + "InteractionType": "AttuneAetherCurrent", + "AetherCurrentId": 2818210 + }, + { + "Position": { + "X": 235.19914, + "Y": 62.795677, + "Z": -495.62 + }, + "TerritoryId": 622, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "Mount": true + }, { "DataId": 1020547, "Position": { @@ -127,4 +163,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2505_The Heart of Nations.json b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2505_The Heart of Nations.json index 817fdcc21..55cb19b06 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2505_The Heart of Nations.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2505_The Heart of Nations.json @@ -59,7 +59,15 @@ }, "TerritoryId": 622, "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": 2008246, @@ -70,7 +78,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "1 16 0 0 0 128 -> 2 32 0 0 0 192" + "$": "1 16 0 0 0 128 -> 2 32 0 0 0 192", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 2008247, @@ -81,7 +97,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "2 32 0 0 0 192 -> 3 48 0 0 0 224" + "$": "2 32 0 0 0 192 -> 3 48 0 0 0 224", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 2008248, @@ -91,7 +115,15 @@ "Z": -355.18427 }, "TerritoryId": 622, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] } ] }, @@ -141,4 +173,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2509_The Labors of Magnai.json b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2509_The Labors of Magnai.json index b250f3289..626bfa6dd 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2509_The Labors of Magnai.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2509_The Labors of Magnai.json @@ -60,29 +60,19 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "TargetTerritoryId": 622 + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_STMBDA410_02509_SYSTEM_000_051", + "Yes": true + } + ] } ] }, { "Sequence": 3, "Steps": [ - { - "Position": { - "X": 63.073254, - "Y": 9.199993, - "Z": 32.532238 - }, - "TerritoryId": 622, - "InteractionType": "Jump", - "JumpDestination": { - "Position": { - "X": 64.39042, - "Y": 1.9869975, - "Z": 24.772852 - } - } - }, { "Position": { "X": 65.04901, @@ -90,7 +80,8 @@ "Z": 23.111439 }, "TerritoryId": 622, - "InteractionType": "Dive" + "InteractionType": "Dive", + "DisableNavmesh": true }, { "DataId": 2008252, @@ -102,7 +93,15 @@ "TerritoryId": 622, "InteractionType": "Interact", "$": "QW: 0 0 0 0 0 0 -> QW: 1 16 0 0 0 32", - "DisableNavmesh": true + "DisableNavmesh": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 2008250, @@ -113,7 +112,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "QW: 1 16 0 0 0 32 -> QW: 2 32 0 0 0 160" + "$": "QW: 1 16 0 0 0 32 -> QW: 2 32 0 0 0 160", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 2008255, @@ -124,7 +131,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "QW: 2 32 0 0 0 160 -> QW: 3 48 0 0 0 164" + "$": "QW: 2 32 0 0 0 160 -> QW: 3 48 0 0 0 164", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 4 + ] }, { "DataId": 2008253, @@ -135,7 +150,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "QW: 3 48 0 0 0 164 -> QW: 4 64 0 0 0 180" + "$": "QW: 3 48 0 0 0 164 -> QW: 4 64 0 0 0 180", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "DataId": 2008256, @@ -146,7 +169,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "QW: 4 64 0 0 0 180 -> QW: 5 80 0 0 0 182" + "$": "QW: 4 64 0 0 0 180 -> QW: 5 80 0 0 0 182", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 2 + ] }, { "DataId": 2008251, @@ -157,7 +188,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "QW: 5 80 0 0 0 182 -> QW: 6 96 0 0 0 246" + "$": "QW: 5 80 0 0 0 182 -> QW: 6 96 0 0 0 246", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 2008254, @@ -168,7 +207,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "QW: 6 96 0 0 0 246 -> QW: 7 112 0 0 0 254" + "$": "QW: 6 96 0 0 0 246 -> QW: 7 112 0 0 0 254", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] }, { "DataId": 2008257, @@ -178,7 +225,15 @@ "Z": 105.97388 }, "TerritoryId": 622, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 1 + ] } ] }, @@ -214,4 +269,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2510_For Love of the Moon.json b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2510_For Love of the Moon.json index 2660e3eb1..c3df7c959 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2510_For Love of the Moon.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2510_For Love of the Moon.json @@ -12,6 +12,7 @@ "Y": 121.12067, "Z": 62.088867 }, + "StopDistance": 7, "TerritoryId": 622, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Azim Steppe - Dawn Throne", @@ -50,7 +51,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 64" + "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 64", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1021602, @@ -61,7 +70,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "QW: 1 0 0 0 0 64 -> QW: 2 0 0 0 0 80" + "$": "QW: 1 0 0 0 0 64 -> QW: 2 0 0 0 0 80", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "DataId": 1020691, @@ -72,7 +89,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "QW: 2 0 0 0 0 80 -> QW: 3 0 0 0 0 208" + "$": "QW: 2 0 0 0 0 80 -> QW: 3 0 0 0 0 208", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1021600, @@ -82,7 +107,15 @@ "Z": 36.697876 }, "TerritoryId": 622, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] } ] }, @@ -97,7 +130,8 @@ }, "TerritoryId": 622, "InteractionType": "WalkTo", - "DisableNavmesh": true + "DisableNavmesh": true, + "Mount": true }, { "DataId": 1019426, @@ -142,4 +176,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2511_Sworn Enemies of the Sun.json b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2511_Sworn Enemies of the Sun.json index cc74f9ad8..6474f1e8f 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2511_Sworn Enemies of the Sun.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2511_Sworn Enemies of the Sun.json @@ -79,6 +79,16 @@ "EnemySpawnType": "AutoOnEnterArea", "KillEnemyDataIds": [ 7563 + ], + "CompletionQuestVariablesFlags": [ + { + "Low": 3 + }, + null, + null, + null, + null, + null ] }, { @@ -103,10 +113,11 @@ "Y": 10.389871, "Z": 598.9928 }, + "StopDistance": 7, "TerritoryId": 622, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2512_The Undying Ones.json b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2512_The Undying Ones.json index b34df30f6..c10be722b 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2512_The Undying Ones.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2512_The Undying Ones.json @@ -12,6 +12,7 @@ "Y": 10.389871, "Z": 598.9928 }, + "StopDistance": 7, "TerritoryId": 622, "InteractionType": "AcceptQuest" } @@ -59,7 +60,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 64" + "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 64", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1019322, @@ -70,7 +79,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "QW: 1 0 0 0 0 64 -> QW: 2 0 0 0 0 96" + "$": "QW: 1 0 0 0 0 64 -> QW: 2 0 0 0 0 96", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1019321, @@ -80,7 +97,15 @@ "Z": 616.907 }, "TerritoryId": 622, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } ] }, @@ -100,4 +125,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2515_Naadam.json b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2515_Naadam.json index 27599b083..c419c628f 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2515_Naadam.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2515_Naadam.json @@ -36,7 +36,15 @@ "Answer": "TEXT_STMBDA416_02515_A1_000_103" } ], - "$": "QW: 0 0 0 0 0 0 -> QW: 17 0 0 0 0 32" + "$": "QW: 0 0 0 0 0 0 -> QW: 17 0 0 0 0 32", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1021634, @@ -54,7 +62,15 @@ "Answer": "TEXT_STMBDA416_02515_A1_120_070" } ], - "$": "QW: 17 0 0 0 0 32 -> QW: 33 0 16 0 0 96" + "$": "QW: 17 0 0 0 0 32 -> QW: 33 0 16 0 0 96", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1019396, @@ -65,7 +81,15 @@ }, "TerritoryId": 622, "InteractionType": "Interact", - "$": "QW: 33 0 16 0 0 96 -> QW: 49 16 16 0 0 112" + "$": "QW: 33 0 16 0 0 96 -> QW: 49 16 16 0 0 112", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "DataId": 1019386, @@ -75,7 +99,15 @@ "Z": -505.9129 }, "TerritoryId": 622, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } ] }, @@ -125,4 +157,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2516_Glory to the Khagan.json b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2516_Glory to the Khagan.json index 5fff20522..a49a5aec9 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2516_Glory to the Khagan.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2516_Glory to the Khagan.json @@ -56,9 +56,10 @@ "Y": 38.841972, "Z": -482.91553 }, + "StopDistance": 0.25, "TerritoryId": 622, - "InteractionType": "WaitForManualProgress", - "Comment": "TODO: /vpose" + "InteractionType": "Emote", + "Emote": "victorypose" } ] }, @@ -78,4 +79,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2517_In Crimson They Walked.json b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2517_In Crimson They Walked.json index fd94a6fa0..171c55966 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2517_In Crimson They Walked.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2517_In Crimson They Walked.json @@ -12,6 +12,7 @@ "Y": 40.836124, "Z": -508.50693 }, + "StopDistance": 7, "TerritoryId": 622, "InteractionType": "AcceptQuest" } @@ -92,4 +93,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2520_Seeds of Despair.json b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2520_Seeds of Despair.json index deb7c0c2c..02e832e7e 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2520_Seeds of Despair.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2520_Seeds of Despair.json @@ -48,7 +48,12 @@ "Z": -545.8195 }, "TerritoryId": 614, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "DataId": 2007923, @@ -105,6 +110,20 @@ { "Sequence": 5, "Steps": [ + { + "Position": { + "X": 543.4046, + "Y": 22.617083, + "Z": -726.5077 + }, + "TerritoryId": 614, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } + }, { "DataId": 1020230, "Position": { @@ -169,4 +188,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2522_The Doma Within.json b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2522_The Doma Within.json index e3934d097..26e6b6a76 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2522_The Doma Within.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2522_The Doma Within.json @@ -30,7 +30,15 @@ "TerritoryId": 614, "InteractionType": "Interact", "AetheryteShortcut": "Yanxia - House of the Fierce", - "$": "QW: 0 0 0 0 0 0 -> QW: 17 0 0 0 0 64" + "$": "QW: 0 0 0 0 0 0 -> QW: 17 0 0 0 0 64", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1019287, @@ -41,7 +49,15 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "$": "QW: 17 0 0 0 0 64 -> QW: 33 16 0 0 0 96" + "$": "QW: 17 0 0 0 0 64 -> QW: 33 16 0 0 0 96", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1019285, @@ -51,7 +67,15 @@ "Z": -437.2473 }, "TerritoryId": 614, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } ] }, @@ -80,7 +104,12 @@ "Z": -494.28577 }, "TerritoryId": 614, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "DataId": 1020237, @@ -144,4 +173,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2523_On the Eve of Destiny.json b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2523_On the Eve of Destiny.json index 12f7fac80..1786d1982 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2523_On the Eve of Destiny.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2523_On the Eve of Destiny.json @@ -45,7 +45,15 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "$": "QW: ? ? ? ? ? ? -> QW: 16 1 0 0 0 128" + "$": "QW: ? ? ? ? ? ? -> QW: 16 1 0 0 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1020521, @@ -56,7 +64,15 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "$": "QW: 16 1 0 0 0 128 -> QW: 33 1 0 0 0 192" + "$": "QW: 16 1 0 0 0 128 -> QW: 33 1 0 0 0 192", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1020240, @@ -66,7 +82,15 @@ "Z": -427.1153 }, "TerritoryId": 614, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] } ] }, @@ -93,4 +117,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2524_The Die Is Cast.json b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2524_The Die Is Cast.json index 68e69afd8..f99aa3834 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2524_The Die Is Cast.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2524_The Die Is Cast.json @@ -33,7 +33,26 @@ "Z": -494.28577 }, "TerritoryId": 614, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } + }, + { + "Position": { + "X": 77.23522, + "Y": 32.751614, + "Z": -517.566 + }, + "TerritoryId": 614, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } }, { "DataId": 2007932, @@ -58,6 +77,7 @@ "Y": 53.217506, "Z": -653.193 }, + "StopDistance": 5, "TerritoryId": 614, "InteractionType": "Interact" } @@ -99,10 +119,11 @@ "Y": 30.646172, "Z": -455.86328 }, + "StopDistance": 7, "TerritoryId": 614, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2525_The World Turned Upside Down.json b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2525_The World Turned Upside Down.json index 81bfab5f4..55f2b8ebf 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2525_The World Turned Upside Down.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2525_The World Turned Upside Down.json @@ -12,6 +12,7 @@ "Y": 30.646172, "Z": -455.86328 }, + "StopDistance": 7, "TerritoryId": 614, "InteractionType": "AcceptQuest" } @@ -102,10 +103,11 @@ "Y": -7.0001082, "Z": 53.81848 }, + "StopDistance": 7, "TerritoryId": 628, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2526_A Swift and Secret Departure.json b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2526_A Swift and Secret Departure.json index e91ba71b6..1312ff5b9 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2526_A Swift and Secret Departure.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2526_A Swift and Secret Departure.json @@ -12,6 +12,7 @@ "Y": -7.000024, "Z": 55.527588 }, + "StopDistance": 7, "TerritoryId": 628, "InteractionType": "AcceptQuest" } @@ -84,4 +85,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2947_Broken Steel, Broken Men.json b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2947_Broken Steel, Broken Men.json index f6a627104..1d4430bde 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2947_Broken Steel, Broken Men.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2947_Broken Steel, Broken Men.json @@ -20,6 +20,34 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": 163.68964, + "Y": -0.29980254, + "Z": 228.32257 + }, + "TerritoryId": 614, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } + }, + { + "Position": { + "X": 146.4086, + "Y": -0.3000002, + "Z": 271.62607 + }, + "TerritoryId": 614, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } + }, { "DataId": 2007926, "Position": { @@ -47,7 +75,15 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "$": "QW: 0 0 16 0 0 0 -> QW: 16 1 19 0 0 128" + "$": "QW: 0 0 16 0 0 0 -> QW: 16 1 19 0 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 2007930, @@ -58,7 +94,15 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "$": "QW: 16 1 19 0 0 128 -> QW: 32 17 20 0 0 160" + "$": "QW: 16 1 19 0 0 128 -> QW: 32 17 20 0 0 160", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 2007929, @@ -68,7 +112,15 @@ "Z": 357.01526 }, "TerritoryId": 614, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, @@ -102,18 +154,15 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "$": "QW: 0 0 0 1 80 0 -> QW: 16 0 16 1 112 8" - }, - { - "DataId": 2008189, - "Position": { - "X": 48.78308, - "Y": 5.5999756, - "Z": 294.02612 - }, - "TerritoryId": 614, - "InteractionType": "Interact", - "$": "QW: 16 0 16 1 112 8 -> QW: 33 0 16 1 144 72" + "$": "QW: 0 0 0 1 80 0 -> QW: 16 0 16 1 112 8", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] }, { "DataId": 2008193, @@ -124,7 +173,34 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "$": "QW: 33 0 16 1 144 72 -> QW: 49 0 17 1 176 76" + "$": "QW: 33 0 16 1 144 72 -> QW: 49 0 17 1 176 76", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 4 + ] + }, + { + "DataId": 2008189, + "Position": { + "X": 48.78308, + "Y": 5.5999756, + "Z": 294.02612 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "$": "QW: 16 0 16 1 112 8 -> QW: 33 0 16 1 144 72", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 2008188, @@ -135,7 +211,15 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "$": "QW: 49 0 17 1 176 76 -> QW: 65 0 17 17 192 204" + "$": "QW: 49 0 17 1 176 76 -> QW: 65 0 17 17 192 204", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 2008191, @@ -146,7 +230,15 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "$": "QW: 65 0 17 17 192 204 -> QW: 81 1 17 17 208 220" + "$": "QW: 65 0 17 17 192 204 -> QW: 81 1 17 17 208 220", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "DataId": 2008190, @@ -156,13 +248,35 @@ "Z": 308.5221 }, "TerritoryId": 614, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] } ] }, { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 163.68964, + "Y": -0.29980254, + "Z": 228.32257 + }, + "TerritoryId": 614, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } + }, { "DataId": 1020232, "Position": { @@ -177,4 +291,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2527_While You Were Away.json b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2527_While You Were Away.json index 3839806e4..0b7250efc 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2527_While You Were Away.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2527_While You Were Away.json @@ -12,6 +12,7 @@ "Y": 7.9999094, "Z": 38.712036 }, + "StopDistance": 6, "TerritoryId": 129, "InteractionType": "AcceptQuest" } @@ -64,4 +65,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2528_Rhalgr's Beacon.json b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2528_Rhalgr's Beacon.json index 082c242ad..44d98e739 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2528_Rhalgr's Beacon.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2528_Rhalgr's Beacon.json @@ -12,6 +12,7 @@ "Y": 130, "Z": -506.95053 }, + "StopDistance": 5, "TerritoryId": 612, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Fringes - Castrum Oriens", @@ -54,7 +55,15 @@ }, "TerritoryId": 635, "InteractionType": "Interact", - "$": "QW: 0 0 0 0 0 0 -> QW: 17 0 0 0 0 64" + "$": "QW: 0 0 0 0 0 0 -> QW: 17 0 0 0 0 64", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1023298, @@ -65,7 +74,15 @@ }, "TerritoryId": 635, "InteractionType": "Interact", - "$": "QW: 17 0 0 0 0 64 -> QW: 33 1 0 0 0 192" + "$": "QW: 17 0 0 0 0 64 -> QW: 33 1 0 0 0 192", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1023763, @@ -75,7 +92,15 @@ "Z": 121.87378 }, "TerritoryId": 635, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] } ] }, @@ -133,4 +158,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2529_The Fortunes of War.json b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2529_The Fortunes of War.json index b4d043ca7..62185826f 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2529_The Fortunes of War.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2529_The Fortunes of War.json @@ -12,6 +12,7 @@ "Y": 50.004436, "Z": 185.6565 }, + "StopDistance": 7, "TerritoryId": 612, "InteractionType": "AcceptQuest" } @@ -32,7 +33,15 @@ "KillEnemyDataIds": [ 8036 ], - "$": "QW: 0 0 0 0 0 0 -> QW: 16 16 0 0 0 128" + "$": "QW: 0 0 0 0 0 0 -> QW: 16 16 0 0 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "Position": { @@ -46,6 +55,14 @@ "KillEnemyDataIds": [ 8044, 8050 + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 ] } ] @@ -81,4 +98,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2530_Rising Fortunes, Rising Spirits.json b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2530_Rising Fortunes, Rising Spirits.json index ef3dc3443..0315248c7 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2530_Rising Fortunes, Rising Spirits.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2530_Rising Fortunes, Rising Spirits.json @@ -27,6 +27,7 @@ "Y": 50.00444, "Z": 210.46765 }, + "StopDistance": 7, "TerritoryId": 612, "InteractionType": "Interact", "DialogueChoices": [ @@ -71,4 +72,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2531_The Lure of the Dream.json b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2531_The Lure of the Dream.json index ea8a8183a..9fa4d564a 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2531_The Lure of the Dream.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2531_The Lure of the Dream.json @@ -68,10 +68,11 @@ "Y": 82.94969, "Z": -101.27417 }, + "StopDistance": 7, "TerritoryId": 612, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2532_The Lady of Bliss.json b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2532_The Lady of Bliss.json index b0eb46a58..ef161cde3 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2532_The Lady of Bliss.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2532_The Lady of Bliss.json @@ -12,6 +12,7 @@ "Y": 82.94969, "Z": -101.27417 }, + "StopDistance": 7, "TerritoryId": 612, "InteractionType": "AcceptQuest" } @@ -103,10 +104,11 @@ "Y": 122.137985, "Z": -242.14551 }, + "StopDistance": 5, "TerritoryId": 612, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2533_The Silence of the Gods.json b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2533_The Silence of the Gods.json index 7c1c1ab69..aa3275fbb 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2533_The Silence of the Gods.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2533_The Silence of the Gods.json @@ -12,6 +12,7 @@ "Y": 122.30697, "Z": -239.643 }, + "StopDistance": 7, "TerritoryId": 612, "InteractionType": "AcceptQuest" } @@ -79,4 +80,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2534_The First of Many.json b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2534_The First of Many.json index a695cb0dd..1f4ebaf5a 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2534_The First of Many.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2534_The First of Many.json @@ -26,6 +26,20 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": 404.45657, + "Y": 73.72764, + "Z": 204.51974 + }, + "TerritoryId": 612, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } + }, { "DataId": 1022334, "Position": { @@ -73,4 +87,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2536_Hells Open.json b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2536_Hells Open.json index fafbabd00..4a38f2399 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2536_Hells Open.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2536_Hells Open.json @@ -41,7 +41,15 @@ 8033, 8045 ], - "$": "QW: 0 0 0 0 0 0 -> QW: 16 32 0 0 0 128" + "$": "QW: 0 0 0 0 0 0 -> QW: 16 32 0 0 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 2008203, @@ -56,6 +64,14 @@ "KillEnemyDataIds": [ 8031, 8032 + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 ] } ] diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2537_Heavens Weep.json b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2537_Heavens Weep.json index b6a8a74d6..ebca2e3da 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2537_Heavens Weep.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2537_Heavens Weep.json @@ -76,7 +76,15 @@ }, "TerritoryId": 620, "InteractionType": "Interact", - "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128" + "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1020618, @@ -87,7 +95,15 @@ }, "TerritoryId": 620, "InteractionType": "Interact", - "$": "QW: 1 0 0 0 0 128 -> QW: 2 0 0 0 0 192" + "$": "QW: 1 0 0 0 0 128 -> QW: 2 0 0 0 0 192", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1020619, @@ -97,7 +113,15 @@ "Z": 105.57703 }, "TerritoryId": 620, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] } ] }, @@ -147,4 +171,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2538_The Road Home.json b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2538_The Road Home.json index 1270d796f..066a19b7d 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2538_The Road Home.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2538_The Road Home.json @@ -44,7 +44,15 @@ }, "TerritoryId": 620, "InteractionType": "Interact", - "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 32" + "$": "QW: 0 0 0 0 0 0 -> QW: 1 0 0 0 0 32", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 2008450, @@ -66,7 +74,15 @@ }, "TerritoryId": 620, "InteractionType": "Interact", - "$": "QW: 1 0 0 0 0 32 -> QW: 2 0 0 0 0 96" + "$": "QW: 1 0 0 0 0 32 -> QW: 2 0 0 0 0 96", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1020623, @@ -76,7 +92,15 @@ "Z": 297.04736 }, "TerritoryId": 620, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } ] }, @@ -97,4 +121,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2539_For the Living and the Dead.json b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2539_For the Living and the Dead.json index e4b3419b2..f19257816 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2539_For the Living and the Dead.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2539_For the Living and the Dead.json @@ -43,15 +43,16 @@ "Steps": [ { "DataId": 1020631, -"Position": { - "X": -300.49597, - "Y": 257.5265, - "Z": 765.0415 -}, -"TerritoryId": 620, -"InteractionType": "CompleteQuest","StopDistance": 7 + "Position": { + "X": -300.49597, + "Y": 257.5265, + "Z": 765.0415 + }, + "TerritoryId": 620, + "InteractionType": "CompleteQuest", + "StopDistance": 7 } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2540_Above the Churning Waters.json b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2540_Above the Churning Waters.json index 3b4ea3e3c..6466101a6 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2540_Above the Churning Waters.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2540_Above the Churning Waters.json @@ -53,6 +53,7 @@ "Y": 262.4093, "Z": 661.86 }, + "StopDistance": 4.25, "TerritoryId": 620, "InteractionType": "Interact" } @@ -68,10 +69,11 @@ "Y": 263.73114, "Z": 655.75635 }, + "StopDistance": 7, "TerritoryId": 620, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2541_The Path Forward.json b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2541_The Path Forward.json index 8ef17c051..6f742c9a1 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2541_The Path Forward.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2541_The Path Forward.json @@ -12,6 +12,7 @@ "Y": 263.73114, "Z": 655.75635 }, + "StopDistance": 7, "TerritoryId": 620, "InteractionType": "AcceptQuest" } @@ -38,15 +39,16 @@ "Steps": [ { "DataId": 1020629, -"Position": { - "X": -298.51227, - "Y": 257.52652, - "Z": 764.98047 -}, -"TerritoryId": 620, -"InteractionType": "CompleteQuest","StopDistance": 7 + "Position": { + "X": -298.51227, + "Y": 257.52652, + "Z": 764.98047 + }, + "TerritoryId": 620, + "InteractionType": "CompleteQuest", + "StopDistance": 7 } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2544_The Price of Freedom.json b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2544_The Price of Freedom.json index b91082db3..3cdd92981 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2544_The Price of Freedom.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2544_The Price of Freedom.json @@ -12,6 +12,7 @@ "Y": 314.22742, "Z": 418.2954 }, + "StopDistance": 7, "TerritoryId": 620, "InteractionType": "AcceptQuest" } @@ -127,10 +128,11 @@ "Y": 344.11768, "Z": 435.3551 }, + "StopDistance": 5, "TerritoryId": 620, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2546_Liberty or Death.json b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2546_Liberty or Death.json index 8196199e3..da1776639 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2546_Liberty or Death.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2546_Liberty or Death.json @@ -27,6 +27,7 @@ "Y": 322.83618, "Z": 746.94434 }, + "StopDistance": 7, "TerritoryId": 620, "InteractionType": "Interact" } @@ -42,6 +43,7 @@ "Y": 322.83618, "Z": 740.6881 }, + "StopDistance": 7, "TerritoryId": 620, "InteractionType": "Interact" } @@ -125,4 +127,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2547_The Lady in Red.json b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2547_The Lady in Red.json index 3d88f6238..772051719 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2547_The Lady in Red.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2547_The Lady in Red.json @@ -62,10 +62,11 @@ "Y": -0.11677644, "Z": -28.610718 }, + "StopDistance": 5, "TerritoryId": 635, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2548_Upon the Great Loch's Shore.json b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2548_Upon the Great Loch's Shore.json index f6918d6e9..c7d19c318 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2548_Upon the Great Loch's Shore.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2548_Upon the Great Loch's Shore.json @@ -12,6 +12,7 @@ "Y": -0.11677644, "Z": -28.610718 }, + "StopDistance": 7, "TerritoryId": 635, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Rhalgr's Reach", @@ -68,6 +69,20 @@ } } }, + { + "Position": { + "X": 1.7183262, + "Y": 317.60666, + "Z": 141.11252 + }, + "TerritoryId": 620, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } + }, { "DataId": 1020649, "Position": { @@ -116,4 +131,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2549_The Key to Victory.json b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2549_The Key to Victory.json index ce7356c24..659248b9f 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2549_The Key to Victory.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2549_The Key to Victory.json @@ -33,6 +33,7 @@ "Y": 50.00002, "Z": -1.9990234 }, + "StopDistance": 7, "TerritoryId": 621, "InteractionType": "SinglePlayerDuty" } @@ -54,4 +55,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2550_The Resonant.json b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2550_The Resonant.json index ad69864e4..fe1034c1b 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2550_The Resonant.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2550_The Resonant.json @@ -31,6 +31,26 @@ "InteractionType": "AttuneAetherCurrent", "AetherCurrentId": 2818170 }, + { + "Position": { + "X": 93.08614, + "Y": 42.177456, + "Z": 772.668 + }, + "TerritoryId": 621, + "InteractionType": "WalkTo", + "Mount": true + }, + { + "Position": { + "X": 75.00177, + "Y": 45.410225, + "Z": 755.10895 + }, + "TerritoryId": 621, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, { "DataId": 1021712, "Position": { @@ -135,4 +155,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2551_The Legacy of Our Fathers.json b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2551_The Legacy of Our Fathers.json index 21a8ffec8..26e15939f 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2551_The Legacy of Our Fathers.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2551_The Legacy of Our Fathers.json @@ -51,6 +51,16 @@ { "Sequence": 2, "Steps": [ + { + "Position": { + "X": -672.0402, + "Y": 49.99975, + "Z": 15.600315 + }, + "TerritoryId": 621, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Lochs - Porta Praetoria" + }, { "DataId": 1021698, "Position": { @@ -59,8 +69,7 @@ "Z": 14.999573 }, "TerritoryId": 621, - "InteractionType": "Interact", - "AetheryteShortcut": "Lochs - Porta Praetoria" + "InteractionType": "Interact" } ] }, @@ -74,6 +83,7 @@ "Y": 50.01024, "Z": 17.92926 }, + "StopDistance": 5, "TerritoryId": 621, "InteractionType": "Interact" } @@ -91,7 +101,15 @@ }, "TerritoryId": 621, "InteractionType": "Interact", - "$": "QW: 0 0 0 0 0 0 -> QW: 16 16 0 0 0 32" + "$": "QW: 0 0 0 0 0 0 -> QW: 16 16 0 0 0 32", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1021701, @@ -102,7 +120,15 @@ }, "TerritoryId": 621, "InteractionType": "Interact", - "$": "QW: 16 16 0 0 0 32 -> QW: 32 17 0 0 0 160" + "$": "QW: 16 16 0 0 0 32 -> QW: 32 17 0 0 0 160", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1021702, @@ -112,7 +138,15 @@ "Z": -4.043701 }, "TerritoryId": 621, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, @@ -132,4 +166,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2553_Stormblood.json b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2553_Stormblood.json index 24ecd2a5b..80b280794 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2553_Stormblood.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2553_Stormblood.json @@ -53,6 +53,7 @@ "Y": 21.62428, "Z": -11.947815 }, + "StopDistance": 7, "TerritoryId": 621, "InteractionType": "Interact" } @@ -70,7 +71,15 @@ }, "TerritoryId": 621, "InteractionType": "Interact", - "$": "QW: 0 0 0 0 0 0 -> QW: 16 1 0 0 0 16" + "$": "QW: 0 0 0 0 0 0 -> QW: 16 1 0 0 0 16", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "DataId": 1021704, @@ -79,9 +88,18 @@ "Y": 50.000015, "Z": -3.1281738 }, + "StopDistance": 1, "TerritoryId": 621, "InteractionType": "Interact", - "$": "QW: 16 1 0 0 0 16 -> QW: 32 1 16 0 0 144" + "$": "QW: 16 1 0 0 0 16 -> QW: 32 1 16 0 0 144", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1022724, @@ -90,9 +108,27 @@ "Y": 50.00002, "Z": 0.869751 }, + "StopDistance": 7, "TerritoryId": 621, "InteractionType": "Interact", - "$": "QW: 32 1 16 0 0 144 -> QW: 49 1 16 0 0 208" + "$": "QW: 32 1 16 0 0 144 -> QW: 49 1 16 0 0 208", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "Position": { + "X": -668.1697, + "Y": 49.99959, + "Z": 10.722498 + }, + "TerritoryId": 621, + "InteractionType": "WalkTo" }, { "DataId": 1021698, @@ -101,8 +137,17 @@ "Y": 49.999725, "Z": 14.999573 }, + "StopDistance": 7, "TerritoryId": 621, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] } ] }, @@ -137,4 +182,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index b7546231d..7db023e10 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -698,7 +698,8 @@ "kneel", "bow", "uchiwasshoi", - "clap" + "clap", + "victorypose" ] } } diff --git a/Questionable.Model/Questing/Converter/EmoteConverter.cs b/Questionable.Model/Questing/Converter/EmoteConverter.cs index 28e102ee7..e6080ce0b 100644 --- a/Questionable.Model/Questing/Converter/EmoteConverter.cs +++ b/Questionable.Model/Questing/Converter/EmoteConverter.cs @@ -31,5 +31,6 @@ public sealed class EmoteConverter() : EnumConverter(Values) { EEmote.Bow, "bow" }, { EEmote.Uchiwasshoi, "uchiwasshoi" }, { EEmote.Clap, "clap" }, + { EEmote.VictoryPose, "victorypose" }, }; } diff --git a/Questionable.Model/Questing/EEmote.cs b/Questionable.Model/Questing/EEmote.cs index b5e825a34..517f9db74 100644 --- a/Questionable.Model/Questing/EEmote.cs +++ b/Questionable.Model/Questing/EEmote.cs @@ -32,4 +32,5 @@ public enum EEmote Bow = 5, Uchiwasshoi = 278, Clap = 7, + VictoryPose = 122, } diff --git a/Questionable/Controller/CombatController.cs b/Questionable/Controller/CombatController.cs index aa55ed27d..2e4805744 100644 --- a/Questionable/Controller/CombatController.cs +++ b/Questionable/Controller/CombatController.cs @@ -257,7 +257,7 @@ internal sealed class CombatController : IDisposable // for enemies that are very far away, their nameplate doesn't render but they're in the object table if (_currentFight?.Data.SpawnType == EEnemySpawnType.OverworldEnemies && - Vector3.Distance(_clientState.LocalPlayer?.Position ?? Vector3.Zero, battleNpc.Position) > 50) + Vector3.Distance(_clientState.LocalPlayer?.Position ?? Vector3.Zero, battleNpc.Position) > 45) return 25; } else