Compare commits

..

15 Commits

Author SHA1 Message Date
FalconTaterz
36126c5bdc Finish ARR Hildibrand quest paths 2024-08-28 10:29:04 -05:00
FalconTaterz
da332f503c Add Hildibrand quest paths up to 8-armed 2024-08-28 10:29:04 -05:00
33774df23b
Daily quest updates 2024-08-28 11:48:40 +02:00
916082ef35
Add Rising dialogue/NextQuestId 2024-08-28 11:26:21 +02:00
218dbd8feb
Daily quest update 2024-08-27 23:40:50 +02:00
90b0467742
Minor gathering path adjustments 2024-08-27 22:52:15 +02:00
3d7b152cd1
Change some teleports in 'World of Wonders' 2024-08-27 22:45:43 +02:00
fe1d2d51db
Mark completed daily quests as unable to accept 2024-08-27 22:45:42 +02:00
95535d0ef2 Merge pull request '[EW][Allied Society][Omicrons] Added a few quests and related gathering paths' (#34) from plogon_enjoyer/Questionable:omicron into master
Reviewed-on: liza/Questionable#34
2024-08-27 20:45:08 +00:00
33726426df
Add Rising 2024 quests 2024-08-27 22:02:26 +02:00
0473c9b17c
Update code for updated dalamud 2024-08-27 22:00:34 +02:00
b9061b3190
Support 'ChatMessage' in CompleteQuest steps 2024-08-27 21:14:22 +02:00
Plogon Enjoyer
2f4313c9da Updated Omicron daily quest 'Guardians of the Galaxy' 2024-08-27 00:44:45 +08:00
Plogon Enjoyer
99499415db Updated Omicron daily quest 'I, Omicron' 2024-08-27 00:44:30 +08:00
Plogon Enjoyer
7fe85a49f2 Added Omicron story quest 'And Another Question'. Also added required gathering points. 2024-08-27 00:08:18 +08:00
29 changed files with 1231 additions and 61 deletions

View File

@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<Version>2.16</Version>
<Version>2.17</Version>
</PropertyGroup>
</Project>

View File

@ -0,0 +1,69 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "plogon_enjoyer",
"Steps": [
{
"TerritoryId": 960,
"InteractionType": "None",
"AetheryteShortcut": "Ultima Thule - Reah Tahra"
}
],
"Groups": [
{
"Nodes": [
{
"DataId": 34376,
"Locations": [
{
"Position": {
"X": -586.0029,
"Y": 84.39367,
"Z": 568.1448
},
"MinimumAngle": -60,
"MaximumAngle": 75,
"MinimumDistance": 1,
"MaximumDistance": 3
}
]
}
]
},
{
"Nodes": [
{
"DataId": 34377,
"Locations": [
{
"Position": {
"X": -578.2748,
"Y": 86.34826,
"Z": 567.2876
},
"MinimumAngle": -80,
"MaximumAngle": 60
}
]
}
]
},
{
"Nodes": [
{
"DataId": 34378,
"Locations": [
{
"Position": {
"X": -600.2446,
"Y": 86.01588,
"Z": 557.4477
},
"MinimumAngle": -35,
"MaximumAngle": 145
}
]
}
]
}
]
}

View File

@ -0,0 +1,67 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
"Author": "plogon_enjoyer",
"Steps": [
{
"TerritoryId": 960,
"InteractionType": "None",
"AetheryteShortcut": "Ultima Thule - Reah Tahra"
}
],
"Groups": [
{
"Nodes": [
{
"DataId": 34385,
"Locations": [
{
"Position": {
"X": 27.77994,
"Y": 73.57088,
"Z": 695.2364
},
"MinimumAngle": 0,
"MaximumAngle": 135
}
]
}
]
},
{
"Nodes": [
{
"DataId": 34386,
"Locations": [
{
"Position": {
"X": 23.20134,
"Y": 70.90392,
"Z": 698.6194
},
"MinimumAngle": -10,
"MaximumAngle": 145
}
]
}
]
},
{
"Nodes": [
{
"DataId": 34387,
"Locations": [
{
"Position": {
"X": 30.69294,
"Y": 75.43362,
"Z": 688.8371
},
"MinimumAngle": -5,
"MaximumAngle": 120
}
]
}
]
}
]
}

View File

@ -1,6 +1,9 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": ["liza", "JerryWester"],
"Author": [
"liza",
"JerryWester"
],
"QuestSequence": [
{
"Sequence": 0,
@ -95,14 +98,19 @@
"AethernetShard": "[Gold Saucer] Chocobo Square"
},
{
"TerritoryId": 144,
"InteractionType": "AttuneAetheryte",
"Aetheryte": "Gold Saucer",
"TerritoryId": 388,
"InteractionType": "None",
"AethernetShortcut": [
"[Gold Saucer] Chocobo Square",
"[Gold Saucer] Entrance & Card Squares"
]
},
{
"TerritoryId": 144,
"InteractionType": "AttuneAetheryte",
"Aetheryte": "Gold Saucer",
"DelaySecondsAtStart": 3
},
{
"DataId": 1011080,
"Position": {
@ -156,7 +164,8 @@
{
"TerritoryId": 144,
"InteractionType": "AttuneAethernetShard",
"AethernetShard": "[Gold Saucer] Event Square"
"AethernetShard": "[Gold Saucer] Event Square",
"DelaySecondsAtStart": 3
},
{
"Position": {
@ -198,6 +207,14 @@
{
"Sequence": 6,
"Steps": [
{
"TerritoryId": 144,
"InteractionType": "None",
"AethernetShortcut": [
"[Gold Saucer] Cactpot Board",
"[Gold Saucer] Aetheryte Plaza"
]
},
{
"DataId": 1011084,
"Position": {
@ -207,10 +224,7 @@
},
"TerritoryId": 144,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Gold Saucer] Cactpot Board",
"[Gold Saucer] Aetheryte Plaza"
]
"DelaySecondsAtStart": 3
}
]
},
@ -222,6 +236,14 @@
"InteractionType": "AttuneAethernetShard",
"AethernetShard": "[Gold Saucer] Round Square"
},
{
"TerritoryId": 144,
"InteractionType": "None",
"AethernetShortcut": [
"[Gold Saucer] Round Square",
"[Gold Saucer] Entrance & Card Squares"
]
},
{
"DataId": 1010448,
"Position": {
@ -232,10 +254,7 @@
"StopDistance": 5,
"TerritoryId": 144,
"InteractionType": "CompleteQuest",
"AethernetShortcut": [
"[Gold Saucer] Round Square",
"[Gold Saucer] Entrance & Card Squares"
]
"DelaySecondsAtStart": 3
}
]
}

View File

@ -1,7 +1,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"QuestSequence": [
{
"Sequence": 0,
@ -30,13 +29,28 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1034071,
"Position": {
"X": -171.4046,
"Y": 5.779212,
"Z": -110.27698
},
"TerritoryId": 813,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"TerritoryId": 813,
"InteractionType": "Craft",
"ItemId": 31179,
"ItemCount": 3
},
{
"Position": {
"X": -615.73865,

View File

@ -1,7 +1,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"QuestSequence": [
{
"Sequence": 0,
@ -18,6 +17,54 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1032830,
"Position": {
"X": -134.02002,
"Y": -18.460577,
"Z": 303.5476
},
"TerritoryId": 817,
"InteractionType": "Interact",
"AetheryteShortcut": "Rak'tika - Slitherbough"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1032831,
"Position": {
"X": -54.795166,
"Y": 0.7328947,
"Z": 217.09009
},
"TerritoryId": 817,
"InteractionType": "UseItem",
"ItemId": 2002980,
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1032830,
"Position": {
"X": -134.02002,
"Y": -18.460577,
"Z": 303.5476
},
"TerritoryId": 817,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
@ -30,12 +77,7 @@
"TerritoryId": 817,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Rak'tika - Fanow",
"Fly": true,
"RequiredGatheredItems": [
]
"Fly": true
},
{
"DataId": 1032643,

View File

@ -1,7 +1,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"QuestSequence": [
{
"Sequence": 0,
@ -32,9 +31,16 @@
"AetheryteShortcut": "Rak'tika - Fanow",
"Fly": true,
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 29535,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 29561,
"ItemCount": 3
}
]
},
{

View File

@ -1,7 +1,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"QuestSequence": [
{
"Sequence": 0,
@ -32,9 +31,16 @@
"AetheryteShortcut": "Rak'tika - Fanow",
"Fly": true,
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 29536,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 29562,
"ItemCount": 3
}
]
},
{

View File

@ -1,7 +1,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"QuestSequence": [
{
"Sequence": 0,
@ -30,11 +29,28 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044592,
"Position": {
"X": -493.40048,
"Y": -158.89024,
"Z": -384.29846
},
"TerritoryId": 959,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"TerritoryId": 959,
"InteractionType": "Craft",
"ItemId": 38879,
"ItemCount": 2
},
{
"Position": {
"X": -201.42024,
@ -42,7 +58,9 @@
"Z": -273.68756
},
"TerritoryId": 959,
"InteractionType": "WalkTo"
"InteractionType": "WalkTo",
"AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
"Fly": true
},
{
"DataId": 1044403,

View File

@ -1,7 +1,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"QuestSequence": [
{
"Sequence": 0,
@ -30,6 +29,38 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044412,
"Position": {
"X": -181.56714,
"Y": -49.19972,
"Z": -304.76843
},
"TerritoryId": 959,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"TerritoryId": 959,
"InteractionType": "Craft",
"ItemId": 38881,
"ItemCount": 1
},
{
"DataId": 1044602,
"Position": {
"X": 463.0349,
"Y": -167.81126,
"Z": -490.13504
},
"TerritoryId": 959,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
@ -42,7 +73,9 @@
"Z": -273.68756
},
"TerritoryId": 959,
"InteractionType": "WalkTo"
"InteractionType": "WalkTo",
"AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
"Fly": true
},
{
"DataId": 1044403,

View File

@ -1,7 +1,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"QuestSequence": [
{
"Sequence": 0,
@ -30,11 +29,29 @@
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044610,
"Position": {
"X": 588.281,
"Y": -161.13907,
"Z": -761.0742
},
"TerritoryId": 959,
"InteractionType": "Interact",
"AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"TerritoryId": 959,
"InteractionType": "Craft",
"ItemId": 38885,
"ItemCount": 1
},
{
"Position": {
"X": -201.42024,
@ -42,7 +59,9 @@
"Z": -273.68756
},
"TerritoryId": 959,
"InteractionType": "WalkTo"
"InteractionType": "WalkTo",
"AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
"Fly": true
},
{
"DataId": 1044403,

View File

@ -1,7 +1,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"QuestSequence": [
{
"Sequence": 0,
@ -21,6 +20,30 @@
{
"Sequence": 255,
"Steps": [
{
"DataId": 2013072,
"Position": {
"X": 456.65674,
"Y": 438.04077,
"Z": 310.2312
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 960,
"AetheryteShortcut": "Ultima Thule - Base Omicron",
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 38283,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 38307,
"ItemCount": 3
}
]
},
{
"DataId": 1043417,
"Position": {

View File

@ -1,7 +1,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"QuestSequence": [
{
"Sequence": 0,
@ -18,9 +17,66 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044048,
"Position": {
"X": -347.70734,
"Y": 263.0844,
"Z": -463.73694
},
"TerritoryId": 960,
"InteractionType": "Interact",
"AetheryteShortcut": "Ultima Thule - Abode of the Ea",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 1044049,
"Position": {
"X": -376.21124,
"Y": 266.08542,
"Z": -551.90356
},
"TerritoryId": 960,
"InteractionType": "Interact",
"Fly": true,
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 2013072,
"Position": {
"X": 456.65674,
"Y": 438.04077,
"Z": 310.2312
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 960,
"AetheryteShortcut": "Ultima Thule - Base Omicron"
},
{
"DataId": 1043417,
"Position": {

View File

@ -1,7 +1,6 @@
{
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
@ -18,9 +17,65 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 2013074,
"Position": {
"X": 304.3412,
"Y": 483.48206,
"Z": 143.11438
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 1073,
"$": "Without this step, there are times where it doesn't confirm automatically"
},
{
"TerritoryId": 1073,
"InteractionType": "None",
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 38291,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 38315,
"ItemCount": 3
}
]
},
{
"DataId": 1044065,
"Position": {
"X": 478.9348,
"Y": 437.0016,
"Z": 340.505
},
"TerritoryId": 960,
"InteractionType": "Interact",
"AetheryteShortcut": "Ultima Thule - Base Omicron"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 2013072,
"Position": {
"X": 456.65674,
"Y": 438.04077,
"Z": 310.2312
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 960,
"Mount": true
},
{
"DataId": 1043417,
"Position": {

View File

@ -1,7 +1,6 @@
{
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
@ -18,9 +17,79 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 2013073,
"Position": {
"X": 334.37085,
"Y": 483.17688,
"Z": 158.28174
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 960,
"Mount": true
},
{
"DataId": 1044066,
"Position": {
"X": 493.58362,
"Y": 436.99985,
"Z": 317.09766
},
"TerritoryId": 960,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1044068,
"Position": {
"X": 638.5748,
"Y": 438.6276,
"Z": 260.3341
},
"TerritoryId": 960,
"InteractionType": "Action",
"Action": "Electric Flux",
"Fly": true
},
{
"DataId": 1044069,
"Position": {
"X": 668.0552,
"Y": 440.4633,
"Z": 360.79956
},
"TerritoryId": 960,
"InteractionType": "Action",
"Action": "Electric Flux",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 2013072,
"Position": {
"X": 456.65674,
"Y": 438.04077,
"Z": 310.2312
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 960,
"AetheryteShortcut": "Ultima Thule - Base Omicron",
"Mount": true
},
{
"DataId": 1043417,
"Position": {
@ -29,7 +98,8 @@
"Z": 148.11926
},
"TerritoryId": 960,
"InteractionType": "CompleteQuest"
"InteractionType": "CompleteQuest",
"Mount": true
}
]
}

View File

@ -1,7 +1,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"QuestSequence": [
{
"Sequence": 0,
@ -18,9 +17,73 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 2013074,
"Position": {
"X": 304.3412,
"Y": 483.48206,
"Z": 143.11438
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 1073
},
{
"DataId": 1044075,
"Position": {
"X": -64.4389,
"Y": 493.32922,
"Z": -4.409851
},
"TerritoryId": 1073,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1044075,
"Position": {
"X": -64.4389,
"Y": 493.32922,
"Z": -4.409851
},
"TerritoryId": 1073,
"InteractionType": "Interact",
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 38296,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 38320,
"ItemCount": 3
}
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1043421,
"Position": {
"X": 2.4261475,
"Y": 499.87805,
"Z": 46.036377
},
"TerritoryId": 1073,
"InteractionType": "Interact",
"TargetTerritoryId": 960
},
{
"DataId": 1043417,
"Position": {

View File

@ -1,7 +1,6 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"Disabled": true,
"QuestSequence": [
{
"Sequence": 0,
@ -18,9 +17,49 @@
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1044081,
"Position": {
"X": -503.99023,
"Y": 74.16917,
"Z": 261.82947
},
"TerritoryId": 960,
"InteractionType": "Interact",
"AetheryteShortcut": "Ultima Thule - Reah Tahra",
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 38299,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 38323,
"ItemCount": 3
}
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 2013072,
"Position": {
"X": 456.65674,
"Y": 438.04077,
"Z": 310.2312
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 960,
"AetheryteShortcut": "Ultima Thule - Base Omicron"
},
{
"DataId": 1043417,
"Position": {

View File

@ -0,0 +1,229 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "plogon_enjoyer",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1043951,
"Position": {
"X": 303.8529,
"Y": 481.99442,
"Z": 154.83325
},
"TerritoryId": 960,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1043865,
"Position": {
"X": 301.8081,
"Y": 482.13644,
"Z": 165.02625
},
"TerritoryId": 960,
"InteractionType": "Interact",
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_BANOMI003_04603_Q9_000_000",
"Yes": true
}
],
"Mount": true
},
{
"DataId": 1043539,
"Position": {
"X": 205.92041,
"Y": 566,
"Z": 257.2517
},
"TerritoryId": 960,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1043547,
"Position": {
"X": 110.30737,
"Y": 269.03677,
"Z": -626.7338
},
"TerritoryId": 960,
"InteractionType": "Interact",
"AetheryteShortcut": "Ultima Thule - Abode of the Ea",
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1043552,
"Position": {
"X": 103.837524,
"Y": 269.41934,
"Z": -514.6105
},
"TerritoryId": 960,
"InteractionType": "Interact",
"Fly": true
},
{
"DataId": 1043549,
"Position": {
"X": 46.219482,
"Y": 269.597,
"Z": -474.60138
},
"TerritoryId": 960,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1043547,
"Position": {
"X": 110.30737,
"Y": 269.03677,
"Z": -626.7338
},
"TerritoryId": 960,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 5,
"Steps": [
{
"DataId": 1043549,
"Position": {
"X": 46.219482,
"Y": 269.597,
"Z": -474.60138
},
"TerritoryId": 960,
"InteractionType": "Interact",
"Fly": true,
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_BANOMI003_04603_Q2_000_000",
"Yes": true
}
]
}
]
},
{
"Sequence": 6,
"Steps": [
{
"TerritoryId": 960,
"InteractionType": "None",
"RequiredGatheredItems": [
{
"QuestAcceptedAsClass": "Miner",
"ItemId": 38278,
"ItemCount": 3
},
{
"QuestAcceptedAsClass": "Botanist",
"ItemId": 38302,
"ItemCount": 3
}
],
"Fly": true
},
{
"DataId": 2013072,
"Position": {
"X": 456.65674,
"Y": 438.04077,
"Z": 310.2312
},
"TerritoryId": 960,
"InteractionType": "Interact",
"AetheryteShortcut": "Ultima Thule - Base Omicron",
"TargetTerritoryId": 960,
"Mount": true
},
{
"DataId": 1043865,
"Position": {
"X": 301.8081,
"Y": 482.13644,
"Z": 165.02625
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 960,
"Fly": true
},
{
"DataId": 1043585,
"Position": {
"X": 203.84521,
"Y": 567.4998,
"Z": 246.87573
},
"TerritoryId": 960,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1043864,
"Position": {
"X": 244.83093,
"Y": 564.8203,
"Z": 261.76843
},
"TerritoryId": 960,
"InteractionType": "Interact",
"Fly": true,
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_BANOMI003_04603_Q8_000_000",
"Yes": true
}
]
},
{
"DataId": 1043951,
"Position": {
"X": 303.8529,
"Y": 481.99442,
"Z": 154.83325
},
"TerritoryId": 960,
"InteractionType": "CompleteQuest"
}
]
}
]
}

View File

@ -0,0 +1,188 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1050998,
"Position": {
"X": 4.0131226,
"Y": 44.499996,
"Z": 126.17676
},
"TerritoryId": 128,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza",
"[Limsa Lominsa] The Aftcastle"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
128
]
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1050999,
"Position": {
"X": 4.837097,
"Y": 31.47563,
"Z": -256.97723
},
"TerritoryId": 128,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Limsa Lominsa] The Aftcastle",
"[Limsa Lominsa] Marauders' Guild"
]
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1051000,
"Position": {
"X": -100.175476,
"Y": 18.00033,
"Z": -15.030151
},
"TerritoryId": 129,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Limsa Lominsa] Marauders' Guild",
"[Limsa Lominsa] Aetheryte Plaza"
]
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1001217,
"Position": {
"X": -140.85602,
"Y": 18.199999,
"Z": 17.013733
},
"TerritoryId": 129,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"DataId": 1051003,
"Position": {
"X": -188.12854,
"Y": 16,
"Z": 33.37146
},
"TerritoryId": 129,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
},
{
"DataId": 1051002,
"Position": {
"X": -205.005,
"Y": 15.999994,
"Z": 71.97681
},
"TerritoryId": 129,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 1051004,
"Position": {
"X": -243.03046,
"Y": 16.199997,
"Z": 40.97046
},
"TerritoryId": 129,
"InteractionType": "Interact",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
16
]
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 2014209,
"Position": {
"X": -385.1225,
"Y": 5.996765,
"Z": 33.707153
},
"TerritoryId": 129,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Limsa Lominsa] Hawkers' Alley",
"[Limsa Lominsa] Arcanists' Guild"
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1051001,
"Position": {
"X": 3.7994385,
"Y": 44.499992,
"Z": 126.05469
},
"TerritoryId": 128,
"InteractionType": "CompleteQuest",
"AethernetShortcut": [
"[Limsa Lominsa] Arcanists' Guild",
"[Limsa Lominsa] The Aftcastle"
],
"NextQuestId": 5016
}
]
}
]
}

View File

@ -0,0 +1,128 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1051007,
"Position": {
"X": 2.2735596,
"Y": 44.499992,
"Z": 125.200195
},
"StopDistance": 5,
"TerritoryId": 128,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza",
"[Limsa Lominsa] The Aftcastle"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
128
]
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1051008,
"Position": {
"X": 2.5481567,
"Y": 43.999977,
"Z": -206.71399
},
"TerritoryId": 128,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Limsa Lominsa] The Aftcastle",
"[Limsa Lominsa] Marauders' Guild"
]
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1051009,
"Position": {
"X": 1.5106201,
"Y": 44,
"Z": -205.8595
},
"TerritoryId": 128,
"InteractionType": "Interact",
"StopDistance": 5
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 2014210,
"Position": {
"X": -176.62323,
"Y": 40.97046,
"Z": 185.35132
},
"TerritoryId": 128,
"InteractionType": "Interact",
"AethernetShortcut": [
"[Limsa Lominsa] Marauders' Guild",
"[Limsa Lominsa] The Aftcastle"
]
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1051010,
"Position": {
"X": -178.11859,
"Y": 40.999958,
"Z": 184.67993
},
"StopDistance": 5,
"TerritoryId": 128,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1051011,
"Position": {
"X": -178.63745,
"Y": 40.999916,
"Z": 186.3584
},
"StopDistance": 7,
"TerritoryId": 128,
"InteractionType": "CompleteQuest",
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_FESANX002_05016_Q52_000_082",
"Yes": true
}
]
}
]
}
]
}

View File

@ -99,7 +99,7 @@ internal sealed class ContextMenuController : IDisposable
if (agentSatisfactionSupply->IsAgentActive())
{
int maxTurnIns = agentSatisfactionSupply->NpcInfo.SatisfactionRank == 1 ? 3 : 6;
quantityToGather = Math.Min(agentSatisfactionSupply->RemainingAllowances,
quantityToGather = Math.Min(agentSatisfactionSupply->NpcData.RemainingAllowances,
((AgentSatisfactionSupply2*)agentSatisfactionSupply)->CalculateTurnInsToNextRank(maxTurnIns));
}
}

View File

@ -44,7 +44,7 @@ internal static class TurnInDelivery
if (addon == null || !LAddon.IsAddonReady(addon))
return ETaskResult.StillRunning;
ushort remainingAllowances = agentSatisfactionSupply->RemainingAllowances;
ushort remainingAllowances = agentSatisfactionSupply->NpcData.RemainingAllowances;
if (remainingAllowances == 0)
{
logger.LogInformation("No remaining weekly allowances");

View File

@ -28,6 +28,9 @@ internal static class Interact
if (step.Emote != null)
yield break;
if (step.ChatMessage != null)
yield break;
if (step.DataId == null)
yield break;
}

View File

@ -17,7 +17,12 @@ internal static class Say
{
public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, QuestStep step)
{
if (step.InteractionType != EInteractionType.Say)
if (step.InteractionType is EInteractionType.AcceptQuest or EInteractionType.CompleteQuest)
{
if (step.ChatMessage == null)
return [];
}
else if (step.InteractionType != EInteractionType.Say)
return [];

View File

@ -82,6 +82,7 @@ internal static class GatheringRequiredItems
"Wait(navmesh ready)");
yield return CreateStartGatheringTask(gatheringPointId, requiredGatheredItems);
yield return new WaitAtEnd.WaitDelay();
}
}

View File

@ -360,6 +360,9 @@ internal sealed unsafe class QuestFunctions
{
if (IsQuestAccepted(questId))
return false;
if (QuestManager.Instance()->IsDailyQuestCompleted(questId.Value))
return false;
}
else
{

View File

@ -110,6 +110,18 @@ internal sealed class CreationUtilsComponent
}
#endif
#if false
var questManager = QuestManager.Instance();
if (questManager != null)
{
for (int i = 0; i < questManager->DailyQuests.Length; ++i)
{
var dailyQuest = questManager->DailyQuests[i];
ImGui.Text($"Daily Quest {i}: {dailyQuest.QuestId}, {dailyQuest.IsCompleted}");
}
}
#endif
#if false
var director = UIState.Instance()->DirectorTodo.Director;
if (director != null)

View File

@ -20,8 +20,7 @@ internal sealed class EventInfoComponent
{
private readonly List<EventQuest> _eventQuests =
[
new EventQuest("Moonfire Faire", [new(5182), new(5183)],
new DateTime(new DateOnly(2024, 8, 26), new TimeOnly(14, 59), DateTimeKind.Utc)),
new("The Rising", [new(5015), new(5016)], AtDailyReset(new(2024, 9, 11))),
];
private readonly QuestData _questData;
@ -47,6 +46,11 @@ internal sealed class EventInfoComponent
_pluginInterface = pluginInterface;
}
private static DateTime AtDailyReset(DateOnly date)
{
return new DateTime(date, new TimeOnly(14, 59), DateTimeKind.Utc);
}
public bool ShouldDraw => _configuration.General.ShowIncompleteSeasonalEvents && _eventQuests.Any(IsIncomplete);
public void Draw()
@ -75,10 +79,10 @@ internal sealed class EventInfoComponent
width -= ImGui.CalcTextSize(FontAwesomeIcon.Check.ToIconString()).X;
List<QuestId> startableQuests = eventQuest.QuestIds.Where(x =>
_questRegistry.IsKnownQuest(x) &&
_questFunctions.IsReadyToAcceptQuest(x) &&
x != _questController.StartedQuest?.Quest.Id &&
x != _questController.NextQuest?.Quest.Id)
_questRegistry.IsKnownQuest(x) &&
_questFunctions.IsReadyToAcceptQuest(x) &&
x != _questController.StartedQuest?.Quest.Id &&
x != _questController.NextQuest?.Quest.Id)
.ToList();
if (startableQuests.Count == 0)
width = 0;

View File

@ -226,9 +226,7 @@ internal sealed class QuestSelectionWindow : LWindow
if (knownQuest != null &&
knownQuest.FindSequence(0)?.LastStep()?.InteractionType is EInteractionType.AcceptQuest
or EInteractionType.AcceptLeve &&
!_questFunctions.IsQuestAccepted(quest.QuestId) &&
!_questFunctions.IsQuestLocked(quest.QuestId) &&
(quest.IsRepeatable || !_questFunctions.IsQuestAcceptedOrComplete(quest.QuestId)))
_questFunctions.IsReadyToAcceptQuest(quest.QuestId))
{
ImGui.BeginDisabled(_questController.NextQuest != null || _questController.SimulatedQuest != null);