Minor adjustments for MNK quests

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 ffeb9cf3dd9f0ffcb299dc373f727b68ecdc1b82..8c3d664383a8687f06f4d172936ce180cc6990f3 100644 (file)
--- 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
@@ -46,20 +46,29 @@
       "Sequence": 2,
       "Steps": [
         {
-          "DataId": 2002439,
           "Position": {
-            "X": -232.80695,
-            "Y": -28.793823,
-            "Z": 125.29175
+            "X": -231.99818,
+            "Y": -28.997791,
+            "Z": 123.01078
           },
           "TerritoryId": 141,
-          "InteractionType": "UseItem",
-          "ItemId": 2000951,
+          "InteractionType": "WalkTo",
           "AethernetShortcut": [
             "[Ul'dah] Goldsmiths' Guild",
             "[Ul'dah] Gate of Nald (Central Thanalan)"
           ],
           "Fly": true
+        },
+        {
+          "DataId": 2002439,
+          "Position": {
+            "X": -232.80695,
+            "Y": -28.793823,
+            "Z": 125.29175
+          },
+          "TerritoryId": 141,
+          "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 b5c9395c302fba60ea379dffb1dd14883b683bed..9e70c0f0e87ac590b2af761612415cab3f439ae7 100644 (file)
--- 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 ce891a9cad5648035f18f353c60e0b1a4c324290..960c27cfe76e2f942be07e9e3fd6ef0714700bf6 100644 (file)
--- 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 299c7971636c013bdde8504fe94953343b5ea5ce..31c22487be40c99d02b79a26aeff09ae0e8521a7 100644 (file)
--- 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 2ec3b5732b1f7c05acc437338b37a31efa3f3e33..8924e6fdb37ef335bf4a83eb4e7d5558ad3f7ab5 100644 (file)
--- 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 79b73060d541a1871ca671d8ef3e7a3a672d27f0..182c255c7fd380e287e849dd1286883042bb80ec 100644 (file)
--- 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 90703500fa15f5f2ba7505fa8b74d9ac5a5680cc..07fb8c37014d3606bc75ada6f18e4c9739ff245f 100644 (file)
--- 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;