update quest requirements

GenerateQuestFile/Program.cs

@@ -95,10 +95,10 @@ namespace GenerateQuestFile
                 AddMissingFields(quest);
 
                 // Quest has start conditions, check to ensure they're carried over
-                if (originalQuest.conditions.AvailableForStart.Count > 0)
+                //if (originalQuest.conditions.AvailableForStart.Count > 0)
-                {
+                //{
-                    AddMissingAvailableForStartConditions(originalQuest, quest);
+                //    AddMissingAvailableForStartConditions(originalQuest, quest);
-                }
+                //}
 
                 if (originalQuest.rewards.Fail.Count > 0)
                 {

QuestValidator.Common/Helpers/QuestNames.cs

@@ -192,7 +192,7 @@ namespace QuestValidator.Common.Helpers
             { Quest.HuntsmanPathJustice, "5d25e43786f7740a212217fa"},
             { Quest.HuntsmanPathEvilWatchman, "5d25e44386f77409453bce7b"},
             { Quest.HuntsmanPathFactoryChief, "60c0c018f7afb4354815096a"},
-            { Quest.HuntsmanPathEraser, "5d25e44f86f77443e625e385"},
+            { Quest.HuntsmanPathEraserP1, "5d25e44f86f77443e625e385"},
             { Quest.HuntsmanPathEraserP2, "5d25e45e86f77408251c4bfa"},
             { Quest.Ambulance, "5d25e46e86f77409453bce7c"},
             { Quest.CourtesyVisit, "5d25e48186f77443e625e386"},

QuestValidator.Common/Helpers/QuestRequirements.cs

@@ -86,8 +86,7 @@ namespace QuestValidator.Common.Helpers
             { Quest.SupplyPlans, GetQuestData(Quest.SupplyPlans)
                 .AddPrerequisiteQuest(Quest.Pharmacist, QuestStatus.Success)},
             { Quest.KindOfSabotage, GetQuestData(Quest.KindOfSabotage)
-                .AddPrerequisiteQuest(Quest.SupplyPlans, QuestStatus.Started)
+                .AddPrerequisiteQuest(Quest.SupplyPlans, QuestStatus.Started)},
-                .AddPrerequisiteQuest(Quest.Pharmacist, QuestStatus.Success)},
             { Quest.GeneralWares, GetQuestData(Quest.GeneralWares)
                 .AddPrerequisiteQuest(Quest.Pharmacist, QuestStatus.Success)},
             { Quest.SanitaryStandardsP2, GetQuestData(Quest.SanitaryStandardsP2)
@@ -117,8 +116,7 @@ namespace QuestValidator.Common.Helpers
             { Quest.OutOfCuriosity, GetQuestData(Quest.OutOfCuriosity)
                 .AddPrerequisiteQuest(Quest.ChemicalP4, QuestStatus.Success) },
             { Quest.BigCustomer, GetQuestData(Quest.BigCustomer)
-                .AddPrerequisiteQuest(Quest.ChemicalP4, QuestStatus.Started)
+                .AddPrerequisiteQuest(Quest.ChemicalP4, QuestStatus.Started) },
-                .AddPrerequisiteQuest(Quest.ChemicalP3, QuestStatus.Success) },
             { Quest.BPDepot, GetQuestData(Quest.BPDepot)
                 .AddPrerequisiteQuest(Quest.DeliveryFromThePast, QuestStatus.Success) },
             { Quest.ThePunisherP1, GetQuestData(Quest.ThePunisherP1)
@@ -367,8 +365,7 @@ namespace QuestValidator.Common.Helpers
             { Quest.Athlete, GetQuestData(Quest.Athlete)
                 .AddPrerequisiteQuest(Quest.HealthCarePrivacyP4, QuestStatus.Success) },
             { Quest.LendLeaseP1, GetQuestData(Quest.LendLeaseP1)
-                .RemovePrerequisiteQuest(Quest.FriendFromTheWestP2)
+                .AddPrerequisiteQuest(Quest.FriendFromTheWestP2, QuestStatus.Success) },
-                .AddPrerequisiteQuest(Quest.HumanitarianSupplies, QuestStatus.Success) },
             { Quest.LendLeaseP2, GetQuestData(Quest.LendLeaseP2)
                 .AddPrerequisiteQuest(Quest.LendLeaseP1, QuestStatus.Success) },
             { Quest.Grenadier, GetQuestData(Quest.Grenadier) },
@@ -443,11 +440,11 @@ namespace QuestValidator.Common.Helpers
             { Quest.HuntsmanPathFactoryChief, GetQuestData(Quest.HuntsmanPathFactoryChief)
                 .AddPrerequisiteQuest(Quest.HuntsmanPathForestCleaning, QuestStatus.Success)
                 .AddPrerequisiteQuest(Quest.Scout, QuestStatus.Success)},
-            { Quest.HuntsmanPathEraser, GetQuestData(Quest.HuntsmanPathEraser)
+            { Quest.HuntsmanPathEraserP1, GetQuestData(Quest.HuntsmanPathEraserP1)
                 .AddPrerequisiteQuest(Quest.PestControl, QuestStatus.Success) },
             { Quest.HuntsmanPathEraserP2, GetQuestData(Quest.HuntsmanPathEraserP2)
-                .RemovePrerequisiteQuest(Quest.HuntsmanPathSecuredPerimeter)
+                .AddPrerequisiteQuest(Quest.HuntsmanPathSecuredPerimeter, QuestStatus.Success)
-                .AddPrerequisiteQuest(Quest.HuntsmanPathEraser, QuestStatus.Success) },
+                .AddPrerequisiteQuest(Quest.HuntsmanPathEraserP1, QuestStatus.Success) },
             { Quest.HuntsmanPathSadist, GetQuestData(Quest.HuntsmanPathSadist)
                 .AddPrerequisiteQuest(Quest.ColleaguesP2, QuestStatus.Success)
                 .AddPrerequisiteQuest(Quest.RiggedGame, QuestStatus.Success)
@@ -475,7 +472,7 @@ namespace QuestValidator.Common.Helpers
             { Quest.AnAppleADayKeepsTheDoctorAway, GetQuestData(Quest.AnAppleADayKeepsTheDoctorAway)
                 .AddPrerequisiteQuest(Quest.HealthCarePrivacyP4, QuestStatus.Success) },
             { Quest.Mentor, GetQuestData(Quest.Mentor)
-                .AddPrerequisiteQuest(Quest.WetJobP4, QuestStatus.Success) },
+                .AddPrerequisiteQuest(Quest.WetJobP5, QuestStatus.Success) },
             { Quest.TheStylishOne, GetQuestData(Quest.TheStylishOne)
                 .AddPrerequisiteQuest(Quest.HuntsmanPathSellOut, QuestStatus.StartedSuccess)
                 .AddPrerequisiteQuest(Quest.TheKeyToSuccess, QuestStatus.Success) },
@@ -501,7 +498,6 @@ namespace QuestValidator.Common.Helpers
                 .AddPrerequisiteLevel(21)
                 .AddPrerequisiteQuest(Quest.ShakingUpTeller, QuestStatus.Success) },
             { Quest.Samples, GetQuestData(Quest.Samples)
-                .RemovePrerequisiteLevel()
                 .AddPrerequisiteQuest(Quest.FriendFromTheWestP2, QuestStatus.Success)
                 .AddPrerequisiteQuest(Quest.FishingGear, QuestStatus.Success)
                 .AddPrerequisiteQuest(Quest.Anesthesia, QuestStatus.Success)
@@ -517,8 +513,8 @@ namespace QuestValidator.Common.Helpers
                 .RemovePrerequisiteLevel()
                 .AddPrerequisiteQuest(Quest.Anesthesia, QuestStatus.Success) },
             { Quest.TerraGroupEmployee, GetQuestData(Quest.TerraGroupEmployee)
-                .AddPrerequisiteQuest(Quest.HuntsmanPathSadist, QuestStatus.SuccessFail)
+                .AddPrerequisiteQuest(Quest.ColleaguesP3, QuestStatus.SuccessFail)
-                .AddPrerequisiteQuest(Quest.Samples, QuestStatus.SuccessFail) },
+                .AddPrerequisiteQuest(Quest.Samples, QuestStatus.Success) },
             { Quest.TheChemistryCloset, GetQuestData(Quest.TheChemistryCloset)
                 .AddPrerequisiteLevel(22)
                 .AddPrerequisiteQuest(Quest.Anesthesia, QuestStatus.Success)
@@ -527,8 +523,8 @@ namespace QuestValidator.Common.Helpers
             { Quest.SearchMission, GetQuestData(Quest.SearchMission)
                 .AddPrerequisiteQuest(Quest.Debut, QuestStatus.Success) },
             { Quest.Hunter, GetQuestData(Quest.Hunter)
-                .RemovePrerequisiteLevel()
+                .AddPrerequisiteQuest(Quest.HuntsmanPathWoodsKeeper, QuestStatus.Success)
-                .AddPrerequisiteQuest(Quest.HuntsmanPathSecuredPerimeter, QuestStatus.Success) },
+            },
             { Quest.RevisionReserve, GetQuestData(Quest.RevisionReserve)
                 .RemovePrerequisiteQuest(Quest.EagleEye)
                 .AddPrerequisiteQuest(Quest.FriendFromTheWestP2, QuestStatus.Success)
@@ -551,7 +547,6 @@ namespace QuestValidator.Common.Helpers
             { Quest.DiseaseHistory, GetQuestData(Quest.DiseaseHistory)
                 .AddPrerequisiteQuest(Quest.Pharmacist, QuestStatus.Success) },
             { Quest.Documents, GetQuestData(Quest.Documents)
-                .RemovePrerequisiteLevel()
                 .AddPrerequisiteQuest(Quest.NoPlaceForRenegades, QuestStatus.Success)
                 .RemovePrerequisiteQuest(Quest.IceCreamCones) },
             { Quest.SurplusGoods, GetQuestData(Quest.SurplusGoods)
@@ -615,6 +610,7 @@ namespace QuestValidator.Common.Helpers
                 .AddPrerequisiteLevel(45)
                 .AddPrerequisiteQuest(Quest.ThePunisherP6, QuestStatus.Success) },
             // The wiki says Crisis only depends on level 48, but the dump says only Athlete, so why not both?
+            // Live dump shows level 48 + athlete
             { Quest.Crisis, GetQuestData(Quest.Crisis)
                 .AddPrerequisiteLevel(48)
                 .AddPrerequisiteQuest(Quest.Athlete, QuestStatus.Success) },
@@ -641,8 +637,9 @@ namespace QuestValidator.Common.Helpers
                 .AddPrerequisiteQuest(Quest.HuntsmanPathTheTrophy, QuestStatus.Success)},
             { Quest.Trophies, GetQuestData(Quest.Trophies)
                 .AddPrerequisiteLevel(55)
-                .RemovePrerequisiteQuest(Quest.HuntsmanPathForestCleaning)
+                .AddPrerequisiteQuest(Quest.HuntsmanPathForestCleaning, QuestStatus.Success)
-                .AddPrerequisiteQuest(Quest.TheGuide, QuestStatus.Success)},
+                .AddPrerequisiteQuest(Quest.FishingGear, QuestStatus.Success)
+            },
             { Quest.SpecialEquipment, GetQuestData(Quest.SpecialEquipment)
                 .AddPrerequisiteLevel(60)
                 .AddPrerequisiteQuest(Quest.Trophies, QuestStatus.Success)},
@@ -758,8 +755,7 @@ namespace QuestValidator.Common.Helpers
         //      { Quest.MakeAmends, GetQuestData(Quest.MakeAmends)
         //          .AddPrerequisiteQuest(Quest., QuestStatus.Success)}// NO DATA YET
             { Quest.InformationSource, GetQuestData(Quest.InformationSource)
-                      .RemovePrerequisiteQuest(Quest.KnockKnock)
+                      .AddPrerequisiteQuest(Quest.KnockKnock, QuestStatus.Success)},
-                      .AddPrerequisiteQuest(Quest.GettingAcquainted, QuestStatus.Success)},
             { Quest.MissingInformant, GetQuestData(Quest.MissingInformant)
                       .AddPrerequisiteQuest(Quest.InformationSource, QuestStatus.Success)},
             { Quest.Snatch, GetQuestData(Quest.Snatch)

QuestValidator.Common/Models/Quest.cs

@@ -182,7 +182,7 @@
         HuntsmanPathJustice = 176,
         HuntsmanPathEvilWatchman = 177,
         HuntsmanPathFactoryChief = 178,
-        HuntsmanPathEraser = 179,
+        HuntsmanPathEraserP1 = 179,
         HuntsmanPathEraserP2 = 180,
         HuntsmanPathSadist = 197,
         HuntsmanPathRelentless = 220,