Platinum/the-blacklist
Platinum/the-blacklist
0
0
Fork 0
Code Issues Pull Requests Projects Releases 9 Wiki Activity

refactor: remove setInterval logic that was causing issues with things not being blacklist properly

Browse Source
This commit is contained in:
Platinum 2024-01-20 21:06:18 +11:00
parent 93067c68c0
commit 6b63df76bf
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
advancedConfig.json
View File

@ -1,5 +1,4 @@
{ {
"startDelayInSeconds": 6.9,
"baselineBulletId": "59e6906286f7746c9f75e847", "baselineBulletId": "59e6906286f7746c9f75e847",
"baselineBulletPrice": 1000, "baselineBulletPrice": 1000,
"bulletDamageMultiplierRedutionFactor": 0.7, "bulletDamageMultiplierRedutionFactor": 0.7,

21
src/mod.ts
View File

@ -18,20 +18,18 @@
import { DependencyContainer } from "tsyringe"; import { DependencyContainer } from "tsyringe";
import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
import { IPostDBLoadMod } from "@spt-aki/models/external/IPostDBLoadMod"; import { IPostDBLoadModAsync } from "@spt-aki/models/external/IPostDBLoadModAsync";
import { ILogger } from "@spt-aki/models/spt/utils/ILogger"; import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem"; import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem";
import { ConfigServer } from "@spt-aki/servers/ConfigServer"; import { ConfigServer } from "@spt-aki/servers/ConfigServer";
import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig"; import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig";
import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes"; import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes";
import { RagfairOfferGenerator } from "@spt-aki/generators/RagfairOfferGenerator";
import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService";
import { Category } from "@spt-aki/models/eft/common/tables/IHandbookBase"; import { Category } from "@spt-aki/models/eft/common/tables/IHandbookBase";
import config from "../config.json"; import config from "../config.json";
import advancedConfig from "../advancedConfig.json"; import advancedConfig from "../advancedConfig.json";
class TheBlacklistMod implements IPostDBLoadMod { class TheBlacklistMod implements IPostDBLoadModAsync {
private logger: ILogger; private logger: ILogger;
private modName = "[The Blacklist]"; private modName = "[The Blacklist]";
@ -43,22 +41,13 @@ class TheBlacklistMod implements IPostDBLoadMod {
// Store the category IDs of all attachments in the handbook so we don't have to manually enter them in json // Store the category IDs of all attachments in the handbook so we don't have to manually enter them in json
private attachmentCategoryIds: string[] = []; private attachmentCategoryIds: string[] = [];
public postDBLoad(container: DependencyContainer): void { public async postDBLoadAsync(container: DependencyContainer) {
this.logger = container.resolve<ILogger>("WinstonLogger"); this.logger = container.resolve<ILogger>("WinstonLogger");
// Easiest way to make mod compatible with Lua's flea updater is let the user choose when to load the mod...
setTimeout(() => this.initialiseMod(container), (advancedConfig.startDelayInSeconds || 7) * 1000);
}
private initialiseMod(
container: DependencyContainer
): void {
const databaseServer = container.resolve<DatabaseServer>("DatabaseServer"); const databaseServer = container.resolve<DatabaseServer>("DatabaseServer");
const tables = databaseServer.getTables(); const tables = databaseServer.getTables();
const configServer = container.resolve<ConfigServer>("ConfigServer"); const configServer = container.resolve<ConfigServer>("ConfigServer");
const ragfairConfig = configServer.getConfig<IRagfairConfig>(ConfigTypes.RAGFAIR); const ragfairConfig = configServer.getConfig<IRagfairConfig>(ConfigTypes.RAGFAIR);
const ragfairPriceService = container.resolve<RagfairPriceService>("RagfairPriceService");
const ragfairOfferGenerator = container.resolve<RagfairOfferGenerator>("RagfairOfferGenerator");
const itemTable = tables.templates.items; const itemTable = tables.templates.items;
const handbookItems = tables.templates.handbook.Items; const handbookItems = tables.templates.handbook.Items;
@ -153,9 +142,6 @@ class TheBlacklistMod implements IPostDBLoadMod {
prices[item._id] *= itemSpecificPriceMultiplier; prices[item._id] *= itemSpecificPriceMultiplier;
}); });
// Typescript hack to call protected method
(ragfairPriceService as any).generateDynamicPrices();
ragfairOfferGenerator.generateDynamicOffers().then(() => {
this.logger.success(`${this.modName}: Success! Found ${blacklistedItemsUpdatedCount} blacklisted & ${nonBlacklistedItemsUpdatedCount} non-blacklisted items to update.`); this.logger.success(`${this.modName}: Success! Found ${blacklistedItemsUpdatedCount} blacklisted & ${nonBlacklistedItemsUpdatedCount} non-blacklisted items to update.`);
if (config.limitMaxPriceOfAttachments) { if (config.limitMaxPriceOfAttachments) {
this.logger.success(`${this.modName}: config.limitMaxPriceOfAttachments is enabled! Updated ${attachmentPriceLimitedCount} flea prices of attachments.`); this.logger.success(`${this.modName}: config.limitMaxPriceOfAttachments is enabled! Updated ${attachmentPriceLimitedCount} flea prices of attachments.`);
@ -163,7 +149,6 @@ class TheBlacklistMod implements IPostDBLoadMod {
if (config.useBalancedPricingForAllAmmo) { if (config.useBalancedPricingForAllAmmo) {
this.logger.success(`${this.modName}: config.useBalancedPricingForAllAmmo is enabled! Updated ${ammoPricesUpdatedCount} ammo prices.`); this.logger.success(`${this.modName}: config.useBalancedPricingForAllAmmo is enabled! Updated ${ammoPricesUpdatedCount} ammo prices.`);
} }
});
} }
private initialiseAttachmentCategoryIds(handbookCategories: Category[]) { private initialiseAttachmentCategoryIds(handbookCategories: Category[]) {