From 258bdb451f091feb6326408c5039b381022d0d69 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 22 Aug 2024 20:21:49 +0200 Subject: [PATCH] Daily quest updates --- Directory.Build.targets | 2 +- .../Ananta/Dailies/3062_Up Sheet Creek.json | 43 ++++- .../Dailies/3063_Let There Be Lard.json | 170 +++++++++++++++++- .../Ananta/Dailies/3063_Let There Be Lard.md | 9 + .../Dailies/3922_Close to Clearmeltdown.json | 61 ++++++- .../Dwarves/Dailies/3923_Demolition Demo.json | 50 +++++- .../Dailies/3924_A Crude Awakening.json | 33 +++- .../3826_Legends of the Ronkan Temple.json | 25 ++- .../Dailies/3827_Her Splendid Materials.json | 17 +- .../Qitari/Dailies/3828_Splendid Eats.json | 14 +- .../Dailies/4572_An Explosive Brew.json | 48 ++++- .../Dailies/4707_Lunar Beats for Hopping.json | 85 ++++++++- .../Dailies/4708_Most Like It Sparkly.json | 38 +++- .../Dailies/4709_Spatial Cleanse.json | 82 ++++++++- .../Dailies/4627_Corporeal Comforts.json | 42 ++++- .../Dailies/4628_Remote Debugging.json | 74 +++++++- .../Dailies/4629_A Light in the Dark.json | 41 ++++- QuestPaths/quest-v1.json | 4 +- .../Questing/Converter/ActionConverter.cs | 2 + Questionable.Model/Questing/EAction.cs | 6 +- 20 files changed, 802 insertions(+), 44 deletions(-) create mode 100644 QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.md diff --git a/Directory.Build.targets b/Directory.Build.targets index db4a3c20..5dacb6b5 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,5 @@ - 2.13 + 2.14 diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3062_Up Sheet Creek.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3062_Up Sheet Creek.json index 2ff0c260..6f9d1cbf 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3062_Up Sheet Creek.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3062_Up Sheet Creek.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -22,7 +21,47 @@ { "Sequence": 1, "Steps": [ - + { + "DataId": 2009353, + "Position": { + "X": 269.1233, + "Y": 39.78015, + "Z": -202.01422 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2009353, + "Position": { + "X": 269.1233, + "Y": 39.78015, + "Z": -202.01422 + }, + "TerritoryId": 612, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2009353, + "Position": { + "X": 269.1233, + "Y": 39.78015, + "Z": -202.01422 + }, + "TerritoryId": 612, + "InteractionType": "Interact" + } ] }, { diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.json index 2ff0c260..e6c949ab 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -22,7 +21,174 @@ { "Sequence": 1, "Steps": [ - + { + "DataId": 2009357, + "Position": { + "X": -173.3883, + "Y": 58.1521, + "Z": -449.48505 + }, + "TerritoryId": 612, + "InteractionType": "Combat", + "ItemId": 2002446, + "EnemySpawnType": "AfterItemUse", + "KillEnemyDataIds": [ + 8594 + ], + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [ + { + "Low": 1 + }, + { + "Low": 2 + }, + { + "Low": 4 + } + ], + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 2009356, + "Position": { + "X": -210.2846, + "Y": 59.250732, + "Z": -512.0775 + }, + "TerritoryId": 612, + "InteractionType": "Combat", + "ItemId": 2002446, + "EnemySpawnType": "AfterItemUse", + "KillEnemyDataIds": [ + 8594 + ], + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [ + { + "Low": 3 + }, + { + "Low": 4 + }, + { + "Low": 6 + } + ], + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 2009355, + "Position": { + "X": -210.98651, + "Y": 59.28125, + "Z": -668.6351 + }, + "TerritoryId": 612, + "InteractionType": "Combat", + "ItemId": 2002446, + "EnemySpawnType": "AfterItemUse", + "KillEnemyDataIds": [ + 8594 + ], + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [ + { + "Low": 1 + }, + { + "Low": 3 + }, + { + "Low": 5 + } + ], + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] + }, + { + "DataId": 2009358, + "Position": { + "X": -171.03839, + "Y": 59.098145, + "Z": -750.3014 + }, + "TerritoryId": 612, + "InteractionType": "Combat", + "ItemId": 2002446, + "EnemySpawnType": "AfterItemUse", + "KillEnemyDataIds": [ + 8594 + ], + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [ + { + "Low": 2 + }, + { + "Low": 5 + }, + { + "Low": 6 + } + ], + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } ] }, { diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.md b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.md new file mode 100644 index 00000000..51ac2684 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3063_Let There Be Lard.md @@ -0,0 +1,9 @@ +``` +0 0 0 x 0 0 | 2009355 2009356 2009357 2009358 + 1 x x | unconfirmed + 2 x x + 3 x x + 4 x x | after 2009356: 2 4 → 17 20 + 5 x x + 6 x x +``` diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3922_Close to Clearmeltdown.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3922_Close to Clearmeltdown.json index d73c93ee..9856ed69 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3922_Close to Clearmeltdown.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3922_Close to Clearmeltdown.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -30,8 +29,64 @@ { "Sequence": 1, "Steps": [ - - + { + "DataId": 1033706, + "Position": { + "X": -384.9088, + "Y": 105.85561, + "Z": -645.9602 + }, + "StopDistance": 2, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1033705, + "Position": { + "X": -380.3922, + "Y": 103.089836, + "Z": -669.8253 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1033707, + "Position": { + "X": -361.83722, + "Y": 103.57124, + "Z": -703.2731 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } ] }, { diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3923_Demolition Demo.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3923_Demolition Demo.json index d73c93ee..235f3e9d 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3923_Demolition Demo.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3923_Demolition Demo.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -30,8 +29,50 @@ { "Sequence": 1, "Steps": [ - - + { + "DataId": 1033715, + "Position": { + "X": -614.4961, + "Y": 65.60227, + "Z": -405.56958 + }, + "TerritoryId": 813, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1034065, + "Position": { + "X": -294.75854, + "Y": 99.225815, + "Z": -724.0253 + }, + "TerritoryId": 813, + "InteractionType": "Action", + "Action": "Cannonfire", + "Fly": true, + "Land": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1034065, + "Position": { + "X": -294.75854, + "Y": 99.225815, + "Z": -724.0253 + }, + "TerritoryId": 813, + "InteractionType": "Action", + "Action": "Cannonfire" + } ] }, { @@ -55,7 +96,8 @@ "Z": -425.25372 }, "TerritoryId": 813, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "Mount": false } ] } diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3924_A Crude Awakening.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3924_A Crude Awakening.json index d73c93ee..6831c8ea 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3924_A Crude Awakening.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3924_A Crude Awakening.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -30,8 +29,38 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1033767, + "Position": { + "X": -608.6061, + "Y": 65.60222, + "Z": -431.81506 + }, + "TerritoryId": 813, + "InteractionType": "Interact" + } - + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 813, + "InteractionType": "Craft", + "ItemId": 31177, + "ItemCount": 1 + }, + { + "DataId": 1034070, + "Position": { + "X": -796.47516, + "Y": 69.28625, + "Z": 117.29602 + }, + "TerritoryId": 813, + "InteractionType": "Interact" + } ] }, { diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3826_Legends of the Ronkan Temple.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3826_Legends of the Ronkan Temple.json index 5b359ba6..6c9ed204 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3826_Legends of the Ronkan Temple.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3826_Legends of the Ronkan Temple.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -18,6 +17,23 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2010997, + "Position": { + "X": -399.52698, + "Y": 10.635498, + "Z": 241.50452 + }, + "TerritoryId": 817, + "InteractionType": "Interact", + "AetheryteShortcut": "Rak'tika - Slitherbough", + "Fly": true + } + ] + }, { "Sequence": 255, "Steps": [ @@ -30,12 +46,7 @@ "TerritoryId": 817, "InteractionType": "WalkTo", "AetheryteShortcut": "Rak'tika - Fanow", - "Fly": true, - "RequiredGatheredItems": [ - - - - ] + "Fly": true }, { "DataId": 1032643, diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3827_Her Splendid Materials.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3827_Her Splendid Materials.json index 5b359ba6..0ae024dc 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3827_Her Splendid Materials.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3827_Her Splendid Materials.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -32,9 +31,16 @@ "AetheryteShortcut": "Rak'tika - Fanow", "Fly": true, "RequiredGatheredItems": [ - - - + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 29533, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 29559, + "ItemCount": 3 + } ] }, { @@ -46,7 +52,8 @@ }, "StopDistance": 7, "TerritoryId": 817, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "Fly": true } ] } diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3828_Splendid Eats.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3828_Splendid Eats.json index 5b359ba6..ce85c188 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3828_Splendid Eats.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3828_Splendid Eats.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -32,9 +31,16 @@ "AetheryteShortcut": "Rak'tika - Fanow", "Fly": true, "RequiredGatheredItems": [ - - - + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 29534, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 29560, + "ItemCount": 3 + } ] }, { diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4572_An Explosive Brew.json b/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4572_An Explosive Brew.json index 42a2b0f7..bf0d1001 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4572_An Explosive Brew.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4572_An Explosive Brew.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -21,7 +20,52 @@ { "Sequence": 1, "Steps": [ - + { + "DataId": 2012903, + "Position": { + "X": 37.03357, + "Y": 22.507019, + "Z": -8.133057 + }, + "TerritoryId": 957, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 14679 + ], + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 2012904, + "Position": { + "X": 116.68567, + "Y": 22.262878, + "Z": -71.000244 + }, + "TerritoryId": 957, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 14679 + ], + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } ] }, { diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4707_Lunar Beats for Hopping.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4707_Lunar Beats for Hopping.json index f0656089..185e6156 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4707_Lunar Beats for Hopping.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4707_Lunar Beats for Hopping.json @@ -2,7 +2,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -31,6 +30,84 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1044408, + "Position": { + "X": -164.08032, + "Y": -49.199722, + "Z": -250.75159 + }, + "TerritoryId": 959, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2013262, + "Position": { + "X": 34.98889, + "Y": -47.56244, + "Z": -531.5481 + }, + "TerritoryId": 959, + "InteractionType": "Action", + "Action": "Hop-step", + "Fly": true, + "Land": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 2013263, + "Position": { + "X": 49.79016, + "Y": -133.07397, + "Z": -558.9227 + }, + "TerritoryId": 959, + "InteractionType": "Action", + "Action": "Hop-step", + "Fly": true, + "Land": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 2013261, + "Position": { + "X": -34.28705, + "Y": -129.2287, + "Z": -495.71985 + }, + "TerritoryId": 959, + "InteractionType": "Action", + "Action": "Hop-step", + "Fly": true, + "Land": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } ] }, { @@ -43,7 +120,8 @@ "Z": -273.68756 }, "TerritoryId": 959, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "Fly": true }, { "DataId": 1044403, @@ -53,7 +131,8 @@ "Z": -273.60956 }, "TerritoryId": 959, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "Mount": false } ] } diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4708_Most Like It Sparkly.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4708_Most Like It Sparkly.json index d731dcbc..13ed2819 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4708_Most Like It Sparkly.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4708_Most Like It Sparkly.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -30,6 +29,39 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1044608, + "Position": { + "X": 227.19153, + "Y": 93.66165, + "Z": -35.385742 + }, + "StopDistance": 1, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 959, + "InteractionType": "Craft", + "ItemId": 38883, + "ItemCount": 3 + }, + { + "DataId": 1044608, + "Position": { + "X": 227.19153, + "Y": 93.66165, + "Z": -35.385742 + }, + "TerritoryId": 959, + "InteractionType": "Interact" + } ] }, { @@ -42,7 +74,9 @@ "Z": -273.68756 }, "TerritoryId": 959, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true }, { "DataId": 1044403, diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4709_Spatial Cleanse.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4709_Spatial Cleanse.json index d731dcbc..60d7d790 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4709_Spatial Cleanse.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4709_Spatial Cleanse.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -30,6 +29,84 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 2013264, + "Position": { + "X": 47.01306, + "Y": -132.86035, + "Z": -504.08182 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 2013266, + "Position": { + "X": 64.65234, + "Y": -132.61621, + "Z": -451.133 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "Position": { + "X": 17.153883, + "Y": -132.7894, + "Z": -444.4903 + }, + "TerritoryId": 959, + "InteractionType": "WalkTo", + "Fly": true, + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + } + }, + { + "DataId": 2013265, + "Position": { + "X": 15.060608, + "Y": -131.27338, + "Z": -444.0528 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } ] }, { @@ -42,7 +119,8 @@ "Z": -273.68756 }, "TerritoryId": 959, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "Fly": true }, { "DataId": 1044403, diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4627_Corporeal Comforts.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4627_Corporeal Comforts.json index 368803c3..1c319fca 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4627_Corporeal Comforts.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4627_Corporeal Comforts.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -18,9 +17,50 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044071, + "Position": { + "X": 46.066895, + "Y": 268.99976, + "Z": -584.77155 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Abode of the Ea", + "Fly": true, + "RequiredGatheredItems": [ + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 38294, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 38318, + "ItemCount": 3 + } + ] + } + ] + }, { "Sequence": 255, "Steps": [ + { + "DataId": 2013072, + "Position": { + "X": 456.65674, + "Y": 438.04077, + "Z": 310.2312 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 960, + "AetheryteShortcut": "Ultima Thule - Base Omicron" + }, { "DataId": 1043417, "Position": { diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4628_Remote Debugging.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4628_Remote Debugging.json index 368803c3..5410d8f0 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4628_Remote Debugging.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4628_Remote Debugging.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -18,9 +17,82 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044072, + "Position": { + "X": -541.9547, + "Y": 74.3691, + "Z": 208.39233 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Reah Tahra" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2013132, + "Position": { + "X": -327.04663, + "Y": 88.48706, + "Z": 293.04944 + }, + "TerritoryId": 960, + "InteractionType": "Action", + "Action": "Electric Flux", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 2013131, + "Position": { + "X": -324.8493, + "Y": 88.05969, + "Z": 269.79468 + }, + "TerritoryId": 960, + "InteractionType": "Action", + "Action": "Electric Flux", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + ] + }, { "Sequence": 255, "Steps": [ + { + "DataId": 2013072, + "Position": { + "X": 456.65674, + "Y": 438.04077, + "Z": 310.2312 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 960, + "AetheryteShortcut": "Ultima Thule - Base Omicron" + }, { "DataId": 1043417, "Position": { diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4629_A Light in the Dark.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4629_A Light in the Dark.json index 368803c3..f1d2760b 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4629_A Light in the Dark.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4629_A Light in the Dark.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -18,9 +17,49 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044074, + "Position": { + "X": -585.90063, + "Y": 75.22713, + "Z": 256.67188 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Reah Tahra", + "RequiredGatheredItems": [ + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 38295, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 38319, + "ItemCount": 3 + } + ] + } + ] + }, { "Sequence": 255, "Steps": [ + { + "DataId": 2013072, + "Position": { + "X": 456.65674, + "Y": 438.04077, + "Z": 310.2312 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 960, + "AetheryteShortcut": "Ultima Thule - Base Omicron" + }, { "DataId": 1043417, "Position": { diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 85cb5d59..0a3be732 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -845,10 +845,12 @@ "Buffet (Griffin)", "Fumigate", "Siphon Snout", + "Cannonfire", "Red Gulal", "Yellow Gulal", "Blue Gulal", - "Electric Flux" + "Electric Flux", + "Hop-step" ] } }, diff --git a/Questionable.Model/Questing/Converter/ActionConverter.cs b/Questionable.Model/Questing/Converter/ActionConverter.cs index 58198632..5410e44b 100644 --- a/Questionable.Model/Questing/Converter/ActionConverter.cs +++ b/Questionable.Model/Questing/Converter/ActionConverter.cs @@ -15,9 +15,11 @@ public sealed class ActionConverter() : EnumConverter(Values) { EAction.BuffetGriffin, "Buffet (Griffin)" }, { EAction.Fumigate, "Fumigate" }, { EAction.SiphonSnout, "Siphon Snout" }, + { EAction.Cannonfire, "Cannonfire" }, { EAction.RedGulal, "Red Gulal" }, { EAction.YellowGulal, "Yellow Gulal" }, { EAction.BlueGulal, "Blue Gulal" }, { EAction.ElectrixFlux, "Electric Flux" }, + { EAction.HopStep, "Hop-step" }, }; } diff --git a/Questionable.Model/Questing/EAction.cs b/Questionable.Model/Questing/EAction.cs index 412999a6..08f71d5a 100644 --- a/Questionable.Model/Questing/EAction.cs +++ b/Questionable.Model/Questing/EAction.cs @@ -14,10 +14,12 @@ public enum EAction BuffetGriffin = 4583, Fumigate = 5872, SiphonSnout = 18187, + Cannonfire = 20121, RedGulal = 29382, YellowGulal = 29383, BlueGulal = 29384, ElectrixFlux = 29718, + HopStep = 31116, CollectMiner = 240, ScourMiner = 22182, @@ -46,9 +48,11 @@ public static class EActionExtensions or EAction.BuffetGriffin or EAction.Fumigate or EAction.SiphonSnout + or EAction.Cannonfire or EAction.RedGulal or EAction.YellowGulal or EAction.BlueGulal - or EAction.ElectrixFlux; + or EAction.ElectrixFlux + or EAction.HopStep; } }