Minor cleanup for ARR WHM

pull/17/head v2.7
Liza 2024-08-14 11:40:49 +02:00
parent 76cc4000ca
commit 348fb06542
Signed by: liza
GPG Key ID: 7199F8D727D55F67
27 changed files with 2954 additions and 2071 deletions

View File

@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<Version>2.6</Version>
<Version>2.7</Version>
</PropertyGroup>
</Project>

View File

@ -317,6 +317,9 @@ public static class RoslynShortcuts
Assignment(nameof(SkipStepConditions.AetheryteUnlocked),
skipStepConditions.AetheryteUnlocked, emptyStep.AetheryteUnlocked)
.AsSyntaxNodeOrToken(),
Assignment(nameof(SkipStepConditions.NearPosition),
skipStepConditions.NearPosition, emptyStep.NearPosition)
.AsSyntaxNodeOrToken(),
Assignment(nameof(SkipStepConditions.ExtraCondition),
skipStepConditions.ExtraCondition, emptyStep.ExtraCondition)
.AsSyntaxNodeOrToken()))));
@ -335,6 +338,22 @@ public static class RoslynShortcuts
skipItemCondition.NotInInventory,
emptyItem.NotInInventory)))));
}
else if (value is NearPositionCondition nearPositionCondition)
{
var emptyCondition = new NearPositionCondition();
return ObjectCreationExpression(
IdentifierName(nameof(NearPositionCondition)))
.WithInitializer(
InitializerExpression(
SyntaxKind.ObjectInitializerExpression,
SeparatedList<ExpressionSyntax>(
SyntaxNodeList(
Assignment(nameof(NearPositionCondition.Position),
nearPositionCondition.Position, emptyCondition.Position).AsSyntaxNodeOrToken(),
Assignment(nameof(NearPositionCondition.MaximumDistance),
nearPositionCondition.MaximumDistance, emptyCondition.MaximumDistance)
.AsSyntaxNodeOrToken()))));
}
else if (value is SkipAetheryteCondition skipAetheryteCondition)
{
var emptyAetheryte = new SkipAetheryteCondition();

View File

@ -21,7 +21,10 @@
"InteractionType": "AcceptQuest",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": false
"InSameTerritory": true,
"InTerritory": [
133
]
}
}
}
@ -30,16 +33,6 @@
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -271.3778,
"Y": 19.49745,
"Z": 96.23329
},
"TerritoryId": 148,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Central Shroud - Bentbranch Meadows"
},
{
"DataId": 1007850,
"Position": {
@ -48,7 +41,9 @@
"Z": 97.42883
},
"TerritoryId": 148,
"InteractionType": "SinglePlayerDuty"
"InteractionType": "SinglePlayerDuty",
"AetheryteShortcut": "Central Shroud - Bentbranch Meadows",
"Fly": true
}
]
},
@ -61,6 +56,7 @@
"Y": 8.006159,
"Z": 268.78055
},
"StopDistance": 0.25,
"TerritoryId": 153,
"AetheryteShortcut": "South Shroud - Camp Tranquil",
"InteractionType": "Jump",
@ -69,7 +65,33 @@
"X": -137.77051,
"Y": 7.7094107,
"Z": 275.28036
}}},
},
"DelaySeconds": 0.75
},
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
},
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"Position": {
"X": -139.04318,
"Y": 8.522301,
"Z": 280.0128
},
"TerritoryId": 153,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"DataId": 1006751,
"Position": {

View File

@ -5,6 +5,61 @@
{
"Sequence": 0,
"Steps": [
{
"Position": {
"X": -146.86935,
"Y": 8.006159,
"Z": 268.78055
},
"StopDistance": 0.25,
"TerritoryId": 153,
"AetheryteShortcut": "South Shroud - Camp Tranquil",
"InteractionType": "Jump",
"JumpDestination": {
"Position": {
"X": -137.77051,
"Y": 7.7094107,
"Z": 275.28036
},
"DelaySeconds": 0.75
},
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
},
"StepIf": {
"Flying": "Unlocked",
"NearPosition": {
"Position": {
"X": -139.45221,
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
}
}
}
},
{
"Position": {
"X": -139.04318,
"Y": 8.522301,
"Z": 280.0128
},
"TerritoryId": 153,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"TerritoryId": 153,
"InteractionType": "EquipItem",
"ItemId": 4547
},
{
"DataId": 1006751,
"Position": {
@ -20,20 +75,6 @@
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -409.1981,
"Y": 61.063103,
"Z": -153.9051
},
"TerritoryId": 148,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] White Wolf Gate (Central Shroud)"
]
},
{
"DataId": 2002392,
"Position": {
@ -46,8 +87,23 @@
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [
1937
],
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] White Wolf Gate (Central Shroud)"
],
"Fly": true,
"CompletionQuestVariablesFlags": [
{
"Low": 3
},
null,
null,
null,
null,
null
]
},
{
"DataId": 2002392,
@ -70,6 +126,7 @@
"Y": 8.006159,
"Z": 268.78055
},
"StopDistance": 0.25,
"TerritoryId": 153,
"AetheryteShortcut": "South Shroud - Camp Tranquil",
"InteractionType": "Jump",
@ -78,7 +135,41 @@
"X": -137.77051,
"Y": 7.7094107,
"Z": 275.28036
}}},
},
"DelaySeconds": 0.75
},
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
},
"StepIf": {
"Flying": "Unlocked",
"NearPosition": {
"Position": {
"X": -139.45221,
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
}
}
}
},
{
"Position": {
"X": -139.04318,
"Y": 8.522301,
"Z": 280.0128
},
"TerritoryId": 153,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"DataId": 1006751,
"Position": {

View File

@ -5,6 +5,56 @@
{
"Sequence": 0,
"Steps": [
{
"Position": {
"X": -146.86935,
"Y": 8.006159,
"Z": 268.78055
},
"StopDistance": 0.25,
"TerritoryId": 153,
"AetheryteShortcut": "South Shroud - Camp Tranquil",
"InteractionType": "Jump",
"JumpDestination": {
"Position": {
"X": -137.77051,
"Y": 7.7094107,
"Z": 275.28036
},
"DelaySeconds": 0.75
},
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
},
"StepIf": {
"Flying": "Unlocked",
"NearPosition": {
"Position": {
"X": -139.45221,
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
}
}
}
},
{
"Position": {
"X": -139.04318,
"Y": 8.522301,
"Z": 280.0128
},
"TerritoryId": 153,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"DataId": 1006751,
"Position": {
@ -21,16 +71,6 @@
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -272.38885,
"Y": 12.935407,
"Z": -46.28064
},
"TerritoryId": 152,
"InteractionType": "WalkTo",
"AetheryteShortcut": "East Shroud - Hawthorne Hut"
},
{
"DataId": 1007852,
"Position": {
"X": -272.38885,
@ -38,7 +78,9 @@
"Z": -46.28064
},
"TerritoryId": 152,
"InteractionType": "Interact"
"InteractionType": "Interact",
"AetheryteShortcut": "East Shroud - Hawthorne Hut",
"Fly": true
}
]
},
@ -47,24 +89,27 @@
"Steps": [
{
"Position": {
"X": -270.7748,
"Y": 13.192019,
"Z": -49.86504
},
"TerritoryId": 152,
"InteractionType": "WalkTo"
},
{
"Position": {
"X": -270.7748,
"Y": 13.192019,
"Z": -49.86504
"X": -271.5343,
"Y": 13.748352,
"Z": -51.773926
},
"StopDistance": 2,
"TerritoryId": 152,
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [
1938,1939
1938,
1939
],
"CompletionQuestVariablesFlags": [
{
"Low": 4
},
null,
null,
null,
null,
null
]
},
{
@ -88,6 +133,7 @@
"Y": 8.006159,
"Z": 268.78055
},
"StopDistance": 0.25,
"TerritoryId": 153,
"AetheryteShortcut": "South Shroud - Camp Tranquil",
"InteractionType": "Jump",
@ -96,7 +142,41 @@
"X": -137.77051,
"Y": 7.7094107,
"Z": 275.28036
}}},
},
"DelaySeconds": 0.75
},
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
},
"StepIf": {
"Flying": "Unlocked",
"NearPosition": {
"Position": {
"X": -139.45221,
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
}
}
}
},
{
"Position": {
"X": -139.04318,
"Y": 8.522301,
"Z": 280.0128
},
"TerritoryId": 153,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"DataId": 1006751,
"Position": {

View File

@ -5,6 +5,56 @@
{
"Sequence": 0,
"Steps": [
{
"Position": {
"X": -146.86935,
"Y": 8.006159,
"Z": 268.78055
},
"StopDistance": 0.25,
"TerritoryId": 153,
"AetheryteShortcut": "South Shroud - Camp Tranquil",
"InteractionType": "Jump",
"JumpDestination": {
"Position": {
"X": -137.77051,
"Y": 7.7094107,
"Z": 275.28036
},
"DelaySeconds": 0.75
},
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
},
"StepIf": {
"Flying": "Unlocked",
"NearPosition": {
"Position": {
"X": -139.45221,
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
}
}
}
},
{
"Position": {
"X": -139.04318,
"Y": 8.522301,
"Z": 280.0128
},
"TerritoryId": 153,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"DataId": 1006751,
"Position": {
@ -22,13 +72,27 @@
"Steps": [
{
"Position": {
"X": -345.86627,
"Y": -37.41542,
"Z": -247.93343
"X": -346.83008,
"Y": -37.93451,
"Z": -236.64346
},
"TerritoryId": 138,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Western La Noscea - Aleport"
"AetheryteShortcut": "Western La Noscea - Aleport",
"Fly": true,
"SkipConditions": {
"StepIf": {
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
],
"Flying": "Locked"
}
}
},
{
"DataId": 2002396,
@ -40,17 +104,15 @@
"TerritoryId": 138,
"InteractionType": "Emote",
"Emote": "pray",
"$": "0 0 17 16 0 0 -> 17 0 1 16 0 128"
},
{
"Position": {
"X": -338.8092,
"Y": -15.966908,
"Z": -407.21075
},
"TerritoryId": 156,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Mor Dhona"
"$": "0 0 17 16 0 0 -> 17 0 1 16 0 128",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
128
]
},
{
"DataId": 2002397,
@ -62,7 +124,17 @@
"TerritoryId": 156,
"InteractionType": "Emote",
"Emote": "pray",
"$": "17 0 1 16 0 128 -> 33 16 1 0 0 192"
"AetheryteShortcut": "Mor Dhona",
"Fly": true,
"$": "17 0 1 16 0 128 -> 33 16 1 0 0 192",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
64
]
},
{
"Position": {
@ -72,7 +144,8 @@
},
"TerritoryId": 147,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant"
"AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant",
"Fly": true
},
{
"DataId": 2002398,
@ -84,7 +157,15 @@
"TerritoryId": 147,
"InteractionType": "Emote",
"Emote": "pray",
"$": "33 16 1 0 0 192 -> 0 0 0 0 0 0"
"$": "33 16 1 0 0 192 -> 0 0 0 0 0 0",
"CompletionQuestVariablesFlags": [
null,
null,
null,
null,
null,
32
]
}
]
},
@ -97,6 +178,7 @@
"Y": 8.006159,
"Z": 268.78055
},
"StopDistance": 0.25,
"TerritoryId": 153,
"AetheryteShortcut": "South Shroud - Camp Tranquil",
"InteractionType": "Jump",
@ -105,7 +187,41 @@
"X": -137.77051,
"Y": 7.7094107,
"Z": 275.28036
}}},
},
"DelaySeconds": 0.75
},
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
},
"StepIf": {
"Flying": "Unlocked",
"NearPosition": {
"Position": {
"X": -139.45221,
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
}
}
}
},
{
"Position": {
"X": -139.04318,
"Y": 8.522301,
"Z": 280.0128
},
"TerritoryId": 153,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"DataId": 1006751,
"Position": {
@ -129,7 +245,8 @@
},
"TerritoryId": 154,
"InteractionType": "WalkTo",
"AetheryteShortcut": "North Shroud - Fallgourd Float"
"AetheryteShortcut": "North Shroud - Fallgourd Float",
"Fly": true
},
{
"DataId": 2002399,
@ -152,6 +269,7 @@
"Y": 8.006159,
"Z": 268.78055
},
"StopDistance": 0.25,
"TerritoryId": 153,
"AetheryteShortcut": "South Shroud - Camp Tranquil",
"InteractionType": "Jump",
@ -160,7 +278,41 @@
"X": -137.77051,
"Y": 7.7094107,
"Z": 275.28036
}}},
},
"DelaySeconds": 0.75
},
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
},
"StepIf": {
"Flying": "Unlocked",
"NearPosition": {
"Position": {
"X": -139.45221,
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
}
}
}
},
{
"Position": {
"X": -139.04318,
"Y": 8.522301,
"Z": 280.0128
},
"TerritoryId": 153,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"DataId": 1006751,
"Position": {
@ -172,7 +324,8 @@
"InteractionType": "Interact"
}
]
},{
},
{
"Sequence": 5,
"Steps": [
{
@ -183,7 +336,16 @@
},
"TerritoryId": 139,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake"
"AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake",
"Fly": true,
"SkipConditions": {
"StepIf": {
"AetheryteUnlocked": "Outer La Noscea - Camp Overlook"
},
"AetheryteShortcutIf": {
"AetheryteUnlocked": "Outer La Noscea - Camp Overlook"
}
}
},
{
"Position": {
@ -193,11 +355,16 @@
},
"TerritoryId": 180,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Outer La Noscea - Camp Overlook"
"AetheryteShortcut": "Outer La Noscea - Camp Overlook",
"Fly": true,
"SkipConditions": {
"AetheryteShortcutIf": {
"AetheryteLocked": "Outer La Noscea - Camp Overlook"
}
}
},
{ "DataId": 2002400,
{
"DataId": 2002400,
"Position": {
"X": 117.32654,
"Y": 75.394775,
@ -218,6 +385,7 @@
"Y": 8.006159,
"Z": 268.78055
},
"StopDistance": 0.25,
"TerritoryId": 153,
"AetheryteShortcut": "South Shroud - Camp Tranquil",
"InteractionType": "Jump",
@ -226,7 +394,41 @@
"X": -137.77051,
"Y": 7.7094107,
"Z": 275.28036
}}},
},
"DelaySeconds": 0.75
},
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
},
"StepIf": {
"Flying": "Unlocked",
"NearPosition": {
"Position": {
"X": -139.45221,
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
}
}
}
},
{
"Position": {
"X": -139.04318,
"Y": 8.522301,
"Z": 280.0128
},
"TerritoryId": 153,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"DataId": 1006751,
"Position": {

View File

@ -5,6 +5,56 @@
{
"Sequence": 0,
"Steps": [
{
"Position": {
"X": -146.86935,
"Y": 8.006159,
"Z": 268.78055
},
"StopDistance": 0.25,
"TerritoryId": 153,
"AetheryteShortcut": "South Shroud - Camp Tranquil",
"InteractionType": "Jump",
"JumpDestination": {
"Position": {
"X": -137.77051,
"Y": 7.7094107,
"Z": 275.28036
},
"DelaySeconds": 0.75
},
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
},
"StepIf": {
"Flying": "Unlocked",
"NearPosition": {
"Position": {
"X": -139.45221,
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
}
}
}
},
{
"Position": {
"X": -139.04318,
"Y": 8.522301,
"Z": 280.0128
},
"TerritoryId": 153,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"DataId": 1006751,
"Position": {
@ -27,6 +77,7 @@
"Y": 8.561184,
"Z": 281.2085
},
"StopDistance": 5,
"TerritoryId": 153,
"InteractionType": "Interact"
}
@ -37,13 +88,27 @@
"Steps": [
{
"Position": {
"X": 52.996822,
"Y": 8.961273,
"Z": -110.2295
"X": 47.682095,
"Y": 9.470074,
"Z": -98.02502
},
"StopDistance": 0.25,
"TerritoryId": 153,
"InteractionType": "WalkTo",
"AetheryteShortcut": "South Shroud - Quarrymill"
"InteractionType": "Jump",
"AetheryteShortcut": "South Shroud - Quarrymill",
"JumpDestination": {
"Position": {
"X": 51.224842,
"Y": 9.313359,
"Z": -104.32791
},
"DelaySeconds": 0.2
},
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"DataId": 1007853,
@ -53,7 +118,8 @@
"Z": -111.25354
},
"TerritoryId": 153,
"InteractionType": "Interact"
"InteractionType": "Interact",
"Fly": true
}
]
},
@ -61,15 +127,6 @@
"Sequence": 3,
"Steps": [
{
"Position": {
"X": 149.47818,
"Y": 18.008802,
"Z": -128.02928
},
"TerritoryId": 153,
"InteractionType": "WalkTo"
},
{
"DataId": 2002403,
"Position": {
"X": 151.53735,
@ -80,7 +137,19 @@
"InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [
1940,1941,1942
1940,
1941,
1942
],
"CompletionQuestVariablesFlags": [
{
"Low": 3
},
null,
null,
null,
null,
null
]
},
{
@ -104,6 +173,7 @@
"Y": 8.006159,
"Z": 268.78055
},
"StopDistance": 0.25,
"TerritoryId": 153,
"AetheryteShortcut": "South Shroud - Camp Tranquil",
"InteractionType": "Jump",
@ -112,7 +182,38 @@
"X": -137.77051,
"Y": 7.7094107,
"Z": 275.28036
}}},
},
"DelaySeconds": 0.75
},
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked",
"NearPosition": {
"Position": {
"X": -139.45221,
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
}
}
}
},
{
"Position": {
"X": -139.04318,
"Y": 8.522301,
"Z": 280.0128
},
"TerritoryId": 153,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"DataId": 1006751,
"Position": {

View File

@ -5,6 +5,56 @@
{
"Sequence": 0,
"Steps": [
{
"Position": {
"X": -146.86935,
"Y": 8.006159,
"Z": 268.78055
},
"StopDistance": 0.25,
"TerritoryId": 153,
"AetheryteShortcut": "South Shroud - Camp Tranquil",
"InteractionType": "Jump",
"JumpDestination": {
"Position": {
"X": -137.77051,
"Y": 7.7094107,
"Z": 275.28036
},
"DelaySeconds": 0.75
},
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
},
"StepIf": {
"Flying": "Unlocked",
"NearPosition": {
"Position": {
"X": -139.45221,
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
}
}
}
},
{
"Position": {
"X": -139.04318,
"Y": 8.522301,
"Z": 280.0128
},
"TerritoryId": 153,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"DataId": 1006751,
"Position": {
@ -20,16 +70,6 @@
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -315.67767,
"Y": 20.999746,
"Z": 178.48499
},
"TerritoryId": 148,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Central Shroud - Bentbranch Meadows"
},
{
"DataId": 2002408,
"Position": {
@ -38,7 +78,9 @@
"Z": 179.70544
},
"TerritoryId": 148,
"InteractionType": "SinglePlayerDuty"
"InteractionType": "SinglePlayerDuty",
"AetheryteShortcut": "Central Shroud - Bentbranch Meadows",
"Fly": true
}
]
},
@ -51,6 +93,7 @@
"Y": 8.006159,
"Z": 268.78055
},
"StopDistance": 0.25,
"TerritoryId": 153,
"AetheryteShortcut": "South Shroud - Camp Tranquil",
"InteractionType": "Jump",
@ -59,7 +102,40 @@
"X": -137.77051,
"Y": 7.7094107,
"Z": 275.28036
}}
},
"DelaySeconds": 0.75
},
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
},
"StepIf": {
"Flying": "Unlocked",
"NearPosition": {
"Position": {
"X": -139.45221,
"Y": 8.712891,
"Z": 281.69678
},
"MaximumDistance": 3
}
}
}
},
{
"Position": {
"X": -139.04318,
"Y": 8.522301,
"Z": 280.0128
},
"TerritoryId": 153,
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"DataId": 1006751,
@ -69,8 +145,7 @@
"Z": 281.69678
},
"TerritoryId": 153,
"InteractionType": "CompleteQuest",
"NextQuestId": 1084
"InteractionType": "CompleteQuest"
}
]
}

View File

@ -0,0 +1,56 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1000323,
"Position": {
"X": -234.02765,
"Y": -4.0000043,
"Z": -11.093384
},
"TerritoryId": 133,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
133
]
}
}
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1000692,
"Position": {
"X": -258.8083,
"Y": -5.7735243,
"Z": -27.267883
},
"TerritoryId": 133,
"InteractionType": "CompleteQuest",
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_CLSCNJ998_00133_Q1_000_1",
"Yes": true
}
]
}
]
}
]
}

View File

@ -0,0 +1,167 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": ["Cacahuetes", "liza"],
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1000692,
"Position": {
"X": -258.8083,
"Y": -5.7735243,
"Z": -27.267883
},
"TerritoryId": 133,
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
],
"InteractionType": "AcceptQuest",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
133
]
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -482.67407,
"Y": 9.16599,
"Z": 207.46878
},
"TerritoryId": 152,
"InteractionType": "WalkTo",
"AetheryteShortcut": "East Shroud - Hawthorne Hut",
"Fly": true
},
{
"DataId": 1000767,
"Position": {
"X": -483.42108,
"Y": 10.130882,
"Z": 209.46057
},
"TerritoryId": 152,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 2001229,
"Position": {
"X": -510.6432,
"Y": 6.301941,
"Z": 35.78235
},
"TerritoryId": 152,
"InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
295
],
"Fly": true
}
]
},
{
"Sequence": 3,
"Steps": [
{
"Position": {
"X": -482.67407,
"Y": 9.16599,
"Z": 207.46878
},
"TerritoryId": 152,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1000767,
"Position": {
"X": -483.42108,
"Y": 10.130882,
"Z": 209.46057
},
"TerritoryId": 152,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 2001230,
"Position": {
"X": -510.76526,
"Y": 6.1798096,
"Z": 35.568726
},
"TerritoryId": 152,
"InteractionType": "SinglePlayerDuty",
"Fly": true
}
]
},
{
"Sequence": 5,
"Steps": [
{
"Position": {
"X": -482.67407,
"Y": 9.16599,
"Z": 207.46878
},
"TerritoryId": 152,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1000767,
"Position": {
"X": -483.42108,
"Y": 10.130882,
"Z": 209.46057
},
"TerritoryId": 152,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1000692,
"Position": {
"X": -258.8083,
"Y": -5.7735243,
"Z": -27.267883
},
"TerritoryId": 133,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
],
"NextQuestId": 92
}
]
}
]
}

View File

@ -0,0 +1,41 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1000323,
"Position": {
"X": -234.02765,
"Y": -4.0000043,
"Z": -11.093384
},
"TerritoryId": 133,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
133
]
}
},
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_CLSCNJ999_00182_Q1_000_1",
"Yes": true
}
]
}
]
}
]
}

View File

@ -0,0 +1,175 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1000692,
"Position": {
"X": -258.8083,
"Y": -5.7735243,
"Z": -27.267883
},
"TerritoryId": 133,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
133
]
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": 97.18397,
"Y": 17.128555,
"Z": -269.5008
},
"TerritoryId": 148,
"InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies",
"ComplexCombatData": [
{
"DataId": 37,
"CompletionQuestVariablesFlags": [
{
"Low": 3
},
null,
null,
null,
null,
null
],
"MinimumKillCount": 3
}
],
"CompletionQuestVariablesFlags": [
{
"Low": 3
},
null,
null,
null,
null,
null
],
"$": "0 0 0 0 0 0 -> 19 0 0 0 0 0",
"AethernetShortcut": [
"[Gridania] Conjurers' Guild",
"[Gridania] Blue Badger Gate (Central Shroud)"
]
},
{
"Position": {
"X": 119.449745,
"Y": 17.399649,
"Z": -259.6467
},
"TerritoryId": 148,
"InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies",
"ComplexCombatData": [
{
"DataId": 49,
"CompletionQuestVariablesFlags": [
null,
{
"High": 3
},
null,
null,
null,
null
],
"MinimumKillCount": 3
}
],
"CompletionQuestVariablesFlags": [
null,
{
"High": 3
},
null,
null,
null,
null
],
"$": "19 0 0 0 0 0 -> 35 48 0 0 0 0"
},
{
"Position": {
"X": 83.756714,
"Y": 4.1801105,
"Z": -191.24133
},
"TerritoryId": 148,
"InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies",
"ComplexCombatData": [
{
"DataId": 47,
"CompletionQuestVariablesFlags": [
null,
{
"Low": 3
},
null,
null,
null,
null
],
"MinimumKillCount": 3
}
],
"CompletionQuestVariablesFlags": [
null,
{
"Low": 3
},
null,
null,
null,
null
],
"$": "35 48 0 0 0 0 -> 35 51 0 0 0 0 // This one automatically went to 0 0 0 0 0 0 so I am not sure about the 51 part"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1000692,
"Position": {
"X": -258.8083,
"Y": -5.7735243,
"Z": -27.267883
},
"TerritoryId": 133,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
],
"NextQuestId": 48
}
]
}
]
}

View File

@ -6,19 +6,25 @@
"Sequence": 0,
"Steps": [
{
"DataId": 1000692,
"DataId": 1000323,
"Position": {
"X": -258.8083,
"Y": -5.7735243,
"Z": -27.267883
"X": -234.02765,
"Y": -4.0000043,
"Z": -11.093384
},
"TerritoryId": 133,
"AetheryteShortcut": "Gridania",
"AethernetShortcut": ["[Gridania] Aetheryte Plaza","[Gridania] Conjurers' Guild"],
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
],
"InteractionType": "AcceptQuest",
"SkipConditions": {
"AetheryteShortcutIf": {
"NotInSameTerritory": true
"InSameTerritory": true,
"InTerritory": [
133
]
}
}
}
@ -39,9 +45,8 @@
"DialogueChoices": [
{
"Type": "YesNo",
"Prompt": "TEXT_CLSGLA020_00253_Q1_000_1",
"Yes": true,
"$": "Need to find real prompt in godbert"
"Prompt": "TEXT_CLSCNJ000_00022_Q1_000_1",
"Yes": true
}
]
}
@ -50,19 +55,6 @@
{
"Sequence": 2,
"Steps": [
{
"Position": {
"X": 104.02482,
"Y": 14.71474,
"Z": -263.02206
},
"TerritoryId": 148,
"InteractionType": "WalkTo",
"AethernetShortcut": [
"[Gridania] Conjurers' Guild",
"[Gridania] Blue Badger Gate (Central Shroud)"
]
},
{
"Position": {
"X": 97.18397,
@ -76,7 +68,9 @@
{
"DataId": 37,
"CompletionQuestVariablesFlags": [
null,
{
"Low": 3
},
null,
null,
null,
@ -87,14 +81,20 @@
}
],
"CompletionQuestVariablesFlags": [
null,
{
"Low": 3
},
null,
null,
null,
null,
null
],
"$": "0 0 0 0 0 0 -> 19 0 0 0 0 0"
"$": "0 0 0 0 0 0 -> 19 0 0 0 0 0",
"AethernetShortcut": [
"[Gridania] Conjurers' Guild",
"[Gridania] Blue Badger Gate (Central Shroud)"
]
},
{
"Position": {
@ -110,7 +110,9 @@
"DataId": 49,
"CompletionQuestVariablesFlags": [
null,
null,
{
"High": 3
},
null,
null,
null,
@ -121,7 +123,9 @@
],
"CompletionQuestVariablesFlags": [
null,
null,
{
"High": 3
},
null,
null,
null,
@ -143,7 +147,9 @@
"DataId": 47,
"CompletionQuestVariablesFlags": [
null,
null,
{
"Low": 3
},
null,
null,
null,
@ -154,7 +160,9 @@
],
"CompletionQuestVariablesFlags": [
null,
null,
{
"Low": 3
},
null,
null,
null,
@ -168,17 +176,6 @@
"Sequence": 255,
"Steps": [
{
"Position": {
"X": -259.39578,
"Y": -5.7723713,
"Z": -24.069485
},
"TerritoryId": 133,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": ["[Gridania] Aetheryte Plaza","[Gridania] Conjurers' Guild"]
},
{
"DataId": 1000692,
"Position": {
"X": -258.8083,
@ -187,6 +184,11 @@
},
"TerritoryId": 133,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
],
"NextQuestId": 48
}
]

View File

@ -21,7 +21,10 @@
"InteractionType": "AcceptQuest",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": false
"InSameTerritory": true,
"InTerritory": [
133
]
}
}
}
@ -30,16 +33,6 @@
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -172.66434,
"Y": 8.378755,
"Z": -54.010723
},
"TerritoryId": 153,
"InteractionType": "WalkTo",
"AetheryteShortcut": "South Shroud - Quarrymill"
},
{
"DataId": 1008149,
"Position": {
@ -48,22 +41,15 @@
"Z": -55.222473
},
"TerritoryId": 153,
"InteractionType": "Interact"
"InteractionType": "Interact",
"AetheryteShortcut": "South Shroud - Quarrymill",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"Position": {
"X": -182.20464,
"Y": 9.869227,
"Z": -77.148476
},
"TerritoryId": 153,
"InteractionType": "WalkTo"
},
{
"DataId": 1008146,
"Position": {
@ -79,15 +65,6 @@
{
"Sequence": 3,
"Steps": [
{
"Position": {
"X": 25.950283,
"Y": 4.080406,
"Z": 33.51876
},
"TerritoryId": 153,
"InteractionType": "WalkTo"
},
{
"DataId": 1008150,
"Position": {
@ -96,22 +73,14 @@
"Z": 35.38562
},
"TerritoryId": 153,
"InteractionType": "SinglePlayerDuty"
"InteractionType": "SinglePlayerDuty",
"Fly": true
}
]
},
{
"Sequence": 4,
"Steps": [
{
"Position": {
"X": 40.772614,
"Y": 3.1398523,
"Z": 32.263535
},
"TerritoryId": 153,
"InteractionType": "WalkTo"
},
{
"DataId": 1008157,
"Position": {
@ -127,20 +96,6 @@
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": -259.39578,
"Y": -5.7723713,
"Z": -24.069485
},
"TerritoryId": 133,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
]
},
{
"DataId": 1000692,
"Position": {
@ -150,6 +105,11 @@
},
"TerritoryId": 133,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
],
"NextQuestId": 441
}
]

View File

@ -21,7 +21,10 @@
"InteractionType": "AcceptQuest",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": false
"InSameTerritory": true,
"InTerritory": [
133
]
}
}
}
@ -30,16 +33,6 @@
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": 45.534206,
"Y": 6.2985306,
"Z": -1.4239028
},
"TerritoryId": 153,
"InteractionType": "WalkTo",
"AetheryteShortcut": "South Shroud - Quarrymill"
},
{
"DataId": 2000899,
"Position": {
@ -52,22 +45,15 @@
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
294
]
],
"AetheryteShortcut": "South Shroud - Quarrymill",
"Fly": true
}
]
},
{
"Sequence": 2,
"Steps": [
{
"Position": {
"X": 46.887703,
"Y": 6.348098,
"Z": -2.0700083
},
"TerritoryId": 153,
"InteractionType": "WalkTo"
},
{
"DataId": 1002965,
"Position": {
@ -75,6 +61,7 @@
"Y": 6.6893935,
"Z": -3.2490644
},
"StopDistance": 7,
"TerritoryId": 153,
"InteractionType": "Interact"
}
@ -83,15 +70,6 @@
{
"Sequence": 3,
"Steps": [
{
"Position": {
"X": 121.718864,
"Y": 17.688908,
"Z": -134.5164
},
"TerritoryId": 153,
"InteractionType": "WalkTo"
},
{
"DataId": 2000901,
"Position": {
@ -104,22 +82,14 @@
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
294
]
],
"Fly": true
}
]
},
{
"Sequence": 4,
"Steps": [
{
"Position": {
"X": 122.99925,
"Y": 17.652422,
"Z": -130.71101
},
"TerritoryId": 153,
"InteractionType": "WalkTo"
},
{
"DataId": 1002966,
"Position": {
@ -127,6 +97,7 @@
"Y": 17.550354,
"Z": -129.90009
},
"StopDistance": 7,
"TerritoryId": 153,
"InteractionType": "Interact"
}
@ -135,15 +106,6 @@
{
"Sequence": 5,
"Steps": [
{
"Position": {
"X": 290.62793,
"Y": 15.393364,
"Z": -108.41017
},
"TerritoryId": 153,
"InteractionType": "WalkTo"
},
{
"DataId": 2000906,
"Position": {
@ -156,22 +118,14 @@
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
294
]
],
"Fly": true
}
]
},
{
"Sequence": 6,
"Steps": [
{
"Position": {
"X": 292.93207,
"Y": 16.015324,
"Z": -111.772804
},
"TerritoryId": 153,
"InteractionType": "WalkTo"
},
{
"DataId": 1002967,
"Position": {
@ -179,6 +133,7 @@
"Y": 16.181925,
"Z": -112.68793
},
"StopDistance": 7,
"TerritoryId": 153,
"InteractionType": "Interact"
}
@ -187,15 +142,6 @@
{
"Sequence": 7,
"Steps": [
{
"Position": {
"X": 331.04,
"Y": 4.1329737,
"Z": -83.1279
},
"TerritoryId": 153,
"InteractionType": "WalkTo"
},
{
"DataId": 1002968,
"Position": {
@ -204,26 +150,14 @@
"Z": -85.648926
},
"TerritoryId": 153,
"InteractionType": "SinglePlayerDuty"
"InteractionType": "SinglePlayerDuty",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{"Position": {
"X": -259.39578,
"Y": -5.7723713,
"Z": -24.069485
},
"TerritoryId": 133,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
]
},
{
"DataId": 1000692,
"Position": {
@ -233,6 +167,11 @@
},
"TerritoryId": 133,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
],
"NextQuestId": 1079
}
]

View File

@ -14,11 +14,17 @@
},
"TerritoryId": 133,
"AetheryteShortcut": "Gridania",
"AethernetShortcut": ["[Gridania] Aetheryte Plaza","[Gridania] Conjurers' Guild"],
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
],
"InteractionType": "AcceptQuest",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": false
"InSameTerritory": true,
"InTerritory": [
133
]
}
}
}
@ -29,13 +35,22 @@
"Steps": [
{
"Position": {
"X": 219.22334,
"Y": -28.377773,
"Z": 335.86304
"X": 220.82336,
"Y": -28.335487,
"Z": 336.9016
},
"AethernetShortcut": ["[Gridania] Conjurers' Guild","[Gridania] Yellow Serpent Gate (North Shroud)"],
"AethernetShortcut": [
"[Gridania] Conjurers' Guild",
"[Gridania] Yellow Serpent Gate (North Shroud)"
],
"TerritoryId": 154,
"InteractionType": "WalkTo"
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"DataId": 1000764,
@ -52,15 +67,6 @@
{
"Sequence": 2,
"Steps": [
{
"Position": {
"X": 326.5162,
"Y": -5.344409,
"Z": 388.57553
},
"TerritoryId": 154,
"InteractionType": "WalkTo"
},
{
"DataId": 2000883,
"Position": {
@ -73,7 +79,8 @@
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
294
]
],
"Fly": true
}
]
},
@ -82,12 +89,18 @@
"Steps": [
{
"Position": {
"X": 219.22334,
"Y": -28.377773,
"Z": 335.86304
"X": 220.82336,
"Y": -28.335487,
"Z": 336.9016
},
"TerritoryId": 154,
"InteractionType": "WalkTo"
"InteractionType": "WalkTo",
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"DataId": 1000764,
@ -104,20 +117,6 @@
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": -259.39578,
"Y": -5.7723713,
"Z": -24.069485
},
"TerritoryId": 133,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
]
},
{
"DataId": 1000692,
"Position": {
@ -127,6 +126,11 @@
},
"TerritoryId": 133,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
],
"NextQuestId": 91
}
]

View File

@ -21,7 +21,10 @@
"InteractionType": "AcceptQuest",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": false
"InSameTerritory": true,
"InTerritory": [
133
]
}
}
}
@ -30,16 +33,6 @@
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -480.4995,
"Y": 8.030102,
"Z": 206.82132
},
"TerritoryId": 152,
"InteractionType": "WalkTo",
"AetheryteShortcut": "East Shroud - Hawthorne Hut"
},
{
"DataId": 1000767,
"Position": {
@ -48,22 +41,19 @@
"Z": 209.46057
},
"TerritoryId": 152,
"InteractionType": "Interact"
"InteractionType": "Interact",
"AetheryteShortcut": "East Shroud - Hawthorne Hut",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
}
]
},
{
"Sequence": 2,
"Steps": [
{
"Position": {
"X": -511.13126,
"Y": 6.470027,
"Z": 38.589493
},
"TerritoryId": 152,
"InteractionType": "WalkTo"
},
{
"DataId": 2000885,
"Position": {
@ -83,15 +73,6 @@
{
"Sequence": 3,
"Steps": [
{
"Position": {
"X": -480.4995,
"Y": 8.030102,
"Z": 206.82132
},
"TerritoryId": 152,
"InteractionType": "WalkTo"
},
{
"DataId": 1000767,
"Position": {
@ -107,15 +88,6 @@
{
"Sequence": 4,
"Steps": [
{
"Position": {
"X": -512.33844,
"Y": 6.7128515,
"Z": 39.61134
},
"TerritoryId": 152,
"InteractionType": "WalkTo"
},
{
"DataId": 2000887,
"Position": {
@ -131,15 +103,6 @@
{
"Sequence": 5,
"Steps": [
{
"Position": {
"X": -480.4995,
"Y": 8.030102,
"Z": 206.82132
},
"TerritoryId": 152,
"InteractionType": "WalkTo"
},
{
"DataId": 1000767,
"Position": {
@ -155,20 +118,6 @@
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": -259.39578,
"Y": -5.7723713,
"Z": -24.069485
},
"TerritoryId": 133,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
]
},
{
"DataId": 1000692,
"Position": {
@ -178,6 +127,11 @@
},
"TerritoryId": 133,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
],
"NextQuestId": 92
}
]

View File

@ -21,7 +21,10 @@
"InteractionType": "AcceptQuest",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": false
"InSameTerritory": true,
"InTerritory": [
133
]
}
}
}
@ -38,7 +41,8 @@
},
"TerritoryId": 152,
"InteractionType": "WalkTo",
"AetheryteShortcut": "East Shroud - Hawthorne Hut"
"AetheryteShortcut": "East Shroud - Hawthorne Hut",
"Fly": true
},
{
"DataId": 2000889,
@ -60,6 +64,35 @@
{
"Sequence": 2,
"Steps": [
{
"Position": {
"X": -235.35493,
"Y": 3.539142,
"Z": 293.25888
},
"TerritoryId": 152,
"InteractionType": "WalkTo",
"Fly": true
},
{
"Position": {
"X": -233.34848,
"Y": 3.5425713,
"Z": 285.89532
},
"TerritoryId": 152,
"InteractionType": "WalkTo"
},
{
"Position": {
"X": -228.59554,
"Y": 3.554365,
"Z": 283.47638
},
"TerritoryId": 152,
"InteractionType": "WalkTo",
"DisableNavmesh": true
},
{
"Position": {
"X": -228.65686,
@ -86,13 +119,43 @@
"Steps": [
{
"Position": {
"X": -210.88799,
"Y": 22.813288,
"Z": 243.95592
"X": -228.59554,
"Y": 3.554365,
"Z": 283.47638
},
"TerritoryId": 152,
"InteractionType": "WalkTo",
"Mount": true
},
{
"Position": {
"X": -233.34848,
"Y": 3.5425713,
"Z": 285.89532
},
"TerritoryId": 152,
"InteractionType": "WalkTo",
"DisableNavmesh": true
},
{
"Position": {
"X": -256.5985,
"Y": 0.9818871,
"Z": 287.17072
},
"TerritoryId": 152,
"InteractionType": "WalkTo"
},
{
"Position": {
"X": -220.44954,
"Y": 22.910912,
"Z": 243.81
},
"TerritoryId": 152,
"InteractionType": "WalkTo",
"Fly": true
},
{
"DataId": 1000619,
"Position": {
@ -108,15 +171,6 @@
{
"Sequence": 4,
"Steps": [
{
"Position": {
"X": -236.00592,
"Y": 17.87103,
"Z": 245.8962
},
"TerritoryId": 152,
"InteractionType": "WalkTo"
},
{
"DataId": 1003001,
"Position": {
@ -125,20 +179,22 @@
"Z": 245.68542
},
"TerritoryId": 152,
"InteractionType": "WaitForManualProgress",
"$": "Action needs to be cure, cure needs to be added to schema--manual until then"
"InteractionType": "Action",
"Action": "Cure"
}
]
},
{
"Sequence": 5,
"Steps": [
{"DataId": 1003057,
{
"DataId": 1003057,
"Position": {
"X": -237.6593,
"Y": 17.850079,
"Z": 243.48816
},
"StopDistance": 7,
"TerritoryId": 152,
"InteractionType": "Interact"
}
@ -147,15 +203,6 @@
{
"Sequence": 6,
"Steps": [
{
"Position": {
"X": -63.76642,
"Y": -8.177125,
"Z": 232.76166
},
"TerritoryId": 152,
"InteractionType": "WalkTo"
},
{
"DataId": 1001213,
"Position": {
@ -164,22 +211,14 @@
"Z": 231.15894
},
"TerritoryId": 152,
"InteractionType": "SinglePlayerDuty"
"InteractionType": "SinglePlayerDuty",
"Fly": true
}
]
},
{
"Sequence": 7,
"Steps": [
{
"Position": {
"X": -75.92712,
"Y": -9.128448,
"Z": 280.5949
},
"TerritoryId": 152,
"InteractionType": "WalkTo"
},
{
"DataId": 1003006,
"Position": {
@ -195,20 +234,6 @@
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": -259.39578,
"Y": -5.7723713,
"Z": -24.069485
},
"TerritoryId": 133,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
]
},
{
"DataId": 1000692,
"Position": {
@ -218,6 +243,11 @@
},
"TerritoryId": 133,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
],
"NextQuestId": 93
}
]

View File

@ -21,7 +21,10 @@
"InteractionType": "AcceptQuest",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": false
"InSameTerritory": true,
"InTerritory": [
133
]
}
}
}
@ -30,16 +33,6 @@
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -72.07284,
"Y": 1,
"Z": -33.972404
},
"TerritoryId": 148,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Central Shroud - Bentbranch Meadows"
},
{
"DataId": 2000891,
"Position": {
@ -52,7 +45,9 @@
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
294
]
],
"AetheryteShortcut": "Central Shroud - Bentbranch Meadows",
"Fly": true
}
]
},
@ -60,15 +55,6 @@
"Sequence": 2,
"Steps": [
{
"Position": {
"X": -67.59361,
"Y": 1,
"Z": -36.785305
},
"TerritoryId": 148,
"InteractionType": "WalkTo"
},
{
"DataId": 1002961,
"Position": {
"X": -66.7583,
@ -83,15 +69,6 @@
{
"Sequence": 3,
"Steps": [
{
"Position": {
"X": 148.54672,
"Y": -5.9836235,
"Z": -34.821217
},
"TerritoryId": 148,
"InteractionType": "WalkTo"
},
{
"DataId": 2000893,
"Position": {
@ -104,22 +81,14 @@
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
299
]
],
"Fly": true
}
]
},
{
"Sequence": 4,
"Steps": [
{
"Position": {
"X": 155.83203,
"Y": -6.3384933,
"Z": -34.853024
},
"TerritoryId": 148,
"InteractionType": "WalkTo"
},
{
"DataId": 1002962,
"Position": {
@ -135,15 +104,6 @@
{
"Sequence": 5,
"Steps": [
{
"Position": {
"X": 330.1284,
"Y": -31.660528,
"Z": 413.6492
},
"TerritoryId": 148,
"InteractionType": "WalkTo"
},
{
"DataId": 2000895,
"Position": {
@ -156,22 +116,14 @@
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
297
]
],
"Fly": true
}
]
},
{
"Sequence": 6,
"Steps": [
{
"Position": {
"X": 335.10825,
"Y": -31.669537,
"Z": 422.18082
},
"TerritoryId": 148,
"InteractionType": "WalkTo"
},
{
"DataId": 1002963,
"Position": {
@ -187,20 +139,6 @@
{
"Sequence": 255,
"Steps": [
{
"Position": {
"X": -259.39578,
"Y": -5.7723713,
"Z": -24.069485
},
"TerritoryId": 133,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
]
},
{
"DataId": 1000692,
"Position": {
@ -210,6 +148,11 @@
},
"TerritoryId": 133,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Gridania",
"AethernetShortcut": [
"[Gridania] Aetheryte Plaza",
"[Gridania] Conjurers' Guild"
],
"NextQuestId": 440
}
]

View File

@ -1,5 +0,0 @@
All ARR Cnj and Whm Quest paths for Questionable. All are verified. Should all work.
navigation in Camp Tranquil is hit or miss depending on Navmesh.
Cure is not an action in the plugin yet, so that part of the quest needs to be done manually.

View File

@ -29,10 +29,12 @@
"TerritoryId": 148,
"InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies",
"KillEnemyDataIds": [
43
],
"Comment": "Kill Chigoes manually"
"ComplexCombatData": [
{
"DataId": 43,
"MinimumKillCount": 3
}
]
}
]
},

View File

@ -56,24 +56,7 @@
"exclusiveMinimum": 0
},
"Position": {
"type": "object",
"description": "Position to (typically) walk to",
"properties": {
"X": {
"type": "number"
},
"Y": {
"type": "number"
},
"Z": {
"type": "number"
}
},
"required": [
"X",
"Y",
"Z"
]
"$ref": "https://git.carvel.li/liza/Questionable/raw/branch/master/Questionable.Model/common-schema.json#/$defs/Vector3"
},
"StopDistance": {
"type": [
@ -243,6 +226,22 @@
"AetheryteUnlocked": {
"$ref": "https://git.carvel.li/liza/Questionable/raw/branch/master/Questionable.Model/common-schema.json#/$defs/Aetheryte"
},
"NearPosition": {
"type": "object",
"properties": {
"Position": {
"$ref": "https://git.carvel.li/liza/Questionable/raw/branch/master/Questionable.Model/common-schema.json#/$defs/Vector3"
},
"MaximumDistance": {
"type": "number"
}
},
"required": [
"Position",
"MaximumDistance"
],
"additionalProperties": false
},
"ExtraCondition": {
"type": "string",
"enum": [
@ -814,24 +813,7 @@
"type": "object",
"properties": {
"Position": {
"type": "object",
"description": "Position to try reaching after the jump",
"properties": {
"X": {
"type": "number"
},
"Y": {
"type": "number"
},
"Z": {
"type": "number"
}
},
"required": [
"X",
"Y",
"Z"
]
"$ref": "https://git.carvel.li/liza/Questionable/raw/branch/master/Questionable.Model/common-schema.json#/$defs/Vector3"
},
"StopDistance": {
"type": [

View File

@ -0,0 +1,12 @@
using System.Numerics;
using System.Text.Json.Serialization;
using Questionable.Model.Common.Converter;
namespace Questionable.Model.Questing;
public sealed class NearPositionCondition
{
[JsonConverter(typeof(VectorConverter))]
public Vector3 Position { get; set; }
public float MaximumDistance { get; set; }
}

View File

@ -18,6 +18,7 @@ public sealed class SkipStepConditions
public List<ElementId> QuestsCompleted { get; set; } = new();
public EAetheryteLocation? AetheryteLocked { get; set; }
public EAetheryteLocation? AetheryteUnlocked { get; set; }
public NearPositionCondition? NearPosition { get; set; }
public EExtraSkipCondition? ExtraCondition { get; set; }
public bool HasSkipConditions()
@ -35,12 +36,13 @@ public sealed class SkipStepConditions
QuestsCompleted.Count > 0 ||
AetheryteLocked != null ||
AetheryteUnlocked != null ||
NearPosition != null ||
ExtraCondition != null;
}
public override string ToString()
{
return
$"{nameof(Never)}: {Never}, {nameof(CompletionQuestVariablesFlags)}: {CompletionQuestVariablesFlags}, {nameof(Flying)}: {Flying}, {nameof(Chocobo)}: {Chocobo}, {nameof(NotTargetable)}: {NotTargetable}, {nameof(InTerritory)}: {string.Join(" ", InTerritory)}, {nameof(NotInTerritory)}: {string.Join(" ", NotInTerritory)}, {nameof(Item)}: {Item}, {nameof(QuestsAccepted)}: {string.Join(" ", QuestsAccepted)}, {nameof(QuestsCompleted)}: {string.Join(" ", QuestsCompleted)}, {nameof(ExtraCondition)}: {ExtraCondition}";
$"{nameof(Never)}: {Never}, {nameof(CompletionQuestVariablesFlags)}: {CompletionQuestVariablesFlags}, {nameof(Flying)}: {Flying}, {nameof(Chocobo)}: {Chocobo}, {nameof(NotTargetable)}: {NotTargetable}, {nameof(InTerritory)}: {string.Join(" ", InTerritory)}, {nameof(NotInTerritory)}: {string.Join(" ", NotInTerritory)}, {nameof(Item)}: {Item}, {nameof(QuestsAccepted)}: {string.Join(" ", QuestsAccepted)}, {nameof(QuestsCompleted)}: {string.Join(" ", QuestsCompleted)}, {nameof(NearPosition)}: {NearPosition}, {nameof(ExtraCondition)}: {ExtraCondition}";
}
}

View File

@ -2,6 +2,26 @@
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://git.carvel.li/liza/Questionable/raw/branch/master/Questionable.Model/common-schema.json",
"$defs": {
"Vector3": {
"type": "object",
"description": "Position to try reaching after the jump",
"properties": {
"X": {
"type": "number"
},
"Y": {
"type": "number"
},
"Z": {
"type": "number"
}
},
"required": [
"X",
"Y",
"Z"
]
},
"Aetheryte": {
"type": "string",
"enum": [

View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using Dalamud.Game.ClientState.Objects.Types;
using Dalamud.Plugin.Services;
using FFXIVClientStructs.FFXIV.Application.Network.WorkDefinitions;
@ -204,6 +205,15 @@ internal static class SkipCondition
}
}
if (SkipConditions.NearPosition is { } nearPosition && clientState.TerritoryType == Step.TerritoryId)
{
if (Vector3.Distance(nearPosition.Position, clientState.LocalPlayer!.Position) <= nearPosition.MaximumDistance)
{
logger.LogInformation("Skipping step, as we're near the position");
return true;
}
}
if (SkipConditions.ExtraCondition == EExtraSkipCondition.WakingSandsMainArea &&
clientState.TerritoryType == 212)
{

View File

@ -1,6 +1,5 @@
<Project Sdk="Dalamud.NET.Sdk/10.0.0">
<PropertyGroup>
<Version>2.4</Version>
<OutputPath>dist</OutputPath>
<PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap>
<Platforms>x64</Platforms>