From 04f806e123c3429cc6df89493a37f1c5c69bcb80 Mon Sep 17 00:00:00 2001
From: Platinum <platinumgamer@hotmail.com>
Date: Sat, 11 Feb 2023 16:26:31 +1100
Subject: [PATCH] Debug improvements, armor tweaks

---
 advancedConfig.json |  2 +-
 config.json         |  2 +-
 src/mod.ts          | 31 ++++++++++++++++++++-----------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/advancedConfig.json b/advancedConfig.json
index e0dc08b..e121d5b 100644
--- a/advancedConfig.json
+++ b/advancedConfig.json
@@ -4,5 +4,5 @@
   "bulletDamageMultiplierRedutionFactor": 0.7,
   "baselineArmourId": "5c0e655586f774045612eeb2",
   "baselineArmourWeight": 10,
-  "percentageOfInitialArmourPriceToAdd": 50
+  "enableDebug": true
 }
\ No newline at end of file
diff --git a/config.json b/config.json
index e6a7d0f..32d078a 100644
--- a/config.json
+++ b/config.json
@@ -4,7 +4,7 @@
   "canSellBlacklistedItemsOnFlea": true,
   "blacklistedItemPriceMultiplier": 2,
   "blacklistedAmmoAdditionalPriceMultiplier": 1,
-  "blacklistedArmourAdditionalPriceMultiplier": 1.8,
+  "blacklistedArmourAdditionalPriceMultiplier": 1,
   "customItemConfigs": [
     {
       "itemIdHint": "Just a human friendly description that isn't used in code to help you remember. This item is the .338 AP round",
diff --git a/src/mod.ts b/src/mod.ts
index f10b3a5..26f5817 100644
--- a/src/mod.ts
+++ b/src/mod.ts
@@ -20,10 +20,8 @@ import { DependencyContainer } from "tsyringe";
 import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
 import { IPostDBLoadMod } from "@spt-aki/models/external/IPostDBLoadMod";
 import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
-import { IDatabaseTables } from "@spt-aki/models/spt/server/IDatabaseTables";
 import { ITemplateItem } from "@spt-aki/models/eft/common/tables/ITemplateItem";
 import { ConfigServer } from "@spt-aki/servers/ConfigServer";
-import { RagfairServer } from "@spt-aki/servers/RagfairServer";
 import { IRagfairConfig } from "@spt-aki/models/spt/config/IRagfairConfig";
 import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes";
 import { RagfairOfferGenerator } from "@spt-aki/generators/RagfairOfferGenerator";
@@ -31,7 +29,6 @@ import { RagfairPriceService } from "@spt-aki/services/RagfairPriceService";
 
 import config from "../config.json";
 import advancedConfig from "../advancedConfig.json";
-import { RagfairOfferService } from "@spt-aki/services/RagfairOfferService";
 
 class TheBlacklistMod implements IPostDBLoadMod {
   private logger: ILogger;
@@ -75,25 +72,31 @@ class TheBlacklistMod implements IPostDBLoadMod {
     handbookItems.forEach(handbookItem => {
       const item = itemTable[handbookItem.Id];
       const customItemConfig = config.customItemConfigs.find(conf => conf.itemId === item._id);
+      const originalPrice = prices[item._id];
 
       // We found a custom price override to use. That's all we care about for this item. Move on to the next item.
       if (customItemConfig?.fleaPriceOverride) {
         prices[item._id] = customItemConfig.fleaPriceOverride;
+
+        this.debug(`Updated ${item._id} - ${item._name} flea price from ${originalPrice} to ${prices[item._id]} (price override).`);
+
+        blacklistedItemsCount++;
         return;
       }
 
       const itemProps = item._props;
-
       if (!itemProps.CanSellOnRagfair) {
-        if (!prices[item._id]) {
-          this.logger.debug(`${this.modName} Could not find flea prices for ${item._id} - ${item._name}. Skipping item update.`);
-          return;
-        }
-
         itemProps.CanSellOnRagfair = config.canSellBlacklistedItemsOnFlea;
 
         prices[item._id] = this.getUpdatedPrice(item, prices);
 
+        if (!prices[item._id]) {
+          this.debug(`There are no flea prices for ${item._id} - ${item._name}!`);
+          return;
+        }
+
+        this.debug(`Updated ${item._id} - ${item._name} flea price from ${originalPrice} to ${prices[item._id]}.`);
+
         blacklistedItemsCount++;
       }
 
@@ -115,7 +118,7 @@ class TheBlacklistMod implements IPostDBLoadMod {
 
     if (item._props.ammoType === "bullet") {
       newPrice = this.getUpdatedAmmoPrice(item);
-    } else if (Number(item._props.armorClass) > 0) {
+    } else if (Number(item._props.armorClass) > 0 && item._props.armorZone?.some(zone => zone === "Chest")) {
       newPrice = this.getUpdatedArmourPrice(item, prices);
     }
 
@@ -148,7 +151,13 @@ class TheBlacklistMod implements IPostDBLoadMod {
     // Hard to balance this figure so will just leave it out.
     // const partialItemCost = prices[item._id] * (advancedConfig.percentageOfInitialArmourPriceToAdd / 100)
 
-    return baselineArmourPrice * config.blacklistedArmourAdditionalPriceMultiplier * itemArmourRatingMultiplier * itemArmourWeightMultiplier;
+    return baselineArmourPrice * itemArmourRatingMultiplier * itemArmourWeightMultiplier * config.blacklistedArmourAdditionalPriceMultiplier;
+  }
+
+  private debug(message: string) {
+    if (advancedConfig.enableDebug) {
+      this.logger.debug(`${this.modName}: ${message}`);
+    }
   }
 }