470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed maps with transit requirements not working after player transits

Browse Source
This commit is contained in:
Dev 2024-10-07 12:48:49 +01:00
parent 34b9785955
commit ca529eb5a0
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project/src/context/ContextVariableType.ts
View File

@ -8,4 +8,6 @@ export enum ContextVariableType {
/** When player is loading into map and loot is requested */ /** When player is loading into map and loot is requested */
REGISTER_PLAYER_REQUEST = 3, REGISTER_PLAYER_REQUEST = 3,
RAID_ADJUSTMENTS = 4, RAID_ADJUSTMENTS = 4,
/** Data returned from client request object from endLocalRaid() */
TRANSIT_INFO = 5,
} }

30
project/src/services/LocationLifecycleService.ts
View File

@ -11,7 +11,11 @@ import { ILocationBase } from "@spt/models/eft/common/ILocationBase";
import { IPmcData } from "@spt/models/eft/common/IPmcData"; import { IPmcData } from "@spt/models/eft/common/IPmcData";
import { Common, IQuestStatus, ITraderInfo } from "@spt/models/eft/common/tables/IBotBase"; import { Common, IQuestStatus, ITraderInfo } from "@spt/models/eft/common/tables/IBotBase";
import { IItem } from "@spt/models/eft/common/tables/IItem"; import { IItem } from "@spt/models/eft/common/tables/IItem";
import { IEndLocalRaidRequestData, IEndRaidResult } from "@spt/models/eft/match/IEndLocalRaidRequestData"; import {
IEndLocalRaidRequestData,
IEndRaidResult,
ILocationTransit,
} from "@spt/models/eft/match/IEndLocalRaidRequestData";
import { IStartLocalRaidRequestData } from "@spt/models/eft/match/IStartLocalRaidRequestData"; import { IStartLocalRaidRequestData } from "@spt/models/eft/match/IStartLocalRaidRequestData";
import { IStartLocalRaidResponseData } from "@spt/models/eft/match/IStartLocalRaidResponseData"; import { IStartLocalRaidResponseData } from "@spt/models/eft/match/IStartLocalRaidResponseData";
import { ConfigTypes } from "@spt/models/enums/ConfigTypes"; import { ConfigTypes } from "@spt/models/enums/ConfigTypes";
@ -107,9 +111,24 @@ export class LocationLifecycleService {
// Only has value when transitioning into map from previous one // Only has value when transitioning into map from previous one
if (request.transition) { if (request.transition) {
// TODO - why doesnt the second raid after transit have any transition data?
result.transition = request.transition; result.transition = request.transition;
} }
// Get data stored at end of previous raid (if any)
const transitionData = this.applicationContext
.getLatestValue(ContextVariableType.TRANSIT_INFO)
?.getValue<ILocationTransit>();
if (transitionData) {
result.transition.isLocationTransition = true;
result.transition.transitionRaidId = transitionData.transitionRaidId;
result.transition.transitionCount += 1;
result.transition.visitedLocations.push(transitionData.location); // TODO - check doesnt exist before adding to prevent dupes
// Complete, clean up
this.applicationContext.clearValues(ContextVariableType.TRANSIT_INFO);
}
// Apply changes from pmcConfig to bot hostility values // Apply changes from pmcConfig to bot hostility values
this.adjustBotHostilitySettings(result.locationLoot); this.adjustBotHostilitySettings(result.locationLoot);
@ -293,6 +312,7 @@ export class LocationLifecycleService {
return locationBaseClone; return locationBaseClone;
} }
/** Handle client/match/local/end */
public endLocalRaid(sessionId: string, request: IEndLocalRaidRequestData): void { public endLocalRaid(sessionId: string, request: IEndLocalRaidRequestData): void {
// Clear bot loot cache // Clear bot loot cache
this.botLootCacheService.clearCache(); this.botLootCacheService.clearCache();
@ -321,9 +341,15 @@ export class LocationLifecycleService {
const isTransfer = this.isMapToMapTransfer(request.results); const isTransfer = this.isMapToMapTransfer(request.results);
const isSurvived = this.isPlayerSurvived(request.results); const isSurvived = this.isPlayerSurvived(request.results);
// Handle items transferred via BTR or transit to player mail // Handle items transferred via BTR or transit to player mailbox
this.handleItemTransferEvent(sessionId, request); this.handleItemTransferEvent(sessionId, request);
// Player is moving between maps
if (isTransfer) {
// Store transfer data for later use in `startLocalRaid()` when next raid starts
this.applicationContext.addValue(ContextVariableType.TRANSIT_INFO, request.locationTransit);
}
if (!isPmc) { if (!isPmc) {
this.handlePostRaidPlayerScav(sessionId, pmcProfile, scavProfile, isDead, isTransfer, request); this.handlePostRaidPlayerScav(sessionId, pmcProfile, scavProfile, isDead, isTransfer, request);