diff --git a/Generator/BotLootGenerator.cs b/Generator/BotLootGenerator.cs index be80551..487f52f 100644 --- a/Generator/BotLootGenerator.cs +++ b/Generator/BotLootGenerator.cs @@ -85,7 +85,7 @@ namespace Generator private void AddSpecialLoot(Bot botToUpdate) { - botToUpdate.specialLoot.AddRange(SpecialLootHelper.GetSpecialLootForBotType(botToUpdate.botType)); + botToUpdate.inventory.items.SpecialLoot.AddRange(SpecialLootHelper.GetSpecialLootForBotType(botToUpdate.botType)); } private List GetItemsStoredInEquipmentItem(List bots, string containerName) diff --git a/Generator/Helpers/Gear/GearChanceHelpers.cs b/Generator/Helpers/Gear/GearChanceHelpers.cs index 1883429..69d3623 100644 --- a/Generator/Helpers/Gear/GearChanceHelpers.cs +++ b/Generator/Helpers/Gear/GearChanceHelpers.cs @@ -109,7 +109,7 @@ namespace Generator.Helpers.Gear public static void AddGenerationChances(Bot bot) { - bot.generation = new GenerationChances(bot.specialLoot.Count > 0 ? 1 : 0 , bot.specialLoot.Count, 1, 2, 0, 3, 2, 4, 0, 5); //TODO get dynamically + bot.generation = new GenerationChances(bot.inventory.items.SpecialLoot.Count > 0 ? 1 : 0 , bot.inventory.items.SpecialLoot.Count, 1, 2, 0, 3, 2, 4, 0, 5); //TODO get dynamically } public static void CalculateEquipmentChances(Bot bot, List baseBots) { diff --git a/Generator/Models/Output/Equipment.cs b/Generator/Models/Output/Equipment.cs index 7c74fcf..3bd28cd 100644 --- a/Generator/Models/Output/Equipment.cs +++ b/Generator/Models/Output/Equipment.cs @@ -60,11 +60,13 @@ namespace Generator.Models.Output Pockets = new List(); Backpack = new List(); SecuredContainer = new List(); + SpecialLoot = new List(); } public List TacticalVest { get; set; } public List Pockets { get; set; } public List Backpack { get; set; } public List SecuredContainer { get; set; } + public List SpecialLoot { get; set; } } } diff --git a/Generator/Models/Output/Output.cs b/Generator/Models/Output/Output.cs index 5b9df25..0b4f522 100644 --- a/Generator/Models/Output/Output.cs +++ b/Generator/Models/Output/Output.cs @@ -13,7 +13,6 @@ namespace Generator.Models.Output health = new Health(); skills = new Skills(); inventory = new Inventory(); - specialLoot = new List(); firstName = new List(); lastName = new List(); difficulty = new Difficulty.Difficulty(); @@ -28,7 +27,6 @@ namespace Generator.Models.Output public Health health { get; set; } public Skills skills { get; set; } public Inventory inventory { get; set; } - public List specialLoot { get; set; } public List firstName { get; set; } public List lastName { get; set; } public Difficulty.Difficulty difficulty { get; set;}