From 8ef1b8440c5a13cec844018ba6c4cb2a0c94aee6 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sat, 31 Aug 2024 20:49:52 +0800 Subject: [PATCH 1/2] Added MNK actions "Twin Snakes", "Demolish", "Dragon Kick", and "Form Shift" --- QuestPaths/quest-v1.json | 4 ++++ Questionable.Model/Questing/Converter/ActionConverter.cs | 4 ++++ Questionable.Model/Questing/EAction.cs | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 6279b7ac..3e134e8b 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -855,11 +855,15 @@ "enum": [ "Heavy Swing", "Bootshine", + "Twin Snakes", + "Demolish", + "Dragon Kick", "Heavy Shot", "Cure", "Cure II", "Esuna", "Physick", + "Form Shift", "Buffet (Sanuwa)", "Buffet (Griffin)", "Fumigate", diff --git a/Questionable.Model/Questing/Converter/ActionConverter.cs b/Questionable.Model/Questing/Converter/ActionConverter.cs index c0399493..6393aeec 100644 --- a/Questionable.Model/Questing/Converter/ActionConverter.cs +++ b/Questionable.Model/Questing/Converter/ActionConverter.cs @@ -9,11 +9,15 @@ public sealed class ActionConverter() : EnumConverter(Values) { { EAction.HeavySwing, "Heavy Swing" }, { EAction.Bootshine, "Bootshine" }, + { EAction.TwinSnakes, "Twin Snakes" }, + { EAction.Demolish, "Demolish" }, + { EAction.DragonKick, "Dragon Kick" }, { EAction.HeavyShot, "Heavy Shot" }, { EAction.Cure, "Cure" }, { EAction.Cure2, "Cure II" }, { EAction.Esuna, "Esuna" }, { EAction.Physick, "Physick" }, + { EAction.FormShift, "Form Shift" }, { EAction.BuffetSanuwa, "Buffet (Sanuwa)" }, { EAction.BuffetGriffin, "Buffet (Griffin)" }, { EAction.Fumigate, "Fumigate" }, diff --git a/Questionable.Model/Questing/EAction.cs b/Questionable.Model/Questing/EAction.cs index c8ea63e6..19fb4a98 100644 --- a/Questionable.Model/Questing/EAction.cs +++ b/Questionable.Model/Questing/EAction.cs @@ -8,11 +8,15 @@ public enum EAction { HeavySwing = 31, Bootshine = 53, + TwinSnakes = 61, + Demolish = 66, + DragonKick = 74, HeavyShot = 97, Cure = 120, Cure2 = 135, Esuna = 7568, Physick = 190, + FormShift = 4262, BuffetSanuwa = 4931, BuffetGriffin = 4583, Fumigate = 5872, -- 2.45.2 From 66ed076785df5be23ae650829f2bbebeacdb54b0 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sat, 31 Aug 2024 20:50:04 +0800 Subject: [PATCH 2/2] Added all MNK Stormblood class quests --- .../MNK/2426_A Fistful of Resolve.json | 107 ++++++++++++ .../MNK/2427_Return of the Monk.json | 151 ++++++++++++++++ .../MNK/2428_Cross-fist Training.json | 164 ++++++++++++++++++ .../MNK/2429_Choices and Paths.json | 149 ++++++++++++++++ .../MNK/2430_The Power to Protect.json | 119 +++++++++++++ 5 files changed, 690 insertions(+) create mode 100644 QuestPaths/4.x - Stormblood/Class Quests/MNK/2426_A Fistful of Resolve.json create mode 100644 QuestPaths/4.x - Stormblood/Class Quests/MNK/2427_Return of the Monk.json create mode 100644 QuestPaths/4.x - Stormblood/Class Quests/MNK/2428_Cross-fist Training.json create mode 100644 QuestPaths/4.x - Stormblood/Class Quests/MNK/2429_Choices and Paths.json create mode 100644 QuestPaths/4.x - Stormblood/Class Quests/MNK/2430_The Power to Protect.json diff --git a/QuestPaths/4.x - Stormblood/Class Quests/MNK/2426_A Fistful of Resolve.json b/QuestPaths/4.x - Stormblood/Class Quests/MNK/2426_A Fistful of Resolve.json new file mode 100644 index 00000000..73f3621e --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/MNK/2426_A Fistful of Resolve.json @@ -0,0 +1,107 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1006749, + "Position": { + "X": -30.47229, + "Y": 13.599918, + "Z": 95.26196 + }, + "TerritoryId": 131, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ul'dah", + "AethernetShortcut": [ + "[Ul'dah] Aetheryte Plaza", + "[Ul'dah] Goldsmiths' Guild" + ], + "SkipConditions": { + "AethernetShortcutIf": { + "InSameTerritory": true + }, + "AetheryteShortcutIf": { + "InTerritory": [130, 131] + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1013971, + "Position": { + "X": 15.854065, + "Y": 28.620823, + "Z": -682.76495 + }, + "TerritoryId": 156, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Mor Dhona" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1022372, + "Position": { + "X": -224.90277, + "Y": 26.139341, + "Z": -353.38373 + }, + "TerritoryId": 146, + "InteractionType": "Interact", + "Mount": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1022373, + "Position": { + "X": -81.22388, + "Y": 39.42472, + "Z": -336.96503 + }, + "TerritoryId": 146, + "InteractionType": "Interact", + "Mount": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1013971, + "Position": { + "X": 15.854065, + "Y": 28.620823, + "Z": -682.76495 + }, + "TerritoryId": 156, + "InteractionType": "CompleteQuest", + "Fly": true, + "AetheryteShortcut": "Mor Dhona", + "DialogueChoices": [ + { + "Prompt": "TEXT_JOBMNK601_02426_Q2_000_000", + "Type": "List", + "Answer": "TEXT_JOBMNK601_02426_A2_000_001" + } + ] + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Class Quests/MNK/2427_Return of the Monk.json b/QuestPaths/4.x - Stormblood/Class Quests/MNK/2427_Return of the Monk.json new file mode 100644 index 00000000..3afc9843 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/MNK/2427_Return of the Monk.json @@ -0,0 +1,151 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1013971, + "Position": { + "X": 15.854065, + "Y": 28.620823, + "Z": -682.76495 + }, + "TerritoryId": 156, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Mor Dhona", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1022384, + "Position": { + "X": 76.920654, + "Y": 62.19928, + "Z": -669.4591 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Fringes - Castrum Oriens" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1022387, + "Position": { + "X": 49.94275, + "Y": 118.155785, + "Z": -746.0899 + }, + "TerritoryId": 620, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Peaks - Ala Gannha" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1022390, + "Position": { + "X": 51.132935, + "Y": 118.44431, + "Z": -789.27295 + }, + "TerritoryId": 620, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "Position": { + "X": 46.555176, + "Y": 117.997925, + "Z": -784.2374 + }, + "TerritoryId": 620, + "InteractionType": "Action", + "Action": "Form Shift" + }, + { + "DataId": 2008451, + "Position": { + "X": 46.555176, + "Y": 117.997925, + "Z": -784.2374 + }, + "TerritoryId": 620, + "InteractionType": "Action", + "Action": "Twin Snakes" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2008451, + "Position": { + "X": 46.555176, + "Y": 117.997925, + "Z": -784.2374 + }, + "TerritoryId": 620, + "InteractionType": "Action", + "Action": "Dragon Kick" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 2008451, + "Position": { + "X": 46.555176, + "Y": 117.997925, + "Z": -784.2374 + }, + "TerritoryId": 620, + "InteractionType": "Action", + "Action": "Demolish" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1022390, + "Position": { + "X": 51.132935, + "Y": 118.44431, + "Z": -789.27295 + }, + "TerritoryId": 620, + "InteractionType": "CompleteQuest", + "NextQuestId": 2428 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Class Quests/MNK/2428_Cross-fist Training.json b/QuestPaths/4.x - Stormblood/Class Quests/MNK/2428_Cross-fist Training.json new file mode 100644 index 00000000..a58ddf73 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/MNK/2428_Cross-fist Training.json @@ -0,0 +1,164 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1022390, + "Position": { + "X": 51.132935, + "Y": 118.44431, + "Z": -789.27295 + }, + "TerritoryId": 620, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Peaks - Ala Gannha", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1003817, + "Position": { + "X": -74.57086, + "Y": 1.9999951, + "Z": -42.404846 + }, + "TerritoryId": 130, + "AetheryteShortcut": "Ul'dah", + "InteractionType": "CompleteQuest" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1022390, + "Position": { + "X": 51.132935, + "Y": 118.44431, + "Z": -789.27295 + }, + "TerritoryId": 620, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Peaks - Ala Gannha" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1022404, + "Position": { + "X": 76.43237, + "Y": 62.148823, + "Z": -667.2923 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Fringes - Castrum Oriens" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "Position": { + "X": -96.72436, + "Y": 60.086643, + "Z": -602.3445 + }, + "TerritoryId": 612, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "Position": { + "X": -109.40343, + "Y": 60.039776, + "Z": -612.03217 + }, + "TerritoryId": 612, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [7217], + "CombatDelaySecondsAtStart": 0, + "Mount": false + }, + { + "DataId": 1022405, + "Position": { + "X": -106.82843, + "Y": 60.07189, + "Z": -609.49115 + }, + "TerritoryId": 612, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1022411, + "Position": { + "X": -107.927124, + "Y": 60.035603, + "Z": -609.76575 + }, + "TerritoryId": 612, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1022412, + "Position": { + "X": 103.77649, + "Y": 118.18349, + "Z": -707.393 + }, + "TerritoryId": 620, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Peaks - Ala Gannha" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1023728, + "Position": { + "X": 51.132935, + "Y": 118.44431, + "Z": -789.27295 + }, + "TerritoryId": 620, + "InteractionType": "CompleteQuest", + "Fly": true, + "NextQuestId": 2429 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Class Quests/MNK/2429_Choices and Paths.json b/QuestPaths/4.x - Stormblood/Class Quests/MNK/2429_Choices and Paths.json new file mode 100644 index 00000000..fbd3bd5b --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/MNK/2429_Choices and Paths.json @@ -0,0 +1,149 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1023728, + "Position": { + "X": 51.132935, + "Y": 118.44431, + "Z": -789.27295 + }, + "TerritoryId": 620, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Peaks - Ala Gannha", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1022437, + "Position": { + "X": 81.467896, + "Y": 118.391884, + "Z": -792.7825 + }, + "TerritoryId": 620, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1022438, + "Position": { + "X": -61.112427, + "Y": -0.002525447, + "Z": -67.67377 + }, + "TerritoryId": 635, + "InteractionType": "Interact", + "Mount": true, + "AetheryteShortcut": "Rhalgr's Reach", + "AethernetShortcut": [ + "[Rhalgr's Reach] Aetheryte Plaza", + "[Rhalgr's Reach] Western Rhalgr's Reach" + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1023728, + "Position": { + "X": 51.132935, + "Y": 118.44431, + "Z": -789.27295 + }, + "TerritoryId": 620, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Peaks - Ala Gannha" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1022439, + "Position": { + "X": 162.40173, + "Y": 49.7417, + "Z": -251.9112 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Fringes - Peering Stones" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1022442, + "Position": { + "X": -575.1583, + "Y": 110.899315, + "Z": -324.69672 + }, + "TerritoryId": 612, + "InteractionType": "SinglePlayerDuty", + "Fly": true, + "AetheryteShortcut": "Fringes - Castrum Oriens", + "$": "Will skip Sequence 6" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1022446, + "Position": { + "X": -586.2974, + "Y": 113.00655, + "Z": -312.7337 + }, + "TerritoryId": 612, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1022390, + "Position": { + "X": 51.132935, + "Y": 118.44431, + "Z": -789.27295 + }, + "TerritoryId": 620, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Peaks - Ala Gannha", + "Fly": true, + "NextQuestId": 2430 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Class Quests/MNK/2430_The Power to Protect.json b/QuestPaths/4.x - Stormblood/Class Quests/MNK/2430_The Power to Protect.json new file mode 100644 index 00000000..457226b0 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Class Quests/MNK/2430_The Power to Protect.json @@ -0,0 +1,119 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1022390, + "Position": { + "X": 51.132935, + "Y": 118.44431, + "Z": -789.27295 + }, + "TerritoryId": 620, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Peaks - Ala Gannha", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + }, + "DialogueChoices": [ + { + "Prompt": "TEXT_JOBMNK700_02430_Q1_000_000", + "Type": "List", + "Answer": "TEXT_JOBMNK700_02430_A1_000_001" + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1022532, + "Position": { + "X": 617.6089, + "Y": 271.0004, + "Z": -463.1266 + }, + "TerritoryId": 620, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1022548, + "Position": { + "X": 75.638916, + "Y": 62.111427, + "Z": -665.3696 + }, + "TerritoryId": 612, + "InteractionType": "SinglePlayerDuty", + "Fly": true, + "AetheryteShortcut": "Fringes - Castrum Oriens", + "$": "Will skip Sequence 5" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1022539, + "Position": { + "X": 54.36792, + "Y": 118.22339, + "Z": -785.12244 + }, + "TerritoryId": 620, + "InteractionType": "Interact" + }, + { + "DataId": 1022538, + "Position": { + "X": 51.31604, + "Y": 118.32745, + "Z": -786.9841 + }, + "TerritoryId": 620, + "InteractionType": "Interact" + }, + { + "DataId": 1022392, + "Position": { + "X": 53.147095, + "Y": 118.4737, + "Z": -788.4489 + }, + "TerritoryId": 620, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1022390, + "Position": { + "X": 51.132935, + "Y": 118.44431, + "Z": -789.27295 + }, + "TerritoryId": 620, + "InteractionType": "CompleteQuest", + "NextQuestId": 3211 + } + ] + } + ] +} -- 2.45.2