diff --git a/Core/Helpers/QuestHelper.cs b/Core/Helpers/QuestHelper.cs index 1ecbab3d..1ffd5b89 100644 --- a/Core/Helpers/QuestHelper.cs +++ b/Core/Helpers/QuestHelper.cs @@ -375,7 +375,20 @@ public class QuestHelper */ public Quest GetQuestFromDb(string questId, PmcData pmcData) { - throw new NotImplementedException(); + // May be a repeatable quest + var quest = _databaseService.GetQuests()[questId]; + if (quest == null) + { + // Check daily/weekly objects + foreach (var repeatableQuest in pmcData.RepeatableQuests) + { + quest = repeatableQuest.ActiveQuests.FirstOrDefault(r => r.Id == questId); + if (quest != null) + break; + } + } + + return quest; } /// diff --git a/Core/Helpers/QuestRewardHelper.cs b/Core/Helpers/QuestRewardHelper.cs index ec8351f2..11eaf2d3 100644 --- a/Core/Helpers/QuestRewardHelper.cs +++ b/Core/Helpers/QuestRewardHelper.cs @@ -90,7 +90,20 @@ public class QuestRewardHelper */ protected Quest GetQuestFromDb(string questId, PmcData pmcData) { - throw new NotImplementedException(); + // May be a repeatable quest + var quest = _databaseService.GetQuests()[questId]; + if (quest == null) + { + // Check daily/weekly objects + foreach (var repeatableQuest in pmcData.RepeatableQuests) + { + quest = repeatableQuest.ActiveQuests.FirstOrDefault(r => r.Id == questId); + if (quest != null) + break; + } + } + + return quest; } ///