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

Pass the location insurance was lost into sendLostInsuranceMessage()

Browse Source 
make use of mailSendService.sendLocalisedNpcMessageToPlayer()
Make use of new `insuranceFailedLabs` array in prapors json data
This commit is contained in:
Dev 2023-08-07 22:43:00 +01:00
parent 6b4341b955
commit 6262d74acc
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,10 +134,7 @@ export class InraidController
} }
else else
{ {
if (locationName.toLowerCase() === "laboratory") this.insuranceService.sendLostInsuranceMessage(sessionID, locationName);
{
this.insuranceService.sendLostInsuranceMessage(sessionID);
}
} }
if (isDead) if (isDead)

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

@ -4,16 +4,13 @@ import { ITraderBase } from "../models/eft/common/tables/ITrader";
import { DialogueHelper } from "../helpers/DialogueHelper"; import { DialogueHelper } from "../helpers/DialogueHelper";
import { HandbookHelper } from "../helpers/HandbookHelper"; import { HandbookHelper } from "../helpers/HandbookHelper";
import { ItemHelper } from "../helpers/ItemHelper"; import { ItemHelper } from "../helpers/ItemHelper";
import { NotificationSendHelper } from "../helpers/NotificationSendHelper";
import { SecureContainerHelper } from "../helpers/SecureContainerHelper"; import { SecureContainerHelper } from "../helpers/SecureContainerHelper";
import { TraderHelper } from "../helpers/TraderHelper"; import { TraderHelper } from "../helpers/TraderHelper";
import { IPmcData } from "../models/eft/common/IPmcData"; import { IPmcData } from "../models/eft/common/IPmcData";
import { Item } from "../models/eft/common/tables/IItem"; import { Item } from "../models/eft/common/tables/IItem";
import { IInsuredItemsData } from "../models/eft/inRaid/IInsuredItemsData"; import { IInsuredItemsData } from "../models/eft/inRaid/IInsuredItemsData";
import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData"; import { ISaveProgressRequestData } from "../models/eft/inRaid/ISaveProgressRequestData";
import { IUserDialogInfo } from "../models/eft/profile/IAkiProfile";
import { ConfigTypes } from "../models/enums/ConfigTypes"; import { ConfigTypes } from "../models/enums/ConfigTypes";
import { MemberCategory } from "../models/enums/MemberCategory";
import { MessageType } from "../models/enums/MessageType"; import { MessageType } from "../models/enums/MessageType";
import { Traders } from "../models/enums/Traders"; import { Traders } from "../models/enums/Traders";
import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig"; import { IInsuranceConfig } from "../models/spt/config/IInsuranceConfig";
@ -26,6 +23,7 @@ import { RandomUtil } from "../utils/RandomUtil";
import { TimeUtil } from "../utils/TimeUtil"; import { TimeUtil } from "../utils/TimeUtil";
import { LocaleService } from "./LocaleService"; import { LocaleService } from "./LocaleService";
import { LocalisationService } from "./LocalisationService"; import { LocalisationService } from "./LocalisationService";
import { MailSendService } from "./MailSendService";
@injectable() @injectable()
export class InsuranceService export class InsuranceService
@ -47,7 +45,7 @@ export class InsuranceService
@inject("HandbookHelper") protected handbookHelper: HandbookHelper, @inject("HandbookHelper") protected handbookHelper: HandbookHelper,
@inject("LocalisationService") protected localisationService: LocalisationService, @inject("LocalisationService") protected localisationService: LocalisationService,
@inject("LocaleService") protected localeService: LocaleService, @inject("LocaleService") protected localeService: LocaleService,
@inject("NotificationSendHelper") protected notificationSendHelper: NotificationSendHelper, @inject("MailSendService") protected mailSendService: MailSendService,
@inject("ConfigServer") protected configServer: ConfigServer @inject("ConfigServer") protected configServer: ConfigServer
) )
{ {
@ -139,24 +137,24 @@ export class InsuranceService
/** /**
* Send a message to player informing them gear was lost * Send a message to player informing them gear was lost
* @param sessionID Session id * @param sessionId Session id
* @param locationName name of map insurance was lost on
*/ */
public sendLostInsuranceMessage(sessionID: string): void public sendLostInsuranceMessage(sessionId: string, locationName = ""): void
{ {
const localeDb = this.localeService.getLocaleDb();
const dialogueTemplates = this.databaseServer.getTables().traders[Traders.PRAPOR].dialogue; // todo: get trader id instead of hard coded prapor const dialogueTemplates = this.databaseServer.getTables().traders[Traders.PRAPOR].dialogue; // todo: get trader id instead of hard coded prapor
const failedText = localeDb[this.randomUtil.getArrayValue(dialogueTemplates.insuranceFailed)]; const randomResponseId = locationName?.toLowerCase() === "laboratory"
const senderDetails: IUserDialogInfo = { ? this.randomUtil.getArrayValue(dialogueTemplates["insuranceFailedLabs"])
_id: Traders.PRAPOR, : this.randomUtil.getArrayValue(dialogueTemplates["insuranceFailed"]);
info: {
Nickname: "Prapor",
Level: 1,
Side: "Bear",
MemberCategory: MemberCategory.TRADER
}
};
this.notificationSendHelper.sendMessageToPlayer(sessionID, senderDetails, failedText, MessageType.NPC_TRADER); this.mailSendService.sendLocalisedNpcMessageToPlayer(
sessionId,
Traders.PRAPOR,
MessageType.NPC_TRADER,
randomResponseId,
[],
null,
{location: locationName});
} }
/** /**