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

Pass full profiles into mergePmcAndScavEncyclopedias

Browse Source
This commit is contained in:
Dev 2024-02-13 13:07:26 +00:00
parent 2e3f624131
commit 7975ebafda
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,7 +140,7 @@ export class InraidController
this.inRaidHelper.updateProfileBaseStats(serverPmcProfile, postRaidRequest, sessionID); this.inRaidHelper.updateProfileBaseStats(serverPmcProfile, postRaidRequest, sessionID);
this.inRaidHelper.updatePmcProfileDataPostRaid(serverPmcProfile, postRaidRequest, sessionID); this.inRaidHelper.updatePmcProfileDataPostRaid(serverPmcProfile, postRaidRequest, sessionID);
this.mergePmcAndScavEncyclopedias(serverPmcProfile.Encyclopedia, serverScavProfile.Encyclopedia); this.mergePmcAndScavEncyclopedias(serverPmcProfile, serverScavProfile);
// Check for exit status // Check for exit status
this.markOrRemoveFoundInRaidItems(postRaidRequest); this.markOrRemoveFoundInRaidItems(postRaidRequest);
@ -336,7 +336,7 @@ export class InraidController
this.inRaidHelper.updateProfileBaseStats(serverScavProfile, postRaidRequest, sessionID); this.inRaidHelper.updateProfileBaseStats(serverScavProfile, postRaidRequest, sessionID);
this.inRaidHelper.updateScavProfileDataPostRaid(serverScavProfile, postRaidRequest, sessionID); this.inRaidHelper.updateScavProfileDataPostRaid(serverScavProfile, postRaidRequest, sessionID);
this.mergePmcAndScavEncyclopedias(serverScavProfile.Encyclopedia, serverPmcProfile.Encyclopedia); this.mergePmcAndScavEncyclopedias(serverScavProfile, serverPmcProfile);
// 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))
@ -368,7 +368,7 @@ export class InraidController
* @param primary main dictionary * @param primary main dictionary
* @param secondary Secondary dictionary * @param secondary Secondary dictionary
*/ */
protected mergePmcAndScavEncyclopedias(primary: Record<string, boolean>, secondary: Record<string, boolean>): void protected mergePmcAndScavEncyclopedias(primary: IPmcData, secondary: IPmcData): void
{ {
function extend(target: { [key: string]: boolean; }, source: Record<string, boolean>) function extend(target: { [key: string]: boolean; }, source: Record<string, boolean>)
{ {
@ -382,9 +382,9 @@ export class InraidController
return target; return target;
} }
const merged = extend(extend({}, primary), secondary); const merged = extend(extend({}, primary.Encyclopedia), secondary.Encyclopedia);
primary = merged; primary.Encyclopedia = merged;
secondary = merged; secondary.Encyclopedia = merged;
} }
/** /**