Daily quest update

pull/4/head
Liza 2024-08-27 23:40:22 +02:00
parent 90b0467742
commit 218dbd8feb
Signed by: liza
GPG Key ID: 7199F8D727D55F67
10 changed files with 214 additions and 26 deletions

View File

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

View File

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

View File

@ -1,7 +1,6 @@
{ {
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza", "Author": "liza",
"Disabled": true,
"QuestSequence": [ "QuestSequence": [
{ {
"Sequence": 0, "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, "Sequence": 255,
"Steps": [ "Steps": [
@ -30,12 +77,7 @@
"TerritoryId": 817, "TerritoryId": 817,
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"AetheryteShortcut": "Rak'tika - Fanow", "AetheryteShortcut": "Rak'tika - Fanow",
"Fly": true, "Fly": true
"RequiredGatheredItems": [
]
}, },
{ {
"DataId": 1032643, "DataId": 1032643,

View File

@ -1,7 +1,6 @@
{ {
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza", "Author": "liza",
"Disabled": true,
"QuestSequence": [ "QuestSequence": [
{ {
"Sequence": 0, "Sequence": 0,
@ -32,9 +31,16 @@
"AetheryteShortcut": "Rak'tika - Fanow", "AetheryteShortcut": "Rak'tika - Fanow",
"Fly": true, "Fly": true,
"RequiredGatheredItems": [ "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", "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza", "Author": "liza",
"Disabled": true,
"QuestSequence": [ "QuestSequence": [
{ {
"Sequence": 0, "Sequence": 0,
@ -32,9 +31,16 @@
"AetheryteShortcut": "Rak'tika - Fanow", "AetheryteShortcut": "Rak'tika - Fanow",
"Fly": true, "Fly": true,
"RequiredGatheredItems": [ "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", "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza", "Author": "liza",
"Disabled": true,
"QuestSequence": [ "QuestSequence": [
{ {
"Sequence": 0, "Sequence": 0,
@ -30,11 +29,29 @@
{ {
"Sequence": 1, "Sequence": 1,
"Steps": [ "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, "Sequence": 255,
"Steps": [ "Steps": [
{
"TerritoryId": 959,
"InteractionType": "Craft",
"ItemId": 38885,
"ItemCount": 1
},
{ {
"Position": { "Position": {
"X": -201.42024, "X": -201.42024,
@ -42,7 +59,9 @@
"Z": -273.68756 "Z": -273.68756
}, },
"TerritoryId": 959, "TerritoryId": 959,
"InteractionType": "WalkTo" "InteractionType": "WalkTo",
"AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
"Fly": true
}, },
{ {
"DataId": 1044403, "DataId": 1044403,

View File

@ -1,7 +1,6 @@
{ {
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza", "Author": "liza",
"Disabled": true,
"QuestSequence": [ "QuestSequence": [
{ {
"Sequence": 0, "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, "Sequence": 255,
"Steps": [ "Steps": [
{
"DataId": 1043421,
"Position": {
"X": 2.4261475,
"Y": 499.87805,
"Z": 46.036377
},
"TerritoryId": 1073,
"InteractionType": "Interact",
"TargetTerritoryId": 960
},
{ {
"DataId": 1043417, "DataId": 1043417,
"Position": { "Position": {

View File

@ -1,7 +1,6 @@
{ {
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza", "Author": "liza",
"Disabled": true,
"QuestSequence": [ "QuestSequence": [
{ {
"Sequence": 0, "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, "Sequence": 255,
"Steps": [ "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, "DataId": 1043417,
"Position": { "Position": {

View File

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

View File

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