From 01e657dbdd2229638c56df7c19c87b105148d970 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 29 Sep 2024 20:22:28 +0200 Subject: [PATCH] Add support for Crystarium leves --- .../Kholusia/576__MIN.json | 120 ++++++++++++++++++ .../6.x - Endwalker/Labyrinthos/886__MIN.json | 3 +- .../Leves/MIN/L1540_Barmy for Ballistas.json | 38 ++++++ .../MSQ/I-5.3/3774_Food for the Soul.json | 1 - .../Misc/3605_The Aspiring Skywatcher.json | 21 +++ Questionable/Data/LeveData.cs | 5 + 6 files changed, 186 insertions(+), 2 deletions(-) create mode 100644 GatheringPaths/5.x - Shadowbringers/Kholusia/576__MIN.json create mode 100644 QuestPaths/5.x - Shadowbringers/Leves/MIN/L1540_Barmy for Ballistas.json create mode 100644 QuestPaths/5.x - Shadowbringers/Unlocks/Misc/3605_The Aspiring Skywatcher.json diff --git a/GatheringPaths/5.x - Shadowbringers/Kholusia/576__MIN.json b/GatheringPaths/5.x - Shadowbringers/Kholusia/576__MIN.json new file mode 100644 index 000000000..6be75bd0b --- /dev/null +++ b/GatheringPaths/5.x - Shadowbringers/Kholusia/576__MIN.json @@ -0,0 +1,120 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 814, + "InteractionType": "None" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 32512, + "Locations": [ + { + "Position": { + "X": -221.5365, + "Y": 88.75751, + "Z": 36.51096 + }, + "MinimumAngle": -100, + "MaximumAngle": 25 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 32513, + "Locations": [ + { + "Position": { + "X": -227.0897, + "Y": 89.90434, + "Z": 37.42806 + }, + "MinimumAngle": -20, + "MaximumAngle": 60 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 32514, + "Locations": [ + { + "Position": { + "X": -233.9371, + "Y": 89.18435, + "Z": 42.91663 + }, + "MinimumAngle": -110, + "MaximumAngle": -25 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 32515, + "Locations": [ + { + "Position": { + "X": -243.0384, + "Y": 88.70179, + "Z": 48.95438 + }, + "MinimumAngle": -70, + "MaximumAngle": 45 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 32516, + "Locations": [ + { + "Position": { + "X": -256.5147, + "Y": 90.32328, + "Z": 51.07351 + }, + "MinimumAngle": -75, + "MaximumAngle": 90 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 32517, + "Locations": [ + { + "Position": { + "X": -265.2769, + "Y": 90.43383, + "Z": 45.49376 + }, + "MinimumAngle": -40, + "MaximumAngle": 40 + } + ] + } + ] + } + ] +} diff --git a/GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json b/GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json index 8bb595147..0657a96fe 100644 --- a/GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json +++ b/GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json @@ -1,6 +1,7 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", "Author": "liza", + "FlyBetweenNodes": false, "Steps": [ { "TerritoryId": 956, @@ -157,4 +158,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/5.x - Shadowbringers/Leves/MIN/L1540_Barmy for Ballistas.json b/QuestPaths/5.x - Shadowbringers/Leves/MIN/L1540_Barmy for Ballistas.json new file mode 100644 index 000000000..486319319 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Leves/MIN/L1540_Barmy for Ballistas.json @@ -0,0 +1,38 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -213.94563, + "Y": 84.02199, + "Z": 43.544315 + }, + "TerritoryId": 814, + "InteractionType": "InitiateLeve", + "AetheryteShortcut": "Kholusia - Wright", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + }, + { + "TerritoryId": 814, + "InteractionType": "Gather", + "ItemsToGather": [ + { + "ItemId": 2002785, + "AlternativeItemId": 2002786, + "ItemCount": 999 + } + ] + } + ] + } + ] +} diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3774_Food for the Soul.json b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3774_Food for the Soul.json index aaf605788..3408d12f6 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3774_Food for the Soul.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3774_Food for the Soul.json @@ -52,7 +52,6 @@ "Fly": true }, { - "Comment": "TODO Verify", "DataId": 1033818, "Position": { "X": 24.551636, diff --git a/QuestPaths/5.x - Shadowbringers/Unlocks/Misc/3605_The Aspiring Skywatcher.json b/QuestPaths/5.x - Shadowbringers/Unlocks/Misc/3605_The Aspiring Skywatcher.json new file mode 100644 index 000000000..b0905c11f --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Unlocks/Misc/3605_The Aspiring Skywatcher.json @@ -0,0 +1,21 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1031106, + "Position": { + "X": -8.255188, + "Y": -3.1851232E-07, + "Z": 10.543945 + }, + "TerritoryId": 819, + "InteractionType": "AcceptQuest" + } + ] + } + ] +} diff --git a/Questionable/Data/LeveData.cs b/Questionable/Data/LeveData.cs index a80842006..fcabe5d80 100644 --- a/Questionable/Data/LeveData.cs +++ b/Questionable/Data/LeveData.cs @@ -13,6 +13,11 @@ internal sealed class LeveData { private static readonly List Leves = [ + new( + aetheryteLocation: EAetheryteLocation.Crystarium, + aethernetShortcut: new AethernetShortcut{From = EAetheryteLocation.Crystarium, To = EAetheryteLocation.CrystariumCrystallineMean}, + issuerDataId: 1027847, + issuerPosition: new(-73.94349f, 19.999794f, -110.86395f)), new( aetheryteLocation: EAetheryteLocation.OldSharlayan, aethernetShortcut: new AethernetShortcut