From 4b06c24da57362a66aca21366783e4f66b95fb1b Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Mon, 12 Aug 2024 16:21:17 +0200 Subject: [PATCH] Minor cleanup for SB part 1 --- GatheringPathRenderer/RendererPlugin.cs | 2 + .../2639_Magiteknical Failure.json | 10 +- .../2632_The Palace of Lost Souls.json | 26 ++- .../2673_The Price of Betrayal.json | 11 +- .../Yanxia/2724_Something Smells.json | 62 ++++++- .../Yanxia/2728_Fly, My Pretties.json | 36 +++- .../Yanxia/2733_Wolves and Weeds.json | 37 +++- .../2635_Future Rust, Future Dust.json | 94 ---------- .../2446_Beyond the Great Wall.json | 37 +++- .../2447_Lyse Takes the Lead.json | 12 +- .../2448_The Promise of a New Beginning.json | 18 +- .../2449_A Haven for the Bold.json | 3 +- .../2450_A Bargain Struck.json | 3 +- .../2451_A Friend of a Friend in Need.json | 9 +- .../2452_Signed, Sealed, to Be Delivered.json | 0 .../2453_Best Served with Cold Steel.json | 3 +- .../2454_Let Fill Your Hearts with Pride.json | 3 +- .../2455_A Familiar Face Forgotten.json | 4 +- .../2456_The Prodigal Daughter.json | 0 .../2457_A Life More Ordinary.json | 3 +- .../2458_The Color of Angry Qiqirn.json | 32 +++- .../2459_The Black Wolf's Pups.json | 18 +- .../2460_Homeward Bound.json | 21 ++- .../2954_Hard Country.json | 2 +- .../2955_Death by a Thousand Rocks.json | 0 .../2461_Where Men Go as One.json | 3 +- .../2462_Crossing the Velodyna.json | 17 +- .../2463_In Crimson It Began.json | 3 +- .../2464_The Fires Fade.json | 22 ++- .../2465_Bereft of Hearth and Home.json | 43 ++++- .../2466_Divide and Conquer.json | 3 +- .../2467_Lies, Damn Lies, and Pirates.json | 0 .../2468_Tales from the Far East.json | 32 +++- .../2469_Not without Incident.json | 4 +- .../2635_Future Rust, Future Dust.json | 174 ++++++++++++++++++ .../2636_A Dash of Green.json | 88 +++++++-- .../2637_Ye Wayward Brothers.json | 62 ++++++- .../2638_Token of Faith.json | 0 .../2470_The Man from Ul'dah.json | 4 +- ...here the Streets Are Paved with Koban.json | 0 .../2472_By the Grace of Lord Lolorito.json | 3 +- .../2473_A Good Samurai Is Hard to Find.json | 84 ++++++++- .../2474_It's Probably a Trap.json | 0 .../2475_Making the Catfish Sing.json | 3 +- .../2476_Once More, to the Ruby Sea.json | 16 +- .../2477_Open Water.json | 3 +- .../2478_Boys with Boats.json | 31 +++- .../2479_To Bend with the Wind.json | 13 +- .../2480_Confederate Consternation.json | 82 ++++++++- .../2481_Alisaie's Stones.json | 3 +- .../2482_Under the Sea.json | 16 +- .../2483_Of Kojin and Kami.json | 21 ++- .../2484_In Soroban We Trust.json | 9 +- .../2485_Forever and Ever Apart.json | 0 .../2486_In Darkness the Magatama Dreams.json | 8 +- .../2487_The Whims of the Divine.json | 5 +- .../2488_Breaking and Delivering.json | 13 +- .../2489_The Lord of the Revel.json | 20 +- .../2490_Tide Goes in, Imperials Go Out.json | 57 ++++-- .../2491_A Silence in Three Parts.json | 3 +- .../2679_The Last Voyage.json | 0 .../2681_The Solace of the Sea.json | 11 +- .../2953_The Arrows of Misfortune.json | 24 ++- .../2492_Life after Doma.json | 0 .../2493_The Stubborn Remainder.json | 40 +++- .../2494_The Ones We Leave Behind.json | 0 .../2495_A New Ruby Tithe.json | 12 +- .../2496_The Will to Live.json | 2 +- .../2497_Daughter of the Deep.json | 6 +- .../2498_The Time between the Seconds.json | 3 +- .../2499_All the Little Angels.json | 43 ++++- .../2934_A Glimpse of Madness.json | 33 +++- .../2935_Path of No Return.json | 15 +- QuestPaths/quest-v1.json | 3 +- .../Questing/Converter/EmoteConverter.cs | 1 + Questionable.Model/Questing/EEmote.cs | 1 + 76 files changed, 1192 insertions(+), 293 deletions(-) delete mode 100644 QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2635_Future Rust, Future Dust.json rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.0-Rhalgr's Reach 1}/2446_Beyond the Great Wall.json (71%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.0-Rhalgr's Reach 1}/2447_Lyse Takes the Lead.json (91%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.0-Rhalgr's Reach 1}/2448_The Promise of a New Beginning.json (88%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.0-Rhalgr's Reach 1}/2449_A Haven for the Bold.json (98%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.0-Rhalgr's Reach 1}/2450_A Bargain Struck.json (97%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.1-Peaks 1}/2451_A Friend of a Friend in Need.json (95%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.1-Peaks 1}/2452_Signed, Sealed, to Be Delivered.json (100%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.1-Peaks 1}/2453_Best Served with Cold Steel.json (98%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.1-Peaks 1}/2454_Let Fill Your Hearts with Pride.json (97%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.2-Fringes 1}/2455_A Familiar Face Forgotten.json (97%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.2-Fringes 1}/2456_The Prodigal Daughter.json (100%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.2-Fringes 1}/2457_A Life More Ordinary.json (98%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.2-Fringes 1}/2458_The Color of Angry Qiqirn.json (78%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.2-Fringes 1}/2459_The Black Wolf's Pups.json (77%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.2-Fringes 1}/2460_Homeward Bound.json (86%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.2-Fringes 1}/2954_Hard Country.json (99%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.2-Fringes 1}/2955_Death by a Thousand Rocks.json (100%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.3-Rhalgr's Reach 2}/2461_Where Men Go as One.json (96%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.3-Rhalgr's Reach 2}/2462_Crossing the Velodyna.json (86%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.3-Rhalgr's Reach 2}/2463_In Crimson It Began.json (97%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.3-Rhalgr's Reach 2}/2464_The Fires Fade.json (72%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.3-Rhalgr's Reach 2}/2465_Bereft of Hearth and Home.json (68%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.3-Rhalgr's Reach 2}/2466_Divide and Conquer.json (98%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.3-Rhalgr's Reach 2}/2467_Lies, Damn Lies, and Pirates.json (100%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.3-Rhalgr's Reach 2}/2468_Tales from the Far East.json (79%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.3-Rhalgr's Reach 2}/2469_Not without Incident.json (97%) create mode 100644 QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2635_Future Rust, Future Dust.json rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.3-Rhalgr's Reach 2}/2636_A Dash of Green.json (61%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.3-Rhalgr's Reach 2}/2637_Ye Wayward Brothers.json (64%) rename QuestPaths/4.x - Stormblood/MSQ/{A1-Fringes 1, Peaks 1 => A1.3-Rhalgr's Reach 2}/2638_Token of Faith.json (100%) rename QuestPaths/4.x - Stormblood/MSQ/{A2-Kugane 1 => A2-Kugane}/2470_The Man from Ul'dah.json (95%) rename QuestPaths/4.x - Stormblood/MSQ/{A2-Kugane 1 => A2-Kugane}/2471_Where the Streets Are Paved with Koban.json (100%) rename QuestPaths/4.x - Stormblood/MSQ/{A2-Kugane 1 => A2-Kugane}/2472_By the Grace of Lord Lolorito.json (97%) rename QuestPaths/4.x - Stormblood/MSQ/{A2-Kugane 1 => A2-Kugane}/2473_A Good Samurai Is Hard to Find.json (63%) rename QuestPaths/4.x - Stormblood/MSQ/{A2-Kugane 1 => A2-Kugane}/2474_It's Probably a Trap.json (100%) rename QuestPaths/4.x - Stormblood/MSQ/{A2-Kugane 1 => A2-Kugane}/2475_Making the Catfish Sing.json (98%) rename QuestPaths/4.x - Stormblood/MSQ/{A2-Kugane 1 => A2-Kugane}/2476_Once More, to the Ruby Sea.json (85%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2477_Open Water.json (98%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2478_Boys with Boats.json (69%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2479_To Bend with the Wind.json (92%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2480_Confederate Consternation.json (67%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2481_Alisaie's Stones.json (99%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2482_Under the Sea.json (88%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2483_Of Kojin and Kami.json (83%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2484_In Soroban We Trust.json (91%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2485_Forever and Ever Apart.json (100%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2486_In Darkness the Magatama Dreams.json (95%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2487_The Whims of the Divine.json (93%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2488_Breaking and Delivering.json (93%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2489_The Lord of the Revel.json (83%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2490_Tide Goes in, Imperials Go Out.json (60%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2491_A Silence in Three Parts.json (97%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2679_The Last Voyage.json (100%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2681_The Solace of the Sea.json (88%) rename QuestPaths/4.x - Stormblood/MSQ/{A3-Ruby Sea 1 => A3.1-Ruby Sea}/2953_The Arrows of Misfortune.json (88%) rename QuestPaths/4.x - Stormblood/MSQ/{A4-Yanxia 1 => A3.2-Yanxia}/2492_Life after Doma.json (100%) rename QuestPaths/4.x - Stormblood/MSQ/{A4-Yanxia 1 => A3.2-Yanxia}/2493_The Stubborn Remainder.json (75%) rename QuestPaths/4.x - Stormblood/MSQ/{A4-Yanxia 1 => A3.2-Yanxia}/2494_The Ones We Leave Behind.json (100%) rename QuestPaths/4.x - Stormblood/MSQ/{A4-Yanxia 1 => A3.2-Yanxia}/2495_A New Ruby Tithe.json (93%) rename QuestPaths/4.x - Stormblood/MSQ/{A4-Yanxia 1 => A3.2-Yanxia}/2496_The Will to Live.json (99%) rename QuestPaths/4.x - Stormblood/MSQ/{A4-Yanxia 1 => A3.2-Yanxia}/2497_Daughter of the Deep.json (97%) rename QuestPaths/4.x - Stormblood/MSQ/{A4-Yanxia 1 => A3.2-Yanxia}/2498_The Time between the Seconds.json (97%) rename QuestPaths/4.x - Stormblood/MSQ/{A4-Yanxia 1 => A3.2-Yanxia}/2499_All the Little Angels.json (70%) rename QuestPaths/4.x - Stormblood/MSQ/{A4-Yanxia 1 => A3.2-Yanxia}/2934_A Glimpse of Madness.json (72%) rename QuestPaths/4.x - Stormblood/MSQ/{A4-Yanxia 1 => A3.2-Yanxia}/2935_Path of No Return.json (79%) diff --git a/GatheringPathRenderer/RendererPlugin.cs b/GatheringPathRenderer/RendererPlugin.cs index a5cfe4b36..b82965196 100644 --- a/GatheringPathRenderer/RendererPlugin.cs +++ b/GatheringPathRenderer/RendererPlugin.cs @@ -239,6 +239,7 @@ public sealed class RendererPlugin : IDalamudPlugin $"{location.Root.Groups.IndexOf(group)} // {node.DataId} / {node.Locations.IndexOf(x)}", overlayBGColor = isUnsaved ? 0xFF2020FF : 0xFF000000, }, +#if false new Element(ElementType.CircleAtFixedCoordinates) { refX = a.X, @@ -259,6 +260,7 @@ public sealed class RendererPlugin : IDalamudPlugin Enabled = true, overlayText = "Max Angle" } +#endif }; })))) .ToList(); diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/The Fringes/2639_Magiteknical Failure.json b/QuestPaths/4.x - Stormblood/Aether Currents/The Fringes/2639_Magiteknical Failure.json index 29fa808b3..7f1657a26 100644 --- a/QuestPaths/4.x - Stormblood/Aether Currents/The Fringes/2639_Magiteknical Failure.json +++ b/QuestPaths/4.x - Stormblood/Aether Currents/The Fringes/2639_Magiteknical Failure.json @@ -47,8 +47,10 @@ "Y": 105.07213, "Z": -401.3476 }, + "StopDistance": 0.5, "TerritoryId": 612, - "InteractionType": "Combat", + "InteractionType": "Instruction", + "Comment": "Manual combat", "EnemySpawnType": "AutoOnEnterArea", "KillEnemyDataIds": [ 7504 @@ -65,8 +67,10 @@ "Y": 64.93323, "Z": -676.26465 }, + "StopDistance": 2, "TerritoryId": 612, - "InteractionType": "Combat", + "InteractionType": "Instruction", + "Comment": "Manual combat", "EnemySpawnType": "AutoOnEnterArea", "KillEnemyDataIds": [ 7505 @@ -91,4 +95,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/The Ruby Sea/2632_The Palace of Lost Souls.json b/QuestPaths/4.x - Stormblood/Aether Currents/The Ruby Sea/2632_The Palace of Lost Souls.json index 36ffa35e2..7425f2d3c 100644 --- a/QuestPaths/4.x - Stormblood/Aether Currents/The Ruby Sea/2632_The Palace of Lost Souls.json +++ b/QuestPaths/4.x - Stormblood/Aether Currents/The Ruby Sea/2632_The Palace of Lost Souls.json @@ -44,13 +44,23 @@ "Steps": [ { "Position": { - "X": 20.067955, + "X": 21.067955, "Y": -197.78902, - "Z": -154.23956 + "Z": -155.23956 }, "TerritoryId": 613, "InteractionType": "WalkTo", - "StopDistance": 0.25 + "$": "Sui-no-Sato, NE inside" + }, + { + "Position": { + "X": -238.47687, + "Y": -192.81738, + "Z": 329.51413 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "$": "To shorten pathfinding time, not strictly necessary" }, { "DataId": 1023293, @@ -106,13 +116,13 @@ }, { "Position": { - "X": 6.516514, - "Y": -198.04588, - "Z": -143.52591 + "X": 22.288645, + "Y": -196.2301, + "Z": -155.5739 }, "TerritoryId": 613, "InteractionType": "WalkTo", - "Fly": true + "$": "Sui-no-Sato, NE outside" }, { "DataId": 1023280, @@ -127,4 +137,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/The Ruby Sea/2673_The Price of Betrayal.json b/QuestPaths/4.x - Stormblood/Aether Currents/The Ruby Sea/2673_The Price of Betrayal.json index 50ee703d2..c3e309487 100644 --- a/QuestPaths/4.x - Stormblood/Aether Currents/The Ruby Sea/2673_The Price of Betrayal.json +++ b/QuestPaths/4.x - Stormblood/Aether Currents/The Ruby Sea/2673_The Price of Betrayal.json @@ -49,6 +49,15 @@ "TerritoryId": 613, "InteractionType": "WalkTo" }, + { + "Position": { + "X": 459.92212, + "Y": -0.19133466, + "Z": 672.5903 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo" + }, { "DataId": 1022745, "Position": { @@ -86,4 +95,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/Yanxia/2724_Something Smells.json b/QuestPaths/4.x - Stormblood/Aether Currents/Yanxia/2724_Something Smells.json index beb8d4097..7e6bc815a 100644 --- a/QuestPaths/4.x - Stormblood/Aether Currents/Yanxia/2724_Something Smells.json +++ b/QuestPaths/4.x - Stormblood/Aether Currents/Yanxia/2724_Something Smells.json @@ -36,7 +36,15 @@ "TerritoryId": 614, "InteractionType": "UseItem", "ItemId": 2002241, - "$": "? ? ? ? ? ? -> 1 80 0 0 0 128" + "$": "? ? ? ? ? ? -> 1 80 0 0 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 2008462, @@ -48,7 +56,15 @@ "TerritoryId": 614, "InteractionType": "UseItem", "ItemId": 2002241, - "$": "1 80 0 0 0 128 -> 2 64 0 0 0 192" + "$": "1 80 0 0 0 128 -> 2 64 0 0 0 192", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 2008463, @@ -60,7 +76,15 @@ "TerritoryId": 614, "InteractionType": "UseItem", "ItemId": 2002241, - "$": "2 64 0 0 0 192 -> 3 48 0 0 0 224" + "$": "2 64 0 0 0 192 -> 3 48 0 0 0 224", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 2008464, @@ -72,7 +96,15 @@ "TerritoryId": 614, "InteractionType": "UseItem", "ItemId": 2002241, - "$": "3 48 0 0 0 224 -> 4 32 0 0 0 240" + "$": "3 48 0 0 0 224 -> 4 32 0 0 0 240", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "DataId": 2008466, @@ -84,7 +116,15 @@ "TerritoryId": 614, "InteractionType": "UseItem", "ItemId": 2002241, - "$": "4 32 0 0 0 240 -> 5 16 0 0 0 244" + "$": "4 32 0 0 0 240 -> 5 16 0 0 0 244", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 4 + ] }, { "DataId": 2008465, @@ -95,7 +135,15 @@ }, "TerritoryId": 614, "InteractionType": "UseItem", - "ItemId": 2002241 + "ItemId": 2002241, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] } ] }, @@ -115,4 +163,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/Yanxia/2728_Fly, My Pretties.json b/QuestPaths/4.x - Stormblood/Aether Currents/Yanxia/2728_Fly, My Pretties.json index e81e5333b..7e269fef5 100644 --- a/QuestPaths/4.x - Stormblood/Aether Currents/Yanxia/2728_Fly, My Pretties.json +++ b/QuestPaths/4.x - Stormblood/Aether Currents/Yanxia/2728_Fly, My Pretties.json @@ -50,7 +50,15 @@ }, "TerritoryId": 614, "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": 2008354, @@ -61,7 +69,15 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "$": "1 0 0 0 0 128 -> 2 0 0 0 0 160" + "$": "1 0 0 0 0 128 -> 2 0 0 0 0 160", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 2008353, @@ -71,7 +87,15 @@ "Z": -134.99658 }, "TerritoryId": 614, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, @@ -118,8 +142,8 @@ "Z": -109.75824 }, "TerritoryId": 614, - "InteractionType": "WaitForManualProgress", - "Comment": "TODO: Add /clap" + "InteractionType": "Emote", + "Emote": "clap" } ] }, @@ -154,4 +178,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/Yanxia/2733_Wolves and Weeds.json b/QuestPaths/4.x - Stormblood/Aether Currents/Yanxia/2733_Wolves and Weeds.json index 306892e21..065ade4e2 100644 --- a/QuestPaths/4.x - Stormblood/Aether Currents/Yanxia/2733_Wolves and Weeds.json +++ b/QuestPaths/4.x - Stormblood/Aether Currents/Yanxia/2733_Wolves and Weeds.json @@ -52,6 +52,17 @@ "InteractionType": "AttuneAetherCurrent", "AetherCurrentId": 2818195 }, + { + "Position": { + "X": 439.41403, + "Y": -0.3, + "Z": 464.3263 + }, + "TerritoryId": 614, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "Mount": true + }, { "DataId": 1022458, "Position": { @@ -87,6 +98,15 @@ { "Sequence": 4, "Steps": [ + { + "Position": { + "X": 439.41403, + "Y": -0.3, + "Z": 464.3263 + }, + "TerritoryId": 614, + "InteractionType": "WalkTo" + }, { "DataId": 1022457, "Position": { @@ -121,7 +141,8 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "DisableNavmesh": true + "DisableNavmesh": true, + "Mount": true } ] }, @@ -130,15 +151,15 @@ "Steps": [ { "Position": { - "X": 618.79517, - "Y": -21.811158, - "Z": 498.69885 + "X": 605.15845, + "Y": -0.5999999, + "Z": 499.43237 }, "TerritoryId": 614, "InteractionType": "WalkTo", - "Fly": true, + "StopDistance": 0.25, "DisableNavmesh": true, - "StopDistance": 0.25 + "Mount": true }, { "Position": { @@ -173,10 +194,10 @@ "Z": -125.01721 }, "TerritoryId": 614, - "InteractionType": "AcceptQuest", + "InteractionType": "CompleteQuest", "AetheryteShortcut": "Yanxia - Namai" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2635_Future Rust, Future Dust.json b/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2635_Future Rust, Future Dust.json deleted file mode 100644 index 2210af646..000000000 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2635_Future Rust, Future Dust.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "JerryWester", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { - "DataId": 1019470, - "Position": { - "X": 152.11719, - "Y": 13.1533165, - "Z": -118.48633 - }, - "TerritoryId": 635, - "InteractionType": "AcceptQuest", - "AetheryteShortcut": "Rhalgr's Reach", - "SkipConditions": { - "AetheryteShortcutIf": { - "InSameTerritory": true - } - } - } - ] - }, - { - "Sequence": 1, - "Steps": [ - { - "DataId": 1019473, - "Position": { - "X": 51.285522, - "Y": 23.640764, - "Z": -288.96008 - }, - "TerritoryId": 635, - "InteractionType": "Interact", - "$": "0 16 0 0 0 0 -> 1 16 0 0 0 128" - }, - { - "DataId": 1019476, - "Position": { - "X": 77.25635, - "Y": 0, - "Z": -14.175659 - }, - "TerritoryId": 635, - "InteractionType": "Interact", - "$": "1 16 0 0 0 128 -> 2 16 0 0 0 160" - }, - { - "DataId": 1019486, - "Position": { - "X": -116.746826, - "Y": 0.6342248, - "Z": -55.832825 - }, - "TerritoryId": 635, - "InteractionType": "Interact", - "$": "2 16 0 0 0 160 -> 3 16 0 0 0 176" - }, - { - "DataId": 1019490, - "Position": { - "X": -6.240967, - "Y": -0.036807638, - "Z": -119.18823 - }, - "TerritoryId": 635, - "InteractionType": "Interact" - } - ] - }, - { - "Sequence": 255, - "Steps": [ - { - "DataId": 1019470, - "Position": { - "X": 152.11719, - "Y": 13.1533165, - "Z": -118.48633 - }, - "TerritoryId": 635, - "InteractionType": "CompleteQuest", - "AethernetShortcut": [ - "[Rhalgr's Reach] Western Rhalgr's Reach", - "[Rhalgr's Reach] Northeastern Rhalgr's Reach" - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2446_Beyond the Great Wall.json b/QuestPaths/4.x - Stormblood/MSQ/A1.0-Rhalgr's Reach 1/2446_Beyond the Great Wall.json similarity index 71% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2446_Beyond the Great Wall.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.0-Rhalgr's Reach 1/2446_Beyond the Great Wall.json index 1b1b1267b..03d66d38a 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2446_Beyond the Great Wall.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.0-Rhalgr's Reach 1/2446_Beyond the Great Wall.json @@ -5,6 +5,30 @@ { "Sequence": 0, "Steps": [ + { + "TerritoryId": 156, + "DataId": 2002881, + "Position": { + "X": 21.133728, + "Y": 22.323914, + "Z": -631.281 + }, + "InteractionType": "Interact", + "TargetTerritoryId": 351, + "AetheryteShortcut": "Mor Dhona", + "SkipConditions": { + "StepIf": { + "InTerritory": [ + 351 + ] + }, + "AetheryteShortcutIf": { + "InTerritory": [ + 351 + ] + } + } + }, { "DataId": 1018330, "Position": { @@ -59,6 +83,7 @@ "Y": 6.1844764, "Z": 400.99182 }, + "StopDistance": 7, "TerritoryId": 152, "InteractionType": "Interact", "DialogueChoices": [ @@ -79,6 +104,15 @@ "InteractionType": "AttuneAetheryte", "Aetheryte": "Fringes - Castrum Oriens" }, + { + "Position": { + "X": -612.8515, + "Y": 130, + "Z": -506.81757 + }, + "TerritoryId": 612, + "InteractionType": "WalkTo" + }, { "DataId": 1020304, "Position": { @@ -86,10 +120,11 @@ "Y": 130, "Z": -506.95053 }, + "StopDistance": 7, "TerritoryId": 612, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2447_Lyse Takes the Lead.json b/QuestPaths/4.x - Stormblood/MSQ/A1.0-Rhalgr's Reach 1/2447_Lyse Takes the Lead.json similarity index 91% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2447_Lyse Takes the Lead.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.0-Rhalgr's Reach 1/2447_Lyse Takes the Lead.json index 817bdd1ea..6086b1877 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2447_Lyse Takes the Lead.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.0-Rhalgr's Reach 1/2447_Lyse Takes the Lead.json @@ -12,6 +12,7 @@ "Y": 130, "Z": -504.02078 }, + "StopDistance": 5, "TerritoryId": 612, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Fringes - Castrum Oriens", @@ -68,6 +69,15 @@ { "Sequence": 3, "Steps": [ + { + "Position": { + "X": -124.70333, + "Y": 58.571022, + "Z": -581.12805 + }, + "TerritoryId": 612, + "InteractionType": "WalkTo" + }, { "DataId": 2007967, "Position": { @@ -122,4 +132,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2448_The Promise of a New Beginning.json b/QuestPaths/4.x - Stormblood/MSQ/A1.0-Rhalgr's Reach 1/2448_The Promise of a New Beginning.json similarity index 88% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2448_The Promise of a New Beginning.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.0-Rhalgr's Reach 1/2448_The Promise of a New Beginning.json index ff1e45c76..52c79e01d 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2448_The Promise of a New Beginning.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.0-Rhalgr's Reach 1/2448_The Promise of a New Beginning.json @@ -20,6 +20,11 @@ { "Sequence": 255, "Steps": [ + { + "TerritoryId": 635, + "InteractionType": "AttuneAethernetShard", + "AethernetShard": "[Rhalgr's Reach] Western Rhalgr's Reach" + }, { "TerritoryId": 635, "InteractionType": "AttuneAetheryte", @@ -28,16 +33,7 @@ { "TerritoryId": 635, "InteractionType": "AttuneAethernetShard", - "AethernetShard": "[Rhalgr's Reach] Western Rhalgr's Reach" - }, - { - "TerritoryId": 635, - "InteractionType": "AttuneAethernetShard", - "AethernetShard": "[Rhalgr's Reach] Northeastern Rhalgr's Reach", - "AethernetShortcut": [ - "[Rhalgr's Reach] Western Rhalgr's Reach", - "[Rhalgr's Reach] Aetheryte Plaza" - ] + "AethernetShard": "[Rhalgr's Reach] Northeastern Rhalgr's Reach" }, { "DataId": 1019466, @@ -52,4 +48,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2449_A Haven for the Bold.json b/QuestPaths/4.x - Stormblood/MSQ/A1.0-Rhalgr's Reach 1/2449_A Haven for the Bold.json similarity index 98% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2449_A Haven for the Bold.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.0-Rhalgr's Reach 1/2449_A Haven for the Bold.json index 47c0cc0d2..91588abe3 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2449_A Haven for the Bold.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.0-Rhalgr's Reach 1/2449_A Haven for the Bold.json @@ -12,6 +12,7 @@ "Y": 13.023668, "Z": -91.50836 }, + "StopDistance": 7, "TerritoryId": 635, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Rhalgr's Reach", @@ -103,4 +104,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2450_A Bargain Struck.json b/QuestPaths/4.x - Stormblood/MSQ/A1.0-Rhalgr's Reach 1/2450_A Bargain Struck.json similarity index 97% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2450_A Bargain Struck.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.0-Rhalgr's Reach 1/2450_A Bargain Struck.json index dc6cb191f..06426f9d2 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2450_A Bargain Struck.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.0-Rhalgr's Reach 1/2450_A Bargain Struck.json @@ -12,6 +12,7 @@ "Y": -9.369123E-13, "Z": -4.6845703 }, + "StopDistance": 5, "TerritoryId": 635, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Rhalgr's Reach", @@ -54,4 +55,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2451_A Friend of a Friend in Need.json b/QuestPaths/4.x - Stormblood/MSQ/A1.1-Peaks 1/2451_A Friend of a Friend in Need.json similarity index 95% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2451_A Friend of a Friend in Need.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.1-Peaks 1/2451_A Friend of a Friend in Need.json index eee87514f..74c9b97ad 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2451_A Friend of a Friend in Need.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.1-Peaks 1/2451_A Friend of a Friend in Need.json @@ -12,6 +12,7 @@ "Y": 13.02367, "Z": -89.951965 }, + "StopDistance": 7, "TerritoryId": 635, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Rhalgr's Reach", @@ -77,9 +78,9 @@ "InteractionType": "Combat", "EnemySpawnType": "AfterInteraction", "KillEnemyDataIds": [ - 7553 - ], - "Comment": "Forgot to note both enemy IDs here, oops" + 7553, + 7554 + ] } ] }, @@ -99,4 +100,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2452_Signed, Sealed, to Be Delivered.json b/QuestPaths/4.x - Stormblood/MSQ/A1.1-Peaks 1/2452_Signed, Sealed, to Be Delivered.json similarity index 100% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2452_Signed, Sealed, to Be Delivered.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.1-Peaks 1/2452_Signed, Sealed, to Be Delivered.json diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2453_Best Served with Cold Steel.json b/QuestPaths/4.x - Stormblood/MSQ/A1.1-Peaks 1/2453_Best Served with Cold Steel.json similarity index 98% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2453_Best Served with Cold Steel.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.1-Peaks 1/2453_Best Served with Cold Steel.json index cbf011d1e..822d5bc0f 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2453_Best Served with Cold Steel.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.1-Peaks 1/2453_Best Served with Cold Steel.json @@ -69,10 +69,11 @@ "Y": 86.34846, "Z": -289.84515 }, + "StopDistance": 5, "TerritoryId": 612, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2454_Let Fill Your Hearts with Pride.json b/QuestPaths/4.x - Stormblood/MSQ/A1.1-Peaks 1/2454_Let Fill Your Hearts with Pride.json similarity index 97% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2454_Let Fill Your Hearts with Pride.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.1-Peaks 1/2454_Let Fill Your Hearts with Pride.json index 0e917df9a..dc46fbb6f 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2454_Let Fill Your Hearts with Pride.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.1-Peaks 1/2454_Let Fill Your Hearts with Pride.json @@ -12,6 +12,7 @@ "Y": 86.34846, "Z": -289.84515 }, + "StopDistance": 5, "TerritoryId": 612, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Fringes - Castrum Oriens", @@ -49,4 +50,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2455_A Familiar Face Forgotten.json b/QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2455_A Familiar Face Forgotten.json similarity index 97% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2455_A Familiar Face Forgotten.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2455_A Familiar Face Forgotten.json index b0bd99276..f7342c49b 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2455_A Familiar Face Forgotten.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2455_A Familiar Face Forgotten.json @@ -12,6 +12,7 @@ "Y": 13.02367, "Z": -93.06476 }, + "StopDistance": 7, "TerritoryId": 635, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Rhalgr's Reach", @@ -63,6 +64,7 @@ "Y": 50.867527, "Z": -784.1764 }, + "StopDistance": 7, "TerritoryId": 620, "InteractionType": "Interact" } @@ -99,4 +101,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2456_The Prodigal Daughter.json b/QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2456_The Prodigal Daughter.json similarity index 100% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2456_The Prodigal Daughter.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2456_The Prodigal Daughter.json diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2457_A Life More Ordinary.json b/QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2457_A Life More Ordinary.json similarity index 98% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2457_A Life More Ordinary.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2457_A Life More Ordinary.json index cbb9562ec..191f0df97 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2457_A Life More Ordinary.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2457_A Life More Ordinary.json @@ -63,10 +63,11 @@ "Y": 118.15579, "Z": -719.96643 }, + "StopDistance": 5, "TerritoryId": 620, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2458_The Color of Angry Qiqirn.json b/QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2458_The Color of Angry Qiqirn.json similarity index 78% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2458_The Color of Angry Qiqirn.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2458_The Color of Angry Qiqirn.json index b0f43af9a..4538e36b7 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2458_The Color of Angry Qiqirn.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2458_The Color of Angry Qiqirn.json @@ -12,6 +12,7 @@ "Y": 118.15579, "Z": -719.96643 }, + "StopDistance": 5, "TerritoryId": 620, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Peaks - Ala Gannha", @@ -26,6 +27,15 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": -98.166626, + "Y": 104.979965, + "Z": -480.49606 + }, + "TerritoryId": 620, + "InteractionType": "WalkTo" + }, { "DataId": 2008681, "Position": { @@ -70,12 +80,32 @@ "InteractionType": "AttuneAetherCurrent", "AetherCurrentId": 2818151 }, + { + "Position": { + "X": -270.3264, + "Y": 202.14117, + "Z": -232.75537 + }, + "TerritoryId": 620, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": -270.3756, + "Y": 200.71988, + "Z": -237.96118 + }, + "TerritoryId": 620, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, { "Position": { "X": -281.3983, "Y": 200.71988, "Z": -294.9439 }, + "StopDistance": 0.25, "TerritoryId": 620, "InteractionType": "Combat", "EnemySpawnType": "AutoOnEnterArea", @@ -117,4 +147,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2459_The Black Wolf's Pups.json b/QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2459_The Black Wolf's Pups.json similarity index 77% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2459_The Black Wolf's Pups.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2459_The Black Wolf's Pups.json index ce93cc70f..cd75c3297 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2459_The Black Wolf's Pups.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2459_The Black Wolf's Pups.json @@ -20,6 +20,22 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": -281.5496, + "Y": 200.71988, + "Z": -258.17767 + }, + "TerritoryId": 620, + "InteractionType": "Jump", + "JumpDestination": { + "Position": { + "X": -281.22574, + "Y": 192.18245, + "Z": -239.78777 + } + } + }, { "DataId": 2008684, "Position": { @@ -63,4 +79,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2460_Homeward Bound.json b/QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2460_Homeward Bound.json similarity index 86% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2460_Homeward Bound.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2460_Homeward Bound.json index 5408f3bfa..9fb706c28 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2460_Homeward Bound.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2460_Homeward Bound.json @@ -43,6 +43,7 @@ "Y": 118.1921, "Z": -732.93665 }, + "StopDistance": 5, "TerritoryId": 620, "InteractionType": "Interact" } @@ -67,14 +68,13 @@ "Sequence": 255, "Steps": [ { - "DataId": 1020338, "Position": { - "X": 170.30591, + "X": 165.07161, "Y": 13.02367, - "Z": -93.06476 + "Z": -91.94302 }, "TerritoryId": 635, - "InteractionType": "CompleteQuest", + "InteractionType": "WalkTo", "AetheryteShortcut": "Rhalgr's Reach", "AethernetShortcut": [ "[Rhalgr's Reach] Aetheryte Plaza", @@ -85,8 +85,19 @@ "InSameTerritory": true } } + }, + { + "DataId": 1020338, + "Position": { + "X": 170.30591, + "Y": 13.02367, + "Z": -93.06476 + }, + "StopDistance": 7, + "TerritoryId": 635, + "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2954_Hard Country.json b/QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2954_Hard Country.json similarity index 99% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2954_Hard Country.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2954_Hard Country.json index d181d9f9c..5b8fffc7f 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2954_Hard Country.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2954_Hard Country.json @@ -81,4 +81,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2955_Death by a Thousand Rocks.json b/QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2955_Death by a Thousand Rocks.json similarity index 100% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2955_Death by a Thousand Rocks.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2955_Death by a Thousand Rocks.json diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2461_Where Men Go as One.json b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2461_Where Men Go as One.json similarity index 96% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2461_Where Men Go as One.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2461_Where Men Go as One.json index 297949078..25a91e365 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2461_Where Men Go as One.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2461_Where Men Go as One.json @@ -12,6 +12,7 @@ "Y": 13.02367, "Z": -91.38635 }, + "StopDistance": 7, "TerritoryId": 635, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Rhalgr's Reach", @@ -39,4 +40,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2462_Crossing the Velodyna.json b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2462_Crossing the Velodyna.json similarity index 86% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2462_Crossing the Velodyna.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2462_Crossing the Velodyna.json index 44b7e2647..766f205c3 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2462_Crossing the Velodyna.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2462_Crossing the Velodyna.json @@ -60,6 +60,16 @@ { "Sequence": 3, "Steps": [ + { + "Position": { + "X": -611.21484, + "Y": 130, + "Z": -503.3509 + }, + "TerritoryId": 612, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Fringes - Castrum Oriens" + }, { "DataId": 1020304, "Position": { @@ -67,9 +77,9 @@ "Y": 130, "Z": -506.95053 }, + "StopDistance": 7, "TerritoryId": 612, - "InteractionType": "Interact", - "AetheryteShortcut": "Fringes - Castrum Oriens" + "InteractionType": "Interact" } ] }, @@ -83,10 +93,11 @@ "Y": 130, "Z": -501.12158 }, + "StopDistance": 5, "TerritoryId": 612, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2463_In Crimson It Began.json b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2463_In Crimson It Began.json similarity index 97% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2463_In Crimson It Began.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2463_In Crimson It Began.json index 869cd3ba0..378e93736 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2463_In Crimson It Began.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2463_In Crimson It Began.json @@ -49,10 +49,11 @@ "Y": 0.024691548, "Z": -75.76111 }, + "StopDistance": 5, "TerritoryId": 635, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2464_The Fires Fade.json b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2464_The Fires Fade.json similarity index 72% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2464_The Fires Fade.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2464_The Fires Fade.json index 2591f6b96..da0c72267 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2464_The Fires Fade.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2464_The Fires Fade.json @@ -12,6 +12,7 @@ "Y": 0.024691548, "Z": -75.76111 }, + "StopDistance": 5, "TerritoryId": 635, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Rhalgr's Reach", @@ -41,6 +42,25 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 2.6558871, + "Y": -2.1714334, + "Z": -3.1224606 + }, + "TerritoryId": 635, + "InteractionType": "WalkTo", + "Mount": true + }, + { + "Position": { + "X": -29.991734, + "Y": -0.5866744, + "Z": -14.3459 + }, + "TerritoryId": 635, + "InteractionType": "WalkTo" + }, { "DataId": 1020416, "Position": { @@ -54,4 +74,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2465_Bereft of Hearth and Home.json b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2465_Bereft of Hearth and Home.json similarity index 68% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2465_Bereft of Hearth and Home.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2465_Bereft of Hearth and Home.json index f591d162f..240721c79 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2465_Bereft of Hearth and Home.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2465_Bereft of Hearth and Home.json @@ -12,6 +12,7 @@ "Y": 0.598051, "Z": -81.498474 }, + "StopDistance": 7, "TerritoryId": 635, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Rhalgr's Reach", @@ -50,7 +51,15 @@ }, "TerritoryId": 635, "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": 2008160, @@ -61,7 +70,25 @@ }, "TerritoryId": 635, "InteractionType": "Interact", - "$": "1 16 0 0 0 128 -> 2 32 0 0 0 160" + "$": "1 16 0 0 0 128 -> 2 32 0 0 0 160", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "Position": { + "X": -128.45901, + "Y": 0.59804773, + "Z": -52.17099 + }, + "TerritoryId": 635, + "InteractionType": "WalkTo", + "DisableNavmesh": true }, { "DataId": 2008159, @@ -71,7 +98,15 @@ "Z": -33.707214 }, "TerritoryId": 635, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, @@ -91,4 +126,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2466_Divide and Conquer.json b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2466_Divide and Conquer.json similarity index 98% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2466_Divide and Conquer.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2466_Divide and Conquer.json index 1e7d58756..b82b0faaf 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2466_Divide and Conquer.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2466_Divide and Conquer.json @@ -12,6 +12,7 @@ "Y": -3.968323E-12, "Z": -19.821533 }, + "StopDistance": 5, "TerritoryId": 635, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Rhalgr's Reach", @@ -74,4 +75,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2467_Lies, Damn Lies, and Pirates.json b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2467_Lies, Damn Lies, and Pirates.json similarity index 100% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2467_Lies, Damn Lies, and Pirates.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2467_Lies, Damn Lies, and Pirates.json diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2468_Tales from the Far East.json b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2468_Tales from the Far East.json similarity index 79% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2468_Tales from the Far East.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2468_Tales from the Far East.json index 255831fe4..9ffa0655a 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2468_Tales from the Far East.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2468_Tales from the Far East.json @@ -56,7 +56,15 @@ }, "TerritoryId": 351, "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": 1020529, @@ -67,7 +75,15 @@ }, "TerritoryId": 351, "InteractionType": "Interact", - "$": "1 0 0 0 0 128 -> 2 0 0 0 0 160" + "$": "1 0 0 0 0 128 -> 2 0 0 0 0 160", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1020528, @@ -77,7 +93,15 @@ "Z": 1.4190674 }, "TerritoryId": 351, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, @@ -108,4 +132,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2469_Not without Incident.json b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2469_Not without Incident.json similarity index 97% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2469_Not without Incident.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2469_Not without Incident.json index d90b46ae5..31f911bf3 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2469_Not without Incident.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2469_Not without Incident.json @@ -53,6 +53,7 @@ "Y": 8.000015, "Z": 45.822754 }, + "StopDistance": 7, "TerritoryId": 129, "InteractionType": "Interact", "DialogueChoices": [ @@ -100,10 +101,11 @@ "Y": -6.9999976, "Z": -58.884644 }, + "StopDistance": 5, "TerritoryId": 628, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2635_Future Rust, Future Dust.json b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2635_Future Rust, Future Dust.json new file mode 100644 index 000000000..e0a4faba8 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2635_Future Rust, Future Dust.json @@ -0,0 +1,174 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "JerryWester", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1019470, + "Position": { + "X": 152.11719, + "Y": 13.1533165, + "Z": -118.48633 + }, + "TerritoryId": 635, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Rhalgr's Reach", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1019473, + "Position": { + "X": 51.285522, + "Y": 23.640764, + "Z": -288.96008 + }, + "TerritoryId": 635, + "InteractionType": "Interact", + "$": "0 16 0 0 0 0 -> 1 16 0 0 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1019476, + "Position": { + "X": 77.25635, + "Y": 0, + "Z": -14.175659 + }, + "TerritoryId": 635, + "InteractionType": "Interact", + "AetheryteShortcut": "Rhalgr's Reach", + "$": "1 16 0 0 0 128 -> 2 16 0 0 0 160", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "Position": { + "X": 0.3239292, + "Y": -2.1258624, + "Z": 5.0789523 + }, + "TerritoryId": 635, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] + } + } + }, + { + "Position": { + "X": -42.27211, + "Y": -0.059376776, + "Z": -115.03399 + }, + "TerritoryId": 635, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + } + }, + { + "DataId": 1019486, + "Position": { + "X": -116.746826, + "Y": 0.6342248, + "Z": -55.832825 + }, + "TerritoryId": 635, + "InteractionType": "Interact", + "$": "2 16 0 0 0 160 -> 3 16 0 0 0 176", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] + }, + { + "DataId": 1019490, + "Position": { + "X": -6.240967, + "Y": -0.036807638, + "Z": -119.18823 + }, + "TerritoryId": 635, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 79.89871, + "Y": -0.38368523, + "Z": -108.87432 + }, + "TerritoryId": 635, + "InteractionType": "WalkTo" + }, + { + "DataId": 1019470, + "Position": { + "X": 152.11719, + "Y": 13.1533165, + "Z": -118.48633 + }, + "TerritoryId": 635, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2636_A Dash of Green.json b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2636_A Dash of Green.json similarity index 61% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2636_A Dash of Green.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2636_A Dash of Green.json index 5eeefb287..2757ce4e5 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2636_A Dash of Green.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2636_A Dash of Green.json @@ -50,18 +50,54 @@ }, "TerritoryId": 635, "InteractionType": "Interact", - "$": "0 32 0 0 0 0 -> 1 48 0 0 0 16" + "$": "0 32 0 0 0 0 -> 1 48 0 0 0 16", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { - "DataId": 2007952, "Position": { - "X": -33.40204, - "Y": -0.16790771, - "Z": -16.800232 + "X": 35.282135, + "Y": -2.2715392, + "Z": -115.13004 + }, + "TerritoryId": 635, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + } + }, + { + "DataId": 2007951, + "Position": { + "X": 24.887451, + "Y": -0.3204956, + "Z": -119.85962 }, "TerritoryId": 635, "InteractionType": "Interact", - "$": "1 48 0 0 0 16 -> 2 64 0 0 0 80" + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 2007953, @@ -72,17 +108,35 @@ }, "TerritoryId": 635, "InteractionType": "Interact", - "$": "2 64 0 0 0 80 -> 3 80 0 0 0 112" + "AetheryteShortcut": "Rhalgr's Reach", + "$": "2 64 0 0 0 80 -> 3 80 0 0 0 112", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { - "DataId": 2007951, + "DataId": 2007952, "Position": { - "X": 24.887451, - "Y": -0.3204956, - "Z": -119.85962 + "X": -33.40204, + "Y": -0.16790771, + "Z": -16.800232 }, "TerritoryId": 635, - "InteractionType": "Interact" + "InteractionType": "Interact", + "$": "1 48 0 0 0 16 -> 2 64 0 0 0 80", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, @@ -91,13 +145,13 @@ "Steps": [ { "Position": { - "X": 82.545715, - "Y": 0.11367369, - "Z": -105.210686 + "X": 0.3266226, + "Y": -2.281856, + "Z": -3.879818 }, "TerritoryId": 635, "InteractionType": "WalkTo", - "Mount": false + "Mount": true }, { "DataId": 1019476, @@ -112,4 +166,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2637_Ye Wayward Brothers.json b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2637_Ye Wayward Brothers.json similarity index 64% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2637_Ye Wayward Brothers.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2637_Ye Wayward Brothers.json index 110d51ecf..c19ea6c23 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2637_Ye Wayward Brothers.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2637_Ye Wayward Brothers.json @@ -5,6 +5,16 @@ { "Sequence": 0, "Steps": [ + { + "Position": { + "X": 0.3266226, + "Y": -2.281856, + "Z": -3.879818 + }, + "TerritoryId": 635, + "InteractionType": "WalkTo", + "Mount": true + }, { "DataId": 1021167, "Position": { @@ -35,7 +45,15 @@ }, "TerritoryId": 635, "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": 1021169, @@ -46,7 +64,15 @@ }, "TerritoryId": 635, "InteractionType": "Interact", - "$": "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 + ] }, { "DataId": 1021171, @@ -57,7 +83,15 @@ }, "TerritoryId": 635, "InteractionType": "Interact", - "$": "2 0 0 0 0 192 -> 3 0 0 0 0 208" + "$": "2 0 0 0 0 192 -> 3 0 0 0 0 208", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "DataId": 1021170, @@ -68,7 +102,15 @@ }, "TerritoryId": 635, "InteractionType": "Interact", - "$": "3 0 0 0 0 208 -> 4 0 0 0 0 240" + "$": "3 0 0 0 0 208 -> 4 0 0 0 0 240", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1021172, @@ -78,7 +120,15 @@ "Z": -144.15204 }, "TerritoryId": 635, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] } ] }, @@ -102,4 +152,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2638_Token of Faith.json b/QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2638_Token of Faith.json similarity index 100% rename from QuestPaths/4.x - Stormblood/MSQ/A1-Fringes 1, Peaks 1/2638_Token of Faith.json rename to QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2638_Token of Faith.json diff --git a/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2470_The Man from Ul'dah.json b/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2470_The Man from Ul'dah.json similarity index 95% rename from QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2470_The Man from Ul'dah.json rename to QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2470_The Man from Ul'dah.json index c0eacaefb..18ae1d015 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2470_The Man from Ul'dah.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2470_The Man from Ul'dah.json @@ -12,6 +12,7 @@ "Y": -6.9999976, "Z": -55.832825 }, + "StopDistance": 5, "TerritoryId": 628, "InteractionType": "AcceptQuest" } @@ -27,6 +28,7 @@ "Y": -2.711526, "Z": -58.396362 }, + "StopDistance": 5, "TerritoryId": 628, "InteractionType": "Interact" } @@ -58,4 +60,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2471_Where the Streets Are Paved with Koban.json b/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2471_Where the Streets Are Paved with Koban.json similarity index 100% rename from QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2471_Where the Streets Are Paved with Koban.json rename to QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2471_Where the Streets Are Paved with Koban.json diff --git a/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2472_By the Grace of Lord Lolorito.json b/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2472_By the Grace of Lord Lolorito.json similarity index 97% rename from QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2472_By the Grace of Lord Lolorito.json rename to QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2472_By the Grace of Lord Lolorito.json index 5d1597fbe..bc6f6073e 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2472_By the Grace of Lord Lolorito.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2472_By the Grace of Lord Lolorito.json @@ -53,10 +53,11 @@ "Y": 0, "Z": -0.96136475 }, + "StopDistance": 7, "TerritoryId": 639, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2473_A Good Samurai Is Hard to Find.json b/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2473_A Good Samurai Is Hard to Find.json similarity index 63% rename from QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2473_A Good Samurai Is Hard to Find.json rename to QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2473_A Good Samurai Is Hard to Find.json index 1cf9f01c3..2a683b4cf 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2473_A Good Samurai Is Hard to Find.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2473_A Good Samurai Is Hard to Find.json @@ -12,6 +12,7 @@ "Y": 0, "Z": -0.96136475 }, + "StopDistance": 7, "TerritoryId": 639, "InteractionType": "AcceptQuest" } @@ -111,7 +112,15 @@ "[Kugane] Shiokaze Hostelry", "[Kugane] Kogane Dori Markets" ], - "$": "? ? ? ? ? ? -> 16 16 16 0 0 32" + "$": "? ? ? ? ? ? -> 16 16 16 0 0 32", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1020469, @@ -122,7 +131,15 @@ }, "TerritoryId": 628, "InteractionType": "Interact", - "$": "16 16 16 0 0 32 -> 32 17 16 0 0 160" + "$": "16 16 16 0 0 32 -> 32 17 16 0 0 160", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1020470, @@ -132,13 +149,70 @@ "Z": 86.96118 }, "TerritoryId": 628, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, { "Sequence": 255, "Steps": [ + { + "Position": { + "X": -132.33249, + "Y": 4.510561, + "Z": 117.53347 + }, + "StopDistance": 0.25, + "TerritoryId": 628, + "InteractionType": "Jump", + "JumpDestination": { + "Position": { + "X": -131.75923, + "Y": 6.245034, + "Z": 123.01645 + }, + "StopDistance": 0.5 + } + }, + { + "Position": { + "X": -125.70999, + "Y": 8.414458, + "Z": 123.2643 + }, + "TerritoryId": 628, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, + { + "Position": { + "X": -124.25544, + "Y": -4.999999, + "Z": 145.54941 + }, + "TerritoryId": 628, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, + { + "TerritoryId": 628, + "InteractionType": "AttuneAethernetShard", + "AethernetShard": "[Kugane] Pier #1", + "DisableNavmesh": true + }, + { + "TerritoryId": 628, + "InteractionType": "AttuneAethernetShard", + "AethernetShard": "[Kugane] Thavnairian Consulate" + }, { "DataId": 1020472, "Position": { @@ -149,11 +223,11 @@ "TerritoryId": 628, "InteractionType": "CompleteQuest", "AethernetShortcut": [ - "[Kugane] Kogane Dori Markets", + "[Kugane] Thavnairian Consulate", "[Kugane] Shiokaze Hostelry" ] } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2474_It's Probably a Trap.json b/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2474_It's Probably a Trap.json similarity index 100% rename from QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2474_It's Probably a Trap.json rename to QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2474_It's Probably a Trap.json diff --git a/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2475_Making the Catfish Sing.json b/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2475_Making the Catfish Sing.json similarity index 98% rename from QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2475_Making the Catfish Sing.json rename to QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2475_Making the Catfish Sing.json index 7308b159b..138f55946 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2475_Making the Catfish Sing.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2475_Making the Catfish Sing.json @@ -110,10 +110,11 @@ "Y": 14.650923, "Z": -101.701416 }, + "StopDistance": 7, "TerritoryId": 628, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2476_Once More, to the Ruby Sea.json b/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2476_Once More, to the Ruby Sea.json similarity index 85% rename from QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2476_Once More, to the Ruby Sea.json rename to QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2476_Once More, to the Ruby Sea.json index e544ce612..f57c09aab 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane 1/2476_Once More, to the Ruby Sea.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2476_Once More, to the Ruby Sea.json @@ -12,6 +12,7 @@ "Y": 14.054269, "Z": -99.47363 }, + "StopDistance": 7, "TerritoryId": 628, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Kugane", @@ -46,16 +47,6 @@ { "Sequence": 2, "Steps": [ - { - "TerritoryId": 628, - "InteractionType": "AttuneAethernetShard", - "AethernetShard": "[Kugane] Thavnairian Consulate" - }, - { - "TerritoryId": 628, - "InteractionType": "AttuneAethernetShard", - "AethernetShard": "[Kugane] Pier #1" - }, { "DataId": 1020485, "Position": { @@ -73,7 +64,7 @@ } ], "AethernetShortcut": [ - "[Kugane] Pier #1", + "[Kugane] The Ruby Bazaar", "[Kugane] Shiokaze Hostelry" ] } @@ -89,10 +80,11 @@ "Y": 5.923008, "Z": 847.7759 }, + "StopDistance": 7, "TerritoryId": 613, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2477_Open Water.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2477_Open Water.json similarity index 98% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2477_Open Water.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2477_Open Water.json index bf5d6b136..8c8d4af1a 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2477_Open Water.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2477_Open Water.json @@ -12,6 +12,7 @@ "Y": 5.923008, "Z": 847.7759 }, + "StopDistance": 7, "TerritoryId": 613, "InteractionType": "AcceptQuest" } @@ -72,4 +73,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2478_Boys with Boats.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2478_Boys with Boats.json similarity index 69% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2478_Boys with Boats.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2478_Boys with Boats.json index 99ba95f0d..80b914170 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2478_Boys with Boats.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2478_Boys with Boats.json @@ -31,6 +31,17 @@ "InteractionType": "AttuneAetherCurrent", "AetherCurrentId": 2818178 }, + { + "Position": { + "X": 375.51163, + "Y": 9.2976055, + "Z": 788.4051 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "Mount": true + }, { "DataId": 2007848, "Position": { @@ -53,6 +64,7 @@ "Y": -0.5, "Z": 499.32092 }, + "StopDistance": 7, "TerritoryId": 613, "InteractionType": "Interact" } @@ -61,6 +73,23 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 377.86084, + "Y": 10.638865, + "Z": 792.4622 + }, + "StopDistance": 0.5, + "TerritoryId": 613, + "InteractionType": "Jump", + "JumpDestination": { + "Position": { + "X": 384.9748, + "Y": 14.661837, + "Z": 793.96063 + } + } + }, { "DataId": 1023650, "Position": { @@ -74,4 +103,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2479_To Bend with the Wind.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2479_To Bend with the Wind.json similarity index 92% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2479_To Bend with the Wind.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2479_To Bend with the Wind.json index 96a82f351..991de741b 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2479_To Bend with the Wind.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2479_To Bend with the Wind.json @@ -35,6 +35,15 @@ { "Sequence": 2, "Steps": [ + { + "Position": { + "X": 553.3004, + "Y": 0.94003797, + "Z": 833.7598 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo" + }, { "DataId": 1019915, "Position": { @@ -64,6 +73,7 @@ "Y": -0.10000001, "Z": -301.83875 }, + "StopDistance": 5, "TerritoryId": 613, "InteractionType": "Interact" } @@ -79,6 +89,7 @@ "Y": 2.129947, "Z": -312.3064 }, + "StopDistance": 5, "TerritoryId": 613, "InteractionType": "Interact" } @@ -157,4 +168,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2480_Confederate Consternation.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2480_Confederate Consternation.json similarity index 67% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2480_Confederate Consternation.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2480_Confederate Consternation.json index b7e169bc7..014e931b6 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2480_Confederate Consternation.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2480_Confederate Consternation.json @@ -12,6 +12,7 @@ "Y": 2.0040545, "Z": -598.2605 }, + "StopDistance": 5, "TerritoryId": 613, "InteractionType": "AcceptQuest" } @@ -126,7 +127,36 @@ }, "TerritoryId": 613, "InteractionType": "Interact", - "$": "0 0 0 0 0 0 -> 16 1 0 0 0 128" + "$": "0 0 0 0 0 0 -> 16 1 0 0 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "Position": { + "X": 28.796398, + "Y": 1.1177638, + "Z": -561.9825 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + } }, { "DataId": 1021508, @@ -137,7 +167,15 @@ }, "TerritoryId": 613, "InteractionType": "Interact", - "$": "16 1 0 0 0 128 -> 33 1 0 0 0 160" + "$": "16 1 0 0 0 128 -> 33 1 0 0 0 160", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 2007854, @@ -147,13 +185,49 @@ "Z": -521.32446 }, "TerritoryId": 613, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, { "Sequence": 255, "Steps": [ + { + "Position": { + "X": -61.59895, + "Y": 0.75750256, + "Z": -577.81134 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": 47.88596, + "Y": 2.0565174, + "Z": -591.9783 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": 47.516483, + "Y": 8.753822, + "Z": -612.76074 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, { "DataId": 1019939, "Position": { @@ -167,4 +241,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2481_Alisaie's Stones.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2481_Alisaie's Stones.json similarity index 99% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2481_Alisaie's Stones.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2481_Alisaie's Stones.json index 64c4689ab..fbe35d079 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2481_Alisaie's Stones.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2481_Alisaie's Stones.json @@ -33,6 +33,7 @@ "Y": 4.1046753, "Z": -603.87585 }, + "StopDistance": 4, "TerritoryId": 613, "InteractionType": "Interact" } @@ -139,4 +140,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2482_Under the Sea.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2482_Under the Sea.json similarity index 88% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2482_Under the Sea.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2482_Under the Sea.json index d42d25d64..ff2d8b3da 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2482_Under the Sea.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2482_Under the Sea.json @@ -41,6 +41,16 @@ { "Sequence": 2, "Steps": [ + { + "Position": { + "X": 159.34975, + "Y": -0.60327315, + "Z": -494.75882 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, { "Position": { "X": 529.52386, @@ -106,11 +116,11 @@ "Y": -98.96018, "Z": -223.10223 }, + "StopDistance": 5, "TerritoryId": 613, - "InteractionType": "CompleteQuest", - "AetheryteShortcut": "Ruby Sea - Tamamizu" + "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2483_Of Kojin and Kami.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2483_Of Kojin and Kami.json similarity index 83% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2483_Of Kojin and Kami.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2483_Of Kojin and Kami.json index ecd81ca39..9a2e5bb72 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2483_Of Kojin and Kami.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2483_Of Kojin and Kami.json @@ -12,6 +12,7 @@ "Y": -99.19678, "Z": -221.36267 }, + "StopDistance": 7, "TerritoryId": 613, "InteractionType": "AcceptQuest" } @@ -57,9 +58,18 @@ }, { "Position": { - "X": 566.1683, - "Y": -60.550995, - "Z": -134.80696 + "X": 543.42303, + "Y": -61.394184, + "Z": -153.51427 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": 647.60547, + "Y": 3.3050807, + "Z": -55.93293 }, "TerritoryId": 613, "InteractionType": "WalkTo" @@ -95,9 +105,10 @@ "Z": -221.36267 }, "TerritoryId": 613, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ruby Sea - Tamamizu" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2484_In Soroban We Trust.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2484_In Soroban We Trust.json similarity index 91% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2484_In Soroban We Trust.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2484_In Soroban We Trust.json index 45f71a7dc..b3a2e566a 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2484_In Soroban We Trust.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2484_In Soroban We Trust.json @@ -43,12 +43,13 @@ "Steps": [ { "Position": { - "X": 23.288645, + "X": 22.288645, "Y": -196.2301, - "Z": -156.5739 + "Z": -155.5739 }, "TerritoryId": 613, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "$": "Sui-no-Sato, NE outside" }, { "DataId": 1019970, @@ -64,4 +65,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2485_Forever and Ever Apart.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2485_Forever and Ever Apart.json similarity index 100% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2485_Forever and Ever Apart.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2485_Forever and Ever Apart.json diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2486_In Darkness the Magatama Dreams.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2486_In Darkness the Magatama Dreams.json similarity index 95% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2486_In Darkness the Magatama Dreams.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2486_In Darkness the Magatama Dreams.json index 21612e697..9b97dfe0a 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2486_In Darkness the Magatama Dreams.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2486_In Darkness the Magatama Dreams.json @@ -22,13 +22,13 @@ "Steps": [ { "Position": { - "X": 20.067955, + "X": 21.067955, "Y": -197.78902, - "Z": -154.23956 + "Z": -155.23956 }, "TerritoryId": 613, "InteractionType": "WalkTo", - "StopDistance": 0.25 + "$": "Sui-no-Sato, NE inside" }, { "DataId": 1019978, @@ -92,4 +92,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2487_The Whims of the Divine.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2487_The Whims of the Divine.json similarity index 93% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2487_The Whims of the Divine.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2487_The Whims of the Divine.json index 28885b77c..12ab0d5b4 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2487_The Whims of the Divine.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2487_The Whims of the Divine.json @@ -13,7 +13,8 @@ "Z": 185.74805 }, "TerritoryId": 613, - "InteractionType": "AcceptQuest" + "InteractionType": "AcceptQuest", + "Mount": false } ] }, @@ -49,4 +50,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2488_Breaking and Delivering.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2488_Breaking and Delivering.json similarity index 93% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2488_Breaking and Delivering.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2488_Breaking and Delivering.json index 5440d345d..9727c165b 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2488_Breaking and Delivering.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2488_Breaking and Delivering.json @@ -78,12 +78,22 @@ "TerritoryId": 613, "InteractionType": "WalkTo" }, + { + "Position": { + "X": -721.99646, + "Y": 0.08899796, + "Z": 248.7757 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo" + }, { "Position": { "X": -739.8565, "Y": 4.6514797, "Z": 233.82903 }, + "StopDistance": 0.5, "TerritoryId": 613, "InteractionType": "Combat", "EnemySpawnType": "AutoOnEnterArea", @@ -103,6 +113,7 @@ "Y": 6.9741554, "Z": 19.126472 }, + "StopDistance": 0.5, "TerritoryId": 613, "InteractionType": "Combat", "EnemySpawnType": "AutoOnEnterArea", @@ -171,4 +182,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2489_The Lord of the Revel.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2489_The Lord of the Revel.json similarity index 83% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2489_The Lord of the Revel.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2489_The Lord of the Revel.json index af04f5c50..be1b52ee3 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2489_The Lord of the Revel.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2489_The Lord of the Revel.json @@ -50,14 +50,22 @@ "Steps": [ { "Position": { - "X": -650.14386, - "Y": -21.460977, - "Z": -278.10513 + "X": -596.66895, + "Y": -45.822067, + "Z": -272.77194 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": -625.9836, + "Y": -0.5999986, + "Z": -278.578 }, "TerritoryId": 613, "InteractionType": "WalkTo", - "Fly": true, - "StopDistance": 0.25 + "DisableNavmesh": true }, { "DataId": 1019987, @@ -87,4 +95,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2490_Tide Goes in, Imperials Go Out.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2490_Tide Goes in, Imperials Go Out.json similarity index 60% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2490_Tide Goes in, Imperials Go Out.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2490_Tide Goes in, Imperials Go Out.json index d3e86ec10..a78c4ffaa 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2490_Tide Goes in, Imperials Go Out.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2490_Tide Goes in, Imperials Go Out.json @@ -29,22 +29,34 @@ }, "TerritoryId": 613, "InteractionType": "Interact", - "$": "0 0 0 0 0 0 -> 0 16 0 0 0 64" + "$": "0 0 0 0 0 0 -> 0 16 0 0 0 64", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "Position": { - "X": -796.88367, - "Y": 7.982711, - "Z": -415.81467 + "X": -796.8525, + "Y": 8.05057, + "Z": -418.3381 }, "TerritoryId": 613, - "InteractionType": "Jump", - "Mount": true, - "JumpDestination": { - "Position": { - "X": -794.9495, - "Y": 5.107234, - "Z": -411.20563 + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } } }, @@ -57,7 +69,16 @@ }, "TerritoryId": 613, "InteractionType": "Interact", - "$": "0 16 0 0 0 64 -> 16 32 0 0 0 192" + "$": "0 16 0 0 0 64 -> 16 32 0 0 0 192", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ], + "DisableNavmesh": true }, { "DataId": 1019992, @@ -67,7 +88,15 @@ "Z": -480.24725 }, "TerritoryId": 613, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] } ] }, @@ -87,4 +116,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2491_A Silence in Three Parts.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2491_A Silence in Three Parts.json similarity index 97% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2491_A Silence in Three Parts.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2491_A Silence in Three Parts.json index 10a2f886f..07fe24aab 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2491_A Silence in Three Parts.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2491_A Silence in Three Parts.json @@ -12,6 +12,7 @@ "Y": 4.763445, "Z": -460.01373 }, + "StopDistance": 5, "TerritoryId": 613, "InteractionType": "AcceptQuest" } @@ -63,4 +64,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2679_The Last Voyage.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2679_The Last Voyage.json similarity index 100% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2679_The Last Voyage.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2679_The Last Voyage.json diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2681_The Solace of the Sea.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2681_The Solace of the Sea.json similarity index 88% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2681_The Solace of the Sea.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2681_The Solace of the Sea.json index e1130a620..87c8e4e08 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2681_The Solace of the Sea.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2681_The Solace of the Sea.json @@ -41,6 +41,15 @@ { "Sequence": 2, "Steps": [ + { + "Position": { + "X": 97.741745, + "Y": 0.95900655, + "Z": -790.4652 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo" + }, { "DataId": 1022959, "Position": { @@ -70,4 +79,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2953_The Arrows of Misfortune.json b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2953_The Arrows of Misfortune.json similarity index 88% rename from QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2953_The Arrows of Misfortune.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2953_The Arrows of Misfortune.json index 65fd83e77..84d1d3f57 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A3-Ruby Sea 1/2953_The Arrows of Misfortune.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2953_The Arrows of Misfortune.json @@ -5,6 +5,21 @@ { "Sequence": 0, "Steps": [ + { + "Position": { + "X": 52.668243, + "Y": 4.323245, + "Z": -600.21014 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Ruby Sea - Onokoro", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + }, { "DataId": 1021507, "Position": { @@ -14,12 +29,7 @@ }, "TerritoryId": 613, "InteractionType": "AcceptQuest", - "AetheryteShortcut": "Ruby Sea - Onokoro", - "SkipConditions": { - "AetheryteShortcutIf": { - "InSameTerritory": true - } - } + "DisableNavmesh": true } ] }, @@ -88,4 +98,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2492_Life after Doma.json b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2492_Life after Doma.json similarity index 100% rename from QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2492_Life after Doma.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2492_Life after Doma.json diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2493_The Stubborn Remainder.json b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2493_The Stubborn Remainder.json similarity index 75% rename from QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2493_The Stubborn Remainder.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2493_The Stubborn Remainder.json index 85177fbf4..2fd01521a 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2493_The Stubborn Remainder.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2493_The Stubborn Remainder.json @@ -45,7 +45,15 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "$": "0 0 0 0 0 0 -> 17 0 0 0 0 64" + "$": "0 0 0 0 0 0 -> 17 0 0 0 0 64", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1022719, @@ -63,6 +71,14 @@ "Prompt": "TEXT_STMBDA317_02493_Q1_100_040", "Answer": "TEXT_STMBDA317_02493_A1_102_040" } + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 ] }, { @@ -74,7 +90,15 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "$": "33 16 0 0 0 96 -> 49 17 0 0 0 112" + "$": "33 16 0 0 0 96 -> 49 17 0 0 0 112", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "DataId": 1020015, @@ -85,7 +109,15 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "Mount": true + "Mount": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } ] }, @@ -105,4 +137,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2494_The Ones We Leave Behind.json b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2494_The Ones We Leave Behind.json similarity index 100% rename from QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2494_The Ones We Leave Behind.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2494_The Ones We Leave Behind.json diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2495_A New Ruby Tithe.json b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2495_A New Ruby Tithe.json similarity index 93% rename from QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2495_A New Ruby Tithe.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2495_A New Ruby Tithe.json index 8cf66b41c..44420f7ac 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2495_A New Ruby Tithe.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2495_A New Ruby Tithe.json @@ -26,6 +26,16 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": 417.0395, + "Y": 68.028534, + "Z": -109.489944 + }, + "TerritoryId": 614, + "InteractionType": "WalkTo", + "Mount": true + }, { "DataId": 2007838, "Position": { @@ -159,4 +169,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2496_The Will to Live.json b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2496_The Will to Live.json similarity index 99% rename from QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2496_The Will to Live.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2496_The Will to Live.json index 57ce4532e..040ec25b8 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2496_The Will to Live.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2496_The Will to Live.json @@ -181,4 +181,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2497_Daughter of the Deep.json b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2497_Daughter of the Deep.json similarity index 97% rename from QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2497_Daughter of the Deep.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2497_Daughter of the Deep.json index 1b4bc1a78..0ca80fb54 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2497_Daughter of the Deep.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2497_Daughter of the Deep.json @@ -20,6 +20,10 @@ { "Sequence": 1, "Steps": [ + { + "TerritoryId": 614, + "InteractionType": "EquipRecommended" + }, { "DataId": 2008011, "Position": { @@ -183,4 +187,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2498_The Time between the Seconds.json b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2498_The Time between the Seconds.json similarity index 97% rename from QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2498_The Time between the Seconds.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2498_The Time between the Seconds.json index cdb839cae..95052575e 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2498_The Time between the Seconds.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2498_The Time between the Seconds.json @@ -42,6 +42,7 @@ "Y": 16.932724, "Z": 577.4165 }, + "StopDistance": 7, "TerritoryId": 614, "InteractionType": "SinglePlayerDuty" } @@ -63,4 +64,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2499_All the Little Angels.json b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2499_All the Little Angels.json similarity index 70% rename from QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2499_All the Little Angels.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2499_All the Little Angels.json index 0243f2d78..a458a5d6f 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2499_All the Little Angels.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2499_All the Little Angels.json @@ -12,6 +12,7 @@ "Y": 8.442365, "Z": 373.22034 }, + "StopDistance": 7, "TerritoryId": 614, "InteractionType": "AcceptQuest" } @@ -45,7 +46,15 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "$": "0 0 0 0 0 0 -> 1 0 0 0 0 64" + "$": "0 0 0 0 0 0 -> 1 0 0 0 0 64", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1020063, @@ -56,7 +65,15 @@ }, "TerritoryId": 614, "InteractionType": "Interact", - "$": "1 0 0 0 0 64 -> 2 0 0 0 0 192" + "$": "1 0 0 0 0 64 -> 2 0 0 0 0 192", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1020065, @@ -68,7 +85,15 @@ "TerritoryId": 614, "InteractionType": "Interact", "Mount": true, - "$": "2 0 0 0 0 192 -> 3 0 0 0 0 224" + "$": "2 0 0 0 0 192 -> 3 0 0 0 0 224", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1020066, @@ -78,7 +103,15 @@ "Z": -73.56378 }, "TerritoryId": 614, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] } ] }, @@ -98,4 +131,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2934_A Glimpse of Madness.json b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2934_A Glimpse of Madness.json similarity index 72% rename from QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2934_A Glimpse of Madness.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2934_A Glimpse of Madness.json index ba5ac0420..3672ff6ce 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2934_A Glimpse of Madness.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2934_A Glimpse of Madness.json @@ -12,6 +12,7 @@ "Y": 3.6584158, "Z": -377.5235 }, + "StopDistance": 5, "TerritoryId": 614, "InteractionType": "AcceptQuest" } @@ -32,7 +33,15 @@ }, "TerritoryId": 681, "InteractionType": "Interact", - "$": "0 0 0 0 0 0 -> 16 1 0 0 0 128" + "$": "0 0 0 0 0 0 -> 16 1 0 0 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1020010, @@ -43,7 +52,15 @@ }, "TerritoryId": 681, "InteractionType": "Interact", - "$": "16 1 0 0 0 128 -> 32 17 0 0 0 160" + "$": "16 1 0 0 0 128 -> 32 17 0 0 0 160", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1020009, @@ -53,7 +70,15 @@ "Z": -31.845642 }, "TerritoryId": 681, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, @@ -80,4 +105,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2935_Path of No Return.json b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2935_Path of No Return.json similarity index 79% rename from QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2935_Path of No Return.json rename to QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2935_Path of No Return.json index 818492d7a..807fdc0e4 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/A4-Yanxia 1/2935_Path of No Return.json +++ b/QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia/2935_Path of No Return.json @@ -12,6 +12,7 @@ "Y": -0.2509899, "Z": -25.742065 }, + "StopDistance": 7, "TerritoryId": 681, "InteractionType": "AcceptQuest" } @@ -28,13 +29,23 @@ "Z": -43.320435 }, "TerritoryId": 614, - "InteractionType": "Interact" + "InteractionType": "Interact", + "AetheryteShortcut": "Yanxia - Namai" } ] }, { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 161.05653, + "Y": -0.299994, + "Z": 191.03581 + }, + "TerritoryId": 614, + "InteractionType": "WalkTo" + }, { "DataId": 2008013, "Position": { @@ -59,4 +70,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 6182b0528..c8533fdf6 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -715,7 +715,8 @@ "lookout", "kneel", "bow", - "uchiwasshoi" + "uchiwasshoi", + "clap" ] } } diff --git a/Questionable.Model/Questing/Converter/EmoteConverter.cs b/Questionable.Model/Questing/Converter/EmoteConverter.cs index 5de1c5c5b..28e102ee7 100644 --- a/Questionable.Model/Questing/Converter/EmoteConverter.cs +++ b/Questionable.Model/Questing/Converter/EmoteConverter.cs @@ -30,5 +30,6 @@ public sealed class EmoteConverter() : EnumConverter(Values) { EEmote.Kneel, "kneel" }, { EEmote.Bow, "bow" }, { EEmote.Uchiwasshoi, "uchiwasshoi" }, + { EEmote.Clap, "clap" }, }; } diff --git a/Questionable.Model/Questing/EEmote.cs b/Questionable.Model/Questing/EEmote.cs index c03be6110..b5e825a34 100644 --- a/Questionable.Model/Questing/EEmote.cs +++ b/Questionable.Model/Questing/EEmote.cs @@ -31,4 +31,5 @@ public enum EEmote Kneel = 19, Bow = 5, Uchiwasshoi = 278, + Clap = 7, }