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

Only add location property to mag cartridge stacks when more than 1 is added

Browse Source
This commit is contained in:
Dev 2024-01-27 15:03:15 +00:00
parent b6327b7d0d
commit 30efd8b720
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
project/src/helpers/ItemHelper.ts
View File

@ -1012,13 +1012,13 @@ export class ItemHelper
/** /**
* Add child items to a magazine of a specific cartridge * Add child items to a magazine of a specific cartridge
* @param magazine Magazine to add child items to * @param magazineWithChildCartridges Magazine to add child items to
* @param magTemplate Db template of magazine * @param magTemplate Db template of magazine
* @param cartridgeTpl Cartridge to add to magazine * @param cartridgeTpl Cartridge to add to magazine
* @param minSizePercent % the magazine must be filled to * @param minSizePercent % the magazine must be filled to
*/ */
public fillMagazineWithCartridge( public fillMagazineWithCartridge(
magazine: Item[], magazineWithChildCartridges: Item[],
magTemplate: ITemplateItem, magTemplate: ITemplateItem,
cartridgeTpl: string, cartridgeTpl: string,
minSizePercent = 0.25, minSizePercent = 0.25,
@ -1045,7 +1045,7 @@ export class ItemHelper
magazineCartridgeMaxCount, magazineCartridgeMaxCount,
); );
if (magazine.length > 1) if (magazineWithChildCartridges.length > 1)
{ {
this.logger.warning(`Magazine ${magTemplate._name} already has cartridges defined, this may cause issues`); this.logger.warning(`Magazine ${magTemplate._name} already has cartridges defined, this may cause issues`);
} }
@ -1068,11 +1068,24 @@ export class ItemHelper
} }
// Add cartridge item object into items array // Add cartridge item object into items array
magazine.push(this.createCartridges(magazine[0]._id, cartridgeTpl, cartridgeCountToAdd, location, magazine[0].upd?.SpawnedInSession)); magazineWithChildCartridges.push(
this.createCartridges(
magazineWithChildCartridges[0]._id,
cartridgeTpl, cartridgeCountToAdd,
location,
magazineWithChildCartridges[0].upd?.SpawnedInSession
)
);
currentStoredCartridgeCount += cartridgeCountToAdd; currentStoredCartridgeCount += cartridgeCountToAdd;
location++; location++;
} }
// Only one cartridge stack added, remove location property as its only used for 2 or more stacks
if (location === 1)
{
delete magazineWithChildCartridges[1].location;
}
} }
/** /**