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

Clean up comments for items removed post-raid

Browse Source
This commit is contained in:
Dev 2023-12-15 10:36:26 +00:00
parent 85f48a10aa
commit ba1bdc9c5f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
project/src/helpers/InRaidHelper.ts
View File

@ -541,6 +541,7 @@ export class InRaidHelper
const itemIdsToDeleteFromProfile = this.getInventoryItemsLostOnDeath(pmcData).map((x) => x._id); const itemIdsToDeleteFromProfile = this.getInventoryItemsLostOnDeath(pmcData).map((x) => x._id);
itemIdsToDeleteFromProfile.forEach((x) => itemIdsToDeleteFromProfile.forEach((x) =>
{ {
// Items inside containers are handed as part of function
this.inventoryHelper.removeItem(pmcData, x, sessionID); this.inventoryHelper.removeItem(pmcData, x, sessionID);
}); });
@ -556,25 +557,25 @@ export class InRaidHelper
protected getInventoryItemsLostOnDeath(pmcProfile: IPmcData): Item[] protected getInventoryItemsLostOnDeath(pmcProfile: IPmcData): Item[]
{ {
const inventoryItems = pmcProfile.Inventory.items ?? []; const inventoryItems = pmcProfile.Inventory.items ?? [];
const equipment = pmcProfile?.Inventory?.equipment; const equipmentRootId = pmcProfile?.Inventory?.equipment;
const questRaidItems = pmcProfile?.Inventory?.questRaidItems; const questRaidItemContainerId = pmcProfile?.Inventory?.questRaidItems;
return inventoryItems.filter((x) => return inventoryItems.filter((item) =>
{ {
// Keep items flagged as kept after death // Keep items flagged as kept after death
if (this.isItemKeptAfterDeath(pmcProfile, x)) if (this.isItemKeptAfterDeath(pmcProfile, item))
{ {
return false; return false;
} }
// Remove normal items or quest raid items // Remove normal items or quest raid items
if (x.parentId === equipment || x.parentId === questRaidItems) if (item.parentId === equipmentRootId || item.parentId === questRaidItemContainerId)
{ {
return true; return true;
} }
// Pocket items are not lost on death // Pocket items are lost on death
if (x.slotId.startsWith("pocket")) if (item.slotId.startsWith("pocket"))
{ {
return true; return true;
} }
@ -609,7 +610,7 @@ export class InRaidHelper
*/ */
protected isItemKeptAfterDeath(pmcData: IPmcData, itemToCheck: Item): boolean protected isItemKeptAfterDeath(pmcData: IPmcData, itemToCheck: Item): boolean
{ {
// No parentid means its a base inventory item, always keep // No parentId = base inventory item, always keep
if (!itemToCheck.parentId) if (!itemToCheck.parentId)
{ {
return true; return true;
@ -629,7 +630,7 @@ export class InRaidHelper
} }
// Is quest item + quest item not lost on death // Is quest item + quest item not lost on death
if (!this.lostOnDeathConfig.questItems && itemToCheck.parentId === pmcData.Inventory.questRaidItems) if (itemToCheck.parentId === pmcData.Inventory.questRaidItems && !this.lostOnDeathConfig.questItems)
{ {
return true; return true;
} }