From bd6655615c141272ac50cde8b3553e013ec926b1 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 8 Sep 2024 14:38:24 +0200 Subject: [PATCH] Add Old Sharlayan side quests --- .../Old Sharlayan/4180_A Waiting Love.json | 76 +++++++ .../4181_Scholarly Perspective.json | 77 +++++++ .../4182_A Literary Delivery.json | 108 ++++++++++ .../Old Sharlayan/4183_Doll Dash.json | 66 ++++++ .../4210_A Volatile Education.json | 113 +++++++++++ .../4211_The Light of Progress.json | 66 ++++++ .../Old Sharlayan/4212_My Fair Mammet.json | 59 ++++++ ...13_The Creature from the Wooden Crate.json | 66 ++++++ .../Old Sharlayan/4214_Fast Fashion.json | 132 ++++++++++++ .../Old Sharlayan/4215_Booking Books.json | 188 ++++++++++++++++++ .../4316_For the Love of Pudding.json | 122 ++++++++++++ .../Old Sharlayan/4317_Secret in the Box.json | 132 ++++++++++++ .../4319_Sandwiches and Pretzels.json | 77 +++++++ QuestPaths/quest-v1.json | 3 +- .../Questing/Converter/EmoteConverter.cs | 1 + Questionable.Model/Questing/EEmote.cs | 1 + .../Controller/Steps/Interactions/Interact.cs | 6 +- 17 files changed, 1290 insertions(+), 3 deletions(-) create mode 100644 QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4180_A Waiting Love.json create mode 100644 QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4181_Scholarly Perspective.json create mode 100644 QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4182_A Literary Delivery.json create mode 100644 QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4183_Doll Dash.json create mode 100644 QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4210_A Volatile Education.json create mode 100644 QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4211_The Light of Progress.json create mode 100644 QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4212_My Fair Mammet.json create mode 100644 QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4213_The Creature from the Wooden Crate.json create mode 100644 QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4214_Fast Fashion.json create mode 100644 QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4215_Booking Books.json create mode 100644 QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4316_For the Love of Pudding.json create mode 100644 QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4317_Secret in the Box.json create mode 100644 QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4319_Sandwiches and Pretzels.json diff --git a/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4180_A Waiting Love.json b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4180_A Waiting Love.json new file mode 100644 index 000000000..89c51bba3 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4180_A Waiting Love.json @@ -0,0 +1,76 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1039336, + "Position": { + "X": -175.61609, + "Y": 7.84433, + "Z": 68.92493 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1039328, + "Position": { + "X": -152.3919, + "Y": -16.147, + "Z": 209.46057 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] The Baldesion Annex", + "[Old Sharlayan] Scholar's Harbor" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1039328, + "Position": { + "X": -152.3919, + "Y": -16.147, + "Z": 209.46057 + }, + "TerritoryId": 962, + "InteractionType": "Emote", + "Emote": "poke" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1039336, + "Position": { + "X": -175.61609, + "Y": 7.84433, + "Z": 68.92493 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Old Sharlayan", + "AethernetShortcut": [ + "[Old Sharlayan] Aetheryte Plaza", + "[Old Sharlayan] The Baldesion Annex" + ] + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4181_Scholarly Perspective.json b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4181_Scholarly Perspective.json new file mode 100644 index 000000000..d78b2a99f --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4181_Scholarly Perspective.json @@ -0,0 +1,77 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1037211, + "Position": { + "X": 36.209595, + "Y": 2.455876, + "Z": -22.90387 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1039337, + "Position": { + "X": 99.6261, + "Y": -10.587427, + "Z": 276.81384 + }, + "TerritoryId": 962, + "InteractionType": "Instruction", + "Comment": "Click ewer, head and feet", + "AethernetShortcut": [ + "[Old Sharlayan] Aetheryte Plaza", + "[Old Sharlayan] Scholar's Harbor" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1039349, + "Position": { + "X": -49.485046, + "Y": -14.999998, + "Z": 253.34546 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AetheryteShortcut": "Old Sharlayan", + "AethernetShortcut": [ + "[Old Sharlayan] Aetheryte Plaza", + "[Old Sharlayan] Scholar's Harbor" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1037211, + "Position": { + "X": 36.209595, + "Y": 2.455876, + "Z": -22.90387 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Old Sharlayan" + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4182_A Literary Delivery.json b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4182_A Literary Delivery.json new file mode 100644 index 000000000..475d4264c --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4182_A Literary Delivery.json @@ -0,0 +1,108 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1039509, + "Position": { + "X": 42.06909, + "Y": 2.4514537, + "Z": -11.062805 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1039340, + "Position": { + "X": 71.39697, + "Y": -14.446998, + "Z": 82.108765 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] Aetheryte Plaza", + "[Old Sharlayan] Scholar's Harbor" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 1039338, + "Position": { + "X": 205.67627, + "Y": 1.5468291, + "Z": 22.690125 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] Scholar's Harbor", + "[Old Sharlayan] Journey's End" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1039339, + "Position": { + "X": -237.93402, + "Y": 12.289626, + "Z": 16.189758 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] Journey's End", + "[Old Sharlayan] The Studium" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1039509, + "Position": { + "X": 42.06909, + "Y": 2.4514537, + "Z": -11.062805 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Old Sharlayan" + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4183_Doll Dash.json b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4183_Doll Dash.json new file mode 100644 index 000000000..c9548b756 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4183_Doll Dash.json @@ -0,0 +1,66 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1039341, + "Position": { + "X": 164.72107, + "Y": 1.2891341, + "Z": 22.140747 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_AKTKZA004_04183_Q1_000_000", + "Answer": "TEXT_AKTKZA004_04183_A1_000_002" + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1039342, + "Position": { + "X": 111.65027, + "Y": 18.835812, + "Z": -175.0058 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] Journey's End", + "[Old Sharlayan] The Leveilleur Estate" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1039341, + "Position": { + "X": 164.72107, + "Y": 1.2891341, + "Z": 22.140747 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Old Sharlayan] The Leveilleur Estate", + "[Old Sharlayan] Journey's End" + ] + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4210_A Volatile Education.json b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4210_A Volatile Education.json new file mode 100644 index 000000000..b42a58b08 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4210_A Volatile Education.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": 1039510, + "Position": { + "X": -309.07147, + "Y": 21.799957, + "Z": -174.36487 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -201.63965, + "Y": 25.46388, + "Z": -157.38919 + }, + "TerritoryId": 962, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": -191.05865, + "Y": 22.001097, + "Z": -166.16983 + }, + "TerritoryId": 962, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, + { + "DataId": 1039346, + "Position": { + "X": -188.922, + "Y": 23.49104, + "Z": -181.90283 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2011801, + "Position": { + "X": -191.02777, + "Y": 24.215942, + "Z": -179.15619 + }, + "TerritoryId": 962, + "InteractionType": "UseItem", + "ItemId": 2003114 + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1039346, + "Position": { + "X": -188.922, + "Y": 23.49104, + "Z": -181.90283 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_AKTKZC001_04210_Q1_000_000", + "Answer": "TEXT_AKTKZC001_04210_A1_000_002" + } + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1039510, + "Position": { + "X": -309.07147, + "Y": 21.799957, + "Z": -174.36487 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Old Sharlayan", + "AethernetShortcut": [ + "[Old Sharlayan] Aetheryte Plaza", + "[Old Sharlayan] The Studium" + ] + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4211_The Light of Progress.json b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4211_The Light of Progress.json new file mode 100644 index 000000000..80534b455 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4211_The Light of Progress.json @@ -0,0 +1,66 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 2011795, + "Position": { + "X": -104.32593, + "Y": 24.673828, + "Z": -120.042725 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1039344, + "Position": { + "X": -58.54895, + "Y": 5.9669995, + "Z": -60.746216 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1039509, + "Position": { + "X": 42.06909, + "Y": 2.4514537, + "Z": -11.062805 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1039345, + "Position": { + "X": -102.1897, + "Y": 24.649986, + "Z": -119.798584 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4212_My Fair Mammet.json b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4212_My Fair Mammet.json new file mode 100644 index 000000000..eec5c43f2 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4212_My Fair Mammet.json @@ -0,0 +1,59 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1037104, + "Position": { + "X": -326.07007, + "Y": 20.1375, + "Z": -142.56512 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1039343, + "Position": { + "X": -16.983276, + "Y": -16.246998, + "Z": 123.03345 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] The Studium", + "[Old Sharlayan] Scholar's Harbor" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1037104, + "Position": { + "X": -326.07007, + "Y": 20.1375, + "Z": -142.56512 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Old Sharlayan] Scholar's Harbor", + "[Old Sharlayan] The Studium" + ] + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4213_The Creature from the Wooden Crate.json b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4213_The Creature from the Wooden Crate.json new file mode 100644 index 000000000..cf4a54278 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4213_The Creature from the Wooden Crate.json @@ -0,0 +1,66 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1041286, + "Position": { + "X": -230.51807, + "Y": 21.437386, + "Z": -119.46289 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_AKTKZC004_04213_Q1_000_000", + "Answer": "TEXT_AKTKZC004_04213_A1_000_001" + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1041285, + "Position": { + "X": 115.80066, + "Y": 14.741594, + "Z": -132.03638 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] The Studium", + "[Old Sharlayan] The Leveilleur Estate" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1041286, + "Position": { + "X": -230.51807, + "Y": 21.437386, + "Z": -119.46289 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Old Sharlayan] The Leveilleur Estate", + "[Old Sharlayan] The Studium" + ] + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4214_Fast Fashion.json b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4214_Fast Fashion.json new file mode 100644 index 000000000..0b4c7e74c --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4214_Fast Fashion.json @@ -0,0 +1,132 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1041287, + "Position": { + "X": -307.3625, + "Y": 22.3, + "Z": -143.29755 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest", + "DialogueChoices": [ + { + "Type": "YesNo", + "Prompt": "TEXT_AKTKZC005_04214_Q1_000_000", + "Yes": true + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1041288, + "Position": { + "X": -169.51251, + "Y": 21.975235, + "Z": -152.26978 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2012434, + "Position": { + "X": -168.32227, + "Y": 21.927185, + "Z": -151.29321 + }, + "StopDistance": 0.25, + "TerritoryId": 962, + "InteractionType": "Emote", + "Emote": "battlestance" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2012437, + "Position": { + "X": -169.69562, + "Y": 22.87323, + "Z": -150.07251 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1037098, + "Position": { + "X": -94.83484, + "Y": 6.617, + "Z": -41.58087 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1041288, + "Position": { + "X": -169.51251, + "Y": 21.975235, + "Z": -152.26978 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_AKTKZC005_04214_Q2_000_000", + "Answer": "TEXT_AKTKZC005_04214_A2_000_002" + } + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1041287, + "Position": { + "X": -307.3625, + "Y": 22.3, + "Z": -143.29755 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Old Sharlayan", + "AethernetShortcut": [ + "[Old Sharlayan] Aetheryte Plaza", + "[Old Sharlayan] The Studium" + ] + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4215_Booking Books.json b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4215_Booking Books.json new file mode 100644 index 000000000..932078177 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4215_Booking Books.json @@ -0,0 +1,188 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1037139, + "Position": { + "X": -317.06726, + "Y": 19, + "Z": 48.844116 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -265.8844, + "Y": 18.745457, + "Z": 44.893326 + }, + "TerritoryId": 962, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + } + }, + { + "Position": { + "X": -258.26123, + "Y": 12.376022, + "Z": 53.92458 + }, + "TerritoryId": 962, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + } + }, + { + "DataId": 1041289, + "Position": { + "X": -265.919, + "Y": 12.623348, + "Z": 102.86096 + }, + "TerritoryId": 962, + "InteractionType": "UseItem", + "ItemId": 2003288, + "GroundTarget": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1041290, + "Position": { + "X": -291.49316, + "Y": 12.68306, + "Z": 127.45862 + }, + "TerritoryId": 962, + "InteractionType": "UseItem", + "ItemId": 2003288, + "GroundTarget": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1041291, + "Position": { + "X": -155.77942, + "Y": 11.71745, + "Z": -52.628357 + }, + "TerritoryId": 962, + "InteractionType": "UseItem", + "ItemId": 2003288, + "GroundTarget": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 1041292, + "Position": { + "X": -147.50903, + "Y": 12.490502, + "Z": -87.052734 + }, + "TerritoryId": 962, + "InteractionType": "UseItem", + "ItemId": 2003288, + "GroundTarget": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] + }, + { + "DataId": 1041293, + "Position": { + "X": -107.86603, + "Y": 18.024683, + "Z": -71.33594 + }, + "TerritoryId": 962, + "InteractionType": "UseItem", + "ItemId": 2003288, + "GroundTarget": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1037139, + "Position": { + "X": -317.06726, + "Y": 19, + "Z": 48.844116 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Old Sharlayan] The Baldesion Annex", + "[Old Sharlayan] The Studium" + ] + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4316_For the Love of Pudding.json b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4316_For the Love of Pudding.json new file mode 100644 index 000000000..39bdc0945 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4316_For the Love of Pudding.json @@ -0,0 +1,122 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1041301, + "Position": { + "X": -50.94995, + "Y": -14.169327, + "Z": 108.75098 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1041295, + "Position": { + "X": -22.568176, + "Y": -16.246908, + "Z": 91.75244 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1037066, + "Position": { + "X": 65.01868, + "Y": -14.446999, + "Z": 78.26355 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 1040985, + "Position": { + "X": 56.77881, + "Y": 5.1499996, + "Z": -73.86902 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] Scholar's Harbor", + "[Old Sharlayan] Aetheryte Plaza" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 2012610, + "Position": { + "X": -363.6988, + "Y": 20.279175, + "Z": 92.729004 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] Aetheryte Plaza", + "[Old Sharlayan] The Studium" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1041301, + "Position": { + "X": -50.94995, + "Y": -14.169327, + "Z": 108.75098 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Old Sharlayan] The Studium", + "[Old Sharlayan] Scholar's Harbor" + ] + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4317_Secret in the Box.json b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4317_Secret in the Box.json new file mode 100644 index 000000000..b5dd688ae --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4317_Secret in the Box.json @@ -0,0 +1,132 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1041296, + "Position": { + "X": -32.913757, + "Y": 2.400051, + "Z": -8.804504 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2012438, + "Position": { + "X": -33.310486, + "Y": 2.8533936, + "Z": -9.048645 + }, + "StopDistance": 4, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1041297, + "Position": { + "X": -167.55939, + "Y": 6.6576204, + "Z": 129.07605 + }, + "TerritoryId": 962, + "InteractionType": "Emote", + "Emote": "doze", + "AethernetShortcut": [ + "[Old Sharlayan] Aetheryte Plaza", + "[Old Sharlayan] The Baldesion Annex" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1041299, + "Position": { + "X": -126.17688, + "Y": 29.890081, + "Z": -201.80054 + }, + "TerritoryId": 962, + "InteractionType": "Say", + "ChatMessage": { + "Key": "TEXT_AKTKZI002_04317_SAYTODO_000_060" + }, + "AethernetShortcut": [ + "[Old Sharlayan] The Baldesion Annex", + "[Old Sharlayan] The Rostra" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1037234, + "Position": { + "X": 16.922241, + "Y": 23.499975, + "Z": -136.67511 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ], + "SkipConditions": { + "StepIf": { + "Never": true + } + } + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 2012439, + "Position": { + "X": -32.822205, + "Y": 2.8533936, + "Z": -9.842102 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Old Sharlayan] The Rostra", + "[Old Sharlayan] Aetheryte Plaza" + ] + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4319_Sandwiches and Pretzels.json b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4319_Sandwiches and Pretzels.json new file mode 100644 index 000000000..5d4c1cacb --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Quests/Old Sharlayan/4319_Sandwiches and Pretzels.json @@ -0,0 +1,77 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "Position": { + "X": -38.106888, + "Y": -14.1693125, + "Z": 107.58956 + }, + "TerritoryId": 962, + "InteractionType": "WalkTo" + }, + { + "DataId": 1037077, + "Position": { + "X": -38.07129, + "Y": -14.169313, + "Z": 105.30249 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1041308, + "Position": { + "X": 190.6615, + "Y": 18.89543, + "Z": -91.44739 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] Scholar's Harbor", + "[Old Sharlayan] The Leveilleur Estate" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": -38.106888, + "Y": -14.1693125, + "Z": 107.58956 + }, + "TerritoryId": 962, + "InteractionType": "WalkTo", + "AethernetShortcut": [ + "[Old Sharlayan] The Leveilleur Estate", + "[Old Sharlayan] Scholar's Harbor" + ] + }, + { + "DataId": 1037077, + "Position": { + "X": -38.07129, + "Y": -14.169313, + "Z": 105.30249 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 5b69b6626..7efcab128 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -780,7 +780,8 @@ "clap", "victorypose", "comfort", - "battlestance" + "battlestance", + "doze" ] } } diff --git a/Questionable.Model/Questing/Converter/EmoteConverter.cs b/Questionable.Model/Questing/Converter/EmoteConverter.cs index 27715b546..629a0f4fd 100644 --- a/Questionable.Model/Questing/Converter/EmoteConverter.cs +++ b/Questionable.Model/Questing/Converter/EmoteConverter.cs @@ -34,5 +34,6 @@ public sealed class EmoteConverter() : EnumConverter(Values) { EEmote.VictoryPose, "victorypose" }, { EEmote.Comfort, "comfort" }, { EEmote.BattleStance, "battlestance" }, + { EEmote.Doze, "doze" }, }; } diff --git a/Questionable.Model/Questing/EEmote.cs b/Questionable.Model/Questing/EEmote.cs index 2ec72603b..424a2ebcb 100644 --- a/Questionable.Model/Questing/EEmote.cs +++ b/Questionable.Model/Questing/EEmote.cs @@ -35,4 +35,5 @@ public enum EEmote VictoryPose = 122, Comfort = 9, BattleStance = 121, + Doze = 13, } diff --git a/Questionable/Controller/Steps/Interactions/Interact.cs b/Questionable/Controller/Steps/Interactions/Interact.cs index 8d6b67faf..4988b2ae4 100644 --- a/Questionable/Controller/Steps/Interactions/Interact.cs +++ b/Questionable/Controller/Steps/Interactions/Interact.cs @@ -47,7 +47,8 @@ internal static class Interact yield return new WaitAtEnd.WaitDelay(); yield return Interact(step.DataId.Value, quest, step.InteractionType, - step.TargetTerritoryId != null || quest.Id is SatisfactionSupplyNpcId, step.PickUpItemId); + step.TargetTerritoryId != null || quest.Id is SatisfactionSupplyNpcId || + step.SkipConditions is { StepIf.Never: true }, step.PickUpItemId); } internal ITask Interact(uint dataId, Quest? quest, EInteractionType interactionType, @@ -182,7 +183,8 @@ internal static class Interact } else if (dataId is >= 1047901 and <= 1047905 && condition[ConditionFlag.Disguised] && - flag == ConditionFlag.Mounting71 && // why the fuck is this the flag that's used, instead of OccupiedIn[Quest]Event + flag == ConditionFlag + .Mounting71 && // why the fuck is this the flag that's used, instead of OccupiedIn[Quest]Event value) { logger.LogInformation("(A Knight of Alexandria) Interaction was most likely triggered");