Fixed incorrect globals interface and related code (fixes christmas e…

…rror)
sp-tarkov · Jan 17, 2025 · de00ac3 · de00ac3
1 parent f07ba3f
commit de00ac3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/project/src/callbacks/DataCallbacks.ts b/project/src/callbacks/DataCallbacks.ts
@@ -44,7 +44,6 @@ export class DataCallbacks {
      */
     public getGlobals(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGlobals> {
         const globals = this.databaseService.getGlobals();
-        globals.time = Date.now() / 1000;
 
         return this.httpResponse.getBody(this.databaseService.getGlobals());
     }

diff --git a/project/src/controllers/PrestigeController.ts b/project/src/controllers/PrestigeController.ts
@@ -88,6 +88,7 @@ export class PrestigeController {
         }
 
         // Skill copy
+        // TODO - Find what skills should be prestiged over
         const commonSKillsToCopy = prePrestigePmc.Skills.Common;
         for (const skillToCopy of commonSKillsToCopy) {
             // Set progress to max level 20

diff --git a/project/src/models/eft/common/IGlobals.ts b/project/src/models/eft/common/IGlobals.ts
@@ -2,11 +2,9 @@ import type { Ixy, Ixyz } from "@spt/models/eft/common/Ixyz";
 import type { IItem } from "@spt/models/eft/common/tables/IItem";
 
 export interface IGlobals {
-    time: number;
     config: IConfig;
     LocationInfection: ILocationInfection;
     bot_presets: IBotPreset[];
-    AudioSettings: IAudioSettings;
     BotWeaponScatterings: IBotWeaponScattering[];
     ItemPresets: Record<string, IPreset>;
 }
@@ -127,6 +125,7 @@ export interface IProjectileExplosionParams {
 }
 
 export interface IConfig {
+    AudioSettings: IAudioSettings;
     ArtilleryShelling: IArtilleryShelling;
     content: IContent;
     AimPunchMagnitude: number;

diff --git a/project/src/services/SeasonalEventService.ts b/project/src/services/SeasonalEventService.ts
@@ -488,7 +488,7 @@ export class SeasonalEventService {
         const globals = this.databaseService.getGlobals();
         globals.config.Airdrop.AirdropViewType = "NewYear";
 
-        const radioSettings = globals.AudioSettings.RadioBroadcastSettings;
+        const radioSettings = globals.config.AudioSettings.RadioBroadcastSettings;
 
         radioSettings.EnabledBroadcast = true;
         const christmasStation = radioSettings.RadioStations.find((x) => x.Station === "Christmas");