4ac12ef70a
These are the formatting & linting configuration changes from the `3.8.0` branch and the changes that they make to the overall project. The majority of these changes are from running two commands: `npm run lint:fix` `npm run style:fix` This has already been run on the `3.8.0` branch and this PR should make `master` play nicer when it comes to merges going forward. There are now four VSCode plugins recommended for server development. They've been added to the workspace file and a user should get a UI notification when the workspace is opened if they're not installed. The four plugins are: https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig https://marketplace.visualstudio.com/items?itemName=dprint.dprint https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint https://marketplace.visualstudio.com/items?itemName=biomejs.biome Once installed they should just work within the workspace. Also, be sure to `npm i` to get the new dprint application. Co-authored-by: Refringe <brownelltyler@gmail.com> Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/168
199 lines
7.9 KiB
TypeScript
199 lines
7.9 KiB
TypeScript
import { inject, injectable } from "tsyringe";
|
|
|
|
import { LocationGenerator } from "@spt-aki/generators/LocationGenerator";
|
|
import { LootGenerator } from "@spt-aki/generators/LootGenerator";
|
|
import { WeightedRandomHelper } from "@spt-aki/helpers/WeightedRandomHelper";
|
|
import { ILocation } from "@spt-aki/models/eft/common/ILocation";
|
|
import { ILocationBase } from "@spt-aki/models/eft/common/ILocationBase";
|
|
import { ILocationsGenerateAllResponse } from "@spt-aki/models/eft/common/ILocationsSourceDestinationBase";
|
|
import { ILooseLoot, SpawnpointTemplate } from "@spt-aki/models/eft/common/ILooseLoot";
|
|
import { IAirdropLootResult } from "@spt-aki/models/eft/location/IAirdropLootResult";
|
|
import { IGetLocationRequestData } from "@spt-aki/models/eft/location/IGetLocationRequestData";
|
|
import { AirdropTypeEnum } from "@spt-aki/models/enums/AirdropType";
|
|
import { ConfigTypes } from "@spt-aki/models/enums/ConfigTypes";
|
|
import { IAirdropConfig } from "@spt-aki/models/spt/config/IAirdropConfig";
|
|
import { ILocationConfig } from "@spt-aki/models/spt/config/ILocationConfig";
|
|
import { ILocations } from "@spt-aki/models/spt/server/ILocations";
|
|
import { LootRequest } from "@spt-aki/models/spt/services/LootRequest";
|
|
import { ILogger } from "@spt-aki/models/spt/utils/ILogger";
|
|
import { ConfigServer } from "@spt-aki/servers/ConfigServer";
|
|
import { DatabaseServer } from "@spt-aki/servers/DatabaseServer";
|
|
import { LocalisationService } from "@spt-aki/services/LocalisationService";
|
|
import { HashUtil } from "@spt-aki/utils/HashUtil";
|
|
import { JsonUtil } from "@spt-aki/utils/JsonUtil";
|
|
import { RandomUtil } from "@spt-aki/utils/RandomUtil";
|
|
import { TimeUtil } from "@spt-aki/utils/TimeUtil";
|
|
|
|
@injectable()
|
|
export class LocationController
|
|
{
|
|
protected airdropConfig: IAirdropConfig;
|
|
protected locationConfig: ILocationConfig;
|
|
|
|
constructor(
|
|
@inject("JsonUtil") protected jsonUtil: JsonUtil,
|
|
@inject("HashUtil") protected hashUtil: HashUtil,
|
|
@inject("RandomUtil") protected randomUtil: RandomUtil,
|
|
@inject("WeightedRandomHelper") protected weightedRandomHelper: WeightedRandomHelper,
|
|
@inject("WinstonLogger") protected logger: ILogger,
|
|
@inject("LocationGenerator") protected locationGenerator: LocationGenerator,
|
|
@inject("LocalisationService") protected localisationService: LocalisationService,
|
|
@inject("LootGenerator") protected lootGenerator: LootGenerator,
|
|
@inject("DatabaseServer") protected databaseServer: DatabaseServer,
|
|
@inject("TimeUtil") protected timeUtil: TimeUtil,
|
|
@inject("ConfigServer") protected configServer: ConfigServer,
|
|
)
|
|
{
|
|
this.airdropConfig = this.configServer.getConfig(ConfigTypes.AIRDROP);
|
|
this.locationConfig = this.configServer.getConfig(ConfigTypes.LOCATION);
|
|
}
|
|
|
|
/* */
|
|
|
|
/**
|
|
* Handle client/location/getLocalloot
|
|
* Get a location (map) with generated loot data
|
|
* @param sessionId Player id
|
|
* @param request Map request to generate
|
|
* @returns ILocationBase
|
|
*/
|
|
public get(sessionId: string, request: IGetLocationRequestData): ILocationBase
|
|
{
|
|
this.logger.debug(`Generating data for: ${request.locationId}, variant: ${request.variantId}`);
|
|
const name = request.locationId.toLowerCase().replace(" ", "");
|
|
return this.generate(name);
|
|
}
|
|
|
|
/**
|
|
* Generate a maps base location with loot
|
|
* @param name Map name
|
|
* @returns ILocationBase
|
|
*/
|
|
protected generate(name: string): ILocationBase
|
|
{
|
|
const db = this.databaseServer.getTables();
|
|
const location: ILocation = db.locations[name];
|
|
const output: ILocationBase = this.jsonUtil.clone(location.base);
|
|
|
|
output.UnixDateTime = this.timeUtil.getTimestamp();
|
|
|
|
// Don't generate loot for hideout
|
|
if (name === "hideout")
|
|
{
|
|
return output;
|
|
}
|
|
|
|
const staticAmmoDist = this.jsonUtil.clone(db.loot.staticAmmo);
|
|
|
|
// Create containers and add loot to them
|
|
const staticLoot = this.locationGenerator.generateStaticContainers(location.base, staticAmmoDist);
|
|
output.Loot.push(...staticLoot);
|
|
|
|
// Add dyanmic loot to output loot
|
|
const dynamicLootDist: ILooseLoot = this.jsonUtil.clone(location.looseLoot);
|
|
const dynamicSpawnPoints: SpawnpointTemplate[] = this.locationGenerator.generateDynamicLoot(
|
|
dynamicLootDist,
|
|
staticAmmoDist,
|
|
name,
|
|
);
|
|
for (const spawnPoint of dynamicSpawnPoints)
|
|
{
|
|
output.Loot.push(spawnPoint);
|
|
}
|
|
|
|
// Done generating, log results
|
|
this.logger.success(
|
|
this.localisationService.getText("location-dynamic_items_spawned_success", dynamicSpawnPoints.length),
|
|
);
|
|
this.logger.success(this.localisationService.getText("location-generated_success", name));
|
|
|
|
return output;
|
|
}
|
|
|
|
/**
|
|
* Handle client/locations
|
|
* Get all maps base location properties without loot data
|
|
* @param sessionId Players Id
|
|
* @returns ILocationsGenerateAllResponse
|
|
*/
|
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
public generateAll(sessionId: string): ILocationsGenerateAllResponse
|
|
{
|
|
const locationsFromDb = this.databaseServer.getTables().locations;
|
|
const locations: ILocations = {};
|
|
for (const mapName in locationsFromDb)
|
|
{
|
|
const mapBase = locationsFromDb[mapName]?.base;
|
|
if (!mapBase)
|
|
{
|
|
this.logger.debug(`Map: ${mapName} has no base json file, skipping generation`);
|
|
continue;
|
|
}
|
|
|
|
// Clear out loot array
|
|
mapBase.Loot = [];
|
|
// Add map base data to dictionary
|
|
locations[mapBase._Id] = mapBase;
|
|
}
|
|
|
|
return { locations: locations, paths: locationsFromDb.base.paths };
|
|
}
|
|
|
|
/**
|
|
* Handle client/location/getAirdropLoot
|
|
* Get loot for an airdop container
|
|
* Generates it randomly based on config/airdrop.json values
|
|
* @returns Array of LootItem objects
|
|
*/
|
|
public getAirdropLoot(): IAirdropLootResult
|
|
{
|
|
const airdropType = this.chooseAirdropType();
|
|
|
|
this.logger.debug(`Chose ${airdropType} for airdrop loot`);
|
|
|
|
const airdropConfig = this.getAirdropLootConfigByType(airdropType);
|
|
|
|
return { dropType: airdropType, loot: this.lootGenerator.createRandomLoot(airdropConfig) };
|
|
}
|
|
|
|
/**
|
|
* Randomly pick a type of airdrop loot using weighted values from config
|
|
* @returns airdrop type value
|
|
*/
|
|
protected chooseAirdropType(): AirdropTypeEnum
|
|
{
|
|
const possibleAirdropTypes = this.airdropConfig.airdropTypeWeightings;
|
|
|
|
return this.weightedRandomHelper.getWeightedValue(possibleAirdropTypes);
|
|
}
|
|
|
|
/**
|
|
* Get the configuration for a specific type of airdrop
|
|
* @param airdropType Type of airdrop to get settings for
|
|
* @returns LootRequest
|
|
*/
|
|
protected getAirdropLootConfigByType(airdropType: AirdropTypeEnum): LootRequest
|
|
{
|
|
let lootSettingsByType = this.airdropConfig.loot[airdropType];
|
|
if (!lootSettingsByType)
|
|
{
|
|
this.logger.error(
|
|
this.localisationService.getText("location-unable_to_find_airdrop_drop_config_of_type", airdropType),
|
|
);
|
|
lootSettingsByType = this.airdropConfig.loot[AirdropTypeEnum.MIXED];
|
|
}
|
|
|
|
return {
|
|
presetCount: lootSettingsByType.presetCount,
|
|
itemCount: lootSettingsByType.itemCount,
|
|
weaponCrateCount: lootSettingsByType.weaponCrateCount,
|
|
itemBlacklist: lootSettingsByType.itemBlacklist,
|
|
itemTypeWhitelist: lootSettingsByType.itemTypeWhitelist,
|
|
itemLimits: lootSettingsByType.itemLimits,
|
|
itemStackLimits: lootSettingsByType.itemStackLimits,
|
|
armorLevelWhitelist: lootSettingsByType.armorLevelWhitelist,
|
|
allowBossItems: lootSettingsByType.allowBossItems,
|
|
};
|
|
}
|
|
}
|