diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3919_Spreading the Word.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3919_Spreading the Word.json index 24aad0b4..1de2f73f 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3919_Spreading the Word.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3919_Spreading the Word.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,34 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1033697, + "Position": { + "X": 705.2262, + "Y": 20.93061, + "Z": 29.007324 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "AetheryteShortcut": "Lakeland - Fort Jobb", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1033697, + "Position": { + "X": 705.2262, + "Y": 20.93061, + "Z": 29.007324 + }, + "TerritoryId": 813, + "InteractionType": "Emote", + "Emote": "psych" + } ] }, { @@ -43,6 +70,7 @@ }, "TerritoryId": 813, "InteractionType": "WalkTo", + "AetheryteShortcut": "Lakeland - Ostall Imperative", "Fly": true }, { diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3822_I Have Never Exploded.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3822_I Have Never Exploded.json index 76b7a64a..49588dea 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3822_I Have Never Exploded.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3822_I Have Never Exploded.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,6 +31,16 @@ "AetheryteShortcut": "Rak'tika - Fanow", "Fly": true, "RequiredGatheredItems": [ + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 29530, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 29556, + "ItemCount": 3 + } ] }, { diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3823_By the Power Invested in Scree.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3823_By the Power Invested in Scree.json index 76b7a64a..e0b0d590 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3823_By the Power Invested in Scree.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3823_By the Power Invested in Scree.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,66 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1032663, + "Position": { + "X": 793.97266, + "Y": -45.811764, + "Z": -188.03699 + }, + "TerritoryId": 817, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1032829, + "Position": { + "X": 488.3954, + "Y": 34.798103, + "Z": 232.37964 + }, + "TerritoryId": 817, + "InteractionType": "Action", + "Action": "Peculiar Light", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1032828, + "Position": { + "X": 352.16296, + "Y": 28.242743, + "Z": 303.2119 + }, + "TerritoryId": 817, + "InteractionType": "Action", + "Action": "Peculiar Light", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + ] + }, { "Sequence": 255, "Steps": [ @@ -30,9 +89,7 @@ "TerritoryId": 817, "InteractionType": "WalkTo", "AetheryteShortcut": "Rak'tika - Fanow", - "Fly": true, - "RequiredGatheredItems": [ - ] + "Fly": true }, { "DataId": 1032643, diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4703_Fungi Frustrations.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4703_Fungi Frustrations.json index d731dcbc..3ec1809c 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4703_Fungi Frustrations.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4703_Fungi Frustrations.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": 1044587, + "Position": { + "X": 354.02454, + "Y": 91.97786, + "Z": 509.14783 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "AetheryteShortcut": "Mare Lamentorum - Sinus Lacrimarum", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 959, + "InteractionType": "Craft", + "ItemId": 38877, + "ItemCount": 2 + }, + { + "DataId": 1044587, + "Position": { + "X": 354.02454, + "Y": 91.97786, + "Z": 509.14783 + }, + "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/4704_For Every Mouth, a Carrot.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4704_For Every Mouth, a Carrot.json index d731dcbc..f547e2f9 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4704_For Every Mouth, a Carrot.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4704_For Every Mouth, a Carrot.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,79 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1044412, + "Position": { + "X": -181.56714, + "Y": -49.19972, + "Z": -304.76843 + }, + "TerritoryId": 959, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1044590, + "Position": { + "X": -536.9497, + "Y": -157.99246, + "Z": -693.75146 + }, + "StopDistance": 1, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1044591, + "Position": { + "X": -502.58643, + "Y": -161.38867, + "Z": -773.251 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 1044589, + "Position": { + "X": -433.03577, + "Y": -167.50002, + "Z": -741.7258 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } ] }, { @@ -42,7 +114,9 @@ "Z": -273.68756 }, "TerritoryId": 959, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true }, { "DataId": 1044403, diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 07f1cd9a..4c271e1a 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -888,6 +888,7 @@ "Trample", "Fumigate", "Siphon Snout", + "Peculiar Light", "Cannonfire", "Red Gulal", "Yellow Gulal", diff --git a/Questionable.Model/Questing/Converter/ActionConverter.cs b/Questionable.Model/Questing/Converter/ActionConverter.cs index 3f371494..32a6654f 100644 --- a/Questionable.Model/Questing/Converter/ActionConverter.cs +++ b/Questionable.Model/Questing/Converter/ActionConverter.cs @@ -15,9 +15,9 @@ public sealed class ActionConverter() : EnumConverter(Values) { EAction.HeavyShot, "Heavy Shot" }, { EAction.Cure, "Cure" }, { EAction.Cure2, "Cure II" }, - { EAction.Eukrasia, "Eukrasia"}, - { EAction.Diagnosis, "Diagnosis"}, - { EAction.EukrasianDiagnosis, "Eukrasian Diagnosis"}, + { EAction.Eukrasia, "Eukrasia" }, + { EAction.Diagnosis, "Diagnosis" }, + { EAction.EukrasianDiagnosis, "Eukrasian Diagnosis" }, { EAction.Esuna, "Esuna" }, { EAction.Physick, "Physick" }, { EAction.AspectedBenefic, "Aspected Benefic" }, @@ -27,6 +27,7 @@ public sealed class ActionConverter() : EnumConverter(Values) { EAction.Trample, "Trample" }, { EAction.Fumigate, "Fumigate" }, { EAction.SiphonSnout, "Siphon Snout" }, + { EAction.PeculiarLight, "Peculiar Light" }, { EAction.Cannonfire, "Cannonfire" }, { EAction.RedGulal, "Red Gulal" }, { EAction.YellowGulal, "Yellow Gulal" }, diff --git a/Questionable.Model/Questing/EAction.cs b/Questionable.Model/Questing/EAction.cs index f0d2ea8b..bcc676e4 100644 --- a/Questionable.Model/Questing/EAction.cs +++ b/Questionable.Model/Questing/EAction.cs @@ -28,6 +28,7 @@ public enum EAction MagitekPulse = 8624, MagitekThunder = 8625, SiphonSnout = 18187, + PeculiarLight = 20030, Cannonfire = 20121, RedGulal = 29382, YellowGulal = 29383, @@ -63,6 +64,7 @@ public static class EActionExtensions or EAction.Trample or EAction.Fumigate or EAction.SiphonSnout + or EAction.PeculiarLight or EAction.Cannonfire or EAction.RedGulal or EAction.YellowGulal