spt/server
spt/server
0
0
Fork 0
mirror of https://github.com/sp-tarkov/server.git synced 2025-02-13 09:30:45 -05:00
Code

Fixed MARK_OF_UNHEARD incorrectly adjusting insurance return time

Browse Source 
Added `ItemHelper.hasItem()`
This commit is contained in:
Dev 2024-06-13 09:47:03 +01:00
parent 6c1935f93f
commit 3c0887172e
3 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
project/src/helpers/ItemHelper.ts
View File

@ -7,6 +7,7 @@ import { Item, Location, Repairable, Upd } from "@spt/models/eft/common/tables/I
import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
import { BaseClasses } from "@spt/models/enums/BaseClasses";
import { EquipmentSlots } from "@spt/models/enums/EquipmentSlots";
import { ItemTpl } from "@spt/models/enums/ItemTpl";
import { ILogger } from "@spt/models/spt/utils/ILogger";
import { DatabaseService } from "@spt/services/DatabaseService";
import { ItemBaseClassService } from "@spt/services/ItemBaseClassService";
@ -52,6 +53,24 @@ export class ItemHelper
)
{}
/**
* Does the provided pool of items contain the desired item
* @param itemPool Item collection to check
* @param item Item to look for
* @param slotId OPTIONAL - slotid of desired item
* @returns True if pool contains item
*/
public hasItem(itemPool: Item[], item: ItemTpl, slotId?: string): boolean
{
// Filter the pool by slotId if provided
const filteredPool = (slotId)
? itemPool.filter((item) => item.slotId?.startsWith(slotId))
: itemPool;
// Check if any item in the filtered pool matches the provided item
return filteredPool.some((poolItem) => poolItem._tpl === item);
}
/**
* This method will compare two items (with all its children) and see if the are equivalent.
* This method will NOT compare IDs on the items

5
project/src/models/enums/ItemTpl.ts Normal file
View File

@ -0,0 +1,5 @@
export enum ItemTpl
{
MARK_OF_UNHEARD = "65ddcc9cfa85b9f17d0dfb07",
SACRED_AMULET = "64d0b40fbe2eed70e254e2d4",
}

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

@ -11,6 +11,7 @@ import { IInsuredItemsData } from "@spt/models/eft/inRaid/IInsuredItemsData";
import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRequestData";
import { BonusType } from "@spt/models/enums/BonusType";
import { ConfigTypes } from "@spt/models/enums/ConfigTypes";
import { ItemTpl } from "@spt/models/enums/ItemTpl";
import { MessageType } from "@spt/models/enums/MessageType";
import { IInsuranceConfig } from "@spt/models/spt/config/IInsuranceConfig";
import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig";
@ -101,27 +102,16 @@ export class InsuranceService
*/
public sendInsuredItems(pmcData: IPmcData, sessionID: string, mapId: string): void
{
// Check for Mark of The Unheard in special slot (only slot it can fit)
const markOfTheUnheardOnPlayer = pmcData.Inventory.items
.filter((item) => item.slotId?.startsWith("SpecialSlot"))
.find((item) => item._tpl === "65ddcc9cfa85b9f17d0dfb07");
// Get insurance items for each trader
const globals = this.databaseService.getGlobals();
for (const traderId in this.getInsurance(sessionID))
{
const globals = this.databaseService.getGlobals();
const traderBase = this.traderHelper.getTrader(traderId, sessionID);
if (!traderBase)
{
throw new Error(this.localisationService.getText("insurance-unable_to_find_trader_by_id", traderId));
}
let insuranceReturnTimestamp = this.getInsuranceReturnTimestamp(pmcData, traderBase);
if (markOfTheUnheardOnPlayer)
{
insuranceReturnTimestamp *= globals.config.Insurance.CoefOfHavingMarkOfUnknown;
}
const dialogueTemplates = this.databaseService.getTrader(traderId).dialogue;
if (!dialogueTemplates)
{
@ -155,7 +145,7 @@ export class InsuranceService
// Store insurance to send to player later in profile
// Store insurance return details in profile + "hey i found your stuff, here you go!" message details to send to player at a later date
this.saveServer.getProfile(sessionID).insurance.push({
scheduledTime: insuranceReturnTimestamp,
scheduledTime: this.getInsuranceReturnTimestamp(pmcData, traderBase),
traderId: traderId,
maxStorageTime: this.timeUtil.getHoursAsSeconds(traderBase.insurance.max_storage_time),
systemData: systemData,
@ -198,7 +188,7 @@ export class InsuranceService
*/
protected getInsuranceReturnTimestamp(pmcData: IPmcData, trader: ITraderBase): number
{
// If override inconfig is non-zero, use that instead of trader values
// If override in config is non-zero, use that instead of trader values
if (this.insuranceConfig.returnTimeOverrideSeconds > 0)
{
this.logger.debug(
@ -207,13 +197,25 @@ export class InsuranceService
return this.timeUtil.getTimestamp() + this.insuranceConfig.returnTimeOverrideSeconds;
}
const insuranceReturnTimeBonus = pmcData.Bonuses.find((b) => b.type === BonusType.INSURANCE_RETURN_TIME);
const insuranceReturnTimeBonus = pmcData.Bonuses.find((bonus) => bonus.type === BonusType.INSURANCE_RETURN_TIME);
const insuranceReturnTimeBonusPercent
= 1.0 - (insuranceReturnTimeBonus ? Math.abs(insuranceReturnTimeBonus!.value ?? 0) : 0) / 100;
const traderMinReturnAsSeconds = trader.insurance.min_return_hour * TimeUtil.ONE_HOUR_AS_SECONDS;
const traderMaxReturnAsSeconds = trader.insurance.max_return_hour * TimeUtil.ONE_HOUR_AS_SECONDS;
const randomisedReturnTimeSeconds = this.randomUtil.getInt(traderMinReturnAsSeconds, traderMaxReturnAsSeconds);
let randomisedReturnTimeSeconds = this.randomUtil.getInt(traderMinReturnAsSeconds, traderMaxReturnAsSeconds);
// Check for Mark of The Unheard in players special slots (only slot item can fit)
const hasMarkOfUnheard = this.itemHelper.hasItem(
pmcData.Inventory.items,
ItemTpl.MARK_OF_UNHEARD,
"SpecialSlot");
if (hasMarkOfUnheard)
{
// Reduce return time by globals multipler value
const globals = this.databaseService.getGlobals();
randomisedReturnTimeSeconds *= globals.config.Insurance.CoefOfHavingMarkOfUnknown;
}
// Current time + randomised time calculated above
return this.timeUtil.getTimestamp() + randomisedReturnTimeSeconds * insuranceReturnTimeBonusPercent;