Minor adjustments for MNK quests

pull/41/head
Liza 2024-09-09 21:13:58 +02:00
parent a1e7aa4122
commit 461c96f7ee
Signed by: liza
GPG Key ID: 7199F8D727D55F67
7 changed files with 114 additions and 27 deletions

View File

@ -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
}
]
},

View File

@ -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"
}
]
},

View File

@ -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,

View File

@ -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
]
}
]
},

View File

@ -154,6 +154,7 @@
"Y": 7.405224,
"Z": -29.312622
},
"StopDistance": 6,
"TerritoryId": 141,
"InteractionType": "Interact"
}

View File

@ -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
]
}
]
},

View File

@ -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;