Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into testing-redux

This commit is contained in:
Dev 2023-11-05 20:25:15 +00:00
commit 5656384c8f

View File

@ -360,13 +360,19 @@ class ItemHelper
*/
protected getRepairableItemQualityValue(itemDetails: ITemplateItem, repairable: Repairable, item: Item): number
{
// Edge case, max durability is below durability
if (repairable.Durability < repairable.MaxDurability)
{
this.logger.warning(`Max durability: ${repairable.MaxDurability} for item id: ${item._id} was below Durability: ${repairable.Durability}, adjusting values to match`);
repairable.MaxDurability = repairable.Durability;
}
// Armor
if (itemDetails._props.armorClass)
{
return repairable.Durability / itemDetails._props.MaxDurability;
}
else
{
// Weapon
// Get max dura from props, if it isnt there use repairable max dura value
const maxDurability = (itemDetails._props.MaxDurability)
@ -383,7 +389,6 @@ class ItemHelper
return Math.sqrt(durability);
}
}
/**
* Recursive function that looks at every item from parameter and gets their childrens Ids + includes parent item in results