From 9c414d44cd0ee99a5c38f3cd17dc5d3fe999f913 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 20 Aug 2024 20:47:11 +0200 Subject: [PATCH 1/5] Daily quest update --- .../3067_For Fast, Temporary Relief.json | 1 - .../Dailies/3926_Not for Drinking.json | 24 +++++++++++-- .../Dwarves/Dailies/3927_Remote Repairs.json | 35 +++++++++++++++++-- .../Dwarves/Dailies/3928_Tip-top Gear.json | 30 ++++++++++++++-- .../Dailies/4573_Gathering Moss.json | 1 - 5 files changed, 80 insertions(+), 11 deletions(-) diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3067_For Fast, Temporary Relief.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3067_For Fast, Temporary Relief.json index 6fdae196c..8b1d6879e 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3067_For Fast, Temporary Relief.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3067_For Fast, Temporary Relief.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, diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3926_Not for Drinking.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3926_Not for Drinking.json index d73c93ee2..a8b87766a 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3926_Not for Drinking.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3926_Not for Drinking.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,26 @@ { "Sequence": 1, "Steps": [ - - + { + "Position": { + "X": -27.174656, + "Y": 1.063369, + "Z": 661.43774 + }, + "TerritoryId": 813, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1034072, + "Position": { + "X": -25.92511, + "Y": 1.3904266, + "Z": 662.8976 + }, + "TerritoryId": 813, + "InteractionType": "Interact" + } ] }, { @@ -45,6 +62,7 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", + "AetheryteShortcut": "Lakeland - Ostall Imperative", "Fly": true }, { diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3927_Remote Repairs.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3927_Remote Repairs.json index d73c93ee2..2fe8b8965 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3927_Remote Repairs.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3927_Remote Repairs.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": 31181, + "ItemCount": 1 + }, + { + "DataId": 1034073, + "Position": { + "X": -504.0513, + "Y": 3.623286, + "Z": 25.802979 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true + } ] }, { diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3928_Tip-top Gear.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3928_Tip-top Gear.json index d73c93ee2..f60bc6851 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3928_Tip-top Gear.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3928_Tip-top Gear.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,13 +29,38 @@ { "Sequence": 1, "Steps": [ - - + { + "Position": { + "X": -134.17696, + "Y": 14.623874, + "Z": -124.68204 + }, + "TerritoryId": 813, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1034075, + "Position": { + "X": -137.71265, + "Y": 14.623856, + "Z": -124.89508 + }, + "StopDistance": 5, + "TerritoryId": 813, + "InteractionType": "Interact" + } ] }, { "Sequence": 255, "Steps": [ + { + "TerritoryId": 813, + "InteractionType": "Craft", + "ItemId": 31183, + "ItemCount": 3 + }, { "Position": { "X": -615.73865, diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4573_Gathering Moss.json b/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4573_Gathering Moss.json index 9685dbf86..06b876996 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4573_Gathering Moss.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4573_Gathering Moss.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, From 440a746e461fa9059b30046ddb18492c850357db Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 20 Aug 2024 21:57:32 +0200 Subject: [PATCH 2/5] Fix nonsense use of portrait id when switching classes --- Questionable/Controller/Steps/Shared/SwitchClassJob.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Questionable/Controller/Steps/Shared/SwitchClassJob.cs b/Questionable/Controller/Steps/Shared/SwitchClassJob.cs index 4a4fa4c0d..bacd4b7d3 100644 --- a/Questionable/Controller/Steps/Shared/SwitchClassJob.cs +++ b/Questionable/Controller/Steps/Shared/SwitchClassJob.cs @@ -21,7 +21,7 @@ internal sealed class SwitchClassJob(EClassJob classJob, IClientState clientStat var gearset = gearsetModule->GetGearset(i); if (gearset->ClassJob == (byte)classJob) { - gearsetModule->EquipGearset(gearset->Id, gearset->BannerIndex); + gearsetModule->EquipGearset(gearset->Id); return true; } } From 034d2704e986817077b7fe2c7102e0f21653bb6f Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 20 Aug 2024 23:36:41 +0200 Subject: [PATCH 3/5] Daily quest updates --- .../6.x - Endwalker/Elysion/319__MIN.json | 78 +++++++++ .../6.x - Endwalker/Elysion/396__BTN.json | 78 +++++++++ .../Story/2164_Three Beaks to the Wind.json | 6 +- .../Ananta/Dailies/3055_A Swarm Welcome.json | 60 ++++++- .../3056_Keeping an Eye off Things.json | 16 +- .../Ananta/Dailies/3057_Bhoot Camps.json | 122 +++++++++++++- .../Ananta/Dailies/3057_Bhoot Camps.md | 6 + .../Dailies/3915_What's in a Locket.json | 36 ++++- .../Dwarves/Dailies/3916_Wayward 'Tons.json | 152 +++++++++++++++++- .../Dwarves/Dailies/3916_Wayward 'Tons.md | 9 ++ .../Dwarves/Dailies/3917_Taking the Heat.json | 37 ++++- .../Qitari/Dailies/3819_La-hee.json | 27 +++- .../3820_The Qitari Book of Records.json | 12 +- .../Qitari/Dailies/3821_Meat and Greet.json | 14 +- .../Dailies/4573_Gathering Moss.json | 11 +- .../4700_Be Carrotful What You Wish For.json | 50 +++++- .../Dailies/4701_Hungry for Knowledge.json | 17 +- .../Loporrits/Dailies/4702_No Chill.json | 38 ++++- .../Dailies/4711_By the Muse Forsaken.json | 24 ++- .../Dailies/4712_Art Is an Explosion!.json | 36 ++++- .../4713_Craft, Craft, Fashion, Baby.json | 23 ++- .../Dailies/4620_A Taste of the Sea.json | 65 +++++++- .../Omicrons/Dailies/4621_It's Electric!.json | 75 ++++++++- .../Omicrons/Dailies/4622_Ea Epicurious.json | 42 ++++- .../Omicrons/Dailies/4631_Not Forgotten.json | 42 ++++- .../Omicrons/Dailies/4633_Brainstorm.json | 53 +++++- QuestPaths/quest-v1.json | 6 +- .../Questing/Converter/ActionConverter.cs | 4 +- Questionable.Model/Questing/EAction.cs | 10 +- 29 files changed, 1094 insertions(+), 55 deletions(-) create mode 100644 GatheringPaths/6.x - Endwalker/Elysion/319__MIN.json create mode 100644 GatheringPaths/6.x - Endwalker/Elysion/396__BTN.json create mode 100644 QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3057_Bhoot Camps.md create mode 100644 QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3916_Wayward 'Tons.md diff --git a/GatheringPaths/6.x - Endwalker/Elysion/319__MIN.json b/GatheringPaths/6.x - Endwalker/Elysion/319__MIN.json new file mode 100644 index 000000000..99eb851cd --- /dev/null +++ b/GatheringPaths/6.x - Endwalker/Elysion/319__MIN.json @@ -0,0 +1,78 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "DataId": 2013074, + "Position": { + "X": 304.3412, + "Y": 483.48206, + "Z": 143.11438 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 1073, + "SkipConditions": { + "StepIf": { + "InTerritory": [ + 1073 + ] + } + } + }, + { + "TerritoryId": 1073, + "InteractionType": "None" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 33840, + "Locations": [ + { + "Position": { + "X": 10.28351, + "Y": 486.144, + "Z": -136.9586 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 33841, + "Locations": [ + { + "Position": { + "X": 19.46428, + "Y": 485.9226, + "Z": -136.738 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 33643, + "Locations": [ + { + "Position": { + "X": 14.21117, + "Y": 486.0551, + "Z": -143.435 + } + } + ] + } + ] + } + ] +} diff --git a/GatheringPaths/6.x - Endwalker/Elysion/396__BTN.json b/GatheringPaths/6.x - Endwalker/Elysion/396__BTN.json new file mode 100644 index 000000000..0f2adbadd --- /dev/null +++ b/GatheringPaths/6.x - Endwalker/Elysion/396__BTN.json @@ -0,0 +1,78 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "DataId": 2013074, + "Position": { + "X": 304.3412, + "Y": 483.48206, + "Z": 143.11438 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 1073, + "SkipConditions": { + "StepIf": { + "InTerritory": [ + 1073 + ] + } + } + }, + { + "TerritoryId": 1073, + "InteractionType": "None" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 34350, + "Locations": [ + { + "Position": { + "X": 18.9518, + "Y": 485.9131, + "Z": -133.3762 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34351, + "Locations": [ + { + "Position": { + "X": 15.71416, + "Y": 486.0302, + "Z": -136.2497 + } + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34349, + "Locations": [ + { + "Position": { + "X": 9.524881, + "Y": 486.2234, + "Z": -142.2316 + } + } + ] + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2164_Three Beaks to the Wind.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2164_Three Beaks to the Wind.json index 8903a9f42..bd8b72bd6 100644 --- a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2164_Three Beaks to the Wind.json +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2164_Three Beaks to the Wind.json @@ -114,7 +114,7 @@ }, "TerritoryId": 401, "InteractionType": "Action", - "Action": "Buffet", + "Action": "Buffet (Sanuwa)", "Fly": true, "CompletionQuestVariablesFlags": [ null, @@ -134,7 +134,7 @@ }, "TerritoryId": 401, "InteractionType": "Action", - "Action": "Buffet", + "Action": "Buffet (Sanuwa)", "Fly": true, "CompletionQuestVariablesFlags": [ null, @@ -154,7 +154,7 @@ }, "TerritoryId": 401, "InteractionType": "Action", - "Action": "Buffet", + "Action": "Buffet (Sanuwa)", "Fly": true, "CompletionQuestVariablesFlags": [ null, diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3055_A Swarm Welcome.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3055_A Swarm Welcome.json index 2ff0c2603..4c29699ad 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3055_A Swarm Welcome.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3055_A Swarm Welcome.json @@ -1,7 +1,7 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, + "$": "TODO Check if this is a sp1ecial mount that can always fly", "QuestSequence": [ { "Sequence": 0, @@ -22,7 +22,61 @@ { "Sequence": 1, "Steps": [ - + { + "DataId": 1024775, + "Position": { + "X": -35.599304, + "Y": 55.9782, + "Z": 214.58752 + }, + "TerritoryId": 612, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1025170, + "Position": { + "X": 253.10132, + "Y": 45.434376, + "Z": 416.98328 + }, + "TerritoryId": 612, + "InteractionType": "Action", + "Action": "Buffet (Griffin)", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1025171, + "Position": { + "X": 349.8435, + "Y": 51.839485, + "Z": 229.66345 + }, + "TerritoryId": 612, + "InteractionType": "Action", + "Action": "Buffet (Griffin)", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } ] }, { @@ -48,7 +102,7 @@ "StopDistance": 7, "TerritoryId": 612, "InteractionType": "CompleteQuest", - "Fly": true + "Mount": false } ] } diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3056_Keeping an Eye off Things.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3056_Keeping an Eye off Things.json index 2ff0c2603..e67bb1d33 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3056_Keeping an Eye off Things.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3056_Keeping an Eye off Things.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,20 @@ { "Sequence": 1, "Steps": [ - + { + "Position": { + "X": -50.436653, + "Y": 41.158955, + "Z": -264.4358 + }, + "TerritoryId": 612, + "InteractionType": "Instruction", + "Comment": "Use item on enemy, then kill it", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 7030 + ] + } ] }, { diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3057_Bhoot Camps.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3057_Bhoot Camps.json index 2ff0c2603..58d70ec9f 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3057_Bhoot Camps.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3057_Bhoot Camps.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,126 @@ { "Sequence": 1, "Steps": [ - + { + "DataId": 2009344, + "Position": { + "X": 101.304565, + "Y": 41.031494, + "Z": -180.89569 + }, + "TerritoryId": 612, + "InteractionType": "WaitForManualProgress", + "Comment": "Kill enemy, then use item", + "ItemId": 2002439, + "EnemySpawnType": "AfterItemUse", + "KillEnemyDataIds": [ + 8591 + ], + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [ + { + "Low": 2 + }, + { + "Low": 3 + } + ], + null, + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 2009345, + "Position": { + "X": 136.40039, + "Y": 50.369995, + "Z": -397.69592 + }, + "TerritoryId": 612, + "InteractionType": "WaitForManualProgress", + "Comment": "Kill enemy, then use item", + "ItemId": 2002439, + "EnemySpawnType": "AfterItemUse", + "KillEnemyDataIds": [ + 8591 + ], + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [ + { + "Low": 1 + }, + { + "Low": 3 + } + ], + null, + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 2009346, + "Position": { + "X": 12.588623, + "Y": 41.672363, + "Z": -294.02612 + }, + "TerritoryId": 612, + "InteractionType": "WaitForManualProgress", + "Comment": "Kill enemy, then use item", + "ItemId": 2002439, + "EnemySpawnType": "AfterItemUse", + "KillEnemyDataIds": [ + 8591 + ], + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [ + { + "Low": 1 + }, + { + "Low": 2 + } + ], + null, + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } ] }, { diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3057_Bhoot Camps.md b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3057_Bhoot Camps.md new file mode 100644 index 000000000..99aa9fa27 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3057_Bhoot Camps.md @@ -0,0 +1,6 @@ +``` +0 0 xx 0 0 0 | 2009344 2009345 2009346 + 33 x x | unconfirmed + 34 x x + 35 x x +``` diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3915_What's in a Locket.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3915_What's in a Locket.json index d73c93ee2..3e6c28a8f 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3915_What's in a Locket.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3915_What's in a Locket.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,39 @@ { "Sequence": 1, "Steps": [ - - + { + "DataId": 1033750, + "Position": { + "X": -591.3329, + "Y": 72.00111, + "Z": -451.01093 + }, + "StopDistance": 5, + "TerritoryId": 813, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 813, + "InteractionType": "Craft", + "ItemId": 31167, + "ItemCount": 1 + }, + { + "DataId": 1033750, + "Position": { + "X": -591.3329, + "Y": 72.00111, + "Z": -451.01093 + }, + "StopDistance": 5, + "TerritoryId": 813, + "InteractionType": "Interact" + } ] }, { diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3916_Wayward 'Tons.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3916_Wayward 'Tons.json index d73c93ee2..528a84d5f 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3916_Wayward 'Tons.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3916_Wayward 'Tons.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,154 @@ { "Sequence": 1, "Steps": [ - - + { + "DataId": 2011169, + "Position": { + "X": -95.903015, + "Y": 1.6326294, + "Z": 41.244995 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [ + { + "High": 1 + }, + { + "High": 4 + }, + { + "High": 5 + } + ], + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 2011170, + "Position": { + "X": -84.916504, + "Y": 2.39563, + "Z": 36.850464 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [ + { + "High": 1 + }, + { + "High": 2 + }, + { + "High": 6 + } + ], + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 2011171, + "Position": { + "X": -68.55884, + "Y": 2.5177002, + "Z": 38.04065 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [ + { + "High": 3 + }, + { + "High": 5 + }, + { + "High": 6 + } + ], + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 2011172, + "Position": { + "X": -70.2984, + "Y": 1.449585, + "Z": 62.210938 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [ + { + "High": 2 + }, + { + "High": 3 + }, + { + "High": 4 + } + ], + null, + null + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] + } ] }, { @@ -45,6 +190,7 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", + "AetheryteShortcut": "Lakeland - Ostall Imperative", "Fly": true }, { diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3916_Wayward 'Tons.md b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3916_Wayward 'Tons.md new file mode 100644 index 000000000..3b7d4a714 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3916_Wayward 'Tons.md @@ -0,0 +1,9 @@ +``` +0 0 0 xx 0 0 | 2011169 2011170 2011171 2011172 + 16(1) x x + 32(2) x x + 48(3) x x + 64(4) x x + 80(5) x x + 96(6) x x +``` diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3917_Taking the Heat.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3917_Taking the Heat.json index d73c93ee2..78cbb03f9 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3917_Taking the Heat.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3917_Taking the Heat.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,39 @@ { "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": 31169, + "ItemCount": 3 + }, + { + "DataId": 1033694, + "Position": { + "X": 593.19434, + "Y": 5.8981767, + "Z": 704.86 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "AetheryteShortcut": "Lakeland - Fort Jobb", + "Fly": true + } ] }, { @@ -45,6 +75,7 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", + "AetheryteShortcut": "Lakeland - Ostall Imperative", "Fly": true }, { diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3819_La-hee.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3819_La-hee.json index 5b359ba61..21cf8ce79 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3819_La-hee.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3819_La-hee.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,25 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1032413, + "Position": { + "X": 144.36548, + "Y": -19.982845, + "Z": -459.8001 + }, + "TerritoryId": 817, + "InteractionType": "Say", + "ChatMessage": { + "Key": "TEXT_BANQIQ114_03819_SAYTODO_000_000" + }, + "Fly": true + } + ] + }, { "Sequence": 255, "Steps": [ @@ -30,12 +48,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/3820_The Qitari Book of Records.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3820_The Qitari Book of Records.json index 5b359ba61..1a56d60e6 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3820_The Qitari Book of Records.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3820_The Qitari Book of Records.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,7 +31,16 @@ "AetheryteShortcut": "Rak'tika - Fanow", "Fly": true, "RequiredGatheredItems": [ - + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 29528, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 29554, + "ItemCount": 3 + } ] diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3821_Meat and Greet.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3821_Meat and Greet.json index 5b359ba61..3d5f7dcbf 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3821_Meat and Greet.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3821_Meat and Greet.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": 29529, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 29555, + "ItemCount": 3 + } ] }, { diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4573_Gathering Moss.json b/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4573_Gathering Moss.json index 06b876996..380b35fe8 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4573_Gathering Moss.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Arkasodara/Dailies/4573_Gathering Moss.json @@ -42,6 +42,16 @@ } } }, + { + "Position": { + "X": 103.41005, + "Y": -23.878786, + "Z": 187.79831 + }, + "TerritoryId": 957, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, { "DataId": 2012907, "Position": { @@ -51,7 +61,6 @@ }, "TerritoryId": 957, "InteractionType": "Interact", - "DisableNavmesh": true, "CompletionQuestVariablesFlags": [ null, null, diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4700_Be Carrotful What You Wish For.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4700_Be Carrotful What You Wish For.json index d731dcbc4..5482ede79 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4700_Be Carrotful What You Wish For.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4700_Be Carrotful What You Wish For.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,52 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1045113, + "Position": { + "X": -315.66345, + "Y": -144, + "Z": -492.0272 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1044585, + "Position": { + "X": -496.14713, + "Y": -154.93994, + "Z": -484.88593 + }, + "TerritoryId": 959, + "InteractionType": "Say", + "Fly": true, + "ChatMessage": { + "Key": "TEXT_BANLOP114_04700_SAYTODO_000_050" + } + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1045113, + "Position": { + "X": -315.66345, + "Y": -144, + "Z": -492.0272 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true + } ] }, { @@ -42,7 +87,8 @@ "Z": -273.68756 }, "TerritoryId": 959, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "Fly": true }, { "DataId": 1044403, diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4701_Hungry for Knowledge.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4701_Hungry for Knowledge.json index d731dcbc4..c1a3e364e 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4701_Hungry for Knowledge.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4701_Hungry for Knowledge.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,11 +29,27 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1044412, + "Position": { + "X": -181.56714, + "Y": -49.19972, + "Z": -304.76843 + }, + "TerritoryId": 959, + "InteractionType": "Interact" + } ] }, { "Sequence": 255, "Steps": [ + { + "TerritoryId": 959, + "InteractionType": "Craft", + "ItemId": 38873, + "ItemCount": 3 + }, { "Position": { "X": -201.42024, diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4702_No Chill.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4702_No Chill.json index d731dcbc4..7b4239d00 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4702_No Chill.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4702_No Chill.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": 1044586, + "Position": { + "X": -524.19324, + "Y": -158.8955, + "Z": -521.17194 + }, + "StopDistance": 0.5, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 959, + "InteractionType": "Craft", + "ItemId": 38875, + "ItemCount": 1 + }, + { + "DataId": 1044586, + "Position": { + "X": -524.19324, + "Y": -158.8955, + "Z": -521.17194 + }, + "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/4711_By the Muse Forsaken.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4711_By the Muse Forsaken.json index f0656089e..c917dfced 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4711_By the Muse Forsaken.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4711_By the Muse Forsaken.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,25 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1044613, + "Position": { + "X": 493.55298, + "Y": -163.52985, + "Z": -711.54346 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_BANLOP125_04711_Q1_000_000", + "Answer": "TEXT_BANLOP125_04711_A3_000_003" + } + ] + } ] }, { @@ -43,7 +61,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/4712_Art Is an Explosion!.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4712_Art Is an Explosion!.json index f0656089e..2706bc505 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4712_Art Is an Explosion!.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4712_Art Is an Explosion!.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,38 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1044615, + "Position": { + "X": -84.7334, + "Y": -49.589592, + "Z": -351.73578 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 959, + "InteractionType": "Craft", + "ItemId": 38887, + "ItemCount": 3 + }, + { + "DataId": 1044615, + "Position": { + "X": -84.7334, + "Y": -49.589592, + "Z": -351.73578 + }, + "TerritoryId": 959, + "InteractionType": "Interact" + } ] }, { @@ -43,7 +74,8 @@ "Z": -273.68756 }, "TerritoryId": 959, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "Fly": true }, { "DataId": 1044403, diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4713_Craft, Craft, Fashion, Baby.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4713_Craft, Craft, Fashion, Baby.json index f0656089e..02199766a 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4713_Craft, Craft, Fashion, Baby.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4713_Craft, Craft, Fashion, Baby.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,11 +30,29 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1044616, + "Position": { + "X": -630.67065, + "Y": -140.39087, + "Z": -789.79175 + }, + "StopDistance": 0.5, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true + } ] }, { "Sequence": 255, "Steps": [ + { + "TerritoryId": 959, + "InteractionType": "Craft", + "ItemId": 38889, + "ItemCount": 1 + }, { "Position": { "X": -201.42024, @@ -43,7 +60,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/Omicrons/Dailies/4620_A Taste of the Sea.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4620_A Taste of the Sea.json index 368803c3a..e06131ede 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4620_A Taste of the Sea.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4620_A Taste of the Sea.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,73 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2013074, + "Position": { + "X": 304.3412, + "Y": 483.48206, + "Z": 143.11438 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 1073 + }, + { + "DataId": 1044059, + "Position": { + "X": -15.304871, + "Y": 494.9991, + "Z": -68.16211 + }, + "TerritoryId": 1073, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1044059, + "Position": { + "X": -15.304871, + "Y": 494.9991, + "Z": -68.16211 + }, + "TerritoryId": 1073, + "InteractionType": "Interact", + "RequiredGatheredItems": [ + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 38289, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 38313, + "ItemCount": 3 + } + ] + } + ] + }, { "Sequence": 255, "Steps": [ + { + "DataId": 1043421, + "Position": { + "X": 2.4261475, + "Y": 499.87805, + "Z": 46.036377 + }, + "TerritoryId": 1073, + "InteractionType": "Interact", + "TargetTerritoryId": 960 + }, { "DataId": 1043417, "Position": { diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4621_It's Electric!.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4621_It's Electric!.json index 368803c3a..8934e0160 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4621_It's Electric!.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4621_It's Electric!.json @@ -1,7 +1,7 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, + "$": "TODO Check if this is a special mount that can always fly", "QuestSequence": [ { "Sequence": 0, @@ -18,9 +18,82 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044060, + "Position": { + "X": 57.75537, + "Y": 269.00012, + "Z": -674.49457 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Abode of the Ea" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1044063, + "Position": { + "X": -193.53015, + "Y": 269.23087, + "Z": -315.63293 + }, + "TerritoryId": 960, + "InteractionType": "Action", + "Action": "Electric Flux", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1044062, + "Position": { + "X": -213.42798, + "Y": 268.01166, + "Z": -299.5194 + }, + "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/4622_Ea Epicurious.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4622_Ea Epicurious.json index 368803c3a..afa62fdd6 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4622_Ea Epicurious.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4622_Ea Epicurious.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": 1044064, + "Position": { + "X": 86.503296, + "Y": 269.08234, + "Z": -515.0683 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Abode of the Ea", + "Fly": true, + "RequiredGatheredItems": [ + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 38290, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 38314, + "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/4631_Not Forgotten.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4631_Not Forgotten.json index 368803c3a..f68b76f5f 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4631_Not Forgotten.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4631_Not Forgotten.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": 1044076, + "Position": { + "X": -499.96188, + "Y": 77.00467, + "Z": 241.07727 + }, + "StopDistance": 9, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Reah Tahra", + "RequiredGatheredItems": [ + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 38297, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 38321, + "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/4633_Brainstorm.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4633_Brainstorm.json index 368803c3a..491fd1616 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4633_Brainstorm.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4633_Brainstorm.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,61 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044078, + "Position": { + "X": 97.154175, + "Y": 269.09738, + "Z": -498.3139 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Abode of the Ea", + "Fly": true, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_BANOMI127_04633_Q1_000_000", + "Answer": "TEXT_BANOMI127_04633_A1_000_002" + } + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1044079, + "Position": { + "X": 99.412476, + "Y": 269.09763, + "Z": -497.1237 + }, + "StopDistance": 5, + "TerritoryId": 960, + "InteractionType": "Interact" + } + ] + }, { "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 93250092f..06f9a711c 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -835,12 +835,14 @@ "Cure", "Esuna", "Physick", - "Buffet", + "Buffet (Sanuwa)", + "Buffet (Griffin)", "Fumigate", "Siphon Snout", "Red Gulal", "Yellow Gulal", - "Blue Gulal" + "Blue Gulal", + "Electric Flux" ] } }, diff --git a/Questionable.Model/Questing/Converter/ActionConverter.cs b/Questionable.Model/Questing/Converter/ActionConverter.cs index 7e62c0113..bef560820 100644 --- a/Questionable.Model/Questing/Converter/ActionConverter.cs +++ b/Questionable.Model/Questing/Converter/ActionConverter.cs @@ -10,11 +10,13 @@ public sealed class ActionConverter() : EnumConverter(Values) { EAction.Cure, "Cure" }, { EAction.Esuna, "Esuna" }, { EAction.Physick, "Physick" }, - { EAction.Buffet, "Buffet" }, + { EAction.BuffetSanuwa, "Buffet (Sanuwa)" }, + { EAction.BuffetGriffin, "Buffet (Griffin)" }, { EAction.Fumigate, "Fumigate" }, { EAction.SiphonSnout, "Siphon Snout" }, { EAction.RedGulal, "Red Gulal" }, { EAction.YellowGulal, "Yellow Gulal" }, { EAction.BlueGulal, "Blue Gulal" }, + { EAction.ElectrixFlux, "Electric Flux" }, }; } diff --git a/Questionable.Model/Questing/EAction.cs b/Questionable.Model/Questing/EAction.cs index f6afab6bc..a2a8b71f2 100644 --- a/Questionable.Model/Questing/EAction.cs +++ b/Questionable.Model/Questing/EAction.cs @@ -9,12 +9,14 @@ public enum EAction Cure = 120, Esuna = 7568, Physick = 190, - Buffet = 4931, + BuffetSanuwa = 4931, + BuffetGriffin = 4583, Fumigate = 5872, SiphonSnout = 18187, RedGulal = 29382, YellowGulal = 29383, BlueGulal = 29384, + ElectrixFlux = 29718, CollectMiner = 240, ScourMiner = 22182, @@ -39,11 +41,13 @@ public static class EActionExtensions public static bool RequiresMount(this EAction action) { return action - is EAction.Buffet + is EAction.BuffetSanuwa + or EAction.BuffetGriffin or EAction.Fumigate or EAction.SiphonSnout or EAction.RedGulal or EAction.YellowGulal - or EAction.BlueGulal; + or EAction.BlueGulal + or EAction.ElectrixFlux; } } From 7ca783bade9827f1b3288bbeef7f28aac49bfe85 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Wed, 21 Aug 2024 00:57:58 +0200 Subject: [PATCH 4/5] Add ShB caster role quests --- Directory.Build.targets | 2 +- .../Magical Ranged/3623_Hollow Pursuits.json | 84 ++++++++- .../3624_A Voice from the Void.json | 110 ++++++++++++ .../3625_Echoes of the Past.json | 169 ++++++++++++++++++ .../3626_Nyelbert's Lament.json | 69 +++++++ .../3627_Taynor's Training Day.json | 144 +++++++++++++++ .../3628_A Tearful Reunion.json | 137 ++++++++++++++ .../Controller/Steps/Interactions/Interact.cs | 3 +- 8 files changed, 715 insertions(+), 3 deletions(-) create mode 100644 QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3624_A Voice from the Void.json create mode 100644 QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3625_Echoes of the Past.json create mode 100644 QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3626_Nyelbert's Lament.json create mode 100644 QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3627_Taynor's Training Day.json create mode 100644 QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3628_A Tearful Reunion.json diff --git a/Directory.Build.targets b/Directory.Build.targets index cf5141ab3..7aba154f4 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,5 @@ - 2.11 + 2.12 diff --git a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3623_Hollow Pursuits.json b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3623_Hollow Pursuits.json index be49e028f..212b50746 100644 --- a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3623_Hollow Pursuits.json +++ b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3623_Hollow Pursuits.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, @@ -17,6 +16,89 @@ "InteractionType": "AcceptQuest" } ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1027264, + "Position": { + "X": 60.593506, + "Y": 36.247692, + "Z": -171.80133 + }, + "TerritoryId": 819, + "InteractionType": "Interact", + "TargetTerritoryId": 815, + "AethernetShortcut": [ + "[Crystarium] The Pendants", + "[Crystarium] The Amaro Launch" + ] + }, + { + "DataId": 1030623, + "Position": { + "X": 665.6748, + "Y": -50.355476, + "Z": -641.5351 + }, + "TerritoryId": 815, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2010165, + "Position": { + "X": 483.48206, + "Y": -50.46167, + "Z": -631.52515 + }, + "TerritoryId": 815, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 10836 + ], + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1030624, + "Position": { + "X": 500.54163, + "Y": -50.72601, + "Z": -647.5471 + }, + "TerritoryId": 815, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1030625, + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "TerritoryId": 815, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Amh Araeng - Mord Souq", + "NextQuestId": 3624 + } + ] } ] } diff --git a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3624_A Voice from the Void.json b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3624_A Voice from the Void.json new file mode 100644 index 000000000..c2dced214 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3624_A Voice from the Void.json @@ -0,0 +1,110 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1030625, + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "TerritoryId": 815, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Amh Araeng - Mord Souq", + "SkipConditions": { + "AetheryteShortcutIf": { + "NearPosition": { + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "MaximumDistance": 100 + } + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2010166, + "Position": { + "X": 599.115, + "Y": -33.61566, + "Z": -304.49384 + }, + "TerritoryId": 815, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 10837 + ], + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1030625, + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "TerritoryId": 815, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2010214, + "Position": { + "X": 488.85327, + "Y": -26.16925, + "Z": -12.008911 + }, + "TerritoryId": 815, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1030625, + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "TerritoryId": 815, + "InteractionType": "CompleteQuest", + "Fly": true, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_LUCKBA411_03624_Q1_000_100", + "Answer": "TEXT_LUCKBA411_03624_A1_000_100" + } + ], + "NextQuestId": 3625 + } + ] + } + ] +} diff --git a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3625_Echoes of the Past.json b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3625_Echoes of the Past.json new file mode 100644 index 000000000..9b7b8ddee --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3625_Echoes of the Past.json @@ -0,0 +1,169 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1030625, + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "TerritoryId": 815, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Amh Araeng - Mord Souq", + "SkipConditions": { + "AetheryteShortcutIf": { + "NearPosition": { + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "MaximumDistance": 100 + } + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1030626, + "Position": { + "X": 331.62415, + "Y": 1.4685826, + "Z": -244.95312 + }, + "TerritoryId": 815, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1030627, + "Position": { + "X": 330.06775, + "Y": 1.4685818, + "Z": -164.0498 + }, + "TerritoryId": 815, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1030628, + "Position": { + "X": 407.6753, + "Y": -28.443933, + "Z": 260.8224 + }, + "TerritoryId": 815, + "InteractionType": "Interact", + "AetheryteShortcut": "Amh Araeng - Inn at Journey's Head", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1030630, + "Position": { + "X": 368.39856, + "Y": -28.620693, + "Z": 353.78027 + }, + "TerritoryId": 815, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1030632, + "Position": { + "X": 550.225, + "Y": -45.678886, + "Z": 282.82593 + }, + "StopDistance": 0.5, + "TerritoryId": 815, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 10838 + ], + "Fly": true + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1030632, + "Position": { + "X": 550.225, + "Y": -45.678886, + "Z": 282.82593 + }, + "TerritoryId": 815, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1030631, + "Position": { + "X": 367.72717, + "Y": -28.562725, + "Z": 356.19116 + }, + "TerritoryId": 815, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1030625, + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "TerritoryId": 815, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Amh Araeng - Mord Souq", + "Fly": true, + "NextQuestId": 3626 + } + ] + } + ] +} diff --git a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3626_Nyelbert's Lament.json b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3626_Nyelbert's Lament.json new file mode 100644 index 000000000..43368dbd5 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3626_Nyelbert's Lament.json @@ -0,0 +1,69 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1030625, + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "TerritoryId": 815, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Amh Araeng - Mord Souq", + "SkipConditions": { + "AetheryteShortcutIf": { + "NearPosition": { + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "MaximumDistance": 100 + } + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1030636, + "Position": { + "X": 342.8855, + "Y": -35.843185, + "Z": 76.58496 + }, + "TerritoryId": 815, + "InteractionType": "SinglePlayerDuty", + "AetheryteShortcut": "Amh Araeng - Inn at Journey's Head", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1030625, + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "TerritoryId": 815, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Amh Araeng - Mord Souq", + "Fly": true, + "NextQuestId": 3627 + } + ] + } + ] +} diff --git a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3627_Taynor's Training Day.json b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3627_Taynor's Training Day.json new file mode 100644 index 000000000..370c4fc15 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3627_Taynor's Training Day.json @@ -0,0 +1,144 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1030625, + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "TerritoryId": 815, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Amh Araeng - Mord Souq", + "SkipConditions": { + "AetheryteShortcutIf": { + "NearPosition": { + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "MaximumDistance": 100 + } + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1030638, + "Position": { + "X": 543.8773, + "Y": -6.503428, + "Z": 811.7036 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "AetheryteShortcut": "Crystarium", + "AethernetShortcut": [ + "[Crystarium] Aetheryte Plaza", + "[Crystarium] Tessellation (Lakeland)" + ], + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InTerritory": [ + 813 + ] + } + } + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2010215, + "Position": { + "X": 523.9795, + "Y": -2.0599976, + "Z": 795.1018 + }, + "TerritoryId": 813, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 10839 + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1030639, + "Position": { + "X": 542.8092, + "Y": -6.489782, + "Z": 811.79517 + }, + "TerritoryId": 813, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1031033, + "Position": { + "X": 540.6727, + "Y": -6.4392195, + "Z": 801.87683 + }, + "TerritoryId": 813, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1031033, + "Position": { + "X": 540.6727, + "Y": -6.4392195, + "Z": 801.87683 + }, + "TerritoryId": 813, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1030625, + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "TerritoryId": 815, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Amh Araeng - Mord Souq", + "Fly": true, + "NextQuestId": 3628 + } + ] + } + ] +} diff --git a/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3628_A Tearful Reunion.json b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3628_A Tearful Reunion.json new file mode 100644 index 000000000..1895ba164 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Role Quests/Magical Ranged/3628_A Tearful Reunion.json @@ -0,0 +1,137 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1030625, + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "TerritoryId": 815, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Amh Araeng - Mord Souq", + "SkipConditions": { + "AetheryteShortcutIf": { + "NearPosition": { + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "MaximumDistance": 100 + } + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1030697, + "Position": { + "X": 288.74634, + "Y": 7.1558266, + "Z": -219.2569 + }, + "TerritoryId": 815, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1030625, + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "TerritoryId": 815, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1030641, + "Position": { + "X": -255.8786, + "Y": 23.447075, + "Z": -288.4718 + }, + "TerritoryId": 815, + "InteractionType": "SinglePlayerDuty", + "AetheryteShortcut": "Amh Araeng - Twine", + "Fly": true + } + ] + }, + { + "Sequence": 4 + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1030641, + "Position": { + "X": -255.8786, + "Y": 23.447075, + "Z": -288.4718 + }, + "TerritoryId": 815, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1030625, + "Position": { + "X": 218.73804, + "Y": 7.1558266, + "Z": -249.1341 + }, + "TerritoryId": 815, + "InteractionType": "Interact", + "AetheryteShortcut": "Amh Araeng - Mord Souq" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1030643, + "Position": { + "X": -0.16790771, + "Y": 3.9998174, + "Z": 201.9226 + }, + "TerritoryId": 819, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Crystarium", + "AethernetShortcut": [ + "[Crystarium] Aetheryte Plaza", + "[Crystarium] The Pendants" + ] + } + ] + } + ] +} diff --git a/Questionable/Controller/Steps/Interactions/Interact.cs b/Questionable/Controller/Steps/Interactions/Interact.cs index 39caf1ae5..49b9e419f 100644 --- a/Questionable/Controller/Steps/Interactions/Interact.cs +++ b/Questionable/Controller/Steps/Interactions/Interact.cs @@ -151,7 +151,8 @@ internal static class Interact { logger.LogDebug("Condition change: {Flag} = {Value}", flag, value); if (_interactionState == EInteractionState.InteractionTriggered && - flag == ConditionFlag.OccupiedInQuestEvent && value) + flag is ConditionFlag.OccupiedInQuestEvent or ConditionFlag.OccupiedInEvent && + value) { logger.LogInformation("Interaction was most likely triggered"); _interactionState = EInteractionState.InteractionConfirmed; From b5f66bb9e8328a84bb4d3f689773ccd0c0c61c42 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Wed, 21 Aug 2024 00:59:32 +0200 Subject: [PATCH 5/5] Update dependencies --- vendor/ECommons | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/ECommons b/vendor/ECommons index 9e90d0032..ac744e72d 160000 --- a/vendor/ECommons +++ b/vendor/ECommons @@ -1 +1 @@ -Subproject commit 9e90d0032f0efd4c9e65d9c5a8e8bd0e99557d68 +Subproject commit ac744e72d99da3f3b4efc64bcadcfd40de7c21eb