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

Rename all globals.ts interfaces to improve naming consistency

Browse Source
This commit is contained in:
Dev 2023-07-18 15:44:14 +01:00
parent 5b3e3e33df
commit 942c079284
12 changed files with 433 additions and 433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project/src/controllers/PresetController.ts
View File

@ -1,6 +1,6 @@
import { inject, injectable } from "tsyringe";
import { PresetHelper } from "../helpers/PresetHelper";
import { Preset } from "../models/eft/common/IGlobals";
import { IPreset } from "../models/eft/common/IGlobals";
import { DatabaseServer } from "../servers/DatabaseServer";
@injectable()
@ -14,7 +14,7 @@ export class PresetController
public initialize(): void
{
const presets: Preset[] = Object.values(this.databaseServer.getTables().globals.ItemPresets);
const presets: IPreset[] = Object.values(this.databaseServer.getTables().globals.ItemPresets);
const reverse: Record<string, string[]> = {};
for (const preset of presets)

4
project/src/generators/BotLevelGenerator.ts
View File

@ -2,7 +2,7 @@ import { inject, injectable } from "tsyringe";
import { MinMax } from "../models/common/MinMax";
import { IRandomisedBotLevelResult } from "../models/eft/bot/IRandomisedBotLevelResult";
import { ExpTable } from "../models/eft/common/IGlobals";
import { IExpTable } from "../models/eft/common/IGlobals";
import { IBotBase } from "../models/eft/common/tables/IBotBase";
import { BotGenerationDetails } from "../models/spt/bots/BotGenerationDetails";
import { ILogger } from "../models/spt/utils/ILogger";
@ -56,7 +56,7 @@ export class BotLevelGenerator
* @param relativeDeltaMax max delta above player level to go
* @returns highest level possible for bot
*/
protected getHighestRelativeBotLevel(playerLevel: number, relativeDeltaMax: number, levelDetails: MinMax, expTable: ExpTable[]): number
protected getHighestRelativeBotLevel(playerLevel: number, relativeDeltaMax: number, levelDetails: MinMax, expTable: IExpTable[]): number
{
const maxPossibleLevel = Math.min(levelDetails.max, expTable.length);

4
project/src/generators/BotWeaponGenerator.ts
View File

@ -5,7 +5,7 @@ import { BotWeaponGeneratorHelper } from "../helpers/BotWeaponGeneratorHelper";
import { ItemHelper } from "../helpers/ItemHelper";
import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
import { MinMax } from "../models/common/MinMax";
import { Preset } from "../models/eft/common/IGlobals";
import { IPreset } from "../models/eft/common/IGlobals";
import { Inventory as PmcInventory } from "../models/eft/common/tables/IBotBase";
import { Inventory, ModsChances } from "../models/eft/common/tables/IBotType";
import { Item } from "../models/eft/common/tables/IItem";
@ -193,7 +193,7 @@ export class BotWeaponGenerator
const weaponMods = [];
// TODO: Right now, preset weapons trigger a lot of warnings regarding missing ammo in magazines & such
let preset: Preset;
let preset: IPreset;
for (const presetObj of Object.values(this.databaseServer.getTables().globals.ItemPresets))
{
if (presetObj._items[0]._tpl === weaponTpl)

6
project/src/generators/LootGenerator.ts
View File

@ -4,7 +4,7 @@ import { InventoryHelper } from "../helpers/InventoryHelper";
import { ItemHelper } from "../helpers/ItemHelper";
import { PresetHelper } from "../helpers/PresetHelper";
import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
import { Preset } from "../models/eft/common/IGlobals";
import { IPreset } from "../models/eft/common/IGlobals";
import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
import { AddItem } from "../models/eft/inventory/IAddItemRequestData";
import { BaseClasses } from "../models/enums/BaseClasses";
@ -211,7 +211,7 @@ export class LootGenerator
* @returns true if preset was valid and added to pool
*/
protected findAndAddRandomPresetToLoot(
globalDefaultPresets: [string, Preset][],
globalDefaultPresets: [string, IPreset][],
itemTypeCounts: Record<string, { current: number; max: number; }>,
itemBlacklist: string[],
result: LootItem[]): boolean
@ -385,7 +385,7 @@ export class LootGenerator
* @param chosenWeaponPreset The weapon preset given to player as reward
* @returns AddItem array
*/
protected getSealedContainerWeaponModRewards(containerSettings: ISealedAirdropContainerSettings, linkedItemsToWeapon: ITemplateItem[], chosenWeaponPreset: Preset): AddItem[]
protected getSealedContainerWeaponModRewards(containerSettings: ISealedAirdropContainerSettings, linkedItemsToWeapon: ITemplateItem[], chosenWeaponPreset: IPreset): AddItem[]
{
const modRewards: AddItem[] = [];
for (const rewardTypeId in containerSettings.weaponModRewardLimits)

6
project/src/generators/RagfairAssortGenerator.ts
View File

@ -1,7 +1,7 @@
import { inject, injectable } from "tsyringe";
import { ItemHelper } from "../helpers/ItemHelper";
import { Preset } from "../models/eft/common/IGlobals";
import { IPreset } from "../models/eft/common/IGlobals";
import { Item } from "../models/eft/common/tables/IItem";
import { BaseClasses } from "../models/enums/BaseClasses";
import { ConfigTypes } from "../models/enums/ConfigTypes";
@ -104,7 +104,7 @@ export class RagfairAssortGenerator
* Get presets from globals.json
* @returns Preset object array
*/
protected getPresets(): Preset[]
protected getPresets(): IPreset[]
{
const presets = Object.values(this.databaseServer.getTables().globals.ItemPresets);
return presets;
@ -114,7 +114,7 @@ export class RagfairAssortGenerator
* Get default presets from globals.json
* @returns Preset object array
*/
protected getDefaultPresets(): Preset[]
protected getDefaultPresets(): IPreset[]
{
return this.getPresets().filter(x => x._encyclopedia);
}

12
project/src/helpers/PresetHelper.ts
View File

@ -1,5 +1,5 @@
import { inject, injectable } from "tsyringe";
import { Preset } from "../models/eft/common/IGlobals";
import { IPreset } from "../models/eft/common/IGlobals";
import { DatabaseServer } from "../servers/DatabaseServer";
import { JsonUtil } from "../utils/JsonUtil";
@ -7,7 +7,7 @@ import { JsonUtil } from "../utils/JsonUtil";
export class PresetHelper
{
protected lookup: Record<string, string[]> = {};
protected defaultPresets: Record<string, Preset>;
protected defaultPresets: Record<string, IPreset>;
constructor(
@inject("JsonUtil") protected jsonUtil: JsonUtil,
@ -20,7 +20,7 @@ export class PresetHelper
this.lookup = input;
}
public getDefaultPresets(): Record<string, Preset>
public getDefaultPresets(): Record<string, IPreset>
{
if (!this.defaultPresets)
{
@ -46,12 +46,12 @@ export class PresetHelper
return templateId in this.lookup;
}
public getPreset(id: string): Preset
public getPreset(id: string): IPreset
{
return this.jsonUtil.clone(this.databaseServer.getTables().globals.ItemPresets[id]);
}
public getPresets(templateId: string): Preset[]
public getPresets(templateId: string): IPreset[]
{
if (!this.hasPreset(templateId))
{
@ -69,7 +69,7 @@ export class PresetHelper
return presets;
}
public getDefaultPreset(templateId: string): Preset
public getDefaultPreset(templateId: string): IPreset
{
if (!this.hasPreset(templateId))
{

808
project/src/models/eft/common/IGlobals.ts
View File

File diff suppressed because it is too large Load Diff

4
project/src/models/spt/services/CustomPreset.ts
View File

@ -1,7 +1,7 @@
import { Preset } from "../../eft/common/IGlobals";
import { IPreset } from "../../eft/common/IGlobals";
export interface CustomPreset
{
key: string,
preset: Preset
preset: IPreset
}

6
project/src/services/FenceService.ts
View File

@ -3,7 +3,7 @@ import { inject, injectable } from "tsyringe";
import { HandbookHelper } from "../helpers/HandbookHelper";
import { ItemHelper } from "../helpers/ItemHelper";
import { PresetHelper } from "../helpers/PresetHelper";
import { FenceLevel, Preset } from "../models/eft/common/IGlobals";
import { IFenceLevel, IPreset } from "../models/eft/common/IGlobals";
import { IPmcData } from "../models/eft/common/IPmcData";
import { Item } from "../models/eft/common/tables/IItem";
import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
@ -447,7 +447,7 @@ export class FenceService
* @param assorts object to add presets to
* @param loyaltyLevel loyalty level to requre item at
*/
protected addPresets(desiredPresetCount: number, defaultWeaponPresets: Record<string, Preset>, assorts: ITraderAssort, loyaltyLevel: number): void
protected addPresets(desiredPresetCount: number, defaultWeaponPresets: Record<string, IPreset>, assorts: ITraderAssort, loyaltyLevel: number): void
{
let presetCount = 0;
const presetKeys = Object.keys(defaultWeaponPresets);
@ -628,7 +628,7 @@ export class FenceService
* @param pmcData Player profile
* @returns FenceLevel object
*/
public getFenceInfo(pmcData: IPmcData): FenceLevel
public getFenceInfo(pmcData: IPmcData): IFenceLevel
{
const fenceSettings = this.databaseServer.getTables().globals.config.FenceSettings;
const pmcFenceInfo = pmcData.TradersInfo[fenceSettings.FenceId];

4
project/src/services/RagfairPriceService.ts
View File

@ -5,7 +5,7 @@ import { HandbookHelper } from "../helpers/HandbookHelper";
import { ItemHelper } from "../helpers/ItemHelper";
import { PresetHelper } from "../helpers/PresetHelper";
import { TraderHelper } from "../helpers/TraderHelper";
import { Preset } from "../models/eft/common/IGlobals";
import { IPreset } from "../models/eft/common/IGlobals";
import { Item } from "../models/eft/common/tables/IItem";
import { IBarterScheme } from "../models/eft/common/tables/ITrader";
import { ConfigTypes } from "../models/enums/ConfigTypes";
@ -403,7 +403,7 @@ export class RagfairPriceService implements OnLoad
* @param presets weapon presets to choose from
* @returns Default preset object
*/
protected getWeaponPreset(presets: Preset[], weapon: Item): {isDefault: boolean, preset: Preset}
protected getWeaponPreset(presets: IPreset[], weapon: Item): {isDefault: boolean, preset: IPreset}
{
const defaultPreset = presets.find(x => x._encyclopedia);
if (defaultPreset)

4
project/src/services/RepairService.ts
View File

@ -5,7 +5,7 @@ import { QuestHelper } from "../helpers/QuestHelper";
import { RepairHelper } from "../helpers/RepairHelper";
import { TraderHelper } from "../helpers/TraderHelper";
import { WeightedRandomHelper } from "../helpers/WeightedRandomHelper";
import { ArmorType } from "../models/eft/common/IGlobals";
import { IArmorType } from "../models/eft/common/IGlobals";
import { IPmcData } from "../models/eft/common/IPmcData";
import { Item } from "../models/eft/common/tables/IItem";
import { ITemplateItem } from "../models/eft/common/tables/ITemplateItem";
@ -250,7 +250,7 @@ export class RepairService
const repairArmorBonus = this.getBonusMultiplierValue("RepairArmorBonus", pmcData);
const armorBonus = (1.0 - (repairArmorBonus - 1.0) - intellectPointReduction);
const materialType = itemToRepairDetails._props.ArmorMaterial ?? "";
const armorMaterial = globals.config.ArmorMaterials[materialType] as ArmorType;
const armorMaterial = globals.config.ArmorMaterials[materialType] as IArmorType;
const destructability = (1 + armorMaterial.Destructibility);
const armorClass = parseInt(`${itemToRepairDetails._props.armorClass}`);
const armorClassDivisor = globals.config.RepairSettings.armorClassDivisor;

4
project/src/services/SeasonalEventService.ts
View File

@ -1,7 +1,7 @@
import { inject, injectable } from "tsyringe";
import { BotHelper } from "../helpers/BotHelper";
import { Config } from "../models/eft/common/IGlobals";
import { IConfig } from "../models/eft/common/IGlobals";
import { Inventory } from "../models/eft/common/tables/IBotType";
import { ConfigTypes } from "../models/enums/ConfigTypes";
import { SeasonalEventType } from "../models/enums/SeasonalEventType";
@ -275,7 +275,7 @@ export class SeasonalEventService
* @param globalConfig globals.json
* @param eventName Name of the event to enable. e.g. Christmas
*/
protected updateGlobalEvents(globalConfig: Config, eventType: SeasonalEventType): void
protected updateGlobalEvents(globalConfig: IConfig, eventType: SeasonalEventType): void
{
switch (eventType.toLowerCase())
{