From 41ce2fa92e6588cd73fa7e54b282bbc1a4a84b84 Mon Sep 17 00:00:00 2001
From: Echo-55 <82003117+Echo-55@users.noreply.github.com>
Date: Mon, 9 Dec 2024 19:19:59 -0600
Subject: [PATCH] Updated the other AddTrader example with same changes

---
 .../13.1AddTraderWithAssortJSON/db/base.json  | 41 ++++---------------
 .../13.1AddTraderWithAssortJSON/src/mod.ts    |  6 ++-
 .../src/traderHelpers.ts                      | 17 --------
 3 files changed, 11 insertions(+), 53 deletions(-)

diff --git a/TypeScript/13.1AddTraderWithAssortJSON/db/base.json b/TypeScript/13.1AddTraderWithAssortJSON/db/base.json
index d5a7c38..2f4fafb 100644
--- a/TypeScript/13.1AddTraderWithAssortJSON/db/base.json
+++ b/TypeScript/13.1AddTraderWithAssortJSON/db/base.json
@@ -55,39 +55,12 @@
         }
     ],
     "sell_category": [
-        "82e7fac0b7495d72d4083356",
-        "ac705d3440c1407645e33579",
-        "dc97aee367144dc03389405d",
-        "7ffcc96aa06c7e90940330c5",
-        "e8f46e3ad74b9d862121f9dc",
-        "5b47574386f77428ca22b33e",
-        "5b47574386f77428ca22b33f",
-        "5b5f78dc86f77409407a7f8e",
-        "5b47574386f77428ca22b346",
-        "5b47574386f77428ca22b340",
-        "5b47574386f77428ca22b344",
-        "5b47574386f77428ca22b342",
-        "5b47574386f77428ca22b341",
-        "5b47574386f77428ca22b345",
-        "5b47574386f77428ca22b343",
-        "5b5f71b386f774093f2ecf11",
-        "5b5f71c186f77409407a7ec0",
-        "5b5f71de86f774093f2ecf13",
-        "5b5f724186f77447ed5636ad",
-        "5b5f736886f774094242f193",
-        "5b5f73ec86f774093e6cb4fd",
-        "5b5f74cc86f77447ec5d770a",
-        "5b5f750686f774093e6cb503",
-        "5b5f751486f77447ec5d770c",
-        "5b5f752e86f774093e6cb505",
-        "5b5f754a86f774094242f19b",
-        "5b5f755f86f77447ec5d770e",
-        "5b5f757486f774093e6cb507",
-        "5b5f75b986f77447ec5d7710",
-        "5b5f75c686f774094242f19f",
-        "5b5f75e486f77447ec5d7712",
-        "5b5f760586f774093e6cb509",
-        "5b5f761f86f774094242f1a1",
-        "5b5f764186f77447ec5d7714"
+        "575146b724597720a27126d5",
+        "635a758bfefc88a93f021b8a",
+        "55d45d3f4bdc2d972f8b456c",
+        "5b363dd25acfc4001a598fd2",
+        "5d1b36a186f7742523398433",
+        "59e3577886f774176a362503",
+        "5d6e67fba4b9361bc73bc779"
     ]
 }
diff --git a/TypeScript/13.1AddTraderWithAssortJSON/src/mod.ts b/TypeScript/13.1AddTraderWithAssortJSON/src/mod.ts
index aeb305b..286e4cc 100644
--- a/TypeScript/13.1AddTraderWithAssortJSON/src/mod.ts
+++ b/TypeScript/13.1AddTraderWithAssortJSON/src/mod.ts
@@ -23,11 +23,13 @@ import { TraderHelper } from "./traderHelpers";
 class SampleTrader implements IPreSptLoadMod, IPostDBLoadMod
 {
     private mod: string;
+    private traderImgPath: string;
     private logger: ILogger;
     private traderHelper: TraderHelper;
 
     constructor() {
-        this.mod = "acidphantasm-131AddTraderWithAssortJSON"; // Set name of mod so we can log it to console later - match this to your folder name that's built for \user\mods\
+        this.mod = "131AddTraderWithAssortJSON"; // Set name of mod so we can log it to console later - match this to your folder name that's built for \user\mods\
+        this.traderImgPath = "res/cat.jpg"; // Set path to trader image
     }
 
     /**
@@ -49,7 +51,7 @@ class SampleTrader implements IPreSptLoadMod, IPostDBLoadMod
 
         // Create helper class and use it to register our traders image/icon + set its stock refresh time
         this.traderHelper = new TraderHelper();
-        this.traderHelper.registerProfileImage(baseJson, this.mod, preSptModLoader, imageRouter, "cat.jpg");
+        imageRouter.addRoute(baseJson.avatar.replace(".jpg", ""), `${preSptModLoader.getModPath(this.mod)}${this.traderImgPath}`);
         this.traderHelper.setTraderUpdateTime(traderConfig, baseJson, 3600, 4000);
 
         // Add trader to trader enum
diff --git a/TypeScript/13.1AddTraderWithAssortJSON/src/traderHelpers.ts b/TypeScript/13.1AddTraderWithAssortJSON/src/traderHelpers.ts
index dda8c83..60a35d3 100644
--- a/TypeScript/13.1AddTraderWithAssortJSON/src/traderHelpers.ts
+++ b/TypeScript/13.1AddTraderWithAssortJSON/src/traderHelpers.ts
@@ -7,23 +7,6 @@ import { JsonUtil } from "@spt/utils/JsonUtil";
 
 export class TraderHelper
 {
-    /**
-     * Add profile picture to our trader
-     * @param baseJson json file for trader (db/base.json)
-     * @param modName mod folder name
-     * @param preSptModLoader mod loader class - used to get the mods file path
-     * @param imageRouter image router class - used to register the trader image path so we see their image on trader page
-     * @param traderImageName Filename of the trader icon to use
-     */
-    public registerProfileImage(baseJson: any, modName: string, preSptModLoader: PreSptModLoader, imageRouter: ImageRouter, traderImageName: string): void
-    {
-        // Reference the mod "res" folder
-        const imageFilepath = `./${preSptModLoader.getModPath(modName)}res`;
-
-        // Register a route to point to the profile picture - remember to remove the .jpg from it
-        imageRouter.addRoute(baseJson.avatar.replace(".jpg", ""), `${imageFilepath}/${traderImageName}`);
-    }
-
     /**
      * Add record to trader config to set the refresh time of trader in seconds (default is 60 minutes)
      * @param traderConfig trader config to add our trader to