From 07c5faa781f1370cb25917d9a7269d27a07f8dca Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Wed, 20 Nov 2024 18:39:30 +0100 Subject: [PATCH] Add Respected Pelupelu quests --- Directory.Build.targets | 2 +- .../Dailies/5213_Advisor vs Predator.json | 88 ++++++++++++++++- .../5214_Let Mobbie Be Your Guide.json | 69 +++++++++++++- .../5215_The Popularity of Punutiys.json | 94 ++++++++++++++++++- .../Dailies/5219_Born to Run Away.json | 81 +++++++++++++++- QuestPaths/quest-v1.json | 3 +- .../Questing/Converter/ActionConverter.cs | 1 + Questionable.Model/Questing/EAction.cs | 4 +- Questionable/Functions/QuestFunctions.cs | 1 + 9 files changed, 335 insertions(+), 8 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index ca80e97a..ba0f6f9d 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,5 @@ - 4.2 + 4.3 diff --git a/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5213_Advisor vs Predator.json b/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5213_Advisor vs Predator.json index f7b53cd4..95e55858 100644 --- a/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5213_Advisor vs Predator.json +++ b/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5213_Advisor vs Predator.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -28,6 +27,93 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2014497, + "Position": { + "X": -130.7851, + "Y": 114.39685, + "Z": 240.31421 + }, + "TerritoryId": 1188, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 18174 + ], + "AetheryteShortcut": "Kozama'uka - Earthenshire", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [ + { + "High": 1 + } + ], + null, + null, + null + ] + }, + { + "DataId": 2014498, + "Position": { + "X": -56.565247, + "Y": 111.77234, + "Z": 172.62524 + }, + "TerritoryId": 1188, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 18174 + ], + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [ + { + "High": 2 + } + ], + null, + null, + null + ] + }, + { + "DataId": 2014499, + "Position": { + "X": -84.18408, + "Y": 111.436646, + "Z": 268.05518 + }, + "TerritoryId": 1188, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 18174 + ], + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [ + { + "High": 3 + } + ], + null, + null, + null + ] + } + ] + }, { "Sequence": 255, "Steps": [ diff --git a/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5214_Let Mobbie Be Your Guide.json b/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5214_Let Mobbie Be Your Guide.json index f7b53cd4..58a270a1 100644 --- a/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5214_Let Mobbie Be Your Guide.json +++ b/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5214_Let Mobbie Be Your Guide.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -28,6 +27,74 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1052324, + "Position": { + "X": -248.18805, + "Y": 110.17465, + "Z": 189.01343 + }, + "TerritoryId": 1188, + "InteractionType": "Interact", + "AetheryteShortcut": "Kozama'uka - Earthenshire", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1052326, + "Position": { + "X": -304.61584, + "Y": 110.20639, + "Z": 725.39856 + }, + "TerritoryId": 1188, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [ + null, + [ + { + "High": 2 + } + ], + null, + null, + null, + null + ] + }, + { + "DataId": 1052435, + "Position": { + "X": 505.76025, + "Y": 115.10293, + "Z": 205.7373 + }, + "TerritoryId": 1188, + "InteractionType": "Interact", + "AetheryteShortcut": "Kozama'uka - Many Fires", + "RequiredQuestVariables": [ + null, + [ + { + "High": 1 + } + ], + null, + null, + null, + null + ] + } + ] + }, { "Sequence": 255, "Steps": [ diff --git a/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5215_The Popularity of Punutiys.json b/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5215_The Popularity of Punutiys.json index f7b53cd4..4bd9620a 100644 --- a/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5215_The Popularity of Punutiys.json +++ b/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5215_The Popularity of Punutiys.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -28,6 +27,99 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1051798, + "Position": { + "X": 897.734, + "Y": 6.8223433, + "Z": -285.1759 + }, + "TerritoryId": 1188, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1052328, + "Position": { + "X": 171.6792, + "Y": 16.762953, + "Z": -112.44379 + }, + "TerritoryId": 1188, + "InteractionType": "Action", + "Action": "Bosom Brook", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [ + { + "High": 1 + } + ], + null, + null, + null + ] + }, + { + "DataId": 1052329, + "Position": { + "X": 216.7544, + "Y": 16.31888, + "Z": -99.687195 + }, + "TerritoryId": 1188, + "InteractionType": "Action", + "Action": "Bosom Brook", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [ + { + "High": 2 + } + ], + null, + null, + null + ] + }, + { + "DataId": 1052327, + "Position": { + "X": 186.38892, + "Y": 21.742897, + "Z": -74.47931 + }, + "TerritoryId": 1188, + "InteractionType": "Action", + "Action": "Bosom Brook", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + [ + { + "High": 3 + } + ], + null, + null, + null + ] + } + ] + }, { "Sequence": 255, "Steps": [ diff --git a/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5219_Born to Run Away.json b/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5219_Born to Run Away.json index f7b53cd4..f93bd50d 100644 --- a/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5219_Born to Run Away.json +++ b/QuestPaths/7.x - Dawntrail/Allied Societies/Pelupelu/Dailies/5219_Born to Run Away.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -28,6 +27,84 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1052333, + "Position": { + "X": 775.1736, + "Y": 12.871736, + "Z": -196.0022 + }, + "TerritoryId": 1188, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1052335, + "Position": { + "X": 867.76526, + "Y": 14.402381, + "Z": -171.31305 + }, + "TerritoryId": 1188, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 1052334, + "Position": { + "X": 864.5609, + "Y": 15.056413, + "Z": -256.27533 + }, + "TerritoryId": 1188, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1052336, + "Position": { + "X": 838.4375, + "Y": 14.301746, + "Z": -222.06458 + }, + "TerritoryId": 1188, + "InteractionType": "Interact", + "Fly": true + } + ] + }, { "Sequence": 255, "Steps": [ @@ -39,7 +116,7 @@ }, "TerritoryId": 1188, "InteractionType": "WalkTo", - "AetheryteShortcut": "Kozama'uka - Dock Poga" + "Fly": true }, { "DataId": 1051711, diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 72ee6318..0564a3a3 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -965,7 +965,8 @@ "Katon", "Raiton", "Hide", - "Slug Shot" + "Slug Shot", + "Bosom Brook" ] } }, diff --git a/Questionable.Model/Questing/Converter/ActionConverter.cs b/Questionable.Model/Questing/Converter/ActionConverter.cs index 86a1800b..2af9cfa8 100644 --- a/Questionable.Model/Questing/Converter/ActionConverter.cs +++ b/Questionable.Model/Questing/Converter/ActionConverter.cs @@ -41,5 +41,6 @@ public sealed class ActionConverter() : EnumConverter(Values) { EAction.Katon, "Katon" }, { EAction.Raiton, "Raiton" }, { EAction.SlugShot, "Slug Shot" }, + { EAction.BosomBrook, "Bosom Brook" }, }; } diff --git a/Questionable.Model/Questing/EAction.cs b/Questionable.Model/Questing/EAction.cs index 4f798797..0f72ecc6 100644 --- a/Questionable.Model/Questing/EAction.cs +++ b/Questionable.Model/Questing/EAction.cs @@ -47,6 +47,7 @@ public enum EAction Raiton = 2267, RabbitMedium = 2272, SlugShot = 7412, + BosomBrook = 37173, CollectMiner = 240, ScourMiner = 22182, @@ -84,6 +85,7 @@ public static class EActionExtensions or EAction.YellowGulal or EAction.BlueGulal or EAction.ElectrixFlux - or EAction.HopStep; + or EAction.HopStep + or EAction.BosomBrook; } } diff --git a/Questionable/Functions/QuestFunctions.cs b/Questionable/Functions/QuestFunctions.cs index 1ef56c4e..dc507a0a 100644 --- a/Questionable/Functions/QuestFunctions.cs +++ b/Questionable/Functions/QuestFunctions.cs @@ -243,6 +243,7 @@ internal sealed unsafe class QuestFunctions { return questId.Value switch { + 5215 => EAlliedSociety.None, >= 5199 and <= 5226 => EAlliedSociety.Pelupelu, _ => EAlliedSociety.None, };