470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small cleanup of fence item removal code -reduce assort size to 140 to ensure its divisible by partialRefreshChangePercent without remainder

Browse Source
This commit is contained in:
Dev 2024-02-07 23:44:15 +00:00
parent 1a885e4eda
commit 7a33eea672
2 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project/assets/configs/trader.json
View File

@ -53,7 +53,7 @@
}, },
"partialRefreshTimeSeconds": 240, "partialRefreshTimeSeconds": 240,
"partialRefreshChangePercent": 15, "partialRefreshChangePercent": 15,
"assortSize": 150, "assortSize": 140,
"weaponPresetMinMax": { "weaponPresetMinMax": {
"min": 8, "min": 8,
"max": 15 "max": 15

38
project/src/services/FenceService.ts
View File

@ -231,18 +231,20 @@ export class FenceService
// Iterate x times to remove items (only remove if assort has items) // Iterate x times to remove items (only remove if assort has items)
if (this.fenceAssort?.items?.length > 0) if (this.fenceAssort?.items?.length > 0)
{ {
const rootItems = this.fenceAssort.items.filter((item) => item.slotId === "hideout");
for (let index = 0; index < itemCountToReplace; index++) for (let index = 0; index < itemCountToReplace; index++)
{ {
this.removeRandomItemFromAssorts(this.fenceAssort); this.removeRandomItemFromAssorts(this.fenceAssort, rootItems);
} }
} }
// Iterate x times to remove items (only remove if assort has items) // Iterate x times to remove items (only remove if assort has items)
if (this.fenceDiscountAssort?.items?.length > 0) if (this.fenceDiscountAssort?.items?.length > 0)
{ {
const rootItems = this.fenceDiscountAssort.items.filter((item) => item.slotId === "hideout");
for (let index = 0; index < discountItemCountToReplace; index++) for (let index = 0; index < discountItemCountToReplace; index++)
{ {
this.removeRandomItemFromAssorts(this.fenceDiscountAssort); this.removeRandomItemFromAssorts(this.fenceDiscountAssort, rootItems);
} }
} }
@ -314,40 +316,24 @@ export class FenceService
} }
/** /**
* Choose an item (not mod) at random and remove from assorts * Choose an item at random and remove it + mods from assorts
* @param assort Items to remove from * @param assort Items to remove from
* @param rootItems Assort root items to pick from to remove
*/ */
protected removeRandomItemFromAssorts(assort: ITraderAssort): void protected removeRandomItemFromAssorts(assort: ITraderAssort, rootItems: Item[]): void
{ {
// Only remove if assort has items const rootItemToRemove = this.randomUtil.getArrayValue(rootItems);
if (!assort.items.some((x) => x.slotId === "hideout"))
{
this.logger.warning(
"Unable to remove random assort from trader as they have no assorts with a slotid of `hideout`",
);
return; // Clean up any mods if item had them
} const itemWithChildren = this.itemHelper.findAndReturnChildrenAsItems(assort.items, rootItemToRemove._id);
let itemToRemove: Item;
while (!itemToRemove || itemToRemove.slotId !== "hideout")
{
itemToRemove = this.randomUtil.getArrayValue(assort.items);
}
const indexOfItemToRemove = assort.items.findIndex((item) => item._id === itemToRemove._id);
assort.items.splice(indexOfItemToRemove, 1);
// Clean up any mods if item removed was a weapon
const itemWithChildren = this.itemHelper.findAndReturnChildrenAsItems(assort.items, itemToRemove._id);
for (const itemToDelete of itemWithChildren) for (const itemToDelete of itemWithChildren)
{ {
// Delete item from assort items array // Delete item from assort items array
assort.items.splice(assort.items.indexOf(itemToDelete), 1); assort.items.splice(assort.items.indexOf(itemToDelete), 1);
} }
delete assort.barter_scheme[itemToRemove._id]; delete assort.barter_scheme[rootItemToRemove._id];
delete assort.loyal_level_items[itemToRemove._id]; delete assort.loyal_level_items[rootItemToRemove._id];
} }
/** /**