diff --git a/QuestPaths/4.x - Stormblood/Class Quests/BLU/3192_Out of the Blue.json b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3192_Out of the Blue.json new file mode 100644 index 00000000..d39707ce --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3192_Out of the Blue.json @@ -0,0 +1,111 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026928, + "Position": { + "X": -64.34735, + "Y": 18.000334, + "Z": -11.032288 + }, + "TerritoryId": 129, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Limsa Lominsa", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1026929, + "Position": { + "X": -69.87109, + "Y": 43.83883, + "Z": -5.661133 + }, + "TerritoryId": 134, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Zephyr Gate (Middle La Noscea)" + ], + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1026936, + "Position": { + "X": 170.85522, + "Y": 62.765503, + "Z": 275.25745 + }, + "TerritoryId": 134, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1028430, + "Position": { + "X": 156.63379, + "Y": 12.126303, + "Z": 649.37805 + }, + "TerritoryId": 135, + "InteractionType": "Interact", + "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1026930, + "Position": { + "X": -85.404785, + "Y": 2.5427969, + "Z": 728.542 + }, + "TerritoryId": 135, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026932, + "Position": { + "X": -105.9129, + "Y": 1.5723714, + "Z": 750.0571 + }, + "StopDistance": 7, + "TerritoryId": 135, + "InteractionType": "CompleteQuest", + "NextQuestId": 3193 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Class Quests/BLU/3193_Blue Leading the Blue.json b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3193_Blue Leading the Blue.json new file mode 100644 index 00000000..fdf1434c --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3193_Blue Leading the Blue.json @@ -0,0 +1,99 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "TerritoryId": 135, + "InteractionType": "EquipItem", + "ItemId": 22746, + "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + }, + "StepIf": { + "Item": { + "NotInInventory": true + } + } + } + }, + { + "TerritoryId": 135, + "InteractionType": "EquipItem", + "ItemId": 24587, + "SkipConditions": { + "StepIf": { + "Item": { + "NotInInventory": true + } + } + } + }, + { + "TerritoryId": 135, + "InteractionType": "EquipRecommended" + }, + { + "DataId": 1026932, + "Position": { + "X": -105.9129, + "Y": 1.5723714, + "Z": 750.0571 + }, + "StopDistance": 7, + "TerritoryId": 135, + "InteractionType": "AcceptQuest", + "Fly": true + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1026934, + "Position": { + "X": -108.04913, + "Y": 1.5026048, + "Z": 749.1415 + }, + "TerritoryId": 135, + "InteractionType": "Action", + "Action": "Water Cannon" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026937, + "Position": { + "X": 65.7511, + "Y": 14.005002, + "Z": 90.440186 + }, + "TerritoryId": 131, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Weavers' Guild" + ], + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_JOBAOZ010_03193_Q1_100_002", + "Yes": true + } + ], + "NextQuestId": 3194 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Class Quests/BLU/3194_Blue Collar Work.json b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3194_Blue Collar Work.json new file mode 100644 index 00000000..27d9a9f8 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3194_Blue Collar Work.json @@ -0,0 +1,113 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026852, + "Position": { + "X": 63.126587, + "Y": 14.005002, + "Z": 89.86035 + }, + "StopDistance": 5, + "TerritoryId": 131, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Weavers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1026938, + "Position": { + "X": 101.27405, + "Y": 7.3536396, + "Z": 600.2135 + }, + "TerritoryId": 141, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ul'dah] Weavers' Guild", + "[Ul'dah] Gate of Thal (Central Thanalan)" + ], + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2009670, + "Position": { + "X": 163.59192, + "Y": 3.7078857, + "Z": 657.0991 + }, + "StopDistance": 0.5, + "TerritoryId": 141, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 9836 + ], + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1026938, + "Position": { + "X": 101.27405, + "Y": 7.3536396, + "Z": 600.2135 + }, + "TerritoryId": 141, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026852, + "Position": { + "X": 63.126587, + "Y": 14.005002, + "Z": 89.86035 + }, + "TerritoryId": 131, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Weavers' Guild" + ], + "NextQuestId": 3195 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Class Quests/BLU/3195_Why They Call It the Blues.json b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3195_Why They Call It the Blues.json new file mode 100644 index 00000000..525e908e --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3195_Why They Call It the Blues.json @@ -0,0 +1,110 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026852, + "Position": { + "X": 63.126587, + "Y": 14.005002, + "Z": 89.86035 + }, + "TerritoryId": 131, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Weavers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1026941, + "Position": { + "X": 105.02783, + "Y": 4.0333576, + "Z": 451.0719 + }, + "TerritoryId": 141, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ul'dah] Weavers' Guild", + "[Ul'dah] Gate of Thal (Central Thanalan)" + ], + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2009671, + "Position": { + "X": 145.52527, + "Y": 9.567322, + "Z": 391.10388 + }, + "TerritoryId": 141, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 9837 + ], + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1026941, + "Position": { + "X": 105.02783, + "Y": 4.0333576, + "Z": 451.0719 + }, + "TerritoryId": 141, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026852, + "Position": { + "X": 63.126587, + "Y": 14.005002, + "Z": 89.86035 + }, + "TerritoryId": 131, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Weavers' Guild" + ], + "NextQuestId": 3196 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Class Quests/BLU/3196_Scream Blue Murder.json b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3196_Scream Blue Murder.json new file mode 100644 index 00000000..62fad7d6 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3196_Scream Blue Murder.json @@ -0,0 +1,130 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026852, + "Position": { + "X": 63.126587, + "Y": 14.005002, + "Z": 89.86035 + }, + "TerritoryId": 131, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Weavers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1026945, + "Position": { + "X": -108.415405, + "Y": 41, + "Z": 76.06616 + }, + "TerritoryId": 131, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ul'dah] Weavers' Guild", + "[Ul'dah] Alchemists' Guild" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1026946, + "Position": { + "X": 392.69092, + "Y": 87.19347, + "Z": 98.10022 + }, + "TerritoryId": 140, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ul'dah] Alchemists' Guild", + "[Ul'dah] Gate of the Sultana (Western Thanalan)" + ], + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "Position": { + "X": 363.6008, + "Y": 83.40785, + "Z": 92.904495 + }, + "StopDistance": 0.5, + "TerritoryId": 140, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 9838, + 9839 + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1026948, + "Position": { + "X": 359.63977, + "Y": 83.013695, + "Z": 92.24072 + }, + "StopDistance": 5, + "TerritoryId": 140, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026852, + "Position": { + "X": 63.126587, + "Y": 14.005002, + "Z": 89.86035 + }, + "TerritoryId": 131, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Weavers' Guild" + ], + "NextQuestId": 3197 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Class Quests/BLU/3197_Blue Gold.json b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3197_Blue Gold.json new file mode 100644 index 00000000..ab9cd8ae --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3197_Blue Gold.json @@ -0,0 +1,98 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026924, + "Position": { + "X": 64.46936, + "Y": 14.005002, + "Z": 88.70068 + }, + "TerritoryId": 131, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Weavers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1026951, + "Position": { + "X": 196.67346, + "Y": 52.774567, + "Z": -38.895264 + }, + "TerritoryId": 140, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 9840 + ], + "AetheryteShortcut": "Western Thanalan - Horizon", + "Fly": true, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_JOBAOZ400_03197_Q1_000_013", + "Yes": true + } + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1026951, + "Position": { + "X": 196.67346, + "Y": 52.774567, + "Z": -38.895264 + }, + "TerritoryId": 140, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026953, + "Position": { + "X": 65.59851, + "Y": 14.005001, + "Z": 91.75244 + }, + "TerritoryId": 131, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Weavers' Guild" + ], + "NextQuestId": 3198 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Class Quests/BLU/3198_The Real Folk Blues.json b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3198_The Real Folk Blues.json new file mode 100644 index 00000000..be76c469 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3198_The Real Folk Blues.json @@ -0,0 +1,87 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026924, + "Position": { + "X": 64.46936, + "Y": 14.005002, + "Z": 88.70068 + }, + "StopDistance": 5, + "TerritoryId": 131, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Weavers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1026955, + "Position": { + "X": -10.055725, + "Y": 47, + "Z": -29.800903 + }, + "TerritoryId": 147, + "InteractionType": "Interact", + "AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1026937, + "Position": { + "X": 65.7511, + "Y": 14.005002, + "Z": 90.440186 + }, + "TerritoryId": 131, + "InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Weavers' Guild" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026937, + "Position": { + "X": 65.7511, + "Y": 14.005002, + "Z": 90.440186 + }, + "TerritoryId": 131, + "InteractionType": "CompleteQuest", + "NextQuestId": 3199 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Class Quests/BLU/3199_Turning Over a Blue Leaf.json b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3199_Turning Over a Blue Leaf.json new file mode 100644 index 00000000..85121f2d --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/BLU/3199_Turning Over a Blue Leaf.json @@ -0,0 +1,52 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026924, + "Position": { + "X": 64.46936, + "Y": 14.005002, + "Z": 88.70068 + }, + "StopDistance": 5, + "TerritoryId": 131, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Weavers' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 131 + ] + } + } + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026852, + "Position": { + "X": 63.126587, + "Y": 14.005002, + "Z": 89.86035 + }, + "StopDistance": 5, + "TerritoryId": 131, + "InteractionType": "CompleteQuest", + "NextQuestId": 3732 + } + ] + } + ] +} diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 247628f8..cb035ef7 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -982,7 +982,8 @@ "Bosom Brook", "Souleater", "Fire III", - "Adloquium" + "Adloquium", + "Water Cannon" ] } }, diff --git a/Questionable.Model/Questing/Converter/ActionConverter.cs b/Questionable.Model/Questing/Converter/ActionConverter.cs index 0f72c731..27436b93 100644 --- a/Questionable.Model/Questing/Converter/ActionConverter.cs +++ b/Questionable.Model/Questing/Converter/ActionConverter.cs @@ -47,5 +47,6 @@ public sealed class ActionConverter() : EnumConverter(Values) { EAction.Souleater, "Souleater" }, { EAction.Fire3, "Fire III" }, { EAction.Adloquium, "Adloquium" }, + { EAction.WaterCannon, "Water Cannon" }, }; } diff --git a/Questionable.Model/Questing/EAction.cs b/Questionable.Model/Questing/EAction.cs index 3a4981af..159c2f7e 100644 --- a/Questionable.Model/Questing/EAction.cs +++ b/Questionable.Model/Questing/EAction.cs @@ -53,6 +53,7 @@ public enum EAction Souleater = 3632, Fire3 = 152, Adloquium = 185, + WaterCannon = 11385, CollectMiner = 240, ScourMiner = 22182, diff --git a/Questionable/Data/QuestData.cs b/Questionable/Data/QuestData.cs index 7e07f2f9..8f51c499 100644 --- a/Questionable/Data/QuestData.cs +++ b/Questionable/Data/QuestData.cs @@ -310,7 +310,7 @@ internal sealed class QuestData // SB EClassJob.Samurai => [110, 111], EClassJob.RedMage => [131, 132], - EClassJob.BlueMage => [134, 135, 146], + EClassJob.BlueMage => [134, 135, 146, 170], // ShB EClassJob.Gunbreaker => [84],