diff --git a/project/assets/configs/airdrop.json b/project/assets/configs/airdrop.json index 98f1a890..4b387b0d 100644 --- a/project/assets/configs/airdrop.json +++ b/project/assets/configs/airdrop.json @@ -47,38 +47,6 @@ "max": 2 }, "itemBlacklist": [ - "5e997f0b86f7741ac73993e2", - "5b44abe986f774283e2e3512", - "5e99711486f7744bfc4af328", - "5e99735686f7744bfc4af32c", - "6087e570b998180e9f76dc24", - "5d52d479a4b936793d58c76b", - "5e85aac65505fa48730d8af2", - "63495c500c297e20065a08b1", - "5cde8864d7f00c0010373be1", - "5b3b713c5acfc4330140bd8d", - "60c080eb991ac167ad1c3ad4", - "57cd379a24597778e7682ecf", - "5fc64ea372b0dd78d51159dc", - "628e4dd1f477aa12234918aa", - "62a61bbf8ec41a51b34758d2", - "5c0e842486f77443a74d2976", - "5c0e874186f7745dc7616606", - "5c0e541586f7747fa54205c9", - "628b9784bcf6e2659e09b8a2", - "62963c18dbc8ab5f0d382d0b", - "628b9c7d45122232a872358f", - "628baf0b967de16aab5a4f36", - "636270263f2495c26f00b007", - "63626d904aa74b8fe30ab426", - "60a7ad2a2198820d95707a2e", - "60a7ad3a0c5cb24b0134664a", - "60a7acf20c5cb24b01346648", - "609e860ebd219504d8507525", - "6275303a9f372d6ea97f9ec7", - "628bc7fb408e2b2e9c0801b1", - "6389c7f115805221fb410466", - "64d0b40fbe2eed70e254e2d4" ], "itemTypeWhitelist": [ "543be5dd4bdc2deb348b4569", @@ -182,37 +150,6 @@ "max": 2 }, "itemBlacklist": [ - "5e997f0b86f7741ac73993e2", - "5b44abe986f774283e2e3512", - "5e99711486f7744bfc4af328", - "5e99735686f7744bfc4af32c", - "6087e570b998180e9f76dc24", - "5d52d479a4b936793d58c76b", - "5e85aac65505fa48730d8af2", - "63495c500c297e20065a08b1", - "5cde8864d7f00c0010373be1", - "5b3b713c5acfc4330140bd8d", - "60c080eb991ac167ad1c3ad4", - "57cd379a24597778e7682ecf", - "5fc64ea372b0dd78d51159dc", - "628e4dd1f477aa12234918aa", - "62a61bbf8ec41a51b34758d2", - "5c0e842486f77443a74d2976", - "5c0e874186f7745dc7616606", - "5c0e541586f7747fa54205c9", - "628b9784bcf6e2659e09b8a2", - "62963c18dbc8ab5f0d382d0b", - "628b9c7d45122232a872358f", - "628baf0b967de16aab5a4f36", - "636270263f2495c26f00b007", - "63626d904aa74b8fe30ab426", - "60a7ad2a2198820d95707a2e", - "60a7ad3a0c5cb24b0134664a", - "60a7acf20c5cb24b01346648", - "609e860ebd219504d8507525", - "6275303a9f372d6ea97f9ec7", - "628bc7fb408e2b2e9c0801b1", - "64d0b40fbe2eed70e254e2d4" ], "itemTypeWhitelist": [ "5485a8684bdc2da71d8b4567", @@ -288,18 +225,6 @@ "max": 0 }, "itemBlacklist": [ - "5e997f0b86f7741ac73993e2", - "5b44abe986f774283e2e3512", - "5e99711486f7744bfc4af328", - "5e99735686f7744bfc4af32c", - "6087e570b998180e9f76dc24", - "5d52d479a4b936793d58c76b", - "5e85aac65505fa48730d8af2", - "63495c500c297e20065a08b1", - "5cde8864d7f00c0010373be1", - "5b3b713c5acfc4330140bd8d", - "60c080eb991ac167ad1c3ad4", - "64d0b40fbe2eed70e254e2d4" ], "itemTypeWhitelist": [ "543be5dd4bdc2deb348b4569", @@ -379,20 +304,6 @@ "max": 0 }, "itemBlacklist": [ - "5e997f0b86f7741ac73993e2", - "5b44abe986f774283e2e3512", - "5e99711486f7744bfc4af328", - "5e99735686f7744bfc4af32c", - "6087e570b998180e9f76dc24", - "5d52d479a4b936793d58c76b", - "5e85aac65505fa48730d8af2", - "63495c500c297e20065a08b1", - "5cde8864d7f00c0010373be1", - "5b3b713c5acfc4330140bd8d", - "60c080eb991ac167ad1c3ad4", - "6389c7f115805221fb410466", - "64d0b40fbe2eed70e254e2d4", - "6389c88b33a719183c7f63b6" ], "itemTypeWhitelist": [ "5d650c3e815116009f6201d2", diff --git a/project/src/controllers/LocationController.ts b/project/src/controllers/LocationController.ts index 6651f591..d6533763 100644 --- a/project/src/controllers/LocationController.ts +++ b/project/src/controllers/LocationController.ts @@ -21,6 +21,7 @@ import { LootRequest } from "@spt-aki/models/spt/services/LootRequest"; import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; import { ConfigServer } from "@spt-aki/servers/ConfigServer"; import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; +import { ItemFilterService } from "@spt-aki/services/ItemFilterService"; import { LocalisationService } from "@spt-aki/services/LocalisationService"; import { RaidTimeAdjustmentService } from "@spt-aki/services/RaidTimeAdjustmentService"; import { HashUtil } from "@spt-aki/utils/HashUtil"; @@ -43,6 +44,7 @@ export class LocationController @inject("LocationGenerator") protected locationGenerator: LocationGenerator, @inject("LocalisationService") protected localisationService: LocalisationService, @inject("RaidTimeAdjustmentService") protected raidTimeAdjustmentService: RaidTimeAdjustmentService, + @inject("ItemFilterService") protected itemFilterService: ItemFilterService, @inject("LootGenerator") protected lootGenerator: LootGenerator, @inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("TimeUtil") protected timeUtil: TimeUtil, @@ -214,7 +216,11 @@ export class LocationController armorPresetCount: lootSettingsByType.armorPresetCount, itemCount: lootSettingsByType.itemCount, weaponCrateCount: lootSettingsByType.weaponCrateCount, - itemBlacklist: lootSettingsByType.itemBlacklist, + itemBlacklist: [ + ...lootSettingsByType.itemBlacklist, + ...this.itemFilterService.getItemRewardBlacklist(), + ...this.itemFilterService.getBossItems(), + ], itemTypeWhitelist: lootSettingsByType.itemTypeWhitelist, itemLimits: lootSettingsByType.itemLimits, itemStackLimits: lootSettingsByType.itemStackLimits,