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/Services/FenceService.cs
+91 -334
View File
@@ -204,9 +204,7 @@ public class FenceService(
{
if (itemHelper.IsOfBaseclass(item.Template, BaseClasses.AMMO))
{
total +=
handbookHelper.GetTemplatePrice(item.Template)
* (item.Upd?.StackObjectsCount ?? 1);
total += handbookHelper.GetTemplatePrice(item.Template) * (item.Upd?.StackObjectsCount ?? 1);
}
}
@@ -219,11 +217,7 @@ public class FenceService(
/// <param name="assort"> (clone) Assort that contains items with prices to adjust </param>
/// <param name="itemMultiplier"> Multiplier to use on items </param>
/// <param name="presetMultiplier"> Multiplier to use on presets </param>
protected void AdjustAssortItemPricesByConfigMultiplier(
TraderAssort assort,
double itemMultiplier,
double presetMultiplier
)
protected void AdjustAssortItemPricesByConfigMultiplier(TraderAssort assort, double itemMultiplier, double presetMultiplier)
{
// Only get root items
foreach (var item in assort.Items.Where(x => x.SlotId is "hideout"))
@@ -266,18 +260,11 @@ public class FenceService(
/// <param name="assort"> Assort to be modified </param>
/// <param name="modifier"> Value to multiply item price by </param>
/// <param name="presetModifier"> Value to multiply preset price by </param>
protected void AdjustItemPriceByModifier(
Item item,
TraderAssort assort,
double modifier,
double presetModifier
)
protected void AdjustItemPriceByModifier(Item item, TraderAssort assort, double modifier, double presetModifier)
{
if (assort?.BarterScheme is null)
{
logger.Warning(
$"Unable to adjust item: {item.Id} on assort as it lacks a barterScheme object"
);
logger.Warning($"Unable to adjust item: {item.Id} on assort as it lacks a barterScheme object");
return;
}
@@ -300,9 +287,7 @@ public class FenceService(
}
else
{
logger.Warning(
$"adjustItemPriceByModifier() - no action taken for item: {item.Template}"
);
logger.Warning($"adjustItemPriceByModifier() - no action taken for item: {item.Template}");
}
}
@@ -330,27 +315,19 @@ public class FenceService(
public void PerformPartialRefresh()
{
var itemCountToReplace = GetCountOfItemsToReplace(traderConfig.Fence.AssortSize);
var discountItemCountToReplace = GetCountOfItemsToReplace(
traderConfig.Fence.DiscountOptions.AssortSize
);
var discountItemCountToReplace = GetCountOfItemsToReplace(traderConfig.Fence.DiscountOptions.AssortSize);
// Simulate players buying items
DeleteRandomAssorts(itemCountToReplace, fenceAssort);
DeleteRandomAssorts(discountItemCountToReplace, fenceDiscountAssort);
var normalItemCountsToGenerate = GetItemCountsToGenerate(
fenceAssort.Items,
desiredAssortCounts.Normal
);
var normalItemCountsToGenerate = GetItemCountsToGenerate(fenceAssort.Items, desiredAssortCounts.Normal);
var newItems = CreateAssorts(normalItemCountsToGenerate, 1);
// Push newly generated assorts into existing data
UpdateFenceAssorts(newItems, fenceAssort);
var discountItemCountsToGenerate = GetItemCountsToGenerate(
fenceDiscountAssort.Items,
desiredAssortCounts.Discount
);
var discountItemCountsToGenerate = GetItemCountsToGenerate(fenceDiscountAssort.Items, desiredAssortCounts.Discount);
var newDiscountItems = CreateAssorts(discountItemCountsToGenerate, 2);
// Push newly generated discount assorts into existing data
@@ -371,17 +348,13 @@ public class FenceService(
// Add new barter items to fence assorts discounted barter scheme
foreach (var barterItemKey in newDiscountItems.BarterScheme.Keys)
{
fenceDiscountAssort.BarterScheme[barterItemKey] = newDiscountItems.BarterScheme[
barterItemKey
];
fenceDiscountAssort.BarterScheme[barterItemKey] = newDiscountItems.BarterScheme[barterItemKey];
}
// Add loyalty items to fence discount assorts loyalty object
foreach (var loyaltyItemKey in newDiscountItems.LoyalLevelItems.Keys)
{
fenceDiscountAssort.LoyalLevelItems[loyaltyItemKey] = newDiscountItems.LoyalLevelItems[
loyaltyItemKey
];
fenceDiscountAssort.LoyalLevelItems[loyaltyItemKey] = newDiscountItems.LoyalLevelItems[loyaltyItemKey];
}
// Reset the clock
@@ -393,10 +366,7 @@ public class FenceService(
/// </summary>
/// <param name="newFenceAssorts"> Assorts to fold into existing fence assorts </param>
/// <param name="existingFenceAssorts"> Current fence assorts, new assorts will be added to </param>
protected void UpdateFenceAssorts(
CreateFenceAssortsResult newFenceAssorts,
TraderAssort existingFenceAssorts
)
protected void UpdateFenceAssorts(CreateFenceAssortsResult newFenceAssorts, TraderAssort existingFenceAssorts)
{
foreach (var itemWithChildren in newFenceAssorts.SptItems)
{
@@ -405,9 +375,7 @@ public class FenceService(
if (newRootItem == null)
{
var firstItem = itemWithChildren.FirstOrDefault(x => x != null);
logger.Error(
$"Unable to process fence assort as root item is missing: {firstItem?.Template}, skipping"
);
logger.Error($"Unable to process fence assort as root item is missing: {firstItem?.Template}, skipping");
continue;
}
@@ -419,16 +387,8 @@ public class FenceService(
// Check if same type of item exists + its on list of item types to always stack
if (existingRootItem != null && ItemInPreventDupeCategoryList(newRootItem.Template))
{
var existingFullItemTree = existingFenceAssorts.Items.GetItemWithChildren(
existingRootItem.Id
);
if (
itemHelper.IsSameItems(
itemWithChildren,
existingFullItemTree,
fenceItemUpdCompareProperties
)
)
var existingFullItemTree = existingFenceAssorts.Items.GetItemWithChildren(existingRootItem.Id);
if (itemHelper.IsSameItems(itemWithChildren, existingFullItemTree, fenceItemUpdCompareProperties))
{
// Guard against a missing stack count
if (existingRootItem.Upd?.StackObjectsCount == null)
@@ -438,8 +398,7 @@ public class FenceService(
}
// Merge new items count into existing, don't add new loyalty/barter data as it already exists
existingRootItem.Upd.StackObjectsCount +=
newRootItem?.Upd?.StackObjectsCount ?? 1;
existingRootItem.Upd.StackObjectsCount += newRootItem?.Upd?.StackObjectsCount ?? 1;
continue;
}
@@ -450,12 +409,8 @@ public class FenceService(
// New assort to be added to existing assorts
existingFenceAssorts.Items.AddRange(itemWithChildren);
existingFenceAssorts.BarterScheme[newRootItem.Id] = newFenceAssorts.BarterScheme[
newRootItem.Id
];
existingFenceAssorts.LoyalLevelItems[newRootItem.Id] = newFenceAssorts.LoyalLevelItems[
newRootItem.Id
];
existingFenceAssorts.BarterScheme[newRootItem.Id] = newFenceAssorts.BarterScheme[newRootItem.Id];
existingFenceAssorts.LoyalLevelItems[newRootItem.Id] = newFenceAssorts.LoyalLevelItems[newRootItem.Id];
}
}
@@ -464,8 +419,7 @@ public class FenceService(
/// </summary>
protected void IncrementPartialRefreshTime()
{
nextPartialRefreshTimestamp =
timeUtil.GetTimeStamp() + traderConfig.Fence.PartialRefreshTimeSeconds;
nextPartialRefreshTimestamp = timeUtil.GetTimeStamp() + traderConfig.Fence.PartialRefreshTimeSeconds;
}
/// <summary>
@@ -474,10 +428,7 @@ public class FenceService(
/// <param name="assortItems"> Current assorts after items have been removed </param>
/// <param name="generationValues"> Base counts assorts should be adjusted to </param>
/// <returns> GenerationAssortValues object with adjustments needed to reach desired state </returns>
protected GenerationAssortValues GetItemCountsToGenerate(
IEnumerable<Item> assortItems,
GenerationAssortValues generationValues
)
protected GenerationAssortValues GetItemCountsToGenerate(IEnumerable<Item> assortItems, GenerationAssortValues generationValues)
{
var allRootItems = assortItems.Where(item => item.SlotId == "hideout");
var rootPresetItems = allRootItems.Where(item => item?.Upd?.SptPresetId != null);
@@ -485,8 +436,7 @@ public class FenceService(
// Get count of weapons
var currentWeaponPresetCount = rootPresetItems.Aggregate(
0,
(count, item) =>
itemHelper.IsOfBaseclass(item.Template, BaseClasses.WEAPON) ? count + 1 : count
(count, item) => itemHelper.IsOfBaseclass(item.Template, BaseClasses.WEAPON) ? count + 1 : count
);
// Get count of equipment
@@ -496,22 +446,12 @@ public class FenceService(
);
// Normal item count is total count minus weapon + armor count
var nonPresetItemAssortCount =
allRootItems.Count() - (currentWeaponPresetCount + currentEquipmentPresetCount);
var nonPresetItemAssortCount = allRootItems.Count() - (currentWeaponPresetCount + currentEquipmentPresetCount);
// Get counts of items to generate, never var values fall below 0
var itemCountToGenerate = Math.Max(
generationValues.Item.Value - nonPresetItemAssortCount,
0
);
var weaponCountToGenerate = Math.Max(
generationValues.WeaponPreset.Value - currentWeaponPresetCount,
0
);
var equipmentCountToGenerate = Math.Max(
generationValues.EquipmentPreset.Value - currentEquipmentPresetCount,
0
);
var itemCountToGenerate = Math.Max(generationValues.Item.Value - nonPresetItemAssortCount, 0);
var weaponCountToGenerate = Math.Max(generationValues.WeaponPreset.Value - currentWeaponPresetCount, 0);
var equipmentCountToGenerate = Math.Max(generationValues.EquipmentPreset.Value - currentEquipmentPresetCount, 0);
return new GenerationAssortValues
{
@@ -562,9 +502,7 @@ public class FenceService(
{
if (rootItemToAdjust.Upd == null)
{
logger.Warning(
$"Fence Item: {rootItemToAdjust.Template} lacks a Upd object, adding"
);
logger.Warning($"Fence Item: {rootItemToAdjust.Template} lacks a Upd object, adding");
rootItemToAdjust.Upd = new Upd();
}
@@ -596,8 +534,7 @@ public class FenceService(
/// <returns> Rounded int of items to replace </returns>
protected int GetCountOfItemsToReplace(int totalItemCount)
{
return (int)
Math.Round(totalItemCount * (traderConfig.Fence.PartialRefreshChangePercent / 100));
return (int)Math.Round(totalItemCount * (traderConfig.Fence.PartialRefreshChangePercent / 100));
}
/// <summary>
@@ -728,10 +665,7 @@ public class FenceService(
/// <param name="itemCounts"> Number of items to generate per type (Item, WeaponPreset, EquipmentPreset) </param>
/// <param name="loyaltyLevel"> Loyalty level to set new item to </param>
/// <returns> CreateFenceAssortResult object </returns>
protected CreateFenceAssortsResult CreateAssorts(
GenerationAssortValues itemCounts,
int loyaltyLevel
)
protected CreateFenceAssortsResult CreateAssorts(GenerationAssortValues itemCounts, int loyaltyLevel)
{
var result = new CreateFenceAssortsResult
{
@@ -745,24 +679,12 @@ public class FenceService(
if (itemCounts.Item > 0)
{
AddItemAssorts(
itemCounts.Item,
result,
baseFenceAssortClone,
itemTypeLimitCounts,
loyaltyLevel
);
AddItemAssorts(itemCounts.Item, result, baseFenceAssortClone, itemTypeLimitCounts, loyaltyLevel);
}
if (itemCounts.WeaponPreset > 0 || itemCounts.EquipmentPreset > 0)
{
AddPresetsToAssort(
itemCounts.WeaponPreset,
itemCounts.EquipmentPreset,
result,
baseFenceAssortClone,
loyaltyLevel
);
AddPresetsToAssort(itemCounts.WeaponPreset, itemCounts.EquipmentPreset, result, baseFenceAssortClone, loyaltyLevel);
}
return result;
@@ -787,8 +709,7 @@ public class FenceService(
var priceLimits = traderConfig.Fence.ItemCategoryRoublePriceLimit;
var assortRootItems = baseFenceAssortClone
.Items.Where(item =>
string.Equals(item.ParentId, "hideout", StringComparison.OrdinalIgnoreCase)
&& item.Upd?.SptPresetId == null
string.Equals(item.ParentId, "hideout", StringComparison.OrdinalIgnoreCase) && item.Upd?.SptPresetId == null
)
.ToList();
@@ -813,10 +734,7 @@ public class FenceService(
continue;
}
var itemLimitCount = GetMatchingItemLimit(
itemTypeLimits,
chosenBaseAssortRoot.Template
);
var itemLimitCount = GetMatchingItemLimit(itemTypeLimits, chosenBaseAssortRoot.Template);
if (itemLimitCount?.current >= itemLimitCount?.max)
{
// Skip adding item as assort as limit reached, try another item
@@ -829,10 +747,7 @@ public class FenceService(
}
var price = baseFenceAssortClone.BarterScheme?[chosenBaseAssortRoot.Id][0][0].Count;
if (
price is 0 or 100
|| (price == 1 && !presetHelper.IsPreset(chosenBaseAssortRoot.Id))
)
if (price is 0 or 100 || (price == 1 && !presetHelper.IsPreset(chosenBaseAssortRoot.Id)))
{
// Don't allow "special" items / presets, try another item
i--;
@@ -843,10 +758,7 @@ public class FenceService(
}
var itemDbDetails = itemHelper.GetItem(chosenBaseAssortRoot.Template).Value;
if (
priceLimits.ContainsKey(itemDbDetails.Parent)
&& price > priceLimits[itemDbDetails.Parent]
)
if (priceLimits.ContainsKey(itemDbDetails.Parent) && price > priceLimits[itemDbDetails.Parent])
{
// Too expensive for fence, try another item
i--;
@@ -865,8 +777,7 @@ public class FenceService(
// Filter to only 1 root item + all children
var childItemsAndSingleRoot = baseFenceAssortClone.Items.Where(item =>
!string.Equals(item.ParentId, "hideout", StringComparison.Ordinal)
|| item.Id == chosenBaseAssortRoot.Id
!string.Equals(item.ParentId, "hideout", StringComparison.Ordinal) || item.Id == chosenBaseAssortRoot.Id
);
// MUST randomise Ids as its possible to add the same base fence assort twice = duplicate IDs = dead client
@@ -882,23 +793,15 @@ public class FenceService(
rootItemBeingAdded.Upd.StackObjectsCount = GetSingleItemStackCount(itemDbDetails);
// Only randomise Upd values for single stacks
var isSingleStack =
Math.Abs((rootItemBeingAdded.Upd?.StackObjectsCount ?? 0) - 1) < 0.1;
var isSingleStack = Math.Abs((rootItemBeingAdded.Upd?.StackObjectsCount ?? 0) - 1) < 0.1;
if (isSingleStack)
{
RandomiseItemUpdProperties(itemDbDetails, rootItemBeingAdded);
}
// Skip items already in the assort if it exists in the 'prevent duplicate' list
var existingItemThatMatches = GetMatchingItem(
rootItemBeingAdded,
itemDbDetails,
assorts.SptItems
);
if (
existingItemThatMatches != null
&& ItemShouldBeForceStacked(existingItemThatMatches, itemDbDetails)
)
var existingItemThatMatches = GetMatchingItem(rootItemBeingAdded, itemDbDetails, assorts.SptItems);
if (existingItemThatMatches != null && ItemShouldBeForceStacked(existingItemThatMatches, itemDbDetails))
{
// Decrement loop counter so another items gets added
i--;
@@ -915,9 +818,7 @@ public class FenceService(
assorts.SptItems.Add(desiredAssortItemAndChildrenClone);
assorts.BarterScheme[rootItemBeingAdded.Id] = _cloner.Clone(
baseFenceAssortClone.BarterScheme[chosenBaseAssortRoot.Id]
);
assorts.BarterScheme[rootItemBeingAdded.Id] = _cloner.Clone(baseFenceAssortClone.BarterScheme[chosenBaseAssortRoot.Id]);
// Only adjust item price by quality for solo items, never multi-stack
if (isSingleStack)
@@ -937,11 +838,7 @@ public class FenceService(
/// <param name="itemDbDetails"> DB details of matching item </param>
/// <param name="itemsWithChildren"> Items to search through </param>
/// <returns> Matching assort item </returns>
protected Item? GetMatchingItem(
Item rootItemBeingAdded,
TemplateItem itemDbDetails,
IEnumerable<List<Item>> itemsWithChildren
)
protected Item? GetMatchingItem(Item rootItemBeingAdded, TemplateItem itemDbDetails, IEnumerable<List<Item>> itemsWithChildren)
{
// Get matching root items
var matchingItems = itemsWithChildren
@@ -959,15 +856,9 @@ public class FenceService(
return null;
}
var isMedical = itemHelper.IsOfBaseclasses(
rootItemBeingAdded.Template,
[BaseClasses.MEDICAL, BaseClasses.MED_KIT]
);
var isMedical = itemHelper.IsOfBaseclasses(rootItemBeingAdded.Template, [BaseClasses.MEDICAL, BaseClasses.MED_KIT]);
var isGearAndHasSlots =
itemHelper.IsOfBaseclasses(
rootItemBeingAdded.Template,
[BaseClasses.ARMORED_EQUIPMENT, BaseClasses.SEARCHABLE_ITEM]
)
itemHelper.IsOfBaseclasses(rootItemBeingAdded.Template, [BaseClasses.ARMORED_EQUIPMENT, BaseClasses.SEARCHABLE_ITEM])
&& itemDbDetails?.Properties?.Slots is not null
&& itemDbDetails.Properties.Slots.Any();
@@ -980,10 +871,7 @@ public class FenceService(
// Items have sub properties that need to be checked against
foreach (var item in matchingItems)
{
if (
isMedical
&& rootItemBeingAdded.Upd?.MedKit?.HpResource == item.Upd?.MedKit?.HpResource
)
if (isMedical && rootItemBeingAdded.Upd?.MedKit?.HpResource == item.Upd?.MedKit?.HpResource)
// e.g. bandages with multiple use
// Both undefined === both max resource left
{
@@ -994,8 +882,7 @@ public class FenceService(
if (
isGearAndHasSlots
&& rootItemBeingAdded.Upd.Repairable?.Durability == item.Upd.Repairable?.Durability
&& rootItemBeingAdded.Upd.Repairable?.MaxDurability
== item.Upd.Repairable?.MaxDurability
&& rootItemBeingAdded.Upd.Repairable?.MaxDurability == item.Upd.Repairable?.MaxDurability
)
{
return item;
@@ -1068,23 +955,15 @@ public class FenceService(
}
// Adjust price based on durability
if (
itemRoot.Upd?.Repairable != null
|| itemHelper.IsOfBaseclass(itemRoot.Template, BaseClasses.KEY_MECHANICAL)
)
if (itemRoot.Upd?.Repairable != null || itemHelper.IsOfBaseclass(itemRoot.Template, BaseClasses.KEY_MECHANICAL))
{
var itemQualityModifier = itemHelper.GetItemQualityModifier(itemRoot);
var basePrice = barterSchemes[itemRoot.Id][0][0].Count;
barterSchemes[itemRoot.Id][0][0].Count = Math.Round(
(double)basePrice * itemQualityModifier
);
barterSchemes[itemRoot.Id][0][0].Count = Math.Round((double)basePrice * itemQualityModifier);
}
}
protected (int current, int max)? GetMatchingItemLimit(
Dictionary<MongoId, (int current, int max)> itemTypeLimits,
MongoId itemTpl
)
protected (int current, int max)? GetMatchingItemLimit(Dictionary<MongoId, (int current, int max)> itemTypeLimits, MongoId itemTpl)
{
foreach (var baseTypeKey in itemTypeLimits.Keys)
{
@@ -1127,9 +1006,7 @@ public class FenceService(
var randomPresetRoot = randomUtil.GetArrayValue(weaponPresetRootItems);
var rootItemDb = itemHelper.GetItem(randomPresetRoot.Template).Value;
var presetWithChildrenClone = _cloner.Clone(
baseFenceAssort.Items.GetItemWithChildren(randomPresetRoot.Id)
);
var presetWithChildrenClone = _cloner.Clone(baseFenceAssort.Items.GetItemWithChildren(randomPresetRoot.Id));
RandomiseItemUpdProperties(rootItemDb, presetWithChildrenClone[0]);
@@ -1140,12 +1017,7 @@ public class FenceService(
var presetPrice =
handbookHelper.GetTemplatePriceForItems(presetWithChildrenClone)
* itemHelper.GetItemQualityModifierForItems(presetWithChildrenClone);
if (
traderConfig.Fence.ItemCategoryRoublePriceLimit.TryGetValue(
rootItemDb.Parent,
out var priceLimitRouble
)
)
if (traderConfig.Fence.ItemCategoryRoublePriceLimit.TryGetValue(rootItemDb.Parent, out var priceLimitRouble))
{
if (presetPrice > priceLimitRouble)
// Too expensive, try again
@@ -1164,10 +1036,7 @@ public class FenceService(
}
// MUST randomise Ids as its possible to add the same base fence assort twice = duplicate IDs = dead client
itemHelper.ReparentItemAndChildren(
presetWithChildrenClone[0],
presetWithChildrenClone
);
itemHelper.ReparentItemAndChildren(presetWithChildrenClone[0], presetWithChildrenClone);
presetWithChildrenClone.RemapRootItemId();
// Remapping IDs causes parentId to be altered, fix
@@ -1179,13 +1048,7 @@ public class FenceService(
// Must be careful to use correct id as the item has had its IDs regenerated
assorts.BarterScheme[presetWithChildrenClone[0].Id] =
[
[
new BarterScheme
{
Template = Money.ROUBLES,
Count = Math.Round(presetPrice),
},
],
[new BarterScheme { Template = Money.ROUBLES, Count = Math.Round(presetPrice) }],
];
assorts.LoyalLevelItems[presetWithChildrenClone[0].Id] = loyaltyLevel;
@@ -1207,9 +1070,7 @@ public class FenceService(
var randomPresetRoot = randomUtil.GetArrayValue(equipmentPresetRootItems);
var rootItemDb = itemHelper.GetItem(randomPresetRoot.Template).Value;
var presetWithChildrenClone = _cloner.Clone(
baseFenceAssort.Items.GetItemWithChildren(randomPresetRoot.Id)
);
var presetWithChildrenClone = _cloner.Clone(baseFenceAssort.Items.GetItemWithChildren(randomPresetRoot.Id));
// Need to add mods to armors so they don't show as red in the trade screen
if (itemHelper.ItemRequiresSoftInserts(randomPresetRoot.Template))
@@ -1220,9 +1081,7 @@ public class FenceService(
RemoveRandomModsOfItem(presetWithChildrenClone);
// Check chosen item is below price cap
var priceLimitRouble = traderConfig.Fence.ItemCategoryRoublePriceLimit[
rootItemDb.Parent
];
var priceLimitRouble = traderConfig.Fence.ItemCategoryRoublePriceLimit[rootItemDb.Parent];
var itemPrice =
handbookHelper.GetTemplatePriceForItems(presetWithChildrenClone)
* itemHelper.GetItemQualityModifierForItems(presetWithChildrenClone);
@@ -1277,9 +1136,7 @@ public class FenceService(
}
// Check for and adjust plate durability values
var plateSlots = itemDbDetails.Properties.Slots?.Where(slot =>
itemHelper.IsRemovablePlateSlot(slot.Name)
);
var plateSlots = itemDbDetails.Properties.Slots?.Where(slot => itemHelper.IsRemovablePlateSlot(slot.Name));
if (plateSlots is not null && plateSlots.Any())
{
RandomiseArmorInsertsDurabilities(plateSlots, armor);
@@ -1291,21 +1148,13 @@ public class FenceService(
/// </summary>
/// <param name="softInsertSlots"> Slots of items to randomise </param>
/// <param name="armorItemAndMods"> Array of armor + inserts to get items from </param>
protected void RandomiseArmorSoftInsertDurabilities(
IEnumerable<Slot> softInsertSlots,
IEnumerable<Item> armorItemAndMods
)
protected void RandomiseArmorSoftInsertDurabilities(IEnumerable<Slot> softInsertSlots, IEnumerable<Item> armorItemAndMods)
{
foreach (var requiredSlot in softInsertSlots)
{
var modItemDbDetails = itemHelper
.GetItem(requiredSlot.Props.Filters.First().Plate.Value)
.Value;
var modItemDbDetails = itemHelper.GetItem(requiredSlot.Props.Filters.First().Plate.Value).Value;
var durabilityValues = GetRandomisedArmorDurabilityValues(
modItemDbDetails,
traderConfig.Fence.ArmorMaxDurabilityPercentMinMax
);
var durabilityValues = GetRandomisedArmorDurabilityValues(modItemDbDetails, traderConfig.Fence.ArmorMaxDurabilityPercentMinMax);
var plateTpl = requiredSlot.Props.Filters.First().Plate ?? string.Empty; // "Plate" property appears to be the 'default' item for slot
if (plateTpl.IsEmpty())
// Some bsg plate properties are empty, skip mod
@@ -1315,11 +1164,7 @@ public class FenceService(
// Find items mod to apply dura changes to
var modItemToAdjust = armorItemAndMods.FirstOrDefault(mod =>
string.Equals(
mod.SlotId,
requiredSlot.Name.ToLowerInvariant(),
StringComparison.OrdinalIgnoreCase
)
string.Equals(mod.SlotId, requiredSlot.Name.ToLowerInvariant(), StringComparison.OrdinalIgnoreCase)
);
itemHelper.AddUpdObjectToItem(modItemToAdjust);
@@ -1339,15 +1184,11 @@ public class FenceService(
randomUtil.GetChance100(25)
&& modItemToAdjust.ParentId == BaseClasses.ARMORED_EQUIPMENT
&& modItemToAdjust.SlotId == "mod_equipment_000"
&& modItemToAdjust.Upd.Repairable.Durability
< modItemDbDetails.Properties.MaxDurability
&& modItemToAdjust.Upd.Repairable.Durability < modItemDbDetails.Properties.MaxDurability
)
// Is damaged
{
modItemToAdjust.Upd.FaceShield = new UpdFaceShield
{
Hits = randomUtil.GetInt(1, 3),
};
modItemToAdjust.Upd.FaceShield = new UpdFaceShield { Hits = randomUtil.GetInt(1, 3) };
}
}
}
@@ -1358,10 +1199,7 @@ public class FenceService(
/// </summary>
/// <param name="plateSlots"> Slots of items to randomise </param>
/// <param name="armorItemAndMods"> Array of armor + inserts to get items from </param>
protected void RandomiseArmorInsertsDurabilities(
IEnumerable<Slot> plateSlots,
IEnumerable<Item> armorItemAndMods
)
protected void RandomiseArmorInsertsDurabilities(IEnumerable<Slot> plateSlots, IEnumerable<Item> armorItemAndMods)
{
foreach (var plateSlot in plateSlots)
{
@@ -1382,20 +1220,13 @@ public class FenceService(
{
// Remove plate from armor
armorItemAndMods = armorItemAndMods.Where(item =>
!string.Equals(
item.SlotId,
plateSlot.Name,
StringComparison.CurrentCultureIgnoreCase
)
!string.Equals(item.SlotId, plateSlot.Name, StringComparison.CurrentCultureIgnoreCase)
);
continue;
}
var durabilityValues = GetRandomisedArmorDurabilityValues(
modItemDbDetails,
traderConfig.Fence.ArmorMaxDurabilityPercentMinMax
);
var durabilityValues = GetRandomisedArmorDurabilityValues(modItemDbDetails, traderConfig.Fence.ArmorMaxDurabilityPercentMinMax);
// Find items mod to apply durability changes to
var modItemToAdjust = armorItemAndMods.FirstOrDefault(mod =>
@@ -1445,30 +1276,17 @@ public class FenceService(
// No override, use stack max size from item db
return itemDbDetails.Properties.StackMaxSize == 1
? 1
: randomUtil.GetInt(
itemDbDetails.Properties.StackMinRandom.Value,
itemDbDetails.Properties.StackMaxRandom.Value
);
: randomUtil.GetInt(itemDbDetails.Properties.StackMinRandom.Value, itemDbDetails.Properties.StackMaxRandom.Value);
}
// Check for override in config, use values if exists
if (
traderConfig.Fence.ItemStackSizeOverrideMinMax.TryGetValue(
itemDbDetails.Id,
out overrideValues
)
)
if (traderConfig.Fence.ItemStackSizeOverrideMinMax.TryGetValue(itemDbDetails.Id, out overrideValues))
{
return randomUtil.GetInt(overrideValues.Min, overrideValues.Max);
}
// Check for parent override
if (
traderConfig.Fence.ItemStackSizeOverrideMinMax.TryGetValue(
itemDbDetails.Parent,
out overrideValues
)
)
if (traderConfig.Fence.ItemStackSizeOverrideMinMax.TryGetValue(itemDbDetails.Parent, out overrideValues))
{
return randomUtil.GetInt(overrideValues.Min, overrideValues.Max);
}
@@ -1521,10 +1339,7 @@ public class FenceService(
protected bool PresetModItemWillBeRemoved(Item weaponMod, HashSet<MongoId> itemsBeingDeleted)
{
var slotIdsThatCanFail = traderConfig.Fence.PresetSlotsToRemoveChancePercent;
if (
!slotIdsThatCanFail.TryGetValue(weaponMod.SlotId, out var removalChance)
|| removalChance == 0.0
)
if (!slotIdsThatCanFail.TryGetValue(weaponMod.SlotId, out var removalChance) || removalChance == 0.0)
{
return false;
}
@@ -1544,22 +1359,14 @@ public class FenceService(
{
if (itemDetails.Properties == null)
{
logger.Error(
$"Item {itemDetails.Name} lacks a _props field, unable to randomise item: {itemToAdjust.Id}"
);
logger.Error($"Item {itemDetails.Name} lacks a _props field, unable to randomise item: {itemToAdjust.Id}");
return;
}
// Randomise hp resource of med items
if (
itemDetails.Properties.MaxHpResource != null
&& (itemDetails.Properties.MaxHpResource ?? 0) > 0
)
if (itemDetails.Properties.MaxHpResource != null && (itemDetails.Properties.MaxHpResource ?? 0) > 0)
{
itemToAdjust.Upd.MedKit = new UpdMedKit
{
HpResource = randomUtil.GetInt(1, itemDetails.Properties.MaxHpResource.Value),
};
itemToAdjust.Upd.MedKit = new UpdMedKit { HpResource = randomUtil.GetInt(1, itemDetails.Properties.MaxHpResource.Value) };
}
// Randomise armor durability
@@ -1572,15 +1379,8 @@ public class FenceService(
&& itemDetails.Properties.MaxDurability.GetValueOrDefault(0) > 0
)
{
var values = GetRandomisedArmorDurabilityValues(
itemDetails,
traderConfig.Fence.ArmorMaxDurabilityPercentMinMax
);
itemToAdjust.Upd.Repairable = new UpdRepairable
{
Durability = values.Durability,
MaxDurability = values.MaxDurability,
};
var values = GetRandomisedArmorDurabilityValues(itemDetails, traderConfig.Fence.ArmorMaxDurabilityPercentMinMax);
itemToAdjust.Upd.Repairable = new UpdRepairable { Durability = values.Durability, MaxDurability = values.MaxDurability };
return;
}
@@ -1589,26 +1389,15 @@ public class FenceService(
if (itemHelper.IsOfBaseclass(itemDetails.Id, BaseClasses.WEAPON))
{
var weaponDurabilityLimits = traderConfig.Fence.WeaponDurabilityPercentMinMax;
var maxDuraMin =
weaponDurabilityLimits.Max.Min / 100 * itemDetails.Properties.MaxDurability;
var maxDuraMax =
weaponDurabilityLimits.Max.Max / 100 * itemDetails.Properties.MaxDurability;
var maxDuraMin = weaponDurabilityLimits.Max.Min / 100 * itemDetails.Properties.MaxDurability;
var maxDuraMax = weaponDurabilityLimits.Max.Max / 100 * itemDetails.Properties.MaxDurability;
var chosenMaxDurability = randomUtil.GetDouble(maxDuraMin.Value, maxDuraMax.Value);
var currentDuraMin =
weaponDurabilityLimits.Current.Min / 100 * itemDetails.Properties.MaxDurability;
var currentDuraMax =
weaponDurabilityLimits.Current.Max / 100 * itemDetails.Properties.MaxDurability;
var currentDurability = Math.Min(
randomUtil.GetDouble(currentDuraMin.Value, currentDuraMax.Value),
chosenMaxDurability
);
var currentDuraMin = weaponDurabilityLimits.Current.Min / 100 * itemDetails.Properties.MaxDurability;
var currentDuraMax = weaponDurabilityLimits.Current.Max / 100 * itemDetails.Properties.MaxDurability;
var currentDurability = Math.Min(randomUtil.GetDouble(currentDuraMin.Value, currentDuraMax.Value), chosenMaxDurability);
itemToAdjust.Upd.Repairable = new UpdRepairable
{
Durability = currentDurability,
MaxDurability = chosenMaxDurability,
};
itemToAdjust.Upd.Repairable = new UpdRepairable { Durability = currentDurability, MaxDurability = chosenMaxDurability };
return;
}
@@ -1624,17 +1413,11 @@ public class FenceService(
}
// Mechanical key + has limited uses
if (
itemHelper.IsOfBaseclass(itemDetails.Id, BaseClasses.KEY_MECHANICAL)
&& (itemDetails.Properties.MaximumNumberOfUsage ?? 0) > 1
)
if (itemHelper.IsOfBaseclass(itemDetails.Id, BaseClasses.KEY_MECHANICAL) && (itemDetails.Properties.MaximumNumberOfUsage ?? 0) > 1)
{
itemToAdjust.Upd.Key = new UpdKey
{
NumberOfUsages = randomUtil.GetInt(
0,
itemDetails.Properties.MaximumNumberOfUsage.Value - 1
),
NumberOfUsages = randomUtil.GetInt(0, itemDetails.Properties.MaximumNumberOfUsage.Value - 1),
};
return;
@@ -1646,11 +1429,7 @@ public class FenceService(
var resourceMax = itemDetails.Properties.MaxResource;
var resourceCurrent = randomUtil.GetInt(1, itemDetails.Properties.MaxResource.Value);
itemToAdjust.Upd.Resource = new UpdResource
{
Value = resourceMax - resourceCurrent,
UnitsConsumed = resourceCurrent,
};
itemToAdjust.Upd.Resource = new UpdResource { Value = resourceMax - resourceCurrent, UnitsConsumed = resourceCurrent };
}
}
@@ -1660,31 +1439,17 @@ public class FenceService(
/// <param name="itemDetails"> Item to create values for </param>
/// <param name="equipmentDurabilityLimits"> Max durability percent min/max values </param>
/// <returns> Durability + MaxDurability values </returns>
protected UpdRepairable GetRandomisedArmorDurabilityValues(
TemplateItem itemDetails,
ItemDurabilityCurrentMax equipmentDurabilityLimits
)
protected UpdRepairable GetRandomisedArmorDurabilityValues(TemplateItem itemDetails, ItemDurabilityCurrentMax equipmentDurabilityLimits)
{
var maxDuraMin =
equipmentDurabilityLimits.Max.Min / 100 * itemDetails.Properties.MaxDurability;
var maxDuraMax =
equipmentDurabilityLimits.Max.Max / 100 * itemDetails.Properties.MaxDurability;
var maxDuraMin = equipmentDurabilityLimits.Max.Min / 100 * itemDetails.Properties.MaxDurability;
var maxDuraMax = equipmentDurabilityLimits.Max.Max / 100 * itemDetails.Properties.MaxDurability;
var chosenMaxDurability = randomUtil.GetDouble(maxDuraMin.Value, maxDuraMax.Value);
var currentDuraMin =
equipmentDurabilityLimits.Current.Min / 100 * itemDetails.Properties.MaxDurability;
var currentDuraMax =
equipmentDurabilityLimits.Current.Max / 100 * itemDetails.Properties.MaxDurability;
var chosenCurrentDurability = Math.Min(
randomUtil.GetDouble(currentDuraMin.Value, currentDuraMax.Value),
chosenMaxDurability
);
var currentDuraMin = equipmentDurabilityLimits.Current.Min / 100 * itemDetails.Properties.MaxDurability;
var currentDuraMax = equipmentDurabilityLimits.Current.Max / 100 * itemDetails.Properties.MaxDurability;
var chosenCurrentDurability = Math.Min(randomUtil.GetDouble(currentDuraMin.Value, currentDuraMax.Value), chosenMaxDurability);
return new UpdRepairable
{
Durability = chosenCurrentDurability,
MaxDurability = chosenMaxDurability,
};
return new UpdRepairable { Durability = chosenCurrentDurability, MaxDurability = chosenMaxDurability };
}
/// <summary>
@@ -1692,9 +1457,7 @@ public class FenceService(
/// </summary>
/// <param name="limits"> Limits as defined in config </param>
/// <returns> Record, key: item tplId, value: current/max item count allowed </returns>
protected Dictionary<MongoId, (int current, int max)> InitItemLimitCounter(
Dictionary<MongoId, int> limits
)
protected Dictionary<MongoId, (int current, int max)> InitItemLimitCounter(Dictionary<MongoId, int> limits)
{
var itemTypeCounts = new Dictionary<MongoId, (int current, int max)>();
@@ -1723,9 +1486,7 @@ public class FenceService(
/// <returns> Refresh time in seconds </returns>
protected int GetFenceRefreshTime()
{
var fence = traderConfig
.UpdateTime.FirstOrDefault(x => x.TraderId == Traders.FENCE)
.Seconds;
var fence = traderConfig.UpdateTime.FirstOrDefault(x => x.TraderId == Traders.FENCE).Seconds;
return randomUtil.GetInt(fence.Min, fence.Max);
}
@@ -1776,9 +1537,7 @@ public class FenceService(
fenceAssortItem = fenceDiscountAssort.Items.FirstOrDefault(item => item.Id == assortId);
if (fenceAssortItem == null)
{
logger.Error(
localisationService.GetText("fence-unable_to_find_offer_by_id", assortId)
);
logger.Error(localisationService.GetText("fence-unable_to_find_offer_by_id", assortId));
return;
}
@@ -1810,9 +1569,7 @@ public class FenceService(
{
if (!assortItemsToRemoveFrom.Remove(itemToRemove))
{
logger.Warning(
$"unable to remove fence assort item: {itemToRemove.Id} tpl: {itemToRemove.Template}"
);
logger.Warning($"unable to remove fence assort item: {itemToRemove.Id} tpl: {itemToRemove.Template}");
}
//var indexToRemove = assortsToDeleteFrom.FindIndex(item => item.Id == itemToRemove.Id);