More bot generation implementation

Libraries/Core/Controllers/BotController.cs

@@ -183,7 +183,7 @@ public class BotController(
 
         if (botCacheCount >= botGenerationDetails.BotCountToGenerate)
         {
-            _logger.Debug($"Cache already has sufficient bots: {botCacheCount}");
+            _logger.Debug($"Cache already has sufficient {cacheKey} bots: {botCacheCount}");
             return;
         }
 

Libraries/Core/Generators/BotEquipmentModGenerator.cs

@@ -1384,7 +1384,7 @@ public class BotEquipmentModGenerator(
             );
         }
 
-        if (modPool[modTemplate.Id] is null)
+        if (!modPool.ContainsKey(modTemplate.Id))
         {
             modPool[modTemplate.Id] = new();
         }

Libraries/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs

@@ -40,8 +40,9 @@ public class ExternalInventoryMagGen(
         var weapon = inventoryMagGen.GetWeaponTemplate();
         List<string> attemptedMagBlacklist = [];
         var defaultMagazineTpl = _botWeaponGeneratorHelper.GetWeaponsDefaultMagazineTpl(weapon);
-        var randomizedMagazineCount = _botWeaponGeneratorHelper.GetRandomizedMagazineCount(inventoryMagGen.GetMagCount());
         var isShotgun = _itemHelper.IsOfBaseclass(weapon.Id, BaseClasses.SHOTGUN);
+
+        var randomizedMagazineCount = _botWeaponGeneratorHelper.GetRandomizedMagazineCount(inventoryMagGen.GetMagCount());
         for (var i = 0; i < randomizedMagazineCount; i++)
         {
             var magazineWithAmmo = _botWeaponGeneratorHelper.CreateMagazineWithAmmo(

Libraries/Core/Helpers/ContainerHelper.cs

@@ -144,7 +144,25 @@ public class ContainerHelper
         int itemH,
         bool rotate)
     {
-        throw new NotImplementedException();
+        // Swap height/width if we want to fit it in rotated
+        var itemWidth = rotate ? itemH : itemW;
+        var itemHeight = rotate ? itemW : itemH;
+
+        for (var tmpY = y; tmpY < y + itemHeight; tmpY++)
+        {
+            for (var tmpX = x; tmpX < x + itemWidth; tmpX++)
+            {
+                if (container2D[tmpY][tmpX] == 0)
+                {
+                    // Flag slot as used
+                    container2D[tmpY][tmpX] = 1;
+                }
+                else
+                {
+                    throw new Exception($"Slot at({ x }, { y}) is already filled. Cannot fit a { itemW} by { itemH} item");
+                }
+            }
+        }
     }
 }
 

Libraries/Core/Helpers/InventoryHelper.cs

@@ -14,6 +14,7 @@ using Core.Models.Eft.Hideout;
 using Core.Models.Enums;
 using Core.Models.Spt.Bots;
 using Core.Models.Spt.Services;
+using System.Xml.Linq;
 
 namespace Core.Helpers;
 
@@ -22,6 +23,7 @@ public class InventoryHelper(
     ISptLogger<InventoryHelper> _logger,
     ProfileHelper _profileHelper,
     DialogueHelper _dialogueHelper,
+    ContainerHelper _containerHelper,
     ItemHelper _itemHelper,
     LocalisationService _localisationService
 )
@@ -94,9 +96,9 @@ public class InventoryHelper(
     /// <param name="containerFS2D">Container grid to fit items into</param>
     /// <param name="itemsWithChildren">Items to try and fit into grid</param>
     /// <returns>True all fit</returns>
-    public bool CanPlaceItemsInContainer(List<List<double>>? containerFS2D, List<List<Item>> itemsWithChildren)
+    public bool CanPlaceItemsInContainer(int[][] containerFS2D, List<List<Item>> itemsWithChildren)
     {
-        throw new NotImplementedException();
+        return itemsWithChildren.All(itemWithChildren => CanPlaceItemInContainer(containerFS2D, itemWithChildren));
     }
 
     /// <summary>
@@ -105,9 +107,38 @@ public class InventoryHelper(
     /// <param name="containerFS2D">Container grid</param>
     /// <param name="itemWithChildren">Item to check fits</param>
     /// <returns>True it fits</returns>
-    public bool CanPlaceItemInContainer(List<List<int>>? containerFS2D, List<Item> itemWithChildren)
+    public bool CanPlaceItemInContainer(int[][] containerFS2D, List<Item> itemWithChildren)
     {
-        throw new NotImplementedException();
+        // Get x/y size of item
+        var rootItem = itemWithChildren[0];
+        var itemSize = GetItemSize(rootItem.Template, rootItem.Id, itemWithChildren);
+
+        // Look for a place to slot item into
+        var findSlotResult = _containerHelper.FindSlotForItem(containerFS2D, itemSize[0], itemSize[1]);
+        if (findSlotResult.Success.GetValueOrDefault(false))
+        {
+            try
+            {
+                _containerHelper.FillContainerMapWithItem(
+                    containerFS2D,
+                    findSlotResult.X.Value,
+                    findSlotResult.Y.Value,
+                    itemSize[0],
+                    itemSize[1],
+                    findSlotResult.Rotation.Value);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(_localisationService.GetText("inventory-unable_to_fit_item_into_inventory", ex.Message));
+
+                return false;
+            }
+
+            // Success! exit
+            return true;
+        }
+
+        return false;
     }
 
     /// <summary>
@@ -118,12 +149,49 @@ public class InventoryHelper(
     /// <param name="containerId">Id of the container we're fitting item into</param>
     /// <param name="desiredSlotId">Slot id value to use, default is "hideout"</param>
     public void PlaceItemInContainer(
-        List<List<double>> containerFS2D,
+        int[][] containerFS2D,
         List<Item> itemWithChildren,
         string containerId,
         string desiredSlotId = "hideout")
     {
-        throw new NotImplementedException();
+        // Get x/y size of item
+        var rootItemAdded = itemWithChildren[0];
+        var itemSize = GetItemSize(rootItemAdded.Template, rootItemAdded.Id, itemWithChildren);
+
+        // Look for a place to slot item into
+        var findSlotResult = _containerHelper.FindSlotForItem(containerFS2D, itemSize[0], itemSize[1]);
+        if (findSlotResult.Success.GetValueOrDefault(false))
+        {
+            try
+            {
+                _containerHelper.FillContainerMapWithItem(
+                    containerFS2D,
+                    findSlotResult.X.Value,
+                    findSlotResult.Y.Value,
+                    itemSize[0],
+                    itemSize[1],
+                    findSlotResult.Rotation.Value);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(_localisationService.GetText("inventory-fill_container_failed", ex.Message));
+
+                return;
+            }
+            // Store details for object, incuding container item will be placed in
+            rootItemAdded.ParentId = containerId;
+            rootItemAdded.SlotId = desiredSlotId;
+            rootItemAdded.Location = new ItemLocation
+            {
+                X = findSlotResult.X,
+                Y = findSlotResult.Y,
+                R = findSlotResult.Rotation.GetValueOrDefault(false) ? 1 : 0,
+                Rotation = findSlotResult.Rotation,
+            };
+
+            // Success! exit
+            return;
+        }
     }
 
     /// <summary>
@@ -515,7 +583,7 @@ public class InventoryHelper(
     /// <param name="pmcData">Player profile</param>
     /// <param name="sessionID">session id</param>
     /// <returns>2-dimensional array</returns>
-    protected int[,] GetStashSlotMap(PmcData pmcData, string sessionID)
+    protected int[][] GetStashSlotMap(PmcData pmcData, string sessionID)
     {
         throw new NotImplementedException();
     }
@@ -525,9 +593,15 @@ public class InventoryHelper(
     /// </summary>
     /// <param name="containerTpl">Container to get data for</param>
     /// <returns>blank two-dimensional array</returns>
-    public List<List<double>> GetContainerSlotMap(string containerTpl)
+    public int[][] GetContainerSlotMap(string containerTpl)
     {
-        throw new NotImplementedException();
+        var containerTemplate = _itemHelper.GetItem(containerTpl).Value;
+
+        var firstContainerGrid = containerTemplate.Properties.Grids.FirstOrDefault();
+        var containerH = firstContainerGrid.Props.CellsH;
+        var containerV = firstContainerGrid.Props.CellsV;
+
+        return GetBlankContainerMap(containerH.Value, containerV.Value);
     }
 
     /// <summary>
@@ -535,7 +609,7 @@ public class InventoryHelper(
     /// </summary>
     /// <param name="pmcData">Player profile</param>
     /// <returns>two-dimensional array</returns>
-    protected List<List<double>> GetSortingTableSlotMap(PmcData pmcData)
+    protected int[][] GetSortingTableSlotMap(PmcData pmcData)
     {
         throw new NotImplementedException();
     }

Libraries/Core/Helpers/ItemHelper.cs

@@ -1450,6 +1450,13 @@ public class ItemHelper(
         double minSizeMultiplier = 0.25
     )
     {
+        var isUBGL = IsOfBaseclass(magTemplate.Id, BaseClasses.UBGL);
+        if (isUBGL)
+        {
+            // UBGL don't have mags
+            return;
+        }
+
         // Get cartridge properties and max allowed stack size
         var cartridgeDetails = GetItem(cartridgeTpl);
         if (!cartridgeDetails.Key)
@@ -1467,7 +1474,7 @@ public class ItemHelper(
         var magProps = magTemplate.Properties;
         var magazineCartridgeMaxCount = IsOfBaseclass(magTemplate.Id, BaseClasses.SPRING_DRIVEN_CYLINDER)
             ? magProps?.Slots?.Count // Edge case for rotating grenade launcher magazine
-            : magProps?.Cartridges.FirstOrDefault()?.MaxCount;
+            : magProps?.Cartridges?.FirstOrDefault()?.MaxCount;
 
         if (magazineCartridgeMaxCount is null)
         {

Libraries/Core/Services/BotNameService.cs

@@ -56,7 +56,7 @@ public class BotNameService(
             // Get bot name with leading/trailing whitespace removed
             var name = (isPmc.GetValueOrDefault(false)) // Explicit handling of PMCs, all other bots will get "first_name last_name"
                 ? _botHelper.GetPmcNicknameOfMaxLength(_botConfig.BotNameLengthLimit, botGenerationDetails.Side)
-                : $"{_randomUtil.GetArrayValue(botJsonTemplate.FirstNames)} {_randomUtil.GetArrayValue(botJsonTemplate.LastNames)}";
+                : $"{_randomUtil.GetArrayValue(botJsonTemplate.FirstNames)} {(botJsonTemplate.LastNames.Count > 0 ? _randomUtil.GetArrayValue(botJsonTemplate.LastNames) : "")}";
 
             name = name.Trim();
 

Tools/ItemTplGenerator/ItemTplGenerator.cs

@@ -5,7 +5,6 @@ using Core.Models.Enums;
 using Core.Models.Utils;
 using Core.Servers;
 using Core.Services;
-using Microsoft.Extensions.Logging;
 using SptCommon.Annotations;
 using SptCommon.Extensions;
 using Path = System.IO.Path;
@@ -14,9 +13,9 @@ namespace ItemTplGenerator;
 
 [Injectable]
 public class ItemTplGenerator(
+    ISptLogger<ItemTplGenerator> _logger,
     DatabaseServer _databaseServer,
     LocaleService _localeService,
-    ISptLogger<ItemTplGenerator> _logger,
     ItemHelper _itemHelper,
     // @inject("FileSystemSync") protected fileSystemSync: FileSystemSync,
     IEnumerable<OnLoad> _onLoadComponents