From 295f80cb46d47275bd290a122fe96215760c31a2 Mon Sep 17 00:00:00 2001 From: Chomp Date: Tue, 3 Jan 2023 15:10:31 +0000 Subject: [PATCH] Update quest list + quest prereq list --- QuestValidator.Common/Helpers/QuestNames.cs | 18 +++- .../Helpers/QuestRequirements.cs | 90 ++++++++++++++++++- QuestValidator.Common/Models/Quest.cs | 9 +- 3 files changed, 112 insertions(+), 5 deletions(-) diff --git a/QuestValidator.Common/Helpers/QuestNames.cs b/QuestValidator.Common/Helpers/QuestNames.cs index da722b7..85737a6 100644 --- a/QuestValidator.Common/Helpers/QuestNames.cs +++ b/QuestValidator.Common/Helpers/QuestNames.cs @@ -314,7 +314,14 @@ namespace QuestValidator.Common.Helpers { Quest.MakeAmendsQuarantine, "6261483dc4874104f230c0cd"}, { Quest.TotheTree, "61bfa784f4378605ca5598e1"}, { Quest.BadSanta, "61bb47578d7cac1532300ccd"}, - { Quest.HomeComfort, "61bb4756883b2c16a163870a"} + { Quest.HomeComfort, "61bb4756883b2c16a163870a"}, + { Quest.Slaughterhouse, "63a9b36cc31b00242d28a99f" }, + { Quest.DangerousRoad, "63ab180c87413d64ae0ac20a" }, + { Quest.WorstJobInTheWorld, "63a9b229813bba58a50c9ee5" }, + { Quest.BestJobInTheWorld, "63a9ae24009ffc6a551631a5" }, + { Quest.BroadcastPart4, "6391372c8ba6894d155e77d7" }, + { Quest.RoadClosed, "639282134ed9512be67647ed"}, + { Quest.MakeAmends, "6391d9144b15ca31f76bc323" } }; private static readonly Dictionary questNames = new Dictionary @@ -628,7 +635,14 @@ namespace QuestValidator.Common.Helpers { "6261483dc4874104f230c0cd", "Make Amends - Quarantine"}, { "61bfa784f4378605ca5598e1", "TotheTree"}, { "61bb47578d7cac1532300ccd", "Bad Santa"}, - { "61bb4756883b2c16a163870a", "Home Comfort"} + { "61bb4756883b2c16a163870a", "Home Comfort"}, + { "63a9b36cc31b00242d28a99f", "Slaughterhouse"}, + { "63ab180c87413d64ae0ac20a", "Dangerous Road"}, + { "63a9b229813bba58a50c9ee5", "Worst Job in the World" }, + { "63a9ae24009ffc6a551631a5", "Best Job in the World" }, + { "6391372c8ba6894d155e77d7", "Broadcast - Part 4"}, + { "639282134ed9512be67647ed", "Road Closed" }, + { "6391d9144b15ca31f76bc323", "Make Amends"} }; public static string GetNameById(string id) { diff --git a/QuestValidator.Common/Helpers/QuestRequirements.cs b/QuestValidator.Common/Helpers/QuestRequirements.cs index 6953603..9acb17f 100644 --- a/QuestValidator.Common/Helpers/QuestRequirements.cs +++ b/QuestValidator.Common/Helpers/QuestRequirements.cs @@ -493,12 +493,98 @@ namespace QuestValidator.Common.Helpers { Quest.EventLetters, GetQuestData(Quest.EventLetters) }, { Quest.TheDeliciousSausage, GetQuestData(Quest.TheDeliciousSausage) .AddPrerequisiteQuest(Quest.TheSurvivalistPathThrifty, QuestStatus.Success)}, + + { Quest.TestDriveP2, GetQuestData(Quest.TestDriveP2) + .AddPrerequisiteQuest(Quest.TestDriveP1, QuestStatus.Success)}, + { Quest.PopulationCensus, GetQuestData(Quest.PopulationCensus) + .AddPrerequisiteQuest(Quest.Pharmacist, QuestStatus.Success)}, + { Quest.UrbanMedicine, GetQuestData(Quest.UrbanMedicine) + .AddPrerequisiteQuest(Quest.PopulationCensus, QuestStatus.Success)}, + // { Quest.HouseArrestPart1, GetQuestData(Quest.HouseArrestPart1) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)}, // NO DATA YET + { Quest.HouseArrestPart2, GetQuestData(Quest.HouseArrestPart2) + .AddPrerequisiteQuest(Quest.HouseArrestPart1, QuestStatus.Success)}, // GUESS + // { Quest.Audiophile, GetQuestData(Quest.Audiophile) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)}, // NO DATA YET + { Quest.GloryToCPSU, GetQuestData(Quest.GloryToCPSU) + .AddPrerequisiteQuest(Quest.YouveGotMail, QuestStatus.Success)}, + { Quest.BalletLover, GetQuestData(Quest.BalletLover) + .AddPrerequisiteQuest(Quest.Audit, QuestStatus.Success)}, + { Quest.YouveGotMail, GetQuestData(Quest.YouveGotMail) + .AddPrerequisiteQuest(Quest.PostmanPatP1, QuestStatus.Success)}, + { Quest.YourCarNeedsAService, GetQuestData(Quest.YourCarNeedsAService) + .AddPrerequisiteQuest(Quest.CargoXP4, QuestStatus.Success)}, + { Quest.Audit, GetQuestData(Quest.Audit) + .AddPrerequisiteQuest(Quest.OnlyBusiness, QuestStatus.Success)}, + { Quest.BroadcastPart3, GetQuestData(Quest.BroadcastPart3) + .AddPrerequisiteQuest(Quest.BroadcastPart2, QuestStatus.Success)}, + { Quest.Debtor, GetQuestData(Quest.Debtor) + .AddPrerequisiteQuest(Quest.Chumming, QuestStatus.Success)}, + // { Quest.CeaseFire, GetQuestData(Quest.CeaseFire) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)}, // NO DATA YET + { Quest.KingsOfTheRooftops, GetQuestData(Quest.KingsOfTheRooftops) + .AddPrerequisiteQuest(Quest.ThePunisherP4, QuestStatus.Success)}, + { Quest.WatchingYou, GetQuestData(Quest.WatchingYou) + .AddPrerequisiteQuest(Quest.BroadcastPart2, QuestStatus.Success)}, + // { Quest.HarleyForever, GetQuestData(Quest.HarleyForever) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)}, // NO DATA YET + { Quest.TheHuntsmanPathAdministrator, GetQuestData(Quest.TheHuntsmanPathAdministrator) + .AddPrerequisiteQuest(Quest.HuntsmanPathWoodsCleaning, QuestStatus.Success)}, + { Quest.GreenCorridor, GetQuestData(Quest.GreenCorridor) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)}, // NO DATA YET + // { Quest.RevisionStreetsOfTarkov, GetQuestData(Quest.RevisionStreetsOfTarkov) + .AddPrerequisiteQuest(Quest.RevisionStreetsOfTarkov, QuestStatus.Success)}, + { Quest.Surveillance, GetQuestData(Quest.Surveillance) + .AddPrerequisiteQuest(Quest.BroadcastPart2, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.CorporateSecrets, 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.AssessmentPart2, GetQuestData(Quest.AssessmentPart2) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)}, // NO DATA YET + // { Quest.AssessmentPart3, GetQuestData(Quest.AssessmentPart3) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)}, // NO DATA YET + // { Quest.KeyToTheTower, GetQuestData(Quest.KeyToTheTower) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)}, // NO DATA YET + // { Quest.KnockKnock, GetQuestData(Quest.KnockKnock) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)},// NO DATA YET + // { Quest.GettingAcquainted, GetQuestData(Quest.GettingAcquainted) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)},// NO DATA YET + // { Quest.MakeAmendsBuyout, GetQuestData(Quest.MakeAmendsBuyout) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)},// NO DATA YET + // { Quest.MakeAmendsEquipment, GetQuestData(Quest.MakeAmendsEquipment) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)},// NO DATA YET + // { Quest.MakeAmendsSecurity, GetQuestData(Quest.MakeAmendsSecurity) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)},// NO DATA YET + // { Quest.MakeAmendsSoftware, GetQuestData(Quest.MakeAmendsSoftware) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)},// NO DATA YET + // { Quest.MakeAmendsQuarantine, GetQuestData(Quest.MakeAmendsQuarantine) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)},// NO DATA YET + // { Quest.HomeComfort, GetQuestData(Quest.HomeComfort) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)},// NO DATA YET + { Quest.Slaughterhouse, GetQuestData(Quest.Slaughterhouse) + .AddPrerequisiteQuest(Quest.TheHuntsmanPathAdministrator, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.BroadcastPart4, QuestStatus.Success)}, + // { Quest.DangerousRoad, GetQuestData(Quest.DangerousRoad) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)},// NO DATA YET + { Quest.WorstJobInTheWorld, GetQuestData(Quest.WorstJobInTheWorld) + .AddPrerequisiteQuest(Quest.RevisionStreetsOfTarkov, QuestStatus.Success) + .AddPrerequisiteQuest(Quest.WetJobP5, QuestStatus.Success)}, + // { Quest.BestJobInTheWorld, GetQuestData(Quest.BestJobInTheWorld) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)},// NO DATA YET + { Quest.BroadcastPart4, GetQuestData(Quest.BroadcastPart4) + .AddPrerequisiteQuest(Quest.BroadcastPart3, QuestStatus.Success)}, + // { Quest.RoadClosed, GetQuestData(Quest.RoadClosed) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)},// NO DATA YET + // { Quest.MakeAmends, GetQuestData(Quest.MakeAmends) + // .AddPrerequisiteQuest(Quest., QuestStatus.Success)}// NO DATA YET }; private static QuestData GetQuestData(Quest quest) { - var Id = QuestNames.GetIdByEnum(quest); - var Name = QuestNames.GetNameByEnum(quest); return new QuestData { Id = QuestNames.GetIdByEnum(quest), diff --git a/QuestValidator.Common/Models/Quest.cs b/QuestValidator.Common/Models/Quest.cs index c7f0451..aade3a8 100644 --- a/QuestValidator.Common/Models/Quest.cs +++ b/QuestValidator.Common/Models/Quest.cs @@ -311,6 +311,13 @@ TotheTree = 306, BadSanta = 307, HomeComfort = 308, - BroadcastPart2 = 309 + BroadcastPart2 = 309, + Slaughterhouse = 310, + DangerousRoad = 311, + WorstJobInTheWorld = 312, + BestJobInTheWorld = 313, + BroadcastPart4 = 314, + RoadClosed = 315, + MakeAmends = 316 } }