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

Fixed getAccountTypeAdjustedTraderPurchaseLimit() not applying to unheard profiles

Browse Source 
Created `GameVersions` enum and replaced all magic strings with it
This commit is contained in:
Dev 2024-06-16 21:22:28 +01:00
parent 04dee496eb
commit 4094b7ecff
5 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
project/src/generators/BotGenerator.ts
View File

@ -18,6 +18,7 @@ import {
import { Appearance, Health, IBotType, Inventory } from "@spt/models/eft/common/tables/IBotType";
import { Item, Upd } from "@spt/models/eft/common/tables/IItem";
import { ConfigTypes } from "@spt/models/enums/ConfigTypes";
import { GameEditions } from "@spt/models/enums/GameEditions";
import { ItemTpl } from "@spt/models/enums/ItemTpl";
import { MemberCategory } from "@spt/models/enums/MemberCategory";
import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
@ -213,7 +214,7 @@ export class BotGenerator
{
bot.Info.IsStreamerModeAvailable = true; // Set to true so client patches can pick it up later - client sometimes alters botrole to assaultGroup
chosenGameVersion = this.setRandomisedGameVersionAndCategory(bot.Info);
if (chosenGameVersion === "unheard_edition")
if (chosenGameVersion === GameEditions.UNHEARD)
{
this.addAdditionalPocketLootWeightsForUnheardBot(botJsonTemplate);
}
@ -585,7 +586,7 @@ export class BotGenerator
{
if (botInfo.Nickname.toLowerCase() === "nikita")
{
botInfo.GameVersion = "unheard_edition";
botInfo.GameVersion = GameEditions.UNHEARD;
botInfo.MemberCategory = MemberCategory.DEVELOPER;
return botInfo.GameVersion;
@ -648,9 +649,9 @@ export class BotGenerator
{
switch (gameVersion)
{
case "edge_of_darkness":
case GameEditions.EDGE_OF_DARKNESS:
return ItemTpl.BARTER_DOGTAG_USEC_EOD;
case "unheard_edition":
case GameEditions.UNHEARD:
return ItemTpl.BARTER_DOGTAG_USEC_TUE;
default:
return ItemTpl.BARTER_DOGTAG_USEC;
@ -659,9 +660,9 @@ export class BotGenerator
switch (gameVersion)
{
case "edge_of_darkness":
case GameEditions.EDGE_OF_DARKNESS:
return ItemTpl.BARTER_DOGTAG_BEAR_EOD;
case "unheard_edition":
case GameEditions.UNHEARD:
return ItemTpl.BARTER_DOGTAG_BEAR_TUE;
default:
return ItemTpl.BARTER_DOGTAG_BEAR;
@ -674,7 +675,7 @@ export class BotGenerator
*/
protected setPmcPocketsByGameVersion(bot: IBotBase): void
{
if (bot.Info.GameVersion === "unheard_edition")
if (bot.Info.GameVersion === GameEditions.UNHEARD)
{
const pockets = bot.Inventory.items.find((item) => item.slotId === "Pockets");
pockets._tpl = ItemTpl.POCKETS_1X4_TUE;

5
project/src/generators/BotInventoryGenerator.ts
View File

@ -11,6 +11,7 @@ import { Chances, Generation, IBotType, Inventory, Mods } from "@spt/models/eft/
import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
import { ConfigTypes } from "@spt/models/enums/ConfigTypes";
import { EquipmentSlots } from "@spt/models/enums/EquipmentSlots";
import { GameEditions } from "@spt/models/enums/GameEditions";
import { ItemTpl } from "@spt/models/enums/ItemTpl";
import {
EquipmentFilterDetails,
@ -191,7 +192,9 @@ export class BotInventoryGenerator
// Generate below in specific order
this.generateEquipment({
rootEquipmentSlot: EquipmentSlots.POCKETS,
rootEquipmentPool: chosenGameVersion === "unheard_edition" ? { [ItemTpl.POCKETS_1X4_TUE]: 1 } : templateInventory.equipment.Pockets,
rootEquipmentPool: chosenGameVersion === GameEditions.UNHEARD
? { [ItemTpl.POCKETS_1X4_TUE]: 1 }
: templateInventory.equipment.Pockets,
modPool: templateInventory.mods,
spawnChances: wornItemChances,
botRole: botRole,

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

@ -7,6 +7,7 @@ import { IValidateNicknameRequestData } from "@spt/models/eft/profile/IValidateN
import { AccountTypes } from "@spt/models/enums/AccountTypes";
import { BonusType } from "@spt/models/enums/BonusType";
import { ConfigTypes } from "@spt/models/enums/ConfigTypes";
import { GameEditions } from "@spt/models/enums/GameEditions";
import { SkillTypes } from "@spt/models/enums/SkillTypes";
import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig";
import { ILogger } from "@spt/models/spt/utils/ILogger";
@ -573,7 +574,7 @@ export class ProfileHelper
public hasAccessToRepeatableFreeRefreshSystem(pmcProfile: IPmcData): boolean
{
return ["edge_of_darkness", "unheard_edition"]
.includes(pmcProfile.Info?.GameVersion);
return [GameEditions.EDGE_OF_DARKNESS, GameEditions.UNHEARD]
.includes(<any>pmcProfile.Info?.GameVersion);
}
}

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

@ -10,6 +10,7 @@ import { ProfileTraderTemplate } from "@spt/models/eft/common/tables/IProfileTem
import { ITraderAssort, ITraderBase, LoyaltyLevel } from "@spt/models/eft/common/tables/ITrader";
import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
import { ConfigTypes } from "@spt/models/enums/ConfigTypes";
import { GameEditions } from "@spt/models/enums/GameEditions";
import { Money } from "@spt/models/enums/Money";
import { Traders } from "@spt/models/enums/Traders";
import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
@ -459,7 +460,7 @@ export class TraderHelper
*/
public getAccountTypeAdjustedTraderPurchaseLimit(buyRestrictionMax: number, gameVersion: string): number
{
if (["edge_of_darkness", "unheard"].includes(gameVersion))
if ([GameEditions.EDGE_OF_DARKNESS, GameEditions.UNHEARD].includes(<any>gameVersion))
{
return Math.floor(buyRestrictionMax * 1.2);
}

9
project/src/models/enums/GameEditions.ts Normal file
View File

@ -0,0 +1,9 @@
export enum GameEditions
{
STANDARD = "standard",
LEFT_BEHIND = "left_behind",
PREPARE_FOR_ESCAPE = "prepare_for_escape",
EDGE_OF_DARKNESS = "edge_of_darkness",
UNHEARD = "unheard_edition",
TOURNAMENT = "tournament_live",
}