diff --git a/QuestPaths/3.x - Heavensward/Class Quests/BRD/1713_On the Road Again.json b/QuestPaths/3.x - Heavensward/Class Quests/BRD/1713_On the Road Again.json index e09b8613..284e7a3c 100644 --- a/QuestPaths/3.x - Heavensward/Class Quests/BRD/1713_On the Road Again.json +++ b/QuestPaths/3.x - Heavensward/Class Quests/BRD/1713_On the Road Again.json @@ -191,7 +191,8 @@ "AetheryteShortcutIf": { "InSameTerritory": true } - } + }, + "NextQuestId": 1714 } ] } diff --git a/QuestPaths/3.x - Heavensward/Class Quests/BRD/1714_The Stiff and the Spent.json b/QuestPaths/3.x - Heavensward/Class Quests/BRD/1714_The Stiff and the Spent.json new file mode 100644 index 00000000..985d6e2d --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Class Quests/BRD/1714_The Stiff and the Spent.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": 1014208, + "Position": { + "X": -52.536804, + "Y": 8.059147, + "Z": 31.72351 + }, + "StopDistance": 7, + "TerritoryId": 418, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ishgard", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1014215, + "Position": { + "X": 446.4026, + "Y": 212.53983, + "Z": 697.444 + }, + "TerritoryId": 397, + "InteractionType": "Interact", + "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1014217, + "Position": { + "X": 59.128662, + "Y": 101.451355, + "Z": -50.797363 + }, + "TerritoryId": 397, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2006300, + "Position": { + "X": 66.11731, + "Y": 103.86804, + "Z": -127.03143 + }, + "TerritoryId": 397, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 4680 + ], + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1014218, + "Position": { + "X": 58.76245, + "Y": 101.43757, + "Z": -51.682373 + }, + "TerritoryId": 397, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1014216, + "Position": { + "X": 445.365, + "Y": 212.53983, + "Z": 699.7938 + }, + "TerritoryId": 397, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest", + "NextQuestId": 1715 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Class Quests/BRD/1715_Requiem on Ice.json b/QuestPaths/3.x - Heavensward/Class Quests/BRD/1715_Requiem on Ice.json new file mode 100644 index 00000000..c2b652b8 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Class Quests/BRD/1715_Requiem on Ice.json @@ -0,0 +1,160 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1014216, + "Position": { + "X": 445.365, + "Y": 212.53983, + "Z": 699.7938 + }, + "TerritoryId": 397, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1014227, + "Position": { + "X": -294.27026, + "Y": 125.76025, + "Z": -15.152283 + }, + "TerritoryId": 397, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1014233, + "Position": { + "X": -299.12268, + "Y": 126.35769, + "Z": -8.682434 + }, + "StopDistance": 7, + "TerritoryId": 397, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1014246, + "Position": { + "X": -429.8009, + "Y": 92.59371, + "Z": -509.4225 + }, + "TerritoryId": 397, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2006301, + "Position": { + "X": -778.0118, + "Y": 112.01648, + "Z": -580.52954 + }, + "TerritoryId": 397, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 4487 + ], + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1014230, + "Position": { + "X": -753.93304, + "Y": 103.917046, + "Z": -467.1855 + }, + "TerritoryId": 397, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1014242, + "Position": { + "X": -750.9728, + "Y": 103.93008, + "Z": -465.4765 + }, + "StopDistance": 4.5, + "TerritoryId": 397, + "InteractionType": "Emote", + "Emote": "salute" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1014230, + "Position": { + "X": -753.93304, + "Y": 103.917046, + "Z": -467.1855 + }, + "TerritoryId": 397, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1014232, + "Position": { + "X": 544.97595, + "Y": -51.27571, + "Z": 65.384766 + }, + "TerritoryId": 398, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "The Dravanian Forelands - Tailfeather", + "NextQuestId": 1716 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Class Quests/BRD/1716_When Gnaths Cry.json b/QuestPaths/3.x - Heavensward/Class Quests/BRD/1716_When Gnaths Cry.json new file mode 100644 index 00000000..a3501e9b --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Class Quests/BRD/1716_When Gnaths Cry.json @@ -0,0 +1,84 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1014232, + "Position": { + "X": 544.97595, + "Y": -51.27571, + "Z": 65.384766 + }, + "StopDistance": 7, + "TerritoryId": 398, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "The Dravanian Forelands - Tailfeather", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + }, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_JOBBRD560_01716_Q1_000_000", + "Answer": "TEXT_JOBBRD560_01716_A1_000_000" + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1014248, + "Position": { + "X": 218.43286, + "Y": -104.75025, + "Z": 592.00415 + }, + "TerritoryId": 398, + "InteractionType": "SinglePlayerDuty", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1014249, + "Position": { + "X": 186.08374, + "Y": -119.0711, + "Z": 480.4912 + }, + "StopDistance": 5, + "TerritoryId": 398, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1014231, + "Position": { + "X": 544.4877, + "Y": -51.27571, + "Z": 64.62195 + }, + "TerritoryId": 398, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "The Dravanian Forelands - Tailfeather" + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Class Quests/BRD/1717_A Saint of Song.json b/QuestPaths/3.x - Heavensward/Class Quests/BRD/1717_A Saint of Song.json new file mode 100644 index 00000000..afecb2dc --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Class Quests/BRD/1717_A Saint of Song.json @@ -0,0 +1,234 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1014232, + "Position": { + "X": 544.97595, + "Y": -51.27571, + "Z": 65.384766 + }, + "StopDistance": 7, + "TerritoryId": 398, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "The Dravanian Forelands - Tailfeather", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1014270, + "Position": { + "X": 457.1145, + "Y": -51.15781, + "Z": 101.48767 + }, + "TerritoryId": 398, + "InteractionType": "Interact", + "Fly": true, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_JOBBRD580_01717_Q1_000_000", + "Answer": "TEXT_JOBBRD580_01717_A1_000_000" + } + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1014262, + "Position": { + "X": -223.65149, + "Y": -30.093239, + "Z": 78.72119 + }, + "TerritoryId": 398, + "InteractionType": "Interact", + "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1014264, + "Position": { + "X": 159.74658, + "Y": -62.55156, + "Z": 685.84717 + }, + "TerritoryId": 400, + "InteractionType": "Interact", + "AetheryteShortcut": "The Churning Mists - Moghome", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "Position": { + "X": 379.64865, + "Y": -69.42944, + "Z": 695.1956 + }, + "TerritoryId": 400, + "InteractionType": "WalkTo", + "$": "Moglin", + "Fly": true + }, + { + "DataId": 1012077, + "Position": { + "X": 381.70435, + "Y": -66.84979, + "Z": 700.86194 + }, + "StopDistance": 8, + "TerritoryId": 400, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1014266, + "Position": { + "X": 273.4568, + "Y": -38.082943, + "Z": 524.95605 + }, + "TerritoryId": 400, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 2006302, + "Position": { + "X": 269.94727, + "Y": -40.299072, + "Z": 398.61133 + }, + "TerritoryId": 400, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 4681 + ], + "Fly": true + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 2006303, + "Position": { + "X": 342.15295, + "Y": -40.024475, + "Z": 288.56335 + }, + "TerritoryId": 400, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 4682 + ], + "Fly": true + } + ] + }, + { + "Sequence": 8, + "Steps": [ + { + "DataId": 2006304, + "Position": { + "X": 417.07483, + "Y": -34.561768, + "Z": 222.9801 + }, + "TerritoryId": 400, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 4483 + ], + "Fly": true + } + ] + }, + { + "Sequence": 9, + "Steps": [ + { + "DataId": 2006381, + "Position": { + "X": 421.16418, + "Y": -29.404175, + "Z": 97.18469 + }, + "TerritoryId": 400, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 379.64865, + "Y": -69.42944, + "Z": 695.1956 + }, + "TerritoryId": 400, + "InteractionType": "WalkTo", + "AetheryteShortcut": "The Churning Mists - Moghome", + "$": "Moglin", + "Fly": true + }, + { + "DataId": 1012077, + "Position": { + "X": 381.70435, + "Y": -66.84979, + "Z": 700.86194 + }, + "StopDistance": 8, + "TerritoryId": 400, + "InteractionType": "CompleteQuest", + "NextQuestId": 1718 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Class Quests/BRD/1718_The Ballad of Oblivion.json b/QuestPaths/3.x - Heavensward/Class Quests/BRD/1718_The Ballad of Oblivion.json new file mode 100644 index 00000000..90e46bed --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Class Quests/BRD/1718_The Ballad of Oblivion.json @@ -0,0 +1,152 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1014265, + "Position": { + "X": 377.37073, + "Y": -69.42938, + "Z": 695.6129 + }, + "StopDistance": 7, + "TerritoryId": 400, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "The Churning Mists - Moghome", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + }, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_JOBBRD600_01718_Q1_000_000", + "Answer": "TEXT_JOBBRD600_01718_A1_000_000" + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1014277, + "Position": { + "X": 485.00793, + "Y": -9.204832, + "Z": 742.6719 + }, + "TerritoryId": 400, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1014273, + "Position": { + "X": 28.976807, + "Y": -18.800003, + "Z": 96.69641 + }, + "StopDistance": 5, + "TerritoryId": 132, + "InteractionType": "Interact", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Airship Landing" + ], + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_JOBBRD600_01718_Q2_000_000", + "Yes": true + } + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1014274, + "Position": { + "X": -449.9428, + "Y": -4.031367, + "Z": -716.4264 + }, + "StopDistance": 5, + "TerritoryId": 401, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1014275, + "Position": { + "X": -179.46143, + "Y": 19.473629, + "Z": -855.98535 + }, + "TerritoryId": 401, + "InteractionType": "SinglePlayerDuty", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1014276, + "Position": { + "X": -451.89594, + "Y": -4.8975077, + "Z": -713.80176 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true, + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_JOBBRD600_01718_Q3_000_000", + "Yes": true + } + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1006750, + "Position": { + "X": 16.464417, + "Y": 6.750492, + "Z": -7.3396606 + }, + "TerritoryId": 153, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "South Shroud - Quarrymill", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 6922167e..35969407 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -853,7 +853,8 @@ "disappointed", "examineself", "joy", - "mogdance" + "mogdance", + "salute" ] } } diff --git a/Questionable.Model/Questing/Converter/EmoteConverter.cs b/Questionable.Model/Questing/Converter/EmoteConverter.cs index 607f6fda..9290a50c 100644 --- a/Questionable.Model/Questing/Converter/EmoteConverter.cs +++ b/Questionable.Model/Questing/Converter/EmoteConverter.cs @@ -23,6 +23,7 @@ public sealed class EmoteConverter() : EnumConverter(Values) { EEmote.Deny, "deny" }, { EEmote.Poke, "poke" }, { EEmote.Psych, "psych" }, + { EEmote.Salute, "salute" }, { EEmote.Rally, "rally" }, { EEmote.Soothe, "soothe" }, { EEmote.Stretch, "stretch" }, diff --git a/Questionable.Model/Questing/EEmote.cs b/Questionable.Model/Questing/EEmote.cs index e70ffd36..4292d1ac 100644 --- a/Questionable.Model/Questing/EEmote.cs +++ b/Questionable.Model/Questing/EEmote.cs @@ -24,6 +24,7 @@ public enum EEmote Deny = 25, Poke = 28, Psych = 30, + Salute = 31, Rally = 34, Soothe = 35, Stretch = 37,