diff --git a/QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4217_Armored Up.json b/QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4217_Armored Up.json new file mode 100644 index 00000000..3d25099e --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4217_Armored Up.json @@ -0,0 +1,101 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "goatzone", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1041122, + "Position": { + "X": 134.844, + "Y": -13.286316, + "Z": 649.8054 + }, + "TerritoryId": 958, + "InteractionType": "AcceptQuest", + "Fly": true, + "$": "this thing starts out in the boonies" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1041119, + "Position": { + "X": 135.85095, + "Y": -17.135998, + "Z": 567.8645 + }, + "TerritoryId": 958, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 73.64728, + "Y": -18.777306, + "Z": 527.2946 + }, + "TerritoryId": 958, + "InteractionType": "WaitForManualProgress", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ], + "Comment": "Use the mount's abilities to kill the drones.", + "$.0": "0 0 0 0 0 0 -> 16 64 0 0 0 128", + "$.1": "can't find any currently extant method of automating this - could add the actions, but it's combat with the actions specifically, repeat use on targets" + }, + { + "Position": { + "X": 370.17212, + "Y": -18.937208, + "Z": 338.0957 + }, + "TerritoryId": 958, + "InteractionType": "WaitForManualProgress", + "Comment": "Use the mount's abilities to kill the drones." + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 370.17212, + "Y": -18.937208, + "Z": 338.0957 + }, + "TerritoryId": 958, + "InteractionType": "Action", + "Action": "Dismount", + "$": "need to dismount explicitly or it blocks quest turnin, gets mad at you for not using the pet hotbar action. if we do it now, we can fly to turnin, big speedup" + }, + { + "DataId": 1041119, + "Position": { + "X": 135.85095, + "Y": -17.135998, + "Z": 567.8645 + }, + "TerritoryId": 958, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 0c0661f7..163d3207 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -919,7 +919,8 @@ "Yellow Gulal", "Blue Gulal", "Electric Flux", - "Hop-step" + "Hop-step", + "Dismount" ] } }, diff --git a/Questionable.Model/Questing/Converter/ActionConverter.cs b/Questionable.Model/Questing/Converter/ActionConverter.cs index 32a6654f..fba2b169 100644 --- a/Questionable.Model/Questing/Converter/ActionConverter.cs +++ b/Questionable.Model/Questing/Converter/ActionConverter.cs @@ -34,5 +34,6 @@ public sealed class ActionConverter() : EnumConverter(Values) { EAction.BlueGulal, "Blue Gulal" }, { EAction.ElectrixFlux, "Electric Flux" }, { EAction.HopStep, "Hop-step" }, + { EAction.Dismount, "Dismount" }, }; } diff --git a/Questionable.Model/Questing/EAction.cs b/Questionable.Model/Questing/EAction.cs index bcc676e4..d331d80c 100644 --- a/Questionable.Model/Questing/EAction.cs +++ b/Questionable.Model/Questing/EAction.cs @@ -14,7 +14,7 @@ public enum EAction HeavyShot = 97, Cure = 120, Cure2 = 135, - Eukrasia = 24290, + Eukrasia = 24290, Diagnosis = 24284, EukrasianDiagnosis = 24291, Esuna = 7568, @@ -35,6 +35,7 @@ public enum EAction BlueGulal = 29384, ElectrixFlux = 29718, HopStep = 31116, + Dismount = 23, CollectMiner = 240, ScourMiner = 22182, @@ -70,6 +71,7 @@ public static class EActionExtensions or EAction.YellowGulal or EAction.BlueGulal or EAction.ElectrixFlux - or EAction.HopStep; + or EAction.HopStep + or EAction.Dismount; } }