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

Rename variable for clarity

Browse Source
This commit is contained in:
Dev 2023-11-24 15:38:37 +00:00
parent 5a2f6b7581
commit 8c7b5da9ff
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
project/src/helpers/BotWeaponGeneratorHelper.ts
View File

@ -202,7 +202,7 @@ export class BotWeaponGeneratorHelper
// Container has no slots to hold items // Container has no slots to hold items
continue; continue;
} }
// Get x/y grid size of item
const itemSize = this.inventoryHelper.getItemSize(parentTpl, parentId, itemWithChildren); const itemSize = this.inventoryHelper.getItemSize(parentTpl, parentId, itemWithChildren);
for (const slotGrid of containerTemplate[1]._props.Grids) for (const slotGrid of containerTemplate[1]._props.Grids)
@ -219,13 +219,13 @@ export class BotWeaponGeneratorHelper
continue; continue;
} }
// Get all base level items in backpack // Get all root items in backpack
const containerItems = inventory.items.filter((i) => const existingContainerItems = inventory.items.filter((i) =>
i.parentId === container._id && i.slotId === slotGrid._name i.parentId === container._id && i.slotId === slotGrid._name
); );
// Get a copy of base level items we can iterate over // Get a copy of base level items we can iterate over
const containerItemsToCheck = containerItems.filter((x) => x.slotId === slotGrid._name); const containerItemsToCheck = existingContainerItems.filter((x) => x.slotId === slotGrid._name);
for (const item of containerItemsToCheck) for (const item of containerItemsToCheck)
{ {
// Look for children on items, insert into array if found // Look for children on items, insert into array if found
@ -233,7 +233,7 @@ export class BotWeaponGeneratorHelper
const itemWithChildren = this.itemHelper.findAndReturnChildrenAsItems(inventory.items, item._id); const itemWithChildren = this.itemHelper.findAndReturnChildrenAsItems(inventory.items, item._id);
if (itemWithChildren.length > 1) if (itemWithChildren.length > 1)
{ {
containerItems.splice(containerItems.indexOf(item), 1, ...itemWithChildren); existingContainerItems.splice(existingContainerItems.indexOf(item), 1, ...itemWithChildren);
} }
} }
@ -241,9 +241,10 @@ export class BotWeaponGeneratorHelper
const slotGridMap = this.inventoryHelper.getContainerMap( const slotGridMap = this.inventoryHelper.getContainerMap(
slotGrid._props.cellsH, slotGrid._props.cellsH,
slotGrid._props.cellsV, slotGrid._props.cellsV,
containerItems, existingContainerItems,
container._id, container._id,
); );
// Try to fit item into grid // Try to fit item into grid
const findSlotResult = this.containerHelper.findSlotForItem(slotGridMap, itemSize[0], itemSize[1]); const findSlotResult = this.containerHelper.findSlotForItem(slotGridMap, itemSize[0], itemSize[1]);