Skip to content

Weapon/Vest Attachments Fix #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ozen-m wants to merge 2 commits into
base: 3.11.x-DEV
Choose a base branch
from
Open

Weapon/Vest Attachments Fix #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbdc96b
Take into account `chanceNoAttachmentsTakenPercent` config of server,…
ozen-m Mar 25, 2025
84bf325
Cleanup
ozen-m Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 51 additions & 21 deletions src/mod.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,27 +115,37 @@ class InRaidHelperExtension extends InRaidHelper {
for (const child of itemsLostOnDeath) {
// If it's not been marked to keep then we need to check if it's insured and handle it accordingly.
const insuredIndex = this.findInsuranceIndex(pmcData, child._id);

// if it's insured
// If it's insured
if (insuredIndex !== -1) {
const traderId = pmcData.InsuredItems[insuredIndex].tid;
if (this.config.LoseInsuranceOnItemAfterDeath) {
// Remove insured status
itemsToUninsure.push(child._id);
//pmcData.InsuredItems.splice(insuredIndex, 1);
// pmcData.InsuredItems.splice(insuredIndex, 1);
}
const traderId = pmcData.InsuredItems[insuredIndex].tid;
if (this.config.RollInsuranceReturn && this.rollItem(traderId, child)) {
this.inventoryHelper.removeItem(pmcData, child._id, sessionId);
continue;
}

// Apply attachment strip chance before proceeding to process attachments
let toStrip = true;
if (Mod.randomUtil.getChance100(this.insuranceConfig.chanceNoAttachmentsTakenPercent)) {
this.logger.debug(`[InsurancePlus] Skipping attachments of ${this.itemHelper.getItemName(child._tpl)}`)
toStrip = false;
} else toStrip = true;

// Keep the item but now let's do the same check for the children
const addToUninsured: string[] = this.recursiveRemoveUninsured(pmcData, sessionId, child, pmcData.Inventory.items);
const addToUninsured: string[] = this.recursiveRemoveUninsured(pmcData, sessionId, child, pmcData.Inventory.items, toStrip);
itemsToUninsure.push(...addToUninsured);
} else {
// Not insured
// If item is ammo, inside mag or gun (slotid check), and we want to keep it, dont remove
// ^ opposite of this to make it easier to read
if (!(this.itemHelper.isOfBaseclass(child._tpl, BaseClasses.AMMO) && ["cartridges", "patron_in_weapon", "patron_in_weapon_000", "patron_in_weapon_001"].includes(child.slotId) && !this.config.LoseAmmoInMagazines)) {
if (!(this.itemHelper.isOfBaseclass(child._tpl, BaseClasses.AMMO)
&& ["cartridges", "patron_in_weapon", "patron_in_weapon_000", "patron_in_weapon_001"].includes(child.slotId)
&& !this.config.LoseAmmoInMagazines)) {
this.inventoryHelper.removeItem(pmcData, child._id, sessionId);
}
}
Expand All @@ -150,37 +160,59 @@ class InRaidHelperExtension extends InRaidHelper {
pmcData.Inventory.fastPanel = {};
}

private recursiveRemoveUninsured(pmcData: IPmcData, sessionId: string, parentItem: IItem, items: IItem[]): string[] {
private recursiveRemoveUninsured(pmcData: IPmcData, sessionId: string, parentItem: IItem, items: IItem[], toStrip: boolean): string[] {
const itemsToUninsure: string[] = [];

// Get the childen of the parent we're looking for (remove the parent from the list)
const children = this.itemHelper.findAndReturnChildrenAsItems(items, parentItem._id);
// Remove parent item
children.splice(0, 1);

// parent is not going to be removed, so check children and make sure theyre insured, otherwise remove them
// Parent is not going to be removed, so check children and make sure theyre insured, otherwise remove them
for (const child of children) {
// Avoid checking twice
if (child.parentId !== parentItem._id) continue;

const insuredIndex = this.findInsuranceIndex(pmcData, child._id);
if (insuredIndex !== -1) {
// Insured, maybe remove insurance status and check the children of the item
const traderId = pmcData.InsuredItems[insuredIndex].tid;
if (this.config.LoseInsuranceOnItemAfterDeath) {
// Remove insured status
itemsToUninsure.push(child._id);
}
if (this.itemHelper.isOfBaseclass(child._tpl, BaseClasses.BUILT_IN_INSERTS)) {
// this.logger.debug(`[InsurancePlus] Skipping soft insert ${this.itemHelper.getItemName(child._tpl)} of item ${this.itemHelper.getItemName(parentItem._tpl)}`)
continue;
}
if (this.config.RollInsuranceReturn && this.rollItem(traderId, child)) {
this.inventoryHelper.removeItem(pmcData, child._id, sessionId);
continue;

// Skip soft armor for now until compatibility added
if (this.itemHelper.isOfBaseclass(child._tpl, BaseClasses.BUILT_IN_INSERTS)) continue;

// Check if toStrip(based on chanceNoAttachmentsTakenPercent), item is a mod, and can be modified in-raid
const traderId = pmcData.InsuredItems[insuredIndex].tid;
if (toStrip
&& child.location === undefined
&& this.itemHelper.isRaidModdable(child, parentItem)
) {
if (this.config.RollInsuranceReturn && this.rollItem(traderId, child)) {
this.inventoryHelper.removeItem(pmcData, child._id, sessionId);
continue;
}
} else {
// If not a mod (item/weapon/rig etc.) always roll!
if (child.location) {
if (this.config.RollInsuranceReturn && this.rollItem(traderId, child)) {
this.inventoryHelper.removeItem(pmcData, child._id, sessionId);
continue;
}
// Apply attachment strip chance since not a mod before proceeding to process attachments
if (Mod.randomUtil.getChance100(this.insuranceConfig.chanceNoAttachmentsTakenPercent)) {
this.logger.debug(`[InsurancePlus] Skipping attachments of ${this.itemHelper.getItemName(child._tpl)}`)
toStrip = false;
} else {
toStrip = true
}
}
}

// It's insured, remove children if theyre uninsured
const addToUninsured: string[] = this.recursiveRemoveUninsured(pmcData, sessionId, child, items);
const addToUninsured: string[] = this.recursiveRemoveUninsured(pmcData, sessionId, child, items, toStrip);
itemsToUninsure.push(...addToUninsured);
} else {
// If item is ammo, inside mag or gun (slotid check), and we want to keep it, dont remove
Expand All @@ -200,10 +232,8 @@ class InRaidHelperExtension extends InRaidHelper {

private rollItem(traderId: string, insuredItem?: IItem): boolean {
const trader = Mod.traderHelper.getTraderById(traderId);
if (!trader)
{
return undefined;
}
if (!trader) return undefined;

const itemName = this.itemHelper.getItemName(insuredItem._tpl);
const returnPercent = this.config.UseTraderReturnPercent ? this.insuranceConfig.returnChancePercent[traderId] : this.config.RollReturnPercent;
const rollChance = Mod.randomUtil.getInt(0, 9999) / 100;
Expand Down