liza
/
Questionable
1
1
Fork 9
Code Issues 1 Pull Requests 3 Releases 71 Activity

Update nier quests

pull/49/head
Liza 2024-09-13 23:29:07 +02:00
parent 8243d14993
commit bbd3c16516
Signed by: liza
GPG Key ID: 7199F8D727D55F67
16 changed files with 281 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
QuestPaths/5.x - Shadowbringers/Alliance Raid Quests/3671_Word about Komra.json
View File

@ -13,7 +13,13 @@
"Z": -636.7438 "Z": -636.7438
}, },
"TerritoryId": 814, "TerritoryId": 814,
"InteractionType": "AcceptQuest" "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Kholusia - Tomra",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
} }
] ]
}, },

3
QuestPaths/5.x - Shadowbringers/Alliance Raid Quests/3720_Tails, You Lose.json
View File

@ -123,7 +123,8 @@
"Z": -264.0879 "Z": -264.0879
}, },
"TerritoryId": 896, "TerritoryId": 896,
"InteractionType": "Interact" "InteractionType": "Interact",
"DelaySecondsAtStart": 5
} }
] ]
}, },

3
QuestPaths/5.x - Shadowbringers/Alliance Raid Quests/3721_Heads, I Win.json
View File

@ -124,7 +124,8 @@
"Z": -264.0879 "Z": -264.0879
}, },
"TerritoryId": 896, "TerritoryId": 896,
"InteractionType": "Interact" "InteractionType": "Interact",
"DelaySecondsAtStart": 5
} }
] ]
}, },

3
QuestPaths/5.x - Shadowbringers/Alliance Raid Quests/3952_We Can Rebuild Her.json
View File

@ -174,7 +174,8 @@
"InteractionType": "Say", "InteractionType": "Say",
"ChatMessage": { "ChatMessage": {
"Key": "TEXT_LUCKTA301_03952_SAYTODO_000_220" "Key": "TEXT_LUCKTA301_03952_SAYTODO_000_220"
} },
"DelaySecondsAtStart": 5
} }
] ]
}, },

7
QuestPaths/5.x - Shadowbringers/Alliance Raid Quests/3953_Everything You Know Is Wrong.json
View File

@ -53,7 +53,12 @@
"Z": 375.69226 "Z": 375.69226
}, },
"TerritoryId": 928, "TerritoryId": 928,
"InteractionType": "Interact" "InteractionType": "Interact",
"SkipConditions": {
"StepIf": {
"NotTargetable": true
}
}
}, },
{ {
"DataId": 2011155, "DataId": 2011155,

53
QuestPaths/5.x - Shadowbringers/Alliance Raid Quests/3998_To Make Amends.json
View File

@ -202,6 +202,23 @@
{ {
"Sequence": 12, "Sequence": 12,
"Steps": [ "Steps": [
{
"Position": {
"X": 702.07294,
"Y": 293.53958,
"Z": -159.18176
},
"TerritoryId": 814,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"InTerritory": [
928
]
}
}
},
{ {
"DataId": 2011154, "DataId": 2011154,
"Position": { "Position": {
@ -212,7 +229,6 @@
"TerritoryId": 814, "TerritoryId": 814,
"InteractionType": "Interact", "InteractionType": "Interact",
"TargetTerritoryId": 928, "TargetTerritoryId": 928,
"Fly": true,
"SkipConditions": { "SkipConditions": {
"StepIf": { "StepIf": {
"InTerritory": [ "InTerritory": [
@ -239,7 +255,8 @@
"Z": 274.00623 "Z": 274.00623
}, },
"TerritoryId": 928, "TerritoryId": 928,
"InteractionType": "Interact" "InteractionType": "Interact",
"DelaySecondsAtStart": 5
} }
] ]
}, },
@ -256,6 +273,11 @@
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"RestartNavigationIfCancelled": false "RestartNavigationIfCancelled": false
}, },
{
"TerritoryId": 928,
"InteractionType": "None",
"DelaySecondsAtStart": 2
},
{ {
"DataId": 2011109, "DataId": 2011109,
"Position": { "Position": {
@ -271,6 +293,15 @@
} }
} }
}, },
{
"Position": {
"X": -234.40671,
"Y": 30,
"Z": 168.78214
},
"TerritoryId": 928,
"InteractionType": "WalkTo"
},
{ {
"Position": { "Position": {
"X": -237.90593, "X": -237.90593,
@ -321,6 +352,11 @@
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"RestartNavigationIfCancelled": false "RestartNavigationIfCancelled": false
}, },
{
"TerritoryId": 928,
"InteractionType": "None",
"DelaySecondsAtStart": 2
},
{ {
"DataId": 2011110, "DataId": 2011110,
"Position": { "Position": {
@ -379,7 +415,13 @@
}, },
"TerritoryId": 928, "TerritoryId": 928,
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"RestartNavigationIfCancelled": false "RestartNavigationIfCancelled": false,
"DelaySecondsAtStart": 2
},
{
"TerritoryId": 928,
"InteractionType": "None",
"DelaySecondsAtStart": 2
}, },
{ {
"DataId": 2011118, "DataId": 2011118,
@ -406,6 +448,11 @@
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"RestartNavigationIfCancelled": false "RestartNavigationIfCancelled": false
}, },
{
"TerritoryId": 928,
"InteractionType": "None",
"DelaySecondsAtStart": 2
},
{ {
"DataId": 2011115, "DataId": 2011115,
"Position": { "Position": {

25
QuestPaths/5.x - Shadowbringers/Alliance Raid Quests/4035_Brave New World.json
View File

@ -46,7 +46,18 @@
}, },
"TerritoryId": 928, "TerritoryId": 928,
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"RestartNavigationIfCancelled": false "RestartNavigationIfCancelled": false,
"DelaySecondsAtStart": 2
},
{
"Position": {
"X": -234.40671,
"Y": 30,
"Z": 168.78214
},
"TerritoryId": 928,
"InteractionType": "WalkTo",
"DelaySecondsAtStart": 2
}, },
{ {
"Position": { "Position": {
@ -106,7 +117,8 @@
}, },
"TerritoryId": 928, "TerritoryId": 928,
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"DisableNavmesh": true "DisableNavmesh": true,
"DelaySecondsAtStart": 2
}, },
{ {
"Position": { "Position": {
@ -116,7 +128,8 @@
}, },
"TerritoryId": 928, "TerritoryId": 928,
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"RestartNavigationIfCancelled": false "RestartNavigationIfCancelled": false,
"DelaySecondsAtStart": 2
}, },
{ {
"Position": { "Position": {
@ -126,7 +139,8 @@
}, },
"TerritoryId": 928, "TerritoryId": 928,
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"RestartNavigationIfCancelled": false "RestartNavigationIfCancelled": false,
"DelaySecondsAtStart": 2
}, },
{ {
"Position": { "Position": {
@ -144,7 +158,8 @@
"Y": -249.74661, "Y": -249.74661,
"Z": -301.74612 "Z": -301.74612
} }
} },
"DelaySecondsAtStart": 2
}, },
{ {
"DataId": 2011269, "DataId": 2011269,

21
QuestPaths/5.x - Shadowbringers/Alliance Raid Quests/4045_Dwarves of a Beard.json Normal file
View File

@ -0,0 +1,21 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1032227,
"Position": {
"X": 665.8884,
"Y": 297.47797,
"Z": -160.57074
},
"TerritoryId": 814,
"InteractionType": "AcceptQuest"
}
]
}
]
}

21
QuestPaths/5.x - Shadowbringers/Alliance Raid Quests/4046_Strange Glagg.json Normal file
View File

@ -0,0 +1,21 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1032227,
"Position": {
"X": 665.8884,
"Y": 297.47797,
"Z": -160.57074
},
"TerritoryId": 814,
"InteractionType": "AcceptQuest"
}
]
}
]
}

21
QuestPaths/5.x - Shadowbringers/Alliance Raid Quests/4047_Dwarves of a Beard Freshened.json Normal file
View File

@ -0,0 +1,21 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1032227,
"Position": {
"X": 665.8884,
"Y": 297.47797,
"Z": -160.57074
},
"TerritoryId": 814,
"InteractionType": "AcceptQuest"
}
]
}
]
}

21
QuestPaths/5.x - Shadowbringers/Alliance Raid Quests/4048_Stranger Glagg.json Normal file
View File

@ -0,0 +1,21 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1032227,
"Position": {
"X": 665.8884,
"Y": 297.47797,
"Z": -160.57074
},
"TerritoryId": 814,
"InteractionType": "AcceptQuest"
}
]
}
]
}

21
QuestPaths/5.x - Shadowbringers/Alliance Raid Quests/4049_All's Well That Ends with Ale.json Normal file
View File

@ -0,0 +1,21 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1032227,
"Position": {
"X": 665.8884,
"Y": 297.47797,
"Z": -160.57074
},
"TerritoryId": 814,
"InteractionType": "AcceptQuest"
}
]
}
]
}

9
QuestPaths/5.x - Shadowbringers/Alliance Raid Quests/4050_All That Grinds Is Not Gloom.json
View File

@ -26,6 +26,11 @@
"Type": "List", "Type": "List",
"Prompt": "TEXT_LUCKTA521_04050_Q1_000_000", "Prompt": "TEXT_LUCKTA521_04050_Q1_000_000",
"Answer": "TEXT_LUCKTA521_04050_A1_000_002" "Answer": "TEXT_LUCKTA521_04050_A1_000_002"
},
{
"Type": "List",
"Prompt": "TEXT_LUCKTA521_04050_Q2_000_000",
"Answer": "TEXT_LUCKTA521_04050_A2_000_001"
} }
] ]
} }
@ -43,7 +48,8 @@
}, },
"TerritoryId": 814, "TerritoryId": 814,
"InteractionType": "Interact", "InteractionType": "Interact",
"TargetTerritoryId": 895 "TargetTerritoryId": 895,
"Fly": true
}, },
{ {
"DataId": 2010830, "DataId": 2010830,
@ -93,6 +99,7 @@
}, },
"TerritoryId": 896, "TerritoryId": 896,
"InteractionType": "Interact", "InteractionType": "Interact",
"DelaySecondsAtStart": 2,
"CompletionQuestVariablesFlags": [ "CompletionQuestVariablesFlags": [
null, null,
null, null,

61
QuestPaths/5.x - Shadowbringers/Alliance Raid Quests/4053_Whence the Heart Leads.json Normal file
View File

@ -0,0 +1,61 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1032227,
"Position": {
"X": 665.8884,
"Y": 297.47797,
"Z": -160.57074
},
"TerritoryId": 814,
"InteractionType": "AcceptQuest",
"Fly": true,
"AetheryteShortcut": "Kholusia - Stilltide",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1036045,
"Position": {
"X": 10.0251465,
"Y": 82.83513,
"Z": -53.60504
},
"TerritoryId": 820,
"InteractionType": "Interact",
"AetheryteShortcut": "Eulmore"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1032227,
"Position": {
"X": 665.8884,
"Y": 297.47797,
"Z": -160.57074
},
"TerritoryId": 814,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Kholusia - Stilltide",
"Fly": true
}
]
}
]
}

21
Questionable/Controller/Steps/Interactions/Interact.cs
View File

@ -16,7 +16,10 @@ namespace Questionable.Controller.Steps.Interactions;
internal static class Interact internal static class Interact
{ {
internal sealed class Factory(GameFunctions gameFunctions, Configuration configuration, ICondition condition, internal sealed class Factory(
GameFunctions gameFunctions,
Configuration configuration,
ICondition condition,
ILoggerFactory loggerFactory) ILoggerFactory loggerFactory)
: ITaskFactory : ITaskFactory
{ {
@ -54,14 +57,14 @@ internal static class Interact
yield return Interact(step.DataId.Value, quest, step.InteractionType, yield return Interact(step.DataId.Value, quest, step.InteractionType,
step.TargetTerritoryId != null || quest.Id is SatisfactionSupplyNpcId || step.TargetTerritoryId != null || quest.Id is SatisfactionSupplyNpcId ||
step.SkipConditions is { StepIf.Never: true }, step.PickUpItemId); step.SkipConditions is { StepIf.Never: true }, step.PickUpItemId, step.SkipConditions?.StepIf);
} }
internal ITask Interact(uint dataId, Quest? quest, EInteractionType interactionType, internal ITask Interact(uint dataId, Quest? quest, EInteractionType interactionType,
bool skipMarkerCheck = false, uint? pickUpItemId = null) bool skipMarkerCheck = false, uint? pickUpItemId = null, SkipStepConditions? skipConditions = null)
{ {
return new DoInteract(dataId, quest, interactionType, skipMarkerCheck, pickUpItemId, gameFunctions, return new DoInteract(dataId, quest, interactionType, skipMarkerCheck, pickUpItemId, skipConditions,
condition, loggerFactory.CreateLogger<DoInteract>()); gameFunctions, condition, loggerFactory.CreateLogger<DoInteract>());
} }
} }
@ -71,6 +74,7 @@ internal static class Interact
EInteractionType interactionType, EInteractionType interactionType,
bool skipMarkerCheck, bool skipMarkerCheck,
uint? pickUpItemId, uint? pickUpItemId,
SkipStepConditions? skipConditions,
GameFunctions gameFunctions, GameFunctions gameFunctions,
ICondition condition, ICondition condition,
ILogger<DoInteract> logger) ILogger<DoInteract> logger)
@ -97,6 +101,13 @@ internal static class Interact
return false; return false;
} }
if (!gameObject.IsTargetable && skipConditions is { Never: false, NotTargetable: true })
{
logger.LogInformation("Not interacting with {DataId} because it is not targetable (but skippable)",
dataId);
return false;
}
// this is only relevant for followers on quests // this is only relevant for followers on quests
if (!gameObject.IsTargetable && condition[ConditionFlag.Mounted] && if (!gameObject.IsTargetable && condition[ConditionFlag.Mounted] &&
gameObject.ObjectKind != ObjectKind.GatheringPoint) gameObject.ObjectKind != ObjectKind.GatheringPoint)

4
Questionable/Windows/QuestComponents/QuestTooltipComponent.cs
View File

@ -117,7 +117,7 @@ internal sealed class QuestTooltipComponent
else else
{ {
using var _ = ImRaii.Disabled(); using var _ = ImRaii.Disabled();
_uiUtils.ChecklistItem($"Unknown Quest ({q})", ImGuiColors.DalamudGrey, FontAwesomeIcon.Question); _uiUtils.ChecklistItem($"Unknown Quest ({q.QuestId})", ImGuiColors.DalamudGrey, FontAwesomeIcon.Question);
} }
} }
} }
@ -180,7 +180,7 @@ internal sealed class QuestTooltipComponent
_ => "None", _ => "None",
}; };
GrandCompany currentGrandCompany = ~_questFunctions.GetGrandCompany(); GrandCompany currentGrandCompany = _questFunctions.GetGrandCompany();
_uiUtils.ChecklistItem($"Grand Company: {gcName}", actualQuestInfo.GrandCompany == currentGrandCompany); _uiUtils.ChecklistItem($"Grand Company: {gcName}", actualQuestInfo.GrandCompany == currentGrandCompany);
} }
} }