From b4c5392f086218968451d451436049a58ec06b30 Mon Sep 17 00:00:00 2001 From: Chomp Date: Mon, 24 Feb 2025 17:53:42 +0000 Subject: [PATCH] Replace various uses of Count() with `Any()` for ienumerables + remove redundant parenthesis --- Libraries/Core/Generators/BotEquipmentModGenerator.cs | 2 +- .../WeaponGen/Implementations/ExternalInventoryMagGen.cs | 2 +- Libraries/Core/Helpers/HideoutHelper.cs | 2 +- Libraries/Core/Helpers/ItemHelper.cs | 4 ++-- Libraries/Core/Helpers/RewardHelper.cs | 2 +- Libraries/Core/Services/BotWeaponModLimitService.cs | 6 +++--- Libraries/Core/Services/LocationLifecycleService.cs | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Libraries/Core/Generators/BotEquipmentModGenerator.cs b/Libraries/Core/Generators/BotEquipmentModGenerator.cs index ea1b9735..16ab859f 100644 --- a/Libraries/Core/Generators/BotEquipmentModGenerator.cs +++ b/Libraries/Core/Generators/BotEquipmentModGenerator.cs @@ -1136,7 +1136,7 @@ public class BotEquipmentModGenerator( { Incompatible = true, Found = false, - Reason = $"Unable to add mod to {choiceTypeEnum.ToString()} slot: {modSlotName}. All: {modPool.Count()} had conflicts" + Reason = $"Unable to add mod to {choiceTypeEnum.ToString()} slot: {modSlotName}. All: {modPool.Count} had conflicts" }; } diff --git a/Libraries/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs b/Libraries/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs index bc6ab055..96ecff84 100644 --- a/Libraries/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs +++ b/Libraries/Core/Generators/WeaponGen/Implementations/ExternalInventoryMagGen.cs @@ -181,7 +181,7 @@ public class ExternalInventoryMagGen( // Non-internal magazines that fit into the weapon var externalMagazineOnlyPool = magazinePool.Where(x => x.Properties.ReloadMagType != ReloadMode.InternalMagazine); - if (externalMagazineOnlyPool is null || externalMagazineOnlyPool?.Count() == 0) + if (externalMagazineOnlyPool is null || !externalMagazineOnlyPool.Any()) { return null; } diff --git a/Libraries/Core/Helpers/HideoutHelper.cs b/Libraries/Core/Helpers/HideoutHelper.cs index 3455422e..8c908631 100644 --- a/Libraries/Core/Helpers/HideoutHelper.cs +++ b/Libraries/Core/Helpers/HideoutHelper.cs @@ -242,7 +242,7 @@ public class HideoutHelper( protected HideoutProperties GetHideoutProperties(PmcData pmcData) { var bitcoinFarm = pmcData.Hideout.Areas.FirstOrDefault(area => area.Type == HideoutAreas.BITCOIN_FARM); - var bitcoinCount = bitcoinFarm?.Slots.Where(slot => slot.Items is not null).Count(); // Get slots with an item property + var bitcoinCount = (bitcoinFarm?.Slots).Count(slot => slot.Items is not null); // Get slots with an item property var hideoutProperties = new HideoutProperties { diff --git a/Libraries/Core/Helpers/ItemHelper.cs b/Libraries/Core/Helpers/ItemHelper.cs index 6a15d340..85c82a0b 100644 --- a/Libraries/Core/Helpers/ItemHelper.cs +++ b/Libraries/Core/Helpers/ItemHelper.cs @@ -584,7 +584,7 @@ public class ItemHelper( { if (_databaseService.GetItems().TryGetValue(itemTpl, out var item)) { - return GetItem(itemTpl).Value.Properties?.Slots?.Count() > 0; + return GetItem(itemTpl).Value.Properties?.Slots?.Count > 0; } return false; @@ -1890,7 +1890,7 @@ public class ItemHelper( if (_logger.IsLogEnabled(LogLevel.Debug)) { _logger.Debug( - $"Unable to choose a mod for slot: {slot.Name} on item: {itemToAddTemplate.Id} {itemToAddTemplate.Name}, no compatible tpl found in pool of {itemPool.Count()}, skipping" + $"Unable to choose a mod for slot: {slot.Name} on item: {itemToAddTemplate.Id} {itemToAddTemplate.Name}, no compatible tpl found in pool of {itemPool.Count}, skipping" ); } diff --git a/Libraries/Core/Helpers/RewardHelper.cs b/Libraries/Core/Helpers/RewardHelper.cs index 8f362e26..a701dc06 100644 --- a/Libraries/Core/Helpers/RewardHelper.cs +++ b/Libraries/Core/Helpers/RewardHelper.cs @@ -228,7 +228,7 @@ public class RewardHelper( .ToList(); // More/less than single match, above filtering wasn't strict enough - if (matchingProductions.Count() != 1) + if (matchingProductions.Count != 1) // Multiple matches were found, last ditch attempt to match by questid (value we add manually to production.json via `gen:productionquests` command) { matchingProductions = matchingProductions.Where( diff --git a/Libraries/Core/Services/BotWeaponModLimitService.cs b/Libraries/Core/Services/BotWeaponModLimitService.cs index 478eb8c1..d7a37788 100644 --- a/Libraries/Core/Services/BotWeaponModLimitService.cs +++ b/Libraries/Core/Services/BotWeaponModLimitService.cs @@ -116,7 +116,7 @@ public class BotWeaponModLimitService( // Item being added is a mount but the parent item is NOT a mount (Allows red dot sub-mounts on mounts) // Mount has one slot and its for a mod_scope if (modLimits.Scope.Count >= modLimits.ScopeMax && - modTemplate.Properties.Slots?.Count() == 1 && + modTemplate.Properties.Slots?.Count == 1 && _itemHelper.IsOfBaseclass(modTemplate.Id, BaseClasses.MOUNT) && !_itemHelper.IsOfBaseclass(modsParent.Id, BaseClasses.MOUNT) && modTemplate.Properties.Slots.Any(slot => slot.Name == "mod_scope") @@ -137,9 +137,9 @@ public class BotWeaponModLimitService( ); } - // Mod is a mount that can hold only flashlights ad limit is reached (dont want to add empty mounts if limit is reached) + // Mod is a mount that can hold only flashlights ad limit is reached (don't want to add empty mounts if limit is reached) if (modLimits.Scope.Count >= modLimits.ScopeMax && - modTemplate.Properties.Slots?.Count() == 1 && + modTemplate.Properties.Slots?.Count == 1 && _itemHelper.IsOfBaseclass(modTemplate.Id, BaseClasses.MOUNT) && modTemplate.Properties.Slots.Any(slot => slot.Name == "mod_flashlight") ) diff --git a/Libraries/Core/Services/LocationLifecycleService.cs b/Libraries/Core/Services/LocationLifecycleService.cs index 74afc782..c0581813 100644 --- a/Libraries/Core/Services/LocationLifecycleService.cs +++ b/Libraries/Core/Services/LocationLifecycleService.cs @@ -931,7 +931,7 @@ public class LocationLifecycleService // Fail if multiple were found if (matchingQuests.Count != 1) { - _logger.Error($"Unable to fix quest item: {lostItem}, {matchingQuests.Count()} matching quests found, expected 1"); + _logger.Error($"Unable to fix quest item: {lostItem}, {matchingQuests.Count} matching quests found, expected 1"); continue; }