From 218dbd8febee62616d99abb76a99f2b351cfa1dd Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 27 Aug 2024 23:40:22 +0200 Subject: [PATCH] Daily quest update --- Directory.Build.targets | 2 +- .../Dwarves/Dailies/3925_Fast and Loud.json | 20 +++++- .../Qitari/Dailies/3829_Eggspotting.json | 56 ++++++++++++++-- .../Dailies/3830_Safety Is No Accident.json | 14 ++-- ...Fish, Two Fish, Bread Fish, Stew Fish.json | 14 ++-- .../4710_Clean Paws Make Good Artists.json | 23 ++++++- .../4630_Reclaiming the Taste of Home.json | 65 ++++++++++++++++++- .../Dailies/4632_Checking for Cavities.json | 41 +++++++++++- .../Steps/Shared/GatheringRequiredItems.cs | 1 + Questionable/Windows/QuestSelectionWindow.cs | 4 +- 10 files changed, 214 insertions(+), 26 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 8fe0a236..d7818760 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,5 @@ - 2.16 + 2.17 diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3925_Fast and Loud.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3925_Fast and Loud.json index d73c93ee..f11fc566 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3925_Fast and Loud.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3925_Fast and Loud.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,28 @@ { "Sequence": 1, "Steps": [ - - + { + "DataId": 1034071, + "Position": { + "X": -171.4046, + "Y": 5.779212, + "Z": -110.27698 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true + } ] }, { "Sequence": 255, "Steps": [ + { + "TerritoryId": 813, + "InteractionType": "Craft", + "ItemId": 31179, + "ItemCount": 3 + }, { "Position": { "X": -615.73865, diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3829_Eggspotting.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3829_Eggspotting.json index 5b359ba6..6fc790bd 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3829_Eggspotting.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3829_Eggspotting.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,54 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1032830, + "Position": { + "X": -134.02002, + "Y": -18.460577, + "Z": 303.5476 + }, + "TerritoryId": 817, + "InteractionType": "Interact", + "AetheryteShortcut": "Rak'tika - Slitherbough" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1032831, + "Position": { + "X": -54.795166, + "Y": 0.7328947, + "Z": 217.09009 + }, + "TerritoryId": 817, + "InteractionType": "UseItem", + "ItemId": 2002980, + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1032830, + "Position": { + "X": -134.02002, + "Y": -18.460577, + "Z": 303.5476 + }, + "TerritoryId": 817, + "InteractionType": "Interact" + } + ] + }, { "Sequence": 255, "Steps": [ @@ -30,12 +77,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/3830_Safety Is No Accident.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3830_Safety Is No Accident.json index 5b359ba6..deded4f5 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3830_Safety Is No Accident.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3830_Safety Is No Accident.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": 29535, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 29561, + "ItemCount": 3 + } ] }, { diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3831_One Fish, Two Fish, Bread Fish, Stew Fish.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3831_One Fish, Two Fish, Bread Fish, Stew Fish.json index 5b359ba6..17c44e90 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3831_One Fish, Two Fish, Bread Fish, Stew Fish.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3831_One Fish, Two Fish, Bread Fish, Stew Fish.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": 29536, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 29562, + "ItemCount": 3 + } ] }, { diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4710_Clean Paws Make Good Artists.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4710_Clean Paws Make Good Artists.json index d731dcbc..4bd89209 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4710_Clean Paws Make Good Artists.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4710_Clean Paws Make Good Artists.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,29 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1044610, + "Position": { + "X": 588.281, + "Y": -161.13907, + "Z": -761.0742 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true + } ] }, { "Sequence": 255, "Steps": [ + { + "TerritoryId": 959, + "InteractionType": "Craft", + "ItemId": 38885, + "ItemCount": 1 + }, { "Position": { "X": -201.42024, @@ -42,7 +59,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/4630_Reclaiming the Taste of Home.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4630_Reclaiming the Taste of Home.json index 368803c3..91ba26b4 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4630_Reclaiming the Taste of Home.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4630_Reclaiming the Taste of Home.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": 1044075, + "Position": { + "X": -64.4389, + "Y": 493.32922, + "Z": -4.409851 + }, + "TerritoryId": 1073, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1044075, + "Position": { + "X": -64.4389, + "Y": 493.32922, + "Z": -4.409851 + }, + "TerritoryId": 1073, + "InteractionType": "Interact", + "RequiredGatheredItems": [ + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 38296, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 38320, + "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/4632_Checking for Cavities.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4632_Checking for Cavities.json index 368803c3..fdec020c 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4632_Checking for Cavities.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4632_Checking for Cavities.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": 1044081, + "Position": { + "X": -503.99023, + "Y": 74.16917, + "Z": 261.82947 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Reah Tahra", + "RequiredGatheredItems": [ + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 38299, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 38323, + "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/Questionable/Controller/Steps/Shared/GatheringRequiredItems.cs b/Questionable/Controller/Steps/Shared/GatheringRequiredItems.cs index 6e821e6a..b500046b 100644 --- a/Questionable/Controller/Steps/Shared/GatheringRequiredItems.cs +++ b/Questionable/Controller/Steps/Shared/GatheringRequiredItems.cs @@ -82,6 +82,7 @@ internal static class GatheringRequiredItems "Wait(navmesh ready)"); yield return CreateStartGatheringTask(gatheringPointId, requiredGatheredItems); + yield return new WaitAtEnd.WaitDelay(); } } diff --git a/Questionable/Windows/QuestSelectionWindow.cs b/Questionable/Windows/QuestSelectionWindow.cs index ba9b5ee1..a53b79e9 100644 --- a/Questionable/Windows/QuestSelectionWindow.cs +++ b/Questionable/Windows/QuestSelectionWindow.cs @@ -226,9 +226,7 @@ internal sealed class QuestSelectionWindow : LWindow if (knownQuest != null && knownQuest.FindSequence(0)?.LastStep()?.InteractionType is EInteractionType.AcceptQuest or EInteractionType.AcceptLeve && - !_questFunctions.IsQuestAccepted(quest.QuestId) && - !_questFunctions.IsQuestLocked(quest.QuestId) && - (quest.IsRepeatable || !_questFunctions.IsQuestAcceptedOrComplete(quest.QuestId))) + _questFunctions.IsReadyToAcceptQuest(quest.QuestId)) { ImGui.BeginDisabled(_questController.NextQuest != null || _questController.SimulatedQuest != null);