Update for 3.10

seionmoya · Nov 3, 2024 · 69f8ae1 · 69f8ae1
1 parent 65450e3
commit 69f8ae1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/db/base.jsonc b/db/base.jsonc
@@ -1,5 +1,5 @@
 {
-    "_id": "kokohekmatyar",
+    "_id": "6726dc8a2b56196f01000000",
     "working": true,
     "availableInRaid": false,
     "items_buy": {
@@ -43,7 +43,8 @@
         "excluded_category": []
     },
     "gridHeight": 150,
-    "loyaltyLevels": [{
+    "loyaltyLevels": [
+        {
             "minLevel": 1,
             "minSalesSum": 0,
             "minStanding": 0,

diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
     "name": "kokohekmatyar",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "main": "src/mod.js",
     "license": "MIT",
     "author": "seionmoya",
-    "sptVersion": "~3.9",
+    "sptVersion": "~3.10",
     "scripts": {
         "build": "node ./build.mjs",
         "lint": "eslint ./src/**/* --ext .ts"

diff --git a/src/KokoHekmatyar.ts b/src/KokoHekmatyar.ts
@@ -42,7 +42,7 @@ export class KokoHekmatyar
         this.logger.debug(`[${this.modAuthor}-${this.modName}] postDb Loading...`);
 
         this.traderGenerator.addTraderToRagfair(this.baseTrader._id, true);
-        this.traderGenerator.setTraderImage(this.baseTrader._id, path.join(`${this.modPath}res/kokohekmatyar.png`));
+        this.traderGenerator.setTraderImage(this.baseTrader, path.join(`${this.modPath}/res/kokohekmatyar.png`));
 
         this.traderGenerator.setInsuranceConfig(this.baseTrader._id, {});
         this.traderGenerator.setTraderConfig(this.baseTrader._id, 3600);
@@ -54,12 +54,7 @@ export class KokoHekmatyar
                 barter_scheme: {},
                 loyal_level_items: {}
             },
-            base: this.baseTrader,
-            questassort: {
-                started: {},
-                success: {},
-                fail: {}
-            }
+            base: this.baseTrader
         });
         this.traderGenerator.setTraderLocales(this.baseTrader._id, {
             FullName: "Koko Hekmatyar",
@@ -70,7 +65,7 @@ export class KokoHekmatyar
         });
 
         // generate assort
-        this.assortGenerator.generate("kokohekmatyar");
+        this.assortGenerator.generate(this.baseTrader._id);
 
         this.logger.debug(`[${this.modAuthor}-${this.modName}] postDb Loaded`);
     }

diff --git a/src/utils/TraderGenerator.ts b/src/utils/TraderGenerator.ts
@@ -7,6 +7,8 @@ import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
 import { ConfigTypes } from "@spt/models/enums/ConfigTypes";
 import { ImageRouter } from "@spt/routers/ImageRouter";
 import { ITrader } from "@spt/models/eft/common/tables/ITrader";
+import { ITraderBase } from "@spt/models/eft/common/tables/ITrader";
+import { Traders } from "@spt/models/enums/Traders";
 
 interface ILocales {
     FullName: string;
@@ -32,9 +34,9 @@ export class KokoTraderGenerator {
         ragfairConfig.traders[traderId] = ragfair;
     }
 
-    public setTraderImage(traderId: string, imagePath: string)
+    public setTraderImage(base: ITraderBase, imagePath: string)
     {
-        this.imageRouter.addRoute(`/files/trader/avatar/${traderId}`, imagePath);
+        this.imageRouter.addRoute(base.avatar.replace(".png", ""), imagePath);
     }
 
     public setInsuranceConfig(traderId: string, insurance: { insuranceMultiplier?: number, returnChancePercent?: number })
@@ -61,6 +63,7 @@ export class KokoTraderGenerator {
         const database = this.databaseServer.getTables();
 
         database.traders[traderId] = traderProps;
+        Traders[traderId] = traderId;
     }
 
     public setTraderLocales(traderId: string, newLocale: ILocales)