liza/Questionable
liza/Questionable
2
1
Fork 18
Code Pull Requests 1 Releases 84 Activity

Allow for more complex gathering (preparation) steps; add firmament aetheryte

Browse Source
This commit is contained in:
Liza 2024-08-16 01:21:15 +02:00
parent 2955cff165
commit f1165a3937
Signed by: liza
GPG Key ID: 7199F8D727D55F67
100 changed files with 1907 additions and 1339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GatheringPathRenderer/EditorCommands.cs
View File

@ -15,6 +15,7 @@ using Dalamud.Plugin.Services;
using Lumina.Excel.GeneratedSheets;
using Questionable.Model;
using Questionable.Model.Gathering;
using Questionable.Model.Questing;
namespace GatheringPathRenderer;
@ -186,7 +187,14 @@ internal sealed class EditorCommands : IDisposable
var root = new GatheringRoot
{
Author = [_configuration.AuthorName],
Steps =
[
new QuestStep
{
TerritoryId = _clientState.TerritoryType,
InteractionType = EInteractionType.None,
}
],
Groups =
[
new GatheringNodeGroup

2
GatheringPathRenderer/RendererPlugin.cs
View File

@ -146,7 +146,7 @@ public sealed class RendererPlugin : IDalamudPlugin
}
internal IEnumerable<GatheringLocationContext> GetLocationsInTerritory(ushort territoryId)
=> _gatheringLocations.Where(x => x.Root.TerritoryId == territoryId);
=> _gatheringLocations.Where(x => x.Root.Steps.LastOrDefault()?.TerritoryId == territoryId);
internal void Save(FileInfo targetFile, GatheringRoot root)
{

7
GatheringPaths/2.x - A Realm Reborn/Central Thanalan/157_Spineless Basin_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 141,
"AetheryteShortcut": "Central Thanalan - Black Brush Station",
"InteractionType": "None",
"AetheryteShortcut": "Central Thanalan - Black Brush Station"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/2.x - A Realm Reborn/Western Thanalan/154_Hammerlea_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 140,
"AetheryteShortcut": "Western Thanalan - Horizon",
"InteractionType": "None",
"AetheryteShortcut": "Western Thanalan - Horizon"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/3.x - Heavensward/Coerthas Western Highlands/300_Twinpools_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 397,
"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
"InteractionType": "None",
"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/3.x - Heavensward/Coerthas Western Highlands/351_Red Rim_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 397,
"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
"InteractionType": "None",
"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/3.x - Heavensward/Coerthas Western Highlands/551_The Bed of Bones_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 397,
"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
"InteractionType": "None",
"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/3.x - Heavensward/Coerthas Western Highlands/552_Gorgagne Holding_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 397,
"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
"InteractionType": "None",
"AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/3.x - Heavensward/The Churning Mists/355_Landlord Colony_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 400,
"AetheryteShortcut": "The Churning Mists - Moghome",
"InteractionType": "None",
"AetheryteShortcut": "The Churning Mists - Moghome"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/3.x - Heavensward/The Churning Mists/359_Four Arms_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 400,
"AetheryteShortcut": "The Churning Mists - Zenith",
"InteractionType": "None",
"AetheryteShortcut": "The Churning Mists - Zenith"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/3.x - Heavensward/The Churning Mists/553_Landlord Colony_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 400,
"AetheryteShortcut": "The Churning Mists - Moghome",
"InteractionType": "None",
"AetheryteShortcut": "The Churning Mists - Moghome"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/3.x - Heavensward/The Churning Mists/554_Ohl Tahn_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 400,
"AetheryteShortcut": "The Churning Mists - Zenith",
"InteractionType": "None",
"AetheryteShortcut": "The Churning Mists - Zenith"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/3.x - Heavensward/The Dravanian Forelands/352_Avalonia Fallen_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 398,
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
"InteractionType": "None",
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/3.x - Heavensward/The Dravanian Forelands/358_Avalonia Fallen_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 398,
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
"InteractionType": "None",
"AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
}
],
"Groups": [
{
"Nodes": [

5
GatheringPaths/3.x - Heavensward/The Dravanian Hinterlands/353_The Makers' Quarter_MIN.json
View File

@ -1,11 +1,16 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 399,
"InteractionType": "None",
"AetheryteShortcut": "Idyllshire",
"AethernetShortcut": [
"[Idyllshire] Aetheryte Plaza",
"[Idyllshire] Epilogue Gate (Eastern Hinterlands)"
]
}
],
"Groups": [
{

5
GatheringPaths/3.x - Heavensward/The Dravanian Hinterlands/361_The Answering Quarter_BTN.json
View File

@ -1,11 +1,16 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 399,
"InteractionType": "None",
"AetheryteShortcut": "Idyllshire",
"AethernetShortcut": [
"[Idyllshire] Aetheryte Plaza",
"[Idyllshire] Prologue Gate (Western Hinterlands)"
]
}
],
"Groups": [
{

7
GatheringPaths/3.x - Heavensward/The Sea of Clouds/354_Voor Sian Siran_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 401,
"AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop",
"InteractionType": "None",
"AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/3.x - Heavensward/The Sea of Clouds/360_The Blue Window_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 401,
"AetheryteShortcut": "The Sea of Clouds - Ok' Zundu",
"InteractionType": "None",
"AetheryteShortcut": "The Sea of Clouds - Ok' Zundu"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Azim Steppe/495_Onsal Hakair_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 622,
"AetheryteShortcut": "Azim Steppe - Dawn Throne",
"InteractionType": "None",
"AetheryteShortcut": "Azim Steppe - Dawn Throne"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Azim Steppe/519_Nhaama's Retreat_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 622,
"AetheryteShortcut": "Azim Steppe - Dawn Throne",
"InteractionType": "None",
"AetheryteShortcut": "Azim Steppe - Dawn Throne"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Azim Steppe/813_Onsal Hakair_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 622,
"AetheryteShortcut": "Azim Steppe - Dawn Throne",
"InteractionType": "None",
"AetheryteShortcut": "Azim Steppe - Dawn Throne"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Fringes/485_East End_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 612,
"AetheryteShortcut": "Fringes - Castrum Oriens",
"InteractionType": "None",
"AetheryteShortcut": "Fringes - Castrum Oriens"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Fringes/486_The Striped Hills_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 612,
"AetheryteShortcut": "Fringes - Castrum Oriens",
"InteractionType": "None",
"AetheryteShortcut": "Fringes - Castrum Oriens"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Fringes/505_East End_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 612,
"AetheryteShortcut": "Fringes - Castrum Oriens",
"InteractionType": "None",
"AetheryteShortcut": "Fringes - Castrum Oriens"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Fringes/509_Dimwold_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 612,
"AetheryteShortcut": "Fringes - Castrum Oriens",
"InteractionType": "None",
"AetheryteShortcut": "Fringes - Castrum Oriens"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Fringes/513_Dimwold_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 612,
"AetheryteShortcut": "Fringes - Castrum Oriens",
"InteractionType": "None",
"AetheryteShortcut": "Fringes - Castrum Oriens"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Lochs/493_The High Bank_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 621,
"AetheryteShortcut": "Lochs - Porta Praetoria",
"InteractionType": "None",
"AetheryteShortcut": "Lochs - Porta Praetoria"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Lochs/514_Abalathia's Skull_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 621,
"AetheryteShortcut": "Lochs - Ala Mhigan Quarter",
"InteractionType": "None",
"AetheryteShortcut": "Lochs - Ala Mhigan Quarter"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Lochs/526_Abalathia's Skull_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 621,
"AetheryteShortcut": "Lochs - Porta Praetoria",
"InteractionType": "None",
"AetheryteShortcut": "Lochs - Porta Praetoria"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Peaks/489_Rustrock_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 620,
"AetheryteShortcut": "Peaks - Ala Gannha",
"InteractionType": "None",
"AetheryteShortcut": "Peaks - Ala Gannha"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Peaks/512_The Last Forest_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 620,
"AetheryteShortcut": "Peaks - Ala Gannha",
"InteractionType": "None",
"AetheryteShortcut": "Peaks - Ala Gannha"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Peaks/531_Sleeping Stones_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 620,
"AetheryteShortcut": "Peaks - Ala Gannha",
"InteractionType": "None",
"AetheryteShortcut": "Peaks - Ala Gannha"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Peaks/532_The Last Forest_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 620,
"AetheryteShortcut": "Peaks - Ala Gannha",
"InteractionType": "None",
"AetheryteShortcut": "Peaks - Ala Gannha"
}
],
"Groups": [
{
"Nodes": [

5
GatheringPaths/4.x - Stormblood/The Ruby Sea/487_Hells' Lid_MIN.json
View File

@ -1,11 +1,16 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 613,
"InteractionType": "None",
"AetheryteShortcut": "Kugane",
"AethernetShortcut": [
"[Kugane] Aetheryte Plaza",
"[Kugane] The Ruby Price"
]
}
],
"Groups": [
{

7
GatheringPaths/4.x - Stormblood/The Ruby Sea/507_Onokoro_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 613,
"AetheryteShortcut": "Ruby Sea - Onokoro",
"InteractionType": "None",
"AetheryteShortcut": "Ruby Sea - Onokoro"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Ruby Sea/510_East Othard Coastline_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 613,
"AetheryteShortcut": "Ruby Sea - Onokoro",
"InteractionType": "None",
"AetheryteShortcut": "Ruby Sea - Onokoro"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Ruby Sea/511_Rasen Kaikyo_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 613,
"AetheryteShortcut": "Ruby Sea - Tamamizu",
"InteractionType": "None",
"AetheryteShortcut": "Ruby Sea - Tamamizu"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/The Ruby Sea/529_Rasen Kaikyo_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 613,
"AetheryteShortcut": "Ruby Sea - Onokoro",
"InteractionType": "None",
"AetheryteShortcut": "Ruby Sea - Onokoro"
}
],
"Groups": [
{
"Nodes": [

5
GatheringPaths/4.x - Stormblood/The Ruby Sea/533_The Turquoise Trench_MIN.json
View File

@ -1,11 +1,16 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 613,
"InteractionType": "None",
"AetheryteShortcut": "Kugane",
"AethernetShortcut": [
"[Kugane] Aetheryte Plaza",
"[Kugane] The Ruby Price"
]
}
],
"FlyBetweenNodes": true,
"Groups": [

7
GatheringPaths/4.x - Stormblood/The Ruby Sea/534_The Isle of Bekko_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 613,
"AetheryteShortcut": "Ruby Sea - Tamamizu",
"InteractionType": "None",
"AetheryteShortcut": "Ruby Sea - Tamamizu"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/Yanxia/488_The Gensui Chain_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 614,
"AetheryteShortcut": "Yanxia - Namai",
"InteractionType": "None",
"AetheryteShortcut": "Yanxia - Namai"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/Yanxia/491_Unseen Spirits Laughing_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 614,
"AetheryteShortcut": "Yanxia - Namai",
"InteractionType": "None",
"AetheryteShortcut": "Yanxia - Namai"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/Yanxia/508_The Heron's Flight_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 614,
"AetheryteShortcut": "Yanxia - Namai",
"InteractionType": "None",
"AetheryteShortcut": "Yanxia - Namai"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/4.x - Stormblood/Yanxia/731_Yuzuka Manor_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 614,
"AetheryteShortcut": "Yanxia - Namai",
"InteractionType": "None",
"AetheryteShortcut": "Yanxia - Namai"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/5.x - Shadowbringers/Kholusia/649_Stonegazer_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 814,
"AetheryteShortcut": "Kholusia - Wright",
"InteractionType": "None",
"AetheryteShortcut": "Kholusia - Wright"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/5.x - Shadowbringers/Kholusia/650_Shadow Fault_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 814,
"AetheryteShortcut": "Kholusia - Wright",
"InteractionType": "None",
"AetheryteShortcut": "Kholusia - Wright"
}
],
"Groups": [
{
"Nodes": [

5
GatheringPaths/5.x - Shadowbringers/The Rak'tika Greatwood/688__MIN.json
View File

@ -1,7 +1,12 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 817,
"InteractionType": "None"
}
],
"Groups": [
{
"Nodes": [

5
GatheringPaths/5.x - Shadowbringers/The Rak'tika Greatwood/689__MIN.json
View File

@ -1,7 +1,12 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 817,
"InteractionType": "None"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/6.x - Endwalker/Elpis/823_The Hungering Gardens_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 961,
"AetheryteShortcut": "Elpis - Poieten Oikos",
"InteractionType": "None",
"AetheryteShortcut": "Elpis - Poieten Oikos"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/6.x - Endwalker/Elpis/846_Anagnorisis_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 961,
"AetheryteShortcut": "Elpis - Anagnorisis",
"InteractionType": "None",
"AetheryteShortcut": "Elpis - Anagnorisis"
}
],
"Groups": [
{
"Nodes": [

5
GatheringPaths/6.x - Endwalker/Elysion/316__MIN.json
View File

@ -1,7 +1,12 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1073,
"InteractionType": "None"
}
],
"Groups": [
{
"Nodes": [

5
GatheringPaths/6.x - Endwalker/Elysion/317__MIN.json
View File

@ -1,7 +1,12 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1073,
"InteractionType": "None"
}
],
"Groups": [
{
"Nodes": [

5
GatheringPaths/6.x - Endwalker/Elysion/322__MIN.json
View File

@ -1,7 +1,12 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1073,
"InteractionType": "None"
}
],
"Groups": [
{
"Nodes": [

5
GatheringPaths/6.x - Endwalker/Elysion/336__MIN.json
View File

@ -1,7 +1,12 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1073,
"InteractionType": "None"
}
],
"Groups": [
{
"Nodes": [

5
GatheringPaths/6.x - Endwalker/Elysion/393__BTN.json
View File

@ -1,7 +1,12 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1073,
"InteractionType": "None"
}
],
"Groups": [
{
"Nodes": [

5
GatheringPaths/6.x - Endwalker/Elysion/394__BTN.json
View File

@ -1,7 +1,12 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1073,
"InteractionType": "None"
}
],
"Groups": [
{
"Nodes": [

5
GatheringPaths/6.x - Endwalker/Elysion/398__BTN.json
View File

@ -1,7 +1,12 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1073,
"InteractionType": "None"
}
],
"Groups": [
{
"Nodes": [

5
GatheringPaths/6.x - Endwalker/Elysion/399__BTN.json
View File

@ -1,7 +1,12 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1073,
"InteractionType": "None"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/6.x - Endwalker/Garlemald/822_Monitoring Station G_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 958,
"AetheryteShortcut": "Garlemald - Camp Broken Glass",
"InteractionType": "None",
"AetheryteShortcut": "Garlemald - Camp Broken Glass"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/6.x - Endwalker/Garlemald/842_Camp Broken Glass_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 958,
"AetheryteShortcut": "Garlemald - Camp Broken Glass",
"InteractionType": "None",
"AetheryteShortcut": "Garlemald - Camp Broken Glass"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/6.x - Endwalker/Labyrinthos/816_Lower Acrinthos_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 956,
"AetheryteShortcut": "Labyrinthos - Archeion",
"InteractionType": "None",
"AetheryteShortcut": "Labyrinthos - Archeion"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/6.x - Endwalker/Labyrinthos/838_Meryall Agronomics_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 956,
"AetheryteShortcut": "Labyrinthos - Archeion",
"InteractionType": "None",
"AetheryteShortcut": "Labyrinthos - Archeion"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/6.x - Endwalker/Mare Lamentorum/821_The Crushing Brand_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 959,
"AetheryteShortcut": "Mare Lamentorum - Sinus Lacrimarum",
"InteractionType": "None",
"AetheryteShortcut": "Mare Lamentorum - Sinus Lacrimarum"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/6.x - Endwalker/Mare Lamentorum/902_Heimdall's Last Sight_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 959,
"AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
"InteractionType": "None",
"AetheryteShortcut": "Mare Lamentorum - Bestways Burrow"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/6.x - Endwalker/Thavnair/820_The Hamsa Hatchery_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 957,
"AetheryteShortcut": "Thavnair - Great Work",
"InteractionType": "None",
"AetheryteShortcut": "Thavnair - Great Work"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/6.x - Endwalker/Thavnair/840_Giantsgall Grounds_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 957,
"AetheryteShortcut": "Thavnair - Great Work",
"InteractionType": "None",
"AetheryteShortcut": "Thavnair - Great Work"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/7.x - Dawntrail/Kozama'uka/946__BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1188,
"AetheryteShortcut": "Kozama'uka - Ok'hanu",
"InteractionType": "None",
"AetheryteShortcut": "Kozama'uka - Ok'hanu"
}
],
"FlyBetweenNodes": true,
"Groups": [
{

7
GatheringPaths/7.x - Dawntrail/Kozama'uka/976_Uyuyub'_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1188,
"AetheryteShortcut": "Kozama'uka - Ok'hanu",
"InteractionType": "None",
"AetheryteShortcut": "Kozama'uka - Ok'hanu"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/7.x - Dawntrail/Kozama'uka/986_Uyuyub'_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1188,
"AetheryteShortcut": "Kozama'uka - Ok'hanu",
"InteractionType": "None",
"AetheryteShortcut": "Kozama'uka - Ok'hanu"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/7.x - Dawntrail/Shaaloani/978_Pyariyoanaan Plain_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1190,
"AetheryteShortcut": "Shaaloani - Mehwahhetsoan",
"InteractionType": "None",
"AetheryteShortcut": "Shaaloani - Mehwahhetsoan"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/7.x - Dawntrail/Shaaloani/999_Yawtanane Grasslands_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1190,
"AetheryteShortcut": "Shaaloani - Hhusatahwi",
"InteractionType": "None",
"AetheryteShortcut": "Shaaloani - Hhusatahwi"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/7.x - Dawntrail/Urqopacha/961__MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1187,
"AetheryteShortcut": "Urqopacha - Wachunpelo",
"InteractionType": "None",
"AetheryteShortcut": "Urqopacha - Wachunpelo"
}
],
"FlyBetweenNodes": false,
"Groups": [
{

7
GatheringPaths/7.x - Dawntrail/Urqopacha/974_Chabameki_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1187,
"AetheryteShortcut": "Urqopacha - Wachunpelo",
"InteractionType": "None",
"AetheryteShortcut": "Urqopacha - Wachunpelo"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/7.x - Dawntrail/Urqopacha/975_Sorrow_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1187,
"AetheryteShortcut": "Urqopacha - Worlar's Echo",
"InteractionType": "None",
"AetheryteShortcut": "Urqopacha - Worlar's Echo"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/7.x - Dawntrail/Urqopacha/992_Chabameki_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1187,
"AetheryteShortcut": "Urqopacha - Wachunpelo",
"InteractionType": "None",
"AetheryteShortcut": "Urqopacha - Wachunpelo"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/7.x - Dawntrail/Urqopacha/993_Chabayuqeq_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1187,
"AetheryteShortcut": "Urqopacha - Wachunpelo",
"InteractionType": "None",
"AetheryteShortcut": "Urqopacha - Wachunpelo"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/7.x - Dawntrail/Urqopacha/994_Larh Tortoh_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1187,
"AetheryteShortcut": "Urqopacha - Worlar's Echo",
"InteractionType": "None",
"AetheryteShortcut": "Urqopacha - Worlar's Echo"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/7.x - Dawntrail/Yak T'el/1000_The Xobr'it Cinderfield_BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1189,
"AetheryteShortcut": "Yak T'el - Iq Br'aax",
"InteractionType": "None",
"AetheryteShortcut": "Yak T'el - Iq Br'aax"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/7.x - Dawntrail/Yak T'el/955__BTN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1189,
"AetheryteShortcut": "Yak T'el - Iq Br'aax",
"InteractionType": "None",
"AetheryteShortcut": "Yak T'el - Iq Br'aax"
}
],
"FlyBetweenNodes": true,
"Groups": [
{

7
GatheringPaths/7.x - Dawntrail/Yak T'el/970__MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1189,
"AetheryteShortcut": "Yak T'el - Mamook",
"InteractionType": "None",
"AetheryteShortcut": "Yak T'el - Mamook"
}
],
"Groups": [
{
"Nodes": [

7
GatheringPaths/7.x - Dawntrail/Yak T'el/979_The Ut'ohmu Horizon_MIN.json
View File

@ -1,8 +1,13 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "liza",
"Steps": [
{
"TerritoryId": 1189,
"AetheryteShortcut": "Yak T'el - Iq Br'aax",
"InteractionType": "None",
"AetheryteShortcut": "Yak T'el - Iq Br'aax"
}
],
"Groups": [
{
"Nodes": [

44
GatheringPaths/gatheringlocation-v1.json
View File

@ -19,20 +19,12 @@
"type": "string"
}
},
"TerritoryId": {
"type": "number"
},
"AetheryteShortcut": {
"$ref": "https://git.carvel.li/liza/Questionable/raw/branch/master/Questionable.Model/common-schema.json#/$defs/Aetheryte"
},
"AethernetShortcut": {
"Steps": {
"type": "array",
"description": "A pair of aethernet locations (from + to) to use as a shortcut",
"minItems": 2,
"maxItems": 2,
"items": {
"$ref": "https://git.carvel.li/liza/Questionable/raw/branch/master/Questionable.Model/common-schema.json#/$defs/AethernetShard"
}
"$ref": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json#/$defs/Step"
},
"minItems": 1
},
"FlyBetweenNodes": {
"description": "If nodes are close enough together, flying makes no sense due to the pathfinding overhead",
@ -63,7 +55,7 @@
"type": "object",
"properties": {
"Position": {
"$ref": "#/$defs/Vector3"
"$ref": "https://git.carvel.li/liza/Questionable/raw/branch/master/Questionable.Model/common-schema.json#/$defs/Vector3"
},
"MinimumAngle": {
"type": "number",
@ -108,30 +100,8 @@
"required": [
"$schema",
"Author",
"TerritoryId",
"Steps",
"Groups"
],
"additionalProperties": false,
"$defs": {
"Vector3": {
"type": "object",
"description": "Position to (typically) walk to",
"properties": {
"X": {
"type": "number"
},
"Y": {
"type": "number"
},
"Z": {
"type": "number"
}
},
"required": [
"X",
"Y",
"Z"
]
}
}
"additionalProperties": false
}

8
QuestPathGenerator/GatheringSourceGenerator.cs
View File

@ -152,13 +152,7 @@ public class GatheringSourceGenerator : ISourceGenerator
SeparatedList<ExpressionSyntax>(
SyntaxNodeList(
AssignmentList(nameof(GatheringRoot.Author), root.Author).AsSyntaxNodeOrToken(),
Assignment(nameof(GatheringRoot.TerritoryId), root.TerritoryId, emptyRoot.TerritoryId)
.AsSyntaxNodeOrToken(),
Assignment(nameof(GatheringRoot.AetheryteShortcut), root.AetheryteShortcut,
emptyRoot.AetheryteShortcut)
.AsSyntaxNodeOrToken(),
Assignment(nameof(GatheringRoot.AethernetShortcut), root.AethernetShortcut,
emptyRoot.AethernetShortcut)
AssignmentList(nameof(GatheringRoot.Steps), root.Steps)
.AsSyntaxNodeOrToken(),
Assignment(nameof(GatheringRoot.FlyBetweenNodes), root.FlyBetweenNodes,
emptyRoot.FlyBetweenNodes)

24
QuestPaths/5.x - Shadowbringers/Custom Deliveries/Charlemend/S7_Charlemend.json
View File

@ -5,6 +5,25 @@
{
"Sequence": 0,
"Steps": [
{
"TerritoryId": 886,
"InteractionType": "None",
"AetheryteShortcut": "Ishgard",
"AethernetShortcut": [
"[Ishgard] Aetheryte Plaza",
"[Ishgard] Firmament"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InTerritory": [
886
]
},
"AethernetShortcutIf": {
"InSameTerritory": true
}
}
},
{
"DataId": 1035211,
"Position": {
@ -14,10 +33,9 @@
},
"TerritoryId": 886,
"InteractionType": "Interact",
"AetheryteShortcut": "Ishgard",
"AethernetShortcut": [
"[Ishgard] Aetheryte Plaza",
"[Ishgard] Firmament"
"[Firmament] The Mendicant's Court",
"[Firmament] Western Risensong Quarter"
],
"DialogueChoices": [
{

24
QuestPaths/5.x - Shadowbringers/Custom Deliveries/Ehll Tou/S6_Ehll Tou.json
View File

@ -5,6 +5,25 @@
{
"Sequence": 0,
"Steps": [
{
"TerritoryId": 886,
"InteractionType": "None",
"AetheryteShortcut": "Ishgard",
"AethernetShortcut": [
"[Ishgard] Aetheryte Plaza",
"[Ishgard] Firmament"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InTerritory": [
886
]
},
"AethernetShortcutIf": {
"InSameTerritory": true
}
}
},
{
"DataId": 1033543,
"Position": {
@ -14,10 +33,9 @@
},
"TerritoryId": 886,
"InteractionType": "Interact",
"AetheryteShortcut": "Ishgard",
"AethernetShortcut": [
"[Ishgard] Aetheryte Plaza",
"[Ishgard] Firmament"
"[Firmament] The Mendicant's Court",
"[Firmament] The Mattock"
],
"DialogueChoices": [
{

39
QuestPaths/quest-v1.json
View File

@ -48,6 +48,28 @@
"Steps": {
"type": "array",
"items": {
"$ref": "#/$defs/Step"
}
},
"Comment": {
"type": "string"
}
},
"required": [
"Sequence"
],
"additionalProperties": false
}
}
},
"required": [
"$schema",
"QuestSequence",
"Author"
],
"additionalProperties": false,
"$defs": {
"Step": {
"type": "object",
"properties": {
"DataId": {
@ -1083,22 +1105,5 @@
]
}
}
},
"Comment": {
"type": "string"
}
},
"required": [
"Sequence"
],
"additionalProperties": false
}
}
},
"required": [
"$schema",
"QuestSequence",
"Author"
],
"additionalProperties": false
}

23
Questionable.Model/Common/EAetheryteLocation.cs
View File

@ -87,6 +87,15 @@ public enum EAetheryteLocation
IshgardGatesOfJudgement = 88,
IshgardFirmament = 100001,
FirmamentMendicantsCourt = 2011373,
FirmamentMattock = 2011374,
FirmamentNewNest = 2011384,
FirmanentSaintRoellesDais = 2011385,
FirmamentFeatherfall = 2011386,
FirmamentHoarfrostHall = 2011387,
FirmamentWesternRisensongQuarter = 2011388,
FIrmamentEasternRisensongQuarter = 2011389,
Idyllshire = 75,
IdyllshireWest = 90,
IdyllshirePrologueGate = 91,
@ -251,3 +260,17 @@ public enum EAetheryteLocation
LivingMemoryLeynodePyro = 214,
LivingMemoryLeynodeAero = 215,
}
public static class EAetheryteLocationExtensions
{
public static bool IsFirmamentAetheryte(this EAetheryteLocation aetheryteLocation) =>
aetheryteLocation is EAetheryteLocation.IshgardFirmament
or EAetheryteLocation.FirmamentMendicantsCourt
or EAetheryteLocation.FirmamentMattock
or EAetheryteLocation.FirmamentNewNest
or EAetheryteLocation.FirmanentSaintRoellesDais
or EAetheryteLocation.FirmamentFeatherfall
or EAetheryteLocation.FirmamentHoarfrostHall
or EAetheryteLocation.FirmamentWesternRisensongQuarter
or EAetheryteLocation.FIrmamentEasternRisensongQuarter;
}

7
Questionable.Model/Gathering/GatheringRoot.cs
View File

@ -2,6 +2,7 @@
using System.Text.Json.Serialization;
using Questionable.Model.Common;
using Questionable.Model.Common.Converter;
using Questionable.Model.Questing;
using Questionable.Model.Questing.Converter;
namespace Questionable.Model.Gathering;
@ -10,12 +11,8 @@ public sealed class GatheringRoot
{
[JsonConverter(typeof(StringListOrValueConverter))]
public List<string> Author { get; set; } = [];
public ushort TerritoryId { get; set; }
[JsonConverter(typeof(AetheryteConverter))]
public EAetheryteLocation? AetheryteShortcut { get; set; }
public AethernetShortcut? AethernetShortcut { get; set; }
public List<QuestStep> Steps { get; set; } = [];
public bool? FlyBetweenNodes { get; set; }
public List<GatheringNodeGroup> Groups { get; set; } = [];
}

9
Questionable.Model/Questing/Converter/AethernetShardConverter.cs
View File

@ -58,6 +58,15 @@ public sealed class AethernetShardConverter() : EnumConverter<EAetheryteLocation
{ EAetheryteLocation.IshgardGatesOfJudgement, "[Ishgard] The Gates of Judgement (Coerthas Central Highlands)" },
{ EAetheryteLocation.IshgardFirmament, "[Ishgard] Firmament" },
{ EAetheryteLocation.FirmamentMendicantsCourt, "[Firmament] The Mendicant's Court" },
{ EAetheryteLocation.FirmamentMattock, "[Firmament] The Mattock" },
{ EAetheryteLocation.FirmamentNewNest, "[Firmament] The New Nest" },
{ EAetheryteLocation.FirmanentSaintRoellesDais, "[Firmament] Saint Roelle's Dais" },
{ EAetheryteLocation.FirmamentFeatherfall, "[Firmament] Featherfall" },
{ EAetheryteLocation.FirmamentHoarfrostHall, "[Firmament] Hoarfrost Hall" },
{ EAetheryteLocation.FirmamentWesternRisensongQuarter, "[Firmament] Western Risensong Quarter" },
{ EAetheryteLocation.FIrmamentEasternRisensongQuarter, "[Firmament] Eastern Risensong Quarter" },
{ EAetheryteLocation.Idyllshire, "[Idyllshire] Aetheryte Plaza" },
{ EAetheryteLocation.IdyllshireWest, "[Idyllshire] West Idyllshire" },
{ EAetheryteLocation.IdyllshirePrologueGate, "[Idyllshire] Prologue Gate (Western Hinterlands)" },

8
Questionable.Model/common-schema.json
View File

@ -182,6 +182,14 @@
"[Ishgard] The Last Vigil",
"[Ishgard] The Gates of Judgement (Coerthas Central Highlands)",
"[Ishgard] Firmament",
"[Firmament] The Mendicant's Court",
"[Firmament] The Mattock",
"[Firmament] The New Nest",
"[Firmament] Saint Roelle's Dais",
"[Firmament] Featherfall",
"[Firmament] Hoarfrost Hall",
"[Firmament] Western Risensong Quarter",
"[Firmament] Eastern Risensong Quarter",
"[Idyllshire] Aetheryte Plaza",
"[Idyllshire] West Idyllshire",
"[Idyllshire] Prologue Gate (Western Hinterlands)",

44
Questionable/Controller/GameUiController.cs
View File

@ -20,7 +20,9 @@ using Questionable.Controller.Steps.Interactions;
using Questionable.Data;
using Questionable.Functions;
using Questionable.Model;
using Questionable.Model.Common;
using Questionable.Model.Questing;
using AethernetShortcut = Questionable.Controller.Steps.Shared.AethernetShortcut;
using Quest = Questionable.Model.Quest;
using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType;
@ -88,6 +90,7 @@ internal sealed class GameUiController : IDisposable
_addonLifecycle.RegisterListener(AddonEvent.PostSetup, "HousingSelectBlock", HousingSelectBlockPostSetup);
_addonLifecycle.RegisterListener(AddonEvent.PostSetup, "JournalResult", JournalResultPostSetup);
_addonLifecycle.RegisterListener(AddonEvent.PostSetup, "GuildLeve", GuildLevePostSetup);
_addonLifecycle.RegisterListener(AddonEvent.PostSetup, "TelepotTown", TeleportTownPostSetup);
}
private bool ShouldHandleUiInteractions => _isInitialCheck || _questController.IsRunning;
@ -916,6 +919,46 @@ internal sealed class GameUiController : IDisposable
addon->Close(true);
}
private void TeleportTownPostSetup(AddonEvent type, AddonArgs args)
{
if (ShouldHandleUiInteractions &&
_questController.HasCurrentTaskMatching(out AethernetShortcut.UseAethernetShortcut? aethernetShortcut) &&
aethernetShortcut.From.IsFirmamentAetheryte())
{
// this might be better via atkvalues; but this works for now
uint toIndex = aethernetShortcut.To switch
{
EAetheryteLocation.FirmamentMendicantsCourt => 0,
EAetheryteLocation.FirmamentMattock => 1,
EAetheryteLocation.FirmamentNewNest => 2,
EAetheryteLocation.FirmanentSaintRoellesDais => 3,
EAetheryteLocation.FirmamentFeatherfall => 4,
EAetheryteLocation.FirmamentHoarfrostHall => 5,
EAetheryteLocation.FirmamentWesternRisensongQuarter => 6,
EAetheryteLocation.FIrmamentEasternRisensongQuarter => 7,
_ => uint.MaxValue,
};
if (toIndex == uint.MaxValue)
return;
_logger.LogInformation("Teleporting to {ToName} with menu index {ToIndex}", aethernetShortcut.From,
toIndex);
unsafe
{
var teleportToDestination = stackalloc AtkValue[]
{
new() { Type = ValueType.Int, Int = 11 },
new() { Type = ValueType.UInt, UInt = toIndex }
};
var addon = (AtkUnitBase*)args.Addon;
addon->FireCallback(2, teleportToDestination);
addon->FireCallback(2, teleportToDestination, true);
}
}
}
private StringOrRegex? ResolveReference(Quest? quest, string? excelSheet, ExcelRef? excelRef, bool isRegExp)
{
if (excelRef == null)
@ -933,6 +976,7 @@ internal sealed class GameUiController : IDisposable
public void Dispose()
{
_addonLifecycle.UnregisterListener(AddonEvent.PostSetup, "TelepotTown", TeleportTownPostSetup);
_addonLifecycle.UnregisterListener(AddonEvent.PostSetup, "GuildLeve", GuildLevePostSetup);
_addonLifecycle.UnregisterListener(AddonEvent.PostSetup, "JournalResult", JournalResultPostSetup);
_addonLifecycle.UnregisterListener(AddonEvent.PostSetup, "HousingSelectBlock", HousingSelectBlockPostSetup);

9
Questionable/Controller/GatheringController.cs
View File

@ -151,11 +151,12 @@ internal sealed unsafe class GatheringController : MiniTaskController<GatheringC
if (currentNode == null)
return;
ushort territoryId = _currentRequest.Root.Steps.Last().TerritoryId;
_taskQueue.Enqueue(_serviceProvider.GetRequiredService<MountTask>()
.With(_currentRequest.Root.TerritoryId, MountTask.EMountIf.Always));
.With(territoryId, MountTask.EMountIf.Always));
bool fly = currentNode.Fly.GetValueOrDefault(_currentRequest.Root.FlyBetweenNodes.GetValueOrDefault(true)) &&
_gameFunctions.IsFlyingUnlocked(_currentRequest.Root.TerritoryId);
_gameFunctions.IsFlyingUnlocked(territoryId);
if (currentNode.Locations.Count > 1)
{
Vector3 averagePosition = new Vector3
@ -170,12 +171,12 @@ internal sealed unsafe class GatheringController : MiniTaskController<GatheringC
pointOnFloor = pointOnFloor.Value with { Y = pointOnFloor.Value.Y + (fly ? 3f : 0f) };
_taskQueue.Enqueue(_serviceProvider.GetRequiredService<Move.MoveInternal>()
.With(_currentRequest.Root.TerritoryId, pointOnFloor ?? averagePosition, 50f, fly: fly,
.With(territoryId, pointOnFloor ?? averagePosition, 50f, fly: fly,
ignoreDistanceToObject: true));
}
_taskQueue.Enqueue(_serviceProvider.GetRequiredService<MoveToLandingLocation>()
.With(_currentRequest.Root.TerritoryId, fly, currentNode));
.With(territoryId, fly, currentNode));
_taskQueue.Enqueue(_serviceProvider.GetRequiredService<Interact.DoInteract>()
.With(currentNode.DataId, null, EInteractionType.InternalGather, true));

35
Questionable/Controller/QuestController.cs
View File

@ -35,7 +35,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>, IDi
private readonly IToastGui _toastGui;
private readonly Configuration _configuration;
private readonly YesAlreadyIpc _yesAlreadyIpc;
private readonly IReadOnlyList<ITaskFactory> _taskFactories;
private readonly TaskCreator _taskCreator;
private readonly object _progressLock = new();
@ -73,7 +73,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>, IDi
IToastGui toastGui,
Configuration configuration,
YesAlreadyIpc yesAlreadyIpc,
IEnumerable<ITaskFactory> taskFactories)
TaskCreator taskCreator)
: base(chatGui, logger)
{
_clientState = clientState;
@ -88,7 +88,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>, IDi
_toastGui = toastGui;
_configuration = configuration;
_yesAlreadyIpc = yesAlreadyIpc;
_taskFactories = taskFactories.ToList().AsReadOnly();
_taskCreator = taskCreator;
_condition.ConditionChange += OnConditionChange;
_toastGui.Toast += OnNormalToast;
@ -607,34 +607,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>, IDi
try
{
var newTasks = _taskFactories
.SelectMany(x =>
{
IList<ITask> tasks = x.CreateAllTasks(CurrentQuest.Quest, seq, step).ToList();
if (tasks.Count > 0 && _logger.IsEnabled(LogLevel.Trace))
{
string factoryName = x.GetType().FullName ?? x.GetType().Name;
if (factoryName.Contains('.', StringComparison.Ordinal))
factoryName = factoryName[(factoryName.LastIndexOf('.') + 1)..];
_logger.LogTrace("Factory {FactoryName} created Task {TaskNames}",
factoryName, string.Join(", ", tasks.Select(y => y.ToString())));
}
return tasks;
})
.ToList();
if (newTasks.Count == 0)
{
_logger.LogInformation("Nothing to execute for step?");
return;
}
_logger.LogInformation("Tasks for {QuestId}, {Sequence}, {Step}: {Tasks}",
CurrentQuest.Quest.Id, seq.Sequence, seq.Steps.IndexOf(step),
string.Join(", ", newTasks.Select(x => x.ToString())));
foreach (var task in newTasks)
foreach (var task in _taskCreator.CreateTasks(CurrentQuest.Quest, seq, step))
_taskQueue.Enqueue(task);
}
catch (Exception e)

40
Questionable/Controller/Steps/Shared/AethernetShortcut.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using Dalamud.Game.ClientState.Conditions;
using Dalamud.Game.ClientState.Objects.Enums;
using Dalamud.Plugin.Services;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
@ -102,12 +103,9 @@ internal static class AethernetShortcut
if (aetheryteData.CalculateDistance(playerPosition, territoryType, From) <
aetheryteData.CalculateDistance(playerPosition, territoryType, To))
{
if (aetheryteData.CalculateDistance(playerPosition, territoryType, From) < 11)
if (aetheryteData.CalculateDistance(playerPosition, territoryType, From) < (From.IsFirmamentAetheryte() ? 11f : 4f))
{
logger.LogInformation("Using lifestream to teleport to {Destination}", To);
lifestreamIpc.Teleport(To);
_teleported = true;
DoTeleport();
return true;
}
else if (From == EAetheryteLocation.SolutionNine)
@ -141,7 +139,7 @@ internal static class AethernetShortcut
}
}
MoveTo(From);
MoveTo();
return true;
}
}
@ -154,13 +152,32 @@ internal static class AethernetShortcut
return false;
}
private void MoveTo(EAetheryteLocation from)
private void MoveTo()
{
logger.LogInformation("Moving to aethernet shortcut");
_moving = true;
movementController.NavigateTo(EMovementType.Quest, (uint)From, aetheryteData.Locations[From],
false, true,
AetheryteConverter.IsLargeAetheryte(From) ? 10.9f : 6.9f);
From.IsFirmamentAetheryte()
? 4.4f
: AetheryteConverter.IsLargeAetheryte(From)
? 10.9f
: 6.9f);
}
private void DoTeleport()
{
if (From.IsFirmamentAetheryte())
{
logger.LogInformation("Using manual teleport interaction");
_teleported = gameFunctions.InteractWith((uint)From, ObjectKind.EventObj);
}
else
{
logger.LogInformation("Using lifestream to teleport to {Destination}", To);
lifestreamIpc.Teleport(To);
_teleported = true;
}
}
public ETaskResult Update()
@ -173,7 +190,7 @@ internal static class AethernetShortcut
if (condition[ConditionFlag.Mounted])
{
_triedMounting = false;
MoveTo(From);
MoveTo();
return ETaskResult.StillRunning;
}
else
@ -194,10 +211,7 @@ internal static class AethernetShortcut
if (!_teleported)
{
logger.LogInformation("Using lifestream to teleport to {Destination}", To);
lifestreamIpc.Teleport(To);
_teleported = true;
DoTeleport();
return ETaskResult.StillRunning;
}

36
Questionable/Controller/Steps/Shared/GatheringRequiredItems.cs
View File

@ -1,13 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Dalamud.Game.Text;
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Client.Game;
using LLib.GameData;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Questionable.Controller.Steps.Common;
using Questionable.Data;
using Questionable.GatheringPaths;
using Questionable.Model;
using Questionable.Model.Gathering;
using Questionable.Model.Questing;
@ -23,7 +24,7 @@ internal static class GatheringRequiredItems
IClientState clientState,
GatheringData gatheringData,
TerritoryData territoryData,
AetheryteData aetheryteData) : ITaskFactory
ILogger<Factory> logger) : ITaskFactory
{
public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, QuestStep step)
{
@ -50,24 +51,25 @@ internal static class GatheringRequiredItems
if (HasRequiredItems(requiredGatheredItems))
continue;
if (gatheringRoot.AetheryteShortcut != null && clientState.TerritoryType != gatheringRoot.TerritoryId)
using (var _ = logger.BeginScope("Gathering(inner)"))
{
ushort expectedTerritoryId = gatheringRoot.TerritoryId;
if (gatheringRoot.AethernetShortcut != null)
expectedTerritoryId = aetheryteData.TerritoryIds[gatheringRoot.AethernetShortcut.From];
yield return serviceProvider.GetRequiredService<AetheryteShortcut.UseAetheryteShortcut>()
.With(null, gatheringRoot.AetheryteShortcut.Value, expectedTerritoryId);
QuestSequence gatheringSequence = new QuestSequence
{
Sequence = 0,
Steps = gatheringRoot.Steps
};
foreach (var gatheringStep in gatheringSequence.Steps)
{
foreach (var task in serviceProvider.GetRequiredService<TaskCreator>()
.CreateTasks(quest, gatheringSequence, gatheringStep))
if (task is not WaitAtEnd.NextStep)
yield return task;
}
}
if (gatheringRoot.AethernetShortcut != null)
{
yield return serviceProvider.GetRequiredService<AethernetShortcut.UseAethernetShortcut>()
.With(gatheringRoot.AethernetShortcut.From, gatheringRoot.AethernetShortcut.To);
}
yield return new WaitConditionTask(() => clientState.TerritoryType == gatheringRoot.TerritoryId,
$"Wait(territory: {territoryData.GetNameAndId(gatheringRoot.TerritoryId)})");
ushort territoryId = gatheringRoot.Steps.Last().TerritoryId;
yield return new WaitConditionTask(() => clientState.TerritoryType == territoryId,
$"Wait(territory: {territoryData.GetNameAndId(territoryId)})");
yield return new WaitConditionTask(() => movementController.IsNavmeshReady,
"Wait(navmesh ready)");

52
Questionable/Controller/Steps/TaskCreator.cs Normal file
View File

@ -0,0 +1,52 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.Extensions.Logging;
using Questionable.Model;
using Questionable.Model.Questing;
namespace Questionable.Controller.Steps;
internal sealed class TaskCreator
{
private readonly IReadOnlyList<ITaskFactory> _taskFactories;
private readonly ILogger<TaskCreator> _logger;
public TaskCreator(IEnumerable<ITaskFactory> taskFactories, ILogger<TaskCreator> logger)
{
_taskFactories = taskFactories.ToList().AsReadOnly();
_logger = logger;
}
public IReadOnlyList<ITask> CreateTasks(Quest quest, QuestSequence sequence, QuestStep step)
{
var newTasks = _taskFactories
.SelectMany(x =>
{
IList<ITask> tasks = x.CreateAllTasks(quest, sequence, step).ToList();
if (tasks.Count > 0 && _logger.IsEnabled(LogLevel.Trace))
{
string factoryName = x.GetType().FullName ?? x.GetType().Name;
if (factoryName.Contains('.', StringComparison.Ordinal))
factoryName = factoryName[(factoryName.LastIndexOf('.') + 1)..];
_logger.LogTrace("Factory {FactoryName} created Task {TaskNames}",
factoryName, string.Join(", ", tasks.Select(y => y.ToString())));
}
return tasks;
})
.ToList();
if (newTasks.Count == 0)
_logger.LogInformation("Nothing to execute for step?");
else
{
_logger.LogInformation("Tasks for {QuestId}, {Sequence}, {Step}: {Tasks}",
quest.Id, sequence.Sequence, sequence.Steps.IndexOf(step),
string.Join(", ", newTasks.Select(x => x.ToString())));
}
return newTasks;
}
}

45
Questionable/Data/AetheryteData.cs
View File

@ -3,6 +3,7 @@ using System.Collections.ObjectModel;
using System.Linq;
using System.Numerics;
using Dalamud.Plugin.Services;
using Dalamud.Utility;
using Lumina.Excel.GeneratedSheets;
using Questionable.Model.Common;
@ -14,7 +15,25 @@ internal sealed class AetheryteData
{
Dictionary<EAetheryteLocation, string> aethernetNames = new();
Dictionary<EAetheryteLocation, ushort> territoryIds = new();
Dictionary<EAetheryteLocation, byte> aethernetGroups = new();
Dictionary<EAetheryteLocation, ushort> aethernetGroups = new();
void ConfigureAetheryte(EAetheryteLocation aetheryteLocation, string name, ushort territoryId,
ushort aethernetGroup)
{
aethernetNames[aetheryteLocation] = name;
territoryIds[aetheryteLocation] = territoryId;
aethernetGroups[aetheryteLocation] = aethernetGroup;
}
void ConfigureAetheryteWithPlaceName(EAetheryteLocation aetheryteLocation, uint placeNameId, ushort territoryId)
{
ConfigureAetheryte(aetheryteLocation,
dataManager.GetExcelSheet<PlaceName>()!.GetRow(placeNameId)!.Name.ToDalamudString().TextValue,
territoryId,
(ushort)((int)aetheryteLocation / 100));
}
foreach (var aetheryte in dataManager.GetExcelSheet<Aetheryte>()!.Where(x => x.RowId > 0))
{
string? aethernetName = aetheryte.AethernetName?.Value?.Name.ToString();
@ -28,9 +47,16 @@ internal sealed class AetheryteData
aethernetGroups[(EAetheryteLocation)aetheryte.RowId] = aetheryte.AethernetGroup;
}
aethernetNames[EAetheryteLocation.IshgardFirmament] = "Firmament";
territoryIds[EAetheryteLocation.IshgardFirmament] = 886;
aethernetGroups[EAetheryteLocation.IshgardFirmament] = aethernetGroups[EAetheryteLocation.Ishgard];
ConfigureAetheryte(EAetheryteLocation.IshgardFirmament, "Firmament", 886,
aethernetGroups[EAetheryteLocation.Ishgard]);
ConfigureAetheryteWithPlaceName(EAetheryteLocation.FirmamentMendicantsCourt, 3436, 886);
ConfigureAetheryteWithPlaceName(EAetheryteLocation.FirmamentMattock, 3473, 886);
ConfigureAetheryteWithPlaceName(EAetheryteLocation.FirmamentNewNest, 3475, 886);
ConfigureAetheryteWithPlaceName(EAetheryteLocation.FirmanentSaintRoellesDais, 3474, 886);
ConfigureAetheryteWithPlaceName(EAetheryteLocation.FirmamentFeatherfall, 3525, 886);
ConfigureAetheryteWithPlaceName(EAetheryteLocation.FirmamentHoarfrostHall, 3528, 886);
ConfigureAetheryteWithPlaceName(EAetheryteLocation.FirmamentWesternRisensongQuarter, 3646, 886);
ConfigureAetheryteWithPlaceName(EAetheryteLocation.FIrmamentEasternRisensongQuarter, 3645, 886);
AethernetNames = aethernetNames.AsReadOnly();
TerritoryIds = territoryIds.AsReadOnly();
@ -207,6 +233,15 @@ internal sealed class AetheryteData
{ EAetheryteLocation.RadzAtHanKama, new(129.59485f, 26.993164f, 13.473633f) },
{ EAetheryteLocation.RadzAtHanHighCrucible, new(57.90796f, -24.704407f, -210.6203f) },
{ EAetheryteLocation.FirmamentMendicantsCourt, new(23.941406f, -16.006714f, 169.35986f) },
{ EAetheryteLocation.FirmamentMattock, new(76.035645f, -18.509216f, 10.299805f) },
{ EAetheryteLocation.FirmamentNewNest, new(149.49255f, -50.003845f, 98.55798f) },
{ EAetheryteLocation.FirmanentSaintRoellesDais, new(207.75159f, -40.024475f, -25.589417f) },
{ EAetheryteLocation.FirmamentFeatherfall, new(-78.78235f, -0.015319824f, 75.97461f) },
{ EAetheryteLocation.FirmamentHoarfrostHall, new(-132.55518f, 9.964111f, -14.66394f) },
{ EAetheryteLocation.FirmamentWesternRisensongQuarter, new(-91.722046f, -0.015319824f, -115.19043f) },
{ EAetheryteLocation.FIrmamentEasternRisensongQuarter, new(114.3053f, -20.004639f, -107.43884f) },
{ EAetheryteLocation.LabyrinthosArcheion, new(443.5338f, 170.6416f, -476.18835f) },
{ EAetheryteLocation.LabyrinthosSharlayanHamlet, new(8.377136f, -27.542603f, -46.67737f) },
{ EAetheryteLocation.LabyrinthosAporia, new(-729.18286f, -27.634155f, 302.1438f) },
@ -276,7 +311,7 @@ internal sealed class AetheryteData
public ReadOnlyDictionary<EAetheryteLocation, string> AethernetNames { get; }
public ReadOnlyDictionary<EAetheryteLocation, ushort> TerritoryIds { get; }
public ReadOnlyDictionary<EAetheryteLocation, byte> AethernetGroups { get; }
public ReadOnlyDictionary<EAetheryteLocation, ushort> AethernetGroups { get; }
public IReadOnlyList<ushort> TownTerritoryIds { get; set; }
public float CalculateDistance(Vector3 fromPosition, ushort fromTerritoryType, EAetheryteLocation to)

2
Questionable/Functions/AetheryteFunctions.cs
View File

@ -41,7 +41,7 @@ internal sealed unsafe class AetheryteFunctions
public bool IsAetheryteUnlocked(EAetheryteLocation aetheryteLocation)
{
if (aetheryteLocation == EAetheryteLocation.IshgardFirmament)
if (aetheryteLocation.IsFirmamentAetheryte())
return _serviceProvider.GetRequiredService<QuestFunctions>().IsQuestComplete(new QuestId(3672));
return IsAetheryteUnlocked((uint)aetheryteLocation, out _);
}

2
Questionable/QuestionablePlugin.cs
View File

@ -171,6 +171,8 @@ public sealed class QuestionablePlugin : IDalamudPlugin
WaitAtEnd.WaitObjectAtPosition>();
serviceCollection.AddTransient<WaitAtEnd.WaitQuestAccepted>();
serviceCollection.AddTransient<WaitAtEnd.WaitQuestCompleted>();
serviceCollection.AddSingleton<TaskCreator>();
}
private static void AddControllers(ServiceCollection serviceCollection)

4
Questionable/Validation/Validators/AethernetShortcutValidator.cs
View File

@ -29,8 +29,8 @@ internal sealed class AethernetShortcutValidator : IQuestValidator
if (aethernetShortcut == null)
return null;
byte fromGroup = _aetheryteData.AethernetGroups.GetValueOrDefault(aethernetShortcut.From);
byte toGroup = _aetheryteData.AethernetGroups.GetValueOrDefault(aethernetShortcut.To);
ushort fromGroup = _aetheryteData.AethernetGroups.GetValueOrDefault(aethernetShortcut.From);
ushort toGroup = _aetheryteData.AethernetGroups.GetValueOrDefault(aethernetShortcut.To);
if (fromGroup != toGroup)
{
return new ValidationIssue