diff --git a/Directory.Build.targets b/Directory.Build.targets index b914cd1e..2ad15fb9 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,5 @@ - 2.6 + 2.7 diff --git a/QuestPathGenerator/RoslynShortcuts.cs b/QuestPathGenerator/RoslynShortcuts.cs index d8ff117d..82b9ecba 100644 --- a/QuestPathGenerator/RoslynShortcuts.cs +++ b/QuestPathGenerator/RoslynShortcuts.cs @@ -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( + 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(); diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1079_Seer Folly.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1079_Seer Folly.json index 7f96c7d5..887f8855 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1079_Seer Folly.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1079_Seer Folly.json @@ -1,87 +1,109 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "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": { + "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": false + "InSameTerritory": true, + "InTerritory": [ + 133 + ] } } - } - ] - }, - { - "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": { - "X": -271.87, - "Y": 19.663366, - "Z": 97.42883 -}, -"TerritoryId": 148, -"InteractionType": "SinglePlayerDuty" - } - ] - }, - { - "Sequence": 255, - "Steps": [ - { - "Position": { - "X": -146.86935, - "Y": 8.006159, - "Z": 268.78055 - }, - "TerritoryId": 153, - "AetheryteShortcut": "South Shroud - Camp Tranquil", - "InteractionType": "Jump", - "JumpDestination": { - "Position": { - "X": -137.77051, - "Y": 7.7094107, - "Z": 275.28036 - }}}, - { - "DataId": 1006751, - "Position": { - "X": -139.45221, - "Y": 8.712891, - "Z": 281.69678 - }, - "TerritoryId": 153, - "InteractionType": "CompleteQuest", -"NextQuestId": 1080 - } - ] } - ] -} \ No newline at end of file + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1007850, + "Position": { + "X": -271.87, + "Y": 19.663366, + "Z": 97.42883 + }, + "TerritoryId": 148, + "InteractionType": "SinglePlayerDuty", + "AetheryteShortcut": "Central Shroud - Bentbranch Meadows", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "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" + } + } + }, + { + "Position": { + "X": -139.04318, + "Y": 8.522301, + "Z": 280.0128 + }, + "TerritoryId": 153, + "InteractionType": "WalkTo", + "Fly": true, + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } + }, + { + "DataId": 1006751, + "Position": { + "X": -139.45221, + "Y": 8.712891, + "Z": 281.69678 + }, + "TerritoryId": 153, + "InteractionType": "CompleteQuest", + "NextQuestId": 1080 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1080_Only You Can Prevent Forest Ire.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1080_Only You Can Prevent Forest Ire.json index 9df26da8..729b4b3f 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1080_Only You Can Prevent Forest Ire.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1080_Only You Can Prevent Forest Ire.json @@ -1,96 +1,187 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "Sequence": 0, - "Steps": [ - { - "DataId": 1006751, - "Position": { - "X": -139.45221, - "Y": 8.712891, - "Z": 281.69678 - }, - "TerritoryId": 153, - "InteractionType": "AcceptQuest" - } - ] - }, - { - "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": { - "X": -416.5561, - "Y": 60.990234, - "Z": -148.63812 -}, -"TerritoryId": 148, -"InteractionType": "Combat", -"EnemySpawnType": "AutoOnEnterArea", -"KillEnemyDataIds": [ - 1937 -] - - }, - { - "DataId": 2002392, -"Position": { - "X": -416.5561, - "Y": 60.990234, - "Z": -148.63812 -}, -"TerritoryId": 148, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 255, - "Steps": [ - { - "Position": { - "X": -146.86935, - "Y": 8.006159, - "Z": 268.78055 -}, -"TerritoryId": 153, - "AetheryteShortcut": "South Shroud - Camp Tranquil", - "InteractionType": "Jump", + "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 -}}}, - { - "DataId": 1006751, -"Position": { - "X": -139.45221, - "Y": 8.712891, - "Z": 281.69678 -}, -"TerritoryId": 153, -"InteractionType": "CompleteQuest", -"NextQuestId": 1081 - } - ] + "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": { + "X": -139.45221, + "Y": 8.712891, + "Z": 281.69678 + }, + "TerritoryId": 153, + "InteractionType": "AcceptQuest" } - ] -} \ No newline at end of file + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2002392, + "Position": { + "X": -416.5561, + "Y": 60.990234, + "Z": -148.63812 + }, + "TerritoryId": 148, + "InteractionType": "Combat", + "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, + "Position": { + "X": -416.5561, + "Y": 60.990234, + "Z": -148.63812 + }, + "TerritoryId": 148, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "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": { + "X": -139.45221, + "Y": 8.712891, + "Z": 281.69678 + }, + "TerritoryId": 153, + "InteractionType": "CompleteQuest", + "NextQuestId": 1081 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1081_O Brother, Where Art Thou.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1081_O Brother, Where Art Thou.json index 8cc32c5e..48d669d2 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1081_O Brother, Where Art Thou.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1081_O Brother, Where Art Thou.json @@ -1,114 +1,194 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "Sequence": 0, - "Steps": [ - { - "DataId": 1006751, - "Position": { - "X": -139.45221, - "Y": 8.712891, - "Z": 281.69678 - }, - "TerritoryId": 153, - "InteractionType": "AcceptQuest" - } - ] - }, - { - "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, - "Y": 12.935407, - "Z": -46.28064 -}, -"TerritoryId": 152, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 2, - "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 -}, -"TerritoryId": 152, -"InteractionType": "Combat", -"EnemySpawnType": "AutoOnEnterArea", -"KillEnemyDataIds": [ - 1938,1939 -] - }, - { - "DataId": 2002394, -"Position": { - "X": -271.5343, - "Y": 13.748352, - "Z": -51.773926 -}, -"TerritoryId": 152, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 255, - "Steps": [ - { - "Position": { - "X": -146.86935, - "Y": 8.006159, - "Z": 268.78055 -}, -"TerritoryId": 153, - "AetheryteShortcut": "South Shroud - Camp Tranquil", - "InteractionType": "Jump", + "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 -}}}, - { - "DataId": 1006751, -"Position": { - "X": -139.45221, - "Y": 8.712891, - "Z": 281.69678 -}, -"TerritoryId": 153, -"InteractionType": "CompleteQuest", -"NextQuestId": 1082 - } - ] + "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": { + "X": -139.45221, + "Y": 8.712891, + "Z": 281.69678 + }, + "TerritoryId": 153, + "InteractionType": "AcceptQuest" } - ] -} \ No newline at end of file + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1007852, + "Position": { + "X": -272.38885, + "Y": 12.935407, + "Z": -46.28064 + }, + "TerritoryId": 152, + "InteractionType": "Interact", + "AetheryteShortcut": "East Shroud - Hawthorne Hut", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": -271.5343, + "Y": 13.748352, + "Z": -51.773926 + }, + "StopDistance": 2, + "TerritoryId": 152, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 1938, + 1939 + ], + "CompletionQuestVariablesFlags": [ + { + "Low": 4 + }, + null, + null, + null, + null, + null + ] + }, + { + "DataId": 2002394, + "Position": { + "X": -271.5343, + "Y": 13.748352, + "Z": -51.773926 + }, + "TerritoryId": 152, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "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": { + "X": -139.45221, + "Y": 8.712891, + "Z": 281.69678 + }, + "TerritoryId": 153, + "InteractionType": "CompleteQuest", + "NextQuestId": 1082 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1082_Following in His Footsteps.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1082_Following in His Footsteps.json index e3b6691d..4be0c9df 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1082_Following in His Footsteps.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1082_Following in His Footsteps.json @@ -1,244 +1,446 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "Sequence": 0, - "Steps": [ - { - "DataId": 1006751, - "Position": { - "X": -139.45221, - "Y": 8.712891, - "Z": 281.69678 - }, - "TerritoryId": 153, - "InteractionType": "AcceptQuest" - } - ] + "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 + } + } + } }, { - "Sequence": 1, - "Steps": [ - { - "Position": { - "X": -345.86627, - "Y": -37.41542, - "Z": -247.93343 -}, -"TerritoryId": 138, -"InteractionType": "WalkTo", -"AetheryteShortcut": "Western La Noscea - Aleport" - }, - { - "DataId": 2002396, -"Position": { - "X": -347.34113, - "Y": -36.240234, - "Z": -249.6529 -}, -"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" - }, - { - "DataId": 2002397, -"Position": { - "X": -339.46753, - "Y": -15.06073, - "Z": -403.21973 -}, -"TerritoryId": 156, -"InteractionType": "Emote", -"Emote":"pray", -"$": "17 0 1 16 0 128 -> 33 16 1 0 0 192" - }, - { - "Position": { - "X": -255.17686, - "Y": 59.31324, - "Z": -44.453175 -}, -"TerritoryId": 147, -"InteractionType": "WalkTo", -"AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant" - }, - { - "DataId": 2002398, -"Position": { - "X": -253.46765, - "Y": 60.68506, - "Z": -43.90027 -}, -"TerritoryId": 147, -"InteractionType": "Emote", -"Emote":"pray", -"$": "33 16 1 0 0 192 -> 0 0 0 0 0 0" - } - ] + "Position": { + "X": -139.04318, + "Y": 8.522301, + "Z": 280.0128 + }, + "TerritoryId": 153, + "InteractionType": "WalkTo", + "Fly": true, + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { - "Sequence": 2, - "Steps": [ - { - "Position": { - "X": -146.86935, - "Y": 8.006159, - "Z": 268.78055 - }, - "TerritoryId": 153, - "AetheryteShortcut": "South Shroud - Camp Tranquil", - "InteractionType": "Jump", - "JumpDestination": { - "Position": { - "X": -137.77051, - "Y": 7.7094107, - "Z": 275.28036 - }}}, - { - "DataId": 1006751, -"Position": { - "X": -139.45221, - "Y": 8.712891, - "Z": 281.69678 -}, -"TerritoryId": 153, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 3, - "Steps": [ - { - "Position": { - "X": 109.89845, - "Y": 7.0051613, - "Z": -45.239243 -}, -"TerritoryId": 154, -"InteractionType": "WalkTo", -"AetheryteShortcut": "North Shroud - Fallgourd Float" - }, - { - "DataId": 2002399, -"Position": { - "X": 107.83545, - "Y": 7.7057495, - "Z": -45.15149 -}, -"TerritoryId": 154, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 4, - "Steps": [ - { - "Position": { - "X": -146.86935, - "Y": 8.006159, - "Z": 268.78055 - }, - "TerritoryId": 153, - "AetheryteShortcut": "South Shroud - Camp Tranquil", - "InteractionType": "Jump", - "JumpDestination": { - "Position": { - "X": -137.77051, - "Y": 7.7094107, - "Z": 275.28036 - }}}, - { - "DataId": 1006751, -"Position": { - "X": -139.45221, - "Y": 8.712891, - "Z": 281.69678 -}, -"TerritoryId": 153, -"InteractionType": "Interact" - } - ] - },{ - "Sequence": 5, - "Steps": [ - { - "Position": { - "X": 286.73157, - "Y": 42.137627, - "Z": -202.96959 -}, -"TerritoryId": 139, -"InteractionType": "WalkTo", - "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake" - }, - { - "Position": { - "X": 118.0728, - "Y": 74.37976, - "Z": -248.26317 -}, -"TerritoryId": 180, -"InteractionType": "WalkTo", -"AetheryteShortcut": "Outer La Noscea - Camp Overlook" - }, - - - { "DataId": 2002400, -"Position": { - "X": 117.32654, - "Y": 75.394775, - "Z": -246.54004 -}, -"TerritoryId": 180, -"InteractionType": "Emote", -"Emote":"pray" -} - ] - }, - { - "Sequence": 255, - "Steps": [ - { - "Position": { - "X": -146.86935, - "Y": 8.006159, - "Z": 268.78055 - }, - "TerritoryId": 153, - "AetheryteShortcut": "South Shroud - Camp Tranquil", - "InteractionType": "Jump", - "JumpDestination": { - "Position": { - "X": -137.77051, - "Y": 7.7094107, - "Z": 275.28036 - }}}, - { - "DataId": 1006751, - "Position": { - "X": -139.45221, - "Y": 8.712891, - "Z": 281.69678 - }, - "TerritoryId": 153, - "InteractionType": "CompleteQuest", -"NextQuestId": 1083 - } - ] + "DataId": 1006751, + "Position": { + "X": -139.45221, + "Y": 8.712891, + "Z": 281.69678 + }, + "TerritoryId": 153, + "InteractionType": "AcceptQuest" } - ] -} \ No newline at end of file + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -346.83008, + "Y": -37.93451, + "Z": -236.64346 + }, + "TerritoryId": 138, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Western La Noscea - Aleport", + "Fly": true, + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ], + "Flying": "Locked" + } + } + }, + { + "DataId": 2002396, + "Position": { + "X": -347.34113, + "Y": -36.240234, + "Z": -249.6529 + }, + "TerritoryId": 138, + "InteractionType": "Emote", + "Emote": "pray", + "$": "0 0 17 16 0 0 -> 17 0 1 16 0 128", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 2002397, + "Position": { + "X": -339.46753, + "Y": -15.06073, + "Z": -403.21973 + }, + "TerritoryId": 156, + "InteractionType": "Emote", + "Emote": "pray", + "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": { + "X": -255.17686, + "Y": 59.31324, + "Z": -44.453175 + }, + "TerritoryId": 147, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant", + "Fly": true + }, + { + "DataId": 2002398, + "Position": { + "X": -253.46765, + "Y": 60.68506, + "Z": -43.90027 + }, + "TerritoryId": 147, + "InteractionType": "Emote", + "Emote": "pray", + "$": "33 16 1 0 0 192 -> 0 0 0 0 0 0", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + ] + }, + { + "Sequence": 2, + "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": { + "X": -139.45221, + "Y": 8.712891, + "Z": 281.69678 + }, + "TerritoryId": 153, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "Position": { + "X": 109.89845, + "Y": 7.0051613, + "Z": -45.239243 + }, + "TerritoryId": 154, + "InteractionType": "WalkTo", + "AetheryteShortcut": "North Shroud - Fallgourd Float", + "Fly": true + }, + { + "DataId": 2002399, + "Position": { + "X": 107.83545, + "Y": 7.7057495, + "Z": -45.15149 + }, + "TerritoryId": 154, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "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": { + "X": -139.45221, + "Y": 8.712891, + "Z": 281.69678 + }, + "TerritoryId": 153, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "Position": { + "X": 286.73157, + "Y": 42.137627, + "Z": -202.96959 + }, + "TerritoryId": 139, + "InteractionType": "WalkTo", + "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": { + "X": 118.0728, + "Y": 74.37976, + "Z": -248.26317 + }, + "TerritoryId": 180, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Outer La Noscea - Camp Overlook", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "AetheryteLocked": "Outer La Noscea - Camp Overlook" + } + } + }, + { + "DataId": 2002400, + "Position": { + "X": 117.32654, + "Y": 75.394775, + "Z": -246.54004 + }, + "TerritoryId": 180, + "InteractionType": "Emote", + "Emote": "pray" + } + ] + }, + { + "Sequence": 255, + "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": { + "X": -139.45221, + "Y": 8.712891, + "Z": 281.69678 + }, + "TerritoryId": 153, + "InteractionType": "CompleteQuest", + "NextQuestId": 1083 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1083_Yearn for the Urn.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1083_Yearn for the Urn.json index a2b77235..c71f25c4 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1083_Yearn for the Urn.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1083_Yearn for the Urn.json @@ -1,130 +1,231 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "Sequence": 0, - "Steps": [ - { - "DataId": 1006751, - "Position": { - "X": -139.45221, - "Y": 8.712891, - "Z": 281.69678 - }, - "TerritoryId": 153, - "InteractionType": "AcceptQuest" - } - ] - }, - { - "Sequence": 1, - "Steps": [ - { - "DataId": 1007861, -"Position": { - "X": -138.59778, - "Y": 8.561184, - "Z": 281.2085 -}, -"TerritoryId": 153, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 2, - "Steps": [ - { - "Position": { - "X": 52.996822, - "Y": 8.961273, - "Z": -110.2295 -}, -"TerritoryId": 153, -"InteractionType": "WalkTo", -"AetheryteShortcut": "South Shroud - Quarrymill" + "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 }, - { - "DataId": 1007853, -"Position": { - "X": 53.72693, - "Y": 8.86706, - "Z": -111.25354 -}, -"TerritoryId": 153, -"InteractionType": "Interact" - } - ] + "MaximumDistance": 3 + } + } + } }, { - "Sequence": 3, - "Steps": [ - { - "Position": { - "X": 149.47818, - "Y": 18.008802, - "Z": -128.02928 -}, -"TerritoryId": 153, -"InteractionType": "WalkTo" - }, - { -"DataId": 2002403, -"Position": { - "X": 151.53735, - "Y": 18.112427, - "Z": -127.30603 -}, -"TerritoryId": 153, -"InteractionType": "Combat", -"EnemySpawnType": "AutoOnEnterArea", -"KillEnemyDataIds": [ - 1940,1941,1942 -] - }, - { - "DataId": 2002403, -"Position": { - "X": 151.53735, - "Y": 18.112427, - "Z": -127.30603 -}, -"TerritoryId": 153, -"InteractionType": "Interact" - } - ] + "Position": { + "X": -139.04318, + "Y": 8.522301, + "Z": 280.0128 + }, + "TerritoryId": 153, + "InteractionType": "WalkTo", + "Fly": true, + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { - "Sequence": 255, - "Steps": [ - { - "Position": { - "X": -146.86935, - "Y": 8.006159, - "Z": 268.78055 - }, - "TerritoryId": 153, - "AetheryteShortcut": "South Shroud - Camp Tranquil", - "InteractionType": "Jump", - "JumpDestination": { - "Position": { - "X": -137.77051, - "Y": 7.7094107, - "Z": 275.28036 - }}}, - { - "DataId": 1006751, - "Position": { - "X": -139.45221, - "Y": 8.712891, - "Z": 281.69678 - }, - "TerritoryId": 153, - "InteractionType": "CompleteQuest", -"NextQuestId": 1084 - } - ] + "DataId": 1006751, + "Position": { + "X": -139.45221, + "Y": 8.712891, + "Z": 281.69678 + }, + "TerritoryId": 153, + "InteractionType": "AcceptQuest" } - ] -} \ No newline at end of file + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1007861, + "Position": { + "X": -138.59778, + "Y": 8.561184, + "Z": 281.2085 + }, + "StopDistance": 5, + "TerritoryId": 153, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 47.682095, + "Y": 9.470074, + "Z": -98.02502 + }, + "StopDistance": 0.25, + "TerritoryId": 153, + "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, + "Position": { + "X": 53.72693, + "Y": 8.86706, + "Z": -111.25354 + }, + "TerritoryId": 153, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2002403, + "Position": { + "X": 151.53735, + "Y": 18.112427, + "Z": -127.30603 + }, + "TerritoryId": 153, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 1940, + 1941, + 1942 + ], + "CompletionQuestVariablesFlags": [ + { + "Low": 3 + }, + null, + null, + null, + null, + null + ] + }, + { + "DataId": 2002403, + "Position": { + "X": 151.53735, + "Y": 18.112427, + "Z": -127.30603 + }, + "TerritoryId": 153, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "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": { + "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": { + "X": -139.45221, + "Y": 8.712891, + "Z": 281.69678 + }, + "TerritoryId": 153, + "InteractionType": "CompleteQuest", + "NextQuestId": 1084 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1084_Heart of the Forest.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1084_Heart of the Forest.json index 20912346..727f1685 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1084_Heart of the Forest.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1084_Heart of the Forest.json @@ -1,78 +1,153 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "Sequence": 0, - "Steps": [ - { - "DataId": 1006751, - "Position": { - "X": -139.45221, - "Y": 8.712891, - "Z": 281.69678 - }, - "TerritoryId": 153, - "InteractionType": "AcceptQuest" - } - ] + "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 + } + } + } }, { - "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": { - "X": -316.27374, - "Y": 21.194763, - "Z": 179.70544 -}, -"TerritoryId": 148, -"InteractionType": "SinglePlayerDuty" - } - ] + "Position": { + "X": -139.04318, + "Y": 8.522301, + "Z": 280.0128 + }, + "TerritoryId": 153, + "InteractionType": "WalkTo", + "Fly": true, + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } }, { - "Sequence": 255, - "Steps": [ - { - "Position": { - "X": -146.86935, - "Y": 8.006159, - "Z": 268.78055 - }, - "TerritoryId": 153, - "AetheryteShortcut": "South Shroud - Camp Tranquil", - "InteractionType": "Jump", - "JumpDestination": { - "Position": { - "X": -137.77051, - "Y": 7.7094107, - "Z": 275.28036 - }} - }, - { - "DataId": 1006751, - "Position": { - "X": -139.45221, - "Y": 8.712891, - "Z": 281.69678 - }, - "TerritoryId": 153, - "InteractionType": "CompleteQuest", -"NextQuestId": 1084 - } - ] + "DataId": 1006751, + "Position": { + "X": -139.45221, + "Y": 8.712891, + "Z": 281.69678 + }, + "TerritoryId": 153, + "InteractionType": "AcceptQuest" } - ] -} \ No newline at end of file + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2002408, + "Position": { + "X": -316.27374, + "Y": 21.194763, + "Z": 179.70544 + }, + "TerritoryId": 148, + "InteractionType": "SinglePlayerDuty", + "AetheryteShortcut": "Central Shroud - Bentbranch Meadows", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "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": { + "X": -139.45221, + "Y": 8.712891, + "Z": 281.69678 + }, + "TerritoryId": 153, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/133_Way of the Conjurer.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/133_Way of the Conjurer.json new file mode 100644 index 00000000..7d96e4e3 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/133_Way of the Conjurer.json @@ -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 + } + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/147_Trial by Wind.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/147_Trial by Wind.json new file mode 100644 index 00000000..6ecee3c5 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/147_Trial by Wind.json @@ -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 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/182_So You Want to Be a Conjurer.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/182_So You Want to Be a Conjurer.json new file mode 100644 index 00000000..08d01bf6 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/182_So You Want to Be a Conjurer.json @@ -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 + } + ] + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/211_My First Cane.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/211_My First Cane.json new file mode 100644 index 00000000..31b4836b --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/211_My First Cane.json @@ -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 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/22_Way of the Conjurer.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/22_Way of the Conjurer.json index 85c378ac..3a3fc95f 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/22_Way of the Conjurer.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/22_Way of the Conjurer.json @@ -1,195 +1,197 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "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": { + "DataId": 1000323, + "Position": { + "X": -234.02765, + "Y": -4.0000043, + "Z": -11.093384 + }, + "TerritoryId": 133, + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Conjurers' Guild" + ], + "InteractionType": "AcceptQuest", + "SkipConditions": { "AetheryteShortcutIf": { - "NotInSameTerritory": true + "InSameTerritory": true, + "InTerritory": [ + 133 + ] } } - } - ] - }, - { - "Sequence": 1, - "Steps": [ - { - "DataId": 1000692, - "Position": { - "X": -258.8083, - "Y": -5.7735243, - "Z": -27.267883 - }, - "TerritoryId": 133, - "InteractionType": "Interact", - "DialogueChoices": [ - { - "Type": "YesNo", - "Prompt": "TEXT_CLSGLA020_00253_Q1_000_1", - "Yes": true, - "$": "Need to find real prompt in godbert" - } - ] - } - ] - }, - { - "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, - "Y": 17.128555, - "Z": -269.5008 - }, - "TerritoryId": 148, - "InteractionType": "Combat", - "EnemySpawnType": "OverworldEnemies", - "ComplexCombatData": [ - { - "DataId": 37, - "CompletionQuestVariablesFlags": [ - null, - null, - null, - null, - null, - null - ], - "MinimumKillCount": 3 - } - ], - "CompletionQuestVariablesFlags": [ - null, - null, - null, - null, - null, - null - ], - "$": "0 0 0 0 0 0 -> 19 0 0 0 0 0" - }, - { - "Position": { - "X": 119.449745, - "Y": 17.399649, - "Z": -259.6467 - }, - "TerritoryId": 148, - "InteractionType": "Combat", - "EnemySpawnType": "OverworldEnemies", - "ComplexCombatData": [ - { - "DataId": 49, - "CompletionQuestVariablesFlags": [ - null, - null, - null, - null, - null, - null - ], - "MinimumKillCount": 3 - } - ], - "CompletionQuestVariablesFlags": [ - null, - null, - 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, - null, - null, - null, - null, - null - ], - "MinimumKillCount": 3 - } - ], - "CompletionQuestVariablesFlags": [ - null, - null, - 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": [ - { -"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, - "Y": -5.7735243, - "Z": -27.267883 -}, -"TerritoryId": 133, -"InteractionType": "CompleteQuest", -"NextQuestId": 48 - } - ] } - ] -} \ No newline at end of file + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1000692, + "Position": { + "X": -258.8083, + "Y": -5.7735243, + "Z": -27.267883 + }, + "TerritoryId": 133, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_CLSCNJ000_00022_Q1_000_1", + "Yes": true + } + ] + } + ] + }, + { + "Sequence": 2, + "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 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/440_Like Mother, Like Daughter.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/440_Like Mother, Like Daughter.json index 14289abc..ac65d844 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/440_Like Mother, Like Daughter.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/440_Like Mother, Like Daughter.json @@ -1,158 +1,118 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "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": { + "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": false + "InSameTerritory": true, + "InTerritory": [ + 133 + ] } } - } - ] - }, - { - "Sequence": 1, - "Steps": [ - { - "Position": { - "X": -172.66434, - "Y": 8.378755, - "Z": -54.010723 -}, -"TerritoryId": 153, -"InteractionType": "WalkTo", -"AetheryteShortcut": "South Shroud - Quarrymill" - }, - { - "DataId": 1008149, -"Position": { - "X": -172.83899, - "Y": 8.492639, - "Z": -55.222473 -}, -"TerritoryId": 153, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 2, - "Steps": [ - { - "Position": { - "X": -182.20464, - "Y": 9.869227, - "Z": -77.148476 -}, -"TerritoryId": 153, -"InteractionType": "WalkTo" - }, - { - "DataId": 1008146, - "Position": { - "X": -183.43082, - "Y": 9.869224, - "Z": -76.830215 -}, -"TerritoryId": 153, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 3, - "Steps": [ - { - "Position": { - "X": 25.950283, - "Y": 4.080406, - "Z": 33.51876 -}, -"TerritoryId": 153, -"InteractionType": "WalkTo" - }, - { - "DataId": 1008150, -"Position": { - "X": 28.30542, - "Y": 3.6544461, - "Z": 35.38562 -}, -"TerritoryId": 153, -"InteractionType": "SinglePlayerDuty" - } - ] - }, - { - "Sequence": 4, - "Steps": [ - { - "Position": { - "X": 40.772614, - "Y": 3.1398523, - "Z": 32.263535 -}, -"TerritoryId": 153, -"InteractionType": "WalkTo" - }, - { - "DataId": 1008157, -"Position": { - "X": 42.404785, - "Y": 3.2469568, - "Z": 32.88318 -}, -"TerritoryId": 153, -"InteractionType": "Interact" - } - ] - }, - { - "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, - "Y": -5.7735243, - "Z": -27.267883 - }, - "TerritoryId": 133, - "InteractionType": "CompleteQuest", - "NextQuestId": 441 - } - ] } - ] -} \ No newline at end of file + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1008149, + "Position": { + "X": -172.83899, + "Y": 8.492639, + "Z": -55.222473 + }, + "TerritoryId": 153, + "InteractionType": "Interact", + "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1008146, + "Position": { + "X": -183.43082, + "Y": 9.869224, + "Z": -76.830215 + }, + "TerritoryId": 153, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1008150, + "Position": { + "X": 28.30542, + "Y": 3.6544461, + "Z": 35.38562 + }, + "TerritoryId": 153, + "InteractionType": "SinglePlayerDuty", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1008157, + "Position": { + "X": 42.404785, + "Y": 3.2469568, + "Z": 32.88318 + }, + "TerritoryId": 153, + "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": 441 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/441_In Nature's Embrace.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/441_In Nature's Embrace.json index 20668eab..c8dbd51d 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/441_In Nature's Embrace.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/441_In Nature's Embrace.json @@ -1,241 +1,180 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "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": { + "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": false + "InSameTerritory": true, + "InTerritory": [ + 133 + ] } } - } - ] - }, - { - "Sequence": 1, - "Steps": [ - { - "Position": { - "X": 45.534206, - "Y": 6.2985306, - "Z": -1.4239028 -}, -"TerritoryId": 153, -"InteractionType": "WalkTo", - "AetheryteShortcut": "South Shroud - Quarrymill" - }, - { - "DataId": 2000899, -"Position": { - "X": 43.900146, - "Y": 6.5460815, - "Z": -1.9379272 -}, -"TerritoryId": 153, -"InteractionType": "Combat", - "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [ - 294 - ] - } - ] - }, - { - "Sequence": 2, - "Steps": [ - { - "Position": { - "X": 46.887703, - "Y": 6.348098, - "Z": -2.0700083 -}, -"TerritoryId": 153, -"InteractionType": "WalkTo" - }, - { - "DataId": 1002965, -"Position": { - "X": 51.181263, - "Y": 6.6893935, - "Z": -3.2490644 -}, -"TerritoryId": 153, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 3, - "Steps": [ - { - "Position": { - "X": 121.718864, - "Y": 17.688908, - "Z": -134.5164 -}, -"TerritoryId": 153, -"InteractionType": "WalkTo" - }, - { - "DataId": 2000901, -"Position": { - "X": 122.36206, - "Y": 17.898804, - "Z": -136.85822 -}, -"TerritoryId": 153, -"InteractionType": "Combat", - "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [ - 294 - ] - } - ] - }, - { - "Sequence": 4, - "Steps": [ - { - "Position": { - "X": 122.99925, - "Y": 17.652422, - "Z": -130.71101 -}, -"TerritoryId": 153, -"InteractionType": "WalkTo" - }, - { - "DataId": 1002966, -"Position": { - "X": 124.193115, - "Y": 17.550354, - "Z": -129.90009 -}, -"TerritoryId": 153, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 5, - "Steps": [ - { - "Position": { - "X": 290.62793, - "Y": 15.393364, - "Z": -108.41017 -}, -"TerritoryId": 153, -"InteractionType": "WalkTo" - }, - { - "DataId": 2000906, -"Position": { - "X": 292.04236, - "Y": 15.365784, - "Z": -107.286194 -}, -"TerritoryId": 153, -"InteractionType": "Combat", - "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [ - 294 - ] - } - ] - }, - { - "Sequence": 6, - "Steps": [ - { - "Position": { - "X": 292.93207, - "Y": 16.015324, - "Z": -111.772804 -}, -"TerritoryId": 153, -"InteractionType": "WalkTo" - }, - { - "DataId": 1002967, -"Position": { - "X": 293.29358, - "Y": 16.181925, - "Z": -112.68793 -}, -"TerritoryId": 153, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 7, - "Steps": [ - { - "Position": { - "X": 331.04, - "Y": 4.1329737, - "Z": -83.1279 -}, -"TerritoryId": 153, -"InteractionType": "WalkTo" - }, - { - "DataId": 1002968, -"Position": { - "X": 332.14307, - "Y": 4.1362643, - "Z": -85.648926 -}, -"TerritoryId": 153, -"InteractionType": "SinglePlayerDuty" - } - ] - }, - { - "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, - "Y": -5.7735243, - "Z": -27.267883 - }, - "TerritoryId": 133, - "InteractionType": "CompleteQuest", - "NextQuestId": 1079 - } - ] } - ] -} \ No newline at end of file + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2000899, + "Position": { + "X": 43.900146, + "Y": 6.5460815, + "Z": -1.9379272 + }, + "TerritoryId": 153, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 294 + ], + "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1002965, + "Position": { + "X": 51.181263, + "Y": 6.6893935, + "Z": -3.2490644 + }, + "StopDistance": 7, + "TerritoryId": 153, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2000901, + "Position": { + "X": 122.36206, + "Y": 17.898804, + "Z": -136.85822 + }, + "TerritoryId": 153, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 294 + ], + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1002966, + "Position": { + "X": 124.193115, + "Y": 17.550354, + "Z": -129.90009 + }, + "StopDistance": 7, + "TerritoryId": 153, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2000906, + "Position": { + "X": 292.04236, + "Y": 15.365784, + "Z": -107.286194 + }, + "TerritoryId": 153, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 294 + ], + "Fly": true + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1002967, + "Position": { + "X": 293.29358, + "Y": 16.181925, + "Z": -112.68793 + }, + "StopDistance": 7, + "TerritoryId": 153, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1002968, + "Position": { + "X": 332.14307, + "Y": 4.1362643, + "Z": -85.648926 + }, + "TerritoryId": 153, + "InteractionType": "SinglePlayerDuty", + "Fly": true + } + ] + }, + { + "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": 1079 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/48_Trial by Earth.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/48_Trial by Earth.json index 0df4fd80..1cc917cf 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/48_Trial by Earth.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/48_Trial by Earth.json @@ -1,135 +1,139 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "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": { + "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": false + "InSameTerritory": true, + "InTerritory": [ + 133 + ] } } - } - ] - }, - { - "Sequence": 1, - "Steps": [ - { - "Position": { - "X": 219.22334, - "Y": -28.377773, - "Z": 335.86304 - }, - "AethernetShortcut": ["[Gridania] Conjurers' Guild","[Gridania] Yellow Serpent Gate (North Shroud)"], - "TerritoryId": 154, - "InteractionType": "WalkTo" - }, - { - "DataId": 1000764, - "Position": { - "X": 218.89062, - "Y": -28.252495, - "Z": 338.39917 - }, - "TerritoryId": 154, - "InteractionType": "Interact" - } - ] - }, - { - "Sequence": 2, - "Steps": [ - { - "Position": { - "X": 326.5162, - "Y": -5.344409, - "Z": 388.57553 - }, - "TerritoryId": 154, - "InteractionType": "WalkTo" - }, - { - "DataId": 2000883, - "Position": { - "X": 325.1848, - "Y": -5.217115, - "Z": 390.488 - }, - "TerritoryId": 154, - "InteractionType": "Combat", - "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [ - 294 - ] - } - ] - }, - { - "Sequence": 3, - "Steps": [ - { - "Position": { - "X": 219.22334, - "Y": -28.377773, - "Z": 335.86304 - }, - "TerritoryId": 154, - "InteractionType": "WalkTo" - }, - { - "DataId": 1000764, - "Position": { - "X": 218.89062, - "Y": -28.252495, - "Z": 338.39917 - }, - "TerritoryId": 154, - "InteractionType": "Interact" - } - ] - }, - { - "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, - "Y": -5.7735243, - "Z": -27.267883 - }, - "TerritoryId": 133, - "InteractionType": "CompleteQuest", - "NextQuestId": 91 - } - ] } - ] -} \ No newline at end of file + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 220.82336, + "Y": -28.335487, + "Z": 336.9016 + }, + "AethernetShortcut": [ + "[Gridania] Conjurers' Guild", + "[Gridania] Yellow Serpent Gate (North Shroud)" + ], + "TerritoryId": 154, + "InteractionType": "WalkTo", + "Fly": true, + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } + }, + { + "DataId": 1000764, + "Position": { + "X": 218.89062, + "Y": -28.252495, + "Z": 338.39917 + }, + "TerritoryId": 154, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2000883, + "Position": { + "X": 325.1848, + "Y": -5.217115, + "Z": 390.488 + }, + "TerritoryId": 154, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 294 + ], + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "Position": { + "X": 220.82336, + "Y": -28.335487, + "Z": 336.9016 + }, + "TerritoryId": 154, + "InteractionType": "WalkTo", + "Fly": true, + "SkipConditions": { + "StepIf": { + "Flying": "Locked" + } + } + }, + { + "DataId": 1000764, + "Position": { + "X": 218.89062, + "Y": -28.252495, + "Z": 338.39917 + }, + "TerritoryId": 154, + "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": 91 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/91_Trial by Wind.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/91_Trial by Wind.json index fb3c9209..4415c7f5 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/91_Trial by Wind.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/91_Trial by Wind.json @@ -1,186 +1,140 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "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": { + "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": false + "InSameTerritory": true, + "InTerritory": [ + 133 + ] } } - } - ] - }, - { - "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": { - "X": -483.42108, - "Y": 10.130882, - "Z": 209.46057 - }, - "TerritoryId": 152, - "InteractionType": "Interact" - } - ] - }, - { - "Sequence": 2, - "Steps": [ - { - "Position": { - "X": -511.13126, - "Y": 6.470027, - "Z": 38.589493 - }, - "TerritoryId": 152, - "InteractionType": "WalkTo" - }, - { - "DataId": 2000885, - "Position": { - "X": -510.6655, - "Y": 5.8422394, - "Z": 35.87895 - }, - "TerritoryId": 152, - "InteractionType": "Combat", - "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [ - 295 - ] - } - ] - }, - { - "Sequence": 3, - "Steps": [ - { - "Position": { - "X": -480.4995, - "Y": 8.030102, - "Z": 206.82132 - }, - "TerritoryId": 152, - "InteractionType": "WalkTo" - }, - { - "DataId": 1000767, - "Position": { - "X": -483.42108, - "Y": 10.130882, - "Z": 209.46057 - }, - "TerritoryId": 152, - "InteractionType": "Interact" - } - ] - }, - { - "Sequence": 4, - "Steps": [ - { - "Position": { - "X": -512.33844, - "Y": 6.7128515, - "Z": 39.61134 - }, - "TerritoryId": 152, - "InteractionType": "WalkTo" - }, - { - "DataId": 2000887, - "Position": { - "X": -510.76526, - "Y": 6.1798096, - "Z": 35.568726 - }, - "TerritoryId": 152, - "InteractionType": "SinglePlayerDuty" - } - ] - }, - { - "Sequence": 5, - "Steps": [ - { - "Position": { - "X": -480.4995, - "Y": 8.030102, - "Z": 206.82132 - }, - "TerritoryId": 152, - "InteractionType": "WalkTo" - }, - { - "DataId": 1000767, - "Position": { - "X": -483.42108, - "Y": 10.130882, - "Z": 209.46057 - }, - "TerritoryId": 152, - "InteractionType": "Interact" - } - ] - }, - { - "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, - "Y": -5.7735243, - "Z": -27.267883 - }, - "TerritoryId": 133, - "InteractionType": "CompleteQuest", - "NextQuestId": 92 - } - ] - } - ] } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1000767, + "Position": { + "X": -483.42108, + "Y": 10.130882, + "Z": 209.46057 + }, + "TerritoryId": 152, + "InteractionType": "Interact", + "AetheryteShortcut": "East Shroud - Hawthorne Hut", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2000885, + "Position": { + "X": -510.6655, + "Y": 5.8422394, + "Z": 35.87895 + }, + "TerritoryId": 152, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 295 + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1000767, + "Position": { + "X": -483.42108, + "Y": 10.130882, + "Z": 209.46057 + }, + "TerritoryId": 152, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2000887, + "Position": { + "X": -510.76526, + "Y": 6.1798096, + "Z": 35.568726 + }, + "TerritoryId": 152, + "InteractionType": "SinglePlayerDuty" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "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 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/92_Trial by Water.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/92_Trial by Water.json index c1ce1d25..cc3a7491 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/92_Trial by Water.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/92_Trial by Water.json @@ -1,226 +1,256 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "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": { + "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": false + "InSameTerritory": true, + "InTerritory": [ + 133 + ] } } - } - ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -276.804, + "Y": 11.2529, + "Z": 366.10303 + }, + "TerritoryId": 152, + "InteractionType": "WalkTo", + "AetheryteShortcut": "East Shroud - Hawthorne Hut", + "Fly": true }, { - "Sequence": 1, - "Steps": [ - { - "Position": { - "X": -276.804, - "Y": 11.2529, - "Z": 366.10303 -}, -"TerritoryId": 152, - "InteractionType": "WalkTo", - "AetheryteShortcut": "East Shroud - Hawthorne Hut" - }, - { - "DataId": 2000889, -"Position": { - "X": -276.93604, - "Y": 11.734131, - "Z": 367.20825 -}, -"TerritoryId": 152, -"InteractionType": "Combat", -"EnemySpawnType": "AfterItemUse", -"ItemId": 2000121, -"KillEnemyDataIds": [ + "DataId": 2000889, + "Position": { + "X": -276.93604, + "Y": 11.734131, + "Z": 367.20825 + }, + "TerritoryId": 152, + "InteractionType": "Combat", + "EnemySpawnType": "AfterItemUse", + "ItemId": 2000121, + "KillEnemyDataIds": [ 297 ] - } - ] - }, - { - "Sequence": 2, - "Steps": [ - { - "Position": { - "X": -228.65686, - "Y": 3.5446393, - "Z": 279.4041 -}, -"TerritoryId": 152, -"InteractionType": "WalkTo" - }, - { - "DataId": 1000561, -"Position": { - "X": -230.18237, - "Y": 3.544826, - "Z": 279.07214 -}, -"TerritoryId": 152, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 3, - "Steps": [ - { - "Position": { - "X": -210.88799, - "Y": 22.813288, - "Z": 243.95592 -}, -"TerritoryId": 152, -"InteractionType": "WalkTo" - }, - { - "DataId": 1000619, -"Position": { - "X": -209.0639, - "Y": 22.813372, - "Z": 245.34973 -}, -"TerritoryId": 152, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 4, - "Steps": [ - { - "Position": { - "X": -236.00592, - "Y": 17.87103, - "Z": 245.8962 -}, -"TerritoryId": 152, -"InteractionType": "WalkTo" - }, - { - "DataId": 1003001, -"Position": { - "X": -234.33282, - "Y": 18.310072, - "Z": 245.68542 -}, -"TerritoryId": 152, -"InteractionType": "WaitForManualProgress", -"$": "Action needs to be cure, cure needs to be added to schema--manual until then" - } - ] - }, - { - "Sequence": 5, - "Steps": [ - {"DataId": 1003057, -"Position": { -"X": -237.6593, -"Y": 17.850079, -"Z": 243.48816 -}, -"TerritoryId": 152, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 6, - "Steps": [ - { - "Position": { - "X": -63.76642, - "Y": -8.177125, - "Z": 232.76166 -}, -"TerritoryId": 152, -"InteractionType": "WalkTo" - }, - { - "DataId": 1001213, -"Position": { - "X": -66.056335, - "Y": -7.982843, - "Z": 231.15894 -}, -"TerritoryId": 152, - "InteractionType": "SinglePlayerDuty" - } - ] - }, - { - "Sequence": 7, - "Steps": [ - { - "Position": { - "X": -75.92712, - "Y": -9.128448, - "Z": 280.5949 -}, -"TerritoryId": 152, -"InteractionType": "WalkTo" - }, - { - "DataId": 1003006, -"Position": { - "X": -76.64612, - "Y": -9.205922, - "Z": 283.22266 -}, -"TerritoryId": 152, -"InteractionType": "Interact" - } - ] - }, - { - "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, - "Y": -5.7735243, - "Z": -27.267883 - }, - "TerritoryId": 133, - "InteractionType": "CompleteQuest", - "NextQuestId": 93 - } - ] } - ] + ] + }, + { + "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, + "Y": 3.5446393, + "Z": 279.4041 + }, + "TerritoryId": 152, + "InteractionType": "WalkTo" + }, + { + "DataId": 1000561, + "Position": { + "X": -230.18237, + "Y": 3.544826, + "Z": 279.07214 + }, + "TerritoryId": 152, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "Position": { + "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": { + "X": -209.0639, + "Y": 22.813372, + "Z": 245.34973 + }, + "TerritoryId": 152, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1003001, + "Position": { + "X": -234.33282, + "Y": 18.310072, + "Z": 245.68542 + }, + "TerritoryId": 152, + "InteractionType": "Action", + "Action": "Cure" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1003057, + "Position": { + "X": -237.6593, + "Y": 17.850079, + "Z": 243.48816 + }, + "StopDistance": 7, + "TerritoryId": 152, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1001213, + "Position": { + "X": -66.056335, + "Y": -7.982843, + "Z": 231.15894 + }, + "TerritoryId": 152, + "InteractionType": "SinglePlayerDuty", + "Fly": true + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1003006, + "Position": { + "X": -76.64612, + "Y": -9.205922, + "Z": 283.22266 + }, + "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": 93 + } + ] + } + ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/93_Sylphie's Trials.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/93_Sylphie's Trials.json index 6a8d7bd3..2b19a6c8 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/93_Sylphie's Trials.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/93_Sylphie's Trials.json @@ -1,218 +1,161 @@ { - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "Cacahuetes", - "QuestSequence": [ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "Cacahuetes", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ { - "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": { + "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": false + "InSameTerritory": true, + "InTerritory": [ + 133 + ] } } - } - ] - }, - { - "Sequence": 1, - "Steps": [ - { - "Position": { - "X": -72.07284, - "Y": 1, - "Z": -33.972404 -}, -"TerritoryId": 148, -"InteractionType": "WalkTo", -"AetheryteShortcut": "Central Shroud - Bentbranch Meadows" - }, - { - "DataId": 2000891, -"Position": { - "X": -74.50989, - "Y": 1.449585, - "Z": -32.76117 -}, -"TerritoryId": 148, -"InteractionType": "Combat", - "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [ - 294 - ] -} - ] - }, - { - "Sequence": 2, - "Steps": [ - { -"Position": { - "X": -67.59361, - "Y": 1, - "Z": -36.785305 -}, -"TerritoryId": 148, -"InteractionType": "WalkTo" - }, - { - "DataId": 1002961, -"Position": { - "X": -66.7583, - "Y": 0.9667693, - "Z": -38.4375 -}, -"TerritoryId": 148, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 3, - "Steps": [ - { - "Position": { - "X": 148.54672, - "Y": -5.9836235, - "Z": -34.821217 -}, -"TerritoryId": 148, -"InteractionType": "WalkTo" - }, - { - "DataId": 2000893, -"Position": { - "X": 147.02063, - "Y": -5.6916504, - "Z": -35.50775 -}, -"TerritoryId": 148, -"InteractionType": "Combat", - "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [ - 299 - ] - } - ] - }, - { - "Sequence": 4, - "Steps": [ - { - "Position": { - "X": 155.83203, - "Y": -6.3384933, - "Z": -34.853024 -}, -"TerritoryId": 148, -"InteractionType": "WalkTo" - }, - { - "DataId": 1002962, -"Position": { - "X": 155.9624, - "Y": -6.358468, - "Z": -35.53833 -}, -"TerritoryId": 148, -"InteractionType": "Interact" - } - ] - }, - { - "Sequence": 5, - "Steps": [ - { - "Position": { - "X": 330.1284, - "Y": -31.660528, - "Z": 413.6492 -}, -"TerritoryId": 148, -"InteractionType": "WalkTo" - }, - { - "DataId": 2000895, -"Position": { - "X": 332.3567, - "Y": -31.540405, - "Z": 414.69434 -}, -"TerritoryId": 148, -"InteractionType": "Combat", - "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [ - 297 - ] - } - ] - }, - { - "Sequence": 6, - "Steps": [ - { - "Position": { - "X": 335.10825, - "Y": -31.669537, - "Z": 422.18082 -}, -"TerritoryId": 148, -"InteractionType": "WalkTo" - }, - { - "DataId": 1002963, -"Position": { - "X": 335.95776, - "Y": -31.68247, - "Z": 423.63623 -}, -"TerritoryId": 148, -"InteractionType": "Interact" - } - ] - }, - { - "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, - "Y": -5.7735243, - "Z": -27.267883 - }, - "TerritoryId": 133, - "InteractionType": "CompleteQuest", - "NextQuestId": 440 - } - ] } - ] -} \ No newline at end of file + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2000891, + "Position": { + "X": -74.50989, + "Y": 1.449585, + "Z": -32.76117 + }, + "TerritoryId": 148, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 294 + ], + "AetheryteShortcut": "Central Shroud - Bentbranch Meadows", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1002961, + "Position": { + "X": -66.7583, + "Y": 0.9667693, + "Z": -38.4375 + }, + "TerritoryId": 148, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2000893, + "Position": { + "X": 147.02063, + "Y": -5.6916504, + "Z": -35.50775 + }, + "TerritoryId": 148, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 299 + ], + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1002962, + "Position": { + "X": 155.9624, + "Y": -6.358468, + "Z": -35.53833 + }, + "TerritoryId": 148, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2000895, + "Position": { + "X": 332.3567, + "Y": -31.540405, + "Z": 414.69434 + }, + "TerritoryId": 148, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 297 + ], + "Fly": true + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1002963, + "Position": { + "X": 335.95776, + "Y": -31.68247, + "Z": 423.63623 + }, + "TerritoryId": 148, + "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": 440 + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/README.txt b/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/README.txt deleted file mode 100644 index 480a0808..00000000 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/README.txt +++ /dev/null @@ -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. diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/3854_Eggs over Queasy.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/3854_Eggs over Queasy.json index 9eedc5c6..b9f10ca6 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/3854_Eggs over Queasy.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/3854_Eggs over Queasy.json @@ -29,10 +29,12 @@ "TerritoryId": 148, "InteractionType": "Combat", "EnemySpawnType": "OverworldEnemies", - "KillEnemyDataIds": [ - 43 - ], - "Comment": "Kill Chigoes manually" + "ComplexCombatData": [ + { + "DataId": 43, + "MinimumKillCount": 3 + } + ] } ] }, diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 96560c31..b7546231 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -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": [ diff --git a/Questionable.Model/Questing/NearPositionCondition.cs b/Questionable.Model/Questing/NearPositionCondition.cs new file mode 100644 index 00000000..7c5885ed --- /dev/null +++ b/Questionable.Model/Questing/NearPositionCondition.cs @@ -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; } +} diff --git a/Questionable.Model/Questing/SkipStepConditions.cs b/Questionable.Model/Questing/SkipStepConditions.cs index dd0a3f3e..323a0dc0 100644 --- a/Questionable.Model/Questing/SkipStepConditions.cs +++ b/Questionable.Model/Questing/SkipStepConditions.cs @@ -18,6 +18,7 @@ public sealed class SkipStepConditions public List 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}"; } } diff --git a/Questionable.Model/common-schema.json b/Questionable.Model/common-schema.json index 01d1ef6c..825f4615 100644 --- a/Questionable.Model/common-schema.json +++ b/Questionable.Model/common-schema.json @@ -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": [ diff --git a/Questionable/Controller/Steps/Shared/SkipCondition.cs b/Questionable/Controller/Steps/Shared/SkipCondition.cs index 62ce22d8..f750cc8b 100644 --- a/Questionable/Controller/Steps/Shared/SkipCondition.cs +++ b/Questionable/Controller/Steps/Shared/SkipCondition.cs @@ -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) { diff --git a/Questionable/Questionable.csproj b/Questionable/Questionable.csproj index 50a60e7e..376045ee 100644 --- a/Questionable/Questionable.csproj +++ b/Questionable/Questionable.csproj @@ -1,6 +1,5 @@  - 2.4 dist $(SolutionDir)=X:\ x64