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

Merge branch '3.10.0-DEV' of https://dev.sp-tarkov.com/SPT/Server into 3.10.0-DEV

Browse Source
This commit is contained in:
Dev 2024-09-03 09:58:38 +01:00
commit 6b4a69b023
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
project/assets/database/traders/54cb50c76803fa8b248b4571/base.json
View File

@ -122,6 +122,5 @@
"category": [], "category": [],
"id_list": [] "id_list": []
}, },
"unlockedByDefault": true, "unlockedByDefault": true
"refreshTraderRagfairOffers": false }
}

32
project/src/helpers/ProfileHelper.ts
View File

@ -80,21 +80,24 @@ export class ProfileHelper {
return output; return output;
} }
const fullProfile = this.getFullProfile(sessionId); const fullProfileClone = this.cloner.clone(this.getFullProfile(sessionId));
// Sanitize any data the client can not receive
this.sanitizeProfileForClient(fullProfileClone);
// Edge-case, true post raid // Edge-case, true post raid
if (this.profileSnapshotService.hasProfileSnapshot(sessionId)) { if (this.profileSnapshotService.hasProfileSnapshot(sessionId)) {
return this.postRaidXpWorkaroundFix( return this.postRaidXpWorkaroundFix(
sessionId, sessionId,
fullProfile.characters.pmc, fullProfileClone.characters.pmc,
fullProfile.characters.scav, fullProfileClone.characters.scav,
output, output,
); );
} }
// PMC must be at array index 0, scav at 1 // PMC must be at array index 0, scav at 1
output.push(fullProfile.characters.pmc); output.push(fullProfileClone.characters.pmc);
output.push(fullProfile.characters.scav); output.push(fullProfileClone.characters.scav);
return output; return output;
} }
@ -113,13 +116,10 @@ export class ProfileHelper {
*/ */
protected postRaidXpWorkaroundFix( protected postRaidXpWorkaroundFix(
sessionId: string, sessionId: string,
pmcProfile: IPmcData, clonedPmc: IPmcData,
scavProfile: IPmcData, clonedScav: IPmcData,
output: IPmcData[], output: IPmcData[],
): IPmcData[] { ): IPmcData[] {
const clonedPmc = this.cloner.clone(pmcProfile);
const clonedScav = this.cloner.clone(scavProfile);
const profileSnapshot = this.profileSnapshotService.getProfileSnapshot(sessionId); const profileSnapshot = this.profileSnapshotService.getProfileSnapshot(sessionId);
clonedPmc.Info.Level = profileSnapshot.characters.pmc.Info.Level; clonedPmc.Info.Level = profileSnapshot.characters.pmc.Info.Level;
clonedPmc.Info.Experience = profileSnapshot.characters.pmc.Info.Experience; clonedPmc.Info.Experience = profileSnapshot.characters.pmc.Info.Experience;
@ -135,6 +135,18 @@ export class ProfileHelper {
return output; return output;
} }
/**
* Sanitize any information from the profile that the client does not expect to receive
* @param clonedProfile A clone of the full player profile
*/
protected sanitizeProfileForClient(clonedProfile: ISptProfile) {
// Remove `loyaltyLevel` from `TradersInfo`, as otherwise it causes the client to not
// properly calculate the player's `loyaltyLevel`
for (const traderInfo of Object.values(clonedProfile.characters.pmc.TradersInfo)) {
traderInfo.loyaltyLevel = undefined;
}
}
/** /**
* Check if a nickname is used by another profile loaded by the server * Check if a nickname is used by another profile loaded by the server
* @param nicknameRequest nickname request object * @param nicknameRequest nickname request object

2
project/src/models/eft/common/tables/IBotBase.ts
View File

@ -458,7 +458,7 @@ export interface IQuestStatus {
} }
export interface TraderInfo { export interface TraderInfo {
loyaltyLevel: number; loyaltyLevel?: number;
salesSum: number; salesSum: number;
standing: number; standing: number;
nextResupply: number; nextResupply: number;