From f336de8f9bc8fb948eff0650b65b00ceecd66e11 Mon Sep 17 00:00:00 2001 From: pot0to <19513249+pot0to@users.noreply.github.com> Date: Sun, 20 Oct 2024 02:27:30 -0700 Subject: [PATCH 1/2] adding all ARR thaumaturge quests and one more loporrit --- .../BLM/344_Way of the Thaumaturge.json | 2 +- .../BLM/345_Way of the Thaumaturge.json | 3 +- .../BLM/351_The Threat of Perplexity.json | 3 +- .../Dailies/4699_Hare-raising Thrills.json | 41 +++++++++++++-- QuestPaths/quest-v1.json | 3 +- .../Questing/Converter/EmoteConverter.cs | 51 +++++++++--------- Questionable.Model/Questing/EEmote.cs | 52 ++++++++++--------- 7 files changed, 97 insertions(+), 58 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json index 902c1ef93..7672f5a55 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/344_Way of the Thaumaturge.json @@ -36,7 +36,7 @@ "Yes": true } ], - "NextQuestId": 553 + "NextQuestId": 351 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/345_Way of the Thaumaturge.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/345_Way of the Thaumaturge.json index 57d4b5d1a..e0f046de1 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/345_Way of the Thaumaturge.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/345_Way of the Thaumaturge.json @@ -36,7 +36,8 @@ "Prompt": "TEXT_CLSTHM020_00345_Q1_001_1", "Yes": true } - ] + ], + "NextQuestId": 351 } ] } diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/351_The Threat of Perplexity.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/351_The Threat of Perplexity.json index 75d2bceba..dbd4f58c7 100644 --- a/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/351_The Threat of Perplexity.json +++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/351_The Threat of Perplexity.json @@ -209,7 +209,8 @@ "Z": 80.88806 }, "TerritoryId": 130, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "NextQuestId": 352 } ] } diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4699_Hare-raising Thrills.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4699_Hare-raising Thrills.json index d731dcbc4..ac2e4f420 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4699_Hare-raising Thrills.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4699_Hare-raising Thrills.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "liza", - "Disabled": true, + "Author": "pot0to", "QuestSequence": [ { "Sequence": 0, @@ -13,7 +12,8 @@ "Z": -273.68756 }, "TerritoryId": 959, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "Fly": true }, { "DataId": 1044403, @@ -30,6 +30,38 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1044412, + "Position": { + "X": -181.56714, + "Y": -49.19972, + "Z": -304.76843 + }, + "TerritoryId": 959, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 959, + "InteractionType": "Craft", + "ItemId": 38871, + "ItemCount": 1 + }, + { + "DataId": 1044584, + "Position": { + "X": 563.8971, + "Y": -167.50002, + "Z": -594.53723 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true + } ] }, { @@ -42,7 +74,8 @@ "Z": -273.68756 }, "TerritoryId": 959, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "Fly": true }, { "DataId": 1044403, diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index eefbf1eb7..aba772ace 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -826,7 +826,8 @@ "battlestance", "doze", "box", - "sundropdance" + "sundropdance", + "cry" ] } } diff --git a/Questionable.Model/Questing/Converter/EmoteConverter.cs b/Questionable.Model/Questing/Converter/EmoteConverter.cs index 213d909a3..7f11a6f21 100644 --- a/Questionable.Model/Questing/Converter/EmoteConverter.cs +++ b/Questionable.Model/Questing/Converter/EmoteConverter.cs @@ -7,35 +7,36 @@ public sealed class EmoteConverter() : EnumConverter(Values) { private static readonly Dictionary Values = new() { - { EEmote.Stretch, "stretch" }, - { EEmote.Wave, "wave" }, - { EEmote.Rally, "rally" }, - { EEmote.Deny, "deny" }, - { EEmote.Pray, "pray" }, - { EEmote.Slap, "slap" }, - { EEmote.Doubt, "doubt" }, - { EEmote.Psych, "psych" }, - { EEmote.Cheer, "cheer" }, - { EEmote.Happy, "happy" }, - { EEmote.Poke, "poke" }, - { EEmote.Flex, "flex" }, - { EEmote.Soothe, "soothe" }, - { EEmote.Me, "me" }, - { EEmote.Welcome, "welcome" }, - { EEmote.ImperialSalute, "imperialsalute" }, - { EEmote.Pet, "pet" }, - { EEmote.Dance, "dance" }, - { EEmote.Respect, "respect" }, - { EEmote.Lookout, "lookout" }, - { EEmote.Kneel, "kneel" }, { EEmote.Bow, "bow" }, - { EEmote.Uchiwasshoi, "uchiwasshoi" }, + { EEmote.Cheer, "cheer" }, { EEmote.Clap, "clap" }, - { EEmote.VictoryPose, "victorypose" }, { EEmote.Comfort, "comfort" }, - { EEmote.BattleStance, "battlestance" }, + { EEmote.Dance, "dance" }, + { EEmote.Doubt, "doubt" }, { EEmote.Doze, "doze" }, + { EEmote.Wave, "wave" }, + { EEmote.Kneel, "kneel" }, + { EEmote.Lookout, "lookout" }, + { EEmote.Me, "me" }, + { EEmote.Deny, "deny" }, + { EEmote.Poke, "poke" }, + { EEmote.Psych, "psych" }, + { EEmote.Rally, "rally" }, + { EEmote.Soothe, "soothe" }, + { EEmote.Stretch, "stretch" }, + { EEmote.Welcome, "welcome" }, + { EEmote.Happy, "happy" }, + { EEmote.Pray, "pray" }, + { EEmote.ImperialSalute, "imperialsalute" }, + { EEmote.Cry, "cry" }, + { EEmote.Pet, "pet" }, + { EEmote.Slap, "slap" }, + { EEmote.SundropDance, "sundropdance"}, + { EEmote.BattleStance, "battlestance" }, + { EEmote.VictoryPose, "victorypose" }, + { EEmote.Flex, "flex" }, + { EEmote.Respect, "respect" }, { EEmote.Box, "box" }, - { EEmote.SundropDance, "sundropdance"} + { EEmote.Uchiwasshoi, "uchiwasshoi" } }; } diff --git a/Questionable.Model/Questing/EEmote.cs b/Questionable.Model/Questing/EEmote.cs index 4f1b2c6f7..9ca0fa68c 100644 --- a/Questionable.Model/Questing/EEmote.cs +++ b/Questionable.Model/Questing/EEmote.cs @@ -8,34 +8,36 @@ public enum EEmote { None = 0, - Stretch = 37, - Wave = 16, - Rally = 34, - Deny = 25, - Pray = 58, - Slap = 111, - Doubt = 12, - Psych = 30, - Cheer = 6, - Happy = 48, - Poke = 28, - Flex = 139, - Soothe = 35, - Me = 23, - Welcome = 41, - ImperialSalute = 59, - Pet = 105, - Dance = 11, - Respect = 140, - Lookout = 22, - Kneel = 19, Bow = 5, - Uchiwasshoi = 278, + Cheer = 6, Clap = 7, - VictoryPose = 122, Comfort = 9, - BattleStance = 121, + Dance = 11, + Doubt = 12, Doze = 13, + Wave = 16, + Kneel = 19, + Lookout = 22, + Me = 23, + Deny = 25, + Poke = 28, + Psych = 30, + Rally = 34, + Soothe = 35, + Stretch = 37, + Welcome = 41, + Happy = 48, + Pray = 58, + ImperialSalute = 59, + Cry = 74, + Pet = 105, + Slap = 111, + SundropDance = 120, + BattleStance = 121, + VictoryPose = 122, + Flex = 139, + Respect = 140, Box = 166, - SundropDance = 120, + Uchiwasshoi = 278 } + From c176bc2b79b001a9c01fbdffdf1326e397e78166 Mon Sep 17 00:00:00 2001 From: pot0to <19513249+pot0to@users.noreply.github.com> Date: Mon, 21 Oct 2024 11:56:55 -0700 Subject: [PATCH 2/2] cleaned up omicrons quest --- .../Omicrons/Dailies/4618_Sold Out.json | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4618_Sold Out.json b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4618_Sold Out.json index 173d6aef5..4b83ed9dd 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4618_Sold Out.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Omicrons/Dailies/4618_Sold Out.json @@ -48,6 +48,31 @@ } ] }, + { + "DataId": 2013072, + "Position": { + "X": 456.65674, + "Y": 438.04077, + "Z": 310.2312 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "AetheryteShortcut": "Ultima Thule - Base Omicron", + "TargetTerritoryId": 960, + "$": "Portal to A-4 Research" + }, + { + "DataId": 1043865, + "Position": { + "X": 301.8081, + "Y": 482.13644, + "Z": 165.02625 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 960, + "$": "Last Dregs Host Unit" + }, { "DataId": 1043936, "Position": { @@ -56,15 +81,25 @@ "Z": 250.93457 }, "TerritoryId": 960, - "InteractionType": "Interact", - "AetheryteShortcut": "Ultima Thule - Base Omicron", - "Mount": true + "InteractionType": "Interact" } ] }, { "Sequence": 255, "Steps": [ + { + "DataId": 1043864, + "Position": { + "X": 244.83093, + "Y": 564.8203, + "Z": 261.76843 + }, + "TerritoryId": 960, + "InteractionType": "Interact", + "TargetTerritoryId": 960, + "$": "A-4 Transport Unit" + }, { "DataId": 1043417, "Position": {