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

Format Style Fixes

Browse Source
This commit is contained in:
sp-tarkov-bot
2025-07-28 19:39:29 +00:00
parent 51430d55c9
commit b14b74bf24
357 changed files with 7345 additions and 24604 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/BarrelInventoryMagGen.cs
+3 -4
View File
@@ -6,10 +6,9 @@ using SPTarkov.Server.Core.Utils;
namespace SPTarkov.Server.Core.Generators.WeaponGen.Implementations;
[Injectable]
public class BarrelInventoryMagGen(
RandomUtil randomUtil,
BotWeaponGeneratorHelper botWeaponGeneratorHelper
) : InventoryMagGen, IInventoryMagGen
public class BarrelInventoryMagGen(RandomUtil randomUtil, BotWeaponGeneratorHelper botWeaponGeneratorHelper)
: InventoryMagGen,
IInventoryMagGen
{
public int GetPriority()
{
Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs
+6 -22
View File
@@ -44,9 +44,7 @@ public class ExternalInventoryMagGen(
var defaultMagazineTpl = weapon.GetWeaponsDefaultMagazineTpl();
var isShotgun = itemHelper.IsOfBaseclass(weapon.Id, BaseClasses.SHOTGUN);
var randomizedMagazineCount = botWeaponGeneratorHelper.GetRandomizedMagazineCount(
inventoryMagGen.GetMagCount()
);
var randomizedMagazineCount = botWeaponGeneratorHelper.GetRandomizedMagazineCount(inventoryMagGen.GetMagCount());
for (var i = 0; i < randomizedMagazineCount; i++)
{
var magazineWithAmmo = botWeaponGeneratorHelper.CreateMagazineWithAmmo(
@@ -77,9 +75,7 @@ public class ExternalInventoryMagGen(
{
if (logger.IsLogEnabled(LogLevel.Debug))
{
logger.Debug(
$"Failed {fitAttempts} times to add magazine {magazineTpl} to bot inventory, stopping"
);
logger.Debug($"Failed {fitAttempts} times to add magazine {magazineTpl} to bot inventory, stopping");
}
break;
@@ -115,12 +111,7 @@ public class ExternalInventoryMagGen(
magTemplate = itemHelper.GetItem(magazineTpl).Value;
if (magTemplate is null)
{
logger.Error(
serverLocalisationService.GetText(
"bot-unable_to_find_default_magazine_item",
magazineTpl
)
);
logger.Error(serverLocalisationService.GetText("bot-unable_to_find_default_magazine_item", magazineTpl));
break;
}
@@ -174,15 +165,10 @@ public class ExternalInventoryMagGen(
/// <param name="weaponTpl"> Weapon to get mag for </param>
/// <param name="magazineBlacklist"> Blacklisted magazines </param>
/// <returns> Item of chosen magazine </returns>
public TemplateItem? GetRandomExternalMagazineForInternalMagazineGun(
MongoId weaponTpl,
HashSet<MongoId> magazineBlacklist
)
public TemplateItem? GetRandomExternalMagazineForInternalMagazineGun(MongoId weaponTpl, HashSet<MongoId> magazineBlacklist)
{
// The mag Slot data for the weapon
var magSlot = itemHelper
.GetItem(weaponTpl)
.Value.Properties.Slots.FirstOrDefault(x => x.Name == "mod_magazine");
var magSlot = itemHelper.GetItem(weaponTpl).Value.Properties.Slots.FirstOrDefault(x => x.Name == "mod_magazine");
if (magSlot is null)
{
return null;
@@ -199,9 +185,7 @@ public class ExternalInventoryMagGen(
}
// Non-internal magazines that fit into the weapon
var externalMagazineOnlyPool = magazinePool.Where(x =>
x.Properties.ReloadMagType != ReloadMode.InternalMagazine
);
var externalMagazineOnlyPool = magazinePool.Where(x => x.Properties.ReloadMagType != ReloadMode.InternalMagazine);
if (externalMagazineOnlyPool is null || !externalMagazineOnlyPool.Any())
{
return null;
Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/InternalMagazineInventoryMagGen.cs
+2 -5
View File
@@ -5,9 +5,7 @@ using SPTarkov.Server.Core.Models.Enums;
namespace SPTarkov.Server.Core.Generators.WeaponGen.Implementations;
[Injectable]
public class InternalMagazineInventoryMagGen(BotWeaponGeneratorHelper botWeaponGeneratorHelper)
: InventoryMagGen,
IInventoryMagGen
public class InternalMagazineInventoryMagGen(BotWeaponGeneratorHelper botWeaponGeneratorHelper) : InventoryMagGen, IInventoryMagGen
{
public int GetPriority()
{
@@ -16,8 +14,7 @@ public class InternalMagazineInventoryMagGen(BotWeaponGeneratorHelper botWeaponG
public bool CanHandleInventoryMagGen(InventoryMagGen inventoryMagGen)
{
return inventoryMagGen.GetMagazineTemplate().Properties.ReloadMagType
== ReloadMode.InternalMagazine;
return inventoryMagGen.GetMagazineTemplate().Properties.ReloadMagType == ReloadMode.InternalMagazine;
}
public void Process(InventoryMagGen inventoryMagGen)
Libraries/SPTarkov.Server.Core/Generators/WeaponGen/Implementations/UbglExternalMagGen.cs
+1 -3
View File
@@ -5,9 +5,7 @@ using SPTarkov.Server.Core.Models.Enums;
namespace SPTarkov.Server.Core.Generators.WeaponGen.Implementations;
[Injectable]
public class UbglExternalMagGen(BotWeaponGeneratorHelper botWeaponGeneratorHelper)
: InventoryMagGen,
IInventoryMagGen
public class UbglExternalMagGen(BotWeaponGeneratorHelper botWeaponGeneratorHelper) : InventoryMagGen, IInventoryMagGen
{
public int GetPriority()
{