This commit is contained in:
Alex
2025-01-22 21:16:10 +00:00
parent dbf6f0d01f
commit ea3e3f3a30
2 changed files with 15 additions and 3 deletions
@@ -1,5 +1,6 @@
using Core.Utils.Cloners;
using System.Text.Json.Serialization;
using Microsoft.AspNetCore.Components.Web;
namespace Core.Utils.Collections;
@@ -46,6 +47,17 @@ public class ProbabilityObjectArray<T, K, V> : List<T> where T : ProbabilityObje
return probCumsum;
}
public ProbabilityObjectArray<T, K, V> Filter(Predicate<ProbabilityObject<K, V>> predicate)
{
var filtered = new ProbabilityObjectArray<T, K, V>(_mathUtil, _cloner, new List<T>());
foreach (var probabilityObject in this)
{
if (predicate.Invoke(probabilityObject))
filtered.Add(probabilityObject);
}
return filtered;
}
/**
* Clone this ProbabilitObjectArray
* @returns {ProbabilityObjectArray} Deep Copy of this ProbabilityObjectArray
+3 -3
View File
@@ -190,7 +190,7 @@ public class ItemTplGenerator(
// Include any bracketed suffixes that exist, handles the case of colored gun variants
var weaponFullName = _localeService.GetLocaleDb()[$"{kv.Key} Name"]?.ToUpper();
if (weaponFullName.RegexMatch("\\((.+?)\\)$", out var itemNameBracketSuffix) &&
if (weaponFullName.RegexMatch(@"\((.+?)\)$", out var itemNameBracketSuffix) &&
!weaponShortName.EndsWith(itemNameBracketSuffix.Groups[1].Value))
{
weaponShortName += $"_{itemNameBracketSuffix.Groups[1].Value}";
@@ -495,7 +495,7 @@ public class ItemTplGenerator(
var caliber = CleanCaliber(item.Properties.AmmoCaliber.ToUpper());
// If the item has a bracketed section at the end of its name, include that
if (itemName?.RegexMatch("\\((.+?)\\)$", out var itemNameBracketSuffix) ?? false)
if (itemName?.RegexMatch(@"\((.+?)\)$", out var itemNameBracketSuffix) ?? false)
{
return $"{caliber}_{itemNameBracketSuffix.Groups[1].Value}";
}
@@ -510,7 +510,7 @@ public class ItemTplGenerator(
}
// If the item has a bracketed section at the end of its name, use that
if (itemName.RegexMatch("\\((.+?)\\)$", out var itemNameBracker))
if (itemName.RegexMatch(@"\((.+?)\)$", out var itemNameBracker))
{
return itemNameBracker.Groups[1].Value;
}