diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1102_The Beast Within.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1102_The Beast Within.json index 06d12fb3..002ac180 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1102_The Beast Within.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1102_The Beast Within.json @@ -119,7 +119,8 @@ "Z": 61.142822 }, "TerritoryId": 139, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "NextQuestId": 1671 } ] } diff --git a/QuestPaths/3.x - Heavensward/Class Quests/SCH/1671_The Green Death.json b/QuestPaths/3.x - Heavensward/Class Quests/SCH/1671_The Green Death.json new file mode 100644 index 00000000..7f0ebace --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Class Quests/SCH/1671_The Green Death.json @@ -0,0 +1,124 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006757, + "Position": { + "X": -4.4709473, + "Y": 44.999886, + "Z": -250.56848 + }, + "TerritoryId": 128, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Limsa Lominsa", + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Marauders' Guild" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 128 + ] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 207.68561, + "Y": -3.1246834, + "Z": 42.986313 + }, + "TerritoryId": 139, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake", + "Fly": true + }, + { + "DataId": 1013135, + "Position": { + "X": 206.0426, + "Y": -3.111818, + "Z": 41.94702 + }, + "TerritoryId": 139, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2005518, + "Position": { + "X": -275.16595, + "Y": 64.25574, + "Z": -197.34491 + }, + "StopDistance": 0.5, + "TerritoryId": 180, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 4399 + ], + "AetheryteShortcut": "Outer La Noscea - Camp Overlook", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2005519, + "Position": { + "X": -275.16595, + "Y": 64.25574, + "Z": -197.34491 + }, + "TerritoryId": 180, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 207.68561, + "Y": -3.1246834, + "Z": 42.986313 + }, + "TerritoryId": 139, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake", + "Fly": true + }, + { + "DataId": 1013135, + "Position": { + "X": 206.0426, + "Y": -3.111818, + "Z": 41.94702 + }, + "TerritoryId": 139, + "InteractionType": "CompleteQuest", + "NextQuestId": 1672 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Class Quests/SCH/1672_Quarantine.json b/QuestPaths/3.x - Heavensward/Class Quests/SCH/1672_Quarantine.json new file mode 100644 index 00000000..44ddb455 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Class Quests/SCH/1672_Quarantine.json @@ -0,0 +1,104 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "Position": { + "X": 207.68561, + "Y": -3.1246834, + "Z": 42.986313 + }, + "TerritoryId": 139, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + }, + { + "DataId": 1013135, + "Position": { + "X": 206.0426, + "Y": -3.111818, + "Z": 41.94702 + }, + "TerritoryId": 139, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 620.5845, + "Y": -3.0527442, + "Z": 169.40678 + }, + "TerritoryId": 139, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1013137, + "Position": { + "X": 620.9657, + "Y": -3.002753, + "Z": 171.06885 + }, + "TerritoryId": 139, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2005520, + "Position": { + "X": 622.91907, + "Y": -3.0671387, + "Z": 171.6792 + }, + "StopDistance": 4.5, + "TerritoryId": 139, + "InteractionType": "SinglePlayerDuty" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 207.68561, + "Y": -3.1246834, + "Z": 42.986313 + }, + "TerritoryId": 139, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1013135, + "Position": { + "X": 206.0426, + "Y": -3.111818, + "Z": 41.94702 + }, + "TerritoryId": 139, + "InteractionType": "CompleteQuest", + "NextQuestId": 1673 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Class Quests/SCH/1673_False Friends.json b/QuestPaths/3.x - Heavensward/Class Quests/SCH/1673_False Friends.json new file mode 100644 index 00000000..192a828a --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Class Quests/SCH/1673_False Friends.json @@ -0,0 +1,176 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "Position": { + "X": 207.68561, + "Y": -3.1246834, + "Z": 42.986313 + }, + "TerritoryId": 139, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + }, + { + "DataId": 1013135, + "Position": { + "X": 206.0426, + "Y": -3.111818, + "Z": 41.94702 + }, + "TerritoryId": 139, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -289.83594, + "Y": 70.47664, + "Z": -272.06448 + }, + "TerritoryId": 180, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Outer La Noscea - Camp Overlook", + "Fly": true + }, + { + "DataId": 2005521, + "Position": { + "X": -292.83594, + "Y": 72.15991, + "Z": -275.4101 + }, + "StopDistance": 0.5, + "TerritoryId": 180, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "ComplexCombatData": [ + { + "DataId": 30, + "NameId": 4108 + } + ], + "Mount": false + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2005522, + "Position": { + "X": -302.05237, + "Y": 70.81714, + "Z": -292.28656 + }, + "StopDistance": 0.5, + "TerritoryId": 180, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "ComplexCombatData": [ + { + "DataId": 30, + "NameId": 4108 + } + ], + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2005523, + "Position": { + "X": -370.04657, + "Y": 65.69006, + "Z": -307.75922 + }, + "StopDistance": 0.5, + "TerritoryId": 180, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2005530, + "Position": { + "X": -381.55188, + "Y": 52.475708, + "Z": -298.93958 + }, + "StopDistance": 2, + "TerritoryId": 180, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 4371 + ], + "DisableNavmesh": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2005531, + "Position": { + "X": -381.55188, + "Y": 52.8114, + "Z": -298.909 + }, + "TerritoryId": 180, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 207.68561, + "Y": -3.1246834, + "Z": 42.986313 + }, + "TerritoryId": 139, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake", + "Fly": true + }, + { + "DataId": 1013135, + "Position": { + "X": 206.0426, + "Y": -3.111818, + "Z": 41.94702 + }, + "TerritoryId": 139, + "InteractionType": "CompleteQuest", + "NextQuestId": 1674 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Class Quests/SCH/1674_Ooh Rah.json b/QuestPaths/3.x - Heavensward/Class Quests/SCH/1674_Ooh Rah.json new file mode 100644 index 00000000..8cbb4518 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Class Quests/SCH/1674_Ooh Rah.json @@ -0,0 +1,128 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "Position": { + "X": 207.68561, + "Y": -3.1246834, + "Z": 42.986313 + }, + "TerritoryId": 139, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + }, + { + "DataId": 1013135, + "Position": { + "X": 206.0426, + "Y": -3.111818, + "Z": 41.94702 + }, + "TerritoryId": 139, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1013138, + "Position": { + "X": 404.19617, + "Y": -2.6082127, + "Z": 212.1156 + }, + "TerritoryId": 139, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1013138, + "Position": { + "X": 404.19617, + "Y": -2.6082127, + "Z": 212.1156 + }, + "TerritoryId": 139, + "InteractionType": "Say", + "ChatMessage": { + "Key": "TEXT_JOBSCH560_01674_SYSTEM_100_023" + } + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1013138, + "Position": { + "X": 404.19617, + "Y": -2.6082127, + "Z": 212.1156 + }, + "TerritoryId": 139, + "InteractionType": "Say", + "ChatMessage": { + "Key": "TEXT_JOBSCH560_01674_SYSTEM_100_023" + } + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1013139, + "Position": { + "X": 700.9536, + "Y": -0.50953937, + "Z": 133.28748 + }, + "TerritoryId": 139, + "InteractionType": "Combat", + "EnemySpawnType": "AfterEmote", + "KillEnemyDataIds": [ + 4400, + 4401 + ], + "Emote": "laugh", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1013138, + "Position": { + "X": 404.19617, + "Y": -2.6082127, + "Z": 212.1156 + }, + "TerritoryId": 139, + "InteractionType": "CompleteQuest", + "Fly": true, + "NextQuestId": 1675 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Class Quests/SCH/1675_Unseen.json b/QuestPaths/3.x - Heavensward/Class Quests/SCH/1675_Unseen.json new file mode 100644 index 00000000..ea1a4006 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Class Quests/SCH/1675_Unseen.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": [ + { + "Position": { + "X": 207.68561, + "Y": -3.1246834, + "Z": 42.986313 + }, + "TerritoryId": 139, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + }, + { + "DataId": 1013135, + "Position": { + "X": 206.0426, + "Y": -3.111818, + "Z": 41.94702 + }, + "TerritoryId": 139, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1002279, + "Position": { + "X": -196.8872, + "Y": 18.459997, + "Z": 59.952637 + }, + "TerritoryId": 130, + "InteractionType": "Interact", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Thaumaturges' Guild" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1011231, + "Position": { + "X": 503.1051, + "Y": 217.95148, + "Z": 790.2189 + }, + "TerritoryId": 397, + "InteractionType": "Interact", + "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1011234, + "Position": { + "X": 546.1356, + "Y": 217.90826, + "Z": 768.06274 + }, + "TerritoryId": 397, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "Position": { + "X": 528.09424, + "Y": 217.9514, + "Z": 773.35565 + }, + "TerritoryId": 397, + "InteractionType": "WalkTo" + }, + { + "DataId": 2005525, + "Position": { + "X": 446.00586, + "Y": 140.82544, + "Z": -749.87415 + }, + "TerritoryId": 397, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 4374 + ], + "Fly": true, + "CompletionQuestVariablesFlags": [ + 1, + null, + null, + null, + null, + null + ] + }, + { + "DataId": 2005525, + "Position": { + "X": 446.00586, + "Y": 140.82544, + "Z": -749.87415 + }, + "TerritoryId": 397, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 207.68561, + "Y": -3.1246834, + "Z": 42.986313 + }, + "TerritoryId": 139, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake", + "Fly": true + }, + { + "DataId": 1013135, + "Position": { + "X": 206.0426, + "Y": -3.111818, + "Z": 41.94702 + }, + "TerritoryId": 139, + "InteractionType": "CompleteQuest", + "NextQuestId": 1676 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Class Quests/SCH/1676_Forward, the Royal Marines.json b/QuestPaths/3.x - Heavensward/Class Quests/SCH/1676_Forward, the Royal Marines.json new file mode 100644 index 00000000..8b2a2201 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Class Quests/SCH/1676_Forward, the Royal Marines.json @@ -0,0 +1,189 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "Position": { + "X": 207.68561, + "Y": -3.1246834, + "Z": 42.986313 + }, + "TerritoryId": 139, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + }, + { + "DataId": 1013135, + "Position": { + "X": 206.0426, + "Y": -3.111818, + "Z": 41.94702 + }, + "TerritoryId": 139, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2005528, + "Position": { + "X": -381.5824, + "Y": 52.475708, + "Z": -298.81744 + }, + "TerritoryId": 180, + "InteractionType": "Interact", + "AetheryteShortcut": "Outer La Noscea - Camp Overlook", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2005529, + "Position": { + "X": 290.15015, + "Y": 41.275635, + "Z": -193.83539 + }, + "TerritoryId": 139, + "InteractionType": "Interact", + "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1013143, + "Position": { + "X": 405.1117, + "Y": 4.109556, + "Z": 81.04065 + }, + "TerritoryId": 139, + "InteractionType": "SinglePlayerDuty", + "AetheryteShortcut": "Upper La Noscea - Camp Bronze Lake" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "Position": { + "X": 489.20578, + "Y": 16.495434, + "Z": 69.11804 + }, + "TerritoryId": 139, + "InteractionType": "WalkTo" + }, + { + "DataId": 1013146, + "Position": { + "X": 489.73828, + "Y": 16.495436, + "Z": 67.33801 + }, + "TerritoryId": 139, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1013147, + "Position": { + "X": 487.84607, + "Y": 16.495436, + "Z": 68.0094 + }, + "TerritoryId": 139, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1013148, + "Position": { + "X": 489.64673, + "Y": 16.495436, + "Z": 70.573 + }, + "TerritoryId": 139, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 1013198, + "Position": { + "X": 487.47998, + "Y": 16.495436, + "Z": 70.35925 + }, + "TerritoryId": 139, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1013199, + "Position": { + "X": 491.47778, + "Y": 16.495434, + "Z": 69.16907 + }, + "TerritoryId": 139, + "InteractionType": "CompleteQuest", + "NextQuestId": 2923 + } + ] + } + ] +} diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 718b36ca..4984fb24 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -858,7 +858,8 @@ "examineself", "joy", "mogdance", - "salute" + "salute", + "laugh" ] } } diff --git a/Questionable.Model/Questing/Converter/EmoteConverter.cs b/Questionable.Model/Questing/Converter/EmoteConverter.cs index 9290a50c..714282e4 100644 --- a/Questionable.Model/Questing/Converter/EmoteConverter.cs +++ b/Questionable.Model/Questing/Converter/EmoteConverter.cs @@ -18,6 +18,7 @@ public sealed class EmoteConverter() : EnumConverter(Values) { EEmote.Wave, "wave" }, { EEmote.Joy, "joy" }, { EEmote.Kneel, "kneel" }, + { EEmote.Laugh, "laugh" }, { EEmote.Lookout, "lookout" }, { EEmote.Me, "me" }, { EEmote.Deny, "deny" }, diff --git a/Questionable.Model/Questing/EEmote.cs b/Questionable.Model/Questing/EEmote.cs index 4292d1ac..dc4363ae 100644 --- a/Questionable.Model/Questing/EEmote.cs +++ b/Questionable.Model/Questing/EEmote.cs @@ -19,6 +19,7 @@ public enum EEmote Wave = 16, Joy = 18, Kneel = 19, + Laugh = 21, Lookout = 22, Me = 23, Deny = 25,