From 070d7a2407607446c8663ef2d0f229bf8383b88e Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 31 Dec 2024 23:30:49 +0100 Subject: [PATCH] Add some Sylph quests --- ...In the Sylphlands, Treasure Hunts You.json | 132 ++++++++++++++++++ .../Dailies/1275_Perilous Pumpkins.json | 79 +++++++++++ .../Sylphs/Dailies/1276_Fungal Foulness.json | 57 ++++++++ .../Controller/Steps/Interactions/Combat.cs | 8 +- .../Controller/Steps/Interactions/UseItem.cs | 4 +- 5 files changed, 276 insertions(+), 4 deletions(-) create mode 100644 QuestPaths/2.x - A Realm Reborn/Allied Societies/Sylphs/Dailies/1274_In the Sylphlands, Treasure Hunts You.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Allied Societies/Sylphs/Dailies/1275_Perilous Pumpkins.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Allied Societies/Sylphs/Dailies/1276_Fungal Foulness.json diff --git a/QuestPaths/2.x - A Realm Reborn/Allied Societies/Sylphs/Dailies/1274_In the Sylphlands, Treasure Hunts You.json b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Sylphs/Dailies/1274_In the Sylphlands, Treasure Hunts You.json new file mode 100644 index 00000000..0f61707f --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Sylphs/Dailies/1274_In the Sylphlands, Treasure Hunts You.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": 1005562, + "Position": { + "X": 36.850464, + "Y": -4.8778634, + "Z": 249.19507 + }, + "TerritoryId": 152, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 321.08926, + "Y": -17.347095, + "Z": -201.61072 + }, + "TerritoryId": 152, + "InteractionType": "WalkTo", + "Fly": true, + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] + } + } + }, + { + "DataId": 2003494, + "Position": { + "X": 319.44763, + "Y": -17.227417, + "Z": -200.88507 + }, + "TerritoryId": 152, + "InteractionType": "Combat", + "EnemySpawnType": "AfterItemUse", + "ItemId": 2001154, + "GroundTarget": true, + "KillEnemyDataIds": [ + 764 + ], + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] + }, + { + "DataId": 2003041, + "Position": { + "X": 386.099, + "Y": -20.187744, + "Z": -200.763 + }, + "TerritoryId": 152, + "InteractionType": "Combat", + "EnemySpawnType": "AfterItemUse", + "ItemId": 2001154, + "GroundTarget": true, + "KillEnemyDataIds": [ + 764 + ], + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 4 + ] + }, + { + "DataId": 2003040, + "Position": { + "X": 326.77185, + "Y": -18.112549, + "Z": -235.95032 + }, + "TerritoryId": 152, + "InteractionType": "Combat", + "EnemySpawnType": "AfterItemUse", + "ItemId": 2001154, + "GroundTarget": true, + "KillEnemyDataIds": [ + 764 + ], + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1005562, + "Position": { + "X": 36.850464, + "Y": -4.8778634, + "Z": 249.19507 + }, + "TerritoryId": 152, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "East Shroud - Hawthorne Hut", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Allied Societies/Sylphs/Dailies/1275_Perilous Pumpkins.json b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Sylphs/Dailies/1275_Perilous Pumpkins.json new file mode 100644 index 00000000..bc371334 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Sylphs/Dailies/1275_Perilous Pumpkins.json @@ -0,0 +1,79 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1005562, + "Position": { + "X": 36.850464, + "Y": -4.8778634, + "Z": 249.19507 + }, + "TerritoryId": 152, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2003307, + "Position": { + "X": 261.82947, + "Y": -9.323303, + "Z": -72.80078 + }, + "TerritoryId": 152, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2003487, + "Position": { + "X": 429.89233, + "Y": -14.2977295, + "Z": -257.61804 + }, + "TerritoryId": 152, + "InteractionType": "Interact" + }, + { + "DataId": 2003310, + "Position": { + "X": 551.812, + "Y": -22.537598, + "Z": -352.13245 + }, + "TerritoryId": 152, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1005562, + "Position": { + "X": 36.850464, + "Y": -4.8778634, + "Z": 249.19507 + }, + "TerritoryId": 152, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "East Shroud - Hawthorne Hut", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Allied Societies/Sylphs/Dailies/1276_Fungal Foulness.json b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Sylphs/Dailies/1276_Fungal Foulness.json new file mode 100644 index 00000000..d03b0a2c --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Sylphs/Dailies/1276_Fungal Foulness.json @@ -0,0 +1,57 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1005562, + "Position": { + "X": 36.850464, + "Y": -4.8778634, + "Z": 249.19507 + }, + "TerritoryId": 152, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 336.78577, + "Y": -17.169508, + "Z": -252.20335 + }, + "TerritoryId": 152, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "KillEnemyDataIds": [ + 2464 + ], + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1005562, + "Position": { + "X": 36.850464, + "Y": -4.8778634, + "Z": 249.19507 + }, + "TerritoryId": 152, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "East Shroud - Hawthorne Hut", + "Fly": true + } + ] + } + ] +} diff --git a/Questionable/Controller/Steps/Interactions/Combat.cs b/Questionable/Controller/Steps/Interactions/Combat.cs index c0a09a3a..a4d9594d 100644 --- a/Questionable/Controller/Steps/Interactions/Combat.cs +++ b/Questionable/Controller/Steps/Interactions/Combat.cs @@ -45,8 +45,12 @@ internal static class Combat ArgumentNullException.ThrowIfNull(step.DataId); ArgumentNullException.ThrowIfNull(step.ItemId); - yield return new UseItem.UseOnObject(quest.Id, step.DataId.Value, step.ItemId.Value, - step.CompletionQuestVariablesFlags, true); + if (step.GroundTarget == true) + yield return new UseItem.UseOnGround(quest.Id, step.DataId.Value, step.ItemId.Value, + step.CompletionQuestVariablesFlags, true); + else + yield return new UseItem.UseOnObject(quest.Id, step.DataId.Value, step.ItemId.Value, + step.CompletionQuestVariablesFlags, true); yield return new WaitAtEnd.WaitDelay(TimeSpan.FromSeconds(1)); yield return CreateTask(quest, sequence, step); break; diff --git a/Questionable/Controller/Steps/Interactions/UseItem.cs b/Questionable/Controller/Steps/Interactions/UseItem.cs index e0753758..118c204a 100644 --- a/Questionable/Controller/Steps/Interactions/UseItem.cs +++ b/Questionable/Controller/Steps/Interactions/UseItem.cs @@ -211,9 +211,9 @@ internal static class UseItem ElementId? QuestId, uint DataId, uint ItemId, - IList CompletionQuestVariablesFlags) : IUseItemBase + IList CompletionQuestVariablesFlags, + bool StartingCombat = false) : IUseItemBase { - public bool StartingCombat => false; public override string ToString() => $"UseItem({ItemId} on ground at {DataId})"; }