feat: add hideout_main_stash_access_via profile override

guillaumearm · Aug 7, 2024 · 790bd91 · 790bd91
1 parent e95a8cc
commit 790bd91
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 17 deletions.
diff --git a/config/alternate_configs/ExampleOverrideByProfiles/config.json b/config/alternate_configs/ExampleOverrideByProfiles/config.json
@@ -3,7 +3,8 @@
   "debug": true,
   "override_by_profiles": {
     "Stalker On Tarkov": {
-      "initial_offraid_position": "TherapistStash"
+      "initial_offraid_position": "TherapistStash",
+      "hideout_main_stash_access_via": ["TherapistStash"]
     }
   },
   "initial_offraid_position": "MechanicStash",

diff --git a/src/config.ts b/src/config.ts
@@ -117,6 +117,7 @@ export type OffraidRegenConfig = {
 
 export type OverrideByProfiles = ByProfileId<{
   initial_offraid_position?: string;
+  hideout_main_stash_access_via: AccessVia;
 }>;
 
 export type Config = {

diff --git a/src/path-to-tarkov-controller.ts b/src/path-to-tarkov-controller.ts
@@ -191,7 +191,7 @@ export class PathToTarkovController {
       const parsed = JSON.parse(rawResult);
       const items: Record<string, ITemplateItem> = parsed.data;
 
-      const size = this.stashController.getStashSize(offraidPosition);
+      const size = this.stashController.getStashSize(offraidPosition, sessionId);
 
       if (size === null) {
         this.debug(`[${sessionId}] main stash selected`);
@@ -235,7 +235,7 @@ export class PathToTarkovController {
       const parsed = JSON.parse(rawResult);
       const areas: IHideoutArea[] = parsed.data;
 
-      const hideoutEnabled = this.stashController.getHideoutEnabled(offraidPosition);
+      const hideoutEnabled = this.stashController.getHideoutEnabled(offraidPosition, sessionId);
 
       areas.forEach(area => {
         if (!isIgnoredArea(area, this.config)) {
@@ -512,9 +512,9 @@ export class PathToTarkovController {
     const profile: Profile = this.saveServer.getProfile(sessionId);
     const profileTemplateId = profile.info.edition;
 
-    const overrideByProfiles = this.config.override_by_profiles?.[profileTemplateId] ?? {};
+    const overrideByProfiles = this.config.override_by_profiles?.[profileTemplateId];
 
-    return overrideByProfiles.initial_offraid_position ?? this.config.initial_offraid_position;
+    return overrideByProfiles?.initial_offraid_position ?? this.config.initial_offraid_position;
   };
 
   getOffraidPosition = (sessionId: string): string => {

diff --git a/src/stash-controller.ts b/src/stash-controller.ts
@@ -1,6 +1,6 @@
 import type { DatabaseServer } from '@spt/servers/DatabaseServer';
 import type { SaveServer } from '@spt/servers/SaveServer';
-import type { ConfigGetter, Profile, StashConfig } from './config';
+import type { AccessVia, ConfigGetter, Profile, StashConfig } from './config';
 import { EMPTY_STASH, SLOT_ID_HIDEOUT, SLOT_ID_LOCKED_STASH, STANDARD_STASH_ID } from './config';
 import {
   checkAccessVia,
@@ -97,13 +97,20 @@ export class StashController {
     }
   }
 
-  private getMainStashAvailable(offraidPosition: string): boolean {
-    const multiStashEnabled = this.getConfig().hideout_multistash_enabled;
+  private getMainStashAccessVia(sessionId: string): AccessVia {
+    const defaultMainStashAccessVia = this.getConfig().hideout_main_stash_access_via;
+    const profile: Profile = this.saveServer.getProfile(sessionId);
+    const profileTemplateId = profile.info.edition;
 
-    const mainStashAvailable = checkAccessVia(
-      this.getConfig().hideout_main_stash_access_via,
-      offraidPosition,
-    );
+    const overrideByProfiles = this.getConfig().override_by_profiles?.[profileTemplateId];
+
+    return overrideByProfiles?.hideout_main_stash_access_via ?? defaultMainStashAccessVia;
+  }
+
+  private getMainStashAvailable(offraidPosition: string, sessionId: string): boolean {
+    const multiStashEnabled = this.getConfig().hideout_multistash_enabled;
+    const mainStashAccessVia = this.getMainStashAccessVia(sessionId);
+    const mainStashAvailable = checkAccessVia(mainStashAccessVia, offraidPosition);
 
     return mainStashAvailable || multiStashEnabled === false;
   }
@@ -128,7 +135,7 @@ export class StashController {
   }
 
   updateStash(offraidPosition: string, sessionId: string): void {
-    const mainStashAvailable = this.getMainStashAvailable(offraidPosition);
+    const mainStashAvailable = this.getMainStashAvailable(offraidPosition, sessionId);
     const secondaryStash = this.getSecondaryStash(offraidPosition);
     const profile: Profile = this.saveServer.getProfile(sessionId);
 
@@ -154,8 +161,8 @@ export class StashController {
     });
   }
 
-  getStashSize(offraidPosition: string): number | null {
-    const mainStashAvailable = this.getMainStashAvailable(offraidPosition);
+  getStashSize(offraidPosition: string, sessionId: string): number | null {
+    const mainStashAvailable = this.getMainStashAvailable(offraidPosition, sessionId);
     const secondaryStash = this.getSecondaryStash(offraidPosition);
 
     if (mainStashAvailable) {
@@ -165,7 +172,7 @@ export class StashController {
     return secondaryStash.size;
   }
 
-  getHideoutEnabled(offraidPosition: string): boolean {
-    return this.getMainStashAvailable(offraidPosition);
+  getHideoutEnabled(offraidPosition: string, sessionId: string): boolean {
+    return this.getMainStashAvailable(offraidPosition, sessionId);
   }
 }