From bddfda87a6673312920113605eb4cf7a08a71788 Mon Sep 17 00:00:00 2001 From: Chomp Date: Fri, 31 May 2024 16:35:41 +0100 Subject: [PATCH] Update generation data --- QuestValidator.Common/Helpers/QuestHelper.cs | 2 +- QuestValidator.Common/Helpers/QuestNames.cs | 74 +++++++++++--------- QuestValidator.Common/Models/Quest.cs | 7 +- 3 files changed, 49 insertions(+), 34 deletions(-) diff --git a/QuestValidator.Common/Helpers/QuestHelper.cs b/QuestValidator.Common/Helpers/QuestHelper.cs index e05f772..940935b 100644 --- a/QuestValidator.Common/Helpers/QuestHelper.cs +++ b/QuestValidator.Common/Helpers/QuestHelper.cs @@ -75,7 +75,7 @@ namespace AssortGenerator.Common.Helpers return mergedResult; } - public static List GetLiveQuestData(string filename = "resp.client.quest.list") + public static List GetLiveQuestData(string filename = "resp.client.quest.list_") { if (_liveQuestData is null) { diff --git a/QuestValidator.Common/Helpers/QuestNames.cs b/QuestValidator.Common/Helpers/QuestNames.cs index f870da0..2038ebe 100644 --- a/QuestValidator.Common/Helpers/QuestNames.cs +++ b/QuestValidator.Common/Helpers/QuestNames.cs @@ -398,7 +398,12 @@ namespace QuestValidator.Common.Helpers { Quest.NothingFishyAboutThis, "65802b627b44fa5e14638899" }, { Quest.HuntsmaPathCrookedCop, "6578eb36e5020875d64645cd" }, - { Quest.NoSwiping, "6578eb36e5020875d64645cd"} + { Quest.NoSwiping, "6578eb36e5020875d64645cd"}, + { Quest.EvilSpiritsEvent, "65e85198e32da31f2b30978e"}, + { Quest.TheTarkovMystery, "6603fe74e773dcf3b0099f88"}, + { Quest.DripOutP1, "6613f3007f6666d56807c929"}, + { Quest.DripOutP2, "6613f307fca4f2f386029409" }, + { Quest.TestDriveP4, "6574e0dedc0d635f633a5805" } }; private static readonly Dictionary questNames = new Dictionary @@ -533,10 +538,10 @@ namespace QuestValidator.Common.Helpers { "5b47891f86f7744d1b23c571", "Living high is not a crime" }, { "5b478b1886f7744d1b23c57d", "Hot delivery"}, { "5b478d0f86f7744d190d91b5", "Minibus"}, - { "5b478eca86f7744642012254", "Vitamins Part 1"}, - { "5b478ff486f7744d184ecbbf", "Vitamins Part 2"}, + { "5b478eca86f7744642012254", "Vitamins - Part 1"}, + { "5b478ff486f7744d184ecbbf", "Vitamins - Part 2"}, { "5b47926a86f7747ccc057c15", "Informed means armed"}, - { "5b4794cb86f774598100d5d4", "Lend lease pt 1"}, + { "5b4794cb86f774598100d5d4", "Lend Lease - Part 1"}, { "5b4795fb86f7745876267770", "Chumming"}, { "5bc4776586f774512d07cf05", "The Tarkov shooter Part 1"}, { "5bc479e586f7747f376c7da3", "The Tarkov shooter Part 2"}, @@ -546,24 +551,24 @@ namespace QuestValidator.Common.Helpers { "5bc4836986f7740c0152911c", "The Tarkov shooter Part 6"}, { "5bc4856986f77454c317bea7", "The Tarkov shooter Part 7"}, { "5bc4893c86f774626f5ebf3e", "The Tarkov shooter Part 8"}, - { "5c0bbaa886f7746941031d82", "Bullshit" }, - { "5c0bc91486f7746ab41857a2", "Silent caliber" }, - { "5c0bd01e86f7747cdd799e56", "Insomnia" }, - { "5c0bd94186f7747a727f09b2", "Test drive Part 1" }, - { "5c0bdb5286f774166e38eed4", "Flint" }, - { "5c0bde0986f77479cf22c2f8", "A Shooter Born in Heaven" }, - { "5c0be13186f7746f016734aa", "Psycho Sniper" }, - { "5c0be5fc86f774467a116593", "Private clinic" }, + { "5c0bbaa886f7746941031d82", "Bullshit"}, + { "5c0bc91486f7746ab41857a2", "Silent caliber"}, + { "5c0bd01e86f7747cdd799e56", "Insomnia"}, + { "5c0bd94186f7747a727f09b2", "Test drive - Part 1"}, + { "5c0bdb5286f774166e38eed4", "Flint"}, + { "5c0bde0986f77479cf22c2f8", "A Shooter Born in Heaven"}, + { "5c0be13186f7746f016734aa", "Psycho Sniper"}, + { "5c0be5fc86f774467a116593", "Private clinic"}, { "5c0d0d5086f774363760aef2", "Athlete" }, - { "5c0d0f1886f77457b8210226", "Lend lease Part 2" }, + { "5c0d0f1886f77457b8210226", "Lend lease - Part 2" }, { "5c0d190cd09282029f5390d8", "Grenadier" }, { "5c0d1c4cd0928202a02a6f5c", "Decontamination service" }, { "5c0d4c12d09282029f539173", "Peacekeeping mission" }, { "5c0d4e61d09282029f53920e", "The guide" }, - { "5c10f94386f774227172c572", "The Blood of War Part 3" }, + { "5c10f94386f774227172c572", "The Blood of War - Part 3" }, { "5c1128e386f7746565181106", "Fertilizers" }, { "5c112d7e86f7740d6f647486", "Scavenger" }, - { "5c1141f386f77430ff393792", "Living high is not a crime Part 2"}, + { "5c1141f386f77430ff393792", "Living high is not a crime - Part 2"}, { "5c1234c286f77406fa13baeb", "Setup" }, { "5c12452c86f7744b83469073", "Perfect mediator" }, { "5c139eb686f7747878361a6f", "Import" }, @@ -571,26 +576,26 @@ namespace QuestValidator.Common.Helpers { "5d2495a886f77425cd51e403", "Introduction" }, { "5d24b81486f77439c92d6ba8", "Acquaintance" }, { "5d25aed386f77442734d25d2", "The survivalist path Unprotected but dangerous"}, - { "5d25b6be86f77444001e1b89", "The survivalist path Thrifty" }, - { "5d25bfd086f77442734d3007", "The survivalist path Zhivchik" }, - { "5d25c81b86f77443e625dd71", "The survivalist path Wounded beast" }, - { "5d25cf2686f77443e75488d4", "The survivalist path Tough guy" }, - { "5d25d2c186f77443e35162e5", "The survivalist path Cold blooded" }, - { "5d25dae186f77443e55d2f78", "The survivalist path Zatoichi" }, + { "5d25b6be86f77444001e1b89", "The survivalist path Thrifty"}, + { "5d25bfd086f77442734d3007", "The survivalist path Zhivchik"}, + { "5d25c81b86f77443e625dd71", "The survivalist path Wounded beast"}, + { "5d25cf2686f77443e75488d4", "The survivalist path Tough guy"}, + { "5d25d2c186f77443e35162e5", "The survivalist path Cold blooded"}, + { "5d25dae186f77443e55d2f78", "The survivalist path Zatoichi"}, { "5d25e29d86f7740a22516326", "The survivalist path Eagle-owl" }, { "5d25e2a986f77409dd5cdf2a", "The survivalist path Combat medic" }, { "5eaaaa7c93afa0558f3b5a1c", "The survivalist path Junkie" }, { "5d25e2b486f77409de05bba0", "Huntsman path Secured perimeter" }, { "5d25e2c386f77443e7549029", "Huntsman path The trophy" }, - { "5d25e2cc86f77443e47ae019", "Huntsman path Forest cleaning" }, + { "5d25e2cc86f77443e47ae019", "Huntsman path Forest cleaning" }, { "5d25e2d886f77442734d335e", "Huntsman path Controller" }, { "5d25e2e286f77444001e2e48", "Huntsman path Sell-out" }, { "5d25e2ee86f77443e35162ea", "Huntsman path Woods keeper" }, { "5d25e43786f7740a212217fa", "Huntsman path Justice" }, { "5d25e44386f77409453bce7b", "Huntsman path Evil watchman" }, { "60c0c018f7afb4354815096a", "Huntsman Path- Factory Chief"}, - { "5d25e44f86f77443e625e385", "Huntsman path Eraser Part 1"}, - { "5d25e45e86f77408251c4bfa", "Huntsman path Eraser Part 2"}, + { "5d25e44f86f77443e625e385", "Huntsman path Eraser - Part 1"}, + { "5d25e45e86f77408251c4bfa", "Huntsman path Eraser- Part 2"}, { "5edab4b1218d181e29451435", "Huntsman path Sadist"}, { "60e71e8ed54b755a3b53eb67", "Huntsman Path - Relentless" }, { "5d25e46e86f77409453bce7c", "Ambulance"}, @@ -608,12 +613,12 @@ namespace QuestValidator.Common.Helpers { "5e4d4ac186f774264f758336", "Textile Part 2 - Bear"}, { "5e383a6386f77465910ce1f3", "Textile Part 1 - Usec"}, { "5e4d515e86f77438b2195244", "Textile Part 2 - Usec"}, - { "5ede55112c95834b583f052a", "Bunker Part 1"}, - { "5ede567cfa6dc072ce15d6e3", "Bunker Part 2"}, + { "5ede55112c95834b583f052a", "Bunker - Part 1"}, + { "5ede567cfa6dc072ce15d6e3", "Bunker - Part 2"}, { "5eda19f0edce541157209cee", "Anesthesia"}, - { "5edab736cc183c769d778bc2", "Colleagues Part 1"}, - { "5edaba7c0c502106f869bc02", "Colleagues Part 2"}, - { "5edac34d0bb72a50635c2bfa", "Colleagues Part 3"}, + { "5edab736cc183c769d778bc2", "Colleagues - Part 1"}, + { "5edaba7c0c502106f869bc02", "Colleagues - Part 2"}, + { "5edac34d0bb72a50635c2bfa", "Colleagues - Part 3"}, { "5edabd13218d181e29451442", "Rigged game"}, { "5edac020218d181e29451446", "Samples"}, { "5edac63b930f5454f51e128b", "TerraGroup employee"}, @@ -771,7 +776,7 @@ namespace QuestValidator.Common.Helpers { "64f1d6e732bed22c3e0c7423", "Overseas trust. Part 2"}, { "64f3176921045e77405d63b5", "Ambulances Again"}, { "64f5aac4b63b74469b6c14c2", "Glory To CPSU P2"}, - { "64f5deac39e45b527a7c4232", "Test Drive P3"}, + { "64f5deac39e45b527a7c4232", "Test Drive - Part 3"}, { "64f5e20652fc01298e2c61e3", "Beyond The RedMeat P1"}, { "64f6aafd67e11a7c6206e0d0", "Beyond The RedMeat P2"}, { "64f731ab83cfca080a361e42", "Pets Wont Need It P1"}, @@ -793,8 +798,13 @@ namespace QuestValidator.Common.Helpers { "65734c186dc1e402c80dc19e", "Dandies" }, { "6578ec473dbd035d04531a8d", "Steady Signal" }, { "65802b627b44fa5e14638899", "Nothing Fishy About This" }, - {"6578eb36e5020875d64645cd", "Huntsman Path Crooked Cop" }, - { "658027799634223183395339", "No Swiping" } + { "6578eb36e5020875d64645cd", "Huntsman Path Crooked Cop" }, + { "658027799634223183395339", "No Swiping" }, + { "65e85198e32da31f2b30978e", "Evil Spirits - Event" }, + { "6603fe74e773dcf3b0099f88", "The Tarkov Mystery"}, + { "6613f3007f6666d56807c929", "DripOut P1" }, + { "6613f307fca4f2f386029409", "DripOut P2" }, + { "6574e0dedc0d635f633a5805", "Test Drive - Part 4"} }; public static string GetNameById(string id) { diff --git a/QuestValidator.Common/Models/Quest.cs b/QuestValidator.Common/Models/Quest.cs index 50f02e8..7b43d63 100644 --- a/QuestValidator.Common/Models/Quest.cs +++ b/QuestValidator.Common/Models/Quest.cs @@ -393,6 +393,11 @@ SteadySignal = 388, NothingFishyAboutThis = 389, HuntsmaPathCrookedCop = 390, - NoSwiping = 391 + NoSwiping = 391, + EvilSpiritsEvent = 392, + TheTarkovMystery = 393, + DripOutP1 = 394, + DripOutP2 = 395, + TestDriveP4 = 396 } }