chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved handling of ammo pick when data not found in bot json

Browse Source
This commit is contained in:
Chomp
2025-10-10 12:26:34 +01:00
parent 8ad0f3d31a
commit 57a1b16505
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Generators/BotWeaponGenerator.cs
+9 -7
View File
@@ -610,9 +610,13 @@ public class BotWeaponGenerator(
);
}
// Immediately returns, default ammo is guaranteed to be compatible
// it is not guaranteed to even have a default ammo
return weaponTemplate.Properties.DefAmmo.Value;
if (weaponTemplate.Properties.DefAmmo.HasValue)
{
return weaponTemplate.Properties.DefAmmo.Value;
}
// last ditch attempt to get default ammo tpl
return weaponTemplate.Properties.Chambers.FirstOrDefault().Properties.Filters.FirstOrDefault().Filter.FirstOrDefault();
}
// Get cartridges the weapons first chamber allow
@@ -712,10 +716,8 @@ public class BotWeaponGenerator(
// Try to get cartridges from slots array first, if none found, try Cartridges array
var cartridges =
magazineTemplate.Value.Properties.Slots.FirstOrDefault()?.Properties?.Filters.FirstOrDefault()?.Filter ?? magazineTemplate
.Value.Properties.Cartridges.FirstOrDefault()
?.Properties?.Filters.FirstOrDefault()
?.Filter;
magazineTemplate.Value.Properties.Slots.FirstOrDefault()?.Properties?.Filters?.FirstOrDefault()?.Filter
?? magazineTemplate.Value.Properties.Cartridges.FirstOrDefault()?.Properties?.Filters?.FirstOrDefault()?.Filter;
return cartridges ?? [];
}