diff --git a/project/assets/database/bots/types/arenafighterevent.json b/project/assets/database/bots/types/arenafighterevent.json index ec498b77..53344b95 100644 --- a/project/assets/database/bots/types/arenafighterevent.json +++ b/project/assets/database/bots/types/arenafighterevent.json @@ -2942,11 +2942,12 @@ "mod_mount": [ "587e08ee245977446b4410cf" ], - "mod_muzzle": [ - "5cf67cadd7f00c065a5abab7" + "mod_reciever": [ + "634f06262e5def262d0b30ca", + "634f05ca517ccc8a960fc748" ], - "mod_sight_rear": [ - "574db213245977459a2f3f5d" + "mod_barrel": [ + "634eff66517ccc8a960fc735" ], "mod_stock": [ "5d0236dad7ad1a0940739d29" @@ -2955,6 +2956,13 @@ "59e0d99486f7744a32234762" ] }, + "634eff66517ccc8a960fc735": { + "mod_mount_000": ["634f05a21f9f536910079b56"], + "mod_muzzle": ["5cf67cadd7f00c065a5abab7"] + }, + "634f05a21f9f536910079b56": { + "mod_gas_block": ["634f036a517ccc8a960fc746"] + }, "587e08ee245977446b4410cf": { "mod_scope": [ "57acb6222459771ec34b5cb0" diff --git a/project/assets/database/bots/types/assault.json b/project/assets/database/bots/types/assault.json index b2d1072a..d9a4e369 100644 --- a/project/assets/database/bots/types/assault.json +++ b/project/assets/database/bots/types/assault.json @@ -2673,7 +2673,8 @@ "5ab8ee7786f7742d8f33f0b9": 673, "5ab8f04f86f774585f4237d8": 470, "5f5e45cc5021ce62144be7aa": 1679, - "60a2828e8689911a226117f9": 109 + "60a2828e8689911a226117f9": 109, + "656ddcf0f02d7bcea90bf395": 200 }, "Earpiece": {}, "Eyewear": { @@ -2715,7 +2716,7 @@ "5580223e4bdc2d1c128b457f": 850, "5644bd2b4bdc2d3b4c8b4572": 208, "56dee2bdd2720bc8328b4567": 2569, - "574d967124597745970e7c94": 1051, + "574d967124597745970e7c94": 9991051, "576165642459773c7a400233": 2099, "57d14d2524597714373db789": 390, "57dc2fa62459775949412633": 1183, @@ -4654,12 +4655,6 @@ ] }, "mods": { - "5648a7494bdc2d9d488b4583": { - "Soft_armor_front": ["65703d866584602f7d057a8a"], - "Soft_armor_back": ["65703fa06584602f7d057a8e"], - "Soft_armor_left": ["65703fe46a912c8b5c03468b"], - "Soft_armor_right": ["657040374e67e8ec7a0d261c"] - }, "5447a9cd4bdc2dbd208b4567": { "mod_charge": [ "6033749e88382f4fab3fd2c5", @@ -4916,6 +4911,20 @@ "56dff061d2720bb5668b4567" ] }, + "5648a7494bdc2d9d488b4583": { + "Soft_armor_back": [ + "65703fa06584602f7d057a8e" + ], + "Soft_armor_front": [ + "65703d866584602f7d057a8a" + ], + "Soft_armor_left": [ + "65703fe46a912c8b5c03468b" + ], + "Soft_armor_right": [ + "657040374e67e8ec7a0d261c" + ] + }, "5648ae314bdc2d3d1c8b457f": { "mod_scope": [ "5b30b0dc5acfc400153b7124" @@ -5103,23 +5112,23 @@ ] }, "574d967124597745970e7c94": { + "mod_barrel": [ + "634eff66517ccc8a960fc735", + "634f02331f9f536910079b51" + ], "mod_magazine": [ "587df3a12459772c28142567", "587df583245977373c4f1129", "61695095d92c473c7702147a" ], - "mod_reciever": [ + "mod_reciever": [ "634f06262e5def262d0b30ca", "634f05ca517ccc8a960fc748", - "6415c694da439c6a97048b56" + "6415c694da439c6a97048b56" ], "mod_stock": [ "574dad8024597745964bf05c", "587e0531245977466077a0f7" - ], - "mod_barrel": [ - "634eff66517ccc8a960fc735", - "634f02331f9f536910079b51" ], "patron_in_weapon": [ "59e4cf5286f7741778269d8a", @@ -5129,18 +5138,6 @@ "64b7af734b75259c590fa895" ] }, - "634f02331f9f536910079b51": { - "mod_mount_000": ["634f05a21f9f536910079b56"], - "mod_mount_001": ["593d1fa786f7746da62d61ac"], - "mod_muzzle": ["5cf67cadd7f00c065a5abab7"] - }, - "634eff66517ccc8a960fc735": { - "mod_mount_000": ["634f05a21f9f536910079b56", "634f04d82e5def262d0b30c6"] - }, - "634f05a21f9f536910079b56": { - "mod_gas_block": ["634f036a517ccc8a960fc746", "634f02d7517ccc8a960fc744"], - "mod_sight_rear": ["574db213245977459a2f3f5d"] - }, "576165642459773c7a400233": { "mod_charge": [ "5648ac824bdc2ded0b8b457d", @@ -5386,17 +5383,20 @@ ] }, "587e02ff24597743df3deaeb": { + "mod_barrel": [ + "634eff66517ccc8a960fc735", + "634f02331f9f536910079b51" + ], "mod_magazine": [ "587df3a12459772c28142567" ], "mod_mount": [ "587e08ee245977446b4410cf" ], - "mod_barrel": [ - "634eff66517ccc8a960fc735", "634f02331f9f536910079b51" - ], - "mod_reciever": [ - "634f06262e5def262d0b30ca", "634f05ca517ccc8a960fc748", "6415c694da439c6a97048b56" + "mod_reciever": [ + "634f06262e5def262d0b30ca", + "634f05ca517ccc8a960fc748", + "6415c694da439c6a97048b56" ], "mod_stock": [ "574dad8024597745964bf05c", @@ -6904,6 +6904,36 @@ "6259c3d8012d6678ec38eeb8" ] }, + "634eff66517ccc8a960fc735": { + "mod_mount_000": [ + "634f05a21f9f536910079b56", + "634f04d82e5def262d0b30c6" + ] + }, + "634f02331f9f536910079b51": { + "mod_mount_000": [ + "634f05a21f9f536910079b56" + ], + "mod_mount_001": [ + "593d1fa786f7746da62d61ac" + ], + "mod_muzzle": [ + "5cf67cadd7f00c065a5abab7" + ] + }, + "634f04d82e5def262d0b30c6": { + "mod_gas_block": ["634f036a517ccc8a960fc746"], + "mod_sight_rear": ["574db213245977459a2f3f5d"] + }, + "634f05a21f9f536910079b56": { + "mod_gas_block": [ + "634f036a517ccc8a960fc746", + "634f02d7517ccc8a960fc744" + ], + "mod_sight_rear": [ + "574db213245977459a2f3f5d" + ] + }, "6374a822e629013b9c0645c8": { "mod_sight_rear": [ "63c6adcfb4ba094317063742" diff --git a/project/assets/database/bots/types/bear.json b/project/assets/database/bots/types/bear.json index bdcfd508..27741288 100644 --- a/project/assets/database/bots/types/bear.json +++ b/project/assets/database/bots/types/bear.json @@ -4645,6 +4645,10 @@ "mod_magazine": [ "5c5970672e221602b21d7855", "587df583245977373c4f1129" + ], + "mod_barrel": [ + "634eff66517ccc8a960fc735", + "634f02331f9f536910079b51" ], "mod_reciever": [ "634f06262e5def262d0b30ca", @@ -5139,6 +5143,20 @@ "601aa3d2b2bcb34913271e6d" ] }, + "634f02331f9f536910079b51": { + "mod_mount_000": ["634f05a21f9f536910079b56", "634f04d82e5def262d0b30c6"], + "mod_mount_001": ["593d1fa786f7746da62d61ac"], + "mod_muzzle": ["5cf67cadd7f00c065a5abab7", "593d490386f7745ee97a1555"] + }, + "634eff66517ccc8a960fc735": { + "mod_mount_000": ["634f05a21f9f536910079b56", "634f04d82e5def262d0b30c6"] + }, + "634f05a21f9f536910079b56": { + "mod_gas_block": ["634f036a517ccc8a960fc746", "634f02d7517ccc8a960fc744"] + }, + "634f04d82e5def262d0b30c6": { + "mod_gas_block": ["634f036a517ccc8a960fc746", "634f02d7517ccc8a960fc744"] + }, "587e08ee245977446b4410cf": { "mod_scope": [ "57acb6222459771ec34b5cb0", diff --git a/project/assets/database/bots/types/bossboar.json b/project/assets/database/bots/types/bossboar.json index 8bc39158..61f320ee 100644 --- a/project/assets/database/bots/types/bossboar.json +++ b/project/assets/database/bots/types/bossboar.json @@ -2976,14 +2976,11 @@ }, "6492d7847363b8a52206bc52": { "mod_pistolgrip_000": [ - "5649ade84bdc2d1b2b8b4587", - "5e2192a498a36665e8337386", - "5a0071d486f77404e23a12b2", - "5649ae4a4bdc2d1b2b8b4588", - "628c9ab845c59e5b80768a81", - "628a664bccaab13006640e47", - "6087e663132d4d12c81fd96b", - "5f6341043ada5942720e2dc5" +"5649ad3f4bdc2df8348b4585", + "59e62cc886f77440d40b52a1", + "59e6318286f77444dd62c4cc", + "5649ade84bdc2d1b2b8b4587", + "57e3dba62459770f0c32322b" ], "mod_stock_000": [ "5a0c59791526d8dba737bba7" diff --git a/project/assets/database/bots/types/bossboarsniper.json b/project/assets/database/bots/types/bossboarsniper.json index dde05884..17de665c 100644 --- a/project/assets/database/bots/types/bossboarsniper.json +++ b/project/assets/database/bots/types/bossboarsniper.json @@ -2487,17 +2487,26 @@ "mod_mount": [ "587e08ee245977446b4410cf" ], - "mod_muzzle": [ - "593d490386f7745ee97a1555" + "mod_reciever": [ +"634f06262e5def262d0b30ca", + "634f05ca517ccc8a960fc748", + "6415c694da439c6a97048b56" ], - "mod_sight_rear": [ - "574db213245977459a2f3f5d" + "mod_barrel": [ + "634eff66517ccc8a960fc735" ], "mod_stock": [ "5afd7ded5acfc40017541f5e", "5d0236dad7ad1a0940739d29" ] }, + "634eff66517ccc8a960fc735": { + "mod_mount_000": ["634f05a21f9f536910079b56"], + "mod_muzzle": ["5cf67cadd7f00c065a5abab7"] + }, + "634f05a21f9f536910079b56": { + "mod_gas_block": ["634f036a517ccc8a960fc746"] + }, "587e08ee245977446b4410cf": { "mod_scope": [ "5947db3f86f77447880cf76f", @@ -2790,16 +2799,8 @@ "5c471c2d2e22164bef5d077f" ], "mod_pistol_grip": [ - "5947f92f86f77427344a76b1", - "63f4da90f31d4a33b87bd054", - "5e2192a498a36665e8337386", - "5c471be12e221602b66cd9ac", - "5cf50850d7f00c056e24104c", - "5947fa2486f77425b47c1a9b", - "5beec8ea0db834001a6f9dbf", - "5cf54404d7f00c108840b2ef", - "623c3be0484b5003161840dc", - "5cf508bfd7f00c056e24104e" + "5c471be12e221602b66cd9ac", + "6516b129609aaf354b34b3a8" ], "mod_reciever": [ "5c471bd12e221602b4129c3a" @@ -2809,6 +2810,9 @@ "6197b229af1f5202c57a9bea" ] }, + "6516b129609aaf354b34b3a8": { + "mod_pistolgrip": ["5f6341043ada5942720e2dc5"] + }, "5c471bfc2e221602b21d4e17": { "mod_muzzle": [ "5e01e9e273d8eb11426f5bc3" diff --git a/project/assets/database/bots/types/bossknight.json b/project/assets/database/bots/types/bossknight.json index 91e0b8b7..cd07d9de 100644 --- a/project/assets/database/bots/types/bossknight.json +++ b/project/assets/database/bots/types/bossknight.json @@ -395,6 +395,7 @@ "DOG_FIGHT_OUT": 6, "ENEMY_LOOK_AT_ME_ANG": 15, "FIND_COVER_TO_GET_POSITION_WITH_SHOOT": 2, + "FOLLOWER_AND_BOSS_WARN_EQUAL_PRIORITY": true, "FRIENDLY_BOT_TYPES": [ "exUsec" ], @@ -423,6 +424,13 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 30, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [ + "exUsec", + "gifter", + "bossKnight", + "followerBigPipe", + "followerBirdEye" + ], "SEARCH_TARGET": false, "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, @@ -906,6 +914,7 @@ "DOG_FIGHT_OUT": 6, "ENEMY_LOOK_AT_ME_ANG": 15, "FIND_COVER_TO_GET_POSITION_WITH_SHOOT": 2, + "FOLLOWER_AND_BOSS_WARN_EQUAL_PRIORITY": true, "FRIENDLY_BOT_TYPES": [ "exUsec" ], @@ -934,6 +943,13 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 30, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [ + "exUsec", + "gifter", + "bossKnight", + "followerBigPipe", + "followerBirdEye" + ], "SEARCH_TARGET": false, "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, @@ -1417,6 +1433,7 @@ "DOG_FIGHT_OUT": 6, "ENEMY_LOOK_AT_ME_ANG": 15, "FIND_COVER_TO_GET_POSITION_WITH_SHOOT": 2, + "FOLLOWER_AND_BOSS_WARN_EQUAL_PRIORITY": true, "FRIENDLY_BOT_TYPES": [ "exUsec" ], @@ -1445,6 +1462,13 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 30, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [ + "exUsec", + "gifter", + "bossKnight", + "followerBigPipe", + "followerBirdEye" + ], "SEARCH_TARGET": false, "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, @@ -1928,6 +1952,7 @@ "DOG_FIGHT_OUT": 6, "ENEMY_LOOK_AT_ME_ANG": 15, "FIND_COVER_TO_GET_POSITION_WITH_SHOOT": 2, + "FOLLOWER_AND_BOSS_WARN_EQUAL_PRIORITY": true, "FRIENDLY_BOT_TYPES": [ "exUsec" ], @@ -1956,6 +1981,13 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 30, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [ + "exUsec", + "gifter", + "bossKnight", + "followerBigPipe", + "followerBirdEye" + ], "SEARCH_TARGET": false, "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, diff --git a/project/assets/database/bots/types/bosskojaniy.json b/project/assets/database/bots/types/bosskojaniy.json index 4e2f4dea..c5c1875b 100644 --- a/project/assets/database/bots/types/bosskojaniy.json +++ b/project/assets/database/bots/types/bosskojaniy.json @@ -407,7 +407,7 @@ "FRIEND_AGR_KILL": 0.2, "FRIEND_DEAD_AGR_LOW": -0.2, "GROUP_ANY_PHRASE_DELAY": 5, - "GROUP_EXACTLY_PHRASE_DELAY": 20, + "GROUP_EXACTLY_PHRASE_DELAY_MAX": 20, "HEAL_DELAY_SEC": 5, "HIT_DELAY_WHEN_HAVE_SMT": -1, "HIT_DELAY_WHEN_PEACE": -1, @@ -480,12 +480,12 @@ "MAX_YDIST_TO_START_WARN_REQUEST_TO_REQUESTER": 5, "MIN_DIST_TO_CLOSE_TALK": 5, "MIN_DIST_TO_CLOSE_TALK_SQR": 25, - "MIN_TALK_DELAY": 50, + "MIN_TALK_DELAY": 20, "RESERVE_OUT_TIME": 60, "RESERVE_TIME_STAY": 72, "SUSPETION_PLACE_LIFETIME": 7, "TALK_DELAY": 1.1, - "TALK_DELAY_BIG": 55.1, + "TALK_DELAY_BIG": 34.1, "TRY_CHOOSE_RESERV_WAY_ON_START": false, "VISION_DIST_COEF_PEACE": 1 }, @@ -902,7 +902,7 @@ "FRIEND_AGR_KILL": 0.2, "FRIEND_DEAD_AGR_LOW": -0.2, "GROUP_ANY_PHRASE_DELAY": 5, - "GROUP_EXACTLY_PHRASE_DELAY": 20, + "GROUP_EXACTLY_PHRASE_DELAY_MAX": 20, "HEAL_DELAY_SEC": 5, "HIT_DELAY_WHEN_HAVE_SMT": -1, "HIT_DELAY_WHEN_PEACE": -1, @@ -975,12 +975,12 @@ "MAX_YDIST_TO_START_WARN_REQUEST_TO_REQUESTER": 5, "MIN_DIST_TO_CLOSE_TALK": 5, "MIN_DIST_TO_CLOSE_TALK_SQR": 25, - "MIN_TALK_DELAY": 50, + "MIN_TALK_DELAY": 20, "RESERVE_OUT_TIME": 60, "RESERVE_TIME_STAY": 72, "SUSPETION_PLACE_LIFETIME": 7, "TALK_DELAY": 1.1, - "TALK_DELAY_BIG": 55.1, + "TALK_DELAY_BIG": 34.1, "TRY_CHOOSE_RESERV_WAY_ON_START": false, "VISION_DIST_COEF_PEACE": 1 }, @@ -1397,7 +1397,7 @@ "FRIEND_AGR_KILL": 0.2, "FRIEND_DEAD_AGR_LOW": -0.2, "GROUP_ANY_PHRASE_DELAY": 5, - "GROUP_EXACTLY_PHRASE_DELAY": 20, + "GROUP_EXACTLY_PHRASE_DELAY_MAX": 20, "HEAL_DELAY_SEC": 5, "HIT_DELAY_WHEN_HAVE_SMT": -1, "HIT_DELAY_WHEN_PEACE": -1, @@ -1470,12 +1470,12 @@ "MAX_YDIST_TO_START_WARN_REQUEST_TO_REQUESTER": 5, "MIN_DIST_TO_CLOSE_TALK": 5, "MIN_DIST_TO_CLOSE_TALK_SQR": 25, - "MIN_TALK_DELAY": 50, + "MIN_TALK_DELAY": 20, "RESERVE_OUT_TIME": 60, "RESERVE_TIME_STAY": 72, "SUSPETION_PLACE_LIFETIME": 7, "TALK_DELAY": 1.1, - "TALK_DELAY_BIG": 55.1, + "TALK_DELAY_BIG": 34.1, "TRY_CHOOSE_RESERV_WAY_ON_START": false, "VISION_DIST_COEF_PEACE": 1 }, @@ -1892,7 +1892,7 @@ "FRIEND_AGR_KILL": 0.2, "FRIEND_DEAD_AGR_LOW": -0.2, "GROUP_ANY_PHRASE_DELAY": 5, - "GROUP_EXACTLY_PHRASE_DELAY": 20, + "GROUP_EXACTLY_PHRASE_DELAY_MAX": 20, "HEAL_DELAY_SEC": 5, "HIT_DELAY_WHEN_HAVE_SMT": -1, "HIT_DELAY_WHEN_PEACE": -1, @@ -1965,12 +1965,12 @@ "MAX_YDIST_TO_START_WARN_REQUEST_TO_REQUESTER": 5, "MIN_DIST_TO_CLOSE_TALK": 5, "MIN_DIST_TO_CLOSE_TALK_SQR": 25, - "MIN_TALK_DELAY": 50, + "MIN_TALK_DELAY": 20, "RESERVE_OUT_TIME": 60, "RESERVE_TIME_STAY": 72, "SUSPETION_PLACE_LIFETIME": 7, "TALK_DELAY": 1.1, - "TALK_DELAY_BIG": 55.1, + "TALK_DELAY_BIG": 34.1, "TRY_CHOOSE_RESERV_WAY_ON_START": false, "VISION_DIST_COEF_PEACE": 1 }, diff --git a/project/assets/database/bots/types/bosszryachiy.json b/project/assets/database/bots/types/bosszryachiy.json index fc60bb32..9da733b9 100644 --- a/project/assets/database/bots/types/bosszryachiy.json +++ b/project/assets/database/bots/types/bosszryachiy.json @@ -105,12 +105,16 @@ "XZ_COEF_STATIONARY_GRENADE": 0.8 }, "Boss": { - "BOSS_DIST_TO_SHOOT": 10, - "BOSS_DIST_TO_SHOOT_SQRT": 100, - "BOSS_DIST_TO_WARNING": 20, - "BOSS_DIST_TO_WARNING_OUT": 25, - "BOSS_DIST_TO_WARNING_OUT_SQRT": 625, - "BOSS_DIST_TO_WARNING_SQRT": 400, + "BOSS_DIST_TO_SHOOT": 5, + "BOSS_DIST_TO_SHOOT_SQRT": 25, + "BOSS_DIST_TO_WARNING": 8, + "BOSS_DIST_TO_WARNING_BEAR": 8, + "BOSS_DIST_TO_WARNING_OUT": 12, + "BOSS_DIST_TO_WARNING_OUT_SQRT": 144, + "BOSS_DIST_TO_WARNING_SQRT": 64, + "BOSS_DIST_TO_WARNING_SQRT_BEAR": 64, + "BOSS_DIST_TO_WARNING_SQRT_USEC": 64, + "BOSS_DIST_TO_WARNING_USEC": 8, "CHANCE_TO_SEND_GRENADE_100": 100, "CHANCE_USE_RESERVE_PATROL_100": 30, "COVER_TO_SEND": true, @@ -586,12 +590,16 @@ "XZ_COEF_STATIONARY_GRENADE": 0.8 }, "Boss": { - "BOSS_DIST_TO_SHOOT": 10, - "BOSS_DIST_TO_SHOOT_SQRT": 100, - "BOSS_DIST_TO_WARNING": 20, - "BOSS_DIST_TO_WARNING_OUT": 25, - "BOSS_DIST_TO_WARNING_OUT_SQRT": 625, - "BOSS_DIST_TO_WARNING_SQRT": 400, + "BOSS_DIST_TO_SHOOT": 5, + "BOSS_DIST_TO_SHOOT_SQRT": 25, + "BOSS_DIST_TO_WARNING": 8, + "BOSS_DIST_TO_WARNING_BEAR": 8, + "BOSS_DIST_TO_WARNING_OUT": 12, + "BOSS_DIST_TO_WARNING_OUT_SQRT": 144, + "BOSS_DIST_TO_WARNING_SQRT": 64, + "BOSS_DIST_TO_WARNING_SQRT_BEAR": 64, + "BOSS_DIST_TO_WARNING_SQRT_USEC": 64, + "BOSS_DIST_TO_WARNING_USEC": 8, "CHANCE_TO_SEND_GRENADE_100": 100, "CHANCE_USE_RESERVE_PATROL_100": 30, "COVER_TO_SEND": true, @@ -1067,12 +1075,16 @@ "XZ_COEF_STATIONARY_GRENADE": 0.8 }, "Boss": { - "BOSS_DIST_TO_SHOOT": 10, - "BOSS_DIST_TO_SHOOT_SQRT": 100, - "BOSS_DIST_TO_WARNING": 20, - "BOSS_DIST_TO_WARNING_OUT": 25, - "BOSS_DIST_TO_WARNING_OUT_SQRT": 625, - "BOSS_DIST_TO_WARNING_SQRT": 400, + "BOSS_DIST_TO_SHOOT": 5, + "BOSS_DIST_TO_SHOOT_SQRT": 25, + "BOSS_DIST_TO_WARNING": 8, + "BOSS_DIST_TO_WARNING_BEAR": 8, + "BOSS_DIST_TO_WARNING_OUT": 12, + "BOSS_DIST_TO_WARNING_OUT_SQRT": 144, + "BOSS_DIST_TO_WARNING_SQRT": 64, + "BOSS_DIST_TO_WARNING_SQRT_BEAR": 64, + "BOSS_DIST_TO_WARNING_SQRT_USEC": 64, + "BOSS_DIST_TO_WARNING_USEC": 8, "CHANCE_TO_SEND_GRENADE_100": 100, "CHANCE_USE_RESERVE_PATROL_100": 30, "COVER_TO_SEND": true, @@ -1548,12 +1560,16 @@ "XZ_COEF_STATIONARY_GRENADE": 0.8 }, "Boss": { - "BOSS_DIST_TO_SHOOT": 10, - "BOSS_DIST_TO_SHOOT_SQRT": 100, - "BOSS_DIST_TO_WARNING": 20, - "BOSS_DIST_TO_WARNING_OUT": 25, - "BOSS_DIST_TO_WARNING_OUT_SQRT": 625, - "BOSS_DIST_TO_WARNING_SQRT": 400, + "BOSS_DIST_TO_SHOOT": 5, + "BOSS_DIST_TO_SHOOT_SQRT": 25, + "BOSS_DIST_TO_WARNING": 8, + "BOSS_DIST_TO_WARNING_BEAR": 8, + "BOSS_DIST_TO_WARNING_OUT": 12, + "BOSS_DIST_TO_WARNING_OUT_SQRT": 144, + "BOSS_DIST_TO_WARNING_SQRT": 64, + "BOSS_DIST_TO_WARNING_SQRT_BEAR": 64, + "BOSS_DIST_TO_WARNING_SQRT_USEC": 64, + "BOSS_DIST_TO_WARNING_USEC": 8, "CHANCE_TO_SEND_GRENADE_100": 100, "CHANCE_USE_RESERVE_PATROL_100": 30, "COVER_TO_SEND": true, @@ -2205,8 +2221,8 @@ "60c7272c204bc17802313365": 1 }, "Scabbard": { - "5fc64ea372b0dd78d51159dc": 1 - }, + "5fc64ea372b0dd78d51159dc": 1 + }, "SecondPrimaryWeapon": { "57dc2fa62459775949412633": 968, "5ba26383d4351e00334c93d9": 13 @@ -2354,7 +2370,7 @@ "5dfcd0e547101c39625f66f9" ], "mod_pistol_grip": [ - "5b30ac585acfc433000eb79c" + "5c471be12e221602b66cd9ac" ], "mod_reciever": [ "5dfce88fe9dc277128008b2e" diff --git a/project/assets/database/bots/types/exusec.json b/project/assets/database/bots/types/exusec.json index aa9b4653..c3efb7f1 100644 --- a/project/assets/database/bots/types/exusec.json +++ b/project/assets/database/bots/types/exusec.json @@ -422,6 +422,7 @@ "ENEMY_BOT_TYPES": [], "ENEMY_LOOK_AT_ME_ANG": 15, "FIND_COVER_TO_GET_POSITION_WITH_SHOOT": 2, + "FOLLOWER_AND_BOSS_WARN_EQUAL_PRIORITY": true, "FRIENDLY_BOT_TYPES": [], "FRIEND_AGR_KILL": 0.2, "FRIEND_DEAD_AGR_LOW": -0.2, @@ -915,6 +916,7 @@ "ENEMY_BOT_TYPES": [], "ENEMY_LOOK_AT_ME_ANG": 15, "FIND_COVER_TO_GET_POSITION_WITH_SHOOT": 2, + "FOLLOWER_AND_BOSS_WARN_EQUAL_PRIORITY": true, "FRIENDLY_BOT_TYPES": [], "FRIEND_AGR_KILL": 0.2, "FRIEND_DEAD_AGR_LOW": -0.2, @@ -1408,6 +1410,7 @@ "ENEMY_BOT_TYPES": [], "ENEMY_LOOK_AT_ME_ANG": 15, "FIND_COVER_TO_GET_POSITION_WITH_SHOOT": 2, + "FOLLOWER_AND_BOSS_WARN_EQUAL_PRIORITY": true, "FRIENDLY_BOT_TYPES": [], "FRIEND_AGR_KILL": 0.2, "FRIEND_DEAD_AGR_LOW": -0.2, @@ -1901,6 +1904,7 @@ "ENEMY_BOT_TYPES": [], "ENEMY_LOOK_AT_ME_ANG": 15, "FIND_COVER_TO_GET_POSITION_WITH_SHOOT": 2, + "FOLLOWER_AND_BOSS_WARN_EQUAL_PRIORITY": true, "FRIENDLY_BOT_TYPES": [], "FRIEND_AGR_KILL": 0.2, "FRIEND_DEAD_AGR_LOW": -0.2, diff --git a/project/assets/database/bots/types/followerbigpipe.json b/project/assets/database/bots/types/followerbigpipe.json index bcaab686..b835330f 100644 --- a/project/assets/database/bots/types/followerbigpipe.json +++ b/project/assets/database/bots/types/followerbigpipe.json @@ -408,6 +408,13 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 30, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [ + "exUsec", + "gifter", + "bossKnight", + "followerBigPipe", + "followerBirdEye" + ], "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, "SIMPLE_POINT_CHOOSE_COEF": 0.4, @@ -892,6 +899,13 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 30, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [ + "exUsec", + "gifter", + "bossKnight", + "followerBigPipe", + "followerBirdEye" + ], "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, "SIMPLE_POINT_CHOOSE_COEF": 0.4, @@ -1376,6 +1390,13 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 30, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [ + "exUsec", + "gifter", + "bossKnight", + "followerBigPipe", + "followerBirdEye" + ], "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, "SIMPLE_POINT_CHOOSE_COEF": 0.4, @@ -1860,6 +1881,13 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 30, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [ + "exUsec", + "gifter", + "bossKnight", + "followerBigPipe", + "followerBirdEye" + ], "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, "SIMPLE_POINT_CHOOSE_COEF": 0.4, diff --git a/project/assets/database/bots/types/followerkojaniy.json b/project/assets/database/bots/types/followerkojaniy.json index c747d64b..13796fdc 100644 --- a/project/assets/database/bots/types/followerkojaniy.json +++ b/project/assets/database/bots/types/followerkojaniy.json @@ -2644,20 +2644,28 @@ "587e02ff24597743df3deaeb": { "mod_magazine": [ "587df583245977373c4f1129" + ], + "mod_barrel": [ + "634eff66517ccc8a960fc735" ], "mod_mount": [ "587e08ee245977446b4410cf" ], - "mod_muzzle": [ - "593d490386f7745ee97a1555" - ], - "mod_sight_rear": [ - "574db213245977459a2f3f5d" - ], "mod_stock": [ "5d0236dad7ad1a0940739d29" + ], + "mod_reciever": [ + "634f06262e5def262d0b30ca", + "634f05ca517ccc8a960fc748" ] }, + "634eff66517ccc8a960fc735": { + "mod_mount_000": ["634f05a21f9f536910079b56"], + "mod_muzzle": ["5cf67cadd7f00c065a5abab7"] + }, + "634f05a21f9f536910079b56": { + "mod_gas_block": ["634f036a517ccc8a960fc746"] + }, "587e08ee245977446b4410cf": { "mod_scope": [ "5947db3f86f77447880cf76f" diff --git a/project/assets/database/bots/types/followerzryachiy.json b/project/assets/database/bots/types/followerzryachiy.json index 2b585733..4c571317 100644 --- a/project/assets/database/bots/types/followerzryachiy.json +++ b/project/assets/database/bots/types/followerzryachiy.json @@ -114,12 +114,12 @@ "XZ_COEF_STATIONARY_GRENADE": 0.8 }, "Boss": { - "BOSS_DIST_TO_SHOOT": 10, - "BOSS_DIST_TO_SHOOT_SQRT": 100, - "BOSS_DIST_TO_WARNING": 20, - "BOSS_DIST_TO_WARNING_OUT": 25, - "BOSS_DIST_TO_WARNING_OUT_SQRT": 625, - "BOSS_DIST_TO_WARNING_SQRT": 400, + "BOSS_DIST_TO_SHOOT": 5, + "BOSS_DIST_TO_SHOOT_SQRT": 25, + "BOSS_DIST_TO_WARNING": 8, + "BOSS_DIST_TO_WARNING_OUT": 12, + "BOSS_DIST_TO_WARNING_OUT_SQRT": 144, + "BOSS_DIST_TO_WARNING_SQRT": 64, "BOSS_ZRYACHIY_MIN_DIST_TO_TELEPORT": 500, "CHANCE_TO_SEND_GRENADE_100": 100, "CHANCE_USE_RESERVE_PATROL_100": 30, @@ -592,12 +592,12 @@ "XZ_COEF_STATIONARY_GRENADE": 0.8 }, "Boss": { - "BOSS_DIST_TO_SHOOT": 10, - "BOSS_DIST_TO_SHOOT_SQRT": 100, - "BOSS_DIST_TO_WARNING": 20, - "BOSS_DIST_TO_WARNING_OUT": 25, - "BOSS_DIST_TO_WARNING_OUT_SQRT": 625, - "BOSS_DIST_TO_WARNING_SQRT": 400, + "BOSS_DIST_TO_SHOOT": 5, + "BOSS_DIST_TO_SHOOT_SQRT": 25, + "BOSS_DIST_TO_WARNING": 8, + "BOSS_DIST_TO_WARNING_OUT": 12, + "BOSS_DIST_TO_WARNING_OUT_SQRT": 144, + "BOSS_DIST_TO_WARNING_SQRT": 64, "BOSS_ZRYACHIY_MIN_DIST_TO_TELEPORT": 500, "CHANCE_TO_SEND_GRENADE_100": 100, "CHANCE_USE_RESERVE_PATROL_100": 30, @@ -1070,12 +1070,12 @@ "XZ_COEF_STATIONARY_GRENADE": 0.8 }, "Boss": { - "BOSS_DIST_TO_SHOOT": 10, - "BOSS_DIST_TO_SHOOT_SQRT": 100, - "BOSS_DIST_TO_WARNING": 20, - "BOSS_DIST_TO_WARNING_OUT": 25, - "BOSS_DIST_TO_WARNING_OUT_SQRT": 625, - "BOSS_DIST_TO_WARNING_SQRT": 400, + "BOSS_DIST_TO_SHOOT": 5, + "BOSS_DIST_TO_SHOOT_SQRT": 25, + "BOSS_DIST_TO_WARNING": 8, + "BOSS_DIST_TO_WARNING_OUT": 12, + "BOSS_DIST_TO_WARNING_OUT_SQRT": 144, + "BOSS_DIST_TO_WARNING_SQRT": 64, "BOSS_ZRYACHIY_MIN_DIST_TO_TELEPORT": 500, "CHANCE_TO_SEND_GRENADE_100": 100, "CHANCE_USE_RESERVE_PATROL_100": 30, @@ -1548,12 +1548,12 @@ "XZ_COEF_STATIONARY_GRENADE": 0.8 }, "Boss": { - "BOSS_DIST_TO_SHOOT": 10, - "BOSS_DIST_TO_SHOOT_SQRT": 100, - "BOSS_DIST_TO_WARNING": 20, - "BOSS_DIST_TO_WARNING_OUT": 25, - "BOSS_DIST_TO_WARNING_OUT_SQRT": 625, - "BOSS_DIST_TO_WARNING_SQRT": 400, + "BOSS_DIST_TO_SHOOT": 5, + "BOSS_DIST_TO_SHOOT_SQRT": 25, + "BOSS_DIST_TO_WARNING": 8, + "BOSS_DIST_TO_WARNING_OUT": 12, + "BOSS_DIST_TO_WARNING_OUT_SQRT": 144, + "BOSS_DIST_TO_WARNING_SQRT": 64, "BOSS_ZRYACHIY_MIN_DIST_TO_TELEPORT": 500, "CHANCE_TO_SEND_GRENADE_100": 100, "CHANCE_USE_RESERVE_PATROL_100": 30, diff --git a/project/assets/database/bots/types/gifter.json b/project/assets/database/bots/types/gifter.json index 1cc66746..16e7ef52 100644 --- a/project/assets/database/bots/types/gifter.json +++ b/project/assets/database/bots/types/gifter.json @@ -3117,21 +3117,21 @@ "587df3a12459772c28142567", "587df583245977373c4f1129" ], - "mod_sight_rear": [ - "574db213245977459a2f3f5d" + "mod_barrel": [ + "634eff66517ccc8a960fc735" ], "mod_stock": [ "574dad8024597745964bf05c" ], + "mod_reciever": [ + "634f06262e5def262d0b30ca", + "634f05ca517ccc8a960fc748", + "6415c694da439c6a97048b56" + ], "patron_in_weapon": [ "5656d7c34bdc2d9d198b4587" ] }, - "574dad8024597745964bf05c": { - "mod_mount_001": [ - "593d1fa786f7746da62d61ac" - ] - }, "576165642459773c7a400233": { "mod_handguard": [ "576169e62459773c69055191", @@ -3258,6 +3258,9 @@ "587e02ff24597743df3deaeb": { "mod_magazine": [ "587df3a12459772c28142567" + ], + "mod_barrel": [ + "634eff66517ccc8a960fc735" ], "mod_mount": [ "587e08ee245977446b4410cf" @@ -3265,10 +3268,21 @@ "mod_stock": [ "587e0531245977466077a0f7" ], + "mod_reciever": [ + "634f06262e5def262d0b30ca", + "634f05ca517ccc8a960fc748" + ], "patron_in_weapon": [ "5656d7c34bdc2d9d198b4587" ] }, + "634eff66517ccc8a960fc735": { + "mod_mount_000": ["634f05a21f9f536910079b56"], + "mod_muzzle": ["5cf67cadd7f00c065a5abab7"] + }, + "634f05a21f9f536910079b56": { + "mod_gas_block": ["634f036a517ccc8a960fc746"] + }, "587e08ee245977446b4410cf": { "mod_scope": [ "57486e672459770abd687134", diff --git a/project/assets/database/bots/types/marksman.json b/project/assets/database/bots/types/marksman.json index b4ae79bc..1932d7d6 100644 --- a/project/assets/database/bots/types/marksman.json +++ b/project/assets/database/bots/types/marksman.json @@ -2656,9 +2656,15 @@ ] }, "574d967124597745970e7c94": { + "mod_barrel": [ + "634f02331f9f536910079b51" + ], "mod_magazine": [ "587df3a12459772c28142567" ], + "mod_reciever": [ + "634f05ca517ccc8a960fc748" + ], "mod_sight_rear": [ "574db213245977459a2f3f5d" ], @@ -2767,12 +2773,18 @@ ] }, "587e02ff24597743df3deaeb": { + "mod_barrel": [ + "634eff66517ccc8a960fc735" + ], "mod_magazine": [ "587df3a12459772c28142567" ], "mod_mount": [ "587e08ee245977446b4410cf" ], + "mod_reciever": [ + "634f06262e5def262d0b30ca" + ], "mod_sight_rear": [ "574db213245977459a2f3f5d" ], @@ -3262,6 +3274,26 @@ "5beec8c20db834001d2c465c" ] }, + "634eff66517ccc8a960fc735": { + "mod_mount_000": [ + "634f05a21f9f536910079b56" + ] + }, + "634f02331f9f536910079b51": { + "mod_mount_000": [ + "634f04d82e5def262d0b30c6" + ] + }, + "634f04d82e5def262d0b30c6": { + "mod_gas_block": [ + "634f02d7517ccc8a960fc744" + ] + }, + "634f05a21f9f536910079b56": { + "mod_gas_block": [ + "634f036a517ccc8a960fc746" + ] + }, "6410758c857473525b08bb77": { "mod_muzzle": [ "64119d1f2c6d6f921a0929f8" diff --git a/project/assets/database/bots/types/pmcbot.json b/project/assets/database/bots/types/pmcbot.json index 586cb926..271aaeff 100644 --- a/project/assets/database/bots/types/pmcbot.json +++ b/project/assets/database/bots/types/pmcbot.json @@ -410,6 +410,7 @@ "ENEMY_BOT_TYPES": [], "ENEMY_LOOK_AT_ME_ANG": 15, "FIND_COVER_TO_GET_POSITION_WITH_SHOOT": 2, + "FOLLOWER_AND_BOSS_WARN_EQUAL_PRIORITY": true, "FRIENDLY_BOT_TYPES": [], "FRIEND_AGR_KILL": 0.2, "FRIEND_DEAD_AGR_LOW": -0.2, @@ -894,6 +895,7 @@ "ENEMY_BOT_TYPES": [], "ENEMY_LOOK_AT_ME_ANG": 15, "FIND_COVER_TO_GET_POSITION_WITH_SHOOT": 2, + "FOLLOWER_AND_BOSS_WARN_EQUAL_PRIORITY": true, "FRIENDLY_BOT_TYPES": [], "FRIEND_AGR_KILL": 0.2, "FRIEND_DEAD_AGR_LOW": -0.2, @@ -1378,6 +1380,7 @@ "ENEMY_BOT_TYPES": [], "ENEMY_LOOK_AT_ME_ANG": 15, "FIND_COVER_TO_GET_POSITION_WITH_SHOOT": 2, + "FOLLOWER_AND_BOSS_WARN_EQUAL_PRIORITY": true, "FRIENDLY_BOT_TYPES": [], "FRIEND_AGR_KILL": 0.2, "FRIEND_DEAD_AGR_LOW": -0.2, @@ -1862,6 +1865,7 @@ "ENEMY_BOT_TYPES": [], "ENEMY_LOOK_AT_ME_ANG": 15, "FIND_COVER_TO_GET_POSITION_WITH_SHOOT": 2, + "FOLLOWER_AND_BOSS_WARN_EQUAL_PRIORITY": true, "FRIENDLY_BOT_TYPES": [], "FRIEND_AGR_KILL": 0.2, "FRIEND_DEAD_AGR_LOW": -0.2, @@ -3097,12 +3101,11 @@ "mod_magazine": [ "5c5970672e221602b21d7855" ], - "mod_muzzle": [ - "593d490386f7745ee97a1555", - "5cf67cadd7f00c065a5abab7" + "mod_reciever": [ + "634f06262e5def262d0b30ca" ], - "mod_sight_rear": [ - "574db213245977459a2f3f5d" + "mod_barrel": [ + "634eff66517ccc8a960fc735" ], "mod_stock": [ "5d0236dad7ad1a0940739d29" @@ -3114,6 +3117,13 @@ "64b7af5a8532cf95ee0a0dbd" ] }, + "634eff66517ccc8a960fc735": { + "mod_mount_000": ["634f05a21f9f536910079b56"], + "mod_muzzle": ["5cf67cadd7f00c065a5abab7"] + }, + "634f05a21f9f536910079b56": { + "mod_gas_block": ["634f036a517ccc8a960fc746"] + }, "576165642459773c7a400233": { "mod_handguard": [ "5827272a24597748c74bdeea" @@ -3807,10 +3817,6 @@ "mod_pistol_grip": [ "5b30ac585acfc433000eb79c" ], - "mod_scope": [ - "5c0505e00db834001b735073", - "5d2da1e948f035477b1ce2ba" - ], "mod_tactical_000": [ "5c5952732e2216398b5abda2", "644a3df63b0b6f03e101e065" diff --git a/project/assets/database/bots/types/sectantpriest.json b/project/assets/database/bots/types/sectantpriest.json index bafba911..52478b66 100644 --- a/project/assets/database/bots/types/sectantpriest.json +++ b/project/assets/database/bots/types/sectantpriest.json @@ -420,6 +420,7 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 60, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [], "REVENGE_FOR_SAVAGE_PLAYERS": false, "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, @@ -922,6 +923,7 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 60, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [], "REVENGE_FOR_SAVAGE_PLAYERS": false, "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, @@ -1424,6 +1426,7 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 60, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [], "REVENGE_FOR_SAVAGE_PLAYERS": false, "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, @@ -1926,6 +1929,7 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 60, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [], "REVENGE_FOR_SAVAGE_PLAYERS": false, "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, diff --git a/project/assets/database/bots/types/sectantwarrior.json b/project/assets/database/bots/types/sectantwarrior.json index 614538c8..7c545835 100644 --- a/project/assets/database/bots/types/sectantwarrior.json +++ b/project/assets/database/bots/types/sectantwarrior.json @@ -424,6 +424,7 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 60, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [], "REVENGE_FOR_SAVAGE_PLAYERS": false, "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, @@ -927,6 +928,7 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 60, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [], "REVENGE_FOR_SAVAGE_PLAYERS": false, "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, @@ -1430,6 +1432,7 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 60, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [], "REVENGE_FOR_SAVAGE_PLAYERS": false, "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, @@ -1933,6 +1936,7 @@ "PISTOL_SHOTGUN_AMBUSH_DIST": 60, "PROTECT_DELTA_HEAL_SEC": 10, "PROTECT_TIME_REAL": true, + "REVENGE_BOT_TYPES": [], "REVENGE_FOR_SAVAGE_PLAYERS": false, "SEC_TO_MORE_DIST_TO_RUN": 10, "SHOOT_INSTEAD_DOG_FIGHT": 9, @@ -2787,16 +2791,23 @@ "mod_magazine": [ "5c5970672e221602b21d7855" ], - "mod_muzzle": [ - "593d490386f7745ee97a1555" + "mod_barrel": [ + "634eff66517ccc8a960fc735" ], - "mod_sight_rear": [ - "574db213245977459a2f3f5d" + "mod_reciever": [ + "634f06262e5def262d0b30ca" ], "mod_stock": [ "5afd7ded5acfc40017541f5e" ] }, + "634eff66517ccc8a960fc735": { + "mod_mount_000": ["634f05a21f9f536910079b56"], + "mod_muzzle": ["5cf67cadd7f00c065a5abab7"] + }, + "634f05a21f9f536910079b56": { + "mod_gas_block": ["634f036a517ccc8a960fc746"] + }, "57c44b372459772d2b39b8ce": { "mod_magazine": [ "57838f9f2459774a150289a0" diff --git a/project/assets/database/bots/types/usec.json b/project/assets/database/bots/types/usec.json index 4f26c959..b290d575 100644 --- a/project/assets/database/bots/types/usec.json +++ b/project/assets/database/bots/types/usec.json @@ -4639,14 +4639,18 @@ ] }, "574d967124597745970e7c94": { + "mod_barrel": [ + "634eff66517ccc8a960fc735", + "634f02331f9f536910079b51" + ], "mod_magazine": [ "5c5970672e221602b21d7855", "587df583245977373c4f1129" ], - "mod_reciever": [ + "mod_reciever": [ "634f06262e5def262d0b30ca", "634f05ca517ccc8a960fc748", - "6415c694da439c6a97048b56" + "6415c694da439c6a97048b56" ], "mod_stock": [ "574dad8024597745964bf05c", @@ -5105,6 +5109,10 @@ ] }, "587e02ff24597743df3deaeb": { + "mod_barrel": [ + "634eff66517ccc8a960fc735", + "634f02331f9f536910079b51" + ], "mod_magazine": [ "5c5970672e221602b21d7855", "587df583245977373c4f1129" @@ -5112,13 +5120,10 @@ "mod_mount": [ "587e08ee245977446b4410cf" ], - "mod_barrel": [ - "634eff66517ccc8a960fc735", "634f02331f9f536910079b51" - ], - "mod_reciever": [ + "mod_reciever": [ "634f06262e5def262d0b30ca", - "634f05ca517ccc8a960fc748", - "6415c694da439c6a97048b56" + "634f05ca517ccc8a960fc748", + "6415c694da439c6a97048b56" ], "mod_stock": [ "587e0531245977466077a0f7", @@ -5126,7 +5131,6 @@ "5afd7ded5acfc40017541f5e", "574dad8024597745964bf05c" ], - "patron_in_weapon": [ "59e0d99486f7744a32234762", "59e4d3d286f774176a36250a", @@ -10040,6 +10044,9 @@ "mod_pistol_grip": [ "5b30ac585acfc433000eb79c" ], + "mod_stock": [ + "653ed132896b99b40a0292e6" + ], "mod_tactical_000": [ "5a800961159bd4315e3a1657" ], @@ -10049,8 +10056,7 @@ "mod_tactical_002": [ "5d10b49bd7ad1a1a560708b0", "5a7b483fe899ef0016170d15" - ], - "mod_stock": ["653ed132896b99b40a0292e6"] + ] }, "5d024f5cd7ad1a04a067e91a": { "mod_scope": [ @@ -13805,6 +13811,37 @@ "5a800961159bd4315e3a1657" ] }, + "634eff66517ccc8a960fc735": { + "mod_mount_000": [ + "634f05a21f9f536910079b56", + "634f04d82e5def262d0b30c6" + ] + }, + "634f02331f9f536910079b51": { + "mod_mount_000": [ + "634f05a21f9f536910079b56", + "634f04d82e5def262d0b30c6" + ], + "mod_mount_001": [ + "593d1fa786f7746da62d61ac" + ], + "mod_muzzle": [ + "5cf67cadd7f00c065a5abab7", + "593d490386f7745ee97a1555" + ] + }, + "634f04d82e5def262d0b30c6": { + "mod_gas_block": [ + "634f036a517ccc8a960fc746", + "634f02d7517ccc8a960fc744" + ] + }, + "634f05a21f9f536910079b56": { + "mod_gas_block": [ + "634f036a517ccc8a960fc746", + "634f02d7517ccc8a960fc744" + ] + }, "637f57b78d137b27f70c496a": { "mod_foregrip": [ "58c157c886f774032749fb06" diff --git a/project/assets/database/locales/server/en.json b/project/assets/database/locales/server/en.json index a62550c4..7eb19e36 100644 --- a/project/assets/database/locales/server/en.json +++ b/project/assets/database/locales/server/en.json @@ -31,7 +31,7 @@ "bot-no_spawn_chance_defined_for_equipment_slot": "No spawn chance was defined for equipment: %s", "bot-single_bot_generation_not_found_in_cache": "Bot: %s not found in cache, generating fresh, this may cause game stuttering", "bot-unable_to_add_mod_item_invalid": "Mod: {{itemName}} is not a valid item, unable to add to slot: '{{modSlot}}' on item: {{parentItemName}}, skipping", - "bot-unable_to_add_mods_to_weapon_missing_ammo_slot": "Unable to add mods to weapon: {{weaponName}} {{weaponId}} as it lacks slots, cartridges or chambers", + "bot-unable_to_add_mods_to_weapon_missing_ammo_slot": "Unable to add mods to weapon: {{weaponName}} {{weaponId}} as it lacks slots, cartridges or chambers - {{botRole}}", "bot-unable_to_filter_mod_slot_all_blacklisted": "Unable to generate filtered dynamic weapon mod pool as blacklist filtered out all mods for slot: %s, ignoring blacklist and regenerating pool", "bot-unable_to_filter_mods_all_blacklisted": "Unable to filter mods for slot: {{slotName}} on {{itemName}} as they were all blacklisted, ignoring blacklist", "bot-unable_to_find_ammo_item": "Unable to find ammo template with tpl: %s", diff --git a/project/src/generators/BotEquipmentModGenerator.ts b/project/src/generators/BotEquipmentModGenerator.ts index eb0dc3b2..0001e79d 100644 --- a/project/src/generators/BotEquipmentModGenerator.ts +++ b/project/src/generators/BotEquipmentModGenerator.ts @@ -208,6 +208,7 @@ export class BotEquipmentModGenerator this.localisationService.getText("bot-unable_to_add_mods_to_weapon_missing_ammo_slot", { weaponName: parentTemplate._name, weaponId: parentTemplate._id, + botRole: botRole }), ); diff --git a/project/src/generators/BotWeaponGenerator.ts b/project/src/generators/BotWeaponGenerator.ts index 30f14abb..8655e9cd 100644 --- a/project/src/generators/BotWeaponGenerator.ts +++ b/project/src/generators/BotWeaponGenerator.ts @@ -366,7 +366,7 @@ export class BotWeaponGenerator // Iterate over slots in db item, if required, check tpl in that slot matches the filter list for (const modSlot of modDbTemplate._props.Slots) { - // ignore optional mods + // Ignore optional mods if (!modSlot._required) { continue;