Compare commits

..

No commits in common. "master" and "1.0.1" have entirely different histories.

3 changed files with 36 additions and 108 deletions

View File

@ -1,9 +1,9 @@
{ {
"relativeProbabilityThreshold": 3, "relativeProbabilityThreshold": 3,
"relativeProbabilitymultiplier": 20, "relativeProbabilitymultiplier": 20,
"LooseKeyPileProbability": 0.2, "LooseKeyPileProbability": 0.10,
"AlterKeyCardProbability": true, "AlterKeyCardProbability": true,
"LooseKeycardProbability": 0.02, "LooseKeycardProbability": 0.02
"drawerStaticRelativeProbability": 1658, }
"jacketStaticRelativeProbability": 829
}

View File

@ -1,10 +1,10 @@
{ {
"name": "LooseKeyModifier", "name": "LooseKeyModifier",
"version": "1.0.2", "version": "1.0.1",
"main": "src/mod.js", "main": "src/mod.js",
"license": "See License file", "license": "See License file",
"author": "Kaeno", "author": "Kaeno",
"akiVersion": "^3.6.1", "akiVersion": "^3.5.1",
"devDependencies": { "devDependencies": {
"@types/node": "16.18.10", "@types/node": "16.18.10",

View File

@ -1,129 +1,57 @@
/* eslint-disable @typescript-eslint/naming-convention */
import { ItemHelper } from "@spt-aki/helpers/ItemHelper"; import { ItemHelper } from "@spt-aki/helpers/ItemHelper";
import { Spawnpoint } from "@spt-aki/models/eft/common/ILooseLoot"; import { Spawnpoint } from "@spt-aki/models/eft/common/ILooseLoot";
import { ItemDistribution } from "@spt-aki/models/eft/common/tables/ILootBase";
import { BaseClasses } from "@spt-aki/models/enums/BaseClasses"; import { BaseClasses } from "@spt-aki/models/enums/BaseClasses";
import type { IPostDBLoadMod } from "@spt-aki/models/external/IPostDBLoadMod"; import type { IPostDBLoadMod } from "@spt-aki/models/external/IPostDBLoadMod";
import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
import { DependencyContainer } from "tsyringe"; import { DependencyContainer } from "tsyringe";
import config from "../config/config.json";
class Lkm implements IPostDBLoadMod const Config = require("../config/config.json");
{
public postDBLoad(container: DependencyContainer): void class Lkm implements IPostDBLoadMod {
{ public postDBLoad(container: DependencyContainer): void {
const databaseServer: DatabaseServer = container.resolve<DatabaseServer>("DatabaseServer"); const DatabaseServer: DatabaseServer = container.resolve<DatabaseServer>("DatabaseServer");
const logger = container.resolve<ILogger>("WinstonLogger");
const itemHelper = container.resolve<ItemHelper>("ItemHelper"); const itemHelper = container.resolve<ItemHelper>("ItemHelper");
const database = databaseServer.getTables(); const database = DatabaseServer.getTables();
const locations = database.locations; const locations = database.locations;
const staticLoot = database.loot.staticLoot;
let count = 0;
let looseCount = 0;
let looseKCount = 0;
for (const mapId in locations) {
for (const staticName in staticLoot)
{
const staticy: ItemDistribution[] = staticLoot[staticName]?.itemDistribution;
if (!staticy)
{
continue;
}
if (staticName === "578f87b7245977356274f2cd") // Drawer
{
for (const itemDistribution of staticy)
{
if (itemHelper.isOfBaseclass(itemDistribution.tpl, BaseClasses.KEY_MECHANICAL))
{
const matchingItem = staticy.find(s => s.tpl === itemDistribution.tpl);
if (matchingItem)
{
if (itemDistribution.relativeProbability < config.drawerStaticRelativeProbability)
{
// By Default this is based of the Yotota Key and been divided by 2
itemDistribution.relativeProbability = config.drawerStaticRelativeProbability;
count++;
}
}
}
}
}
if (staticName === "578f8778245977358849a9b5") // Jackets
{
for (const itemDistribution of staticy)
{
if (itemHelper.isOfBaseclass(itemDistribution.tpl, BaseClasses.KEY_MECHANICAL))
{
const matchingItem = staticy.find(s => s.tpl === itemDistribution.tpl);
if (matchingItem)
{
if (itemDistribution.relativeProbability < (config.jacketStaticRelativeProbability))
{
// By Default this is based of the Yotota Key and been divided by 4
itemDistribution.relativeProbability = (config.jacketStaticRelativeProbability);
count++;
}
}
}
}
}
}
console.log(`Finished Altering ${count} Container Keys `);
for (const mapId in locations)
{
const spawnPoints: Spawnpoint[] = locations[mapId]?.looseLoot?.spawnpoints; const spawnPoints: Spawnpoint[] = locations[mapId]?.looseLoot?.spawnpoints;
if (!spawnPoints) if (!spawnPoints) {
{
continue; continue;
} }
for (const spawnPoint of spawnPoints) for (const spawnPoint of spawnPoints) {
{ for (const item of spawnPoint.template.Items) {
for (const item of spawnPoint.template.Items) if (itemHelper.isOfBaseclass(item._tpl, BaseClasses.KEY_MECHANICAL)) {
{
if (itemHelper.isOfBaseclass(item._tpl, BaseClasses.KEY_MECHANICAL))
{
const matchingItem = spawnPoint.itemDistribution.find(x => x.composedKey.key === item._id); const matchingItem = spawnPoint.itemDistribution.find(x => x.composedKey.key === item._id);
if (matchingItem) if (matchingItem) {
{ if (spawnPoint.probability < Config.LooseKeyPileProbability) {
if (spawnPoint.probability < config.LooseKeyPileProbability) spawnPoint.probability = Config.LooseKeyPileProbability;
{ logger.debug(`Updated Spawnpoint Probability having new probability of ${spawnPoint.probability} on loot pile ${spawnPoint.template.Id} on map ${mapId}`);
spawnPoint.probability = config.LooseKeyPileProbability;
} }
if (matchingItem.relativeProbability < config.relativeProbabilityThreshold) if (matchingItem.relativeProbability < Config.relativeProbabilityThreshold) {
{ matchingItem.relativeProbability *= Config.relativeProbabilitymultiplier;
matchingItem.relativeProbability *= config.relativeProbabilitymultiplier; logger.debug(`Updated ${item._tpl} having new relativeProbability of ${matchingItem.relativeProbability} on loot pile ${spawnPoint.template.Id} on map ${mapId}`);
} }
looseCount++;
} }
} }
else if (Config.AlterKeyCardProbability && itemHelper.isOfBaseclass(item._tpl, BaseClasses.KEYCARD)) {
{ const matchingItem = spawnPoint.itemDistribution.find(x => x.composedKey.key === item._id);
// Any loot changes wont modify items inside of loot.json(Added Keycards from SPT Team) if (matchingItem) {
if (itemHelper.isOfBaseclass(item._tpl, BaseClasses.KEYCARD) && config.AlterKeyCardProbability == true) if (spawnPoint.probability < Config.LooseKeycardProbability) {
{ spawnPoint.probability = Config.LooseKeycardProbability;
const matchingItem = spawnPoint.itemDistribution.find(x => x.composedKey.key === item._id); logger.debug(`Updated Spawnpoint Probability having new probability of ${spawnPoint.probability} on loot pile ${spawnPoint.template.Id} on map ${mapId} KEYCARD?`);
if (matchingItem)
{
if (spawnPoint.probability < config.LooseKeycardProbability)
{
spawnPoint.probability = config.LooseKeycardProbability;
looseKCount++;
}
} }
} }
} }
} }
} }
} }
if (looseCount === 0 && looseKCount === 0) logger.debug("Altering Probabilities Complete. Lkm");
{
console.log("No Items modified. Check config parameters");
}
else
console.log(`Finished Altering ${looseCount} LooseLoot Keys and ${looseKCount} LooseLoot Keycards. Lkm`);
} }
} }
module.exports = { mod: new Lkm() }; module.exports = { mod: new Lkm() };