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

Update nvgIsActiveChancePercent into 2 properties, one for day, one for night

Browse Source 
Removed:
nvgIsActiveChancePercent
Added:
nvgIsActiveChanceDayPercent
nvgIsActiveChanceNightPercent
This commit is contained in:
Dev 2023-04-08 13:30:39 +01:00
parent c60c67fce5
commit d39c7f30f8
3 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
project/assets/configs/bot.json
View File

@ -293,7 +293,8 @@
] ]
}, },
"marksman": { "marksman": {
"nvgIsActiveChancePercent": 60, "nvgIsActiveChanceDayPercent": 60,
"nvgIsActiveChanceNightPercent": 60,
"faceShieldIsActiveChancePercent": 100, "faceShieldIsActiveChancePercent": 100,
"lightIsActiveDayChancePercent": 25, "lightIsActiveDayChancePercent": 25,
"lightIsActiveNightChancePercent": 85, "lightIsActiveNightChancePercent": 85,
@ -310,21 +311,24 @@
"laserIsActiveChancePercent": 75 "laserIsActiveChancePercent": 75
}, },
"exusec": { "exusec": {
"nvgIsActiveChancePercent": 80, "nvgIsActiveChanceDayPercent": 10,
"nvgIsActiveChanceNightPercent": 90,
"faceShieldIsActiveChancePercent": 100, "faceShieldIsActiveChancePercent": 100,
"lightIsActiveDayChancePercent": 25, "lightIsActiveDayChancePercent": 25,
"lightIsActiveNightChancePercent": 90, "lightIsActiveNightChancePercent": 90,
"laserIsActiveChancePercent": 85 "laserIsActiveChancePercent": 85
}, },
"bossbully": { "bossbully": {
"nvgIsActiveChancePercent": 75, "nvgIsActiveChanceDayPercent": 10,
"nvgIsActiveChanceNightPercent": 90,
"faceShieldIsActiveChancePercent": 100, "faceShieldIsActiveChancePercent": 100,
"lightIsActiveDayChancePercent": 25, "lightIsActiveDayChancePercent": 25,
"lightIsActiveNightChancePercent": 75, "lightIsActiveNightChancePercent": 75,
"laserIsActiveChancePercent": 75 "laserIsActiveChancePercent": 75
}, },
"bossgluhar": { "bossgluhar": {
"nvgIsActiveChancePercent": 80, "nvgIsActiveChanceDayPercent": 10,
"nvgIsActiveChanceNightPercent": 90,
"faceShieldIsActiveChancePercent": 100, "faceShieldIsActiveChancePercent": 100,
"lightIsActiveDayChancePercent": 45, "lightIsActiveDayChancePercent": 45,
"lightIsActiveNightChancePercent": 95, "lightIsActiveNightChancePercent": 95,
@ -359,14 +363,16 @@
"laserIsActiveChancePercent": 75 "laserIsActiveChancePercent": 75
}, },
"bossknight": { "bossknight": {
"nvgIsActiveChancePercent": 90, "nvgIsActiveChanceDayPercent": 10,
"nvgIsActiveChanceNightPercent": 90,
"faceShieldIsActiveChancePercent": 100, "faceShieldIsActiveChancePercent": 100,
"lightIsActiveDayChancePercent": 25, "lightIsActiveDayChancePercent": 25,
"lightIsActiveNightChancePercent": 75, "lightIsActiveNightChancePercent": 75,
"laserIsActiveChancePercent": 75 "laserIsActiveChancePercent": 75
}, },
"bosszryachiy": { "bosszryachiy": {
"nvgIsActiveChancePercent": 90, "nvgIsActiveChanceDayPercent": 10,
"nvgIsActiveChanceNightPercent": 90,
"lightIsActiveDayChancePercent": 25, "lightIsActiveDayChancePercent": 25,
"lightIsActiveNightChancePercent": 85, "lightIsActiveNightChancePercent": 85,
"laserIsActiveChancePercent": 85 "laserIsActiveChancePercent": 85
@ -379,7 +385,8 @@
"laserIsActiveChancePercent": 75 "laserIsActiveChancePercent": 75
}, },
"followergluharassault": { "followergluharassault": {
"nvgIsActiveChancePercent": 75, "nvgIsActiveChanceDayPercent": 10,
"nvgIsActiveChanceNightPercent": 85,
"faceShieldIsActiveChancePercent": 100, "faceShieldIsActiveChancePercent": 100,
"lightIsActiveDayChancePercent": 25, "lightIsActiveDayChancePercent": 25,
"lightIsActiveNightChancePercent": 75, "lightIsActiveNightChancePercent": 75,
@ -404,7 +411,8 @@
"laserIsActiveChancePercent": 75 "laserIsActiveChancePercent": 75
}, },
"followerkojaniy": { "followerkojaniy": {
"nvgIsActiveChancePercent": 80, "nvgIsActiveChanceDayPercent": 10,
"nvgIsActiveChanceNightPercent": 85,
"faceShieldIsActiveChancePercent": 100, "faceShieldIsActiveChancePercent": 100,
"lightIsActiveDayChancePercent": 25, "lightIsActiveDayChancePercent": 25,
"lightIsActiveNightChancePercent": 75, "lightIsActiveNightChancePercent": 75,
@ -418,7 +426,8 @@
}, },
"followertagilla": {}, "followertagilla": {},
"followerbirdeye": { "followerbirdeye": {
"nvgIsActiveChancePercent": 80, "nvgIsActiveChanceDayPercent": 10,
"nvgIsActiveChanceNightPercent": 90,
"faceShieldIsActiveChancePercent": 100, "faceShieldIsActiveChancePercent": 100,
"lightIsActiveDayChancePercent": 25, "lightIsActiveDayChancePercent": 25,
"lightIsActiveNightChancePercent": 75, "lightIsActiveNightChancePercent": 75,
@ -429,28 +438,32 @@
} }
}, },
"followerbigpipe": { "followerbigpipe": {
"nvgIsActiveChancePercent": 90, "nvgIsActiveChanceDayPercent": 10,
"nvgIsActiveChanceNightPercent": 90,
"faceShieldIsActiveChancePercent": 100, "faceShieldIsActiveChancePercent": 100,
"lightIsActiveDayChancePercent": 25, "lightIsActiveDayChancePercent": 25,
"lightIsActiveNightChancePercent": 75, "lightIsActiveNightChancePercent": 75,
"laserIsActiveChancePercent": 75 "laserIsActiveChancePercent": 75
}, },
"followerzryachiy": { "followerzryachiy": {
"nvgIsActiveChancePercent": 90, "nvgIsActiveChanceDayPercent": 10,
"nvgIsActiveChanceNightPercent": 90,
"lightIsActiveDayChancePercent": 25, "lightIsActiveDayChancePercent": 25,
"lightIsActiveNightChancePercent": 85, "lightIsActiveNightChancePercent": 85,
"laserIsActiveChancePercent": 85 "laserIsActiveChancePercent": 85
}, },
"followertest": {}, "followertest": {},
"sectantpriest": { "sectantpriest": {
"nvgIsActiveChancePercent": 100, "nvgIsActiveChanceDayPercent": 10,
"nvgIsActiveChanceNightPercent": 100,
"faceShieldIsActiveChancePercent": 100, "faceShieldIsActiveChancePercent": 100,
"lightIsActiveDayChancePercent": 25, "lightIsActiveDayChancePercent": 25,
"lightIsActiveNightChancePercent": 85, "lightIsActiveNightChancePercent": 85,
"laserIsActiveChancePercent": 95 "laserIsActiveChancePercent": 95
}, },
"sectantwarrior": { "sectantwarrior": {
"nvgIsActiveChancePercent": 100, "nvgIsActiveChanceDayPercent": 10,
"nvgIsActiveChanceNightPercent": 100,
"faceShieldIsActiveChancePercent": 100, "faceShieldIsActiveChancePercent": 100,
"lightIsActiveDayChancePercent": 25, "lightIsActiveDayChancePercent": 25,
"lightIsActiveNightChancePercent": 75, "lightIsActiveNightChancePercent": 75,
@ -458,7 +471,8 @@
}, },
"test": {}, "test": {},
"pmcbot": { "pmcbot": {
"nvgIsActiveChancePercent": 80, "nvgIsActiveChanceDayPercent": 20,
"nvgIsActiveChanceNightPercent": 95,
"faceShieldIsActiveChancePercent": 100, "faceShieldIsActiveChancePercent": 100,
"lightIsActiveDayChancePercent": 35, "lightIsActiveDayChancePercent": 35,
"lightIsActiveNightChancePercent": 95, "lightIsActiveNightChancePercent": 95,
@ -491,7 +505,8 @@
"5447b5e04bdc2d62278b4567": ["55818ad54bdc2ddc698b4569", "55818acf4bdc2dde698b456b", "55818ac54bdc2d5b648b456e"], "5447b5e04bdc2d62278b4567": ["55818ad54bdc2ddc698b4569", "55818acf4bdc2dde698b456b", "55818ac54bdc2d5b648b456e"],
"5447b6254bdc2dc3278b4568": ["55818ae44bdc2dde698b456c", "55818ac54bdc2d5b648b456e", "55818aeb4bdc2ddc698b456a", "55818add4bdc2d5b648b456f"] "5447b6254bdc2dc3278b4568": ["55818ae44bdc2dde698b456c", "55818ac54bdc2d5b648b456e", "55818aeb4bdc2ddc698b456a", "55818add4bdc2d5b648b456f"]
}, },
"nvgIsActiveChancePercent": 50, "nvgIsActiveChanceDayPercent": 20,
"nvgIsActiveChanceNightPercent": 95,
"faceShieldIsActiveChancePercent": 85, "faceShieldIsActiveChancePercent": 85,
"lightIsActiveDayChancePercent": 25, "lightIsActiveDayChancePercent": 25,
"lightIsActiveNightChancePercent": 95, "lightIsActiveNightChancePercent": 95,

16
project/src/helpers/BotGeneratorHelper.ts
View File

@ -47,6 +47,10 @@ export class BotGeneratorHelper
*/ */
public generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole: string = null): { upd?: Upd } public generateExtraPropertiesForItem(itemTemplate: ITemplateItem, botRole: string = null): { upd?: Upd }
{ {
// Get raid settings, if no raid, default to day
const raidSettings = this.applicationContext.getLatestValue(ContextVariableType.RAID_CONFIGURATION)?.getValue<IGetRaidConfigurationRequestData>();
const raidIsNight = raidSettings?.timeVariant === "PAST";
const itemProperties: Upd = {}; const itemProperties: Upd = {};
if (itemTemplate._props.MaxDurability) if (itemTemplate._props.MaxDurability)
@ -95,11 +99,7 @@ export class BotGeneratorHelper
if (itemTemplate._parent === BaseClasses.FLASHLIGHT) if (itemTemplate._parent === BaseClasses.FLASHLIGHT)
{ {
// Get raid settings, if no raid, default to day // Get chance from botconfig for bot type
const raidSettings = this.applicationContext.getLatestValue(ContextVariableType.RAID_CONFIGURATION)?.getValue<IGetRaidConfigurationRequestData>();
const raidIsNight = raidSettings?.timeVariant === "PAST";
// Get chance from botconfig for bot type, use 50% if no value found
const lightLaserActiveChance = raidIsNight const lightLaserActiveChance = raidIsNight
? this.getBotEquipmentSettingFromConfig(botRole, "lightIsActiveNightChancePercent", 50) ? this.getBotEquipmentSettingFromConfig(botRole, "lightIsActiveNightChancePercent", 50)
: this.getBotEquipmentSettingFromConfig(botRole, "lightIsActiveDayChancePercent", 25); : this.getBotEquipmentSettingFromConfig(botRole, "lightIsActiveDayChancePercent", 25);
@ -114,8 +114,10 @@ export class BotGeneratorHelper
if (itemTemplate._parent === BaseClasses.NIGHTVISION) if (itemTemplate._parent === BaseClasses.NIGHTVISION)
{ {
// Get chance from botconfig for bot type, use 50% if no value found // Get chance from botconfig for bot type
const nvgActiveChance = this.getBotEquipmentSettingFromConfig(botRole, "nvgIsActiveChancePercent", 50); const nvgActiveChance = raidIsNight
? this.getBotEquipmentSettingFromConfig(botRole, "nvgIsActiveChanceNightPercent", 90)
: this.getBotEquipmentSettingFromConfig(botRole, "nvgIsActiveChanceDayPercent", 15);
itemProperties.Togglable = { On: (this.randomUtil.getChance100(nvgActiveChance)) }; itemProperties.Togglable = { On: (this.randomUtil.getChance100(nvgActiveChance)) };
} }

3
project/src/models/spt/config/IBotConfig.ts
View File

@ -81,7 +81,8 @@ export interface EquipmentFilters
lightIsActiveDayChancePercent?: number; lightIsActiveDayChancePercent?: number;
lightIsActiveNightChancePercent?: number; lightIsActiveNightChancePercent?: number;
laserIsActiveChancePercent?: number; laserIsActiveChancePercent?: number;
nvgIsActiveChancePercent?: number; nvgIsActiveChanceDayPercent?: number;
nvgIsActiveChanceNightPercent?: number;
randomisation: RandomisationDetails[] randomisation: RandomisationDetails[]
blacklist: EquipmentFilterDetails[] blacklist: EquipmentFilterDetails[]
whitelist: EquipmentFilterDetails[] whitelist: EquipmentFilterDetails[]