forked from liza/Questionable
Update nier quests
This commit is contained in:
parent
8243d14993
commit
bbd3c16516
@ -13,7 +13,13 @@
|
||||
"Z": -636.7438
|
||||
},
|
||||
"TerritoryId": 814,
|
||||
"InteractionType": "AcceptQuest"
|
||||
"InteractionType": "AcceptQuest",
|
||||
"AetheryteShortcut": "Kholusia - Tomra",
|
||||
"SkipConditions": {
|
||||
"AetheryteShortcutIf": {
|
||||
"InSameTerritory": true
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
|
@ -123,7 +123,8 @@
|
||||
"Z": -264.0879
|
||||
},
|
||||
"TerritoryId": 896,
|
||||
"InteractionType": "Interact"
|
||||
"InteractionType": "Interact",
|
||||
"DelaySecondsAtStart": 5
|
||||
}
|
||||
]
|
||||
},
|
||||
|
@ -124,7 +124,8 @@
|
||||
"Z": -264.0879
|
||||
},
|
||||
"TerritoryId": 896,
|
||||
"InteractionType": "Interact"
|
||||
"InteractionType": "Interact",
|
||||
"DelaySecondsAtStart": 5
|
||||
}
|
||||
]
|
||||
},
|
||||
|
@ -174,7 +174,8 @@
|
||||
"InteractionType": "Say",
|
||||
"ChatMessage": {
|
||||
"Key": "TEXT_LUCKTA301_03952_SAYTODO_000_220"
|
||||
}
|
||||
},
|
||||
"DelaySecondsAtStart": 5
|
||||
}
|
||||
]
|
||||
},
|
||||
|
@ -53,7 +53,12 @@
|
||||
"Z": 375.69226
|
||||
},
|
||||
"TerritoryId": 928,
|
||||
"InteractionType": "Interact"
|
||||
"InteractionType": "Interact",
|
||||
"SkipConditions": {
|
||||
"StepIf": {
|
||||
"NotTargetable": true
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"DataId": 2011155,
|
||||
|
@ -202,6 +202,23 @@
|
||||
{
|
||||
"Sequence": 12,
|
||||
"Steps": [
|
||||
{
|
||||
"Position": {
|
||||
"X": 702.07294,
|
||||
"Y": 293.53958,
|
||||
"Z": -159.18176
|
||||
},
|
||||
"TerritoryId": 814,
|
||||
"InteractionType": "WalkTo",
|
||||
"Fly": true,
|
||||
"SkipConditions": {
|
||||
"StepIf": {
|
||||
"InTerritory": [
|
||||
928
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"DataId": 2011154,
|
||||
"Position": {
|
||||
@ -212,7 +229,6 @@
|
||||
"TerritoryId": 814,
|
||||
"InteractionType": "Interact",
|
||||
"TargetTerritoryId": 928,
|
||||
"Fly": true,
|
||||
"SkipConditions": {
|
||||
"StepIf": {
|
||||
"InTerritory": [
|
||||
@ -239,7 +255,8 @@
|
||||
"Z": 274.00623
|
||||
},
|
||||
"TerritoryId": 928,
|
||||
"InteractionType": "Interact"
|
||||
"InteractionType": "Interact",
|
||||
"DelaySecondsAtStart": 5
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -256,6 +273,11 @@
|
||||
"InteractionType": "WalkTo",
|
||||
"RestartNavigationIfCancelled": false
|
||||
},
|
||||
{
|
||||
"TerritoryId": 928,
|
||||
"InteractionType": "None",
|
||||
"DelaySecondsAtStart": 2
|
||||
},
|
||||
{
|
||||
"DataId": 2011109,
|
||||
"Position": {
|
||||
@ -271,6 +293,15 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"Position": {
|
||||
"X": -234.40671,
|
||||
"Y": 30,
|
||||
"Z": 168.78214
|
||||
},
|
||||
"TerritoryId": 928,
|
||||
"InteractionType": "WalkTo"
|
||||
},
|
||||
{
|
||||
"Position": {
|
||||
"X": -237.90593,
|
||||
@ -321,6 +352,11 @@
|
||||
"InteractionType": "WalkTo",
|
||||
"RestartNavigationIfCancelled": false
|
||||
},
|
||||
{
|
||||
"TerritoryId": 928,
|
||||
"InteractionType": "None",
|
||||
"DelaySecondsAtStart": 2
|
||||
},
|
||||
{
|
||||
"DataId": 2011110,
|
||||
"Position": {
|
||||
@ -379,7 +415,13 @@
|
||||
},
|
||||
"TerritoryId": 928,
|
||||
"InteractionType": "WalkTo",
|
||||
"RestartNavigationIfCancelled": false
|
||||
"RestartNavigationIfCancelled": false,
|
||||
"DelaySecondsAtStart": 2
|
||||
},
|
||||
{
|
||||
"TerritoryId": 928,
|
||||
"InteractionType": "None",
|
||||
"DelaySecondsAtStart": 2
|
||||
},
|
||||
{
|
||||
"DataId": 2011118,
|
||||
@ -406,6 +448,11 @@
|
||||
"InteractionType": "WalkTo",
|
||||
"RestartNavigationIfCancelled": false
|
||||
},
|
||||
{
|
||||
"TerritoryId": 928,
|
||||
"InteractionType": "None",
|
||||
"DelaySecondsAtStart": 2
|
||||
},
|
||||
{
|
||||
"DataId": 2011115,
|
||||
"Position": {
|
||||
|
@ -46,7 +46,18 @@
|
||||
},
|
||||
"TerritoryId": 928,
|
||||
"InteractionType": "WalkTo",
|
||||
"RestartNavigationIfCancelled": false
|
||||
"RestartNavigationIfCancelled": false,
|
||||
"DelaySecondsAtStart": 2
|
||||
},
|
||||
{
|
||||
"Position": {
|
||||
"X": -234.40671,
|
||||
"Y": 30,
|
||||
"Z": 168.78214
|
||||
},
|
||||
"TerritoryId": 928,
|
||||
"InteractionType": "WalkTo",
|
||||
"DelaySecondsAtStart": 2
|
||||
},
|
||||
{
|
||||
"Position": {
|
||||
@ -106,7 +117,8 @@
|
||||
},
|
||||
"TerritoryId": 928,
|
||||
"InteractionType": "WalkTo",
|
||||
"DisableNavmesh": true
|
||||
"DisableNavmesh": true,
|
||||
"DelaySecondsAtStart": 2
|
||||
},
|
||||
{
|
||||
"Position": {
|
||||
@ -116,7 +128,8 @@
|
||||
},
|
||||
"TerritoryId": 928,
|
||||
"InteractionType": "WalkTo",
|
||||
"RestartNavigationIfCancelled": false
|
||||
"RestartNavigationIfCancelled": false,
|
||||
"DelaySecondsAtStart": 2
|
||||
},
|
||||
{
|
||||
"Position": {
|
||||
@ -126,7 +139,8 @@
|
||||
},
|
||||
"TerritoryId": 928,
|
||||
"InteractionType": "WalkTo",
|
||||
"RestartNavigationIfCancelled": false
|
||||
"RestartNavigationIfCancelled": false,
|
||||
"DelaySecondsAtStart": 2
|
||||
},
|
||||
{
|
||||
"Position": {
|
||||
@ -144,7 +158,8 @@
|
||||
"Y": -249.74661,
|
||||
"Z": -301.74612
|
||||
}
|
||||
}
|
||||
},
|
||||
"DelaySecondsAtStart": 2
|
||||
},
|
||||
{
|
||||
"DataId": 2011269,
|
||||
|
@ -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"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
@ -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"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
@ -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"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
@ -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"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
@ -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"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
@ -26,6 +26,11 @@
|
||||
"Type": "List",
|
||||
"Prompt": "TEXT_LUCKTA521_04050_Q1_000_000",
|
||||
"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,
|
||||
"InteractionType": "Interact",
|
||||
"TargetTerritoryId": 895
|
||||
"TargetTerritoryId": 895,
|
||||
"Fly": true
|
||||
},
|
||||
{
|
||||
"DataId": 2010830,
|
||||
@ -93,6 +99,7 @@
|
||||
},
|
||||
"TerritoryId": 896,
|
||||
"InteractionType": "Interact",
|
||||
"DelaySecondsAtStart": 2,
|
||||
"CompletionQuestVariablesFlags": [
|
||||
null,
|
||||
null,
|
||||
|
@ -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
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
@ -16,7 +16,10 @@ namespace Questionable.Controller.Steps.Interactions;
|
||||
|
||||
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)
|
||||
: ITaskFactory
|
||||
{
|
||||
@ -54,14 +57,14 @@ internal static class Interact
|
||||
|
||||
yield return Interact(step.DataId.Value, quest, step.InteractionType,
|
||||
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,
|
||||
bool skipMarkerCheck = false, uint? pickUpItemId = null)
|
||||
bool skipMarkerCheck = false, uint? pickUpItemId = null, SkipStepConditions? skipConditions = null)
|
||||
{
|
||||
return new DoInteract(dataId, quest, interactionType, skipMarkerCheck, pickUpItemId, gameFunctions,
|
||||
condition, loggerFactory.CreateLogger<DoInteract>());
|
||||
return new DoInteract(dataId, quest, interactionType, skipMarkerCheck, pickUpItemId, skipConditions,
|
||||
gameFunctions, condition, loggerFactory.CreateLogger<DoInteract>());
|
||||
}
|
||||
}
|
||||
|
||||
@ -71,6 +74,7 @@ internal static class Interact
|
||||
EInteractionType interactionType,
|
||||
bool skipMarkerCheck,
|
||||
uint? pickUpItemId,
|
||||
SkipStepConditions? skipConditions,
|
||||
GameFunctions gameFunctions,
|
||||
ICondition condition,
|
||||
ILogger<DoInteract> logger)
|
||||
@ -97,6 +101,13 @@ internal static class Interact
|
||||
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
|
||||
if (!gameObject.IsTargetable && condition[ConditionFlag.Mounted] &&
|
||||
gameObject.ObjectKind != ObjectKind.GatheringPoint)
|
||||
|
@ -117,7 +117,7 @@ internal sealed class QuestTooltipComponent
|
||||
else
|
||||
{
|
||||
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",
|
||||
};
|
||||
|
||||
GrandCompany currentGrandCompany = ~_questFunctions.GetGrandCompany();
|
||||
GrandCompany currentGrandCompany = _questFunctions.GetGrandCompany();
|
||||
_uiUtils.ChecklistItem($"Grand Company: {gcName}", actualQuestInfo.GrandCompany == currentGrandCompany);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user