diff --git a/project/assets/configs/trader.json b/project/assets/configs/trader.json index a4bdc060..089204e3 100644 --- a/project/assets/configs/trader.json +++ b/project/assets/configs/trader.json @@ -125,11 +125,18 @@ }, "preventDuplicateOffersOfCategory": [ "543be5cb4bdc2deb348b4568", + "57bef4c42459772e8d35a53b", "5485a8684bdc2da71d8b4567", "5448f3ac4bdc2dce718b4569", "5448f39d4bdc2d0a728b4568", "5448f3a14bdc2d27728b4569", - "5448bc234bdc2d3c308b4569" + "5448bc234bdc2d3c308b4569", + "543be5e94bdc2df1348b4568", + "5448eb774bdc2d0a728b4567", + "5447e1d04bdc2dff2f8b4567", + "5448ecbe4bdc2d60728b4568", + "543be6674bdc2df1348b4569", + "5448fe124bdc2da5018b4567" ], "weaponDurabilityPercentMinMax": { "current": { diff --git a/project/src/services/FenceService.ts b/project/src/services/FenceService.ts index 2e3175a5..162aadd5 100644 --- a/project/src/services/FenceService.ts +++ b/project/src/services/FenceService.ts @@ -609,7 +609,7 @@ export class FenceService if (this.itemShouldBeForceStacked(existingItem, itemDbDetails)) { i--; - + existingItem.upd.StackObjectsCount++; continue; } @@ -667,8 +667,11 @@ export class FenceService return false; } - // Don't stack armored rigs - if (this.itemHelper.isOfBaseclass(itemDbDetails._id, BaseClasses.VEST) && itemDbDetails._props.Slots.length > 0) + // Don't stack armor with slots (plates/inserts etc) + if ( + this.itemHelper.isOfBaseclass(itemDbDetails._id, BaseClasses.ARMORED_EQUIPMENT) + && itemDbDetails._props.Slots.length > 0 + ) { return false; }