diff --git a/Libraries/SPTarkov.Server.Core/Controllers/InsuranceController.cs b/Libraries/SPTarkov.Server.Core/Controllers/InsuranceController.cs index 32226d2d..1a68167d 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/InsuranceController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/InsuranceController.cs @@ -504,7 +504,7 @@ public class InsuranceController( // Draw x attachments from weighted array to remove from parent, remove from pool after being picked var attachmentIdsToRemove = attachmentsProbabilityArray.Draw( - (int) countOfAttachmentsToRemove, + (int)countOfAttachmentsToRemove, false ); foreach (var attachmentId in attachmentIdsToRemove) diff --git a/Libraries/SPTarkov.Server.Core/Generators/LocationLootGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/LocationLootGenerator.cs index d6120170..c09a3ca7 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/LocationLootGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/LocationLootGenerator.cs @@ -408,7 +408,7 @@ public class LocationLootGenerator( containerDistribution.Add(new ProbabilityObject(x, value, value)); } - chosenContainerIds.AddRange(containerDistribution.Draw((int) containerData.ChosenCount)); + chosenContainerIds.AddRange(containerDistribution.Draw((int)containerData.ChosenCount)); return chosenContainerIds; } @@ -855,7 +855,7 @@ public class LocationLootGenerator( if (randomSpawnPointCount > 0 && spawnPointArray.Count > 0) // Add randomly chosen spawn points { - foreach (var si in spawnPointArray.Draw((int) randomSpawnPointCount, false)) + foreach (var si in spawnPointArray.Draw((int)randomSpawnPointCount, false)) { chosenSpawnPoints.Add(spawnPointArray.Data(si)); } diff --git a/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGeneration/EliminationQuestGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGeneration/EliminationQuestGenerator.cs index 57dac1bc..62c16136 100644 --- a/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGeneration/EliminationQuestGenerator.cs +++ b/Libraries/SPTarkov.Server.Core/Generators/RepeatableQuestGeneration/EliminationQuestGenerator.cs @@ -605,9 +605,9 @@ public class EliminationQuestGenerator( + generationData.EliminationConfig.MinDistance ); - distance = (int) Math.Ceiling((decimal) (distance / 5d)) * 5; + distance = (int)Math.Ceiling((decimal)(distance / 5d)) * 5; - var distanceDifficulty = (int) ( + var distanceDifficulty = (int)( MaxDistDifficulty * distance / generationData.EliminationConfig.MaxDistance ); @@ -629,26 +629,26 @@ public class EliminationQuestGenerator( { // Filter out close range weapons from far distance requirement case > 50: - { - List weaponTypeBlacklist = ["Shotgun", "Pistol"]; + { + List weaponTypeBlacklist = ["Shotgun", "Pistol"]; - // Filter out close range weapons from long distance requirement - generationData.WeaponCategoryRequirementConfig.RemoveAll(category => - weaponTypeBlacklist.Contains(category.Key) - ); - break; - } + // Filter out close range weapons from long distance requirement + generationData.WeaponCategoryRequirementConfig.RemoveAll(category => + weaponTypeBlacklist.Contains(category.Key) + ); + break; + } // Filter out long range weapons from close distance requirement case < 20: - { - List weaponTypeBlacklist = ["MarksmanRifle", "DMR"]; + { + List weaponTypeBlacklist = ["MarksmanRifle", "DMR"]; - // Filter out far range weapons from close distance requirement - generationData.WeaponCategoryRequirementConfig.RemoveAll(category => - weaponTypeBlacklist.Contains(category.Key) - ); - break; - } + // Filter out far range weapons from close distance requirement + generationData.WeaponCategoryRequirementConfig.RemoveAll(category => + weaponTypeBlacklist.Contains(category.Key) + ); + break; + } } // Pick a weighted weapon category diff --git a/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs index 6c94c73e..2cbe748a 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs @@ -433,7 +433,7 @@ public class ItemHelper( // Run getItemPrice for each tpl in tpls array, return sum return tpls.Aggregate( 0, - (total, tpl) => total + (int) GetItemPrice(tpl).GetValueOrDefault(0) + (total, tpl) => total + (int)GetItemPrice(tpl).GetValueOrDefault(0) ); } @@ -902,8 +902,8 @@ public class ItemHelper( // Find required items to take after buying (handles multiple items) var desiredBarterIds = desiredBarterItemIds.GetType() == typeof(string) - ? [(string) desiredBarterItemIds] - : (List) desiredBarterItemIds; + ? [(string)desiredBarterItemIds] + : (List)desiredBarterItemIds; List matchingItems = []; foreach (var barterId in desiredBarterIds) @@ -1456,7 +1456,7 @@ public class ItemHelper( var cartridgeItemToAdd = CreateCartridges( ammoBox[0].Id, cartridgeTpl, - (int) cartridgeCountToAdd, + (int)cartridgeCountToAdd, location ); @@ -1485,7 +1485,7 @@ public class ItemHelper( 0 ].Filter?.FirstOrDefault(); ammoBox.Add( - CreateCartridges(ammoBox[0].Id, cartridgeTpl, (int) ammoBoxMaxCartridgeCount, 0) + CreateCartridges(ammoBox[0].Id, cartridgeTpl, (int)ammoBoxMaxCartridgeCount, 0) ); } @@ -1593,8 +1593,8 @@ public class ItemHelper( } var desiredStackCount = _randomUtil.GetInt( - (int) Math.Round(minSizeMultiplier * magazineCartridgeMaxCount ?? 0), - (int) magazineCartridgeMaxCount + (int)Math.Round(minSizeMultiplier * magazineCartridgeMaxCount ?? 0), + (int)magazineCartridgeMaxCount ); if (magazineWithChildCartridges.Count > 1) @@ -1706,7 +1706,7 @@ public class ItemHelper( ammoArray.Add( new ProbabilityObject( icd.Tpl, - (double) icd.RelativeProbability, + (double)icd.RelativeProbability, null ) ); diff --git a/Libraries/SPTarkov.Server.Core/Utils/Collections/ProbabilityObjectArray.cs b/Libraries/SPTarkov.Server.Core/Utils/Collections/ProbabilityObjectArray.cs index f39a5711..3cb21f8c 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Collections/ProbabilityObjectArray.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Collections/ProbabilityObjectArray.cs @@ -90,7 +90,7 @@ public class ProbabilityObjectArray : List> /// ProbabilityObjectArray without the dropped element public ProbabilityObjectArray Drop(K key) { - return (ProbabilityObjectArray) this.Where(r => !r.Key?.Equals(key) ?? false); + return (ProbabilityObjectArray)this.Where(r => !r.Key?.Equals(key) ?? false); } ///