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

Add system to purchase all clothing from trader on profile creation - enabled for tourney profile

Browse Source 
Fixed USEC profiles not having fence locked on tourney profile creation
This commit is contained in:
Dev 2024-05-27 16:30:03 +01:00
parent 7432817d7d
commit e5fd26b89c
3 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
project/assets/database/templates/profiles.json
View File

@ -36760,6 +36760,9 @@
"fleaBlockedDays": 365, "fleaBlockedDays": 365,
"lockedByDefaultOverride": [ "lockedByDefaultOverride": [
"579dc571d53a0658a154fbec" "579dc571d53a0658a154fbec"
],
"purchaseAlllClothingByDefaultForTrader":[
"5ac3b934156ae10c4430e83c"
] ]
}, },
"weaponbuilds": {} "weaponbuilds": {}
@ -37697,7 +37700,13 @@
"initialSalesSum": 0, "initialSalesSum": 0,
"initialStanding": 0.2, "initialStanding": 0.2,
"jaegerUnlocked": false, "jaegerUnlocked": false,
"fleaBlockedDays": 365 "fleaBlockedDays": 365,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
],
"purchaseAlllClothingByDefaultForTrader":[
"5ac3b934156ae10c4430e83c"
]
}, },
"weaponbuilds": {} "weaponbuilds": {}
} }

41
project/src/helpers/TraderHelper.ts
View File

@ -14,8 +14,8 @@ import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
import { ILogger } from "@spt/models/spt/utils/ILogger"; import { ILogger } from "@spt/models/spt/utils/ILogger";
import { ConfigServer } from "@spt/servers/ConfigServer"; import { ConfigServer } from "@spt/servers/ConfigServer";
import { DatabaseServer } from "@spt/servers/DatabaseServer"; import { DatabaseServer } from "@spt/servers/DatabaseServer";
import { SaveServer } from "@spt/servers/SaveServer";
import { FenceService } from "@spt/services/FenceService"; import { FenceService } from "@spt/services/FenceService";
import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
import { LocalisationService } from "@spt/services/LocalisationService"; import { LocalisationService } from "@spt/services/LocalisationService";
import { PlayerService } from "@spt/services/PlayerService"; import { PlayerService } from "@spt/services/PlayerService";
import { RandomUtil } from "@spt/utils/RandomUtil"; import { RandomUtil } from "@spt/utils/RandomUtil";
@ -33,7 +33,6 @@ export class TraderHelper
constructor( constructor(
@inject("WinstonLogger") protected logger: ILogger, @inject("WinstonLogger") protected logger: ILogger,
@inject("DatabaseServer") protected databaseServer: DatabaseServer, @inject("DatabaseServer") protected databaseServer: DatabaseServer,
@inject("SaveServer") protected saveServer: SaveServer,
@inject("ProfileHelper") protected profileHelper: ProfileHelper, @inject("ProfileHelper") protected profileHelper: ProfileHelper,
@inject("HandbookHelper") protected handbookHelper: HandbookHelper, @inject("HandbookHelper") protected handbookHelper: HandbookHelper,
@inject("ItemHelper") protected itemHelper: ItemHelper, @inject("ItemHelper") protected itemHelper: ItemHelper,
@ -129,10 +128,10 @@ export class TraderHelper
public resetTrader(sessionID: string, traderID: string): void public resetTrader(sessionID: string, traderID: string): void
{ {
const db = this.databaseServer.getTables(); const db = this.databaseServer.getTables();
const account = this.saveServer.getProfile(sessionID); const fullProfile = this.profileHelper.getFullProfile(sessionID);
const pmcData = this.profileHelper.getPmcProfile(sessionID); const pmcData = fullProfile.characters.pmc;
const rawProfileTemplate: ProfileTraderTemplate const rawProfileTemplate: ProfileTraderTemplate
= db.templates.profiles[account.info.edition][pmcData.Info.Side.toLowerCase()] = db.templates.profiles[fullProfile.info.edition][pmcData.Info.Side.toLowerCase()]
.trader; .trader;
pmcData.TradersInfo[traderID] = { pmcData.TradersInfo[traderID] = {
@ -150,6 +149,16 @@ export class TraderHelper
pmcData.TradersInfo[traderID].unlocked = false; pmcData.TradersInfo[traderID].unlocked = false;
} }
if (rawProfileTemplate.purchaseAlllClothingByDefaultForTrader?.includes(traderID))
{
//Get traders clothing
const clothing = this.databaseServer.getTables().traders[traderID].suits;
// Force suit ids into profile
this.addSuitsToProfile(fullProfile, clothing.map(x => x.suiteId));
}
if (rawProfileTemplate.fleaBlockedDays > 0) if (rawProfileTemplate.fleaBlockedDays > 0)
{ {
const newBanDateTime = this.timeUtil.getTimeStampFromNowDays(rawProfileTemplate.fleaBlockedDays); const newBanDateTime = this.timeUtil.getTimeStampFromNowDays(rawProfileTemplate.fleaBlockedDays);
@ -191,6 +200,28 @@ export class TraderHelper
return rawProfileTemplate.initialStanding; return rawProfileTemplate.initialStanding;
} }
/**
* Add an array of suit ids to a profiles suit array, no duplicates
* @param fullProfile Profile to add to
* @param suitIds Suit Ids to add
*/
protected addSuitsToProfile(fullProfile: ISptProfile, suitIds: string[]): void
{
if (!fullProfile.suits)
{
fullProfile.suits = [];
}
for (const suitId of suitIds)
{
// Don't add dupes
if (!fullProfile.suits.includes(suitId))
{
fullProfile.suits.push(suitId);
}
}
}
/** /**
* Alter a traders unlocked status * Alter a traders unlocked status
* @param traderId Trader to alter * @param traderId Trader to alter

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

@ -44,4 +44,6 @@ export interface ProfileTraderTemplate
fleaBlockedDays?: number fleaBlockedDays?: number
/** What traders default to being locked on profile creation */ /** What traders default to being locked on profile creation */
lockedByDefaultOverride?: string[] lockedByDefaultOverride?: string[]
/** What traders should have their clothing unlocked/purchased on creation */
purchaseAlllClothingByDefaultForTrader?: string[]
} }