diff --git a/DumpCleaner/Helpers/TraderSellCategories.cs b/DumpCleaner/Helpers/TraderSellCategories.cs index 9c9e0be..d2d2e74 100644 --- a/DumpCleaner/Helpers/TraderSellCategories.cs +++ b/DumpCleaner/Helpers/TraderSellCategories.cs @@ -140,7 +140,8 @@ public static class TraderSellCategories "5b5f757486f774093e6cb507", "5b5f78e986f77447ed5636b1", "5b5f78fc86f77409407a7f90"} }, - {"638f541a29ffd1183d187f57", new List { } } + {"638f541a29ffd1183d187f57", new List { } }, + {"656f0f98d80a697f855d34b1", new List { } }, }; public static List GetCategoriesByTraderId(string id) diff --git a/DumpCleaner/Models/Trader.cs b/DumpCleaner/Models/Trader.cs index 9ae161b..9676ad4 100644 --- a/DumpCleaner/Models/Trader.cs +++ b/DumpCleaner/Models/Trader.cs @@ -26,6 +26,7 @@ public class Trader public List sell_category { get; set; } public ItemsBuy items_buy { get; set; } public ItemsBuy items_buy_prohibited { get; set; } + public int sell_modifier_for_prohibited_items { get; set; } } public class ItemsBuy diff --git a/DumpCleaner/Program.cs b/DumpCleaner/Program.cs index 6c96dcc..b46ece1 100644 --- a/DumpCleaner/Program.cs +++ b/DumpCleaner/Program.cs @@ -49,11 +49,20 @@ void HandleSpecialCase(DumpData names, Dump dumpFile, string rawJson) if (names.InputName == "resp.client.location.getLocalloot") { locationParser.AddLocalLootDump(dumpFile, rawJson); + + return; } if (names.InputName == "resp.client.trading.api.traderSettings") { HandleTraderSettingsFile(names, dumpFile); + + return; + } + + if (names.InputName == "resp.client.achievement.list") + { + HandleAchievementFile(names, dumpFile); } } diff --git a/GenerateQuestFile/Program.cs b/GenerateQuestFile/Program.cs index bd5f9e5..3052e4e 100644 --- a/GenerateQuestFile/Program.cs +++ b/GenerateQuestFile/Program.cs @@ -4,7 +4,6 @@ using QuestValidator.Common.Helpers; using QuestValidator.Common.Models; using QuestValidator.Helpers; using QuestValidator.Models; -using QuestValidator.Models.Output; using System; using System.Collections.Generic; using System.IO; diff --git a/QuestValidator.Common/Helpers/QuestNames.cs b/QuestValidator.Common/Helpers/QuestNames.cs index da27074..f870da0 100644 --- a/QuestValidator.Common/Helpers/QuestNames.cs +++ b/QuestValidator.Common/Helpers/QuestNames.cs @@ -1,5 +1,6 @@ using QuestValidator.Common.Models; using System.Collections.Generic; +using System.IO; namespace QuestValidator.Common.Helpers { @@ -8,7 +9,7 @@ namespace QuestValidator.Common.Helpers private static readonly Dictionary questLookup = new Dictionary { { Quest.Debut, "5936d90786f7742b1420ba5b" }, - { Quest.Checking, "5936da9e86f7742d65037edf"}, + { Quest.BackgroundCheck, "5936da9e86f7742d65037edf"}, { Quest.ShootoutPicnic, "59674cd986f7744ab26e32f2"}, { Quest.DeliveryFromThePast, "59674eb386f774539f14813a"}, { Quest.BadRepEvidence, "5967530a86f77462ba22226b"}, @@ -376,7 +377,7 @@ namespace QuestValidator.Common.Helpers { Quest.TestDriveP3, "64f5deac39e45b527a7c4232"}, { Quest.BeyondTheRedMeatP1, "64f5e20652fc01298e2c61e3"}, { Quest.BeyondTheRedMeatP2, "64f6aafd67e11a7c6206e0d0"}, - { Quest.PetsWontNeedIt, "64f731ab83cfca080a361e42"}, + { Quest.PetsWontNeedItP1, "64f731ab83cfca080a361e42"}, { Quest.GunsmithP23, "64f83bb69878a0569d6ecfbe"}, { Quest.GunsmithP24, "64f83bcdde58fc437700d8fa"}, { Quest.GunsmithP25, "64f83bd983cfca080a362c82"}, @@ -388,13 +389,22 @@ namespace QuestValidator.Common.Helpers { Quest.SavingTheMole, "657315e4a6af4ab4b50f3459"}, { Quest.DevelopersSecretsP1, "65733403eefc2c312a759ddb" }, { Quest.DevelopersSecretsP2, "6573382e557ff128bf3da536" }, - { Quest.LuxuriousLife, "657315e1dccd301f1301416a"} + { Quest.LuxuriousLife, "657315e1dccd301f1301416a"}, + { Quest.PyramidScheme, "6572e876dc0d635f633a5714" }, + { Quest.PetsWontNeedItP2, "6573387d0b26ed4fde798de3" }, + { Quest.PropertiesAllAround, "6573397ef3f8344c4575cd87" }, + { Quest.Dandies, "65734c186dc1e402c80dc19e" }, + { Quest.SteadySignal, "6578ec473dbd035d04531a8d" }, + { Quest.NothingFishyAboutThis, "65802b627b44fa5e14638899" }, + + { Quest.HuntsmaPathCrookedCop, "6578eb36e5020875d64645cd" }, + { Quest.NoSwiping, "6578eb36e5020875d64645cd"} }; private static readonly Dictionary questNames = new Dictionary { { "5936d90786f7742b1420ba5b", "Debut" }, - { "5936da9e86f7742d65037edf", "Checking"}, + { "5936da9e86f7742d65037edf", "Background Check"}, { "59674cd986f7744ab26e32f2", "Shootout picnic"}, { "59674eb386f774539f14813a", "Delivery from the past"}, { "5967530a86f77462ba22226b", "Bad rep evidence"}, @@ -764,11 +774,11 @@ namespace QuestValidator.Common.Helpers { "64f5deac39e45b527a7c4232", "Test Drive P3"}, { "64f5e20652fc01298e2c61e3", "Beyond The RedMeat P1"}, { "64f6aafd67e11a7c6206e0d0", "Beyond The RedMeat P2"}, - { "64f731ab83cfca080a361e42", "Pets Wont Need It"}, + { "64f731ab83cfca080a361e42", "Pets Wont Need It P1"}, { "64f83bb69878a0569d6ecfbe", "Gunsmith P23"}, { "64f83bcdde58fc437700d8fa", "Gunsmith P24"}, { "64f83bd983cfca080a362c82", "Gunsmith P25"}, - { "655e427b64d09b4122018228", "The Punisher - Harvest"}, + { "655e427b64d09b4122018228", "The Punisher - Harvest - Event"}, { "657315df034d76585f032e01", "Shooting Cans"}, { "657315ddab5a49b71f098853", "First In Line"}, @@ -776,7 +786,15 @@ namespace QuestValidator.Common.Helpers { "657315e4a6af4ab4b50f3459", "Saving The Mole"}, { "65733403eefc2c312a759ddb", "Developers Secrets P1" }, { "6573382e557ff128bf3da536", "Developers Secrets P2" }, - { "657315e1dccd301f1301416a", "Luxurious Life"} + { "657315e1dccd301f1301416a", "Luxurious Life"}, + { "6572e876dc0d635f633a5714", "Pyramid Scheme" }, + { "6573387d0b26ed4fde798de3", "Pets Wont Need It P2" }, + { "6573397ef3f8344c4575cd87", "Properties All Around" }, + { "65734c186dc1e402c80dc19e", "Dandies" }, + { "6578ec473dbd035d04531a8d", "Steady Signal" }, + { "65802b627b44fa5e14638899", "Nothing Fishy About This" }, + {"6578eb36e5020875d64645cd", "Huntsman Path Crooked Cop" }, + { "658027799634223183395339", "No Swiping" } }; public static string GetNameById(string id) { diff --git a/QuestValidator.Common/Models/Quest.cs b/QuestValidator.Common/Models/Quest.cs index 1b76cc6..50f02e8 100644 --- a/QuestValidator.Common/Models/Quest.cs +++ b/QuestValidator.Common/Models/Quest.cs @@ -4,7 +4,7 @@ { NOQUESTFOUND = 0, Debut = 1, - Checking = 2, + BackgroundCheck = 2, ShootoutPicnic = 3, DeliveryFromThePast = 4, BadRepEvidence = 5, @@ -374,7 +374,7 @@ TestDriveP3 = 369, BeyondTheRedMeatP1 = 370, BeyondTheRedMeatP2 = 371, - PetsWontNeedIt = 372, + PetsWontNeedItP1 = 372, GunsmithP23 = 373, GunsmithP24 = 374, GunsmithP25 =375, @@ -385,6 +385,14 @@ SavingTheMole = 380, DevelopersSecretsP1 = 381, DevelopersSecretsP2 = 382, - LuxuriousLife = 383 + LuxuriousLife = 383, + PyramidScheme = 384, + PetsWontNeedItP2 = 385, + PropertiesAllAround = 386, + Dandies = 387, + SteadySignal = 388, + NothingFishyAboutThis = 389, + HuntsmaPathCrookedCop = 390, + NoSwiping = 391 } }