Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0

2023-11-02 21:25:31 +00:00 · 2023-11-02 21:25:31 +00:00 · b62850e03e
commit b62850e03e
parent a5a0bf82d7 e9be58d5f4
18 changed files with 35 additions and 34 deletions
--- a/project/assets/database/bots/types/assault.json
+++ b/project/assets/database/bots/types/assault.json
@ -4895,7 +4895,8 @@
          "59e89d0986f77427600d226e",
          "5649b0fc4bdc2d17108b4588",
          "59d6514b86f774171a068a08",
-          "5649b2314bdc2d79388b4576"
+          "5649b2314bdc2d79388b4576",
+          "5cf518cfd7f00c065b422214"
        ],
        "patron_in_weapon": [
          "56dff3afd2720bba668b4567",
--- a/project/assets/database/bots/types/bossbully.json
+++ b/project/assets/database/bots/types/bossbully.json
@ -2005,8 +2005,8 @@
      "min": 0
    },
    "reward": {
-      "max": 1000,
-      "min": 1000
+      "max": 2500,
+      "min": 2500
    },
    "standingForKill": -0.2
  },
--- a/project/assets/database/bots/types/bossgluhar.json
+++ b/project/assets/database/bots/types/bossgluhar.json
@ -2287,8 +2287,8 @@
      "min": 0
    },
    "reward": {
-      "max": 1000,
-      "min": 1000
+      "max": 2650,
+      "min": 2650
    },
    "standingForKill": -0.2
  },
--- a/project/assets/database/bots/types/bosskilla.json
+++ b/project/assets/database/bots/types/bosskilla.json
@ -1989,8 +1989,8 @@
      "min": 0
    },
    "reward": {
-      "max": 1200,
-      "min": 1200
+      "max": 2000,
+      "min": 2000
    },
    "standingForKill": -0.2
  },
--- a/project/assets/database/bots/types/bossknight.json
+++ b/project/assets/database/bots/types/bossknight.json
@ -2105,8 +2105,8 @@
      "min": 0
    },
    "reward": {
-      "max": 1000,
-      "min": 1000
+      "max": 2300,
+      "min": 2300
    },
    "standingForKill": 0
  },
--- a/project/assets/database/bots/types/bosskojaniy.json
+++ b/project/assets/database/bots/types/bosskojaniy.json
@ -2051,8 +2051,8 @@
      "min": 0
    },
    "reward": {
-      "max": 1100,
-      "min": 1100
+      "max": 2100,
+      "min": 2100
    },
    "standingForKill": -0.2
  },
--- a/project/assets/database/bots/types/bosssanitar.json
+++ b/project/assets/database/bots/types/bosssanitar.json
@ -2090,8 +2090,8 @@
      "min": 0
    },
    "reward": {
-      "max": 1000,
-      "min": 1000
+      "max": 2700,
+      "min": 2700
    },
    "standingForKill": -0.2
  },
--- a/project/assets/database/bots/types/bosstagilla.json
+++ b/project/assets/database/bots/types/bosstagilla.json
@ -2084,8 +2084,8 @@
      "min": 0
    },
    "reward": {
-      "max": 1000,
-      "min": 1000
+      "max": 2450,
+      "min": 2450
    },
    "standingForKill": -0.2
  },
--- a/project/assets/database/bots/types/followerbigpipe.json
+++ b/project/assets/database/bots/types/followerbigpipe.json
@ -1998,8 +1998,8 @@
      "min": 0
    },
    "reward": {
-      "max": 1000,
-      "min": 1000
+      "max": 2100,
+      "min": 2100
    },
    "standingForKill": -0.05
  },
--- a/project/assets/database/bots/types/followerbirdeye.json
+++ b/project/assets/database/bots/types/followerbirdeye.json
@ -2056,8 +2056,8 @@
      "min": 0
    },
    "reward": {
-      "max": 1000,
-      "min": 1000
+      "max": 2100,
+      "min": 2100
    },
    "standingForKill": -0.05
  },
--- a/project/assets/database/bots/types/followerbully.json
+++ b/project/assets/database/bots/types/followerbully.json
@ -1998,8 +1998,8 @@
      "min": 0
    },
    "reward": {
-      "max": 200,
-      "min": 200
+      "max": 250,
+      "min": 250
    },
    "standingForKill": -0.05
  },
--- a/project/assets/database/bots/types/followergluharsecurity.json
+++ b/project/assets/database/bots/types/followergluharsecurity.json
@ -2159,8 +2159,8 @@
      "min": 0
    },
    "reward": {
-      "max": 275,
-      "min": 275
+      "max": 325,
+      "min": 325
    },
    "standingForKill": -0.05
  },
--- a/project/assets/database/bots/types/followersanitar.json
+++ b/project/assets/database/bots/types/followersanitar.json
@ -2077,8 +2077,8 @@
      "min": 0
    },
    "reward": {
-      "max": 325,
-      "min": 325
+      "max": 350,
+      "min": 350
    },
    "standingForKill": -0.05
  },
--- a/project/assets/database/bots/types/followerzryachiy.json
+++ b/project/assets/database/bots/types/followerzryachiy.json
@ -42,7 +42,7 @@
      "mod_handguard": 100,
      "mod_launcher": 0,
      "mod_magazine": 100,
-      "mod_mount": 93,
+      "mod_mount": 95,
      "mod_mount_000": 72,
      "mod_mount_001": 97,
      "mod_mount_002": 98,
@ -61,7 +61,7 @@
      "mod_tactical002": 0,
      "mod_tactical_000": 1,
      "mod_tactical_001": 0,
-      "mod_tactical_002": 96
+      "mod_tactical_002": 97
    }
  },
  "difficulty": {
--- a/project/assets/database/bots/types/marksman.json
+++ b/project/assets/database/bots/types/marksman.json
@ -1997,7 +1997,7 @@
      "max": -1,
      "min": -1
    },
-    "standingForKill": -0.04
+    "standingForKill": -0.05
  },
  "firstName": [
    "Артур",
--- a/project/assets/database/bots/types/pmcbot.json
+++ b/project/assets/database/bots/types/pmcbot.json
@ -2031,8 +2031,8 @@
      "min": 0
    },
    "reward": {
-      "max": 250,
-      "min": 250
+      "max": 275,
+      "min": 275
    },
    "standingForKill": 0
  },
--- a/project/assets/database/bots/types/sectantpriest.json
+++ b/project/assets/database/bots/types/sectantpriest.json
@ -2072,8 +2072,8 @@
      "min": 0
    },
    "reward": {
-      "max": 1200,
-      "min": 1200
+      "max": 2900,
+      "min": 2900
    },
    "standingForKill": 0
  },
--- a/project/assets/database/bots/types/sectantwarrior.json
+++ b/project/assets/database/bots/types/sectantwarrior.json
@ -2079,8 +2079,8 @@
      "min": 0
    },
    "reward": {
-      "max": 600,
-      "min": 600
+      "max": 800,
+      "min": 800
    },
    "standingForKill": 0
  },