Add SB BLM quests

diff --git a/QuestPaths/4.x - Stormblood/Class Quests/BLM/2588_Shades of Shatotto.json b/QuestPaths/4.x - Stormblood/Class Quests/BLM/2588_Shades of Shatotto.json
new file mode 100644 (file)
index 0000000..fe3c501
--- /dev/null
+++ b/QuestPaths/4.x - Stormblood/Class Quests/BLM/2588_Shades of Shatotto.json
@@ -0,0 +1,83 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1006752,
+          "Position": {
+            "X": 87.5105,
+            "Y": 18,
+            "Z": 113.725464
+          },
+          "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": 1004597,
+          "Position": {
+            "X": -292.10345,
+            "Y": -2.910112,
+            "Z": 245.59387
+          },
+          "TerritoryId": 146,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Southern Thanalan - Forgotten Springs",
+          "Fly": true,
+          "TargetTerritoryId": 146
+        },
+        {
+          "DataId": 1020959,
+          "Position": {
+            "X": -463.1571,
+            "Y": -3.164927,
+            "Z": 61.264893
+          },
+          "TerritoryId": 146,
+          "InteractionType": "SinglePlayerDuty"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1006752,
+          "Position": {
+            "X": 87.5105,
+            "Y": 18,
+            "Z": 113.725464
+          },
+          "TerritoryId": 131,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Weavers' Guild"
+          ],
+          "NextQuestId": 2589
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/4.x - Stormblood/Class Quests/BLM/2589_Golems Gone Wild.json b/QuestPaths/4.x - Stormblood/Class Quests/BLM/2589_Golems Gone Wild.json
new file mode 100644 (file)
index 0000000..28892d1
--- /dev/null
+++ b/QuestPaths/4.x - Stormblood/Class Quests/BLM/2589_Golems Gone Wild.json
@@ -0,0 +1,163 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1006752,
+          "Position": {
+            "X": 87.5105,
+            "Y": 18,
+            "Z": 113.725464
+          },
+          "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": 1008543,
+          "Position": {
+            "X": -360.00616,
+            "Y": 1.2644191,
+            "Z": 459.83057
+          },
+          "TerritoryId": 153,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "South Shroud - Camp Tranquil",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 2007872,
+          "Position": {
+            "X": -275.62378,
+            "Y": 4.8675537,
+            "Z": 523.76587
+          },
+          "TerritoryId": 153,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterAction",
+          "Action": "Fire III",
+          "KillEnemyDataIds": [
+            7232
+          ],
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
+        },
+        {
+          "DataId": 2007873,
+          "Position": {
+            "X": -298.909,
+            "Y": 11.825684,
+            "Z": 567.46765
+          },
+          "TerritoryId": 153,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterAction",
+          "Action": "Fire III",
+          "KillEnemyDataIds": [
+            7232
+          ],
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        },
+        {
+          "DataId": 2007874,
+          "Position": {
+            "X": -310.5974,
+            "Y": 12.344482,
+            "Z": 645.777
+          },
+          "TerritoryId": 153,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterAction",
+          "Action": "Fire III",
+          "KillEnemyDataIds": [
+            7232
+          ],
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1020964,
+          "Position": {
+            "X": -348.50085,
+            "Y": 0.22347936,
+            "Z": 454.45935
+          },
+          "TerritoryId": 153,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1020966,
+          "Position": {
+            "X": 87.47986,
+            "Y": 18,
+            "Z": 113.69495
+          },
+          "TerritoryId": 131,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Weavers' Guild"
+          ],
+          "NextQuestId": 2590
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/4.x - Stormblood/Class Quests/BLM/2590_When the Golems Get Tough.json b/QuestPaths/4.x - Stormblood/Class Quests/BLM/2590_When the Golems Get Tough.json
new file mode 100644 (file)
index 0000000..a090c4f
--- /dev/null
+++ b/QuestPaths/4.x - Stormblood/Class Quests/BLM/2590_When the Golems Get Tough.json
@@ -0,0 +1,155 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1006752,
+          "Position": {
+            "X": 87.5105,
+            "Y": 18,
+            "Z": 113.725464
+          },
+          "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": 1021051,
+          "Position": {
+            "X": -36.91156,
+            "Y": 20.090933,
+            "Z": -679.07227
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Mor Dhona"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": -335.20407,
+            "Y": -15.94506,
+            "Z": -491.67297
+          },
+          "TerritoryId": 156,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "$": "Pathfinding workaround"
+        },
+        {
+          "DataId": 1021052,
+          "Position": {
+            "X": -334.00476,
+            "Y": -16.18119,
+            "Z": -490.1961
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 2007907,
+          "Position": {
+            "X": -321.21765,
+            "Y": -16.922302,
+            "Z": -361.6236
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "Position": {
+            "X": -412.69736,
+            "Y": -17.148405,
+            "Z": -361.9313
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 156,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AutoOnEnterArea",
+          "KillEnemyDataIds": [
+            7233
+          ],
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "DataId": 1021059,
+          "Position": {
+            "X": -413.80945,
+            "Y": -17.148407,
+            "Z": -362.23395
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1006752,
+          "Position": {
+            "X": 87.5105,
+            "Y": 18,
+            "Z": 113.725464
+          },
+          "TerritoryId": 131,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Weavers' Guild"
+          ],
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_JOBBLM650_02590_Q2_000_000",
+              "Answer": "TEXT_JOBBLM650_02590_A2_000_001"
+            }
+          ],
+          "NextQuestId": 2591
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/4.x - Stormblood/Class Quests/BLM/2591_Unnatural Selection.json b/QuestPaths/4.x - Stormblood/Class Quests/BLM/2591_Unnatural Selection.json
new file mode 100644 (file)
index 0000000..f60a185
--- /dev/null
+++ b/QuestPaths/4.x - Stormblood/Class Quests/BLM/2591_Unnatural Selection.json
@@ -0,0 +1,143 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1006752,
+          "Position": {
+            "X": 87.5105,
+            "Y": 18,
+            "Z": 113.725464
+          },
+          "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": 1021086,
+          "Position": {
+            "X": 326.10046,
+            "Y": 11.181234,
+            "Z": -8.743469
+          },
+          "TerritoryId": 145,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1021090,
+          "Position": {
+            "X": 7.2174683,
+            "Y": 115.514336,
+            "Z": -720.7599
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 620,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Peaks - Ala Gannha",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 2007936,
+          "Position": {
+            "X": -284.93176,
+            "Y": 66.20886,
+            "Z": -679.07227
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [
+            7234
+          ],
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1021092,
+          "Position": {
+            "X": -266.4073,
+            "Y": 76.297005,
+            "Z": -623.1022
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "DataId": 1006753,
+          "Position": {
+            "X": 325.063,
+            "Y": 11.236564,
+            "Z": -6.2105103
+          },
+          "TerritoryId": 145,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1006752,
+          "Position": {
+            "X": 87.5105,
+            "Y": 18,
+            "Z": 113.725464
+          },
+          "TerritoryId": 131,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Weavers' Guild"
+          ],
+          "NextQuestId": 2592
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/4.x - Stormblood/Class Quests/BLM/2592_One Golem to Rule Them All.json b/QuestPaths/4.x - Stormblood/Class Quests/BLM/2592_One Golem to Rule Them All.json
new file mode 100644 (file)
index 0000000..a5b89ff
--- /dev/null
+++ b/QuestPaths/4.x - Stormblood/Class Quests/BLM/2592_One Golem to Rule Them All.json
@@ -0,0 +1,118 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1006752,
+          "Position": {
+            "X": 87.5105,
+            "Y": 18,
+            "Z": 113.725464
+          },
+          "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": 1021097,
+          "Position": {
+            "X": -270.37463,
+            "Y": -29.998833,
+            "Z": 111.92493
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1011935,
+          "Position": {
+            "X": -285.63367,
+            "Y": 39.04305,
+            "Z": 53.72693
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1021102,
+          "Position": {
+            "X": -287.19012,
+            "Y": 39.04307,
+            "Z": 44.47998
+          },
+          "TerritoryId": 398,
+          "InteractionType": "SinglePlayerDuty"
+        }
+      ]
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "DataId": 1021104,
+          "Position": {
+            "X": -267.17023,
+            "Y": -30.09441,
+            "Z": 117.54016
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1006752,
+          "Position": {
+            "X": 87.5105,
+            "Y": 18,
+            "Z": 113.725464
+          },
+          "TerritoryId": 131,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Weavers' Guild"
+          ]
+        }
+      ]
+    }
+  ]
+}

diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json
index 7013ea2dcbf89a4ebf3f8cb155d2a8bfd6e856a3..718b36caff2a9ab4cdbab433c8954f8904d0114b 100644 (file)
--- a/QuestPaths/quest-v1.json
+++ b/QuestPaths/quest-v1.json
@@ -978,7 +978,8 @@
                   "Hide",
                   "Slug Shot",
                   "Bosom Brook",
-                  "Souleater"
+                  "Souleater",
+                  "Fire III"
                 ]
               }
             },

diff --git a/Questionable.Model/Questing/Converter/ActionConverter.cs b/Questionable.Model/Questing/Converter/ActionConverter.cs
index 141e4f2ef5dde4d01416e857042f28afab7fdb40..8d211442f2e09aa00b17f403db433688579441f3 100644 (file)
--- a/Questionable.Model/Questing/Converter/ActionConverter.cs
+++ b/Questionable.Model/Questing/Converter/ActionConverter.cs
@@ -44,5 +44,6 @@ public sealed class ActionConverter() : EnumConverter<EAction>(Values)
         { EAction.SlugShot, "Slug Shot" },
         { EAction.BosomBrook, "Bosom Brook" },
         { EAction.Souleater, "Souleater" },
+        { EAction.Fire3, "Fire III" },
     };
 }

diff --git a/Questionable.Model/Questing/EAction.cs b/Questionable.Model/Questing/EAction.cs
index 1b23da040db3a0c3913aa5ab0ebee465ae9d9608..ed4d6e83e8aaa4e5fe2e97e247d9a101f2027445 100644 (file)
--- a/Questionable.Model/Questing/EAction.cs
+++ b/Questionable.Model/Questing/EAction.cs
@@ -50,6 +50,7 @@ public enum EAction
     SlugShot = 7412,
     BosomBrook = 37173,
     Souleater = 3632,
+    Fire3 = 152,
 
     CollectMiner = 240,
     ScourMiner = 22182,