From b044e5181fad9fa59a0ceb1f61824d90d2788b94 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Fri, 26 Jul 2024 17:17:02 +0200 Subject: [PATCH] Minor cleanup for HW part 1 --- .../1744_Bridge over Frozen Water.json | 12 +- .../1759_Protecting What's Important.json | 0 .../1760_Baby Steps.json | 0 .../2111_For All the Nights to Come.json | 0 .../1819_The Bathing Bully.json | 5 +- .../The Churning Mists/1823_Road Kill.json | 11 +- .../1771_Some Bad News.json | 113 +++++++++++++++++- .../1790_Stolen Munitions.json | 13 +- .../1797_The Hunter Becomes the Kweh.json | 113 +++++++++++++++++- .../1802_A Lesson in Humility.json | 21 +++- .../1580_Coming to Ishgard.json | 0 .../1581_Taking in the Sights.json | 3 +- .../1582_The Better Half.json | 0 .../1583_Over the Wall.json | 5 +- .../1584_Work in Progress.json | 30 ++++- .../1585_The First and Foremost.json | 11 +- .../1586_From on High.json | 0 .../1587_Reconnaissance Lost.json | 0 .../1588_At the End of Our Hope.json | 6 +- .../1589_Knights Be Not Proud.json | 0 .../1590_Onwards and Upwards.json | 0 .../1591_An Indispensable Ally.json | 0 .../1592_Meeting the Neighbors.json | 31 ++++- .../1593_Sense of Urgency.json | 82 +++++++++++-- .../1594_Hope Springs Eternal.json | 11 +- .../1595_A Series of Unfortunate Events.json | 3 +- .../1596_A Reward Long in Coming.json | 0 .../1597_Divine Intervention.json | 3 +- .../1598_Disclosure.json | 0 .../1599_Flame General Affairs.json | 0 .../1600_In Search of Raubahn.json | 3 +- .../1601_Keeping the Flame Alive.json | 3 +- .../1602_To Siege or Not to Siege.json | 0 .../1603_Alphinaud's Way.json | 4 +- .../1604_In Search of Iceheart.json | 47 +++++++- .../1605_From One Heretic to Another.json | 53 +++++++- .../1606_Sounding Out the Amphitheatre.json | 46 ++++++- .../1607_Camp of the Convictors.json | 32 ++++- .../1608_Purple Flame, Purple Flame.json | 0 .../1609_Where the Chocobos Roam.json | 13 +- .../1610_Worse than Dragons.json | 4 +- .../1611_The Trine Towers.json | 5 +- .../1612_Gifts for the Outcasts.json | 0 .../1613_The Nonmind.json | 0 .../1614_A Gnathic Deity.json | 45 ++++++- .../1615_Breaking into Hives.json | 13 +- .../1616_Lord of the Hive.json | 39 +++++- .../1617_Mourn in Passing.json | 15 ++- .../1618_Beyond the Clouds.json | 32 ++++- .../1619_Mountaintop Diplomacy.json | 5 +- .../1620_Moghan's Trial.json | 53 ++++++-- .../1621_Mogmug's Trial.json | 23 +++- .../1622_Mogwin's Trial.json | 60 +++++++++- .../1623_Moglin's Judgment.json | 71 +++++++++-- .../1624_Leaving Moghome.json | 3 +- .../1625_The Road to Zenith.json | 0 .../1626_Waiting for the Wind to Change.json | 12 +- .../1627_Heart of Ice.json | 29 ++++- .../Misc/2107_Sights of the North.json | 3 - QuestPaths/Reusable Paths.md | 27 +++++ Questionable.Model/V1/ComplexCombatData.cs | 3 + .../MovementOverrideController.cs | 11 +- 62 files changed, 1021 insertions(+), 106 deletions(-) rename QuestPaths/3.x - Heavensward/Aether Currents/{Western Coerthas Highlands => Coerthas Western Highlands}/1744_Bridge over Frozen Water.json (80%) rename QuestPaths/3.x - Heavensward/Aether Currents/{Western Coerthas Highlands => Coerthas Western Highlands}/1759_Protecting What's Important.json (100%) rename QuestPaths/3.x - Heavensward/Aether Currents/{Western Coerthas Highlands => Coerthas Western Highlands}/1760_Baby Steps.json (100%) rename QuestPaths/3.x - Heavensward/Aether Currents/{Western Coerthas Highlands => Coerthas Western Highlands}/2111_For All the Nights to Come.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1580_Coming to Ishgard.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1581_Taking in the Sights.json (98%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1582_The Better Half.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1583_Over the Wall.json (98%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1584_Work in Progress.json (79%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1585_The First and Foremost.json (87%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1586_From on High.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1587_Reconnaissance Lost.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1588_At the End of Our Hope.json (85%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1589_Knights Be Not Proud.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1590_Onwards and Upwards.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1591_An Indispensable Ally.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1592_Meeting the Neighbors.json (78%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1593_Sense of Urgency.json (53%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1594_Hope Springs Eternal.json (91%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1595_A Series of Unfortunate Events.json (98%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1596_A Reward Long in Coming.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1597_Divine Intervention.json (98%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A1-Coerthas Western Highlands 1, Sea of Clouds 1}/1598_Disclosure.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A2-Raubahn}/1599_Flame General Affairs.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A2-Raubahn}/1600_In Search of Raubahn.json (95%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A2-Raubahn}/1601_Keeping the Flame Alive.json (98%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.1-Coerthas Western Highlands 2}/1602_To Siege or Not to Siege.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.1-Coerthas Western Highlands 2}/1603_Alphinaud's Way.json (97%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.1-Coerthas Western Highlands 2}/1604_In Search of Iceheart.json (75%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.1-Coerthas Western Highlands 2}/1605_From One Heretic to Another.json (55%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.1-Coerthas Western Highlands 2}/1606_Sounding Out the Amphitheatre.json (58%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.1-Coerthas Western Highlands 2}/1607_Camp of the Convictors.json (70%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.1-Coerthas Western Highlands 2}/1608_Purple Flame, Purple Flame.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.2-The Dravanian Forelands}/1609_Where the Chocobos Roam.json (86%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.2-The Dravanian Forelands}/1610_Worse than Dragons.json (97%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.2-The Dravanian Forelands}/1611_The Trine Towers.json (95%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.2-The Dravanian Forelands}/1612_Gifts for the Outcasts.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.2-The Dravanian Forelands}/1613_The Nonmind.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.2-The Dravanian Forelands}/1614_A Gnathic Deity.json (74%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.2-The Dravanian Forelands}/1615_Breaking into Hives.json (88%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.2-The Dravanian Forelands}/1616_Lord of the Hive.json (66%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.2-The Dravanian Forelands}/1617_Mourn in Passing.json (84%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.3-The Churning Mists}/1618_Beyond the Clouds.json (75%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.3-The Churning Mists}/1619_Mountaintop Diplomacy.json (97%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.3-The Churning Mists}/1620_Moghan's Trial.json (61%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.3-The Churning Mists}/1621_Mogmug's Trial.json (68%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.3-The Churning Mists}/1622_Mogwin's Trial.json (63%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.3-The Churning Mists}/1623_Moglin's Judgment.json (58%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.3-The Churning Mists}/1624_Leaving Moghome.json (97%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.3-The Churning Mists}/1625_The Road to Zenith.json (100%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.3-The Churning Mists}/1626_Waiting for the Wind to Change.json (89%) rename QuestPaths/3.x - Heavensward/MSQ/{ => A3.3-The Churning Mists}/1627_Heart of Ice.json (69%) diff --git a/QuestPaths/3.x - Heavensward/Aether Currents/Western Coerthas Highlands/1744_Bridge over Frozen Water.json b/QuestPaths/3.x - Heavensward/Aether Currents/Coerthas Western Highlands/1744_Bridge over Frozen Water.json similarity index 80% rename from QuestPaths/3.x - Heavensward/Aether Currents/Western Coerthas Highlands/1744_Bridge over Frozen Water.json rename to QuestPaths/3.x - Heavensward/Aether Currents/Coerthas Western Highlands/1744_Bridge over Frozen Water.json index cd030b78..8321737b 100644 --- a/QuestPaths/3.x - Heavensward/Aether Currents/Western Coerthas Highlands/1744_Bridge over Frozen Water.json +++ b/QuestPaths/3.x - Heavensward/Aether Currents/Coerthas Western Highlands/1744_Bridge over Frozen Water.json @@ -41,6 +41,16 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 524.6143, + "Y": 212.77472, + "Z": 703.436 + }, + "TerritoryId": 397, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest" + }, { "DataId": 1011240, "Position": { @@ -54,4 +64,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/Aether Currents/Western Coerthas Highlands/1759_Protecting What's Important.json b/QuestPaths/3.x - Heavensward/Aether Currents/Coerthas Western Highlands/1759_Protecting What's Important.json similarity index 100% rename from QuestPaths/3.x - Heavensward/Aether Currents/Western Coerthas Highlands/1759_Protecting What's Important.json rename to QuestPaths/3.x - Heavensward/Aether Currents/Coerthas Western Highlands/1759_Protecting What's Important.json diff --git a/QuestPaths/3.x - Heavensward/Aether Currents/Western Coerthas Highlands/1760_Baby Steps.json b/QuestPaths/3.x - Heavensward/Aether Currents/Coerthas Western Highlands/1760_Baby Steps.json similarity index 100% rename from QuestPaths/3.x - Heavensward/Aether Currents/Western Coerthas Highlands/1760_Baby Steps.json rename to QuestPaths/3.x - Heavensward/Aether Currents/Coerthas Western Highlands/1760_Baby Steps.json diff --git a/QuestPaths/3.x - Heavensward/Aether Currents/Western Coerthas Highlands/2111_For All the Nights to Come.json b/QuestPaths/3.x - Heavensward/Aether Currents/Coerthas Western Highlands/2111_For All the Nights to Come.json similarity index 100% rename from QuestPaths/3.x - Heavensward/Aether Currents/Western Coerthas Highlands/2111_For All the Nights to Come.json rename to QuestPaths/3.x - Heavensward/Aether Currents/Coerthas Western Highlands/2111_For All the Nights to Come.json diff --git a/QuestPaths/3.x - Heavensward/Aether Currents/The Churning Mists/1819_The Bathing Bully.json b/QuestPaths/3.x - Heavensward/Aether Currents/The Churning Mists/1819_The Bathing Bully.json index 4e6850b0..ed542fc8 100644 --- a/QuestPaths/3.x - Heavensward/Aether Currents/The Churning Mists/1819_The Bathing Bully.json +++ b/QuestPaths/3.x - Heavensward/Aether Currents/The Churning Mists/1819_The Bathing Bully.json @@ -49,9 +49,10 @@ "Z": 678.4314 }, "TerritoryId": 400, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "The Churning Mists - Moghome" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/Aether Currents/The Churning Mists/1823_Road Kill.json b/QuestPaths/3.x - Heavensward/Aether Currents/The Churning Mists/1823_Road Kill.json index 4bbd1edd..31e4ea50 100644 --- a/QuestPaths/3.x - Heavensward/Aether Currents/The Churning Mists/1823_Road Kill.json +++ b/QuestPaths/3.x - Heavensward/Aether Currents/The Churning Mists/1823_Road Kill.json @@ -41,6 +41,15 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 83.82025, + "Y": -24.433022, + "Z": 150.46234 + }, + "TerritoryId": 400, + "InteractionType": "WalkTo" + }, { "DataId": 1012288, "Position": { @@ -54,4 +63,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1771_Some Bad News.json b/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1771_Some Bad News.json index 2478906d..e9f82aab 100644 --- a/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1771_Some Bad News.json +++ b/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1771_Some Bad News.json @@ -27,7 +27,51 @@ "Z": -408.3923 }, "TerritoryId": 398, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -32 + ] + }, + { + "Position": { + "X": 643.6058, + "Y": -17.959486, + "Z": -409.5136 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -32 + ] + }, + { + "Position": { + "X": 681.08307, + "Y": -23.861216, + "Z": -313.61807 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -32 + ] }, { "DataId": 1011932, @@ -37,7 +81,50 @@ "Z": -269.06238 }, "TerritoryId": 398, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "Position": { + "X": 698.47815, + "Y": -24.308271, + "Z": -262.69476 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -64 + ] + }, + { + "Position": { + "X": 725.30743, + "Y": -43.07919, + "Z": -208.64124 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -64 + ] }, { "DataId": 1011924, @@ -47,7 +134,15 @@ "Z": -39.56665 }, "TerritoryId": 398, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1011923, @@ -57,7 +152,15 @@ "Z": 198.10791 }, "TerritoryId": 398, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } ] }, @@ -78,4 +181,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1790_Stolen Munitions.json b/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1790_Stolen Munitions.json index 12e0badd..963bff47 100644 --- a/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1790_Stolen Munitions.json +++ b/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1790_Stolen Munitions.json @@ -44,6 +44,17 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 70.535545, + "Y": -49.45454, + "Z": -149.54617 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo", + "Mount": true, + "$": "Loth ast Vath navmesh workaround" + }, { "DataId": 1011929, "Position": { @@ -57,4 +68,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1797_The Hunter Becomes the Kweh.json b/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1797_The Hunter Becomes the Kweh.json index c67e48d4..931debe8 100644 --- a/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1797_The Hunter Becomes the Kweh.json +++ b/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1797_The Hunter Becomes the Kweh.json @@ -31,7 +31,51 @@ "Z": -408.3923 }, "TerritoryId": 398, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -32 + ] + }, + { + "Position": { + "X": 643.6058, + "Y": -17.959486, + "Z": -409.5136 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -32 + ] + }, + { + "Position": { + "X": 681.08307, + "Y": -23.861216, + "Z": -313.61807 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -32 + ] }, { "DataId": 1011932, @@ -42,7 +86,50 @@ }, "TerritoryId": 398, "InteractionType": "Interact", - "$": " -> 16 16 0 0 0 32" + "$": " -> 16 16 0 0 0 32", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "Position": { + "X": 698.47815, + "Y": -24.308271, + "Z": -262.69476 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -64 + ] + }, + { + "Position": { + "X": 725.30743, + "Y": -43.07919, + "Z": -208.64124 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -64 + ] }, { "DataId": 1011924, @@ -53,7 +140,15 @@ }, "TerritoryId": 398, "InteractionType": "Interact", - "$": "16 16 0 0 0 32 -> 33 16 0 0 0 96" + "$": "16 16 0 0 0 32 -> 33 16 0 0 0 96", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1011923, @@ -63,7 +158,15 @@ "Z": 198.10791 }, "TerritoryId": 398, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } ] }, @@ -84,4 +187,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1802_A Lesson in Humility.json b/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1802_A Lesson in Humility.json index 9ccd4167..e2b31364 100644 --- a/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1802_A Lesson in Humility.json +++ b/QuestPaths/3.x - Heavensward/Aether Currents/The Dravanian Forelands/1802_A Lesson in Humility.json @@ -24,6 +24,25 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": -334.08136, + "Y": 40.34739, + "Z": 18.237068 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": -324.42703, + "Y": -22.971008, + "Z": 51.45664 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, { "DataId": 1013406, "Position": { @@ -136,4 +155,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1580_Coming to Ishgard.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1580_Coming to Ishgard.json similarity index 100% rename from QuestPaths/3.x - Heavensward/MSQ/1580_Coming to Ishgard.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1580_Coming to Ishgard.json diff --git a/QuestPaths/3.x - Heavensward/MSQ/1581_Taking in the Sights.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1581_Taking in the Sights.json similarity index 98% rename from QuestPaths/3.x - Heavensward/MSQ/1581_Taking in the Sights.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1581_Taking in the Sights.json index d844c9e9..9f220b2d 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1581_Taking in the Sights.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1581_Taking in the Sights.json @@ -27,6 +27,7 @@ "Y": 16.009666, "Z": -7.0039062 }, + "StopDistance": 5, "TerritoryId": 419, "InteractionType": "Interact" } @@ -86,4 +87,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1582_The Better Half.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1582_The Better Half.json similarity index 100% rename from QuestPaths/3.x - Heavensward/MSQ/1582_The Better Half.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1582_The Better Half.json diff --git a/QuestPaths/3.x - Heavensward/MSQ/1583_Over the Wall.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1583_Over the Wall.json similarity index 98% rename from QuestPaths/3.x - Heavensward/MSQ/1583_Over the Wall.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1583_Over the Wall.json index b655c979..3794c537 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1583_Over the Wall.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1583_Over the Wall.json @@ -78,7 +78,8 @@ { "TerritoryId": 397, "InteractionType": "AttuneAetheryte", - "Aetheryte": "Coerthas Western Highlands - Falcon's Nest" + "Aetheryte": "Coerthas Western Highlands - Falcon's Nest", + "StopDistance": 7 }, { "DataId": 1011231, @@ -93,4 +94,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1584_Work in Progress.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1584_Work in Progress.json similarity index 79% rename from QuestPaths/3.x - Heavensward/MSQ/1584_Work in Progress.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1584_Work in Progress.json index ed5c066a..dab2dfa8 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1584_Work in Progress.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1584_Work in Progress.json @@ -52,7 +52,15 @@ "KillEnemyDataIds": [ 4376 ], - "$": "0 0 0 0 0 0 -> 16 2 0 0 0 128" + "$": "0 0 0 0 0 0 -> 16 2 0 0 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 2005404, @@ -67,7 +75,15 @@ "KillEnemyDataIds": [ 4376 ], - "$": "16 2 0 0 0 128 -> 35 2 0 0 0 192" + "$": "16 2 0 0 0 128 -> 35 2 0 0 0 192", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 2005405, @@ -81,6 +97,14 @@ "EnemySpawnType": "AfterInteraction", "KillEnemyDataIds": [ 4376 + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 ] } ] @@ -101,4 +125,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1585_The First and Foremost.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1585_The First and Foremost.json similarity index 87% rename from QuestPaths/3.x - Heavensward/MSQ/1585_The First and Foremost.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1585_The First and Foremost.json index 060c36ba..daaf1475 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1585_The First and Foremost.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1585_The First and Foremost.json @@ -20,6 +20,15 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": 464.90463, + "Y": 203.4332, + "Z": 679.09424 + }, + "TerritoryId": 397, + "InteractionType": "WalkTo" + }, { "DataId": 1011241, "Position": { @@ -70,4 +79,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1586_From on High.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1586_From on High.json similarity index 100% rename from QuestPaths/3.x - Heavensward/MSQ/1586_From on High.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1586_From on High.json diff --git a/QuestPaths/3.x - Heavensward/MSQ/1587_Reconnaissance Lost.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1587_Reconnaissance Lost.json similarity index 100% rename from QuestPaths/3.x - Heavensward/MSQ/1587_Reconnaissance Lost.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1587_Reconnaissance Lost.json diff --git a/QuestPaths/3.x - Heavensward/MSQ/1588_At the End of Our Hope.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1588_At the End of Our Hope.json similarity index 85% rename from QuestPaths/3.x - Heavensward/MSQ/1588_At the End of Our Hope.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1588_At the End of Our Hope.json index 725571a5..5cd5ad2d 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1588_At the End of Our Hope.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1588_At the End of Our Hope.json @@ -12,6 +12,7 @@ "Y": 117.19698, "Z": 150.31653 }, + "StopDistance": 7, "TerritoryId": 397, "InteractionType": "AcceptQuest" } @@ -28,7 +29,8 @@ "Z": -42.404846 }, "TerritoryId": 397, - "InteractionType": "SinglePlayerDuty" + "InteractionType": "SinglePlayerDuty", + "Comment": "Walk straight to Gorgagne Mills basement, ignore footprints" } ] }, @@ -48,4 +50,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1589_Knights Be Not Proud.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1589_Knights Be Not Proud.json similarity index 100% rename from QuestPaths/3.x - Heavensward/MSQ/1589_Knights Be Not Proud.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1589_Knights Be Not Proud.json diff --git a/QuestPaths/3.x - Heavensward/MSQ/1590_Onwards and Upwards.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1590_Onwards and Upwards.json similarity index 100% rename from QuestPaths/3.x - Heavensward/MSQ/1590_Onwards and Upwards.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1590_Onwards and Upwards.json diff --git a/QuestPaths/3.x - Heavensward/MSQ/1591_An Indispensable Ally.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1591_An Indispensable Ally.json similarity index 100% rename from QuestPaths/3.x - Heavensward/MSQ/1591_An Indispensable Ally.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1591_An Indispensable Ally.json diff --git a/QuestPaths/3.x - Heavensward/MSQ/1592_Meeting the Neighbors.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1592_Meeting the Neighbors.json similarity index 78% rename from QuestPaths/3.x - Heavensward/MSQ/1592_Meeting the Neighbors.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1592_Meeting the Neighbors.json index 2ed6bfd2..5e82eb5d 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1592_Meeting the Neighbors.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1592_Meeting the Neighbors.json @@ -49,8 +49,15 @@ 4381, 4382 ], - "Comment": "I forgot the ID of the mobs, oops", - "$": "0 0 0 0 0 0 -> 16 2 0 0 0 128" + "$": "0 0 0 0 0 0 -> 16 2 0 0 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 2005411, @@ -61,7 +68,15 @@ }, "TerritoryId": 401, "InteractionType": "Interact", - "$": "16 2 0 0 0 128 -> 33 2 0 0 0 160" + "$": "16 2 0 0 0 128 -> 33 2 0 0 0 160", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 2005410, @@ -76,6 +91,14 @@ "KillEnemyDataIds": [ 4380, 4382 + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 ] } ] @@ -97,4 +120,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1593_Sense of Urgency.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1593_Sense of Urgency.json similarity index 53% rename from QuestPaths/3.x - Heavensward/MSQ/1593_Sense of Urgency.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1593_Sense of Urgency.json index 248976aa..afbc946e 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1593_Sense of Urgency.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1593_Sense of Urgency.json @@ -21,16 +21,59 @@ "Sequence": 1, "Steps": [ { - "DataId": 1012359, "Position": { - "X": -260.91406, - "Y": -184.91077, - "Z": 705.4092 + "X": -343.27975, + "Y": -169.12419, + "Z": 800.5701 + }, + "TerritoryId": 401, + "InteractionType": "WalkTo", + "Mount": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -128 + ] + }, + { + "Position": { + "X": -325.61444, + "Y": -184.8876, + "Z": 806.3595 + }, + "TerritoryId": 401, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -128 + ] + }, + { + "DataId": 1013498, + "Position": { + "X": -293.04956, + "Y": -183.73486, + "Z": 812.6802 }, "TerritoryId": 401, "InteractionType": "Emote", "Emote": "psych", - "$": "0 0 0 0 0 0 -> 17 0 0 0 0 64" + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1012360, @@ -42,18 +85,33 @@ "TerritoryId": 401, "InteractionType": "Emote", "Emote": "psych", - "$": "17 0 0 0 0 64 -> 33 16 0 0 0 96" + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { - "DataId": 1013498, + "DataId": 1012359, "Position": { - "X": -293.04956, - "Y": -183.73486, - "Z": 812.6802 + "X": -260.91406, + "Y": -184.91077, + "Z": 705.4092 }, "TerritoryId": 401, "InteractionType": "Emote", - "Emote": "psych" + "Emote": "psych", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, @@ -73,4 +131,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1594_Hope Springs Eternal.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1594_Hope Springs Eternal.json similarity index 91% rename from QuestPaths/3.x - Heavensward/MSQ/1594_Hope Springs Eternal.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1594_Hope Springs Eternal.json index 801088f4..7d7e30c6 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1594_Hope Springs Eternal.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1594_Hope Springs Eternal.json @@ -87,6 +87,15 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 91.65932, + "Y": -147.83772, + "Z": 551.8496 + }, + "TerritoryId": 401, + "InteractionType": "WalkTo" + }, { "DataId": 1012364, "Position": { @@ -100,4 +109,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1595_A Series of Unfortunate Events.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1595_A Series of Unfortunate Events.json similarity index 98% rename from QuestPaths/3.x - Heavensward/MSQ/1595_A Series of Unfortunate Events.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1595_A Series of Unfortunate Events.json index 5616adce..7559c600 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1595_A Series of Unfortunate Events.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1595_A Series of Unfortunate Events.json @@ -72,10 +72,11 @@ "Y": -110.67414, "Z": 481.77307 }, + "StopDistance": 7, "TerritoryId": 401, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1596_A Reward Long in Coming.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1596_A Reward Long in Coming.json similarity index 100% rename from QuestPaths/3.x - Heavensward/MSQ/1596_A Reward Long in Coming.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1596_A Reward Long in Coming.json diff --git a/QuestPaths/3.x - Heavensward/MSQ/1597_Divine Intervention.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1597_Divine Intervention.json similarity index 98% rename from QuestPaths/3.x - Heavensward/MSQ/1597_Divine Intervention.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1597_Divine Intervention.json index 74eabf92..1e266510 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1597_Divine Intervention.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1597_Divine Intervention.json @@ -27,6 +27,7 @@ "Y": -9.313226E-10, "Z": 9.018005 }, + "StopDistance": 5, "TerritoryId": 433, "InteractionType": "Interact" } @@ -97,4 +98,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1598_Disclosure.json b/QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1598_Disclosure.json similarity index 100% rename from QuestPaths/3.x - Heavensward/MSQ/1598_Disclosure.json rename to QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1598_Disclosure.json diff --git a/QuestPaths/3.x - Heavensward/MSQ/1599_Flame General Affairs.json b/QuestPaths/3.x - Heavensward/MSQ/A2-Raubahn/1599_Flame General Affairs.json similarity index 100% rename from QuestPaths/3.x - Heavensward/MSQ/1599_Flame General Affairs.json rename to QuestPaths/3.x - Heavensward/MSQ/A2-Raubahn/1599_Flame General Affairs.json diff --git a/QuestPaths/3.x - Heavensward/MSQ/1600_In Search of Raubahn.json b/QuestPaths/3.x - Heavensward/MSQ/A2-Raubahn/1600_In Search of Raubahn.json similarity index 95% rename from QuestPaths/3.x - Heavensward/MSQ/1600_In Search of Raubahn.json rename to QuestPaths/3.x - Heavensward/MSQ/A2-Raubahn/1600_In Search of Raubahn.json index 05ae5d42..2d3b4186 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1600_In Search of Raubahn.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A2-Raubahn/1600_In Search of Raubahn.json @@ -29,6 +29,7 @@ }, "TerritoryId": 145, "InteractionType": "Interact", + "AetheryteShortcut": "Eastern Thanalan - Camp Drybone", "Fly": true, "StopDistance": 1 } @@ -61,4 +62,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1601_Keeping the Flame Alive.json b/QuestPaths/3.x - Heavensward/MSQ/A2-Raubahn/1601_Keeping the Flame Alive.json similarity index 98% rename from QuestPaths/3.x - Heavensward/MSQ/1601_Keeping the Flame Alive.json rename to QuestPaths/3.x - Heavensward/MSQ/A2-Raubahn/1601_Keeping the Flame Alive.json index c5c099b2..243ca431 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1601_Keeping the Flame Alive.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A2-Raubahn/1601_Keeping the Flame Alive.json @@ -60,6 +60,7 @@ "Y": -24.34079, "Z": 424.30762 }, + "StopDistance": 5, "TerritoryId": 145, "InteractionType": "Interact" } @@ -112,4 +113,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1602_To Siege or Not to Siege.json b/QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1602_To Siege or Not to Siege.json similarity index 100% rename from QuestPaths/3.x - Heavensward/MSQ/1602_To Siege or Not to Siege.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1602_To Siege or Not to Siege.json diff --git a/QuestPaths/3.x - Heavensward/MSQ/1603_Alphinaud's Way.json b/QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1603_Alphinaud's Way.json similarity index 97% rename from QuestPaths/3.x - Heavensward/MSQ/1603_Alphinaud's Way.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1603_Alphinaud's Way.json index 330e7af8..0a6e0c39 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1603_Alphinaud's Way.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1603_Alphinaud's Way.json @@ -27,6 +27,7 @@ "Y": 1.1443481, "Z": 13.199036 }, + "StopDistance": 7, "TerritoryId": 433, "InteractionType": "Interact", "TargetTerritoryId": 419 @@ -79,10 +80,11 @@ "Y": 24.378597, "Z": -6.6987915 }, + "StopDistance": 7, "TerritoryId": 418, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1604_In Search of Iceheart.json b/QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1604_In Search of Iceheart.json similarity index 75% rename from QuestPaths/3.x - Heavensward/MSQ/1604_In Search of Iceheart.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1604_In Search of Iceheart.json index bc11caa7..306c7190 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1604_In Search of Iceheart.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1604_In Search of Iceheart.json @@ -12,6 +12,7 @@ "Y": 24.378597, "Z": -6.6987915 }, + "StopDistance": 7, "TerritoryId": 418, "InteractionType": "AcceptQuest" } @@ -123,6 +124,28 @@ { "Sequence": 5, "Steps": [ + { + "Position": { + "X": 454.75964, + "Y": 164.27075, + "Z": -535.00354 + }, + "TerritoryId": 397, + "InteractionType": "WalkTo", + "$": "Gorgagne Mills (outside)", + "Mount": true + }, + { + "Position": { + "X": 454.9128, + "Y": 164.30827, + "Z": -542.1735 + }, + "TerritoryId": 397, + "InteractionType": "WalkTo", + "$": "Gorgagne Mills (inside)", + "DisableNavmesh": true + }, { "Position": { "X": 455.6516, @@ -142,6 +165,28 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 454.9128, + "Y": 164.30827, + "Z": -542.1735 + }, + "TerritoryId": 397, + "InteractionType": "WalkTo", + "$": "Gorgagne Mills (inside)", + "Mount": true + }, + { + "Position": { + "X": 454.75964, + "Y": 164.27075, + "Z": -535.00354 + }, + "TerritoryId": 397, + "InteractionType": "WalkTo", + "$": "Gorgagne Mills (outside)", + "DisableNavmesh": true + }, { "DataId": 1012592, "Position": { @@ -155,4 +200,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1605_From One Heretic to Another.json b/QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1605_From One Heretic to Another.json similarity index 55% rename from QuestPaths/3.x - Heavensward/MSQ/1605_From One Heretic to Another.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1605_From One Heretic to Another.json index e39afb98..5746b326 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1605_From One Heretic to Another.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1605_From One Heretic to Another.json @@ -20,6 +20,27 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": 454.75964, + "Y": 164.27075, + "Z": -535.00354 + }, + "TerritoryId": 397, + "InteractionType": "WalkTo", + "$": "Gorgagne Mills (outside)" + }, + { + "Position": { + "X": 454.9128, + "Y": 164.30827, + "Z": -542.1735 + }, + "TerritoryId": 397, + "InteractionType": "WalkTo", + "$": "Gorgagne Mills (inside)", + "DisableNavmesh": true + }, { "DataId": 2005432, "Position": { @@ -29,7 +50,15 @@ }, "TerritoryId": 397, "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": 2005433, @@ -40,7 +69,15 @@ }, "TerritoryId": 397, "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": 2005434, @@ -50,7 +87,15 @@ "Z": -540.8561 }, "TerritoryId": 397, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] } ] }, @@ -70,4 +115,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1606_Sounding Out the Amphitheatre.json b/QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1606_Sounding Out the Amphitheatre.json similarity index 58% rename from QuestPaths/3.x - Heavensward/MSQ/1606_Sounding Out the Amphitheatre.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1606_Sounding Out the Amphitheatre.json index 5c86df20..b8f0bea2 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1606_Sounding Out the Amphitheatre.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1606_Sounding Out the Amphitheatre.json @@ -12,6 +12,7 @@ "Y": 157.40831, "Z": -544.6708 }, + "StopDistance": 5, "TerritoryId": 397, "InteractionType": "AcceptQuest" } @@ -20,6 +21,45 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": 486.38373, + "Y": 163.58846, + "Z": 239.54294 + }, + "TerritoryId": 397, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest" + }, + { + "Position": { + "X": 517.53094, + "Y": 131.76724, + "Z": 200.50333 + }, + "TerritoryId": 397, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, + { + "Position": { + "X": 595.8404, + "Y": 116.82471, + "Z": 203.86801 + }, + "TerritoryId": 397, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": 616.8997, + "Y": 78.429, + "Z": 207.48883 + }, + "TerritoryId": 397, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, { "DataId": 1011905, "Position": { @@ -28,7 +68,8 @@ "Z": 217.30359 }, "TerritoryId": 397, - "InteractionType": "SinglePlayerDuty" + "InteractionType": "SinglePlayerDuty", + "DisableNavmesh": true } ] }, @@ -42,6 +83,7 @@ "Y": 78.42899, "Z": 213.88562 }, + "StopDistance": 5, "TerritoryId": 397, "InteractionType": "Interact" } @@ -74,4 +116,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1607_Camp of the Convictors.json b/QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1607_Camp of the Convictors.json similarity index 70% rename from QuestPaths/3.x - Heavensward/MSQ/1607_Camp of the Convictors.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1607_Camp of the Convictors.json index 7512ac88..19b70564 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1607_Camp of the Convictors.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1607_Camp of the Convictors.json @@ -29,7 +29,15 @@ }, "TerritoryId": 397, "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": 1013436, @@ -40,7 +48,15 @@ }, "TerritoryId": 397, "InteractionType": "Interact", - "$": "1 0 0 0 0 64 -> 2 0 0 0 0 96" + "$": "1 0 0 0 0 64 -> 2 0 0 0 0 96", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1011910, @@ -50,7 +66,15 @@ "Z": -1.4191895 }, "TerritoryId": 397, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } ] }, @@ -70,4 +94,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1608_Purple Flame, Purple Flame.json b/QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1608_Purple Flame, Purple Flame.json similarity index 100% rename from QuestPaths/3.x - Heavensward/MSQ/1608_Purple Flame, Purple Flame.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1608_Purple Flame, Purple Flame.json diff --git a/QuestPaths/3.x - Heavensward/MSQ/1609_Where the Chocobos Roam.json b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1609_Where the Chocobos Roam.json similarity index 86% rename from QuestPaths/3.x - Heavensward/MSQ/1609_Where the Chocobos Roam.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1609_Where the Chocobos Roam.json index 26c5b9de..4567a59c 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1609_Where the Chocobos Roam.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1609_Where the Chocobos Roam.json @@ -61,6 +61,17 @@ "InteractionType": "AttuneAetherCurrent", "AetherCurrentId": 2818068 }, + { + "Position": { + "X": 744.5929, + "Y": -34.200893, + "Z": 272.8362 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "Mount": true + }, { "TerritoryId": 398, "InteractionType": "AttuneAetheryte", @@ -79,4 +90,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1610_Worse than Dragons.json b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1610_Worse than Dragons.json similarity index 97% rename from QuestPaths/3.x - Heavensward/MSQ/1610_Worse than Dragons.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1610_Worse than Dragons.json index 35689eb7..e12f34ba 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1610_Worse than Dragons.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1610_Worse than Dragons.json @@ -41,6 +41,7 @@ "Y": -40.05916, "Z": -296.1493 }, + "StopDistance": 1, "TerritoryId": 398, "InteractionType": "Combat", "EnemySpawnType": "AutoOnEnterArea", @@ -71,6 +72,7 @@ "Y": -56.601433, "Z": -258.33804 }, + "StopDistance": 1, "TerritoryId": 398, "InteractionType": "Combat", "EnemySpawnType": "AutoOnEnterArea", @@ -104,4 +106,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1611_The Trine Towers.json b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1611_The Trine Towers.json similarity index 95% rename from QuestPaths/3.x - Heavensward/MSQ/1611_The Trine Towers.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1611_The Trine Towers.json index e5db3b8d..cf28ac27 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1611_The Trine Towers.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1611_The Trine Towers.json @@ -12,6 +12,7 @@ "Y": -63.618378, "Z": -9.2317505 }, + "StopDistance": 7, "TerritoryId": 398, "InteractionType": "AcceptQuest" } @@ -41,6 +42,7 @@ "Y": -84.46064, "Z": 450.64175 }, + "StopDistance": 1, "TerritoryId": 398, "InteractionType": "Combat", "EnemySpawnType": "AutoOnEnterArea", @@ -61,6 +63,7 @@ "Y": -63.319576, "Z": 333.95447 }, + "StopDistance": 1, "TerritoryId": 398, "InteractionType": "Combat", "EnemySpawnType": "AutoOnEnterArea", @@ -88,4 +91,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1612_Gifts for the Outcasts.json b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1612_Gifts for the Outcasts.json similarity index 100% rename from QuestPaths/3.x - Heavensward/MSQ/1612_Gifts for the Outcasts.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1612_Gifts for the Outcasts.json diff --git a/QuestPaths/3.x - Heavensward/MSQ/1613_The Nonmind.json b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1613_The Nonmind.json similarity index 100% rename from QuestPaths/3.x - Heavensward/MSQ/1613_The Nonmind.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1613_The Nonmind.json diff --git a/QuestPaths/3.x - Heavensward/MSQ/1614_A Gnathic Deity.json b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1614_A Gnathic Deity.json similarity index 74% rename from QuestPaths/3.x - Heavensward/MSQ/1614_A Gnathic Deity.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1614_A Gnathic Deity.json index 0f86f3ba..8ab6d910 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1614_A Gnathic Deity.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1614_A Gnathic Deity.json @@ -34,9 +34,18 @@ "Y": -49.21252, "Z": -150.04199 }, + "StopDistance": 7, "TerritoryId": 398, "InteractionType": "Interact", - "$": "0 0 0 0 0 0 -> 1 0 0 0 0 32" + "$": "0 0 0 0 0 0 -> 1 0 0 0 0 32", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1011929, @@ -47,7 +56,15 @@ }, "TerritoryId": 398, "InteractionType": "Interact", - "$": "1 0 0 0 0 32 -> 2 0 0 0 0 96" + "$": "1 0 0 0 0 32 -> 2 0 0 0 0 96", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1011928, @@ -56,8 +73,17 @@ "Y": -49.19563, "Z": -139.05548 }, + "StopDistance": 5, "TerritoryId": 398, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } ] }, @@ -79,6 +105,17 @@ { "Sequence": 3, "Steps": [ + { + "Position": { + "X": 70.535545, + "Y": -49.45454, + "Z": -149.54617 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo", + "Mount": true, + "$": "Loth ast Vath navmesh workaround" + }, { "Position": { "X": 291.1391, @@ -130,4 +167,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1615_Breaking into Hives.json b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1615_Breaking into Hives.json similarity index 88% rename from QuestPaths/3.x - Heavensward/MSQ/1615_Breaking into Hives.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1615_Breaking into Hives.json index c1b2d07f..1485c2f4 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1615_Breaking into Hives.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1615_Breaking into Hives.json @@ -20,6 +20,17 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": 70.535545, + "Y": -49.45454, + "Z": -149.54617 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo", + "Mount": true, + "$": "Loth ast Vath navmesh workaround" + }, { "DataId": 1012639, "Position": { @@ -104,4 +115,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1616_Lord of the Hive.json b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1616_Lord of the Hive.json similarity index 66% rename from QuestPaths/3.x - Heavensward/MSQ/1616_Lord of the Hive.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1616_Lord of the Hive.json index c272e7fa..6cc5d8ad 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1616_Lord of the Hive.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1616_Lord of the Hive.json @@ -32,7 +32,18 @@ ] }, { - "Sequence": 2 + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": -17.24303, + "Y": 0, + "Z": 70.677536 + }, + "TerritoryId": 462, + "InteractionType": "WalkTo" + } + ] }, { "Sequence": 3, @@ -45,7 +56,19 @@ ] }, { - "Sequence": 4 + "Sequence": 4, + "Steps": [ + { + "Position": { + "X": 0, + "Y": 0, + "Z": 0 + }, + "TerritoryId": 1, + "InteractionType": "WalkTo", + "Comment": "Filler" + } + ] }, { "Sequence": 5, @@ -57,6 +80,7 @@ "Y": -128.9908, "Z": 728.26733 }, + "StopDistance": 5, "TerritoryId": 398, "InteractionType": "Interact" } @@ -65,6 +89,15 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 123.44939, + "Y": -60.88712, + "Z": -118.79085 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo" + }, { "DataId": 1014544, "Position": { @@ -78,4 +111,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1617_Mourn in Passing.json b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1617_Mourn in Passing.json similarity index 84% rename from QuestPaths/3.x - Heavensward/MSQ/1617_Mourn in Passing.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1617_Mourn in Passing.json index d2de7454..947dd3e3 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1617_Mourn in Passing.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1617_Mourn in Passing.json @@ -12,6 +12,7 @@ "Y": -50.325172, "Z": -146.95972 }, + "StopDistance": 5, "TerritoryId": 398, "InteractionType": "AcceptQuest" } @@ -27,6 +28,7 @@ "Y": -30.095806, "Z": 102.22009 }, + "StopDistance": 7, "TerritoryId": 398, "InteractionType": "Interact", "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine" @@ -47,6 +49,17 @@ "InteractionType": "AttuneAetherCurrent", "AetherCurrentId": 2818074 }, + { + "Position": { + "X": -467.55936, + "Y": -11.599176, + "Z": -445.6323 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "Mount": true + }, { "DataId": 2005448, "Position": { @@ -85,4 +98,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1618_Beyond the Clouds.json b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1618_Beyond the Clouds.json similarity index 75% rename from QuestPaths/3.x - Heavensward/MSQ/1618_Beyond the Clouds.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1618_Beyond the Clouds.json index bfddc7fe..818574fe 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1618_Beyond the Clouds.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1618_Beyond the Clouds.json @@ -49,7 +49,15 @@ }, "TerritoryId": 400, "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": 2005452, @@ -60,7 +68,15 @@ }, "TerritoryId": 400, "InteractionType": "Interact", - "$": "17 0 0 0 0 64 -> 33 16 0 0 0 96" + "$": "17 0 0 0 0 64 -> 33 16 0 0 0 96", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 2005450, @@ -70,7 +86,15 @@ "Z": 696.2843 }, "TerritoryId": 400, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } ] }, @@ -90,4 +114,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1619_Mountaintop Diplomacy.json b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1619_Mountaintop Diplomacy.json similarity index 97% rename from QuestPaths/3.x - Heavensward/MSQ/1619_Mountaintop Diplomacy.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1619_Mountaintop Diplomacy.json index 4a2dac91..f2d634f0 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1619_Mountaintop Diplomacy.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1619_Mountaintop Diplomacy.json @@ -102,9 +102,10 @@ }, "TerritoryId": 400, "InteractionType": "CompleteQuest", - "StopDistance": 9 + "StopDistance": 8, + "IgnoreDistanceToObject": true } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1620_Moghan's Trial.json b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1620_Moghan's Trial.json similarity index 61% rename from QuestPaths/3.x - Heavensward/MSQ/1620_Moghan's Trial.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1620_Moghan's Trial.json index 07635e65..089e84e6 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1620_Moghan's Trial.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1620_Moghan's Trial.json @@ -12,6 +12,7 @@ "Y": -69.42934, "Z": 693.5072 }, + "StopDistance": 5, "TerritoryId": 400, "InteractionType": "AcceptQuest" } @@ -21,15 +22,14 @@ "Sequence": 1, "Steps": [ { - "DataId": 2005455, "Position": { - "X": 289.93665, - "Y": -37.979797, - "Z": 483.5431 + "X": 286.46622, + "Y": -46.748116, + "Z": 661.95807 }, "TerritoryId": 400, - "InteractionType": "Interact", - "$": "0 0 0 0 0 0 -> 1 16 0 0 0 128" + "InteractionType": "WalkTo", + "$": "Moghome entrance" }, { "DataId": 2005453, @@ -40,7 +40,34 @@ }, "TerritoryId": 400, "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 + ] + }, + { + "DataId": 2005455, + "Position": { + "X": 289.93665, + "Y": -37.979797, + "Z": 483.5431 + }, + "TerritoryId": 400, + "InteractionType": "Interact", + "$": "0 0 0 0 0 0 -> 1 16 0 0 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 2005454, @@ -50,7 +77,15 @@ "Z": 411.3069 }, "TerritoryId": 400, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, @@ -70,4 +105,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1621_Mogmug's Trial.json b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1621_Mogmug's Trial.json similarity index 68% rename from QuestPaths/3.x - Heavensward/MSQ/1621_Mogmug's Trial.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1621_Mogmug's Trial.json index a6f66aff..6c12f0c8 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1621_Mogmug's Trial.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1621_Mogmug's Trial.json @@ -20,6 +20,27 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": 378.22073, + "Y": -74.08917, + "Z": 651.4364 + }, + "TerritoryId": 400, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "Mount": true + }, + { + "Position": { + "X": 286.46622, + "Y": -46.748116, + "Z": 661.95807 + }, + "TerritoryId": 400, + "InteractionType": "WalkTo", + "$": "Moghome entrance" + }, { "Position": { "X": 243.81534, @@ -52,4 +73,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1622_Mogwin's Trial.json b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1622_Mogwin's Trial.json similarity index 63% rename from QuestPaths/3.x - Heavensward/MSQ/1622_Mogwin's Trial.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1622_Mogwin's Trial.json index e7ece1d9..7441d84d 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1622_Mogwin's Trial.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1622_Mogwin's Trial.json @@ -29,7 +29,15 @@ }, "TerritoryId": 400, "InteractionType": "Interact", - "$": "0 0 0 0 0 0 -> 16 16 0 0 0 32" + "$": "0 0 0 0 0 0 -> 16 16 0 0 0 32", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1015174, @@ -40,7 +48,15 @@ }, "TerritoryId": 400, "InteractionType": "Interact", - "$": "16 16 0 0 0 32 -> 32 17 0 0 0 160" + "$": "16 16 0 0 0 32 -> 32 17 0 0 0 160", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1012079, @@ -50,7 +66,15 @@ "Z": 702.57104 }, "TerritoryId": 400, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, @@ -83,6 +107,15 @@ "InteractionType": "AttuneAetherCurrent", "AetherCurrentId": 2818099 }, + { + "Position": { + "X": 327.68222, + "Y": 2.3181255, + "Z": 602.9682 + }, + "TerritoryId": 400, + "InteractionType": "WalkTo" + }, { "DataId": 2005456, "Position": { @@ -98,6 +131,22 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 343.68805, + "Y": 16.317823, + "Z": 686.95074 + }, + "TerritoryId": 400, + "InteractionType": "Jump", + "JumpDestination": { + "Position": { + "X": 367.56647, + "Y": -73.91838, + "Z": 661.2286 + } + } + }, { "DataId": 1012083, "Position": { @@ -106,9 +155,10 @@ "Z": 639.6123 }, "TerritoryId": 400, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "DisableNavmesh": true } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1623_Moglin's Judgment.json b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1623_Moglin's Judgment.json similarity index 58% rename from QuestPaths/3.x - Heavensward/MSQ/1623_Moglin's Judgment.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1623_Moglin's Judgment.json index 893685ab..42bac951 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1623_Moglin's Judgment.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1623_Moglin's Judgment.json @@ -13,7 +13,9 @@ "Z": 700.86194 }, "TerritoryId": 400, - "InteractionType": "AcceptQuest" + "InteractionType": "AcceptQuest", + "StopDistance": 8, + "IgnoreDistanceToObject": true } ] }, @@ -29,7 +31,15 @@ }, "TerritoryId": 400, "InteractionType": "Interact", - "$": "0 0 0 0 0 0 -> 16 0 1 0 0 128" + "$": "0 0 0 0 0 0 -> 16 0 1 0 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] }, { "DataId": 1013587, @@ -40,7 +50,15 @@ }, "TerritoryId": 400, "InteractionType": "Interact", - "$": "16 0 1 0 0 128 -> 33 0 1 0 0 192" + "$": "16 0 1 0 0 128 -> 33 0 1 0 0 192", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1013589, @@ -51,7 +69,15 @@ }, "TerritoryId": 400, "InteractionType": "Interact", - "$": "33 0 1 0 0 192 -> 49 1 1 0 0 208" + "$": "33 0 1 0 0 192 -> 49 1 1 0 0 208", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "DataId": 1013588, @@ -62,7 +88,15 @@ }, "TerritoryId": 400, "InteractionType": "Interact", - "$": "49 1 1 0 0 208 -> 65 17 1 0 0 240" + "$": "49 1 1 0 0 208 -> 65 17 1 0 0 240", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1013590, @@ -72,13 +106,31 @@ "Z": 645.1361 }, "TerritoryId": 400, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] } ] }, { "Sequence": 2, "Steps": [ + { + "Position": { + "X": 374.66388, + "Y": -74.11696, + "Z": 651.47766 + }, + "TerritoryId": 400, + "InteractionType": "WalkTo", + "Mount": true + }, { "DataId": 1012077, "Position": { @@ -87,7 +139,9 @@ "Z": 700.86194 }, "TerritoryId": 400, - "InteractionType": "Interact" + "InteractionType": "Interact", + "StopDistance": 8, + "IgnoreDistanceToObject": true } ] }, @@ -101,10 +155,11 @@ "Y": -69.42934, "Z": 693.5072 }, + "StopDistance": 5, "TerritoryId": 400, "InteractionType": "CompleteQuest" } ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1624_Leaving Moghome.json b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1624_Leaving Moghome.json similarity index 97% rename from QuestPaths/3.x - Heavensward/MSQ/1624_Leaving Moghome.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1624_Leaving Moghome.json index ecca538f..099b86ec 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1624_Leaving Moghome.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1624_Leaving Moghome.json @@ -12,6 +12,7 @@ "Y": -69.42934, "Z": 693.5072 }, + "StopDistance": 5, "TerritoryId": 400, "InteractionType": "AcceptQuest" } @@ -63,4 +64,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1625_The Road to Zenith.json b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1625_The Road to Zenith.json similarity index 100% rename from QuestPaths/3.x - Heavensward/MSQ/1625_The Road to Zenith.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1625_The Road to Zenith.json diff --git a/QuestPaths/3.x - Heavensward/MSQ/1626_Waiting for the Wind to Change.json b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1626_Waiting for the Wind to Change.json similarity index 89% rename from QuestPaths/3.x - Heavensward/MSQ/1626_Waiting for the Wind to Change.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1626_Waiting for the Wind to Change.json index c852dcbd..9f4c6ce6 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1626_Waiting for the Wind to Change.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1626_Waiting for the Wind to Change.json @@ -27,6 +27,7 @@ "Y": -6.7597656, "Z": 223.83447 }, + "StopDistance": 5, "TerritoryId": 400, "InteractionType": "AttuneAetherCurrent", "AetherCurrentId": 2818100 @@ -78,6 +79,15 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": -250.59578, + "Y": 19.834919, + "Z": 438.27606 + }, + "TerritoryId": 400, + "InteractionType": "WalkTo" + }, { "DataId": 1012757, "Position": { @@ -91,4 +101,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/MSQ/1627_Heart of Ice.json b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1627_Heart of Ice.json similarity index 69% rename from QuestPaths/3.x - Heavensward/MSQ/1627_Heart of Ice.json rename to QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1627_Heart of Ice.json index e5a234b4..04121b9e 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/1627_Heart of Ice.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1627_Heart of Ice.json @@ -20,11 +20,38 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": -289.72092, + "Y": 24.054262, + "Z": 489.63916 + }, + "TerritoryId": 400, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": -313.92142, + "Y": 21.75836, + "Z": 472.20667 + }, + "TerritoryId": 400, + "InteractionType": "WalkTo" + }, { "TerritoryId": 400, "InteractionType": "AttuneAetheryte", "Aetheryte": "The Churning Mists - Zenith" }, + { + "Position": { + "X": -718.6387, + "Y": 83.7983, + "Z": 241.97528 + }, + "TerritoryId": 400, + "InteractionType": "WalkTo" + }, { "DataId": 2006218, "Position": { @@ -64,4 +91,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/3.x - Heavensward/Unlocks/Misc/2107_Sights of the North.json b/QuestPaths/3.x - Heavensward/Unlocks/Misc/2107_Sights of the North.json index 1b47a9ce..6ac48683 100644 --- a/QuestPaths/3.x - Heavensward/Unlocks/Misc/2107_Sights of the North.json +++ b/QuestPaths/3.x - Heavensward/Unlocks/Misc/2107_Sights of the North.json @@ -20,9 +20,6 @@ ] } ] - }, - { - "Sequence": 255 } ] } diff --git a/QuestPaths/Reusable Paths.md b/QuestPaths/Reusable Paths.md index 03a318a6..719a95f5 100644 --- a/QuestPaths/Reusable Paths.md +++ b/QuestPaths/Reusable Paths.md @@ -37,3 +37,30 @@ that can sometimes be found as valid paths. "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead" } ``` + +## Coerthas Western Highlands + +```json + { + "Position": { + "X": 454.75964, + "Y": 164.27075, + "Z": -535.00354 + }, + "TerritoryId": 397, + "InteractionType": "WalkTo", + "$": "Gorgagne Mills (outside)", + "Mount": true + }, + { + "Position": { + "X": 454.9128, + "Y": 164.30827, + "Z": -542.1735 + }, + "TerritoryId": 397, + "InteractionType": "WalkTo", + "$": "Gorgagne Mills (inside)", + "DisableNavmesh": true + }, +``` diff --git a/Questionable.Model/V1/ComplexCombatData.cs b/Questionable.Model/V1/ComplexCombatData.cs index f1e70fed..a408a29f 100644 --- a/Questionable.Model/V1/ComplexCombatData.cs +++ b/Questionable.Model/V1/ComplexCombatData.cs @@ -9,6 +9,9 @@ public sealed class ComplexCombatData // TODO Use this public uint? MinimumKillCount { get; set; } + /// + /// If a reward item has been set, this is (ping allowing) given to the player before the dead enemy despawns. + /// public uint? RewardItemId { get; set; } public int? RewardItemCount { get; set; } public IList CompletionQuestVariablesFlags { get; set; } = new List(); diff --git a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs index 32ddab99..f990719b 100644 --- a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs +++ b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs @@ -42,7 +42,16 @@ internal sealed class MovementOverrideController new BlacklistedPoint(155, new(-478.75f, 149.25f, -305.75f), new(-476.1802f, 149.06573f, -304.7811f)), // rising stones, plant boxes - new BlacklistedPoint(351, new(3.25f, 0.75f, 8.5f),new(4f, 0f, 9.5f)), + new BlacklistedPoint(351, new(3.25f, 0.75f, 8.5f), new(4f, 0f, 9.5f)), + + // southern sea of clouds, random rock + new BlacklistedPoint(401, new(-14.75f, -136.75f, 515.75f), new(-17.631899f, -137.39148f, 512.6676f), 2), + + // coerthas western highland, right before dusk vigil + new BlacklistedPoint(397, new(-93.75f, 87.75f, -715.5f), new(-87.78183f, 87.188995f, -713.3343f), 2), + + // moghome, mogmug's trial + new BlacklistedPoint(400, new(384, -74, 648.75f), new(386.0543f, -72.409454f, 652.0184f), 3), new BlacklistedPoint(1189, new(574f, -142.25f, 504.25f), new(574.44183f, -142.12766f, 507.60065f)),