spt/server
spt/server
0
0
Fork 0
mirror of https://github.com/sp-tarkov/server.git synced 2025-02-13 09:50:43 -05:00
Code

Rename mods to weaponMods and add new object equipmentMods

Browse Source 
regenerate bot jsons to include this new data (includes correct inclusion of equipment slot "TacticalVest" which was previously missing)

Fix issue with PMM ammo causes generation issues
This commit is contained in:
Dev 2024-01-09 15:31:56 +00:00
parent 60f96ea6aa
commit f3964639bd
45 changed files with 27162 additions and 25792 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8585
project/assets/database/bots/types/arenafighterevent.json
View File

File diff suppressed because it is too large Load Diff

55
project/assets/database/bots/types/assault.json
View File

@ -59,54 +59,57 @@
"chances": {
"equipment": {
"ArmBand": 0,
"ArmorVest": 23,
"Backpack": 43,
"ArmorVest": 21,
"Backpack": 44,
"Earpiece": 0,
"Eyewear": 26,
"FaceCover": 54,
"Eyewear": 24,
"FaceCover": 53,
"FirstPrimaryWeapon": 92,
"Headwear": 76,
"Headwear": 77,
"Holster": 7,
"Pockets": 100,
"Scabbard": 76,
"Scabbard": 78,
"SecondPrimaryWeapon": 0,
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"left_side_plate": 0,
"mod_charge": 2,
"mod_equipment": 16,
"mod_equipment": 11,
"mod_equipment_000": 0,
"mod_equipment_001": 0,
"mod_equipment_002": 0,
"mod_flashlight": 99,
"mod_foregrip": 4,
"mod_mount": 0,
"mod_nvg": 0,
"right_side_plate": 0
},
"weaponMods": {
"mod_charge": 1,
"mod_flashlight": 100,
"mod_foregrip": 5,
"mod_handguard": 100,
"mod_launcher": 0,
"mod_magazine": 100,
"mod_mount": 20,
"mod_mount_000": 35,
"mod_mount_001": 4,
"mod_muzzle": 34,
"mod_nvg": 0,
"mod_mount": 22,
"mod_mount_000": 26,
"mod_mount_001": 0,
"mod_muzzle": 38,
"mod_pistol_grip": 0,
"mod_reciever": 95,
"mod_scope": 43,
"mod_sight_front": 29,
"mod_sight_rear": 59,
"mod_reciever": 94,
"mod_scope": 51,
"mod_sight_front": 28,
"mod_sight_rear": 55,
"mod_stock": 48,
"mod_stock_000": 5,
"mod_stock_000": 12,
"mod_stock_akms": 100,
"mod_tactical": 33,
"mod_tactical": 37,
"mod_tactical_000": 1,
"mod_tactical_001": 78,
"mod_tactical_002": 2,
"mod_tactical_001": 75,
"mod_tactical_002": 4,
"mod_tactical_003": 0,
"mod_tactical_2": 0,
"right_side_plate": 0
"mod_tactical_2": 0
}
},
"difficulty": {

22
project/assets/database/bots/types/bear.json
View File

@ -67,18 +67,22 @@
"SecondPrimaryWeapon": 5,
"TacticalVest": 100
},
"mods": {
"back_plate": 100,
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"left_side_plate": 80,
"left_side_plate": 75,
"rightside_plate": 75,
"mod_nvg": 40,
"mod_equipment": 25,
"mod_equipment_000": 25,
"mod_equipment_001": 25,
"mod_equipment_002": 25
},
"weaponMods": {
"mod_barrel": 100,
"mod_bipod": 100,
"mod_catch": 25,
"mod_charge": 60,
"mod_equipment": 58,
"mod_equipment_000": 77,
"mod_equipment_001": 45,
"mod_equipment_002": 50,
"mod_flashlight": 75,
"mod_foregrip": 65,
"mod_gas_block": 100,
@ -97,7 +101,6 @@
"mod_muzzle": 60,
"mod_muzzle_000": 75,
"mod_muzzle_001": 75,
"mod_nvg": 40,
"mod_pistol_grip": 100,
"mod_pistol_grip_akms": 50,
"mod_pistolgrip": 50,
@ -122,8 +125,7 @@
"mod_tactical_002": 75,
"mod_tactical_003": 61,
"mod_tactical_2": 50,
"mod_trigger": 25,
"rightside_plate": 80
"mod_trigger": 25
}
},
"difficulty": {

35
project/assets/database/bots/types/bossboar.json
View File

@ -22,38 +22,39 @@
"ArmorVest": 0,
"Backpack": 0,
"Earpiece": 0,
"Eyewear": 52,
"FaceCover": 97,
"Eyewear": 48,
"FaceCover": 87,
"FirstPrimaryWeapon": 100,
"Headwear": 98,
"Headwear": 88,
"Holster": 100,
"Pockets": 100,
"Scabbard": 54,
"Scabbard": 52,
"SecondPrimaryWeapon": 0,
"SecuredContainer": 100,
"TacticalVest": 0
},
"mods": {
"equipmentMods": {},
"weaponMods": {
"mod_bipod": 100,
"mod_charge": 100,
"mod_foregrip": 35,
"mod_handguard": 40,
"mod_foregrip": 13,
"mod_handguard": 41,
"mod_magazine": 100,
"mod_mount": 72,
"mod_mount": 44,
"mod_mount_000": 100,
"mod_mount_001": 0,
"mod_muzzle": 99,
"mod_pistolgrip_000": 100,
"mod_muzzle": 100,
"mod_pistolgrip_000": 17,
"mod_reciever": 100,
"mod_scope": 71,
"mod_scope": 72,
"mod_sight_front": 100,
"mod_sight_rear": 89,
"mod_stock": 70,
"mod_stock_000": 57,
"mod_sight_rear": 96,
"mod_stock": 72,
"mod_stock_000": 53,
"mod_stock_001": 100,
"mod_tactical": 46,
"mod_tactical_000": 40,
"mod_tactical_001": 35,
"mod_tactical": 43,
"mod_tactical_000": 14,
"mod_tactical_001": 6,
"mod_tactical_002": 0
}
},

40
project/assets/database/bots/types/bossboarsniper.json
View File

@ -50,38 +50,40 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"back_plate": 77,
"equipmentMods": {
"back_plate": 72,
"front_plate": 100,
"left_side_plate": 57,
"right_side_plate": 57
},
"weaponMods": {
"mod_bipod": 0,
"mod_charge": 9,
"mod_foregrip": 91,
"mod_charge": 11,
"mod_foregrip": 100,
"mod_launcher": 0,
"mod_magazine": 100,
"mod_mount": 64,
"mod_mount_000": 86,
"mod_mount_001": 82,
"mod_mount_002": 21,
"mod_mount": 59,
"mod_mount_000": 90,
"mod_mount_001": 29,
"mod_mount_002": 22,
"mod_mount_003": 100,
"mod_mount_004": 0,
"mod_muzzle": 81,
"mod_muzzle": 75,
"mod_pistol_grip": 0,
"mod_reciever": 100,
"mod_scope": 82,
"mod_scope": 86,
"mod_scope_000": 100,
"mod_scope_001": 100,
"mod_scope_002": 100,
"mod_scope_003": 100,
"mod_sight_front": 71,
"mod_sight_rear": 85,
"mod_stock": 71,
"mod_stock": 66,
"mod_stock_000": 100,
"mod_tactical": 15,
"mod_tactical": 12,
"mod_tactical_000": 60,
"mod_tactical_001": 0,
"mod_tactical_002": 0,
"right_side_plate": 57
"mod_tactical_002": 0
}
},
"difficulty": {
@ -2376,11 +2378,6 @@
]
},
"mods": {
"634f036a517ccc8a960fc746": {
"mod_mount_000": [
"634f03d40384a3ba4f06f874"
]
},
"5448bd6b4bdc2dfc2f8b4569": {
"mod_magazine": [
"5448c12b4bdc2d02308b456f"
@ -3503,6 +3500,11 @@
"5cf67cadd7f00c065a5abab7"
]
},
"634f036a517ccc8a960fc746": {
"mod_mount_000": [
"634f03d40384a3ba4f06f874"
]
},
"634f05a21f9f536910079b56": {
"mod_gas_block": [
"634f036a517ccc8a960fc746"

17
project/assets/database/bots/types/bossbully.json
View File

@ -33,9 +33,10 @@
"SecuredContainer": 100,
"TacticalVest": 0
},
"mods": {
"mod_charge": 57,
"mod_foregrip": 81,
"equipmentMods": {},
"weaponMods": {
"mod_charge": 65,
"mod_foregrip": 85,
"mod_launcher": 0,
"mod_magazine": 100,
"mod_mount": 0,
@ -43,17 +44,17 @@
"mod_mount_001": 0,
"mod_mount_002": 0,
"mod_mount_003": 100,
"mod_muzzle": 51,
"mod_muzzle": 50,
"mod_reciever": 100,
"mod_scope": 43,
"mod_sight_front": 70,
"mod_sight_rear": 26,
"mod_scope": 41,
"mod_sight_front": 68,
"mod_sight_rear": 28,
"mod_stock": 100,
"mod_tactical": 0,
"mod_tactical_000": 0,
"mod_tactical_001": 0,
"mod_tactical_002": 0,
"mod_tactical_003": 74
"mod_tactical_003": 80
}
},
"difficulty": {

29
project/assets/database/bots/types/bossgluhar.json
View File

@ -21,36 +21,43 @@
"ArmBand": 0,
"ArmorVest": 0,
"Backpack": 0,
"Earpiece": 15,
"Eyewear": 78,
"FaceCover": 5,
"Earpiece": 0,
"Eyewear": 30,
"FaceCover": 90,
"FirstPrimaryWeapon": 100,
"Headwear": 100,
"Headwear": 99,
"Holster": 100,
"Pockets": 100,
"Scabbard": 0,
"SecondPrimaryWeapon": 60,
"SecondPrimaryWeapon": 58,
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"mod_charge": 100,
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"left_side_plate": 0,
"mod_equipment_000": 0,
"mod_equipment_001": 0,
"mod_equipment_002": 0,
"mod_mount": 0,
"mod_nvg": 69,
"right_side_plate": 0
},
"weaponMods": {
"mod_charge": 100,
"mod_foregrip": 100,
"mod_handguard": 100,
"mod_magazine": 100,
"mod_mount": 0,
"mod_mount_000": 43,
"mod_mount_000": 41,
"mod_mount_001": 0,
"mod_muzzle": 88,
"mod_nvg": 79,
"mod_reciever": 100,
"mod_scope": 66,
"mod_scope": 67,
"mod_sight_front": 100,
"mod_sight_rear": 61,
"mod_stock": 85,
"mod_stock": 80,
"mod_tactical": 0,
"mod_tactical_000": 0,
"mod_tactical_001": 50,

23
project/assets/database/bots/types/bosskilla.json
View File

@ -28,33 +28,38 @@
"Headwear": 100,
"Holster": 100,
"Pockets": 100,
"Scabbard": 16,
"Scabbard": 21,
"SecondPrimaryWeapon": 0,
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"mod_charge": 14,
"mod_equipment": 100,
"mod_foregrip": 8,
"mod_equipment_000": 100,
"mod_mount": 0,
"mod_nvg": 0
},
"weaponMods": {
"mod_charge": 21,
"mod_foregrip": 14,
"mod_launcher": 0,
"mod_magazine": 100,
"mod_mount": 0,
"mod_mount_000": 100,
"mod_mount_001": 83,
"mod_mount_001": 84,
"mod_mount_002": 0,
"mod_mount_003": 100,
"mod_muzzle": 95,
"mod_muzzle": 96,
"mod_reciever": 100,
"mod_scope": 39,
"mod_scope": 37,
"mod_sight_front": 0,
"mod_sight_rear": 53,
"mod_sight_rear": 55,
"mod_stock": 100,
"mod_stock_001": 100,
"mod_stock_akms": 100,
"mod_tactical": 90,
"mod_tactical": 91,
"mod_tactical_000": 0
}
},

30
project/assets/database/bots/types/bossknight.json
View File

@ -33,23 +33,29 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"left_side_plate": 100,
"right_side_plate": 100
},
"weaponMods": {
"mod_flashlight": 100,
"mod_foregrip": 100,
"mod_foregrip": 83,
"mod_magazine": 100,
"mod_mount": 17,
"mod_mount_000": 58,
"mod_mount_001": 25,
"mod_mount": 13,
"mod_mount_000": 40,
"mod_mount_001": 21,
"mod_mount_002": 0,
"mod_muzzle": 32,
"mod_pistol_grip": 37,
"mod_scope": 90,
"mod_sight_front": 68,
"mod_sight_rear": 100,
"mod_stock": 38,
"mod_muzzle": 33,
"mod_pistol_grip": 38,
"mod_scope": 88,
"mod_sight_front": 65,
"mod_sight_rear": 89,
"mod_stock": 33,
"mod_stock_000": 100,
"mod_stock_002": 100,
"mod_tactical": 61,
"mod_tactical": 58,
"mod_tactical_000": 100
}
},

11
project/assets/database/bots/types/bosskojaniy.json
View File

@ -33,7 +33,8 @@
"SecuredContainer": 100,
"TacticalVest": 0
},
"mods": {
"equipmentMods": {},
"weaponMods": {
"mod_charge": 0,
"mod_foregrip": 0,
"mod_launcher": 0,
@ -44,17 +45,11 @@
"mod_muzzle": 66,
"mod_reciever": 100,
"mod_scope": 100,
"mod_scope_000": 100,
"mod_scope_001": 0,
"mod_scope_002": 0,
"mod_sight_front": 100,
"mod_sight_rear": 100,
"mod_stock": 100,
"mod_stock_000": 100,
"mod_tactical": 100,
"mod_tactical_000": 98,
"mod_tactical_001": 0,
"mod_tactical_002": 0
"mod_tactical_000": 100
}
},
"difficulty": {

5967
project/assets/database/bots/types/bosskolontay.json
View File

File diff suppressed because it is too large Load Diff

13
project/assets/database/bots/types/bosssanitar.json
View File

@ -21,11 +21,11 @@
"ArmBand": 0,
"ArmorVest": 0,
"Backpack": 100,
"Earpiece": 25,
"Eyewear": 30,
"FaceCover": 26,
"Earpiece": 0,
"Eyewear": 0,
"FaceCover": 93,
"FirstPrimaryWeapon": 100,
"Headwear": 0,
"Headwear": 74,
"Holster": 100,
"Pockets": 100,
"Scabbard": 10,
@ -33,11 +33,12 @@
"SecuredContainer": 100,
"TacticalVest": 0
},
"mods": {
"equipmentMods": {},
"weaponMods": {
"mod_charge": 0,
"mod_foregrip": 0,
"mod_magazine": 100,
"mod_mount": 90,
"mod_mount": 91,
"mod_mount_000": 56,
"mod_mount_001": 0,
"mod_mount_004": 0,

24
project/assets/database/bots/types/bosstagilla.json
View File

@ -33,25 +33,31 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"mod_charge": 33,
"mod_foregrip": 46,
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"left_side_plate": 0,
"right_side_plate": 0
},
"weaponMods": {
"mod_charge": 69,
"mod_foregrip": 74,
"mod_magazine": 100,
"mod_mount": 100,
"mod_mount_000": 31,
"mod_mount_000": 42,
"mod_mount_001": 100,
"mod_mount_002": 100,
"mod_mount_003": 100,
"mod_muzzle": 96,
"mod_muzzle": 84,
"mod_reciever": 100,
"mod_scope": 87,
"mod_scope": 82,
"mod_sight_front": 0,
"mod_sight_rear": 83,
"mod_sight_rear": 48,
"mod_stock": 100,
"mod_stock_001": 100,
"mod_tactical": 100,
"mod_tactical_000": 36,
"mod_tactical_001": 44,
"mod_tactical_000": 55,
"mod_tactical_001": 8,
"mod_tactical_002": 0
}
},

27
project/assets/database/bots/types/bosszryachiy.json
View File

@ -25,7 +25,7 @@
"Eyewear": 0,
"FaceCover": 100,
"FirstPrimaryWeapon": 100,
"Headwear": 51,
"Headwear": 100,
"Holster": 100,
"Pockets": 100,
"Scabbard": 0,
@ -33,26 +33,23 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"equipmentMods": {},
"weaponMods": {
"mod_charge": 0,
"mod_flashlight": 50,
"mod_foregrip": 100,
"mod_magazine": 100,
"mod_mount": 0,
"mod_mount_000": 33,
"mod_mount_001": 2,
"mod_mount_002": 1,
"mod_mount_003": 100,
"mod_mount_001": 0,
"mod_mount_002": 0,
"mod_muzzle": 100,
"mod_reciever": 100,
"mod_scope": 100,
"mod_sight_front": 0,
"mod_sight_rear": 0,
"mod_stock": 75,
"mod_tactical": 2,
"mod_tactical_000": 3,
"mod_tactical_001": 0,
"mod_tactical_002": 100
"mod_tactical": 0,
"mod_tactical_000": 0,
"mod_tactical_001": 0
}
},
"difficulty": {
@ -2380,9 +2377,6 @@
"6197b229af1f5202c57a9bea"
]
},
"6516b129609aaf354b34b3a8": {
"mod_pistolgrip": ["5f6341043ada5942720e2dc5"]
},
"5c471bfc2e221602b21d4e17": {
"mod_muzzle": [
"5e01e9e273d8eb11426f5bc3"
@ -2480,6 +2474,11 @@
"mod_muzzle": [
"5fc23636016cce60e8341b05"
]
},
"6516b129609aaf354b34b3a8": {
"mod_pistolgrip": [
"5f6341043ada5942720e2dc5"
]
}
}
},

3512
project/assets/database/bots/types/crazyassaultevent.json
View File

File diff suppressed because it is too large Load Diff

39
project/assets/database/bots/types/exusec.json
View File

@ -54,46 +54,49 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"left_side_plate": 14,
"mod_charge": 33,
"left_side_plate": 15,
"mod_equipment_000": 1,
"mod_equipment_001": 0,
"mod_equipment_002": 0,
"mod_mount": 0,
"mod_nvg": 17,
"right_side_plate": 15
},
"weaponMods": {
"mod_charge": 32,
"mod_flashlight": 100,
"mod_foregrip": 58,
"mod_foregrip": 59,
"mod_handguard": 100,
"mod_launcher": 0,
"mod_magazine": 100,
"mod_mount": 1,
"mod_mount_000": 69,
"mod_mount_001": 67,
"mod_mount": 0,
"mod_mount_000": 65,
"mod_mount_001": 62,
"mod_mount_002": 2,
"mod_mount_003": 0,
"mod_muzzle": 89,
"mod_muzzle_000": 42,
"mod_muzzle_000": 45,
"mod_muzzle_001": 0,
"mod_nvg": 17,
"mod_pistol_grip": 0,
"mod_reciever": 100,
"mod_scope": 68,
"mod_sight_front": 74,
"mod_sight_rear": 81,
"mod_scope": 66,
"mod_sight_front": 73,
"mod_sight_rear": 80,
"mod_stock": 100,
"mod_stock_000": 100,
"mod_stock_001": 100,
"mod_stock_002": 100,
"mod_tactical": 20,
"mod_tactical": 19,
"mod_tactical001": 100,
"mod_tactical002": 0,
"mod_tactical_000": 26,
"mod_tactical_000": 24,
"mod_tactical_001": 0,
"mod_tactical_002": 55,
"mod_tactical_003": 29,
"mod_tactical_2": 16,
"right_side_plate": 14
"mod_tactical_002": 51,
"mod_tactical_003": 27,
"mod_tactical_2": 17
}
},
"difficulty": {

12
project/assets/database/bots/types/followerbigpipe.json
View File

@ -33,19 +33,23 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"equipmentMods": {
"back_plate": 100,
"front_plate": 100
},
"weaponMods": {
"mod_flashlight": 100,
"mod_foregrip": 91,
"mod_magazine": 100,
"mod_mount": 36,
"mod_mount": 38,
"mod_mount_000": 0,
"mod_mount_001": 100,
"mod_muzzle": 50,
"mod_muzzle_000": 100,
"mod_muzzle_001": 100,
"mod_scope": 84,
"mod_sight_front": 94,
"mod_sight_rear": 94,
"mod_sight_front": 93,
"mod_sight_rear": 93,
"mod_stock": 100,
"mod_tactical": 100,
"mod_tactical_000": 0,

16
project/assets/database/bots/types/followerbirdeye.json
View File

@ -33,11 +33,15 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"left_side_plate": 0,
"mod_foregrip": 88,
"mod_nvg": 100,
"right_side_plate": 0
},
"weaponMods": {
"mod_foregrip": 87,
"mod_magazine": 100,
"mod_mount": 100,
"mod_mount_000": 50,
@ -46,17 +50,15 @@
"mod_mount_003": 0,
"mod_mount_004": 0,
"mod_muzzle": 78,
"mod_nvg": 100,
"mod_scope": 75,
"mod_scope": 76,
"mod_scope_000": 100,
"mod_scope_001": 0,
"mod_sight_front": 78,
"mod_sight_rear": 78,
"mod_stock": 100,
"mod_stock_000": 100,
"mod_tactical": 89,
"mod_tactical_000": 0,
"right_side_plate": 0
"mod_tactical": 90,
"mod_tactical_000": 0
}
},
"difficulty": {

57
project/assets/database/bots/types/followerboar.json
View File

@ -54,41 +54,44 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"left_side_plate": 48,
"mod_charge": 20,
"left_side_plate": 41,
"mod_equipment": 14,
"mod_equipment_000": 36,
"mod_equipment_001": 9,
"mod_equipment_002": 31,
"mod_equipment_001": 8,
"mod_equipment_002": 25,
"mod_mount": 5,
"mod_nvg": 0,
"right_side_plate": 41
},
"weaponMods": {
"mod_charge": 20,
"mod_flashlight": 100,
"mod_foregrip": 87,
"mod_foregrip": 86,
"mod_launcher": 0,
"mod_magazine": 100,
"mod_mount": 17,
"mod_mount": 21,
"mod_mount_000": 25,
"mod_mount_001": 26,
"mod_mount_002": 1,
"mod_mount_004": 94,
"mod_mount_001": 23,
"mod_mount_002": 0,
"mod_mount_004": 78,
"mod_muzzle": 85,
"mod_nvg": 0,
"mod_reciever": 88,
"mod_scope": 57,
"mod_sight_front": 80,
"mod_reciever": 86,
"mod_scope": 55,
"mod_sight_front": 83,
"mod_sight_rear": 70,
"mod_stock": 71,
"mod_stock_000": 100,
"mod_stock_001": 98,
"mod_stock": 70,
"mod_stock_000": 56,
"mod_stock_001": 97,
"mod_stock_akms": 100,
"mod_tactical": 37,
"mod_tactical_000": 35,
"mod_tactical_001": 33,
"mod_tactical_002": 34,
"mod_tactical": 41,
"mod_tactical_000": 47,
"mod_tactical_001": 41,
"mod_tactical_002": 35,
"mod_tactical_003": 0,
"mod_tactical_004": 0,
"right_side_plate": 48
"mod_tactical_004": 0
}
},
"difficulty": {
@ -2768,6 +2771,14 @@
]
},
"mods": {
"5e4ac41886f77406a511c9a8": {
"front_plate": ["65573fa5655447403702a816", "64afc71497cf3a403c01ff38", "64afdcb83efdfea28601d041", "655746010177119f4a097ff7", "656f9d5900d62bcd2e02407c", "656fa8d700d62bcd2e024084", "656fa99800d62bcd2e024088", "656fae5f7c2d57afe200c0d7", "656faf0ca0dce000a2020f77", "656fa0fb498d1b7e3e071d9c", "656fafe3498d1b7e3e071da4", "656fa76500d62bcd2e024080", "656fa25e94b480b8a500c0e0", "656fad8c498d1b7e3e071da0", "656fa61e94b480b8a500c0e8", "656fb21fa0dce000a2020f7c", "656fac30c6baea13cd07e10c", "656fb0bd7c2d57afe200c0dc", "656f9fa0498d1b7e3e071d98", "656fa53d94b480b8a500c0e4"],
"back_plate": ["65573fa5655447403702a816", "64afc71497cf3a403c01ff38", "64afdcb83efdfea28601d041", "655746010177119f4a097ff7", "656f9d5900d62bcd2e02407c", "656fa8d700d62bcd2e024084", "656fa99800d62bcd2e024088", "656fae5f7c2d57afe200c0d7", "656faf0ca0dce000a2020f77", "656fa0fb498d1b7e3e071d9c", "656fafe3498d1b7e3e071da4", "656fa76500d62bcd2e024080", "656fa25e94b480b8a500c0e0", "656fad8c498d1b7e3e071da0", "656fa61e94b480b8a500c0e8", "656fb21fa0dce000a2020f7c", "656fac30c6baea13cd07e10c", "656fb0bd7c2d57afe200c0dc", "656f9fa0498d1b7e3e071d98", "656fa53d94b480b8a500c0e4"],
"soft_armor_front": ["6575ef599c7cad336508e453"],
"soft_armor_back": ["6575ef6bf6a13a7b7100b093"],
"soft_armor_left": ["6575ef78da698a4e980677eb"],
"soft_armor_right": ["6575ef7f9c7cad336508e457"]
},
"5448bd6b4bdc2dfc2f8b4569": {
"mod_magazine": [
"5448c12b4bdc2d02308b456f"

7984
project/assets/database/bots/types/followerboarclose1.json
View File

File diff suppressed because it is too large Load Diff

7996
project/assets/database/bots/types/followerboarclose2.json
View File

File diff suppressed because it is too large Load Diff

31
project/assets/database/bots/types/followerbully.json
View File

@ -43,31 +43,34 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"back_plate": 66,
"equipmentMods": {
"back_plate": 74,
"front_plate": 100,
"left_side_plate": 0,
"left_side_plate": 6,
"mod_equipment": 12,
"mod_equipment_000": 35,
"mod_mount": 0,
"mod_nvg": 0,
"right_side_plate": 6
},
"weaponMods": {
"mod_charge": 72,
"mod_equipment": 14,
"mod_equipment_000": 57,
"mod_foregrip": 32,
"mod_foregrip": 36,
"mod_launcher": 0,
"mod_magazine": 100,
"mod_mount": 0,
"mod_mount_000": 10,
"mod_mount_000": 11,
"mod_mount_001": 0,
"mod_mount_002": 66,
"mod_muzzle": 87,
"mod_nvg": 0,
"mod_mount_002": 69,
"mod_muzzle": 90,
"mod_reciever": 100,
"mod_scope": 39,
"mod_sight_front": 0,
"mod_sight_rear": 27,
"mod_sight_rear": 26,
"mod_stock": 100,
"mod_stock_000": 100,
"mod_tactical": 68,
"mod_tactical_002": 72,
"right_side_plate": 0
"mod_tactical": 67,
"mod_tactical_002": 71
}
},
"difficulty": {

75
project/assets/database/bots/types/followergluharassault.json
View File

@ -46,37 +46,40 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"back_plate": 80,
"equipmentMods": {
"back_plate": 79,
"front_plate": 100,
"left_side_plate": 100,
"left_side_plate": 11,
"mod_equipment": 23,
"mod_equipment_000": 76,
"mod_mount": 0,
"mod_nvg": 15,
"right_side_plate": 11
},
"weaponMods": {
"mod_charge": 0,
"mod_equipment": 15,
"mod_equipment_000": 81,
"mod_foregrip": 0,
"mod_launcher": 0,
"mod_magazine": 100,
"mod_mount": 17,
"mod_mount_000": 49,
"mod_mount_001": 68,
"mod_mount": 19,
"mod_mount_000": 46,
"mod_mount_001": 72,
"mod_mount_002": 0,
"mod_mount_004": 100,
"mod_muzzle": 55,
"mod_nvg": 26,
"mod_reciever": 100,
"mod_scope": 31,
"mod_sight_front": 5,
"mod_sight_rear": 47,
"mod_scope": 33,
"mod_sight_front": 10,
"mod_sight_rear": 48,
"mod_stock": 100,
"mod_stock_000": 100,
"mod_stock_001": 100,
"mod_stock_akms": 100,
"mod_tactical": 87,
"mod_tactical_000": 44,
"mod_tactical": 84,
"mod_tactical_000": 41,
"mod_tactical_001": 100,
"mod_tactical_002": 0,
"mod_tactical_003": 0,
"right_side_plate": 100
"mod_tactical_003": 0
}
},
"difficulty": {
@ -2518,6 +2521,23 @@
"56083cba4bdc2de22e8b456f"
]
},
"544a5caa4bdc2d1a388b4568": {
"Back_plate": [
"656f9fa0498d1b7e3e071d98"
],
"Front_plate": [
"656f9fa0498d1b7e3e071d98"
],
"Groin": [
"6570e90b3a5689d85f08db97"
],
"Soft_armor_back": [
"6570e87c23c1f638ef0b0ee2"
],
"Soft_armor_front": [
"6570e83223c1f638ef0b0ede"
]
},
"545cdb794bdc2d3a198b456a": {
"Back_plate": [
"64afc71497cf3a403c01ff38"
@ -2852,6 +2872,29 @@
"5addbf175acfc408fb13965b"
]
},
"5ab8e79e86f7742d8b372e78": {
"Back_plate": [
"65573fa5655447403702a816"
],
"Collar": [
"657326bc5d3a3129fb05f36b"
],
"Front_plate": [
"656f611f94b480b8a500c0db"
],
"Soft_armor_back": [
"657326978c1cc6dcd9098b56"
],
"Soft_armor_front": [
"65732688d9d89ff7ac0d9c4c"
],
"Soft_armor_left": [
"657326a28c1cc6dcd9098b5a"
],
"soft_armor_right": [
"657326b08c1cc6dcd9098b5e"
]
},
"5ac4cd105acfc40016339859": {
"mod_gas_block": [
"5cf656f2d7f00c06585fb6eb"

29
project/assets/database/bots/types/followergluharscout.json
View File

@ -46,15 +46,20 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"back_plate": 78,
"equipmentMods": {
"back_plate": 82,
"front_plate": 100,
"left_side_plate": 0,
"mod_charge": 0,
"mod_equipment": 0,
"mod_equipment_000": 0,
"mod_mount": 0,
"mod_nvg": 0,
"right_side_plate": 0
},
"weaponMods": {
"mod_charge": 0,
"mod_flashlight": 100,
"mod_foregrip": 11,
"mod_foregrip": 10,
"mod_handguard": 100,
"mod_launcher": 0,
"mod_magazine": 100,
@ -62,22 +67,20 @@
"mod_mount_000": 0,
"mod_mount_001": 100,
"mod_mount_002": 0,
"mod_muzzle": 83,
"mod_nvg": 0,
"mod_muzzle": 84,
"mod_reciever": 100,
"mod_scope": 34,
"mod_sight_front": 34,
"mod_sight_rear": 52,
"mod_scope": 35,
"mod_sight_front": 37,
"mod_sight_rear": 58,
"mod_stock": 100,
"mod_stock_000": 100,
"mod_stock_001": 100,
"mod_stock_akms": 100,
"mod_tactical": 61,
"mod_tactical_000": 59,
"mod_tactical": 59,
"mod_tactical_000": 61,
"mod_tactical_001": 100,
"mod_tactical_003": 100,
"mod_tactical_2": 0,
"right_side_plate": 0
"mod_tactical_2": 0
}
},
"difficulty": {

37
project/assets/database/bots/types/followergluharsecurity.json
View File

@ -44,35 +44,38 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"left_side_plate": 67,
"left_side_plate": 50,
"mod_equipment": 90,
"mod_equipment_000": 37,
"mod_equipment_001": 0,
"mod_equipment_002": 0,
"mod_mount": 0,
"mod_nvg": 0,
"right_side_plate": 50
},
"weaponMods": {
"mod_bipod": 100,
"mod_charge": 0,
"mod_equipment": 96,
"mod_equipment_000": 26,
"mod_equipment_001": 0,
"mod_equipment_002": 4,
"mod_foregrip": 49,
"mod_foregrip": 51,
"mod_launcher": 0,
"mod_magazine": 100,
"mod_mount": 24,
"mod_mount_000": 60,
"mod_mount": 31,
"mod_mount_000": 62,
"mod_mount_001": 1,
"mod_muzzle": 43,
"mod_nvg": 0,
"mod_reciever": 62,
"mod_scope": 93,
"mod_sight_rear": 28,
"mod_muzzle": 46,
"mod_reciever": 58,
"mod_scope": 91,
"mod_sight_rear": 38,
"mod_stock": 100,
"mod_stock_000": 100,
"mod_tactical": 100,
"mod_tactical": 96,
"mod_tactical_000": 0,
"mod_tactical_001": 100,
"mod_tactical_002": 0,
"mod_tactical_003": 0,
"right_side_plate": 67
"mod_tactical_003": 0
}
},
"difficulty": {

34
project/assets/database/bots/types/followerkojaniy.json
View File

@ -47,33 +47,35 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"back_plate": 60,
"equipmentMods": {
"back_plate": 61,
"front_plate": 100,
"left_side_plate": 28,
"left_side_plate": 30,
"mod_nvg": 100,
"right_side_plate": 30
},
"weaponMods": {
"mod_charge": 0,
"mod_foregrip": 0,
"mod_magazine": 100,
"mod_mount": 51,
"mod_mount_000": 55,
"mod_mount_001": 10,
"mod_mount_002": 72,
"mod_mount_004": 74,
"mod_muzzle": 28,
"mod_nvg": 100,
"mod_mount_000": 64,
"mod_mount_001": 13,
"mod_mount_002": 74,
"mod_mount_004": 88,
"mod_muzzle": 21,
"mod_pistol_grip": 0,
"mod_reciever": 100,
"mod_scope": 73,
"mod_scope": 75,
"mod_sight_front": 58,
"mod_sight_rear": 77,
"mod_stock": 100,
"mod_stock_000": 100,
"mod_tactical": 26,
"mod_tactical_000": 63,
"mod_tactical_001": 48,
"mod_tactical_002": 16,
"mod_tactical_003": 0,
"right_side_plate": 28
"mod_tactical": 25,
"mod_tactical_000": 62,
"mod_tactical_001": 51,
"mod_tactical_002": 17,
"mod_tactical_003": 0
}
},
"difficulty": {

6655
project/assets/database/bots/types/followerkolontayassault.json
View File

File diff suppressed because it is too large Load Diff

6781
project/assets/database/bots/types/followerkolontaysecurity.json
View File

File diff suppressed because it is too large Load Diff

27
project/assets/database/bots/types/followersanitar.json
View File

@ -52,32 +52,35 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"left_side_plate": 67,
"mod_charge": 0,
"left_side_plate": 68,
"mod_equipment": 35,
"mod_equipment_000": 32,
"mod_equipment_000": 53,
"mod_equipment_001": 0,
"mod_equipment_002": 0,
"mod_foregrip": 36,
"mod_mount": 0,
"mod_nvg": 0,
"right_side_plate": 68
},
"weaponMods": {
"mod_charge": 0,
"mod_foregrip": 40,
"mod_launcher": 0,
"mod_magazine": 100,
"mod_mount": 31,
"mod_mount_000": 87,
"mod_mount": 30,
"mod_mount_000": 86,
"mod_muzzle": 80,
"mod_nvg": 0,
"mod_reciever": 100,
"mod_scope": 0,
"mod_sight_front": 0,
"mod_sight_rear": 66,
"mod_sight_rear": 65,
"mod_stock": 50,
"mod_tactical": 100,
"mod_tactical_000": 75,
"mod_tactical_000": 76,
"mod_tactical_001": 0,
"mod_tactical_002": 16,
"right_side_plate": 67
"mod_tactical_002": 16
}
},
"difficulty": {

37
project/assets/database/bots/types/followerzryachiy.json
View File

@ -32,36 +32,31 @@
"Holster": 0,
"Pockets": 100,
"Scabbard": 0,
"SecondPrimaryWeapon": 76,
"SecondPrimaryWeapon": 78,
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"mod_charge": 37,
"mod_foregrip": 98,
"equipmentMods": {},
"weaponMods": {
"mod_charge": 40,
"mod_foregrip": 100,
"mod_handguard": 100,
"mod_launcher": 0,
"mod_magazine": 100,
"mod_mount": 95,
"mod_mount_000": 72,
"mod_mount_001": 97,
"mod_mount_002": 98,
"mod_mount": 100,
"mod_mount_000": 69,
"mod_mount_001": 100,
"mod_mount_002": 100,
"mod_muzzle": 100,
"mod_reciever": 100,
"mod_scope": 42,
"mod_scope_000": 100,
"mod_scope_001": 100,
"mod_scope_002": 0,
"mod_sight_front": 4,
"mod_sight_rear": 98,
"mod_stock": 75,
"mod_scope": 39,
"mod_sight_front": 0,
"mod_sight_rear": 100,
"mod_stock": 76,
"mod_stock_000": 100,
"mod_tactical": 14,
"mod_tactical001": 0,
"mod_tactical002": 0,
"mod_tactical_000": 1,
"mod_tactical": 16,
"mod_tactical_000": 0,
"mod_tactical_001": 0,
"mod_tactical_002": 97
"mod_tactical_002": 100
}
},
"difficulty": {

25
project/assets/database/bots/types/gifter.json
View File

@ -67,30 +67,33 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"left_side_plate": 0,
"right_side_plate": 0
},
"weaponMods": {
"mod_charge": 0,
"mod_flashlight": 100,
"mod_foregrip": 0,
"mod_launcher": 0,
"mod_magazine": 100,
"mod_mount": 40,
"mod_mount_000": 26,
"mod_mount_001": 4,
"mod_muzzle": 24,
"mod_reciever": 91,
"mod_scope": 38,
"mod_sight_front": 58,
"mod_sight_rear": 61,
"mod_mount_000": 11,
"mod_mount_001": 0,
"mod_muzzle": 27,
"mod_reciever": 88,
"mod_scope": 49,
"mod_sight_front": 53,
"mod_sight_rear": 52,
"mod_stock": 44,
"mod_stock_000": 0,
"mod_stock_akms": 100,
"mod_tactical": 67,
"mod_tactical": 71,
"mod_tactical_000": 0,
"mod_tactical_001": 36,
"mod_tactical_002": 23,
"mod_tactical_001": 45,
"mod_tactical_002": 15,
"mod_tactical_003": 0
}
},

23
project/assets/database/bots/types/marksman.json
View File

@ -73,29 +73,30 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"mod_nvg": 100
},
"weaponMods": {
"mod_bipod": 0,
"mod_charge": 0,
"mod_foregrip": 1,
"mod_foregrip": 2,
"mod_launcher": 0,
"mod_magazine": 100,
"mod_mount": 77,
"mod_mount_000": 84,
"mod_mount": 72,
"mod_mount_000": 24,
"mod_mount_001": 0,
"mod_mount_002": 32,
"mod_mount_004": 0,
"mod_mount_002": 24,
"mod_muzzle": 15,
"mod_nvg": 100,
"mod_pistol_grip": 0,
"mod_reciever": 56,
"mod_reciever": 58,
"mod_scope": 100,
"mod_sight_front": 53,
"mod_sight_rear": 43,
"mod_sight_front": 69,
"mod_sight_rear": 34,
"mod_stock": 100,
"mod_stock_000": 100,
"mod_tactical": 40,
"mod_tactical": 38,
"mod_tactical_000": 0,
"mod_tactical_001": 0,
"mod_tactical_002": 0

49
project/assets/database/bots/types/pmcbot.json
View File

@ -49,45 +49,48 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"left_side_plate": 25,
"mod_charge": 14,
"mod_equipment": 10,
"mod_equipment_000": 1,
"left_side_plate": 8,
"mod_equipment": 0,
"mod_equipment_000": 2,
"mod_equipment_001": 0,
"mod_equipment_002": 6,
"mod_equipment_002": 0,
"mod_mount": 0,
"mod_nvg": 15,
"right_side_plate": 8
},
"weaponMods": {
"mod_charge": 8,
"mod_flashlight": 100,
"mod_foregrip": 28,
"mod_foregrip": 30,
"mod_handguard": 100,
"mod_launcher": 0,
"mod_magazine": 100,
"mod_mount": 36,
"mod_mount_000": 16,
"mod_mount_001": 47,
"mod_mount_002": 16,
"mod_mount": 47,
"mod_mount_000": 19,
"mod_mount_001": 46,
"mod_mount_002": 23,
"mod_mount_003": 0,
"mod_mount_004": 74,
"mod_muzzle": 36,
"mod_muzzle_000": 57,
"mod_mount_004": 0,
"mod_muzzle": 34,
"mod_muzzle_000": 33,
"mod_muzzle_001": 0,
"mod_nvg": 16,
"mod_pistol_grip": 0,
"mod_reciever": 100,
"mod_scope": 69,
"mod_sight_front": 85,
"mod_sight_rear": 75,
"mod_scope": 72,
"mod_sight_front": 86,
"mod_sight_rear": 73,
"mod_stock": 100,
"mod_stock_000": 100,
"mod_stock_001": 100,
"mod_tactical": 46,
"mod_tactical_000": 30,
"mod_tactical_001": 41,
"mod_tactical": 48,
"mod_tactical_000": 31,
"mod_tactical_001": 44,
"mod_tactical_002": 0,
"mod_tactical_003": 0,
"mod_tactical_2": 100,
"right_side_plate": 25
"mod_tactical_2": 100
}
},
"difficulty": {

16
project/assets/database/bots/types/sectantpriest.json
View File

@ -34,20 +34,22 @@
"SecuredContainer": 100,
"TacticalVest": 0
},
"mods": {
"equipmentMods": {
"mod_nvg": 100
},
"weaponMods": {
"mod_charge": 0,
"mod_foregrip": 19,
"mod_foregrip": 21,
"mod_magazine": 100,
"mod_mount": 91,
"mod_mount_000": 19,
"mod_mount_001": 68,
"mod_mount_000": 22,
"mod_mount_001": 78,
"mod_mount_002": 100,
"mod_muzzle": 100,
"mod_nvg": 100,
"mod_reciever": 100,
"mod_scope": 0,
"mod_sight_front": 30,
"mod_sight_rear": 46,
"mod_sight_front": 35,
"mod_sight_rear": 49,
"mod_stock": 100,
"mod_tactical": 0,
"mod_tactical_000": 0,

30
project/assets/database/bots/types/sectantwarrior.json
View File

@ -35,31 +35,33 @@
"SecuredContainer": 100,
"TacticalVest": 100
},
"mods": {
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"left_side_plate": 100,
"left_side_plate": 65,
"right_side_plate": 65
},
"weaponMods": {
"mod_charge": 0,
"mod_foregrip": 14,
"mod_foregrip": 13,
"mod_launcher": 0,
"mod_magazine": 100,
"mod_mount": 10,
"mod_mount_000": 31,
"mod_mount_001": 45,
"mod_mount_002": 24,
"mod_mount": 25,
"mod_mount_000": 35,
"mod_mount_001": 32,
"mod_mount_002": 23,
"mod_mount_003": 0,
"mod_mount_004": 100,
"mod_muzzle": 100,
"mod_muzzle": 92,
"mod_reciever": 100,
"mod_scope": 11,
"mod_sight_front": 50,
"mod_sight_rear": 64,
"mod_scope": 13,
"mod_sight_front": 51,
"mod_sight_rear": 65,
"mod_stock": 100,
"mod_stock_000": 100,
"mod_stock_001": 100,
"mod_tactical": 5,
"mod_tactical_000": 9,
"right_side_plate": 100
"mod_tactical": 4,
"mod_tactical_000": 13
}
},
"difficulty": {

4544
project/assets/database/bots/types/shooterbtr.json
View File

File diff suppressed because it is too large Load Diff

23
project/assets/database/bots/types/usec.json
View File

@ -64,18 +64,22 @@
"SecondPrimaryWeapon": 5,
"TacticalVest": 100
},
"mods": {
"equipmentMods": {
"back_plate": 100,
"front_plate": 100,
"left_side_plate": 80,
"left_side_plate": 75,
"mod_equipment": 25,
"mod_equipment_000": 25,
"mod_equipment_001": 25,
"mod_equipment_002": 25,
"mod_nvg": 40,
"rightside_plate": 75
},
"weaponMods": {
"mod_barrel": 100,
"mod_bipod": 100,
"mod_catch": 25,
"mod_charge": 60,
"mod_equipment": 58,
"mod_equipment_000": 77,
"mod_equipment_001": 45,
"mod_equipment_002": 50,
"mod_flashlight": 75,
"mod_foregrip": 65,
"mod_gas_block": 100,
@ -94,7 +98,6 @@
"mod_muzzle": 60,
"mod_muzzle_000": 75,
"mod_muzzle_001": 75,
"mod_nvg": 40,
"mod_pistol_grip": 100,
"mod_pistol_grip_akms": 50,
"mod_pistolgrip": 50,
@ -2425,9 +2428,9 @@
"CharlieMike",
"oroku",
"Glukhar_111",
"aburiu",
"r2go",
"Mihai"
"aburiu",
"r2go",
"Mihai"
],
"generation": {
"items": {

2
project/src/generators/BotEquipmentModGenerator.ts
View File

@ -95,7 +95,7 @@ export class BotEquipmentModGenerator
continue;
}
if (!(this.shouldModBeSpawned(itemSlot, modSlot, settings.spawnChances.mods) || forceSpawn))
if (!(this.shouldModBeSpawned(itemSlot, modSlot, settings.spawnChances.equipmentMods) || forceSpawn))
{
continue;
}

4
project/src/generators/BotGenerator.ts
View File

@ -113,7 +113,9 @@ export class BotGenerator
// Get raw json data for bot (Cloned)
const botJsonTemplate = this.jsonUtil.clone(
this.botHelper.getBotTemplate((botGenerationDetails.isPmc) ? bot.Info.Side : botGenerationDetails.role),
this.botHelper.getBotTemplate((botGenerationDetails.isPmc)
? bot.Info.Side
: botGenerationDetails.role),
);
bot = this.generateBot(sessionId, bot, botJsonTemplate, botGenerationDetails);

24
project/src/generators/BotInventoryGenerator.ts
View File

@ -63,18 +63,18 @@ export class BotInventoryGenerator
): PmcInventory
{
const templateInventory = botJsonTemplate.inventory;
const equipmentChances = botJsonTemplate.chances;
const wornItemChances = botJsonTemplate.chances;
const itemGenerationLimitsMinMax = botJsonTemplate.generation;
// Generate base inventory with no items
const botInventory = this.generateInventoryBase();
this.generateAndAddEquipmentToBot(templateInventory, equipmentChances, botRole, botInventory, botLevel);
this.generateAndAddEquipmentToBot(templateInventory, wornItemChances, botRole, botInventory, botLevel);
// Roll weapon spawns (primary/secondary/holster) and generate a weapon for each roll that passed
this.generateAndAddWeaponsToBot(
templateInventory,
equipmentChances,
wornItemChances,
sessionId,
botInventory,
botRole,
@ -132,14 +132,14 @@ export class BotInventoryGenerator
/**
* Add equipment to a bot
* @param templateInventory bot/x.json data from db
* @param equipmentChances Chances items will be added to bot
* @param wornItemChances Chances items will be added to bot
* @param botRole Role bot has (assault/pmcBot)
* @param botInventory Inventory to add equipment to
* @param botLevel Level of bot
*/
protected generateAndAddEquipmentToBot(
templateInventory: Inventory,
equipmentChances: Chances,
wornItemChances: Chances,
botRole: string,
botInventory: PmcInventory,
botLevel: number,
@ -171,7 +171,7 @@ export class BotInventoryGenerator
rootEquipmentSlot: equipmentSlot,
rootEquipmentPool: templateInventory.equipment[equipmentSlot],
modPool: templateInventory.mods,
spawnChances: equipmentChances,
spawnChances: wornItemChances,
botRole: botRole,
botLevel: botLevel,
inventory: botInventory,
@ -185,7 +185,7 @@ export class BotInventoryGenerator
rootEquipmentSlot: EquipmentSlots.FACE_COVER,
rootEquipmentPool: templateInventory.equipment.FaceCover,
modPool: templateInventory.mods,
spawnChances: equipmentChances,
spawnChances: wornItemChances,
botRole: botRole,
botLevel: botLevel,
inventory: botInventory,
@ -196,7 +196,7 @@ export class BotInventoryGenerator
rootEquipmentSlot: EquipmentSlots.HEADWEAR,
rootEquipmentPool: templateInventory.equipment.Headwear,
modPool: templateInventory.mods,
spawnChances: equipmentChances,
spawnChances: wornItemChances,
botRole: botRole,
botLevel: botLevel,
inventory: botInventory,
@ -207,7 +207,7 @@ export class BotInventoryGenerator
rootEquipmentSlot: EquipmentSlots.EARPIECE,
rootEquipmentPool: templateInventory.equipment.Earpiece,
modPool: templateInventory.mods,
spawnChances: equipmentChances,
spawnChances: wornItemChances,
botRole: botRole,
botLevel: botLevel,
inventory: botInventory,
@ -218,7 +218,7 @@ export class BotInventoryGenerator
rootEquipmentSlot: EquipmentSlots.TACTICAL_VEST,
rootEquipmentPool: templateInventory.equipment.TacticalVest,
modPool: templateInventory.mods,
spawnChances: equipmentChances,
spawnChances: wornItemChances,
botRole: botRole,
botLevel: botLevel,
inventory: botInventory,
@ -229,7 +229,7 @@ export class BotInventoryGenerator
rootEquipmentSlot: EquipmentSlots.ARMOR_VEST,
rootEquipmentPool: templateInventory.equipment.ArmorVest,
modPool: templateInventory.mods,
spawnChances: equipmentChances,
spawnChances: wornItemChances,
botRole: botRole,
botLevel: botLevel,
inventory: botInventory,
@ -447,7 +447,7 @@ export class BotInventoryGenerator
weaponSlot.slot,
templateInventory,
botInventory.equipment,
equipmentChances.mods,
equipmentChances.weaponMods,
botRole,
isPmc,
botLevel,

2
project/src/generators/BotLootGenerator.ts
View File

@ -159,7 +159,7 @@ export class BotLootGenerator
botInventory,
EquipmentSlots.BACKPACK,
botJsonTemplate.inventory,
botJsonTemplate.chances.mods,
botJsonTemplate.chances.weaponMods,
botRole,
isPmc,
botLevel,

5
project/src/generators/BotWeaponGenerator.ts
View File

@ -666,7 +666,10 @@ export class BotWeaponGenerator
if (weaponTemplate._props.ammoCaliber)
{
return weaponTemplate._props.ammoCaliber;
// 9x18pmm has a typo, should be Caliber9x18PM
return weaponTemplate._props.ammoCaliber === "Caliber9x18PMM"
? "Caliber9x18PM"
: weaponTemplate._props.ammoCaliber;
}
if (weaponTemplate._props.LinkedWeapon)

2
project/src/generators/PlayerScavGenerator.ts
View File

@ -230,7 +230,7 @@ export class PlayerScavGenerator
continue;
}
baseBotNode.chances.mods[modKey] += karmaSettings.modifiers.mod[modKey];
baseBotNode.chances.weaponMods[modKey] += karmaSettings.modifiers.mod[modKey];
}
// Adjust item spawn quantity values

3
project/src/models/eft/common/tables/IBotType.ts
View File

@ -27,7 +27,8 @@ export interface Appearance
export interface Chances
{
equipment: EquipmentChances;
mods: ModsChances;
weaponMods: ModsChances;
equipmentMods: ModsChances;
}
export interface EquipmentChances

2
project/src/services/BotEquipmentFilterService.ts
View File

@ -89,7 +89,7 @@ export class BotEquipmentFilterService
if (randomisationDetails)
{
this.adjustChances(randomisationDetails?.equipment, baseBotNode.chances.equipment);
this.adjustChances(randomisationDetails?.mods, baseBotNode.chances.mods);
this.adjustChances(randomisationDetails?.mods, baseBotNode.chances.weaponMods);
this.adjustGenerationChances(randomisationDetails?.generation, baseBotNode.generation);
}
}