From 8feadf953f3406c6e3a9ae84962161b3b1814518 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Wed, 24 Jul 2024 15:45:03 +0200 Subject: [PATCH] Draft of ARR SCH quests --- .../SCH/1098_The Last Remnants.json | 3 +- .../SCH/1099_The Consequences of Anger.json | 75 ++++++ .../1100_In the Image of the Ancients.json | 190 ++++++++++++++++ .../SCH/1101_For Your Fellow Man.json | 215 ++++++++++++++++++ .../SCH/1102_The Beast Within.json | 114 ++++++++++ QuestPaths/quest-v1.json | 1 + .../V1/Converter/ActionConverter.cs | 1 + Questionable.Model/V1/EAction.cs | 1 + .../Steps/Interactions/EquipItem.cs | 3 +- 9 files changed, 600 insertions(+), 3 deletions(-) create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1099_The Consequences of Anger.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1100_In the Image of the Ancients.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1101_For Your Fellow Man.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1102_The Beast Within.json diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1098_The Last Remnants.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1098_The Last Remnants.json index f0489f12..b40ce33d 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1098_The Last Remnants.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1098_The Last Remnants.json @@ -207,7 +207,8 @@ "AethernetShortcut": [ "[Limsa Lominsa] Aetheryte Plaza", "[Limsa Lominsa] Marauders' Guild" - ] + ], + "NextQuestId": 1099 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1099_The Consequences of Anger.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1099_The Consequences of Anger.json new file mode 100644 index 00000000..6e6cd787 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1099_The Consequences of Anger.json @@ -0,0 +1,75 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006757, + "Position": { + "X": -4.4709473, + "Y": 44.999886, + "Z": -250.56848 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1007837, + "Position": { + "X": 256.82446, + "Y": -3.0527449, + "Z": 60.9292 + }, + "TerritoryId": 139, + "InteractionType": "SinglePlayerDuty", + "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1007845, + "Position": { + "X": 256.33618, + "Y": -3.2069032, + "Z": 58.091064 + }, + "StopDistance": 5, + "TerritoryId": 139, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1006757, + "Position": { + "X": -4.4709473, + "Y": 44.999886, + "Z": -250.56848 + }, + "TerritoryId": 128, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ], + "NextQuestId": 1100 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1100_In the Image of the Ancients.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1100_In the Image of the Ancients.json new file mode 100644 index 00000000..0437e633 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1100_In the Image of the Ancients.json @@ -0,0 +1,190 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006757, + "Position": { + "X": -4.4709473, + "Y": 44.999886, + "Z": -250.56848 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -260.8949, + "Y": -17.148405, + "Z": -346.92633 + }, + "TerritoryId": 156, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Mor Dhona", + "Fly": true + }, + { + "DataId": 2002715, + "Position": { + "X": -259.02197, + "Y": -15.762573, + "Z": -344.71655 + }, + "StopDistance": 4.5, + "TerritoryId": 156, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 1949, + 2285 + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2002716, + "Position": { + "X": -259.02197, + "Y": -15.94574, + "Z": -344.71655 + }, + "StopDistance": 4.5, + "TerritoryId": 156, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1003818, + "Position": { + "X": 157.36621, + "Y": 7.7920074, + "Z": 98.924194 + }, + "TerritoryId": 131, + "InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Weavers' Guild" + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1004093, + "Position": { + "X": -25.162231, + "Y": 12.200003, + "Z": 110.795654 + }, + "TerritoryId": 131, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ul'dah] Weavers' Guild", + "[Ul'dah] Goldsmiths' Guild" + ] + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1000691, + "Position": { + "X": 71.97681, + "Y": 8, + "Z": -166.52173 + }, + "TerritoryId": 133, + "InteractionType": "Interact", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Leatherworkers' Guild & Shaded Bower" + ] + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1000357, + "Position": { + "X": 68.314575, + "Y": 8.199997, + "Z": -170.51965 + }, + "TerritoryId": 133, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1006757, + "Position": { + "X": -4.4709473, + "Y": 44.999886, + "Z": -250.56848 + }, + "TerritoryId": 128, + "InteractionType": "EquipItem", + "ItemId": 2905, + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ] + }, + { + "TerritoryId": 128, + "InteractionType": "EquipItem", + "ItemId": 3689 + }, + { + "TerritoryId": 128, + "InteractionType": "EquipItem", + "ItemId": 3466 + }, + { + "TerritoryId": 128, + "InteractionType": "EquipItem", + "ItemId": 3897 + }, + { + "DataId": 1006757, + "Position": { + "X": -4.4709473, + "Y": 44.999886, + "Z": -250.56848 + }, + "TerritoryId": 128, + "InteractionType": "CompleteQuest", + "NextQuestId": 1101 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1101_For Your Fellow Man.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1101_For Your Fellow Man.json new file mode 100644 index 00000000..f01129b7 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1101_For Your Fellow Man.json @@ -0,0 +1,215 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006757, + "Position": { + "X": -4.4709473, + "Y": 44.999886, + "Z": -250.56848 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1006332, + "Position": { + "X": 426.96265, + "Y": 8.373348, + "Z": 20.004517 + }, + "TerritoryId": 139, + "InteractionType": "Interact", + "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1007843, + "Position": { + "X": 388.08264, + "Y": 7.8583374, + "Z": 40.512573 + }, + "TerritoryId": 139, + "InteractionType": "Action", + "Action": "Esuna", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "Position": { + "X": 423.76727, + "Y": 4.109605, + "Z": 74.008965 + }, + "TerritoryId": 139, + "InteractionType": "WalkTo", + "Mount": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -128 + ] + }, + { + "DataId": 1007844, + "Position": { + "X": 417.16638, + "Y": 3.6468506, + "Z": 59.64746 + }, + "TerritoryId": 139, + "InteractionType": "Action", + "Action": "Esuna", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1007840, + "Position": { + "X": 427.2068, + "Y": 7.6130996, + "Z": 141.34424 + }, + "TerritoryId": 139, + "InteractionType": "Action", + "Action": "Esuna", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] + }, + { + "Position": { + "X": 477.80576, + "Y": 10.397504, + "Z": 104.84231 + }, + "TerritoryId": 139, + "InteractionType": "WalkTo", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -32 + ], + "SkipIf": [ + "FlyingUnlocked" + ] + }, + { + "DataId": 1007842, + "Position": { + "X": 477.25635, + "Y": 8.499207, + "Z": 108.07959 + }, + "StopDistance": 0.5, + "TerritoryId": 139, + "InteractionType": "Action", + "Action": "Esuna", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 1007841, + "Position": { + "X": 503.04407, + "Y": 16.468494, + "Z": 72.46509 + }, + "TerritoryId": 139, + "InteractionType": "Action", + "Action": "Esuna", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1006332, + "Position": { + "X": 426.96265, + "Y": 8.373348, + "Z": 20.004517 + }, + "TerritoryId": 139, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1006757, + "Position": { + "X": -4.4709473, + "Y": 44.999886, + "Z": -250.56848 + }, + "TerritoryId": 128, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ], + "NextQuestId": 1102 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1102_The Beast Within.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1102_The Beast Within.json new file mode 100644 index 00000000..741e020a --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1102_The Beast Within.json @@ -0,0 +1,114 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006757, + "Position": { + "X": -4.4709473, + "Y": 44.999886, + "Z": -250.56848 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1007838, + "Position": { + "X": 256.36682, + "Y": -3.2069032, + "Z": 58.091064 + }, + "TerritoryId": 139, + "InteractionType": "SinglePlayerDuty", + "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1007838, + "Position": { + "X": 256.36682, + "Y": -3.2069032, + "Z": 58.091064 + }, + "StopDistance": 5, + "TerritoryId": 139, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1007846, + "Position": { + "X": 262.80603, + "Y": -2.852741, + "Z": 63.1875 + }, + "StopDistance": 5, + "TerritoryId": 139, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1007847, + "Position": { + "X": 257.98413, + "Y": -3.4, + "Z": 49.05774 + }, + "TerritoryId": 139, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1007849, + "Position": { + "X": 231.79968, + "Y": 5.18473, + "Z": 61.142822 + }, + "TerritoryId": 139, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 331848f0..ba7841d0 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -630,6 +630,7 @@ "description": "The action to use", "enum": [ "Esuna", + "Physick", "Siphon Snout", "Red Gulal", "Yellow Gulal", diff --git a/Questionable.Model/V1/Converter/ActionConverter.cs b/Questionable.Model/V1/Converter/ActionConverter.cs index 216a2551..23711dae 100644 --- a/Questionable.Model/V1/Converter/ActionConverter.cs +++ b/Questionable.Model/V1/Converter/ActionConverter.cs @@ -7,6 +7,7 @@ public sealed class ActionConverter() : EnumConverter(Values) private static readonly Dictionary Values = new() { { EAction.Esuna, "Esuna" }, + { EAction.Physick, "Physick" }, { EAction.SiphonSnout, "Siphon Snout" }, { EAction.RedGulal, "Red Gulal" }, { EAction.YellowGulal, "Yellow Gulal" }, diff --git a/Questionable.Model/V1/EAction.cs b/Questionable.Model/V1/EAction.cs index 9b266f07..4464fc54 100644 --- a/Questionable.Model/V1/EAction.cs +++ b/Questionable.Model/V1/EAction.cs @@ -7,6 +7,7 @@ namespace Questionable.Model.V1; public enum EAction { Esuna = 7568, + Physick = 190, SiphonSnout = 18187, RedGulal = 29382, YellowGulal = 29383, diff --git a/Questionable/Controller/Steps/Interactions/EquipItem.cs b/Questionable/Controller/Steps/Interactions/EquipItem.cs index d48c7083..9322563d 100644 --- a/Questionable/Controller/Steps/Interactions/EquipItem.cs +++ b/Questionable/Controller/Steps/Interactions/EquipItem.cs @@ -6,7 +6,6 @@ using FFXIVClientStructs.FFXIV.Client.Game; using Lumina.Excel.GeneratedSheets; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Questionable.Controller.Steps.Common; using Questionable.Model.V1; using Quest = Questionable.Model.Quest; @@ -55,7 +54,7 @@ internal static class EquipItem private uint _itemId; private Item _item = null!; private List _targetSlots = []; - private int _attempts = 0; + private int _attempts; private DateTime _continueAt = DateTime.MaxValue;