From c6739b3cced6c441d1246ac41835b2dcb787065f Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Wed, 25 Sep 2024 00:07:34 +0800 Subject: [PATCH 01/13] Updated the following daily quest: - Serpent's Will Be Done --- .../Dailies/3832_Serpent's Will Be Done.json | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3832_Serpent's Will Be Done.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3832_Serpent's Will Be Done.json index bdbb16961..bd564434b 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3832_Serpent's Will Be Done.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3832_Serpent's Will Be Done.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "liza", - "Disabled": true, + "Author": "plogon_enjoyer", "QuestSequence": [ { "Sequence": 0, @@ -18,6 +17,39 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1032663, + "Position": { + "X": 793.97266, + "Y": -45.811764, + "Z": -188.03699 + }, + "TerritoryId": 817, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2010998, + "Position": { + "X": -677.0886, + "Y": 0.32037354, + "Z": 208.69751 + }, + "TerritoryId": 817, + "InteractionType": "Action", + "Action": "Peculiar Light", + "Fly": true + } + ] + }, { "Sequence": 255, "Steps": [ From 225ffe7ba0f5369d97697a3cd4fbcb07d899f10f Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Wed, 25 Sep 2024 00:55:29 +0800 Subject: [PATCH 02/13] Added the following daily quests: - Dance Commander --- .../Dailies/2197_Dance Commander.json | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2197_Dance Commander.json diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2197_Dance Commander.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2197_Dance Commander.json new file mode 100644 index 000000000..bbf06ae73 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2197_Dance Commander.json @@ -0,0 +1,116 @@ +{ + "$schema": "https://git.carvel.li/plogon_enjoyer/Questionable/raw/branch/temp/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016089, + "Position": { + "X": -799.46594, + "Y": -133.2695, + "Z": -404.1352 + }, + "TerritoryId": 401, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 650.37317, + "Y": -41.15606, + "Z": -302.4378 + }, + "TerritoryId": 401, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1016362, + "Position": { + "X": 647.57764, + "Y": -41.156067, + "Z": -301.47253 + }, + "TerritoryId": 401, + "InteractionType": "Emote", + "Emote": "sundropdance" + }, + { + "DataId": 1016365, + "Position": { + "X": 682.36804, + "Y": -11.396843, + "Z": -400.6256 + }, + "TerritoryId": 401, + "InteractionType": "Emote", + "Emote": "sundropdance", + "Fly": true + }, + { + "DataId": 1016364, + "Position": { + "X": 799.9846, + "Y": -11.396843, + "Z": -416.98334 + }, + "TerritoryId": 401, + "InteractionType": "Emote", + "Emote": "sundropdance", + "Fly": true + }, + { + "DataId": 1016363, + "Position": { + "X": 776.9131, + "Y": -39.97968, + "Z": -540.24567 + }, + "TerritoryId": 401, + "InteractionType": "Emote", + "Emote": "sundropdance", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu", + "Fly": true + } + ] + } + ] +} From 228a06723117766b5ba527027baec76773c599f7 Mon Sep 17 00:00:00 2001 From: kaiser Date: Thu, 26 Sep 2024 18:20:00 +1000 Subject: [PATCH 03/13] feat: add Loporrits The Incredible machines --- .../Story/4682_The Incredible Machines.json | 147 ++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Story/4682_The Incredible Machines.json diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Story/4682_The Incredible Machines.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Story/4682_The Incredible Machines.json new file mode 100644 index 000000000..caaaa04f2 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Story/4682_The Incredible Machines.json @@ -0,0 +1,147 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "kaiser", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "Position": { + "X": -193.89642, + "Y": -49.19972, + "Z": -262.13477 + }, + "TerritoryId": 959, + "InteractionType": "None", + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true, + "StopDistance": 5, + "SkipConditions": { + "AetheryteShortcutIf": { + "NearPosition": { + "Position": { + "X": -193.89642, + "Y": -49.19972, + "Z": -262.13477 + }, + "TerritoryId": 959, + "MaximumDistance": 100 + } + } + } + } + , + { + "DataId": 1044402, + "Position": { + "X": -193.89642, + "Y": -49.19972, + "Z": -262.13477 + }, + "TerritoryId": 959, + "InteractionType": "AcceptQuest", + "StopDistance": 5, + "Fly": true + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044924, + "Position": { + "X": 344.625, + "Y": -168.00002, + "Z": -403.89105 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "StopDistance": 5, + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1044926, + "Position": { + "X": 500.96887, + "Y": -164.43474, + "Z": -698.3902 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "StopDistance": 5, + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1044928, + "Position": { + "X": -172.74744, + "Y": -49.199722, + "Z": -250.8736 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "StopDistance": 5, + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "TerritoryId": 959, + "InteractionType": "Craft", + "ItemId": 38845, + "ItemCount": 2 + }, + { + "DataId": 1044928, + "Position": { + "X": -172.74744, + "Y": -49.199722, + "Z": -250.8736 + }, + "TerritoryId": 959, + "InteractionType": "CompleteQuest", + "StopDistance": 5, + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + } + ] +} From 03d69692d018a5eb798835e1e60bb9d84ac44c03 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Thu, 26 Sep 2024 22:13:56 +0800 Subject: [PATCH 04/13] Added the following daily quests: - Smooth as Silk, Cool as Air - Gaelicat's Out of the Bag - Rotten to the Korrigan --- .../2191_Smooth as Silk, Cool as Air.json | 105 +++++++++++++++ .../2192_Gaelicat's Out of the Bag.json | 120 ++++++++++++++++++ .../Dailies/2193_Rotten to the Korrigan.json | 104 +++++++++++++++ 3 files changed, 329 insertions(+) create mode 100644 QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json create mode 100644 QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2192_Gaelicat's Out of the Bag.json create mode 100644 QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2193_Rotten to the Korrigan.json diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json new file mode 100644 index 000000000..e04cb159e --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json @@ -0,0 +1,105 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016089, + "Position": { + "X": -799.46594, + "Y": -133.2695, + "Z": -404.1352 + }, + "TerritoryId": 401, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2006687, + "Position": { + "X": -553.97876, + "Y": -58.42682, + "Z": -271.10706 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu" + }, + { + "DataId": 2006688, + "Position": { + "X": -715.1446, + "Y": -58.640503, + "Z": -342.30566 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + }, + { + "DataId": 2006689, + "Position": { + "X": -830.3197, + "Y": -14.358765, + "Z": -131.82275 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + }, + { + "DataId": 2006690, + "Position": { + "X": -857.6333, + "Y": 4.6539917, + "Z": -218.67706 + }, + "TerritoryId": 401, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [5246], + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2192_Gaelicat's Out of the Bag.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2192_Gaelicat's Out of the Bag.json new file mode 100644 index 000000000..62988c555 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2192_Gaelicat's Out of the Bag.json @@ -0,0 +1,120 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016089, + "Position": { + "X": -799.46594, + "Y": -133.2695, + "Z": -404.1352 + }, + "TerritoryId": 401, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1016092, + "Position": { + "X": -792.6299, + "Y": -133.32184, + "Z": -425.5589 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1016375, + "Position": { + "X": -627.89355, + "Y": -149.95285, + "Z": 480.15564 + }, + "TerritoryId": 401, + "InteractionType": "UseItem", + "ItemId": 2001934, + "Fly": true, + "AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop" + }, + { + "DataId": 1016232, + "Position": { + "X": -452.10956, + "Y": -187.396, + "Z": 734.18774 + }, + "TerritoryId": 401, + "InteractionType": "UseItem", + "ItemId": 2001934, + "Fly": true + }, + { + "DataId": 1016233, + "Position": { + "X": -359.823, + "Y": -184.95448, + "Z": 796.71924 + }, + "TerritoryId": 401, + "InteractionType": "UseItem", + "ItemId": 2001934, + "Fly": true + }, + { + "DataId": 1016374, + "Position": { + "X": -343.00757, + "Y": -161.8661, + "Z": 770.01587 + }, + "TerritoryId": 401, + "InteractionType": "UseItem", + "ItemId": 2001934, + "Fly": true + }, + { + "DataId": 1016231, + "Position": { + "X": -333.79114, + "Y": -184.97446, + "Z": 625.1162 + }, + "TerritoryId": 401, + "InteractionType": "UseItem", + "ItemId": 2001934, + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016092, + "Position": { + "X": -792.6299, + "Y": -133.32184, + "Z": -425.5589 + }, + "TerritoryId": 401, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2193_Rotten to the Korrigan.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2193_Rotten to the Korrigan.json new file mode 100644 index 000000000..0d571b1c7 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2193_Rotten to the Korrigan.json @@ -0,0 +1,104 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016089, + "Position": { + "X": -799.46594, + "Y": -133.2695, + "Z": -404.1352 + }, + "TerritoryId": 401, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1016091, + "Position": { + "X": -804.25726, + "Y": -133.2695, + "Z": -390.89038 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1016508, + "Position": { + "X": -261.8601, + "Y": -132.0669, + "Z": 388.66248 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop" + }, + { + "DataId": 1016235, + "Position": { + "X": -229.48047, + "Y": -129.59497, + "Z": 418.44812 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + }, + { + "DataId": 1016236, + "Position": { + "X": -196.2768, + "Y": -131.82275, + "Z": 333.9436 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + }, + { + "DataId": 1016216, + "Position": { + "X": -253.62024, + "Y": -130.38837, + "Z": 340.3219 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016091, + "Position": { + "X": -804.25726, + "Y": -133.2695, + "Z": -390.89038 + }, + "TerritoryId": 401, + "InteractionType": "CompleteQuest", + "Fly": true, + "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu" + } + ] + } + ] +} From 22b9c6f12afc1643a82ede0eea570914f1aeb2d3 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Thu, 26 Sep 2024 22:33:17 +0800 Subject: [PATCH 05/13] Reordered steps in sequence 2 --- .../2191_Smooth as Silk, Cool as Air.json | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json index e04cb159e..4471cd3cf 100644 --- a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json @@ -37,26 +37,16 @@ "Sequence": 2, "Steps": [ { - "DataId": 2006687, + "DataId": 2006690, "Position": { - "X": -553.97876, - "Y": -58.42682, - "Z": -271.10706 + "X": -857.6333, + "Y": 4.6539917, + "Z": -218.67706 }, "TerritoryId": 401, - "InteractionType": "Interact", - "Fly": true, - "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu" - }, - { - "DataId": 2006688, - "Position": { - "X": -715.1446, - "Y": -58.640503, - "Z": -342.30566 - }, - "TerritoryId": 401, - "InteractionType": "Interact", + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [5246], "Fly": true }, { @@ -71,16 +61,25 @@ "Fly": true }, { - "DataId": 2006690, + "DataId": 2006687, "Position": { - "X": -857.6333, - "Y": 4.6539917, - "Z": -218.67706 + "X": -553.97876, + "Y": -58.42682, + "Z": -271.10706 }, "TerritoryId": 401, - "InteractionType": "Combat", - "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [5246], + "InteractionType": "Interact", + "Fly": true + }, + { + "DataId": 2006688, + "Position": { + "X": -715.1446, + "Y": -58.640503, + "Z": -342.30566 + }, + "TerritoryId": 401, + "InteractionType": "Interact", "Fly": true } ] From ac5f7a4e4f19970584f23bf73e172afabe44100b Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Fri, 27 Sep 2024 00:10:33 +0800 Subject: [PATCH 06/13] Added story quest: - Celebratory Smorgasbord --- .../Story/3041_Celebratory Smorgasbord.json | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Story/3041_Celebratory Smorgasbord.json diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Story/3041_Celebratory Smorgasbord.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Story/3041_Celebratory Smorgasbord.json new file mode 100644 index 000000000..81c0e3ac9 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Story/3041_Celebratory Smorgasbord.json @@ -0,0 +1,98 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024771, + "Position": { + "X": 12.008789, + "Y": 55.97821, + "Z": 237.96448 + }, + "TerritoryId": 612, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1023142, + "Position": { + "X": -642.9083, + "Y": 130.25946, + "Z": -538.29254 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Fringes - Castrum Oriens" + }, + { + "DataId": 1024937, + "Position": { + "X": 450.88867, + "Y": 114.36421, + "Z": 235.91968 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Fringes - Peering Stones" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024952, + "Position": { + "X": 12.008789, + "Y": 55.97821, + "Z": 237.96448 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1025235, + "Position": { + "X": -155.2301, + "Y": 39.096687, + "Z": 159.0448 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024952, + "Position": { + "X": 12.008789, + "Y": 55.97821, + "Z": 237.96448 + }, + "TerritoryId": 612, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} From eeea9a66f6ec2bf6ae57cc0fe0255f45424334be Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 26 Sep 2024 22:11:05 +0200 Subject: [PATCH 07/13] Fix issues in 'Pussyfooting About' --- .../Vanu Vanu/Dailies/2172_Pussyfooting About.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2172_Pussyfooting About.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2172_Pussyfooting About.json index 0771c2924..7fd649f63 100644 --- a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2172_Pussyfooting About.json +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2172_Pussyfooting About.json @@ -1,5 +1,5 @@ { - "$schema": "https://git.carvel.li/plogon_enjoyer/Questionable/raw/branch/temp/QuestPaths/quest-v1.json", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "plogon_enjoyer", "QuestSequence": [ { @@ -100,7 +100,7 @@ "Z": -404.1352 }, "TerritoryId": 401, - "InteractionType": "Interact", + "InteractionType": "CompleteQuest", "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu", "Fly": true } From 22949d0e327ad89276a1cef233803f82dfa97625 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 26 Sep 2024 22:50:05 +0200 Subject: [PATCH 08/13] Fix 'Bringing out the Dead' --- .../MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json index 8db848843..6b4070d06 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json @@ -269,7 +269,8 @@ "Z": -353.6584 }, "TerritoryId": 140, - "InteractionType": "Interact" + "InteractionType": "Interact", + "DisableNavmesh": true } ] }, From d4ae5f95b25942b84f76e56381c5dd522d6dab07 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sat, 28 Sep 2024 16:12:33 +0800 Subject: [PATCH 09/13] Added new daily quests: - Shady Premonitions - Pestered Ancestors --- .../Dailies/2189_Shady Premonitions.json | 138 ++++++++++++++++++ .../Dailies/2190_Pestered Ancestors.json | 86 +++++++++++ 2 files changed, 224 insertions(+) create mode 100644 QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2189_Shady Premonitions.json create mode 100644 QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2190_Pestered Ancestors.json diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2189_Shady Premonitions.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2189_Shady Premonitions.json new file mode 100644 index 000000000..3f662fcbb --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2189_Shady Premonitions.json @@ -0,0 +1,138 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016089, + "Position": { + "X": -799.46594, + "Y": -133.2695, + "Z": -404.1352 + }, + "TerritoryId": 401, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1016228, + "Position": { + "X": -547.7836, + "Y": -57.646603, + "Z": -549.76733 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2006684, + "Position": { + "X": -357.29004, + "Y": -56.565247, + "Z": -598.9929 + }, + "TerritoryId": 401, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [5243], + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1016229, + "Position": { + "X": -369.31415, + "Y": -54.222214, + "Z": -605.3407 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2006685, + "Position": { + "X": -107.07257, + "Y": -13.5043335, + "Z": -655.6039 + }, + "TerritoryId": 401, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [5243], + "Fly": true + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1016230, + "Position": { + "X": -114.85474, + "Y": -13.978999, + "Z": -652.8878 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "CompleteQuest", + "Fly": true, + "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu" + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2190_Pestered Ancestors.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2190_Pestered Ancestors.json new file mode 100644 index 000000000..b41fc640d --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2190_Pestered Ancestors.json @@ -0,0 +1,86 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016089, + "Position": { + "X": -799.46594, + "Y": -133.2695, + "Z": -404.1352 + }, + "TerritoryId": 401, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2006707, + "Position": { + "X": 72.92273, + "Y": -88.39557, + "Z": 428.82422 + }, + "TerritoryId": 401, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [5244], + "Fly": true, + "AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop" + }, + { + "DataId": 2006686, + "Position": { + "X": 167.58984, + "Y": -97.428955, + "Z": 455.71057 + }, + "TerritoryId": 401, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [5244], + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "CompleteQuest", + "Fly": true, + "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu" + } + ] + } + ] +} From 38f5cd66cdce01880ad3cdd020a8e425b1c025c1 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sat, 28 Sep 2024 16:13:16 +0800 Subject: [PATCH 10/13] Updated "A Hut to Dye For". Added step to run away from spawned enemy to be able to TP away, since defeating it is not required to proceed. --- .../Vanu Vanu/Dailies/2188_A Hut to Dye For.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2188_A Hut to Dye For.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2188_A Hut to Dye For.json index 484d98342..935cc0a3d 100644 --- a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2188_A Hut to Dye For.json +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2188_A Hut to Dye For.json @@ -84,6 +84,16 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 317.41415, + "Y": 110.85538, + "Z": -34.527588 + }, + "TerritoryId": 401, + "InteractionType": "WalkTo", + "$": "Run away from the enemy to TP" + }, { "DataId": 1016092, "Position": { From 90b543c95ad84e9512747d4dbc80febe04666994 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sat, 28 Sep 2024 17:11:30 +0800 Subject: [PATCH 11/13] Added new daily quests: - A Shell to Scry On - Losing One's Tempered - Blitzing the Beacons --- .../Dailies/1222_A Shell to Scry On.json | 76 ++++++++++++ .../Dailies/1228_Losing One's Tempered.json | 114 ++++++++++++++++++ .../Dailies/1231_Blitzing the Beacons.json | 68 +++++++++++ 3 files changed, 258 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1222_A Shell to Scry On.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1228_Losing One's Tempered.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1231_Blitzing the Beacons.json diff --git a/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1222_A Shell to Scry On.json b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1222_A Shell to Scry On.json new file mode 100644 index 000000000..afc10e117 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1222_A Shell to Scry On.json @@ -0,0 +1,76 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1005550, + "Position": { + "X": 105.27197, + "Y": 15.359643, + "Z": -357.3816 + }, + "TerritoryId": 146, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -84.12953, + "Y": -14.744684, + "Z": -148.0814 + }, + "TerritoryId": 146, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 134, + "MinimumKillCount": 2 + } + ], + "Fly": true + }, + { + "Position": { + "X": -253.56975, + "Y": 6.8785334, + "Z": 162.0949 + }, + "TerritoryId": 146, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 358, + "MinimumKillCount": 1 + } + ], + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1005550, + "Position": { + "X": 105.27197, + "Y": 15.359643, + "Z": -357.3816 + }, + "TerritoryId": 146, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1228_Losing One's Tempered.json b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1228_Losing One's Tempered.json new file mode 100644 index 000000000..a7c09b47f --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1228_Losing One's Tempered.json @@ -0,0 +1,114 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1005550, + "Position": { + "X": 105.27197, + "Y": 15.359643, + "Z": -357.3816 + }, + "TerritoryId": 146, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2003169, + "Position": { + "X": -191.18036, + "Y": 3.6774292, + "Z": -162.00513 + }, + "TerritoryId": 146, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [80], + "Fly": true + }, + { + "DataId": 80, + "Position": { + "X": -198.6194, + "Y": 4.4395595, + "Z": -156.7357 + }, + "TerritoryId": 146, + "InteractionType": "UseItem", + "ItemId": 2001191 + }, + { + "DataId": 2003168, + "Position": { + "X": -155.44366, + "Y": 3.8604736, + "Z": -132.21948 + }, + "TerritoryId": 146, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [80], + "Fly": true + }, + { + "DataId": 80, + "Position": { + "X": -159.83832, + "Y": 4.2440715, + "Z": -136.43097 + }, + "TerritoryId": 146, + "InteractionType": "UseItem", + "ItemId": 2001191 + }, + { + "DataId": 2003172, + "Position": { + "X": -19.36377, + "Y": 0.47296143, + "Z": 15.182739 + }, + "TerritoryId": 146, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [80], + "Fly": true + }, + { + "DataId": 81, + "Position": { + "X": -19.760498, + "Y": 0.97421986, + "Z": 19.790894 + }, + "TerritoryId": 146, + "InteractionType": "UseItem", + "ItemId": 2001191 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1005550, + "Position": { + "X": 105.27197, + "Y": 15.359643, + "Z": -357.3816 + }, + "TerritoryId": 146, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1231_Blitzing the Beacons.json b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1231_Blitzing the Beacons.json new file mode 100644 index 000000000..232222cb2 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1231_Blitzing the Beacons.json @@ -0,0 +1,68 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1005550, + "Position": { + "X": 105.27197, + "Y": 15.359643, + "Z": -357.3816 + }, + "TerritoryId": 146, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -9.631764, + "Y": 4.530592, + "Z": -52.115612 + }, + "TerritoryId": 146, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 2452, + "MinimumKillCount": 2 + } + ], + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": -74.8761, + "Y": -1.9533517, + "Z": -51.731575 + }, + "TerritoryId": 146, + "InteractionType": "WalkTo" + }, + { + "DataId": 1005550, + "Position": { + "X": 105.27197, + "Y": 15.359643, + "Z": -357.3816 + }, + "TerritoryId": 146, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} From 619b5431d5b9459df644db4652bafecaee0c916a Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 28 Sep 2024 15:47:48 +0200 Subject: [PATCH 12/13] Skip loading unknown quests (e.g. for CN) shipped with the plugin --- Questionable/Controller/QuestRegistry.cs | 27 +++++++++++++++--------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/Questionable/Controller/QuestRegistry.cs b/Questionable/Controller/QuestRegistry.cs index 502630519..724acaf4c 100644 --- a/Questionable/Controller/QuestRegistry.cs +++ b/Questionable/Controller/QuestRegistry.cs @@ -92,17 +92,24 @@ internal sealed class QuestRegistry foreach ((ElementId questId, QuestRoot questRoot) in AssemblyQuestLoader.GetQuests()) { - var questInfo = _questData.GetQuestInfo(questId); - if (questInfo is LeveInfo leveInfo) - _leveData.AddQuestSteps(leveInfo, questRoot); - Quest quest = new() + try { - Id = questId, - Root = questRoot, - Info = questInfo, - Source = Quest.ESource.Assembly, - }; - _quests[quest.Id] = quest; + var questInfo = _questData.GetQuestInfo(questId); + if (questInfo is LeveInfo leveInfo) + _leveData.AddQuestSteps(leveInfo, questRoot); + Quest quest = new() + { + Id = questId, + Root = questRoot, + Info = questInfo, + Source = Quest.ESource.Assembly, + }; + _quests[quest.Id] = quest; + } + catch (Exception e) + { + _logger.LogWarning("Not loading unknown quest {QuestId} from assembly: {Message}", questId, e.Message); + } } _logger.LogInformation("Loaded {Count} quests from assembly", _quests.Count); From 17cfda172b8c819a5cc8485c7f15a3c5f7e9c22b Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 28 Sep 2024 23:28:53 +0200 Subject: [PATCH 13/13] Add support for Old Sharlayan leves --- .../6.x - Endwalker/Labyrinthos/886__MIN.json | 160 ++++++++++++++++++ .../Leves/MIN/L1675_Rocks of a Feather.json | 38 +++++ Questionable/Data/LeveData.cs | 29 +++- 3 files changed, 222 insertions(+), 5 deletions(-) create mode 100644 GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json create mode 100644 QuestPaths/6.x - Endwalker/Leves/MIN/L1675_Rocks of a Feather.json diff --git a/GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json b/GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json new file mode 100644 index 000000000..8bb595147 --- /dev/null +++ b/GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json @@ -0,0 +1,160 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 956, + "InteractionType": "None" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 34281, + "Locations": [ + { + "Position": { + "X": -510.2663, + "Y": -20.72923, + "Z": -119.9257 + }, + "MinimumAngle": -120, + "MaximumAngle": 10 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34283, + "Locations": [ + { + "Position": { + "X": -502.4525, + "Y": -18.55583, + "Z": -139.683 + }, + "MinimumAngle": -95, + "MaximumAngle": -35, + "MinimumDistance": 1, + "MaximumDistance": 1.8 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34284, + "Locations": [ + { + "Position": { + "X": -499.3535, + "Y": -18.75164, + "Z": -141.9256 + }, + "MinimumAngle": -75, + "MaximumAngle": 15, + "MinimumDistance": 1, + "MaximumDistance": 2.3 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34285, + "Locations": [ + { + "Position": { + "X": -495.1168, + "Y": -18.65139, + "Z": -142.5636 + }, + "MinimumAngle": -85, + "MaximumAngle": 45 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34286, + "Locations": [ + { + "Position": { + "X": -491.4826, + "Y": -19.44574, + "Z": -144.2088 + }, + "MinimumAngle": -105, + "MaximumAngle": 25 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34287, + "Locations": [ + { + "Position": { + "X": -488.8665, + "Y": -19.70717, + "Z": -147.403 + }, + "MinimumAngle": 230, + "MaximumAngle": 340 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34289, + "Locations": [ + { + "Position": { + "X": -489.1829, + "Y": -19.91622, + "Z": -153.7781 + }, + "MinimumAngle": 200, + "MaximumAngle": 320 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34291, + "Locations": [ + { + "Position": { + "X": -490.1324, + "Y": -18.06493, + "Z": -164.4281 + }, + "MinimumAngle": 210, + "MaximumAngle": 310 + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/6.x - Endwalker/Leves/MIN/L1675_Rocks of a Feather.json b/QuestPaths/6.x - Endwalker/Leves/MIN/L1675_Rocks of a Feather.json new file mode 100644 index 000000000..7b90c2f75 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Leves/MIN/L1675_Rocks of a Feather.json @@ -0,0 +1,38 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -506.1484, + "Y": -22.671598, + "Z": -116.16144 + }, + "TerritoryId": 956, + "InteractionType": "InitiateLeve", + "AetheryteShortcut": "Labyrinthos - Aporia", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + }, + { + "TerritoryId": 956, + "InteractionType": "Gather", + "ItemsToGather": [ + { + "ItemId": 2003172, + "AlternativeItemId": 2003173, + "ItemCount": 999 + } + ] + } + ] + } + ] +} diff --git a/Questionable/Data/LeveData.cs b/Questionable/Data/LeveData.cs index a8d5835ca..a80842006 100644 --- a/Questionable/Data/LeveData.cs +++ b/Questionable/Data/LeveData.cs @@ -13,7 +13,16 @@ internal sealed class LeveData { private static readonly List Leves = [ - new(EAetheryteLocation.Tuliyollal, 1048390, new(15.243713f, -14.000001f, 85.83191f)), + new( + aetheryteLocation: EAetheryteLocation.OldSharlayan, + aethernetShortcut: new AethernetShortcut + { From = EAetheryteLocation.OldSharlayan, To = EAetheryteLocation.OldSharlayanScholarsHarbor }, + issuerDataId: 1037263, + issuerPosition: new(45.818386f, -15.646993f, 109.40509f)), + new(aetheryteLocation: EAetheryteLocation.Tuliyollal, + aethernetShortcut: null, + issuerDataId: 1048390, + issuerPosition: new(15.243713f, -14.000001f, 85.83191f)), ]; private readonly AetheryteData _aetheryteData; @@ -44,6 +53,7 @@ internal sealed class LeveData TerritoryId = _aetheryteData.TerritoryIds[leveStepData.AetheryteLocation], InteractionType = EInteractionType.AcceptLeve, AetheryteShortcut = leveStepData.AetheryteLocation, + AethernetShortcut = leveStepData.AethernetShortcut, SkipConditions = new() { AetheryteShortcutIf = new() @@ -71,6 +81,7 @@ internal sealed class LeveData TerritoryId = _aetheryteData.TerritoryIds[leveStepData.AetheryteLocation], InteractionType = EInteractionType.CompleteLeve, AetheryteShortcut = leveStepData.AetheryteLocation, + AethernetShortcut = leveStepData.AethernetShortcut, SkipConditions = new() { AetheryteShortcutIf = new() @@ -93,10 +104,16 @@ internal sealed class LeveData private readonly uint? _crafterTurnInDataId; private readonly Vector3? _crafterTurnInPosition; - public LeveStepData(EAetheryteLocation aetheryteLocation, uint issuerDataId, Vector3 issuerPosition, - uint? turnInDataId = null, Vector3? turnInPosition = null, - uint? gathererTurnInDataId = null, Vector3? gathererTurnInPosition = null, - uint? crafterTurnInDataId = null, Vector3? crafterTurnInPosition = null) + public LeveStepData(EAetheryteLocation aetheryteLocation, + AethernetShortcut? aethernetShortcut, + uint issuerDataId, + Vector3 issuerPosition, + uint? turnInDataId = null, + Vector3? turnInPosition = null, + uint? gathererTurnInDataId = null, + Vector3? gathererTurnInPosition = null, + uint? crafterTurnInDataId = null, + Vector3? crafterTurnInPosition = null) { _turnInDataId = turnInDataId; _turnInPosition = turnInPosition; @@ -105,11 +122,13 @@ internal sealed class LeveData _crafterTurnInDataId = crafterTurnInDataId; _crafterTurnInPosition = crafterTurnInPosition; AetheryteLocation = aetheryteLocation; + AethernetShortcut = aethernetShortcut; IssuerDataId = issuerDataId; IssuerPosition = issuerPosition; } public EAetheryteLocation AetheryteLocation { get; } + public AethernetShortcut? AethernetShortcut { get; } public uint IssuerDataId { get; } public Vector3 IssuerPosition { get; }