diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/globals.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/globals.json index ea9c1f98..a44a6abb 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/globals.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/globals.json @@ -23983,262 +23983,394 @@ { "BotDifficulty": "easy", "COEF_IF_MOVE": 1.3, - "FIRST_CONTACT_ADD_SEC": 0.15, + "FIRST_CONTACT_ADD_SEC": 0.75, "HearingSense": 0.75, "MAX_AIMING_UPGRADE_BY_TIME": 0.85, "Role": "assault", "SCATTERING_DIST_MODIF": 0.8, "ScatteringPerMeter": 0.095, "UseThis": true, - "VisibleAngle": 140, + "VISIBILITY_CHANGE_SPEED": 1, + "VisibleAngle": 70, "VisibleDistance": 125 }, { "BotDifficulty": "normal", "COEF_IF_MOVE": 1.3, - "FIRST_CONTACT_ADD_SEC": 0.15, + "FIRST_CONTACT_ADD_SEC": 0.75, "HearingSense": 0.8, "MAX_AIMING_UPGRADE_BY_TIME": 0.85, "Role": "assault", "SCATTERING_DIST_MODIF": 0.8, "ScatteringPerMeter": 0.085, "UseThis": true, - "VisibleAngle": 145, + "VISIBILITY_CHANGE_SPEED": 1, + "VisibleAngle": 70, "VisibleDistance": 129 }, { "BotDifficulty": "hard", "COEF_IF_MOVE": 1.3, - "FIRST_CONTACT_ADD_SEC": 0.15, + "FIRST_CONTACT_ADD_SEC": 0.75, "HearingSense": 0.85, "MAX_AIMING_UPGRADE_BY_TIME": 0.85, "Role": "assault", "SCATTERING_DIST_MODIF": 0.8, "ScatteringPerMeter": 0.085, "UseThis": true, - "VisibleAngle": 145, + "VISIBILITY_CHANGE_SPEED": 1, + "VisibleAngle": 75, "VisibleDistance": 137 }, { "BotDifficulty": "impossible", "COEF_IF_MOVE": 1.3, - "FIRST_CONTACT_ADD_SEC": 0.15, + "FIRST_CONTACT_ADD_SEC": 0.75, "HearingSense": 0.85, "MAX_AIMING_UPGRADE_BY_TIME": 0.85, "Role": "assault", "SCATTERING_DIST_MODIF": 0.8, "ScatteringPerMeter": 0.063, "UseThis": true, - "VisibleAngle": 160, + "VISIBILITY_CHANGE_SPEED": 20, + "VisibleAngle": 80, "VisibleDistance": 140 }, { "BotDifficulty": "easy", "COEF_IF_MOVE": 1, - "FIRST_CONTACT_ADD_SEC": 0.1, + "FIRST_CONTACT_ADD_SEC": 0.75, "HearingSense": 0.7, "MAX_AIMING_UPGRADE_BY_TIME": 0.85, "Role": "marksman", "SCATTERING_DIST_MODIF": 0.7, "ScatteringPerMeter": 0.08, "UseThis": true, - "VisibleAngle": 160, + "VISIBILITY_CHANGE_SPEED": 1, + "VisibleAngle": 80, "VisibleDistance": 200 }, { "BotDifficulty": "normal", "COEF_IF_MOVE": 1, - "FIRST_CONTACT_ADD_SEC": 0.1, + "FIRST_CONTACT_ADD_SEC": 0.75, "HearingSense": 0.7, "MAX_AIMING_UPGRADE_BY_TIME": 0.85, "Role": "marksman", "SCATTERING_DIST_MODIF": 0.7, "ScatteringPerMeter": 0.08, "UseThis": true, - "VisibleAngle": 165, + "VISIBILITY_CHANGE_SPEED": 1, + "VisibleAngle": 80, "VisibleDistance": 220 }, { "BotDifficulty": "hard", "COEF_IF_MOVE": 1, - "FIRST_CONTACT_ADD_SEC": 0.1, + "FIRST_CONTACT_ADD_SEC": 0.75, "HearingSense": 0.9, "MAX_AIMING_UPGRADE_BY_TIME": 0.85, "Role": "marksman", "SCATTERING_DIST_MODIF": 0.7, "ScatteringPerMeter": 0.08, "UseThis": true, - "VisibleAngle": 180, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 85, "VisibleDistance": 240 }, { "BotDifficulty": "impossible", "COEF_IF_MOVE": 1, - "FIRST_CONTACT_ADD_SEC": 0.1, + "FIRST_CONTACT_ADD_SEC": 0.75, "HearingSense": 0.9, "MAX_AIMING_UPGRADE_BY_TIME": 0.85, "Role": "marksman", "SCATTERING_DIST_MODIF": 0.7, "ScatteringPerMeter": 0.08, "UseThis": true, - "VisibleAngle": 160, + "VISIBILITY_CHANGE_SPEED": 20, + "VisibleAngle": 90, "VisibleDistance": 250 }, { "BotDifficulty": "normal", "COEF_IF_MOVE": 1, - "FIRST_CONTACT_ADD_SEC": 0.13, + "FIRST_CONTACT_ADD_SEC": 0.75, "HearingSense": 4.8, - "MAX_AIMING_UPGRADE_BY_TIME": 0.15, - "Role": "bossKilla", - "SCATTERING_DIST_MODIF": 0.45, - "ScatteringPerMeter": 0.09, - "UseThis": true, - "VisibleAngle": 180, - "VisibleDistance": 140 - }, - { - "BotDifficulty": "normal", - "COEF_IF_MOVE": 1, - "FIRST_CONTACT_ADD_SEC": 0.13, - "HearingSense": 4.8, - "MAX_AIMING_UPGRADE_BY_TIME": 0.15, - "Role": "bossTagilla", - "SCATTERING_DIST_MODIF": 0.45, - "ScatteringPerMeter": 0.09, - "UseThis": true, - "VisibleAngle": 180, - "VisibleDistance": 140 - }, - { - "BotDifficulty": "normal", - "COEF_IF_MOVE": 1, - "FIRST_CONTACT_ADD_SEC": 0.13, - "HearingSense": 4.8, - "MAX_AIMING_UPGRADE_BY_TIME": 0.15, + "MAX_AIMING_UPGRADE_BY_TIME": 1, "Role": "bossBully", "SCATTERING_DIST_MODIF": 0.8, "ScatteringPerMeter": 0.02, "UseThis": true, - "VisibleAngle": 170, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 80, "VisibleDistance": 140 }, { "BotDifficulty": "normal", "COEF_IF_MOVE": 1, - "FIRST_CONTACT_ADD_SEC": 0.13, + "FIRST_CONTACT_ADD_SEC": 0.75, "HearingSense": 4.8, - "MAX_AIMING_UPGRADE_BY_TIME": 0.15, + "MAX_AIMING_UPGRADE_BY_TIME": 1, "Role": "bossGluhar", "SCATTERING_DIST_MODIF": 0.67, "ScatteringPerMeter": 0.045, "UseThis": true, - "VisibleAngle": 170, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 85, "VisibleDistance": 140 }, { "BotDifficulty": "normal", "COEF_IF_MOVE": 1, - "FIRST_CONTACT_ADD_SEC": 0.13, + "FIRST_CONTACT_ADD_SEC": 0.75, "HearingSense": 4.8, - "MAX_AIMING_UPGRADE_BY_TIME": 0.15, + "MAX_AIMING_UPGRADE_BY_TIME": 1, "Role": "bossSanitar", "SCATTERING_DIST_MODIF": 0.6, "ScatteringPerMeter": 0.045, "UseThis": true, - "VisibleAngle": 170, + "VISIBILITY_CHANGE_SPEED": 4, + "VisibleAngle": 85, "VisibleDistance": 140 }, { "BotDifficulty": "normal", "COEF_IF_MOVE": 1, - "FIRST_CONTACT_ADD_SEC": 0.13, + "FIRST_CONTACT_ADD_SEC": 0.75, "HearingSense": 4.8, - "MAX_AIMING_UPGRADE_BY_TIME": 0.15, + "MAX_AIMING_UPGRADE_BY_TIME": 1, "Role": "bossKojaniy", "SCATTERING_DIST_MODIF": 0.6, "ScatteringPerMeter": 0.045, "UseThis": true, - "VisibleAngle": 170, + "VISIBILITY_CHANGE_SPEED": 15.384, + "VisibleAngle": 85, "VisibleDistance": 165 }, { "BotDifficulty": "normal", "COEF_IF_MOVE": 1, - "FIRST_CONTACT_ADD_SEC": 0.13, + "FIRST_CONTACT_ADD_SEC": 0.75, "HearingSense": 4.8, - "MAX_AIMING_UPGRADE_BY_TIME": 0.15, - "Role": "bossKnight", - "SCATTERING_DIST_MODIF": 0.6, - "ScatteringPerMeter": 0.045, - "UseThis": true, - "VisibleAngle": 170, - "VisibleDistance": 140 - }, - { - "BotDifficulty": "normal", - "COEF_IF_MOVE": 1, - "FIRST_CONTACT_ADD_SEC": 0.13, - "HearingSense": 4.8, - "MAX_AIMING_UPGRADE_BY_TIME": 0.15, - "Role": "followerBigPipe", - "SCATTERING_DIST_MODIF": 0.45, - "ScatteringPerMeter": 0.09, - "UseThis": true, - "VisibleAngle": 180, - "VisibleDistance": 170 - }, - { - "BotDifficulty": "normal", - "COEF_IF_MOVE": 1, - "FIRST_CONTACT_ADD_SEC": 0.13, - "HearingSense": 4.8, - "MAX_AIMING_UPGRADE_BY_TIME": 0.15, - "Role": "followerBirdEye", - "SCATTERING_DIST_MODIF": 0.55, - "ScatteringPerMeter": 0.045, - "UseThis": true, - "VisibleAngle": 180, - "VisibleDistance": 255 - }, - { - "BotDifficulty": "normal", - "COEF_IF_MOVE": 1, - "FIRST_CONTACT_ADD_SEC": 0.13, - "HearingSense": 4.8, - "MAX_AIMING_UPGRADE_BY_TIME": 0.15, + "MAX_AIMING_UPGRADE_BY_TIME": 1, "Role": "bossBoar", "SCATTERING_DIST_MODIF": 0.6, "ScatteringPerMeter": 0.045, - "UseThis": false, - "VisibleAngle": 170, + "UseThis": true, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 85, "VisibleDistance": 140 }, { "BotDifficulty": "hard", "COEF_IF_MOVE": 1.5, - "FIRST_CONTACT_ADD_SEC": 0.15, + "FIRST_CONTACT_ADD_SEC": 0.75, "HearingSense": 0.8, "MAX_AIMING_UPGRADE_BY_TIME": 0.85, "Role": "infectedAssault", "SCATTERING_DIST_MODIF": 0.8, "ScatteringPerMeter": 0.1, "UseThis": true, - "VisibleAngle": 140, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 70, "VisibleDistance": 120 }, { "BotDifficulty": "hard", "COEF_IF_MOVE": 1.3, - "FIRST_CONTACT_ADD_SEC": 0.15, + "FIRST_CONTACT_ADD_SEC": 0.75, "HearingSense": 0.8, "MAX_AIMING_UPGRADE_BY_TIME": 0.85, "Role": "infectedPmc", "SCATTERING_DIST_MODIF": 0.8, "ScatteringPerMeter": 0.1, "UseThis": true, - "VisibleAngle": 150, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 75, "VisibleDistance": 130 + }, + { + "BotDifficulty": "normal", + "COEF_IF_MOVE": 1.3, + "FIRST_CONTACT_ADD_SEC": 0.75, + "HearingSense": 0.85, + "MAX_AIMING_UPGRADE_BY_TIME": 0.85, + "Role": "pmcBot", + "SCATTERING_DIST_MODIF": 0.8, + "ScatteringPerMeter": 0.085, + "UseThis": true, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 70, + "VisibleDistance": 127 + }, + { + "BotDifficulty": "normal", + "COEF_IF_MOVE": 1.3, + "FIRST_CONTACT_ADD_SEC": 0.75, + "HearingSense": 0.85, + "MAX_AIMING_UPGRADE_BY_TIME": 0.85, + "Role": "exUsec", + "SCATTERING_DIST_MODIF": 0.8, + "ScatteringPerMeter": 0.085, + "UseThis": true, + "VISIBILITY_CHANGE_SPEED": 3, + "VisibleAngle": 70, + "VisibleDistance": 127 + }, + { + "BotDifficulty": "normal", + "COEF_IF_MOVE": 1.3, + "FIRST_CONTACT_ADD_SEC": 0.75, + "HearingSense": 0.85, + "MAX_AIMING_UPGRADE_BY_TIME": 0.85, + "Role": "followerGluharAssault", + "SCATTERING_DIST_MODIF": 0.8, + "ScatteringPerMeter": 0.085, + "UseThis": true, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 70, + "VisibleDistance": 117 + }, + { + "BotDifficulty": "normal", + "COEF_IF_MOVE": 1.3, + "FIRST_CONTACT_ADD_SEC": 0.75, + "HearingSense": 0.85, + "MAX_AIMING_UPGRADE_BY_TIME": 0.85, + "Role": "followerGluharSecurity", + "SCATTERING_DIST_MODIF": 0.8, + "ScatteringPerMeter": 0.085, + "UseThis": true, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 70, + "VisibleDistance": 117 + }, + { + "BotDifficulty": "normal", + "COEF_IF_MOVE": 1.3, + "FIRST_CONTACT_ADD_SEC": 0.75, + "HearingSense": 0.85, + "MAX_AIMING_UPGRADE_BY_TIME": 0.85, + "Role": "followerGluharScout", + "SCATTERING_DIST_MODIF": 0.8, + "ScatteringPerMeter": 0.085, + "UseThis": true, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 70, + "VisibleDistance": 117 + }, + { + "BotDifficulty": "normal", + "COEF_IF_MOVE": 1.3, + "FIRST_CONTACT_ADD_SEC": 0.75, + "HearingSense": 0.85, + "MAX_AIMING_UPGRADE_BY_TIME": 0.85, + "Role": "followerGluharSnipe", + "SCATTERING_DIST_MODIF": 0.8, + "ScatteringPerMeter": 0.085, + "UseThis": true, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 70, + "VisibleDistance": 117 + }, + { + "BotDifficulty": "normal", + "COEF_IF_MOVE": 1.3, + "FIRST_CONTACT_ADD_SEC": 0.75, + "HearingSense": 0.85, + "MAX_AIMING_UPGRADE_BY_TIME": 0.85, + "Role": "followerSanitar", + "SCATTERING_DIST_MODIF": 0.8, + "ScatteringPerMeter": 0.085, + "UseThis": true, + "VISIBILITY_CHANGE_SPEED": 4, + "VisibleAngle": 70, + "VisibleDistance": 117 + }, + { + "BotDifficulty": "normal", + "COEF_IF_MOVE": 1.3, + "FIRST_CONTACT_ADD_SEC": 0.75, + "HearingSense": 0.85, + "MAX_AIMING_UPGRADE_BY_TIME": 0.85, + "Role": "followerKolontayAssault", + "SCATTERING_DIST_MODIF": 0.8, + "ScatteringPerMeter": 0.085, + "UseThis": true, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 70, + "VisibleDistance": 117 + }, + { + "BotDifficulty": "normal", + "COEF_IF_MOVE": 1.3, + "FIRST_CONTACT_ADD_SEC": 0.75, + "HearingSense": 0.85, + "MAX_AIMING_UPGRADE_BY_TIME": 0.85, + "Role": "followerKolontaySecurity", + "SCATTERING_DIST_MODIF": 0.8, + "ScatteringPerMeter": 0.085, + "UseThis": true, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 70, + "VisibleDistance": 117 + }, + { + "BotDifficulty": "normal", + "COEF_IF_MOVE": 1.3, + "FIRST_CONTACT_ADD_SEC": 0.75, + "HearingSense": 0.85, + "MAX_AIMING_UPGRADE_BY_TIME": 0.85, + "Role": "bossPartisan", + "SCATTERING_DIST_MODIF": 0.8, + "ScatteringPerMeter": 0.085, + "UseThis": true, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 70, + "VisibleDistance": 117 + }, + { + "BotDifficulty": "normal", + "COEF_IF_MOVE": 1.3, + "FIRST_CONTACT_ADD_SEC": 0.75, + "HearingSense": 0.85, + "MAX_AIMING_UPGRADE_BY_TIME": 0.85, + "Role": "followerBoar", + "SCATTERING_DIST_MODIF": 0.8, + "ScatteringPerMeter": 0.085, + "UseThis": true, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 70, + "VisibleDistance": 117 + }, + { + "BotDifficulty": "normal", + "COEF_IF_MOVE": 1.3, + "FIRST_CONTACT_ADD_SEC": 0.75, + "HearingSense": 0.85, + "MAX_AIMING_UPGRADE_BY_TIME": 0.85, + "Role": "pmcBEAR", + "SCATTERING_DIST_MODIF": 0.8, + "ScatteringPerMeter": 0.085, + "UseThis": true, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 70, + "VisibleDistance": 127 + }, + { + "BotDifficulty": "normal", + "COEF_IF_MOVE": 1.3, + "FIRST_CONTACT_ADD_SEC": 0.75, + "HearingSense": 0.85, + "MAX_AIMING_UPGRADE_BY_TIME": 0.85, + "Role": "pmcUSEC", + "SCATTERING_DIST_MODIF": 0.8, + "ScatteringPerMeter": 0.085, + "UseThis": true, + "VISIBILITY_CHANGE_SPEED": 2, + "VisibleAngle": 70, + "VisibleDistance": 127 } ], "config": { diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/handbook.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/handbook.json index 85393d61..e1766554 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/handbook.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/handbook.json @@ -5144,7 +5144,7 @@ { "Id": "59faff1d86f7746c51718c9c", "ParentId": "5b47574386f77428ca22b2f1", - "Price": 1496691 + "Price": 1597620 }, { "Id": "59fb137a86f7740adb646af1", diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json index 6369dca8..b8cb1149 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/database/templates/items.json @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26fc2ec29296becd95d101207b662e1aed19634ad26a851a46f133e2424f6495 -size 19063710 +oid sha256:69304c9e423c09e52c842c45e197371f4d60f02de44643c5e26921452c04336d +size 19063778 diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs index 9c61949c..4ca9e157 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Globals.cs @@ -4368,6 +4368,9 @@ public record BotPreset [JsonPropertyName("UseThis")] public bool UseThis { get; set; } + [JsonPropertyName("VISIBILITY_CHANGE_SPEED")] + public float VisibilityChangeSpeed { get; set; } + [JsonPropertyName("Role")] public string Role { get; set; }