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

Fix incorrect trader messages being sent when dealing with insurance on labs (!241)

Browse Source 
Co-authored-by: HiddenCirno <hiddencirno@noreply.dev.sp-tarkov.com>
Co-authored-by: Dev <dev@dev.sp-tarkov.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/241
This commit is contained in:
chomp 2024-03-03 11:06:33 +00:00
parent d828e9da7d
commit 9a28e86261
3 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,9 +172,7 @@ export class InraidController
if (gearToStore.length > 0) if (gearToStore.length > 0)
{ {
mapHasInsuranceEnabled this.insuranceService.storeGearLostInRaidToSendLater(sessionID, gearToStore);
? this.insuranceService.storeGearLostInRaidToSendLater(sessionID, gearToStore)
: this.insuranceService.sendLostInsuranceMessage(sessionID, locationName);
} }
// Edge case - Handle usec players leaving lighthouse with Rogues angry at them // Edge case - Handle usec players leaving lighthouse with Rogues angry at them
@ -235,11 +233,8 @@ export class InraidController
this.pmcChatResponseService.sendVictimResponse(sessionID, victims, serverPmcProfile); this.pmcChatResponseService.sendVictimResponse(sessionID, victims, serverPmcProfile);
} }
if (mapHasInsuranceEnabled)
{
this.insuranceService.sendInsuredItems(serverPmcProfile, sessionID, map.Id); this.insuranceService.sendInsuredItems(serverPmcProfile, sessionID, map.Id);
} }
}
/** /**
* Make changes to PMC profile after they've died in raid, * Make changes to PMC profile after they've died in raid,

18
project/src/controllers/InsuranceController.ts
View File

@ -522,10 +522,22 @@ export class InsuranceController
{ {
// After all of the item filtering that we've done, if there are no items remaining, the insurance has // After all of the item filtering that we've done, if there are no items remaining, the insurance has
// successfully "failed" to return anything and an appropriate message should be sent to the player. // successfully "failed" to return anything and an appropriate message should be sent to the player.
if (insurance.items.length === 0) const traderDialogMessages = this.databaseServer.getTables().traders[insurance.traderId].dialogue;
if (insurance.systemData?.location.toLowerCase() === "laboratory")
{ {
const insuranceFailedTemplates = // Trader has labs-specific messages
this.databaseServer.getTables().traders[insurance.traderId].dialogue.insuranceFailed; // Wipe out returnable items
if (traderDialogMessages.insuranceFailedLabs?.length > 0)
{
const insuranceFailedLabTemplates = traderDialogMessages.insuranceFailedLabs;
insurance.messageTemplateId = this.randomUtil.getArrayValue(insuranceFailedLabTemplates);
insurance.items = [];
}
}
else if (insurance.items.length === 0)
{
// Not labs and no items to return
const insuranceFailedTemplates = traderDialogMessages.insuranceFailed;
insurance.messageTemplateId = this.randomUtil.getArrayValue(insuranceFailedTemplates); insurance.messageTemplateId = this.randomUtil.getArrayValue(insuranceFailedTemplates);
} }

23
project/src/services/InsuranceService.ts
View File

@ -142,29 +142,6 @@ export class InsuranceService
this.resetInsurance(sessionID); this.resetInsurance(sessionID);
} }
/**
* Send a message to player informing them gear was completely lost
* @param sessionId Session id
* @param locationName name of map insurance was lost on
*/
public sendLostInsuranceMessage(sessionId: string, locationName = ""): void
{
const dialogueTemplates = this.databaseServer.getTables().traders[Traders.PRAPOR].dialogue; // todo: get trader id instead of hard coded prapor
const randomResponseId = locationName?.toLowerCase() === "laboratory"
? this.randomUtil.getArrayValue(dialogueTemplates.insuranceFailedLabs)
: this.randomUtil.getArrayValue(dialogueTemplates.insuranceFailed);
this.mailSendService.sendLocalisedNpcMessageToPlayer(
sessionId,
this.traderHelper.getTraderById(Traders.PRAPOR),
MessageType.NPC_TRADER,
randomResponseId,
[],
null,
{ location: locationName },
);
}
/** /**
* Check all root insured items and remove location property + set slotId to 'hideout' * Check all root insured items and remove location property + set slotId to 'hideout'
* @param sessionId Session id * @param sessionId Session id