cacahuetes/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests 1 Activity

master #3

Open
cacahuetes wants to merge 653 commits from liza/Questionable:master into cacahuetes-ShB-Healer
pull from: liza/Questionable:master
merge into: cacahuetes:cacahuetes-ShB-Healer
Conversation 0 Commits 653 Files Changed 1490 +214 -26
10 changed files with 214 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 218dbd8feb - Show all commits

2
Directory.Build.targets
View File

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

20
QuestPaths/5.x - Shadowbringers/Allied Societies/Dwarves/Dailies/3925_Fast and Loud.json
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,

56
QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3829_Eggspotting.json
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,

14
QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3830_Safety Is No Accident.json
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
}
]
},
{

14
QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3831_One Fish, Two Fish, Bread Fish, Stew Fish.json
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
}
]
},
{

23
QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4710_Clean Paws Make Good Artists.json
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,

65
QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4630_Reclaiming the Taste of Home.json
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": {

41
QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4632_Checking for Cavities.json
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": {

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

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

4
Questionable/Windows/QuestSelectionWindow.cs
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);