Fix botgen issues
This commit is contained in:
@@ -553,7 +553,7 @@ public class BotWeaponGenerator(
|
||||
protected string GetWeightedCompatibleAmmo(Dictionary<string, Dictionary<string, double>> cartridgePool, TemplateItem weaponTemplate)
|
||||
{
|
||||
var desiredCaliber = GetWeaponCaliber(weaponTemplate);
|
||||
if (!cartridgePool.TryGetValue(desiredCaliber, out var cartridgePoolForWeapon) && cartridgePoolForWeapon.Keys.Count > 0)
|
||||
if (!cartridgePool.TryGetValue(desiredCaliber, out var cartridgePoolForWeapon) || cartridgePoolForWeapon?.Keys.Count == 0)
|
||||
{
|
||||
_logger.Debug(
|
||||
_localisationService.GetText(
|
||||
|
||||
@@ -1459,9 +1459,10 @@ public class ItemHelper(
|
||||
}
|
||||
|
||||
// Get max number of cartridges in magazine, choose random value between min/max
|
||||
var magProps = magTemplate.Properties;
|
||||
var magazineCartridgeMaxCount = IsOfBaseclass(magTemplate.Id, BaseClasses.SPRING_DRIVEN_CYLINDER)
|
||||
? magTemplate.Properties?.Slots?.Count() // Edge case for rotating grenade launcher magazine
|
||||
: magTemplate.Properties?.Cartridges[0]?.MaxCount;
|
||||
? magProps?.Slots?.Count // Edge case for rotating grenade launcher magazine
|
||||
: magProps?.Cartridges.FirstOrDefault()?.MaxCount;
|
||||
|
||||
if (magazineCartridgeMaxCount is null)
|
||||
{
|
||||
|
||||
@@ -152,7 +152,7 @@ public class BotEquipmentModPoolService
|
||||
|
||||
return _gearModPool.TryGetValue(itemTpl, out var value)
|
||||
? value
|
||||
: null;
|
||||
: [];
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -88,7 +88,6 @@
|
||||
"minLimitPercent": 15
|
||||
}
|
||||
},
|
||||
"botDurabilities": {
|
||||
"pmc": {
|
||||
"armor": {
|
||||
"lowestMaxPercent": 90,
|
||||
@@ -105,6 +104,7 @@
|
||||
"minLimitPercent": 15
|
||||
}
|
||||
},
|
||||
"botDurabilities": {
|
||||
"boss": {
|
||||
"armor": {
|
||||
"lowestMaxPercent": 90,
|
||||
|
||||
@@ -2826,6 +2826,10 @@
|
||||
"5efb0d4f4bc50b58e81710f3": 9,
|
||||
"5efb0fc6aeb21837e749c801": 9
|
||||
},
|
||||
"Caliber127x33": {
|
||||
"668fe62ac62660a5d8071446": 2,
|
||||
"66a0d1e0ed648d72fe064d06": 5
|
||||
},
|
||||
"Caliber127x55": {
|
||||
"5cadf6ddae9215051e1c23b2": 8,
|
||||
"5cadf6e5ae921500113bb973": 4,
|
||||
|
||||
@@ -2818,6 +2818,10 @@
|
||||
"5efb0d4f4bc50b58e81710f3": 9,
|
||||
"5efb0fc6aeb21837e749c801": 9
|
||||
},
|
||||
"Caliber127x33": {
|
||||
"668fe62ac62660a5d8071446": 2,
|
||||
"66a0d1e0ed648d72fe064d06": 5
|
||||
},
|
||||
"Caliber127x55": {
|
||||
"5cadf6ddae9215051e1c23b2": 8,
|
||||
"5cadf6e5ae921500113bb973": 4,
|
||||
|
||||
Reference in New Issue
Block a user