From 1f5b9ac687702c26b02535a19697606d4c2f0a5e Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 3 Nov 2024 20:18:00 +0100 Subject: [PATCH] Update THM paths; fix /cry being the wrong emote --- .../BLM/346_My First Scepter.json | 2 +- .../BLM/347_The Threat of Intimacy.json | 13 +- .../BLM/349_The Threat of Paucity.json | 142 +++++++++++------- .../BLM/350_The Threat of Superiority.json | 8 +- .../BLM/353_Facing Your Demons.json | 27 ++-- .../Questing/Converter/EmoteConverter.cs | 2 +- Questionable.Model/Questing/EEmote.cs | 2 +- 7 files changed, 119 insertions(+), 77 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/346_My First Scepter.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/346_My First Scepter.json index 160be2559..74f4a3d3e 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/346_My First Scepter.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/346_My First Scepter.json @@ -103,7 +103,7 @@ "Y": 3.082914, "Z": 272.46896 }, - "TerritoryId": 148, + "TerritoryId": 141, "InteractionType": "Combat", "EnemySpawnType": "OverworldEnemies", "ComplexCombatData": [ diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/347_The Threat of Intimacy.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/347_The Threat of Intimacy.json index 83f8fccdd..d257b9b6e 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/347_The Threat of Intimacy.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/347_The Threat of Intimacy.json @@ -93,6 +93,16 @@ { "Sequence": 4, "Steps": [ + { + "Position": { + "X": -253.97243, + "Y": 33.2412, + "Z": 408.68488 + }, + "TerritoryId": 140, + "InteractionType": "WalkTo", + "Fly": true + }, { "DataId": 1002027, "Position": { @@ -101,8 +111,7 @@ "Z": 407.27856 }, "TerritoryId": 140, - "InteractionType": "Interact", - "Fly": true + "InteractionType": "Interact" } ] }, diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/349_The Threat of Paucity.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/349_The Threat of Paucity.json index db9410cbd..fdcc2b859 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/349_The Threat of Paucity.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/349_The Threat of Paucity.json @@ -33,9 +33,9 @@ { "DataId": 1001710, "Position": { - "X": -240.2533, - "Y": 18.8, - "Z": 86.900024 + "X": -240.2533, + "Y": 18.8, + "Z": 86.900024 }, "TerritoryId": 130, "InteractionType": "Interact" @@ -43,49 +43,79 @@ ] }, { - "Sequence": 2, - "Steps": [ - { - "Position": { - "X": 149.07747, - "Y": -2, - "Z": -225.21188 + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 130, + "InteractionType": "None", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Thaumaturges' Guild", + "[Ul'dah] Gate of Nald (Central Thanalan)" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true, + "InTerritory": [ + 141 + ], + "AetheryteUnlocked": "Central Thanalan - Black Brush Station" }, - "TerritoryId": 141, - "AetheryteShortcut": "Ul'dah", - "AethernetShortcut": [ - "[Ul'dah] Thaumaturges' Guild", - "[Ul'dah] Gate of Nald (Central Thanalan)" - ], - "SkipConditions": { - "AetheryteShortcutIf": { - "InSameTerritory": true, - "InTerritory": [ - 141 - ] - } - }, - "InteractionType": "Combat", - "EnemySpawnType": "OverworldEnemies", - "ComplexCombatData": [ - { - "DataId": 160, - "MinimumKillCount": 8, - "$": "Slay efts", - "CompletionQuestVariablesFlags": [ - { - "Low": 8 - }, - null, - null, - null, - null, - null - ] - } - ] + "AethernetShortcutIf": { + "AetheryteUnlocked": "Central Thanalan - Black Brush Station" + } } - ] + }, + { + "Position": { + "X": -62.183617, + "Y": -3.6582246, + "Z": 145.88391 + }, + "InteractionType": "WalkTo", + "TerritoryId": 141, + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked", + "AetheryteUnlocked": "Central Thanalan - Black Brush Station" + } + } + }, + { + "Position": { + "X": 149.07747, + "Y": -2, + "Z": -225.21188 + }, + "TerritoryId": 141, + "AetheryteShortcut": "Central Thanalan - Black Brush Station", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + }, + "Fly": true, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 160, + "MinimumKillCount": 8, + "$": "Slay efts", + "CompletionQuestVariablesFlags": [ + { + "Low": 8 + }, + null, + null, + null, + null, + null + ] + } + ] + } + ] }, { "Sequence": 3, @@ -93,9 +123,9 @@ { "DataId": 1001710, "Position": { - "X": -240.2533, - "Y": 18.8, - "Z": 86.900024 + "X": -240.2533, + "Y": 18.8, + "Z": 86.900024 }, "TerritoryId": 130, "InteractionType": "Interact", @@ -125,9 +155,9 @@ { "DataId": 2001512, "Position": { - "X": -366.29285, - "Y": -34.989014, - "Z": 293.56824 + "X": -366.29285, + "Y": -34.989014, + "Z": 293.56824 }, "TerritoryId": 145, "InteractionType": "Combat", @@ -151,9 +181,9 @@ { "DataId": 2001499, "Position": { - "X": -366.29285, - "Y": -34.989014, - "Z": 293.56824 + "X": -366.29285, + "Y": -34.989014, + "Z": 293.56824 }, "TerritoryId": 145, "InteractionType": "Interact" @@ -166,9 +196,9 @@ { "DataId": 1001710, "Position": { - "X": -240.2533, - "Y": 18.8, - "Z": 86.900024 + "X": -240.2533, + "Y": 18.8, + "Z": 86.900024 }, "TerritoryId": 130, "InteractionType": "CompleteQuest", diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/350_The Threat of Superiority.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/350_The Threat of Superiority.json index 3f4f94e38..4057558e9 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/350_The Threat of Superiority.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/350_The Threat of Superiority.json @@ -121,11 +121,11 @@ "Sequence": 255, "Steps": [ { - "DataId": 1001710, + "DataId": 1001711, "Position": { - "X": -240.2533, - "Y": 18.8, - "Z": 86.900024 + "X": -241.62665, + "Y": 18.8, + "Z": 83.32947 }, "TerritoryId": 130, "InteractionType": "CompleteQuest", diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/353_Facing Your Demons.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/353_Facing Your Demons.json index 7465e765c..073489d1e 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/353_Facing Your Demons.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/353_Facing Your Demons.json @@ -34,19 +34,12 @@ "Sequence": 1, "Steps": [ { - "DataId": 1004094, - "Position": { - "X": -413.47375, - "Y": 23.113977, - "Z": -383.71863 - }, - "TerritoryId": 140, - "InteractionType": "Interact", - "AetheryteShortcut": "Western Thanalan - Horizon", - "Fly": true, + "TerritoryId": 145, + "InteractionType": "UseItem", + "ItemId": 30362, + "TargetTerritoryId": 140, "SkipConditions": { - "AetheryteShortcutIf": { - "InSameTerritory": true, + "StepIf": { "InTerritory": [ 140 ] @@ -72,6 +65,16 @@ }, "TerritoryId": 140, "InteractionType": "Interact" + }, + { + "DataId": 1004094, + "Position": { + "X": -413.47375, + "Y": 23.113977, + "Z": -383.71863 + }, + "TerritoryId": 140, + "InteractionType": "Interact" } ] }, diff --git a/Questionable.Model/Questing/Converter/EmoteConverter.cs b/Questionable.Model/Questing/Converter/EmoteConverter.cs index 9b0071788..3e7cb2cb2 100644 --- a/Questionable.Model/Questing/Converter/EmoteConverter.cs +++ b/Questionable.Model/Questing/Converter/EmoteConverter.cs @@ -11,6 +11,7 @@ public sealed class EmoteConverter() : EnumConverter(Values) { EEmote.Cheer, "cheer" }, { EEmote.Clap, "clap" }, { EEmote.Comfort, "comfort" }, + { EEmote.Cry, "cry" }, { EEmote.Dance, "dance" }, { EEmote.Doubt, "doubt" }, { EEmote.Doze, "doze" }, @@ -31,7 +32,6 @@ public sealed class EmoteConverter() : EnumConverter(Values) { EEmote.Disappointed, "disappointed" }, { EEmote.Pray, "pray" }, { EEmote.ImperialSalute, "imperialsalute" }, - { EEmote.Cry, "cry" }, { EEmote.Pet, "pet" }, { EEmote.Slap, "slap" }, { EEmote.SundropDance, "sundropdance"}, diff --git a/Questionable.Model/Questing/EEmote.cs b/Questionable.Model/Questing/EEmote.cs index 1056d9aea..933426660 100644 --- a/Questionable.Model/Questing/EEmote.cs +++ b/Questionable.Model/Questing/EEmote.cs @@ -12,6 +12,7 @@ public enum EEmote Cheer = 6, Clap = 7, Comfort = 9, + Cry = 10, Dance = 11, Doubt = 12, Doze = 13, @@ -32,7 +33,6 @@ public enum EEmote Disappointed = 49, Pray = 58, ImperialSalute = 59, - Cry = 74, Pet = 105, Slap = 111, SundropDance = 120,