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

Add funtionality to propigate scav Charisma gains into PMC based on live testing

Browse Source
This commit is contained in:
Dev 2024-03-18 12:56:34 +00:00
parent bd0cb15596
commit f2254b150a
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
project/src/controllers/InraidController.ts
View File

@ -19,6 +19,7 @@ import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes";
import { MessageType } from "@spt-aki/models/enums/MessageType"; import { MessageType } from "@spt-aki/models/enums/MessageType";
import { PlayerRaidEndState } from "@spt-aki/models/enums/PlayerRaidEndState"; import { PlayerRaidEndState } from "@spt-aki/models/enums/PlayerRaidEndState";
import { QuestStatus } from "@spt-aki/models/enums/QuestStatus"; import { QuestStatus } from "@spt-aki/models/enums/QuestStatus";
import { SkillTypes } from "@spt-aki/models/enums/SkillTypes";
import { Traders } from "@spt-aki/models/enums/Traders"; import { Traders } from "@spt-aki/models/enums/Traders";
import { IAirdropConfig } from "@spt-aki/models/spt/config/IAirdropConfig"; import { IAirdropConfig } from "@spt-aki/models/spt/config/IAirdropConfig";
import { IBTRConfig } from "@spt-aki/models/spt/config/IBTRConfig"; import { IBTRConfig } from "@spt-aki/models/spt/config/IBTRConfig";
@ -334,6 +335,10 @@ export class InraidController
const serverPmcProfile = this.profileHelper.getPmcProfile(sessionID); const serverPmcProfile = this.profileHelper.getPmcProfile(sessionID);
const serverScavProfile = this.profileHelper.getScavProfile(sessionID); const serverScavProfile = this.profileHelper.getScavProfile(sessionID);
const isDead = this.isPlayerDead(postRaidRequest.exit); const isDead = this.isPlayerDead(postRaidRequest.exit);
const preRaidScavCharismaProgress = this.profileHelper.getSkillFromProfile(
serverScavProfile,
SkillTypes.CHARISMA,
)?.Progress;
this.saveServer.getProfile(sessionID).inraid.character = "scav"; this.saveServer.getProfile(sessionID).inraid.character = "scav";
@ -342,6 +347,8 @@ export class InraidController
this.mergePmcAndScavEncyclopedias(serverScavProfile, serverPmcProfile); this.mergePmcAndScavEncyclopedias(serverScavProfile, serverPmcProfile);
this.updatePmcCharismaSkillPostScavRaid(serverScavProfile, serverPmcProfile, preRaidScavCharismaProgress);
// Completing scav quests create ConditionCounters, these values need to be transported to the PMC profile // Completing scav quests create ConditionCounters, these values need to be transported to the PMC profile
if (this.profileHasConditionCounters(serverScavProfile)) if (this.profileHasConditionCounters(serverScavProfile))
{ {
@ -391,6 +398,33 @@ export class InraidController
secondary.Encyclopedia = merged; secondary.Encyclopedia = merged;
} }
/**
* Post-scav-raid any charisma increase must be propigated into PMC profile
* @param postRaidServerScavProfile Scav profile after adjustments made from raid
* @param postRaidServerPmcProfile Pmc profile after raid
* @param preRaidScavCharismaProgress charisma progress value pre-raid
*/
protected updatePmcCharismaSkillPostScavRaid(
postRaidServerScavProfile: IPmcData,
postRaidServerPmcProfile: IPmcData,
preRaidScavCharismaProgress: number,
): void
{
const postRaidScavCharismaSkill = this.profileHelper.getSkillFromProfile(
postRaidServerScavProfile,
SkillTypes.CHARISMA,
);
const pmcCharismaSkill = this.profileHelper.getSkillFromProfile(postRaidServerPmcProfile, SkillTypes.CHARISMA);
const postRaidScavCharismaGain = postRaidScavCharismaSkill?.Progress - preRaidScavCharismaProgress ?? 0;
// Scav gained charisma, add to pmc
if (postRaidScavCharismaGain > 0)
{
this.logger.debug(`Applying ${postRaidScavCharismaGain} Charisma skill gained in scav raid to PMC profile`);
pmcCharismaSkill.Progress += postRaidScavCharismaGain;
}
}
/** /**
* Does provided profile contain any condition counters * Does provided profile contain any condition counters
* @param profile Profile to check for condition counters * @param profile Profile to check for condition counters