From 461c96f7eed3e6c4971965597d8e581221445db8 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Mon, 9 Sep 2024 21:13:58 +0200 Subject: [PATCH] Minor adjustments for MNK quests --- .../MNK/1061_Brother from Another Mother.json | 23 ++++++--- .../MNK/1062_Insulted Intelligence.json | 19 +++++--- .../MNK/1065_Good Vibrations.json | 9 +++- .../MNK/554_Harder than Rock.json | 48 +++++++++++++++++-- .../MNK/558_The Spirit Is Willing.json | 1 + .../MNK/566_Star-crossed Rivals.json | 37 ++++++++++++-- Questionable/Functions/GameFunctions.cs | 4 +- 7 files changed, 114 insertions(+), 27 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1061_Brother from Another Mother.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1061_Brother from Another Mother.json index ffeb9cf3..8c3d6643 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1061_Brother from Another Mother.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1061_Brother from Another Mother.json @@ -45,6 +45,20 @@ { "Sequence": 2, "Steps": [ + { + "Position": { + "X": -231.99818, + "Y": -28.997791, + "Z": 123.01078 + }, + "TerritoryId": 141, + "InteractionType": "WalkTo", + "AethernetShortcut": [ + "[Ul'dah] Goldsmiths' Guild", + "[Ul'dah] Gate of Nald (Central Thanalan)" + ], + "Fly": true + }, { "DataId": 2002439, "Position": { @@ -53,13 +67,8 @@ "Z": 125.29175 }, "TerritoryId": 141, - "InteractionType": "UseItem", - "ItemId": 2000951, - "AethernetShortcut": [ - "[Ul'dah] Goldsmiths' Guild", - "[Ul'dah] Gate of Nald (Central Thanalan)" - ], - "Fly": true + "InteractionType": "SinglePlayerDuty", + "ItemId": 2000951 } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1062_Insulted Intelligence.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1062_Insulted Intelligence.json index b5c9395c..9e70c0f0 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1062_Insulted Intelligence.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1062_Insulted Intelligence.json @@ -6,14 +6,9 @@ "Sequence": 0, "Steps": [ { - "DataId": 1006749, - "Position": { - "X": -30.47229, - "Y": 13.599918, - "Z": 95.26196 - }, "TerritoryId": 131, - "InteractionType": "AcceptQuest", + "InteractionType": "EquipItem", + "ItemId": 4543, "AetheryteShortcut": "Ul'dah", "AethernetShortcut": [ "[Ul'dah] Aetheryte Plaza", @@ -27,6 +22,16 @@ "InSameTerritory": true } } + }, + { + "DataId": 1006749, + "Position": { + "X": -30.47229, + "Y": 13.599918, + "Z": 95.26196 + }, + "TerritoryId": 131, + "InteractionType": "AcceptQuest" } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1065_Good Vibrations.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1065_Good Vibrations.json index ce891a9c..960c27cf 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1065_Good Vibrations.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1065_Good Vibrations.json @@ -96,7 +96,12 @@ }, "TerritoryId": 146, "InteractionType": "WalkTo", - "Fly": true + "Fly": true, + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { "Position": { @@ -106,7 +111,7 @@ }, "TerritoryId": 146, "InteractionType": "WalkTo", - "Land": true + "Fly": true }, { "DataId": 2002548, diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/554_Harder than Rock.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/554_Harder than Rock.json index 299c7971..31c22487 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/554_Harder than Rock.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/554_Harder than Rock.json @@ -44,7 +44,15 @@ "Z": -59.55603 }, "TerritoryId": 130, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] }, { "DataId": 2001282, @@ -54,7 +62,15 @@ "Z": -78.50769 }, "TerritoryId": 130, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 2001283, @@ -64,7 +80,15 @@ "Z": -98.8938 }, "TerritoryId": 130, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "DataId": 2001280, @@ -78,6 +102,14 @@ "AethernetShortcut": [ "[Ul'dah] Adventurers' Guild", "[Ul'dah] Thaumaturges' Guild" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 ] }, { @@ -88,7 +120,15 @@ "Z": 67.33801 }, "TerritoryId": 130, - "InteractionType": "Interact" + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/558_The Spirit Is Willing.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/558_The Spirit Is Willing.json index 2ec3b573..8924e6fd 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/558_The Spirit Is Willing.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/558_The Spirit Is Willing.json @@ -154,6 +154,7 @@ "Y": 7.405224, "Z": -29.312622 }, + "StopDistance": 6, "TerritoryId": 141, "InteractionType": "Interact" } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/566_Star-crossed Rivals.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/566_Star-crossed Rivals.json index 79b73060..182c255c 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/566_Star-crossed Rivals.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/566_Star-crossed Rivals.json @@ -68,7 +68,14 @@ "TerritoryId": 146, "InteractionType": "UseItem", "ItemId": 2000409, - "RequiredQuestVariables": [[0], null, null, null, null, null] + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] }, { "Position": { @@ -100,7 +107,14 @@ "TerritoryId": 146, "InteractionType": "UseItem", "ItemId": 2000409, - "RequiredQuestVariables": [[16], null, null, null, null, null] + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 2001524, @@ -112,7 +126,14 @@ "TerritoryId": 146, "InteractionType": "UseItem", "ItemId": 2000409, - "RequiredQuestVariables": [[32], null, null, null, null, null], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ], "Fly": true }, { @@ -125,7 +146,15 @@ "TerritoryId": 146, "InteractionType": "UseItem", "ItemId": 2000409, - "Fly": true + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } ] }, diff --git a/Questionable/Functions/GameFunctions.cs b/Questionable/Functions/GameFunctions.cs index 90703500..07fb8c37 100644 --- a/Questionable/Functions/GameFunctions.cs +++ b/Questionable/Functions/GameFunctions.cs @@ -182,9 +182,7 @@ internal sealed unsafe class GameFunctions long result = AgentInventoryContext.Instance()->UseItem(itemId); _logger.LogInformation("UseItem result on {DataId}: {Result}", dataId, result); - - // TODO is 1 a generally accepted result? - return result == 0 || (itemId == 2002450 && result == 1); + return result is 0 or 1; } return false;