diff --git a/QuestValidator.Common/Helpers/QuestNames.cs b/QuestValidator.Common/Helpers/QuestNames.cs index 53ced83..4b166ea 100644 --- a/QuestValidator.Common/Helpers/QuestNames.cs +++ b/QuestValidator.Common/Helpers/QuestNames.cs @@ -132,7 +132,7 @@ namespace QuestValidator.Common.Helpers { Quest.GunsmithP21, "63987301e11ec11ff5504036"}, { Quest.GunsmithP22, "5b47825886f77468074618d3"}, { Quest.TheBloodOfWarP2, "5b47876e86f7744d1c353205"}, - { Quest.LivingHighIsNotACrime, "5b47891f86f7744d1b23c571"}, + { Quest.LivingHighIsNotACrimeP1, "5b47891f86f7744d1b23c571"}, { Quest.HotDelivery, "5b478b1886f7744d1b23c57d"}, { Quest.Minibus, "5b478d0f86f7744d190d91b5"}, { Quest.VitaminsP1, "5b478eca86f7744642012254"}, diff --git a/QuestValidator.Common/Helpers/QuestRequirements.cs b/QuestValidator.Common/Helpers/QuestRequirements.cs index 7135598..c788ece 100644 --- a/QuestValidator.Common/Helpers/QuestRequirements.cs +++ b/QuestValidator.Common/Helpers/QuestRequirements.cs @@ -13,6 +13,8 @@ namespace QuestValidator.Common.Helpers public QuestData AddPrerequisiteQuest(Quest quest, QuestStatus status) { + // TODO: add check if desired prereq is same id as quest, prevent it + (PreRequisites ??= new List()).Add(new PreRequisite { Quest = GetQuestData(quest), QuestStatus = status }); return this; @@ -279,7 +281,7 @@ namespace QuestValidator.Common.Helpers { Quest.Supervisor, GetQuestData(Quest.Supervisor) .AddPrerequisiteQuest(Quest.SalesNight, QuestStatus.Success) .AddPrerequisiteQuest(Quest.TheKeyToSuccess, QuestStatus.Success)}, - { Quest.LivingHighIsNotACrime, GetQuestData(Quest.LivingHighIsNotACrime) + { Quest.LivingHighIsNotACrimeP1, GetQuestData(Quest.LivingHighIsNotACrimeP1) .AddPrerequisiteQuest(Quest.SewItGoodP3, QuestStatus.Success) }, { Quest.HotDelivery, GetQuestData(Quest.HotDelivery) .AddPrerequisiteQuest(Quest.Gratitude, QuestStatus.Success) }, @@ -350,7 +352,8 @@ namespace QuestValidator.Common.Helpers { Quest.Scavenger, GetQuestData(Quest.Scavenger) .AddPrerequisiteQuest(Quest.HotDelivery, QuestStatus.Success) }, { Quest.LivingHighIsNotACrimeP2, GetQuestData(Quest.LivingHighIsNotACrimeP2) - .AddPrerequisiteQuest(Quest.TheBloodOfWarP3, QuestStatus.Success) }, + .AddPrerequisiteQuest(Quest.TheBloodOfWarP3, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.LivingHighIsNotACrimeP1, QuestStatus.Success)}, { Quest.Setup, GetQuestData(Quest.Setup) .AddPrerequisiteQuest(Quest.Bullshit, QuestStatus.Success) }, { Quest.PerfectMediator, GetQuestData(Quest.PerfectMediator) @@ -606,12 +609,24 @@ namespace QuestValidator.Common.Helpers .AddPrerequisiteQuest(Quest.Revision, QuestStatus.Success) }, { Quest.Surveillance, GetQuestData(Quest.Surveillance) .AddPrerequisiteQuest(Quest.BroadcastPart2, QuestStatus.Success) }, - // { Quest.NetworkProviderPart1, GetQuestData(Quest.NetworkProviderPart1) - // .AddPrerequisiteQuest(Quest., QuestStatus.Success)}, // NO DATA YET - // { Quest.NetworkProviderPart2, GetQuestData(Quest.NetworkProviderPart2) - // .AddPrerequisiteQuest(Quest., QuestStatus.Success)}, // NO DATA YET - // { Quest.AssessmentPart1, GetQuestData(Quest.AssessmentPart1) - // .AddPrerequisiteQuest(Quest., QuestStatus.Success)}, // NO DATA YET + { Quest.NetworkProviderPart1, GetQuestData(Quest.NetworkProviderPart1) + .AddPrerequisiteQuest(Quest.ThePunisherP5, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.Bullshit, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.HouseArrestPart1, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.CargoXP4, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.PeacekeepingMission, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.LivingHighIsNotACrimeP2, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.TheBloodOfWarP3, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.HuntsmanPathEraserP2, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.TheTarkovShooterP8, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.GunsmithP15, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.BroadcastPart2, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.DecontaminationService, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.DrugTrafficking, QuestStatus.Success) }, + { Quest.NetworkProviderPart2, GetQuestData(Quest.NetworkProviderPart2) + .AddPrerequisiteQuest(Quest.NetworkProviderPart1, QuestStatus.Success)}, + { Quest.AssessmentPart1, GetQuestData(Quest.AssessmentPart1) + .AddPrerequisiteQuest(Quest.NetworkProviderPart2, QuestStatus.Success)}, // { Quest.AssessmentPart2, GetQuestData(Quest.AssessmentPart2) // .AddPrerequisiteQuest(Quest., QuestStatus.Success)}, // NO DATA YET // { Quest.AssessmentPart3, GetQuestData(Quest.AssessmentPart3) diff --git a/QuestValidator.Common/Models/Quest.cs b/QuestValidator.Common/Models/Quest.cs index 6b589f3..4cb144a 100644 --- a/QuestValidator.Common/Models/Quest.cs +++ b/QuestValidator.Common/Models/Quest.cs @@ -123,7 +123,7 @@ GunsmithP15 = 117, GunsmithP16 = 118, TheBloodOfWarP2 = 119, - LivingHighIsNotACrime = 120, + LivingHighIsNotACrimeP1 = 120, HotDelivery = 121, Minibus = 122, VitaminsP1 = 123,