User raid counter to determine whether to regen loot

project-fika · Nov 22, 2024 · db873e5 · db873e5
1 parent cbd5e69
commit db873e5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/models/fika/IFikaMatch.ts b/src/models/fika/IFikaMatch.ts
@@ -24,4 +24,5 @@ export interface IFikaMatch {
     raidCode: string;
     natPunch: boolean;
     isDedicated: boolean;
+    raids: number;
 }
diff --git a/src/overrides/services/LocationLifecycleService.ts b/src/overrides/services/LocationLifecycleService.ts
@@ -54,7 +54,10 @@ export class LocationLifecycleServiceOverride extends Override {
                         // player is in a Fika match, use match location loot and regen if transit
                         const match = this.fikaMatchService.getMatch(matchId);
                         if (matchId === sessionId) {
-                            match.locationData = lifecycleService.generateLocationAndLoot(request.location);
+                            match.raids++;
+                            if (match.raids > 1) {
+                                match.locationData = lifecycleService.generateLocationAndLoot(request.location);
+                            }
                         }
                         locationLoot = match.locationData;
                     }

diff --git a/src/services/FikaMatchService.ts b/src/services/FikaMatchService.ts
@@ -1,20 +1,20 @@
 import { inject, injectable } from "tsyringe";
 
-import { LocationLifecycleService } from "@spt/services/LocationLifecycleService";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { SaveServer } from "@spt/servers/SaveServer";
+import { LocationLifecycleService } from "@spt/services/LocationLifecycleService";
 
 import { EFikaMatchEndSessionMessage } from "../models/enums/EFikaMatchEndSessionMessages";
 import { EFikaMatchStatus } from "../models/enums/EFikaMatchStatus";
+import { EFikaPlayerPresences } from "../models/enums/EFikaPlayerPresences";
 import { IFikaMatch } from "../models/fika/IFikaMatch";
 import { IFikaPlayer } from "../models/fika/IFikaPlayer";
 import { IFikaRaidCreateRequestData } from "../models/fika/routes/raid/create/IFikaRaidCreateRequestData";
-import { EFikaPlayerPresences } from "../models/enums/EFikaPlayerPresences";
 
 import { FikaConfig } from "../utils/FikaConfig";
-import { FikaDedicatedRaidService } from "./dedicated/FikaDedicatedRaidService";
 import { FikaInsuranceService } from "./FikaInsuranceService";
 import { FikaPresenceService } from "./FikaPresenceService";
+import { FikaDedicatedRaidService } from "./dedicated/FikaDedicatedRaidService";
 
 @injectable()
 export class FikaMatchService {
@@ -209,6 +209,7 @@ export class FikaMatchService {
             raidCode: data.raidCode,
             natPunch: false,
             isDedicated: false,
+            raids: 0
         });
 
         this.addTimeoutInterval(data.serverId);