From ed109a0fcad3cd43321889f964c7e3e8d0d42442 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 26 May 2024 15:43:33 +0200 Subject: [PATCH] Model updates --- Questionable/Controller/MovementController.cs | 3 +- Questionable/Controller/QuestController.cs | 13 +- Questionable/Model/Quest.cs | 2 + Questionable/Model/V1/AethernetShortcut.cs | 7 + .../Converter/AethernetShortcutConverter.cs | 134 +++++++++++ .../V1/Converter/InteractionTypeConverter.cs | 44 ++++ Questionable/Model/V1/EAetheryteLocation.cs | 95 ++++++++ Questionable/Model/V1/EInteractionType.cs | 14 ++ Questionable/Model/V1/QuestData.cs | 8 +- Questionable/Model/V1/QuestSequence.cs | 3 +- Questionable/Model/V1/QuestStep.cs | 13 +- .../4357_The Next Ship to Sail.json | 41 ++++ .../4358_Old Sharlayan New to You.json | 220 ++++++++++++++++++ .../4359_Hitting the Books.json | 161 +++++++++++++ .../4360_A Seat at the Last Stand.json | 164 +++++++++++++ .../4361_A Labyrinthine Descent.json | 121 ++++++++++ .../4362_Glorified Ratcatcher.json | 158 +++++++++++++ .../4363_Deeper into the Maze.json | 132 +++++++++++ .../4364_The Medial Circuit.json | 172 ++++++++++++++ .../4365_The Full Reports Warts and All.json | 80 +++++++ .../4366_A Guide of Sorts.json | 96 ++++++++ .../4367_Estate Visitor.json | 110 +++++++++ .../4368_For Thavnair Bound.json | 137 +++++++++++ .../4369_On Low Tide.json | 133 +++++++++++ .../4370_A Fishermans Friend.json | 133 +++++++++++ .../4371_House of Divinities.json | 149 ++++++++++++ .../4372_The Great Work.json | 134 +++++++++++ .../4373_Shadowed Footsteps.json | 114 +++++++++ .../4374_A Boys Errand.json | 145 ++++++++++++ .../4375_Tipping the Scale.json | 101 ++++++++ .../4376_The Satrap of Radz at Han.json | 90 +++++++ .../4377_In the Dark of the Tower.json | 82 +++++++ .../4378_The Jewel of Thavnair.json | 156 +++++++++++++ .../4379_The Color of Joy.json | 121 ++++++++++ .../4384_Tracks in the Snow.json | 2 +- .../4385_How the Mighty Are Fallen.json | 4 +- .../4388_The Last Bastion.json | 2 +- .../4390_His Park Materials.json | 2 +- .../4393_Strange Bedfellows.json | 4 +- .../4395_Gateway of the Gods.json | 4 +- .../4401_A Harey Situation.json | 2 +- .../4402_A Taste of the Moon.json | 2 +- .../4404_Alls Vale That Endsvale.json | 2 +- .../4405_Back to Old Tricks.json | 22 +- .../4406_Settiing Things Straight.json | 2 +- .../4413_That We Might Live.json | 4 +- .../4414_When All Hope Seems Lost.json | 2 +- .../4415_Warm Hearts, Rekindled Hopes.json | 2 +- .../4425_Their Greatest Contribution.json | 4 +- .../4426_Aether to Aether.json | 4 +- .../4427_A Sentimental Gift.json | 2 +- .../4431_Witness to the Spectacle.json | 2 +- .../4432_Worthy of His Back.json | 2 +- .../4433_A Flower upon Your Return.json | 6 +- .../4442_No Job Too Small.json | 2 +- .../4445_Sage Council.json | 158 +++++++------ .../4446_Hither and Yarns.json | 4 +- .../4447_Once Forged.json | 2 +- .../4456_.Roads Paved of Sacrifice.json | 4 +- .../4459_Victory x Lost.json | 6 +- .../Endwalker-G-UltimaThule/4460_x.json | 8 +- .../Endwalker-L-6.5/4750_Growing Light.json | 147 +++++++----- Questionable/QuestSchema/schema_v1.json | 57 ++++- Questionable/Questionable.cs | 6 +- Questionable/Questionable.csproj | 2 + Questionable/Windows/DebugWindow.cs | 12 +- 66 files changed, 3569 insertions(+), 201 deletions(-) create mode 100644 Questionable/Model/V1/AethernetShortcut.cs create mode 100644 Questionable/Model/V1/Converter/AethernetShortcutConverter.cs create mode 100644 Questionable/Model/V1/Converter/InteractionTypeConverter.cs create mode 100644 Questionable/Model/V1/EAetheryteLocation.cs create mode 100644 Questionable/Model/V1/EInteractionType.cs create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4357_The Next Ship to Sail.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4358_Old Sharlayan New to You.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4359_Hitting the Books.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4360_A Seat at the Last Stand.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4361_A Labyrinthine Descent.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4362_Glorified Ratcatcher.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4363_Deeper into the Maze.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4364_The Medial Circuit.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4365_The Full Reports Warts and All.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4366_A Guide of Sorts.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4367_Estate Visitor.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4368_For Thavnair Bound.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4369_On Low Tide.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4370_A Fishermans Friend.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4371_House of Divinities.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4372_The Great Work.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4373_Shadowed Footsteps.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4374_A Boys Errand.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4375_Tipping the Scale.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4376_The Satrap of Radz at Han.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4377_In the Dark of the Tower.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4378_The Jewel of Thavnair.json create mode 100644 Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4379_The Color of Joy.json diff --git a/Questionable/Controller/MovementController.cs b/Questionable/Controller/MovementController.cs index 52686420..c8183dc6 100644 --- a/Questionable/Controller/MovementController.cs +++ b/Questionable/Controller/MovementController.cs @@ -18,7 +18,8 @@ internal sealed class MovementController : IDisposable private CancellationTokenSource? _cancellationTokenSource; private Task>? _pathfindTask; - public MovementController(NavmeshIpc navmeshIpc, IClientState clientState, GameFunctions gameFunctions, IPluginLog pluginLog) + public MovementController(NavmeshIpc navmeshIpc, IClientState clientState, GameFunctions gameFunctions, + IPluginLog pluginLog) { _navmeshIpc = navmeshIpc; _clientState = clientState; diff --git a/Questionable/Controller/QuestController.cs b/Questionable/Controller/QuestController.cs index f2fe0a6c..095163a4 100644 --- a/Questionable/Controller/QuestController.cs +++ b/Questionable/Controller/QuestController.cs @@ -12,10 +12,14 @@ internal sealed class QuestController public QuestController(DalamudPluginInterface pluginInterface) { +#if false LoadFromEmbeddedResources(); - LoadFromDalamudConfigDirecory(pluginInterface.ConfigDirectory); +#endif + LoadFromDirectory(new DirectoryInfo(@"E:\ffxiv\Questionable\Questionable\QuestPaths")); + LoadFromDirectory(pluginInterface.ConfigDirectory); } +#if false private void LoadFromEmbeddedResources() { foreach (string resourceName in typeof(Questionable).Assembly.GetManifestResourceNames()) @@ -34,8 +38,9 @@ internal sealed class QuestController } } } +#endif - private void LoadFromDalamudConfigDirecory(DirectoryInfo configDirectory) + private void LoadFromDirectory(DirectoryInfo configDirectory) { foreach (FileInfo fileInfo in configDirectory.GetFiles("*.json")) { @@ -43,12 +48,16 @@ internal sealed class QuestController var (questId, name) = ExtractQuestDataFromName(fileInfo.Name); Quest quest = new Quest { + FilePath = fileInfo.FullName, QuestId = questId, Name = name, Data = JsonSerializer.Deserialize(stream)!, }; _quests[questId] = quest; } + + foreach (DirectoryInfo childDirectory in configDirectory.GetDirectories()) + LoadFromDirectory(childDirectory); } private static (ushort QuestId, string Name) ExtractQuestDataFromName(string resourceName) diff --git a/Questionable/Model/Quest.cs b/Questionable/Model/Quest.cs index b933181b..015ddda4 100644 --- a/Questionable/Model/Quest.cs +++ b/Questionable/Model/Quest.cs @@ -4,6 +4,8 @@ namespace Questionable; internal sealed class Quest { + public required string FilePath { get; init; } + public required ushort QuestId { get; init; } public required string Name { get; init; } public required QuestData Data { get; init; } diff --git a/Questionable/Model/V1/AethernetShortcut.cs b/Questionable/Model/V1/AethernetShortcut.cs new file mode 100644 index 00000000..f605809e --- /dev/null +++ b/Questionable/Model/V1/AethernetShortcut.cs @@ -0,0 +1,7 @@ +namespace Questionable.Model.V1; + +public class AethernetShortcut +{ + public EAetheryteLocation From { get; set; } + public EAetheryteLocation To { get; set; } +} diff --git a/Questionable/Model/V1/Converter/AethernetShortcutConverter.cs b/Questionable/Model/V1/Converter/AethernetShortcutConverter.cs new file mode 100644 index 00000000..73d77b60 --- /dev/null +++ b/Questionable/Model/V1/Converter/AethernetShortcutConverter.cs @@ -0,0 +1,134 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Questionable.Model.V1.Converter; + +public sealed class AethernetShortcutConverter : JsonConverter +{ + private static readonly Dictionary EnumToString = new() + { + { EAetheryteLocation.Limsa, "[Limsa Lominsa] Aetheryte Plaza" }, + { EAetheryteLocation.LimsaArcanist, "[Limsa Lominsa] Arcanist's Guild" }, + { EAetheryteLocation.LimsaFisher, "[Limsa Lominsa] Fishermen's Guild" }, + { EAetheryteLocation.LimsaHawkersAlley, "[Limsa Lominsa] Hawker's Alley" }, + { EAetheryteLocation.LimsaAftcastle, "[Limsa Lominsa] The Aftcastle" }, + { EAetheryteLocation.LimsaCulinarian, "[Limsa Lominsa] Culinarian's Guild" }, + { EAetheryteLocation.LimsaMarauder, "[Limsa Lominsa] Marauder's Guild" }, + { EAetheryteLocation.LimsaAirship, "[Limsa Lominsa] Airship Landing" }, + { EAetheryteLocation.Gridania, "[Gridania] Aetheryte Plaza" }, + { EAetheryteLocation.GridaniaArcher, "[Gridania] Archer's Guild" }, + { EAetheryteLocation.GridaniaLeatherworker, "[Gridania] Leatherworker's Guld & Shaded Bower" }, + { EAetheryteLocation.GridaniaLancer, "[Gridania] Lancer's Guild" }, + { EAetheryteLocation.GridaniaConjurer, "[Gridania] Conjurer's Guild" }, + { EAetheryteLocation.GridaniaBotanist, "[Gridania] Botanist's Guild" }, + { EAetheryteLocation.GridaniaAmphitheatre, "[Gridania] Mih Khetto's Amphitheatre" }, + { EAetheryteLocation.GridaniaAirship, "[Gridania] Airship Landing" }, + { EAetheryteLocation.Uldah, "[Ul'dah] Aetheryte Plaza" }, + { EAetheryteLocation.UldahAdventurers, "[Ul'dah] Adventurer's Guild" }, + { EAetheryteLocation.UldahThaumaturge, "[Ul'dah] Thaumaturge's Guild" }, + { EAetheryteLocation.UldahGladiator, "[Ul'dah] Gladiator's Guild" }, + { EAetheryteLocation.UldahMiner, "[Ul'dah] Miner's Guild" }, + { EAetheryteLocation.UldahWeaver, "[Ul'dah] Weavers' Guild" }, + { EAetheryteLocation.UldahGoldsmith, "[Ul'dah] Goldsmiths' Guild" }, + { EAetheryteLocation.UldahSapphireAvenue, "[Ul'dah] Sapphire Avenue Exchange" }, + { EAetheryteLocation.UldahAlchemist, "[Ul'dah] Alchemists' Guild" }, + { EAetheryteLocation.UldahChamberOfRule, "[Ul'dah] The Chamber of Rule" }, + { EAetheryteLocation.UldahAirship, "[Ul'dah] Airship Landing" }, + { EAetheryteLocation.Ishgard, "[Ishgard] Aetheryte Plaza" }, + { EAetheryteLocation.IshgardForgottenKnight, "[Ishgard] The Forgotten Knight" }, + { EAetheryteLocation.IshgardSkysteelManufactory, "[Ishgard] Skysteel Manufactory" }, + { EAetheryteLocation.IshgardBrume, "[Ishgard] The Brume" }, + { EAetheryteLocation.IshgardAthenaeumAstrologicum, "[Ishgard] Athenaeum Astrologicum" }, + { EAetheryteLocation.IshgardJeweledCrozier, "[Ishgard] The Jeweled Crozier" }, + { EAetheryteLocation.IshgardSaintReymanaudsCathedral, "[Ishgard] Saint Reymanaud's Cathedral" }, + { EAetheryteLocation.IshgardTribunal, "[Ishgard] The Tribunal" }, + { EAetheryteLocation.IshgardLastVigil, "[Ishgard] The Last Vigil" }, + { EAetheryteLocation.Idyllshire, "[Idyllshire] Aetheryte Plaza" }, + { EAetheryteLocation.IdyllshireWest, "[Idyllshire] West Idyllshire" }, + { EAetheryteLocation.RhalgrsReach, "[Rhalgr's Reach] Aetheryte Plaza" }, + { EAetheryteLocation.RhalgrsReachWest, "[Rhalgr's Reach] Western Rhalgr's Reach" }, + { EAetheryteLocation.RhalgrsReachNorthEast, "[Rhalgr's Reach] Northeastern Rhalgr's Reach" }, + { EAetheryteLocation.Kugane, "[Kugane] Aetheryte Plaza" }, + { EAetheryteLocation.KuganeShiokazeHostelry, "[Kugane] Shiokaze Hostelry" }, + { EAetheryteLocation.KuganePier1, "[Kugane] Pier #1" }, + { EAetheryteLocation.KuganeThavnairianConsulate, "[Kugane] Thavnairian Consulate" }, + { EAetheryteLocation.KuganeMarkets, "[Kugane] Kogane Dori Markets" }, + { EAetheryteLocation.KuganeBokairoInn, "[Kugane] Bokairo Inn" }, + { EAetheryteLocation.KuganeRubyBazaar, "[Kugane] The Ruby Bazaar" }, + { EAetheryteLocation.KuganeSekiseigumiBarracks, "[Kugane] Sekiseigumi Barracks" }, + { EAetheryteLocation.KuganeRakuzaDistrict, "[Kugane] Rakuza District" }, + { EAetheryteLocation.KuganeAirship, "[Kugane] Airship Landing" }, + { EAetheryteLocation.Crystarium, "[The Crystarium] Aetheryte Plaza" }, + { EAetheryteLocation.CrystariumMarkets, "[The Crystarium] Musica Universalis Markets" }, + { EAetheryteLocation.CrystariumThemenosRookery, "[The Crystarium] Themenos Rookery" }, + { EAetheryteLocation.CrystariumDossalGate, "[The Crystarium] The Dossal Gate" }, + { EAetheryteLocation.CrystariumPendants, "[The Crystarium] The Pendants" }, + { EAetheryteLocation.CrystariumAmaroLaunch, "[The Crystarium] The Amaro Launch" }, + { EAetheryteLocation.CrystariumCrystallineMean, "[The Crystarium] The Crystalline Mean" }, + { EAetheryteLocation.CrystariumCabinetOfCuriosity, "[The Crystarium] The Cabinet of Curiosity" }, + { EAetheryteLocation.Eulmore, "[Eulmore] Aetheryte Plaza" }, + { EAetheryteLocation.EulmoreSoutheastDerelict, "[Eulmore] Southeast Derelicts" }, + { EAetheryteLocation.EulmoreNightsoilPots, "[Eulmore] Nightsoil Pots" }, + { EAetheryteLocation.EulmoreGloryGate, "[Eulmore] The Glory Gate" }, + { EAetheryteLocation.EulmoreMainstay, "[Eulmore] The Mainstay" }, + { EAetheryteLocation.OldSharlayan, "[Old Sharlayan] Aetheryte Plaza" }, + { EAetheryteLocation.OldSharlayanStudium, "[Old Sharlayan] The Studium" }, + { EAetheryteLocation.OldSharlayanBaldesionAnnex, "[Old Sharlayan] The Baldesion Annex" }, + { EAetheryteLocation.OldSharlayanRostra, "[Old Sharlayan] The Rostra" }, + { EAetheryteLocation.OldSharlayanLeveilleurEstate, "[Old Sharlayan] The Leveilleur Estate" }, + { EAetheryteLocation.OldSharlayanJourneysEnd, "[Old Sharlayan] Journey's End" }, + { EAetheryteLocation.OldSharlayanScholarsHarbor, "[Old Sharlayan] Scholar's Harbor" }, + { EAetheryteLocation.RadzAtHan, "[Radz-at-Han] Aetheryte Plaza" }, + { EAetheryteLocation.RadzAtHanMeghaduta, "[Radz-at-Han] Meghaduta" }, + { EAetheryteLocation.RadzAtHanRuveydahFibers, "[Radz-at-Han] Ruveydah Fibers" }, + { EAetheryteLocation.RadzAtHanAirship, "[Radz-at-Han] Airship Landing" }, + { EAetheryteLocation.RadzAtHanAlzadaalsPeace, "[Radz-at-Han] Alzadaal's Peace" }, + { EAetheryteLocation.RadzAtHanHallOfTheRadiantHost, "[Radz-at-Han] Hall of the Radiant Host" }, + { EAetheryteLocation.RadzAtHanMehrydesMeyhane, "[Radz-at-Han] Mehryde's Meyhane" }, + { EAetheryteLocation.RadzAtHanKama, "[Radz-at-Han] Kama" }, + { EAetheryteLocation.RadzAtHanHighCrucible, "[Radz-at-Han] The High Crucible of Al-Kimiya" } + }; + + private static readonly Dictionary StringToEnum = + EnumToString.ToDictionary(x => x.Value, x => x.Key); + + public override AethernetShortcut? Read(ref Utf8JsonReader reader, Type typeToConvert, + JsonSerializerOptions options) + { + if (reader.TokenType != JsonTokenType.StartArray) + throw new JsonException(); + + if (!reader.Read() || reader.TokenType != JsonTokenType.String) + throw new JsonException(); + + string from = reader.GetString() ?? throw new JsonException(); + + if (!reader.Read() || reader.TokenType != JsonTokenType.String) + throw new JsonException(); + + string to = reader.GetString() ?? throw new JsonException(); + + if (!reader.Read() || reader.TokenType != JsonTokenType.EndArray) + throw new JsonException(); + + return new AethernetShortcut + { + From = StringToEnum.TryGetValue(from, out var fromEnum) ? fromEnum : throw new JsonException(), + To = StringToEnum.TryGetValue(to, out var toEnum) ? toEnum : throw new JsonException() + }; + } + + public override void Write(Utf8JsonWriter writer, AethernetShortcut value, JsonSerializerOptions options) + { + ArgumentNullException.ThrowIfNull(writer); + ArgumentNullException.ThrowIfNull(value); + + writer.WriteStartArray(); + writer.WriteStringValue(EnumToString[value.From]); + writer.WriteStringValue(EnumToString[value.To]); + writer.WriteEndArray(); + } +} diff --git a/Questionable/Model/V1/Converter/InteractionTypeConverter.cs b/Questionable/Model/V1/Converter/InteractionTypeConverter.cs new file mode 100644 index 00000000..b85313b5 --- /dev/null +++ b/Questionable/Model/V1/Converter/InteractionTypeConverter.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Questionable.Model.V1.Converter; + +public sealed class InteractionTypeConverter : JsonConverter +{ + private static readonly Dictionary EnumToString = new() + { + { EInteractionType.Interact, "Interact" }, + { EInteractionType.WalkTo, "WalkTo" }, + { EInteractionType.AttuneAethenetShard, "AttuneAethenetShard" }, + { EInteractionType.AttuneAetheryte, "AttuneAetheryte" }, + { EInteractionType.AttuneAetherCurrent, "AttuneAetherCurrent" }, + { EInteractionType.Combat, "Combat" }, + { EInteractionType.UseItem, "UseItem" }, + { EInteractionType.Emote, "Emote" }, + { EInteractionType.ManualAction, "ManualAction" } + }; + + private static readonly Dictionary StringToEnum = + EnumToString.ToDictionary(x => x.Value, x => x.Key); + + public override EInteractionType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + if (reader.TokenType != JsonTokenType.String) + throw new JsonException(); + + string? str = reader.GetString(); + if (str == null) + throw new JsonException(); + + return StringToEnum.TryGetValue(str, out EInteractionType value) ? value : throw new JsonException(); + } + + public override void Write(Utf8JsonWriter writer, EInteractionType value, JsonSerializerOptions options) + { + ArgumentNullException.ThrowIfNull(writer); + writer.WriteStringValue(EnumToString[value]); + } +} diff --git a/Questionable/Model/V1/EAetheryteLocation.cs b/Questionable/Model/V1/EAetheryteLocation.cs new file mode 100644 index 00000000..514c52ea --- /dev/null +++ b/Questionable/Model/V1/EAetheryteLocation.cs @@ -0,0 +1,95 @@ +namespace Questionable.Model.V1; + +public enum EAetheryteLocation +{ + Gridania = 2, + GridaniaArcher = 25, + GridaniaLeatherworker = 26, + GridaniaLancer = 27, + GridaniaConjurer = 28, + GridaniaBotanist = 29, + GridaniaAmphitheatre = 30, + GridaniaAirship = 94, + + Uldah = 9, + UldahAdventurers = 33, + UldahThaumaturge = 34, + UldahGladiator = 35, + UldahMiner = 36, + UldahAlchemist = 37, + UldahWeaver = 47, + UldahGoldsmith = 50, + UldahChamberOfRule = 51, + UldahAirship = 95, + UldahSapphireAvenue = 125, + + Limsa = 8, + LimsaAftcastle = 41, + LimsaCulinarian = 42, + LimsaArcanist = 43, + LimsaFisher = 44, + LimsaMarauder = 48, + LimsaHawkersAlley = 49, + LimsaAirship = 93, + + Ishgard = 70, + IshgardForgottenKnight = 80, + IshgardSkysteelManufactory = 81, + IshgardBrume = 82, + IshgardAthenaeumAstrologicum = 83, + IshgardJeweledCrozier = 84, + IshgardSaintReymanaudsCathedral = 85, + IshgardTribunal = 86, + IshgardLastVigil = 87, + + Idyllshire = 75, + IdyllshireWest = 76, + + RhalgrsReach = 104, + RhalgrsReachWest = 121, + RhalgrsReachNorthEast = 122, + + Kugane = 111, + KuganeShiokazeHostelry = 112, + KuganePier1 = 113, + KuganeThavnairianConsulate = 114, + KuganeMarkets = 115, + KuganeBokairoInn = 116, + KuganeRubyBazaar = 117, + KuganeSekiseigumiBarracks = 118, + KuganeRakuzaDistrict = 119, + KuganeAirship = 120, + + Crystarium = 133, + CrystariumMarkets = 149, + CrystariumThemenosRookery = 150, + CrystariumDossalGate = 151, + CrystariumPendants = 152, + CrystariumAmaroLaunch = 153, + CrystariumCrystallineMean = 154, + CrystariumCabinetOfCuriosity = 155, + + Eulmore = 134, + EulmoreMainstay = 157, + EulmoreNightsoilPots = 158, + EulmoreGloryGate = 159, + EulmoreSoutheastDerelict = 135, + + OldSharlayan = 182, + OldSharlayanStudium = 184, + OldSharlayanBaldesionAnnex = 185, + OldSharlayanRostra = 186, + OldSharlayanLeveilleurEstate = 187, + OldSharlayanJourneysEnd = 188, + OldSharlayanScholarsHarbor = 189, + + RadzAtHan = 183, + RadzAtHanMeghaduta = 191, + RadzAtHanRuveydahFibers = 192, + RadzAtHanAirship = 193, + RadzAtHanAlzadaalsPeace = 194, + RadzAtHanHallOfTheRadiantHost = 195, + RadzAtHanMehrydesMeyhane = 196, + RadzAtHanKama = 198, + RadzAtHanHighCrucible = 199, +} diff --git a/Questionable/Model/V1/EInteractionType.cs b/Questionable/Model/V1/EInteractionType.cs new file mode 100644 index 00000000..bf29d34f --- /dev/null +++ b/Questionable/Model/V1/EInteractionType.cs @@ -0,0 +1,14 @@ +namespace Questionable.Model.V1; + +public enum EInteractionType +{ + Interact, + WalkTo, + AttuneAethenetShard, + AttuneAetheryte, + AttuneAetherCurrent, + Combat, + UseItem, + Emote, + ManualAction +} diff --git a/Questionable/Model/V1/QuestData.cs b/Questionable/Model/V1/QuestData.cs index ef78734d..79bfa152 100644 --- a/Questionable/Model/V1/QuestData.cs +++ b/Questionable/Model/V1/QuestData.cs @@ -4,6 +4,10 @@ namespace Questionable.Model.V1; public class QuestData { - public required int Version { get; init; } - public required List QuestSequence { get; set; } + public required int Version { get; set; } + public required string Author { get; set; } + public List Contributors { get; set; } = new(); + public string Comment { get; set; } + public List TerritoryBlacklist { get; set; } = new(); + public required List QuestSequence { get; set; } = new(); } diff --git a/Questionable/Model/V1/QuestSequence.cs b/Questionable/Model/V1/QuestSequence.cs index 113ae7b7..f39d0e9a 100644 --- a/Questionable/Model/V1/QuestSequence.cs +++ b/Questionable/Model/V1/QuestSequence.cs @@ -4,6 +4,7 @@ namespace Questionable.Model.V1; public class QuestSequence { - public int Sequence { get; set; } + public required int Sequence { get; set; } + public string Comment { get; set; } public List Steps { get; set; } = new(); } diff --git a/Questionable/Model/V1/QuestStep.cs b/Questionable/Model/V1/QuestStep.cs index 0ec61ce9..3c533322 100644 --- a/Questionable/Model/V1/QuestStep.cs +++ b/Questionable/Model/V1/QuestStep.cs @@ -1,11 +1,20 @@ -using System.Numerics; +using System.Collections.Generic; +using System.Numerics; +using System.Text.Json.Serialization; +using Questionable.Model.V1.Converter; namespace Questionable.Model.V1; public class QuestStep { - public required string InteractionType { get; set; } + [JsonConverter(typeof(InteractionTypeConverter))] + public EInteractionType InteractionType { get; set; } + public ulong? DataId { get; set; } public Vector3 Position { get; set; } public ushort TerritoryId { get; set; } + public bool Disabled { get; set; } + + [JsonConverter(typeof(AethernetShortcutConverter))] + public AethernetShortcut AethernetShortcut { get; set; } } diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4357_The Next Ship to Sail.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4357_The Next Ship to Sail.json new file mode 100644 index 00000000..7083ecec --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4357_The Next Ship to Sail.json @@ -0,0 +1,41 @@ +{ + "Version": 1, + "Author": "liza", + "Comment": "TODO Missing Quest Start", + "QuestSequence": [ + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1038570, + "Position": { + "X": -374.6853, + "Y": 7.999938, + "Z": 45.822754 + }, + "TerritoryId": 129, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Arcanist's Guild" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038578, + "Position": { + "X": 49.69861, + "Y": -16.246998, + "Z": 145.2201 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4358_Old Sharlayan New to You.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4358_Old Sharlayan New to You.json new file mode 100644 index 00000000..e3fd4aa0 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4358_Old Sharlayan New to You.json @@ -0,0 +1,220 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038578, + "Position": { + "X": 49.69861, + "Y": -16.246998, + "Z": 145.2201 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1038584, + "Position": { + "X": 47.68445, + "Y": -16.246998, + "Z": 147.02063 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1038578, + "Position": { + "X": 49.69861, + "Y": -16.246998, + "Z": 145.2201 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 189, + "Position": { + "X": 16.49812, + "Y": -16.247, + "Z": 127.753 + }, + "TerritoryId": 962, + "InteractionType": "AttuneAethenetShard" + }, + { + "DataId": 1038578, + "Position": { + "X": -53.576973, + "Y": -15.127001, + "Z": 131.09679 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1038578, + "Position": { + "X": 0.86839586, + "Y": 3.2250001, + "Z": 9.54673 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 182, + "Position": { + "X": 0.08138847, + "Y": 4.818894, + "Z": -0.1004486 + }, + "TerritoryId": 962, + "InteractionType": "AttuneAetheryte" + }, + { + "DataId": 1038578, + "Position": { + "X": 65.84385, + "Y": 5.0999994, + "Z": -63.417946 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1038578, + "Position": { + "X": -0.4629783, + "Y": 41.37599, + "Z": -142.5033 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 186, + "Position": { + "X": -36.94214, + "Y": 41.367188, + "Z": -156.6034 + }, + "TerritoryId": 962, + "InteractionType": "AttuneAethenetShard" + }, + { + "DataId": 1038578, + "Position": { + "X": 149.26689, + "Y": 18.800978, + "Z": -142.65858 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 8, + "Steps": [ + { + "DataId": 187, + "Position": { + "X": 204.79126, + "Y": 21.774597, + "Z": -118.73047 + }, + "TerritoryId": 962, + "InteractionType": "AttuneAethenetShard" + }, + { + "DataId": 188, + "Position": { + "X": 206.22559, + "Y": 1.8463135, + "Z": 13.77887 + }, + "TerritoryId": 962, + "InteractionType": "AttuneAethenetShard" + }, + { + "DataId": 1038578, + "Position": { + "X": -82.642426, + "Y": 1.0594833, + "Z": 30.052902 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] Journey's End", + "[Old Sharlayan] Aetheryte Plaza" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 2011936, + "Position": { + "X": -108.56799, + "Y": 5.0201416, + "Z": 4.5318604 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + }, + { + "DataId": 1038586, + "Position": { + "X": -0.015319824, + "Y": 1.9073486E-06, + "Z": -0.77819824 + }, + "TerritoryId": 987, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4359_Hitting the Books.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4359_Hitting the Books.json new file mode 100644 index 00000000..c4e31f40 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4359_Hitting the Books.json @@ -0,0 +1,161 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038670, + "Position": { + "X": -2.609314, + "Y": 1.9073486E-06, + "Z": 0.16778564 + }, + "TerritoryId": 987, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2011937, + "Position": { + "X": -0.009068698, + "Y": 1.151502, + "Z": 14.81335 + }, + "TerritoryId": 987, + "InteractionType": "Interact" + }, + { + "DataId": 185, + "Position": { + "X": -92.21033, + "Y": 2.304016, + "Z": 29.709229 + }, + "TerritoryId": 962, + "InteractionType": "AttuneAethenetShard" + }, + { + "DataId": 184, + "Position": { + "X": -291.1574, + "Y": 20.004517, + "Z": -74.143616 + }, + "TerritoryId": 962, + "InteractionType": "AttuneAethenetShard" + }, + { + "DataId": 1038675, + "Position": { + "X": -301.38098, + "Y": 18.47832, + "Z": 10.849121 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2011828, + "Position": { + "X": -320.72937, + "Y": 20.248657, + "Z": 57.99951 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + }, + { + "DataId": 2011825, + "Position": { + "X": -370.47382, + "Y": 20.248657, + "Z": 100.1449 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + }, + { + "DataId": 2011826, + "Position": { + "X": -385.36664, + "Y": 20.248657, + "Z": 43.289795 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2011830, + "Position": { + "X": -276.0205, + "Y": 18.997375, + "Z": 18.936401 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2011830, + "Position": { + "X": -276.0205, + "Y": 18.997375, + "Z": 18.936401 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2011830, + "Position": { + "X": -276.0205, + "Y": 18.997375, + "Z": 18.936401 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1038679, + "Position": { + "X": -275.5932, + "Y": 19.003881, + "Z": 13.321045 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4360_A Seat at the Last Stand.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4360_A Seat at the Last Stand.json new file mode 100644 index 00000000..784be244 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4360_A Seat at the Last Stand.json @@ -0,0 +1,164 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038681, + "Position": { + "X": -281.11694, + "Y": 19.003874, + "Z": 18.966919 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1038682, + "Position": { + "X": -69.13867, + "Y": -15.127, + "Z": 113.572876 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] The Studium", + "[Old Sharlayan] Scholar's Harbor" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1037079, + "Position": { + "X": -81.04071, + "Y": -13.777, + "Z": 117.32654 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + }, + { + "DataId": 1037078, + "Position": { + "X": -42.557434, + "Y": -14.1693125, + "Z": 111.49768 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1037077, + "Position": { + "X": -38.07129, + "Y": -14.169313, + "Z": 105.30249 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2011831, + "Position": { + "X": -86.90015, + "Y": -12.985474, + "Z": 130.47986 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2011832, + "Position": { + "X": -74.57086, + "Y": -12.985474, + "Z": 141.1001 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 2011833, + "Position": { + "X": -74.57086, + "Y": -12.985474, + "Z": 148.11926 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1038683, + "Position": { + "X": -36.697998, + "Y": -14.169313, + "Z": 114.76306 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 15.242085, + "Y": -16.247002, + "Z": 109.177666 + }, + "TerritoryId": 962, + "InteractionType": "WalkTo" + }, + { + "DataId": 1038684, + "Position": { + "X": 29.007324, + "Y": -14.446999, + "Z": 76.46289 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4361_A Labyrinthine Descent.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4361_A Labyrinthine Descent.json new file mode 100644 index 00000000..ac97e616 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4361_A Labyrinthine Descent.json @@ -0,0 +1,121 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038684, + "Position": { + "X": 29.007324, + "Y": -14.446999, + "Z": 76.46289 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1038679, + "Position": { + "X": -275.5932, + "Y": 19.003881, + "Z": 13.321045 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] Scholar's Harbor", + "[Old Sharlayan] The Studium" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1038753, + "Position": { + "X": -234.21082, + "Y": 12.969517, + "Z": -27.054321 + }, + "TerritoryId": 962, + "InteractionType": "ManualAction", + "Comment": "Follow Alisaie" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1038688, + "Position": { + "X": -69.5354, + "Y": 18.043928, + "Z": -321.40082 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1038692, + "Position": { + "X": -1.5411987, + "Y": 170.403, + "Z": -748.0125 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + }, + { + "DataId": 1037473, + "Position": { + "X": -27.17633, + "Y": 170.40298, + "Z": -722.46893 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + }, + { + "DataId": 1037472, + "Position": { + "X": -74.69299, + "Y": 170.403, + "Z": -755.67255 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038695, + "Position": { + "X": -52.384216, + "Y": 170.403, + "Z": -734.7677 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4362_Glorified Ratcatcher.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4362_Glorified Ratcatcher.json new file mode 100644 index 00000000..9571e693 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4362_Glorified Ratcatcher.json @@ -0,0 +1,158 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038695, + "Position": { + "X": -52.384216, + "Y": 170.403, + "Z": -734.7677 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1038692, + "Position": { + "X": -1.5411987, + "Y": 170.403, + "Z": -748.0125 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1038699, + "Position": { + "X": 128.00781, + "Y": 186.03699, + "Z": -740.9324 + }, + "TerritoryId": 956, + "InteractionType": "Combat", + "KillEnemyDataIds": [ + 14024 + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1038699, + "Position": { + "X": 128.00781, + "Y": 186.03699, + "Z": -740.9324 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1038700, + "Position": { + "X": 259.0829, + "Y": 166.40231, + "Z": -595.69696 + }, + "TerritoryId": 956, + "InteractionType": "Combat", + "KillEnemyDataIds": [ + 14023, + 14022 + ] + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1038700, + "Position": { + "X": 259.0829, + "Y": 166.40231, + "Z": -595.69696 + }, + "TerritoryId": 956, + "InteractionType": "UseItem" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 2011980, + "Position": { + "X": 346.51697, + "Y": 209.3385, + "Z": -767.7577 + }, + "TerritoryId": 956, + "InteractionType": "AttuneAetherCurrent" + }, + { + "DataId": 1038701, + "Position": { + "X": 280.38452, + "Y": 216.34708, + "Z": -823.3921 + }, + "TerritoryId": 956, + "InteractionType": "UseItem" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1038757, + "Position": { + "X": -1.9074707, + "Y": 170.403, + "Z": -751.5221 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038702, + "Position": { + "X": 394.27783, + "Y": 165.94997, + "Z": -521.294 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4363_Deeper into the Maze.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4363_Deeper into the Maze.json new file mode 100644 index 00000000..3b25f9c4 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4363_Deeper into the Maze.json @@ -0,0 +1,132 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038702, + "Position": { + "X": 394.27783, + "Y": 165.94997, + "Z": -521.294 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 166, + "Position": { + "X": 443.5338, + "Y": 170.6416, + "Z": -476.18835 + }, + "TerritoryId": 956, + "InteractionType": "AttuneAetheryte" + }, + { + "DataId": 1037475, + "Position": { + "X": 379.14087, + "Y": 170.1, + "Z": -410.97125 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1038712, + "Position": { + "X": 415.8236, + "Y": 166.41167, + "Z": -451.10248 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1038714, + "Position": { + "X": 383.01672, + "Y": 166.19273, + "Z": -464.7746 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + }, + { + "DataId": 1038716, + "Position": { + "X": 468.10095, + "Y": 166.2036, + "Z": -458.2132 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1038717, + "Position": { + "X": 579.91907, + "Y": 168.84044, + "Z": -517.3572 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2011839, + "Position": { + "X": 576.8367, + "Y": 168.99365, + "Z": -519.18823 + }, + "TerritoryId": 956, + "InteractionType": "ManualAction", + "Comment": "Duty - Shoot some bird" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038718, + "Position": { + "X": 644.9835, + "Y": 185.14716, + "Z": -130.23578 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4364_The Medial Circuit.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4364_The Medial Circuit.json new file mode 100644 index 00000000..6cc3d329 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4364_The Medial Circuit.json @@ -0,0 +1,172 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038719, + "Position": { + "X": 646.3264, + "Y": 185.07715, + "Z": -131.97534 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2011981, + "Position": { + "X": 748.53125, + "Y": 106.7063, + "Z": 66.75818 + }, + "TerritoryId": 956, + "InteractionType": "AttuneAetherCurrent" + }, + { + "DataId": 2011840, + "Position": { + "X": 828.33594, + "Y": 147.8446, + "Z": -72.22095 + }, + "TerritoryId": 956, + "InteractionType": "Combat", + "KillEnemyDataIds": [ + 14020 + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2011841, + "Position": { + "X": 813.6262, + "Y": 158.64807, + "Z": 126.57361 + }, + "TerritoryId": 956, + "InteractionType": "Combat", + "KillEnemyDataIds": [ + 14021 + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1038722, + "Position": { + "X": 621.3015, + "Y": 97.13325, + "Z": 182.17737 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2011842, + "Position": { + "X": 492.1797, + "Y": 64.86609, + "Z": -44.571655 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2011984, + "Position": { + "X": 497.09314, + "Y": 73.41101, + "Z": -267.23126 + }, + "TerritoryId": 956, + "InteractionType": "AttuneAetherCurrent" + }, + { + "DataId": 1038708, + "Position": { + "X": 408.31604, + "Y": 65.3329, + "Z": -130.11371 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + }, + { + "DataId": 1038707, + "Position": { + "X": 455.80212, + "Y": 65.16199, + "Z": -150.04199 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + }, + { + "DataId": 1037985, + "Position": { + "X": 481.8036, + "Y": 66.16195, + "Z": -108.537415 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 2011843, + "Position": { + "X": 312.64197, + "Y": 97.3678, + "Z": -257.34344 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038732, + "Position": { + "X": 321.43127, + "Y": 97.50893, + "Z": -279.92682 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4365_The Full Reports Warts and All.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4365_The Full Reports Warts and All.json new file mode 100644 index 00000000..c9cfce33 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4365_The Full Reports Warts and All.json @@ -0,0 +1,80 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038731, + "Position": { + "X": 324.84924, + "Y": 97.07327, + "Z": -282.21564 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1038736, + "Position": { + "X": 177.26404, + "Y": 56.63088, + "Z": -411.5511 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1038738, + "Position": { + "X": 177.05042, + "Y": 56.567654, + "Z": -409.41486 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "Position": { + "X": -156.15488, + "Y": 81.17488, + "Z": -534.99316 + }, + "TerritoryId": 956, + "InteractionType": "WalkTo" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038740, + "Position": { + "X": -256.27533, + "Y": 79.75535, + "Z": -502.12863 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4366_A Guide of Sorts.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4366_A Guide of Sorts.json new file mode 100644 index 00000000..9485fef4 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4366_A Guide of Sorts.json @@ -0,0 +1,96 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038741, + "Position": { + "X": -257.9538, + "Y": 79.7362, + "Z": -502.06763 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2011982, + "Position": { + "X": -316.30432, + "Y": 79.75891, + "Z": -395.31555 + }, + "TerritoryId": 956, + "InteractionType": "AttuneAetherCurrent" + }, + { + "DataId": 2011983, + "Position": { + "X": 32.303345, + "Y": 72.83118, + "Z": -286.27454 + }, + "TerritoryId": 956, + "InteractionType": "AttuneAetherCurrent" + }, + { + "DataId": 1038736, + "Position": { + "X": 177.26404, + "Y": 56.63088, + "Z": -411.5511 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 253.34096, + "Y": 71.49686, + "Z": -241.08495 + }, + "TerritoryId": 956, + "InteractionType": "WalkTo", + "Comment": "Needed for Navmesh" + }, + { + "DataId": 1038744, + "Position": { + "X": 315.4497, + "Y": 96.90322, + "Z": -259.23553 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038747, + "Position": { + "X": -1.6022339, + "Y": 41.37599, + "Z": -141.16125 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4367_Estate Visitor.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4367_Estate Visitor.json new file mode 100644 index 00000000..fa9a8b2f --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4367_Estate Visitor.json @@ -0,0 +1,110 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038746, + "Position": { + "X": 2.5481567, + "Y": 41.37599, + "Z": -142.1684 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1038745, + "Position": { + "X": 1.663208, + "Y": 41.37599, + "Z": -141.00867 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1038746, + "Position": { + "X": 2.5481567, + "Y": 41.37599, + "Z": -142.1684 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1040284, + "Position": { + "X": 219.22632, + "Y": 25.041138, + "Z": -160.60126 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] The Rostra", + "[Old Sharlayan] The Leveilleur Estate" + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1040285, + "Position": { + "X": 222.03394, + "Y": 21.878136, + "Z": -120.43945 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 2011936, + "Position": { + "X": -108.56799, + "Y": 5.0201416, + "Z": 4.5318604 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + }, + { + "DataId": 1040291, + "Position": { + "X": -1.9379272, + "Y": 1.9073486E-06, + "Z": 1.5715942 + }, + "TerritoryId": 987, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4368_For Thavnair Bound.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4368_For Thavnair Bound.json new file mode 100644 index 00000000..8c016440 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4368_For Thavnair Bound.json @@ -0,0 +1,137 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1041250, + "Position": { + "X": 4.0740967, + "Y": 1.9073486E-06, + "Z": 2.029419 + }, + "TerritoryId": 987, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2011937, + "Position": { + "X": -0.015319824, + "Y": 1.1443481, + "Z": 14.785889 + }, + "TerritoryId": 987, + "InteractionType": "Interact" + }, + { + "DataId": 1038592, + "Position": { + "X": -83.05487, + "Y": 6.6169996, + "Z": -39.383606 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2011947, + "Position": { + "X": -15.4574585, + "Y": 2.7922974, + "Z": -8.98761 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1038599, + "Position": { + "X": 168.87158, + "Y": 5.3451567, + "Z": 633.93604 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1038599, + "Position": { + "X": 168.87158, + "Y": 5.3451567, + "Z": 633.93604 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1038599, + "Position": { + "X": 168.87158, + "Y": 5.3451567, + "Z": 633.93604 + }, + "TerritoryId": 957, + "InteractionType": "Emote", + "Emote": "deny" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1038598, + "Position": { + "X": 187.42651, + "Y": 9.9744425, + "Z": 592.2178 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038597, + "Position": { + "X": 189.25769, + "Y": 9.9744425, + "Z": 590.0206 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4369_On Low Tide.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4369_On Low Tide.json new file mode 100644 index 00000000..5e68fd39 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4369_On Low Tide.json @@ -0,0 +1,133 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038600, + "Position": { + "X": 189.92896, + "Y": 9.9744425, + "Z": 589.89844 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 169, + "Position": { + "X": 193.529, + "Y": 6.991216, + "Z": 629.2394 + }, + "TerritoryId": 957, + "InteractionType": "AttuneAetheryte" + }, + { + "Position": { + "X": 190.45029, + "Y": 0.9965663, + "Z": 703.01746 + }, + "TerritoryId": 957, + "InteractionType": "WalkTo" + }, + { + "DataId": 1037622, + "Position": { + "X": 187.9148, + "Y": 0.26447815, + "Z": 700.12964 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + }, + { + "DataId": 2011948, + "Position": { + "X": 204.66919, + "Y": 2.243042, + "Z": 715.4192 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + }, + { + "DataId": 2011949, + "Position": { + "X": 200, + "Y": 1.7547607, + "Z": 768.9784 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + }, + { + "DataId": 1037623, + "Position": { + "X": 220.78271, + "Y": 1.8349868, + "Z": 759.4263 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 200.24112, + "Y": 1.7700036, + "Z": 712.99384 + }, + "TerritoryId": 957, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": 240.97523, + "Y": 0.8542664, + "Z": 712.4415 + }, + "TerritoryId": 957, + "InteractionType": "WalkTo" + }, + { + "DataId": 1038606, + "Position": { + "X": 277.72937, + "Y": 2.9636285, + "Z": 703.7003 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038608, + "Position": { + "X": 197.55847, + "Y": 1.769943, + "Z": 737.97205 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4370_A Fishermans Friend.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4370_A Fishermans Friend.json new file mode 100644 index 00000000..d9d40c26 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4370_A Fishermans Friend.json @@ -0,0 +1,133 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038608, + "Position": { + "X": 197.55847, + "Y": 1.769943, + "Z": 737.97205 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1038608, + "Position": { + "X": 197.55847, + "Y": 1.769943, + "Z": 737.97205 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1037625, + "Position": { + "X": 176.47058, + "Y": 1.8742183, + "Z": 799.2217 + }, + "TerritoryId": 957, + "InteractionType": "ManualAction", + "Comment": "Talk (2, 2, 1)" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1037626, + "Position": { + "X": 166.61316, + "Y": 4.763736, + "Z": 681.7273 + }, + "TerritoryId": 957, + "InteractionType": "ManualAction", + "Comment": "Talk (2, 1, 2)" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1037624, + "Position": { + "X": 213.91614, + "Y": 15.136713, + "Z": 517.72327 + }, + "TerritoryId": 957, + "InteractionType": "ManualAction", + "Comment": "Talk (2, 2, 2)" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2011992, + "Position": { + "X": 303.91382, + "Y": 0.25933838, + "Z": 473.65527 + }, + "TerritoryId": 957, + "InteractionType": "AttuneAetherCurrent" + }, + { + "Position": { + "X": 201.66586, + "Y": 1.7700036, + "Z": 712.9197 + }, + "TerritoryId": 957, + "InteractionType": "WalkTo" + }, + { + "DataId": 1038608, + "Position": { + "X": 199.48804, + "Y": 1.769943, + "Z": 738.9843 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038609, + "Position": { + "X": 199.35901, + "Y": 5.873753, + "Z": 612.787 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4371_House of Divinities.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4371_House of Divinities.json new file mode 100644 index 00000000..f7ffcbc2 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4371_House of Divinities.json @@ -0,0 +1,149 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038611, + "Position": { + "X": 201.86157, + "Y": 5.880045, + "Z": 612.02405 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2011951, + "Position": { + "X": 105.1499, + "Y": 7.7667847, + "Z": 581.5061 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2011952, + "Position": { + "X": -13.290649, + "Y": 32.333862, + "Z": 499.07666 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1038612, + "Position": { + "X": 31.937134, + "Y": 37.463673, + "Z": 379.5985 + }, + "TerritoryId": 957, + "InteractionType": "Combat", + "KillEnemyDataIds": [ + 14006 + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1038612, + "Position": { + "X": 31.937134, + "Y": 37.463673, + "Z": 379.5985 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2011990, + "Position": { + "X": -176.10437, + "Y": 21.530457, + "Z": 537.8346 + }, + "TerritoryId": 957, + "InteractionType": "AttuneAetherCurrent" + }, + { + "DataId": 1038616, + "Position": { + "X": -278.88916, + "Y": 2.740889, + "Z": 532.03625 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1037644, + "Position": { + "X": -293.72095, + "Y": 1.4600283, + "Z": 551.0491 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + }, + { + "DataId": 1037645, + "Position": { + "X": -271.0155, + "Y": 0.7022661, + "Z": 588.8303 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038616, + "Position": { + "X": -278.88916, + "Y": 2.740889, + "Z": 532.03625 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4372_The Great Work.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4372_The Great Work.json new file mode 100644 index 00000000..03cc5b2b --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4372_The Great Work.json @@ -0,0 +1,134 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038616, + "Position": { + "X": -278.88916, + "Y": 2.740889, + "Z": 532.03625 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1038620, + "Position": { + "X": -477.68372, + "Y": 5.0817194, + "Z": 19.21106 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 170, + "Position": { + "X": -527.4888, + "Y": 4.785123, + "Z": 36.76496 + }, + "TerritoryId": 957, + "InteractionType": "AttuneAetheryte" + }, + { + "DataId": 1038631, + "Position": { + "X": -510.7958, + "Y": 11.975282, + "Z": 117.69275 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1038635, + "Position": { + "X": -487.1443, + "Y": 49.161343, + "Z": 153.42944 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1038636, + "Position": { + "X": -485.70996, + "Y": 49.103825, + "Z": 152.91064 + }, + "TerritoryId": 957, + "InteractionType": "ManualAction", + "Comment": "Follow the Lantern" + } + ] + }, + { + "Sequence": 5, + "Comment": "Follow the Lantern" + }, + { + "Sequence": 6, + "Comment": "Follow the Lantern" + }, + { + "Sequence": 7, + "Comment": "Follow the Lantern" + }, + { + "Sequence": 8, + "Steps": [ + { + "DataId": 1038637, + "Position": { + "X": -484.61133, + "Y": 54.187614, + "Z": 128.34363 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038635, + "Position": { + "X": -487.1443, + "Y": 49.161343, + "Z": 153.42944 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4373_Shadowed Footsteps.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4373_Shadowed Footsteps.json new file mode 100644 index 00000000..e49a3073 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4373_Shadowed Footsteps.json @@ -0,0 +1,114 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038635, + "Position": { + "X": -487.1443, + "Y": 49.161343, + "Z": 153.42944 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1038638, + "Position": { + "X": -230.6402, + "Y": 27.619656, + "Z": 23.727722 + }, + "TerritoryId": 957, + "InteractionType": "Combat", + "KillEnemyDataIds": [ + 14004 + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1038638, + "Position": { + "X": -230.6402, + "Y": 27.619656, + "Z": 23.727722 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1038639, + "Position": { + "X": -15.030151, + "Y": 84.48873, + "Z": -71.000244 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2011954, + "Position": { + "X": 31.60144, + "Y": 90.22656, + "Z": -154.65027 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1038641, + "Position": { + "X": 34.62268, + "Y": 90.26942, + "Z": -159.80774 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038631, + "Position": { + "X": -510.7958, + "Y": 11.975282, + "Z": 117.69275 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4374_A Boys Errand.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4374_A Boys Errand.json new file mode 100644 index 00000000..6b6603cc --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4374_A Boys Errand.json @@ -0,0 +1,145 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038631, + "Position": { + "X": -510.7958, + "Y": 11.975282, + "Z": 117.69275 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1038642, + "Position": { + "X": -384.1764, + "Y": 12.2027235, + "Z": 28.244385 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1038642, + "Position": { + "X": -384.1764, + "Y": 12.2027235, + "Z": 28.244385 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1037646, + "Position": { + "X": -568.99365, + "Y": 9.817484, + "Z": -569.8787 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + }, + { + "DataId": 1037648, + "Position": { + "X": -562.005, + "Y": 9.817466, + "Z": -585.1987 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + }, + { + "DataId": 1037647, + "Position": { + "X": -588.83044, + "Y": 9.81748, + "Z": -590.08167 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1038645, + "Position": { + "X": -549.24854, + "Y": 9.817465, + "Z": -563.04266 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1038648, + "Position": { + "X": -557.641, + "Y": 9.672808, + "Z": -555.04694 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "Position": { + "X": -103.68971, + "Y": 88.84356, + "Z": -608.6588 + }, + "TerritoryId": 957, + "InteractionType": "WalkTo" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1037649, + "Position": { + "X": -92.97333, + "Y": 89.5583, + "Z": -642.3591 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4375_Tipping the Scale.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4375_Tipping the Scale.json new file mode 100644 index 00000000..1047bad7 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4375_Tipping the Scale.json @@ -0,0 +1,101 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1037649, + "Position": { + "X": -92.97333, + "Y": 89.5583, + "Z": -642.3591 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2011991, + "Position": { + "X": -49.271423, + "Y": 94.0719, + "Z": -710.7805 + }, + "TerritoryId": 957, + "InteractionType": "AttuneAetherCurrent" + }, + { + "DataId": 1038631, + "Position": { + "X": -510.7958, + "Y": 11.975282, + "Z": 117.69275 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2011993, + "Position": { + "X": -479.45374, + "Y": 72.892334, + "Z": -561.82196 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + }, + { + "DataId": 1038651, + "Position": { + "X": -699.67194, + "Y": -0.06901036, + "Z": -565.0569 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1038652, + "Position": { + "X": -704.09705, + "Y": -0.090369135, + "Z": -562.4323 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038653, + "Position": { + "X": -492.0577, + "Y": 4.5676737, + "Z": 17.532532 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4376_The Satrap of Radz at Han.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4376_The Satrap of Radz at Han.json new file mode 100644 index 00000000..ce1e3f9a --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4376_The Satrap of Radz at Han.json @@ -0,0 +1,90 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1038653, + "Position": { + "X": -492.0577, + "Y": 4.5676737, + "Z": 17.532532 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2011994, + "Position": { + "X": -114.488464, + "Y": 87.08313, + "Z": -288.3192 + }, + "TerritoryId": 957, + "InteractionType": "AttuneAetherCurrent" + }, + { + "DataId": 1038656, + "Position": { + "X": 203.96729, + "Y": 60.34319, + "Z": -595.8496 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1038657, + "Position": { + "X": 201.98364, + "Y": 60.34776, + "Z": -594.0185 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 2011936, + "Position": { + "X": -108.56799, + "Y": 5.0201416, + "Z": 4.5318604 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] Aetheryte Plaza", + "[Old Sharlayan] The Baldesion Annex" + ] + }, + { + "DataId": 1038589, + "Position": { + "X": 4.0740967, + "Y": 1.9073486E-06, + "Z": 2.029419 + }, + "TerritoryId": 987, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4377_In the Dark of the Tower.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4377_In the Dark of the Tower.json new file mode 100644 index 00000000..fe2f81f2 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4377_In the Dark of the Tower.json @@ -0,0 +1,82 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1040291, + "Position": { + "X": -1.9379272, + "Y": 1.9073486E-06, + "Z": 1.5715942 + }, + "TerritoryId": 987, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1037646, + "Position": { + "X": -568.99365, + "Y": 9.817484, + "Z": -569.8787 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2011956, + "Position": { + "X": -632.04395, + "Y": -0.015319824, + "Z": -659.6018 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2011959, + "Position": { + "X": -636.4081, + "Y": -0.015319824, + "Z": -663.81323 + }, + "TerritoryId": 957, + "InteractionType": "ManualAction", + "Comment": "Duty - The Tower of Zot" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1040252, + "Position": { + "X": -568.719, + "Y": 9.817484, + "Z": -581.323 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4378_The Jewel of Thavnair.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4378_The Jewel of Thavnair.json new file mode 100644 index 00000000..00ec3b59 --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4378_The Jewel of Thavnair.json @@ -0,0 +1,156 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1040252, + "Position": { + "X": -568.719, + "Y": 9.817484, + "Z": -581.323 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1040283, + "Position": { + "X": 210.31506, + "Y": 60.712387, + "Z": -600.76294 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1040255, + "Position": { + "X": 57.26709, + "Y": -27.000013, + "Z": 177.5387 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 194, + "Position": { + "X": 6.6071167, + "Y": -2.02948, + "Z": 110.55151 + }, + "TerritoryId": 963, + "InteractionType": "AttuneAethenetShard" + }, + { + "DataId": 1040256, + "Position": { + "X": -4.135254, + "Y": -1.9999973, + "Z": 85.40466 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1040257, + "Position": { + "X": -99.3515, + "Y": 20, + "Z": 110.52112 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1040258, + "Position": { + "X": -149.43164, + "Y": 27.999998, + "Z": 171.12988 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 193, + "Position": { + "X": -144.33508, + "Y": 27.969727, + "Z": 202.2583 + }, + "TerritoryId": 963, + "InteractionType": "AttuneAethenetShard" + }, + { + "DataId": 191, + "Position": { + "X": -365.95715, + "Y": 44.99878, + "Z": -31.815125 + }, + "TerritoryId": 963, + "InteractionType": "AttuneAethenetShard" + }, + { + "DataId": 1040259, + "Position": { + "X": -341.93945, + "Y": 55, + "Z": -70.603516 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1040260, + "Position": { + "X": -377.27936, + "Y": 45.00252, + "Z": -28.610718 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4379_The Color of Joy.json b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4379_The Color of Joy.json new file mode 100644 index 00000000..d07aa57b --- /dev/null +++ b/Questionable/QuestPaths/Endwalker-A-Thavnair1-Labyrinthos1/4379_The Color of Joy.json @@ -0,0 +1,121 @@ +{ + "Version": 1, + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1040261, + "Position": { + "X": -377.61505, + "Y": 45.002518, + "Z": -29.922974 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1040262, + "Position": { + "X": -237.01843, + "Y": 36, + "Z": 58.976074 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 192, + "Position": { + "X": -156.14563, + "Y": 35.99597, + "Z": 27.725586 + }, + "TerritoryId": 963, + "InteractionType": "AttuneAethenetShard" + }, + { + "DataId": 1040264, + "Position": { + "X": -106.49274, + "Y": 30.999998, + "Z": -14.54187 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1040266, + "Position": { + "X": 3.982544, + "Y": -2.9207662E-05, + "Z": 0.99176025 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1040268, + "Position": { + "X": 87.5105, + "Y": 1.8631812, + "Z": -121.41614 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1040276, + "Position": { + "X": -99.076904, + "Y": 3.9334679, + "Z": 1.3884888 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1038588, + "Position": { + "X": -101.76245, + "Y": 4.357494, + "Z": 0.7476196 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + } + ] +} diff --git a/Questionable/QuestPaths/Endwalker-B-Garlemald/4384_Tracks in the Snow.json b/Questionable/QuestPaths/Endwalker-B-Garlemald/4384_Tracks in the Snow.json index 72f745e1..bd5e330f 100644 --- a/Questionable/QuestPaths/Endwalker-B-Garlemald/4384_Tracks in the Snow.json +++ b/Questionable/QuestPaths/Endwalker-B-Garlemald/4384_Tracks in the Snow.json @@ -28,7 +28,7 @@ "Z": 423.6056 }, "TerritoryId": 958, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1038840, diff --git a/Questionable/QuestPaths/Endwalker-B-Garlemald/4385_How the Mighty Are Fallen.json b/Questionable/QuestPaths/Endwalker-B-Garlemald/4385_How the Mighty Are Fallen.json index 49d522de..ec8654bd 100644 --- a/Questionable/QuestPaths/Endwalker-B-Garlemald/4385_How the Mighty Are Fallen.json +++ b/Questionable/QuestPaths/Endwalker-B-Garlemald/4385_How the Mighty Are Fallen.json @@ -113,7 +113,7 @@ "Z": 520.31726 }, "TerritoryId": 958, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 2012001, @@ -123,7 +123,7 @@ "Z": 644.28174 }, "TerritoryId": 958, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1038853, diff --git a/Questionable/QuestPaths/Endwalker-B-Garlemald/4388_The Last Bastion.json b/Questionable/QuestPaths/Endwalker-B-Garlemald/4388_The Last Bastion.json index ff7bdb14..776262bc 100644 --- a/Questionable/QuestPaths/Endwalker-B-Garlemald/4388_The Last Bastion.json +++ b/Questionable/QuestPaths/Endwalker-B-Garlemald/4388_The Last Bastion.json @@ -28,7 +28,7 @@ "Z": 102.00659 }, "TerritoryId": 958, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "Position": { diff --git a/Questionable/QuestPaths/Endwalker-B-Garlemald/4390_His Park Materials.json b/Questionable/QuestPaths/Endwalker-B-Garlemald/4390_His Park Materials.json index 2127b0a5..7a7c7655 100644 --- a/Questionable/QuestPaths/Endwalker-B-Garlemald/4390_His Park Materials.json +++ b/Questionable/QuestPaths/Endwalker-B-Garlemald/4390_His Park Materials.json @@ -64,7 +64,7 @@ "Z": -482.20038 }, "TerritoryId": 958, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 2012095, diff --git a/Questionable/QuestPaths/Endwalker-B-Garlemald/4393_Strange Bedfellows.json b/Questionable/QuestPaths/Endwalker-B-Garlemald/4393_Strange Bedfellows.json index fe24a88b..2a67c179 100644 --- a/Questionable/QuestPaths/Endwalker-B-Garlemald/4393_Strange Bedfellows.json +++ b/Questionable/QuestPaths/Endwalker-B-Garlemald/4393_Strange Bedfellows.json @@ -28,7 +28,7 @@ "Z": -172.25916 }, "TerritoryId": 958, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "Position": { @@ -48,7 +48,7 @@ "Z": -518.2117 }, "TerritoryId": 958, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1039917, diff --git a/Questionable/QuestPaths/Endwalker-B-Garlemald/4395_Gateway of the Gods.json b/Questionable/QuestPaths/Endwalker-B-Garlemald/4395_Gateway of the Gods.json index c8487a8d..f764e99e 100644 --- a/Questionable/QuestPaths/Endwalker-B-Garlemald/4395_Gateway of the Gods.json +++ b/Questionable/QuestPaths/Endwalker-B-Garlemald/4395_Gateway of the Gods.json @@ -28,7 +28,7 @@ "Z": 67.826294 }, "TerritoryId": 958, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1039942, @@ -53,7 +53,7 @@ "Z": -325.85645 }, "TerritoryId": 958, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1039946, diff --git a/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4401_A Harey Situation.json b/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4401_A Harey Situation.json index c2d1edc5..db0915f0 100644 --- a/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4401_A Harey Situation.json +++ b/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4401_A Harey Situation.json @@ -28,7 +28,7 @@ "Z": -385.7313 }, "TerritoryId": 959, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1038897, diff --git a/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4402_A Taste of the Moon.json b/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4402_A Taste of the Moon.json index b0ab1a5a..78b3ff93 100644 --- a/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4402_A Taste of the Moon.json +++ b/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4402_A Taste of the Moon.json @@ -59,7 +59,7 @@ "Z": -595.72754 }, "TerritoryId": 959, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1038912, diff --git a/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4404_Alls Vale That Endsvale.json b/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4404_Alls Vale That Endsvale.json index 120ade0b..b489dab5 100644 --- a/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4404_Alls Vale That Endsvale.json +++ b/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4404_Alls Vale That Endsvale.json @@ -89,7 +89,7 @@ "Z": -405.08124 }, "TerritoryId": 959, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1038929, diff --git a/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4405_Back to Old Tricks.json b/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4405_Back to Old Tricks.json index 6cf4ce1b..70c71c66 100644 --- a/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4405_Back to Old Tricks.json +++ b/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4405_Back to Old Tricks.json @@ -51,16 +51,18 @@ }, { "Sequence": 255, - "Steps": [{ - "DataId": 1038935, - "Position": { - "X": 68.5282, - "Y": 75.72459, - "Z": -23.51416 - }, - "TerritoryId": 959, - "InteractionType": "Interact" - }] + "Steps": [ + { + "DataId": 1038935, + "Position": { + "X": 68.5282, + "Y": 75.72459, + "Z": -23.51416 + }, + "TerritoryId": 959, + "InteractionType": "Interact" + } + ] } ] } diff --git a/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4406_Settiing Things Straight.json b/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4406_Settiing Things Straight.json index d4279fc6..404979cc 100644 --- a/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4406_Settiing Things Straight.json +++ b/Questionable/QuestPaths/Endwalker-C-MareLamentorum/4406_Settiing Things Straight.json @@ -103,7 +103,7 @@ "Z": -595.5444 }, "TerritoryId": 959, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1038937, diff --git a/Questionable/QuestPaths/Endwalker-D-Thavnair2/4413_That We Might Live.json b/Questionable/QuestPaths/Endwalker-D-Thavnair2/4413_That We Might Live.json index b56baec6..a0a4d1ea 100644 --- a/Questionable/QuestPaths/Endwalker-D-Thavnair2/4413_That We Might Live.json +++ b/Questionable/QuestPaths/Endwalker-D-Thavnair2/4413_That We Might Live.json @@ -43,7 +43,7 @@ "Z": -343.89258 }, "TerritoryId": 957, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 2011997, @@ -53,7 +53,7 @@ "Z": -447.8676 }, "TerritoryId": 957, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1039023, diff --git a/Questionable/QuestPaths/Endwalker-D-Thavnair2/4414_When All Hope Seems Lost.json b/Questionable/QuestPaths/Endwalker-D-Thavnair2/4414_When All Hope Seems Lost.json index 21f5f93c..72e05684 100644 --- a/Questionable/QuestPaths/Endwalker-D-Thavnair2/4414_When All Hope Seems Lost.json +++ b/Questionable/QuestPaths/Endwalker-D-Thavnair2/4414_When All Hope Seems Lost.json @@ -58,7 +58,7 @@ "Z": -159.1059 }, "TerritoryId": 957, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "Position": { diff --git a/Questionable/QuestPaths/Endwalker-D-Thavnair2/4415_Warm Hearts, Rekindled Hopes.json b/Questionable/QuestPaths/Endwalker-D-Thavnair2/4415_Warm Hearts, Rekindled Hopes.json index 2f7d201d..c6d08665 100644 --- a/Questionable/QuestPaths/Endwalker-D-Thavnair2/4415_Warm Hearts, Rekindled Hopes.json +++ b/Questionable/QuestPaths/Endwalker-D-Thavnair2/4415_Warm Hearts, Rekindled Hopes.json @@ -28,7 +28,7 @@ "Z": 425.10107 }, "TerritoryId": 957, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 2012207, diff --git a/Questionable/QuestPaths/Endwalker-E-Elpis/4425_Their Greatest Contribution.json b/Questionable/QuestPaths/Endwalker-E-Elpis/4425_Their Greatest Contribution.json index c5eff596..fae40825 100644 --- a/Questionable/QuestPaths/Endwalker-E-Elpis/4425_Their Greatest Contribution.json +++ b/Questionable/QuestPaths/Endwalker-E-Elpis/4425_Their Greatest Contribution.json @@ -43,7 +43,7 @@ "Z": 107.9021 }, "TerritoryId": 961, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1040052, @@ -83,7 +83,7 @@ "Z": 2.5177002 }, "TerritoryId": 961, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1040061, diff --git a/Questionable/QuestPaths/Endwalker-E-Elpis/4426_Aether to Aether.json b/Questionable/QuestPaths/Endwalker-E-Elpis/4426_Aether to Aether.json index c67d3eb8..86783bc8 100644 --- a/Questionable/QuestPaths/Endwalker-E-Elpis/4426_Aether to Aether.json +++ b/Questionable/QuestPaths/Endwalker-E-Elpis/4426_Aether to Aether.json @@ -28,7 +28,7 @@ "Z": 551.5067 }, "TerritoryId": 961, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1040073, @@ -53,7 +53,7 @@ "Z": 490.53174 }, "TerritoryId": 961, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1040080, diff --git a/Questionable/QuestPaths/Endwalker-E-Elpis/4427_A Sentimental Gift.json b/Questionable/QuestPaths/Endwalker-E-Elpis/4427_A Sentimental Gift.json index e45de47e..a12e0213 100644 --- a/Questionable/QuestPaths/Endwalker-E-Elpis/4427_A Sentimental Gift.json +++ b/Questionable/QuestPaths/Endwalker-E-Elpis/4427_A Sentimental Gift.json @@ -128,7 +128,7 @@ "Z": 411.12378 }, "TerritoryId": 961, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 2012141, diff --git a/Questionable/QuestPaths/Endwalker-E-Elpis/4431_Witness to the Spectacle.json b/Questionable/QuestPaths/Endwalker-E-Elpis/4431_Witness to the Spectacle.json index f3aab7b7..2fcb9fdc 100644 --- a/Questionable/QuestPaths/Endwalker-E-Elpis/4431_Witness to the Spectacle.json +++ b/Questionable/QuestPaths/Endwalker-E-Elpis/4431_Witness to the Spectacle.json @@ -43,7 +43,7 @@ "Z": -108.99524 }, "TerritoryId": 961, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1040121, diff --git a/Questionable/QuestPaths/Endwalker-E-Elpis/4432_Worthy of His Back.json b/Questionable/QuestPaths/Endwalker-E-Elpis/4432_Worthy of His Back.json index 514e7795..f1c95840 100644 --- a/Questionable/QuestPaths/Endwalker-E-Elpis/4432_Worthy of His Back.json +++ b/Questionable/QuestPaths/Endwalker-E-Elpis/4432_Worthy of His Back.json @@ -28,7 +28,7 @@ "Z": -36.972656 }, "TerritoryId": 961, - "InteractionType": "AetherCurrent", + "InteractionType": "AttuneAetherCurrent", "Comment": "Might be faster when initially entering the Island" }, { diff --git a/Questionable/QuestPaths/Endwalker-E-Elpis/4433_A Flower upon Your Return.json b/Questionable/QuestPaths/Endwalker-E-Elpis/4433_A Flower upon Your Return.json index 351430f8..5c722fd0 100644 --- a/Questionable/QuestPaths/Endwalker-E-Elpis/4433_A Flower upon Your Return.json +++ b/Questionable/QuestPaths/Endwalker-E-Elpis/4433_A Flower upon Your Return.json @@ -58,7 +58,7 @@ "Z": 172.41162 }, "TerritoryId": 961, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 2012027, @@ -68,7 +68,7 @@ "Z": -293.59882 }, "TerritoryId": 961, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 2012151, @@ -108,7 +108,7 @@ "Z": -691.3405 }, "TerritoryId": 961, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1040135, diff --git a/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4442_No Job Too Small.json b/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4442_No Job Too Small.json index c6862b23..a7cc4daa 100644 --- a/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4442_No Job Too Small.json +++ b/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4442_No Job Too Small.json @@ -39,7 +39,7 @@ "Z": 178.85095 }, "TerritoryId": 956, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1039750, diff --git a/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4445_Sage Council.json b/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4445_Sage Council.json index ef29623b..059b841f 100644 --- a/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4445_Sage Council.json +++ b/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4445_Sage Council.json @@ -4,56 +4,63 @@ "QuestSequence": [ { "Sequence": 0, - "Steps": [{ - "DataId": 1040401, - "Position": { - "X": 374.83777, - "Y": 79.691376, - "Z": 298.08484 - }, - "TerritoryId": 956, - "InteractionType": "Interact" - }] + "Steps": [ + { + "DataId": 1040401, + "Position": { + "X": 374.83777, + "Y": 79.691376, + "Z": 298.08484 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] }, { "Sequence": 1, - "Steps": [{ - "DataId": 1039687, - "Position": { - "X": -18.875488, - "Y": -31.53043, - "Z": -76.98181 - }, - "TerritoryId": 956, - "InteractionType": "Interact" - }] + "Steps": [ + { + "DataId": 1039687, + "Position": { + "X": -18.875488, + "Y": -31.53043, + "Z": -76.98181 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] }, { "Sequence": 2, - "Steps": [{ - "DataId": 1040409, - "Position": { - "X": -99.076904, - "Y": -28.516306, - "Z": -60.013794 - }, - "TerritoryId": 956, - "InteractionType": "Interact" - }] + "Steps": [ + { + "DataId": 1040409, + "Position": { + "X": -99.076904, + "Y": -28.516306, + "Z": -60.013794 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] }, { "Sequence": 3, - "Steps": [{ - "DataId": 1040422, - "Position": { - "X": -37.125244, - "Y": -29.530075, - "Z": -169.14624 + "Steps": [ + { + "DataId": 1040422, + "Position": { + "X": -37.125244, + "Y": -29.530075, + "Z": -169.14624 + }, + "TerritoryId": 956, + "InteractionType": "Interact", + "Comment": "Distracted Researcher" }, - "TerritoryId": 956, - "InteractionType": "Interact", - "Comment": "Distracted Researcher" - }, { "DataId": 1040416, "Position": { @@ -130,46 +137,53 @@ "TerritoryId": 956, "InteractionType": "Interact", "Comment": "Anxious Engineer" - }] + } + ] }, { "Sequence": 4, - "Steps": [{ - "DataId": 1040436, - "Position": { - "X": -78.26355, - "Y": -29.53, - "Z": -58.854065 - }, - "TerritoryId": 956, - "InteractionType": "Interact" - }] + "Steps": [ + { + "DataId": 1040436, + "Position": { + "X": -78.26355, + "Y": -29.53, + "Z": -58.854065 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] }, { "Sequence": 5, - "Steps": [{ - "DataId": 2012220, - "Position": { - "X": -74.418274, - "Y": -29.58728, - "Z": -53.23877 - }, - "TerritoryId": 956, - "InteractionType": "Interact" - }] + "Steps": [ + { + "DataId": 2012220, + "Position": { + "X": -74.418274, + "Y": -29.58728, + "Z": -53.23877 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] }, { - "Sequence":255, - "Steps": [{ - "DataId": 1040436, - "Position": { - "X": -78.26355, - "Y": -29.53, - "Z": -58.854065 - }, - "TerritoryId": 956, - "InteractionType": "Interact" - }] + "Sequence": 255, + "Steps": [ + { + "DataId": 1040436, + "Position": { + "X": -78.26355, + "Y": -29.53, + "Z": -58.854065 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] } ] } diff --git a/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4446_Hither and Yarns.json b/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4446_Hither and Yarns.json index 7ee8d0d5..c0532b5d 100644 --- a/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4446_Hither and Yarns.json +++ b/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4446_Hither and Yarns.json @@ -28,7 +28,7 @@ "Z": -242.26752 }, "TerritoryId": 956, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 2011988, @@ -38,7 +38,7 @@ "Z": -122.60626 }, "TerritoryId": 956, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1040444, diff --git a/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4447_Once Forged.json b/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4447_Once Forged.json index 526627a2..33b3edb8 100644 --- a/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4447_Once Forged.json +++ b/Questionable/QuestPaths/Endwalker-F-Labyrinthos2/4447_Once Forged.json @@ -78,7 +78,7 @@ "Z": 661.86 }, "TerritoryId": 956, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1040455, diff --git a/Questionable/QuestPaths/Endwalker-G-UltimaThule/4456_.Roads Paved of Sacrifice.json b/Questionable/QuestPaths/Endwalker-G-UltimaThule/4456_.Roads Paved of Sacrifice.json index 71bb7064..c3e34381 100644 --- a/Questionable/QuestPaths/Endwalker-G-UltimaThule/4456_.Roads Paved of Sacrifice.json +++ b/Questionable/QuestPaths/Endwalker-G-UltimaThule/4456_.Roads Paved of Sacrifice.json @@ -58,7 +58,7 @@ "Z": -361.50153 }, "TerritoryId": 960, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 2012035, @@ -68,7 +68,7 @@ "Z": -295.15533 }, "TerritoryId": 960, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1040317, diff --git a/Questionable/QuestPaths/Endwalker-G-UltimaThule/4459_Victory x Lost.json b/Questionable/QuestPaths/Endwalker-G-UltimaThule/4459_Victory x Lost.json index 34374569..eabfc771 100644 --- a/Questionable/QuestPaths/Endwalker-G-UltimaThule/4459_Victory x Lost.json +++ b/Questionable/QuestPaths/Endwalker-G-UltimaThule/4459_Victory x Lost.json @@ -135,7 +135,7 @@ "Z": 239.39868 }, "TerritoryId": 960, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1039791, @@ -205,7 +205,7 @@ "Z": -756.40497 }, "TerritoryId": 960, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 2012034, @@ -215,7 +215,7 @@ "Z": -679.7742 }, "TerritoryId": 960, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1039791, diff --git a/Questionable/QuestPaths/Endwalker-G-UltimaThule/4460_x.json b/Questionable/QuestPaths/Endwalker-G-UltimaThule/4460_x.json index 5a308804..6d64d03a 100644 --- a/Questionable/QuestPaths/Endwalker-G-UltimaThule/4460_x.json +++ b/Questionable/QuestPaths/Endwalker-G-UltimaThule/4460_x.json @@ -28,7 +28,7 @@ "Z": 402.12085 }, "TerritoryId": 960, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 2012032, @@ -38,7 +38,7 @@ "Z": 411.73413 }, "TerritoryId": 960, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1040343, @@ -109,7 +109,7 @@ "Z": 357.86987 }, "TerritoryId": 960, - "InteractionType": "AetherCurrent", + "InteractionType": "AttuneAetherCurrent", "Comment": "Unsure if this is the right spot" }, { @@ -120,7 +120,7 @@ "Z": 289.66187 }, "TerritoryId": 960, - "InteractionType": "AetherCurrent" + "InteractionType": "AttuneAetherCurrent" }, { "DataId": 1040349, diff --git a/Questionable/QuestPaths/Endwalker-L-6.5/4750_Growing Light.json b/Questionable/QuestPaths/Endwalker-L-6.5/4750_Growing Light.json index 9ae16aae..68ecbdfa 100644 --- a/Questionable/QuestPaths/Endwalker-L-6.5/4750_Growing Light.json +++ b/Questionable/QuestPaths/Endwalker-L-6.5/4750_Growing Light.json @@ -4,84 +4,105 @@ "QuestSequence": [ { "Sequence": 0, - "Steps": [{ - "DataId": 1045681, - "Position": { - "X": 5.8136597, - "Y": 41.530136, - "Z": -165.27051 - }, - "TerritoryId": 962, - "InteractionType": "Interact" - }] + "Steps": [ + { + "DataId": 1045681, + "Position": { + "X": 5.8136597, + "Y": 41.530136, + "Z": -165.27051 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] }, { "Sequence": 1, - "Steps": [{ - "DataId": 1030533, - "Position": { - "X": 117.997925, - "Y": 14.649025, - "Z": 7.156433 - }, - "TerritoryId": 819, - "InteractionType": "Interact" - , "AethernetShortcut": ["[The Crystarium] Aetheryte Plaza", "[The Crystarium] The Dossal Gate"] - }] + "Steps": [ + { + "DataId": 1030533, + "Position": { + "X": 117.997925, + "Y": 14.649025, + "Z": 7.156433 + }, + "TerritoryId": 819, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[The Crystarium] Aetheryte Plaza", + "[The Crystarium] The Dossal Gate" + ] + } + ] }, { "Sequence": 2, - "Steps": [{ - "DataId": 1045684, - "Position": { - "X": -0.96136475, - "Y": 0, - "Z": -3.3417358 - }, - "TerritoryId": 844, - "InteractionType": "Interact" - }] + "Steps": [ + { + "DataId": 1045684, + "Position": { + "X": -0.96136475, + "Y": 0, + "Z": -3.3417358 + }, + "TerritoryId": 844, + "InteractionType": "Interact" + } + ] }, { "Sequence": 4, - "Steps": [{ - "DataId": 1039649, - "Position": { - "X": -336.53772, - "Y": 55, - "Z": -69.47443 - }, - "TerritoryId": 963, - "InteractionType": "Interact", - "AethernetShortcut": ["[Radz-at-Han] Aetheryte Plaza", "[Radz-at-Han] Meghaduta"] - }] + "Steps": [ + { + "DataId": 1039649, + "Position": { + "X": -336.53772, + "Y": 55, + "Z": -69.47443 + }, + "TerritoryId": 963, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Radz-at-Han] Aetheryte Plaza", + "[Radz-at-Han] Meghaduta" + ] + } + ] }, { "Sequence": 5, - "Steps": [{ - "DataId": 1045688, - "Position": { - "X": -2.456726, - "Y": 3.0299988, - "Z": -212.84814 - }, - "TerritoryId": 963, - "InteractionType": "Interact" - }] + "Steps": [ + { + "DataId": 1045688, + "Position": { + "X": -2.456726, + "Y": 3.0299988, + "Z": -212.84814 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] }, { "Sequence": 255, - "Steps": [{ - "DataId": 196, - "Position": { - "X": -42.61847, - "Y": -0.015319824, - "Z": -197.61963 - }, - "TerritoryId": 963, - "InteractionType": "Interact", - "AethernetShortcut": ["[Radz-at-Han] Mehryde's Meyhane", "[Radz-at-Han] Aetheryte Plaza"] - }] + "Steps": [ + { + "DataId": 196, + "Position": { + "X": -42.61847, + "Y": -0.015319824, + "Z": -197.61963 + }, + "TerritoryId": 963, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Radz-at-Han] Mehryde's Meyhane", + "[Radz-at-Han] Aetheryte Plaza" + ] + } + ] } ] } diff --git a/Questionable/QuestSchema/schema_v1.json b/Questionable/QuestSchema/schema_v1.json index 6c14bf69..bf35fe5a 100644 --- a/Questionable/QuestSchema/schema_v1.json +++ b/Questionable/QuestSchema/schema_v1.json @@ -76,9 +76,10 @@ "type": "string", "enum": [ "Interact", + "WalkTo", "AttuneAethenetShard", "AttuneAetheryte", - "AetherCurrent", + "AttuneAetherCurrent", "Combat", "UseItem", "Emote", @@ -95,6 +96,57 @@ "items": { "type": "string", "enum": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Arcanist's Guild", + "[Limsa Lominsa] Fishermen's Guild", + "[Limsa Lominsa] Hawker's Alley", + "[Limsa Lominsa] The Aftcastle", + "[Limsa Lominsa] Culinarian's Guild", + "[Limsa Lominsa] Marauder's Guild", + "[Limsa Lominsa] Airship Landing", + "[Gridania] Aetheryte Plaza", + "[Gridania] Archer's Guild", + "[Gridania] Leatherworker's Guld & Shaded Bower", + "[Gridania] Lancer's Guild", + "[Gridania] Conjurer's Guild", + "[Gridania] Botanist's Guild", + "[Gridania] Mih Khetto's Amphitheatre", + "[Gridania] Airship Landing", + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Adventurer's Guild", + "[Ul'dah] Thaumaturge's Guild", + "[Ul'dah] Gladiator's Guild", + "[Ul'dah] Miner's Guild", + "[Ul'dah] Weavers' Guild", + "[Ul'dah] Goldsmiths' Guild", + "[Ul'dah] Sapphire Avenue Exchange", + "[Ul'dah] Alchemists' Guild", + "[Ul'dah] The Chamber of Rule", + "[Ul'dah] Airship Landing", + "[Ishgard] Aetheryte Plaza", + "[Ishgard] The Forgotten Knight", + "[Ishgard] Skysteel Manufactory", + "[Ishgard] The Brume", + "[Ishgard] Athenaeum Astrologicum", + "[Ishgard] The Jeweled Crozier", + "[Ishgard] Saint Reymanaud's Cathedral", + "[Ishgard] The Tribunal", + "[Ishgard] The Last Vigil", + "[Idyllshire] Aetheryte Plaza", + "[Idyllshire] West Idyllshire", + "[Rhalgr's Reach] Aetheryte Plaza", + "[Rhalgr's Reach] Western Rhalgr's Reach", + "[Rhalgr's Reach] Northeastern Rhalgr's Reach", + "[Kugane] Aetheryte Plaza", + "[Kugane] Shiokaze Hostelry", + "[Kugane] Pier #1", + "[Kugane] Thavnairian Consulate", + "[Kugane] Kogane Dori Markets", + "[Kugane] Bokairo Inn", + "[Kugane] The Ruby Bazaar", + "[Kugane] Sekiseigumi Barracks", + "[Kugane] Rakuza District", + "[Kugane] Airship Landing", "[The Crystarium] Aetheryte Plaza", "[The Crystarium] Musica Universalis Markets", "[The Crystarium] Themenos Rookery", @@ -138,7 +190,8 @@ "enum": [ "stretch", "wave", - "rally" + "rally", + "deny" ] }, "SkipIf": { diff --git a/Questionable/Questionable.cs b/Questionable/Questionable.cs index ba7a64c3..0351d8c7 100644 --- a/Questionable/Questionable.cs +++ b/Questionable/Questionable.cs @@ -31,7 +31,8 @@ public sealed class Questionable : IDalamudPlugin _framework = framework; _gameGui = gameGui; _gameFunctions = new GameFunctions(dataManager, sigScanner); - _movementController = new MovementController(new NavmeshIpc(pluginInterface), clientState, _gameFunctions, pluginLog); + _movementController = + new MovementController(new NavmeshIpc(pluginInterface), clientState, _gameFunctions, pluginLog); _windowSystem.AddWindow(new DebugWindow(_movementController, _gameFunctions, clientState, targetManager)); _pluginInterface.UiBuilder.Draw += _windowSystem.Draw; @@ -57,7 +58,8 @@ public sealed class Questionable : IDalamudPlugin _gameGui.ScreenToWorld(new Vector2(inputData->CursorXPosition, inputData->CursorYPosition), out Vector3 worldPos)) { - _movementController.NavigateTo(EMovementType.Shortcut, worldPos, _gameFunctions.IsFlyingUnlocked(_clientState.TerritoryType)); + _movementController.NavigateTo(EMovementType.Shortcut, worldPos, + _gameFunctions.IsFlyingUnlocked(_clientState.TerritoryType)); } } diff --git a/Questionable/Questionable.csproj b/Questionable/Questionable.csproj index b27e6201..4c374490 100644 --- a/Questionable/Questionable.csproj +++ b/Questionable/Questionable.csproj @@ -54,9 +54,11 @@ + diff --git a/Questionable/Windows/DebugWindow.cs b/Questionable/Windows/DebugWindow.cs index b60fc37b..ab557a8b 100644 --- a/Questionable/Windows/DebugWindow.cs +++ b/Questionable/Windows/DebugWindow.cs @@ -39,7 +39,8 @@ internal sealed class DebugWindow : Window if (!_clientState.IsLoggedIn || _clientState.LocalPlayer == null) return; - ImGui.Text($"Current TerritoryId: {_clientState.TerritoryType}, Flying: {(_gameFunctions.IsFlyingUnlocked(_clientState.TerritoryType) ? "Yes" : "No")}"); + ImGui.Text( + $"Current TerritoryId: {_clientState.TerritoryType}, Flying: {(_gameFunctions.IsFlyingUnlocked(_clientState.TerritoryType) ? "Yes" : "No")}"); var q = _gameFunctions.GetCurrentQuest(); ImGui.Text($"Current Quest: {q.CurrentQuest} → {q.Sequence}"); @@ -54,7 +55,8 @@ internal sealed class DebugWindow : Window { if (ImGui.Button("Move to Target")) { - _movementController.NavigateTo(EMovementType.DebugWindow, _targetManager.Target.Position, _gameFunctions.IsFlyingUnlocked(_clientState.TerritoryType)); + _movementController.NavigateTo(EMovementType.DebugWindow, _targetManager.Target.Position, + _gameFunctions.IsFlyingUnlocked(_clientState.TerritoryType)); } } else @@ -107,9 +109,11 @@ internal sealed class DebugWindow : Window ImGui.Separator(); var map = AgentMap.Instance(); - ImGui.BeginDisabled(map == null || map->IsFlagMarkerSet == 0 || map->FlagMapMarker.TerritoryId != _clientState.TerritoryType); + ImGui.BeginDisabled(map == null || map->IsFlagMarkerSet == 0 || + map->FlagMapMarker.TerritoryId != _clientState.TerritoryType); if (ImGui.Button("Move to Flag")) - _gameFunctions.ExecuteCommand($"/vnav {(_gameFunctions.IsFlyingUnlocked(_clientState.TerritoryType) ? "flyflag" : "moveflag")}"); + _gameFunctions.ExecuteCommand( + $"/vnav {(_gameFunctions.IsFlyingUnlocked(_clientState.TerritoryType) ? "flyflag" : "moveflag")}"); ImGui.EndDisabled(); ImGui.SameLine();