From c5bde7bc9af795e82a283f952feb67eff044f5fb Mon Sep 17 00:00:00 2001 From: Valiant Date: Wed, 8 May 2019 10:32:21 +0400 Subject: [PATCH 1/7] Randomize amount of ammo in gun spawns --- data/json/itemgroups/guns.json | 376 +++++++++++++++++++-------------- 1 file changed, 219 insertions(+), 157 deletions(-) diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index ba1e8fa9e4b8b..c11fe6f3178bb 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -4,21 +4,21 @@ "id": "guns_pistol_common", "//": "Pistols commonly owned by citizens and found in many locations.", "items": [ - [ "glock_17", 35 ], - [ "glock_19", 50 ], - [ "glock_22", 35 ], - [ "m1911", 50 ], - [ "m9", 30 ], - [ "ruger_lcr_38", 10 ], - [ "sig_mosquito", 15 ], - [ "sw_22", 15 ], - [ "sw_610", 20 ], - [ "sw_619", 25 ], - [ "p226_357sig", 20 ], - [ "kp32", 10 ], - [ "kp3at", 35 ], - [ "rugerlcp", 35 ], - [ "kpf9", 35 ] + { "item": "glock_17", "prob": 35, "charges-min": 1, "charges-max": 15 }, + { "item": "glock_19", "prob": 50, "charges-min": 1, "charges-max": 15 }, + { "item": "glock_22", "prob": 35, "charges-min": 1, "charges-max": 15 }, + { "item": "m1911", "prob": 50, "charges-min": 1, "charges-max": 7 }, + { "item": "m9", "prob": 30, "charges-min": 1, "charges-max": 15 }, + { "item": "ruger_lcr_38", "prob": 10, "charges-min": 1, "charges-max": 5 }, + { "item": "sig_mosquito", "prob": 15, "charges-min": 1, "charges-max": 10 }, + { "item": "sw_22", "prob": 15, "charges-min": 1, "charges-max": 10 }, + { "item": "sw_610", "prob": 20, "charges-min": 1, "charges-max": 6 }, + { "item": "sw_619", "prob": 25, "charges-min": 1, "charges-max": 7 }, + { "item": "p226_357sig", "prob": 20, "charges-min": 1, "charges-max": 15 }, + { "item": "kp32", "prob": 10, "charges-min": 1, "charges-max": 7 }, + { "item": "kp3at", "prob": 35, "charges-min": 1, "charges-max": 6 }, + { "item": "rugerlcp", "prob": 35, "charges-min": 1, "charges-max": 6 }, + { "item": "kpf9", "prob": 35, "charges-min": 1, "charges-max": 7 } ] }, { @@ -26,86 +26,110 @@ "id": "guns_pistol_rare", "//": "Less common pistols including those only used by police/paramilitary forces.", "items": [ - [ "deagle_44", 35 ], - [ "fn57", 80 ], - [ "l_enforcer_45", 25 ], - [ "l_lookout_9mm", 20 ], - [ "l_sp_45", 35 ], - [ "l_sp_9mm", 60 ], - [ "ruger_lcr_22", 35 ], - [ "ruger_redhawk", 25 ], - [ "sig_40", 35 ], - [ "sig_p230", 45 ], - [ "sw_500", 25 ], - [ "sw629", 40 ], - [ "taurus_38", 35 ], - [ "usp_45", 70 ], - [ "usp_9mm", 120 ] + { "item": "deagle_44", "prob": 35, "charges-min": 1, "charges-max": 8 }, + { "item": "fn57", "prob": 80, "charges-min": 1, "charges-max": 20 }, + { "item": "l_enforcer_45", "prob": 25, "charges-min": 1, "charges-max": 6 }, + { "item": "l_lookout_9mm", "prob": 20, "charges-min": 1, "charges-max": 7 }, + { "item": "l_sp_45", "prob": 35, "charges-min": 1, "charges-max": 12 }, + { "item": "l_sp_9mm", "prob": 60, "charges-min": 1, "charges-max": 21 }, + { "item": "ruger_lcr_22", "prob": 35, "charges-min": 1, "charges-max": 8 }, + { "item": "ruger_redhawk", "prob": 25, "charges-min": 1, "charges-max": 6 }, + { "item": "sig_40", "prob": 35, "charges-min": 1, "charges-max": 12 }, + { "item": "sig_p230", "prob": 45, "charges-min": 1, "charges-max": 8 }, + { "item": "sw_500", "prob": 25, "charges-min": 1, "charges-max": 5 }, + { "item": "sw629", "prob": 40, "charges-min": 1, "charges-max": 6 }, + { "item": "taurus_38", "prob": 35, "charges-min": 1, "charges-max": 10 }, + { "item": "usp_45", "prob": 70, "charges-min": 1, "charges-max": 12 }, + { "item": "usp_9mm", "prob": 120, "charges-min": 1, "charges-max": 15 } ] }, { "type": "item_group", "id": "guns_pistol_milspec", "//": "Military specification pistols only ever found at military sites.", - "items": [ [ "hk_ucp", 100 ], [ "l_mp_45", 70 ], [ "l_mp_9mm", 100 ], [ "needlepistol", 45 ], [ "rm103a_pistol", 35 ] ] + "items": [ + { "item": "hk_ucp", "prob": 100, "charges-min": 1, "charges-max": 20 }, + { "item": "l_mp_45", "prob": 70, "charges-min": 1, "charges-max": 12 }, + { "item": "l_mp_9mm", "prob": 100, "charges-min": 1, "charges-max": 21 }, + { "item": "needlepistol", "prob": 45, "charges-min": 1, "charges-max": 50 }, + { "item": "rm103a_pistol", "prob": 35, "charges-min": 1, "charges-max": 10 } + ] }, { "type": "item_group", "id": "guns_pistol_obscure", "//": "Imported or otherwise very obscure pistols.", "items": [ - [ "cop_38", 100 ], - [ "lemat_revolver", 150 ], - [ "makarov", 100 ], - [ "moss_brownie", 100 ], - [ "pistol_flintlock", 150 ], - [ "raging_bull", 100 ], - [ "l_bak_223", 80 ], - [ "rm99_pistol", 150 ], - [ "tokarev", 100 ], - [ "walther_ppk", 100 ] + { "item": "cop_38", "prob": 100, "charges-min": 1, "charges-max": 4 }, + { "item": "lemat_revolver", "prob": 150, "charges-min": 1, "charges-max": 9 }, + { "item": "makarov", "prob": 100, "charges-min": 1, "charges-max": 8 }, + { "item": "moss_brownie", "prob": 100, "charges-min": 1, "charges-max": 4 }, + { "item": "pistol_flintlock", "prob": 150 }, + { "item": "raging_bull", "prob": 100, "charges-min": 1, "charges-max": 5 }, + { "item": "l_bak_223", "prob": 80, "charges-min": 1, "charges-max": 5 }, + { "item": "rm99_pistol", "prob": 150, "charges-min": 1, "charges-max": 5 }, + { "item": "tokarev", "prob": 100, "charges-min": 1, "charges-max": 8 }, + { "item": "walther_ppk", "prob": 100, "charges-min": 1, "charges-max": 8 } ] }, { "type": "item_group", "id": "guns_pistol_improvised", "//": "Makeshift or otherwise poor quality pistols.", - "items": [ [ "ashot", 100 ], [ "surv_hand_cannon", 100 ], [ "surv_six_shooter", 100 ] ] + "items": [ + { "item": "ashot", "prob": 100 }, + { "item": "surv_hand_cannon", "prob": 100, "charges-min": 1, "charges-max": 5 }, + { "item": "surv_six_shooter", "prob": 100, "charges-min": 1, "charges-max": 6 } + ] }, { "type": "item_group", "id": "guns_smg_common", "//": "SMGs commonly owned by citizens and found in many locations.", - "items": [ [ "tommygun", 70 ], [ "briefcase_smg", 20 ], [ "sten", 100 ], [ "uzi", 100 ] ] + "items": [ + { "item": "tommygun", "prob": 70, "charges-min": 1, "charges-max": 20 }, + { "item": "briefcase_smg", "prob": 20, "charges-min": 1, "charges-max": 32 }, + { "item": "sten", "prob": 100, "charges-min": 1, "charges-max": 32 }, + { "item": "uzi", "prob": 100, "charges-min": 1, "charges-max": 32 } + ] }, { "type": "item_group", "id": "guns_smg_rare", "//": "Less common SMGs including those only used by police/paramilitary forces.", "items": [ - [ "calico", 30 ], - [ "fn_p90", 50 ], - [ "hk_mp5", 100 ], - [ "hk_ump45", 30 ], - [ "mac_10", 40 ], - [ "mac_11", 20 ], - [ "rm360_carbine", 30 ], - [ "TDI", 10 ], - [ "american_180", 50 ], - [ "tec9", 50 ] + { "item": "calico", "prob": 30, "charges-min": 1, "charges-max": 50 }, + { "item": "fn_p90", "prob": 50, "charges-min": 1, "charges-max": 50 }, + { "item": "hk_mp5", "prob": 100, "charges-min": 1, "charges-max": 30 }, + { "item": "hk_ump45", "prob": 30, "charges-min": 1, "charges-max": 25 }, + { "item": "mac_10", "prob": 40, "charges-min": 1, "charges-max": 30 }, + { "item": "mac_11", "prob": 20, "charges-min": 1, "charges-max": 32 }, + { "item": "rm360_carbine", "prob": 30, "charges-min": 1, "charges-max": 100 }, + { "item": "TDI", "prob": 10, "charges-min": 1, "charges-max": 30 }, + { "item": "american_180", "prob": 50, "charges-min": 1, "charges-max": 100 }, + { "item": "tec9", "prob": 50, "charges-min": 1, "charges-max": 32 } ] }, { "type": "item_group", "id": "guns_smg_milspec", "//": "Military specification SMGs only ever found at military sites.", - "items": [ [ "hk_mp7", 100 ], [ "needlegun", 30 ], [ "rm2000_smg", 50 ], [ "hk_mp5sd", 75 ] ] + "items": [ + { "item": "hk_mp7", "prob": 100, "charges-min": 1, "charges-max": 20 }, + { "item": "needlegun", "prob": 30, "charges-min": 1, "charges-max": 50 }, + { "item": "rm2000_smg", "prob": 50, "charges-min": 1, "charges-max": 10 }, + { "item": "hk_mp5sd", "prob": 75, "charges-min": 1, "charges-max": 30 } + ] }, { "type": "item_group", "id": "guns_smg_obscure", "//": "Imported or otherwise very obscure SMGs.", - "items": [ [ "ppsh", 150 ], [ "skorpion_61", 100 ], [ "skorpion_82", 100 ] ] + "items": [ + { "item": "ppsh", "prob": 150, "charges-min": 1, "charges-max": 35 }, + { "item": "skorpion_61", "prob": 100, "charges-min": 1, "charges-max": 20 }, + { "item": "skorpion_82", "prob": 100, "charges-min": 1, "charges-max": 20 } + ] }, { "type": "item_group", @@ -118,19 +142,19 @@ "id": "guns_rifle_common", "//": "Rifles commonly owned by citizens and found in many locations.", "items": [ - [ "browning_blr", 25 ], - [ "garand", 65 ], - [ "ar15", 30 ], - [ "cx4", 45 ], - [ "ksub2000", 30 ], - [ "m1a", 50 ], - [ "marlin_9a", 80 ], - [ "mosin44", 15 ], - [ "mosin91_30", 25 ], - [ "ruger_1022", 70 ], - [ "ruger_mini", 60 ], - [ "sks", 40 ], - [ "win70", 15 ] + { "item": "browning_blr", "prob": 25, "charges-min": 1, "charges-max": 4 }, + { "item": "garand", "prob": 65, "charges-min": 1, "charges-max": 8 }, + { "item": "ar15", "prob": 30, "charges-min": 1, "charges-max": 30 }, + { "item": "cx4", "prob": 45, "charges-min": 1, "charges-max": 15 }, + { "item": "ksub2000", "prob": 30, "charges-min": 1, "charges-max": 15 }, + { "item": "m1a", "prob": 50, "charges-min": 1, "charges-max": 5 }, + { "item": "marlin_9a", "prob": 80, "charges-min": 1, "charges-max": 19 }, + { "item": "mosin44", "prob": 15, "charges-min": 1, "charges-max": 5 }, + { "item": "mosin91_30", "prob": 25, "charges-min": 1, "charges-max": 5 }, + { "item": "ruger_1022", "prob": 70, "charges-min": 1, "charges-max": 10 }, + { "item": "ruger_mini", "prob": 60, "charges-min": 1, "charges-max": 5 }, + { "item": "sks", "prob": 40, "charges-min": 1, "charges-max": 10 }, + { "item": "win70", "prob": 15, "charges-min": 1, "charges-max": 3 } ] }, { @@ -138,25 +162,25 @@ "id": "guns_rifle_rare", "//": "Less common rifles including those only used by police/paramilitary forces.", "items": [ - [ "acr", 25 ], - [ "fn_fal", 40 ], - [ "hk_g3", 40 ], - [ "hk_g36", 30 ], - [ "henry_big_boy", 10 ], - [ "l_base_223", 40 ], - [ "l_car_223", 10 ], - [ "l_dsr_223", 5 ], - [ "l_long_45", 30 ], - [ "m14ebr", 15 ], - [ "M24", 15 ], - [ "m4a1", 45 ], - [ "m1903", 15 ], - [ "m1918", 30 ], - [ "mosin44_ebr", 10 ], - [ "mosin91_30_ebr", 20 ], - [ "remington_700", 20 ], - [ "savage_111f", 15 ], - [ "weatherby_5", 15 ] + { "item": "acr", "prob": 25, "charges-min": 1, "charges-max": 30 }, + { "item": "fn_fal", "prob": 40, "charges-min": 1, "charges-max": 20 }, + { "item": "hk_g3", "prob": 40, "charges-min": 1, "charges-max": 20 }, + { "item": "hk_g36", "prob": 30, "charges-min": 1, "charges-max": 30 }, + { "item": "henry_big_boy", "prob": 10, "charges-min": 1, "charges-max": 10 }, + { "item": "l_base_223", "prob": 40, "charges-min": 1, "charges-max": 32 }, + { "item": "l_car_223", "prob": 10, "charges-min": 1, "charges-max": 32 }, + { "item": "l_dsr_223", "prob": 5, "charges-min": 1, "charges-max": 32 }, + { "item": "l_long_45", "prob": 30, "charges-min": 1, "charges-max": 12 }, + { "item": "m14ebr", "prob": 15, "charges-min": 1, "charges-max": 20 }, + { "item": "M24", "prob": 15, "charges-min": 1, "charges-max": 20 }, + { "item": "m4a1", "prob": 45, "charges-min": 1, "charges-max": 30 }, + { "item": "m1903", "prob": 15, "charges-min": 1, "charges-max": 5 }, + { "item": "m1918", "prob": 30, "charges-min": 1, "charges-max": 20 }, + { "item": "mosin44_ebr", "prob": 10, "charges-min": 1, "charges-max": 5 }, + { "item": "mosin91_30_ebr", "prob": 20, "charges-min": 1, "charges-max": 5 }, + { "item": "remington_700", "prob": 20, "charges-min": 1, "charges-max": 4 }, + { "item": "savage_111f", "prob": 15, "charges-min": 1, "charges-max": 3 }, + { "item": "weatherby_5", "prob": 15, "charges-min": 1, "charges-max": 3 } ] }, { @@ -164,72 +188,96 @@ "id": "guns_rifle_milspec", "//": "Military specification rifles only ever found at military sites.", "items": [ - [ "h&k416a5", 50 ], - [ "l_lmg_223", 30 ], - [ "l_mbr_223", 100 ], - [ "m107a1", 30 ], - [ "m134", 10 ], - [ "m14ebr", 10 ], - [ "m2010", 20 ], - [ "m240", 15 ], - [ "m249", 25 ], - [ "m27iar", 50 ], - [ "m60", 15 ], - [ "rm11b_sniper_rifle", 15 ], - [ "rm298", 10 ], - [ "rm51_assault_rifle", 25 ], - [ "rm614_lmg", 10 ], - [ "rm88_battle_rifle", 25 ], - [ "sig552", 100 ], - [ "scar_l", 50 ], - [ "scar_h", 50 ] + { "item": "h&k416a5", "prob": 50, "charges-min": 1, "charges-max": 30 }, + { "item": "l_lmg_223", "prob": 30, "charges-min": 1, "charges-max": 32 }, + { "item": "l_mbr_223", "prob": 100, "charges-min": 1, "charges-max": 32 }, + { "item": "m107a1", "prob": 30, "charges-min": 1, "charges-max": 10 }, + { "item": "m134", "prob": 10, "charges-min": 1, "charges-max": 100 }, + { "item": "m14ebr", "prob": 10, "charges-min": 1, "charges-max": 20 }, + { "item": "m2010", "prob": 20, "charges-min": 1, "charges-max": 5 }, + { "item": "m240", "prob": 15, "charges-min": 1, "charges-max": 100 }, + { "item": "m249", "prob": 25, "charges-min": 1, "charges-max": 10 }, + { "item": "m27iar", "prob": 50, "charges-min": 1, "charges-max": 30 }, + { "item": "m60", "prob": 15, "charges-min": 1, "charges-max": 100 }, + { "item": "rm11b_sniper_rifle", "prob": 15, "charges-min": 1, "charges-max": 10 }, + { "item": "rm298", "prob": 10, "charges-min": 1, "charges-max": 100 }, + { "item": "rm51_assault_rifle", "prob": 25, "charges-min": 1, "charges-max": 50 }, + { "item": "rm614_lmg", "prob": 10, "charges-min": 1, "charges-max": 100 }, + { "item": "rm88_battle_rifle", "prob": 25, "charges-min": 1, "charges-max": 50 }, + { "item": "sig552", "prob": 100, "charges-min": 1, "charges-max": 30 }, + { "item": "scar_l", "prob": 50, "charges-min": 1, "charges-max": 30 }, + { "item": "scar_h", "prob": 50, "charges-min": 1, "charges-max": 20 } ] }, { "type": "item_group", "id": "guns_energy", "//": "Assorted factory crafted energy weapons.", - "items": [ [ "laser_rifle", 30 ], [ "emp_gun", 10 ], [ "v29", 70 ], [ "ftk93", 10 ] ] + "items": [ + { "item": "laser_rifle", "prob": 30 }, + { "item": "emp_gun", "prob": 10 }, + { "item": "v29", "prob": 70 }, + { "item": "ftk93", "prob": 10 } + ] }, { "type": "item_group", "id": "guns_rifle_obscure", "//": "Imported or otherwise very obscure rifles.", "items": [ - [ "ak47", 100 ], - [ "ak74", 60 ], - [ "an94", 40 ], - [ "bh_m89", 20 ], - [ "carbine_flintlock", 140 ], - [ "rifle_flintlock", 180 ], - [ "steyr_aug", 40 ], - [ "trex_gun", 60 ], - [ "arx160", 40 ] + { "item": "ak47", "prob": 100, "charges-min": 1, "charges-max": 30 }, + { "item": "ak74", "prob": 60, "charges-min": 1, "charges-max": 30 }, + { "item": "an94", "prob": 40, "charges-min": 1, "charges-max": 30 }, + { "item": "bh_m89", "prob": 20, "charges-min": 1, "charges-max": 7 }, + { "item": "carbine_flintlock", "prob": 140 }, + { "item": "rifle_flintlock", "prob": 180 }, + { "item": "steyr_aug", "prob": 40, "charges-min": 1, "charges-max": 30 }, + { "item": "trex_gun", "prob": 60 }, + { "item": "arx160", "prob": 40, "charges-min": 1, "charges-max": 30 } ] }, { "type": "item_group", "id": "guns_rifle_improvised", "//": "Makeshift or otherwise poor quality rifles.", - "items": [ [ "rifle_22", 60 ], [ "rifle_3006", 30 ], [ "rifle_9mm", 60 ], [ "surv_carbine_223", 120 ] ] + "items": [ + { "item": "rifle_22", "prob": 60 }, + { "item": "rifle_3006", "prob": 30 }, + { "item": "rifle_9mm", "prob": 60 }, + { "item": "surv_carbine_223", "prob": 120, "charges-min": 1, "charges-max": 5 } + ] }, { "type": "item_group", "id": "guns_shotgun_common", "//": "Shotguns commonly owned by citizens and found in many locations.", - "items": [ [ "mossberg_500", 50 ], [ "remington_870", 100 ], [ "shotgun_d", 30 ], [ "shotgun_s", 30 ] ] + "items": [ + { "item": "mossberg_500", "prob": 50, "charges-min": 1, "charges-max": 8 }, + { "item": "remington_870", "prob": 100, "charges-min": 1, "charges-max": 6 }, + { "item": "shotgun_d", "prob": 30, "charges-min": 1, "charges-max": 2 }, + { "item": "shotgun_s", "prob": 30 } + ] }, { "type": "item_group", "id": "guns_shotgun_rare", "//": "Less common shotguns including those only used by police/paramilitary forces.", - "items": [ [ "ksg", 50 ], [ "m1014", 80 ], [ "rm120c", 30 ], [ "rm228", 30 ], [ "saiga_12", 50 ] ] + "items": [ + { "item": "ksg", "prob": 50, "charges-min": 1, "charges-max": 7 }, + { "item": "m1014", "prob": 80, "charges-min": 1, "charges-max": 8 }, + { "item": "rm120c", "prob": 30, "charges-min": 1, "charges-max": 5 }, + { "item": "rm228", "prob": 30, "charges-min": 1, "charges-max": 10 }, + { "item": "saiga_12", "prob": 50, "charges-min": 1, "charges-max": 10 } + ] }, { "type": "item_group", "id": "guns_shotgun_milspec", "//": "Military specification shotguns only ever found at military sites.", - "items": [ [ "l_def_12", 100 ], [ "rm20", 20 ] ] + "items": [ + { "item": "l_def_12", "prob": 100, "charges-min": 1, "charges-max": 8 }, + { "item": "rm20", "prob": 20, "charges-min": 1, "charges-max": 20 } + ] }, { "type": "item_group", @@ -242,25 +290,34 @@ "id": "guns_shotgun_improvised", "//": "Makeshift or otherwise poor quality shotguns.", "items": [ - [ "blunderbuss", 70 ], - [ "bigun", 10 ], - [ "pipe_double_shotgun", 70 ], - [ "pipe_shotgun", 100 ], - [ "revolver_shotgun", 30 ], - [ "surv_levershotgun", 40 ] + { "item": "blunderbuss", "prob": 70 }, + { "item": "bigun", "prob": 10, "charges-min": 1, "charges-max": 6 }, + { "item": "pipe_double_shotgun", "prob": 70, "charges-min": 1, "charges-max": 2 }, + { "item": "pipe_shotgun", "prob": 100 }, + { "item": "revolver_shotgun", "prob": 30, "charges-min": 1, "charges-max": 6 }, + { "item": "surv_levershotgun", "prob": 40, "charges-min": 1, "charges-max": 8 } ] }, { "type": "item_group", "id": "guns_launcher_flame", "//": "Factory manufactured incendiary liquid projectors (excludes improvised weapons)", - "items": [ [ "flamethrower", 50 ], [ "rm451_flamethrower", 40 ] ] + "items": [ + { "item": "flamethrower", "prob": 50, "charges-min": 100, "charges-max": 1500 }, + { "item": "rm451_flamethrower", "prob": 40, "charges-min": 100, "charges-max": 1500 } + ] }, { "type": "item_group", "id": "guns_launcher_grenade", "//": "Factory manufactured grenade launchers (excludes improvised weapons)", - "items": [ [ "m320", 75 ], [ "m79", 100 ], [ "mark19", 10 ], [ "mgl", 25 ], [ "rm802", 15 ] ] + "items": [ + { "item": "m320", "prob": 75 }, + { "item": "m79", "prob": 100 }, + { "item": "mark19", "prob": 10, "charges-min": 1, "charges-max": 10 }, + { "item": "mgl", "prob": 25, "charges-min": 1, "charges-max": 6 }, + { "item": "rm802", "prob": 15, "charges-min": 1, "charges-max": 4 } + ] }, { "type": "item_group", @@ -290,7 +347,7 @@ "type": "item_group", "id": "guns_launcher_improvised", "//": "Makeshift or otherwise poor quality grenade and rocket launchers", - "items": [ [ "launcher_simple", 100 ], [ "triple_launcher_simple", 15 ] ] + "items": [ { "item": "launcher_simple", "prob": 100 }, { "item": "triple_launcher_simple", "prob": 15 } ] }, { "type": "item_group", @@ -354,32 +411,37 @@ "id": "guns_cop", "//": "Police issue weapons of all types", "items": [ - [ "ar15", 15 ], - [ "cx4", 20 ], - [ "fn57", 20 ], - [ "fn_p90", 5 ], - [ "glock_19", 15 ], - [ "glock_22", 20 ], - [ "hk_mp5", 10 ], - [ "l_enforcer_45", 10 ], - [ "m9", 5 ], - [ "mossberg_500", 15 ], - [ "remington_700", 5 ], - [ "remington_870", 20 ], - [ "sig_40", 20 ], - [ "usp_45", 10 ], - [ "usp_9mm", 10 ], - [ "kp32", 1 ], - [ "kp3at", 2 ], - [ "rugerlcp", 2 ], - [ "kpf9", 3 ] + { "item": "ar15", "prob": 15, "charges-min": 1, "charges-max": 30 }, + { "item": "cx4", "prob": 20, "charges-min": 1, "charges-max": 15 }, + { "item": "fn57", "prob": 20, "charges-min": 1, "charges-max": 20 }, + { "item": "fn_p90", "prob": 5, "charges-min": 1, "charges-max": 50 }, + { "item": "glock_19", "prob": 15, "charges-min": 1, "charges-max": 15 }, + { "item": "glock_22", "prob": 20, "charges-min": 1, "charges-max": 15 }, + { "item": "hk_mp5", "prob": 10, "charges-min": 1, "charges-max": 30 }, + { "item": "l_enforcer_45", "prob": 10, "charges-min": 1, "charges-max": 6 }, + { "item": "m9", "prob": 5, "charges-min": 1, "charges-max": 15 }, + { "item": "mossberg_500", "prob": 15, "charges-min": 1, "charges-max": 8 }, + { "item": "remington_700", "prob": 5, "charges-min": 1, "charges-max": 4 }, + { "item": "remington_870", "prob": 20, "charges-min": 1, "charges-max": 6 }, + { "item": "sig_40", "prob": 20, "charges-min": 1, "charges-max": 12 }, + { "item": "usp_45", "prob": 10, "charges-min": 1, "charges-max": 12 }, + { "item": "usp_9mm", "prob": 10, "charges-min": 1, "charges-max": 15 }, + { "item": "kp32", "prob": 1, "charges-min": 1, "charges-max": 7 }, + { "item": "kp3at", "prob": 2, "charges-min": 1, "charges-max": 6 }, + { "item": "rugerlcp", "prob": 2, "charges-min": 1, "charges-max": 6 }, + { "item": "kpf9", "prob": 3, "charges-min": 1, "charges-max": 7 } ] }, { "type": "item_group", "id": "guns_swat", "//": "Guns issued to paramilitary forces in addition to standard police issue.", - "items": [ { "group": "guns_cop", "prob": 100 }, [ "hk_ump45", 15 ], [ "m1014", 10 ], [ "m4a1", 35 ] ] + "items": [ + { "group": "guns_cop", "prob": 100 }, + { "item": "hk_ump45", "prob": 15, "charges-min": 1, "charges-max": 25 }, + { "item": "m1014", "prob": 10, "charges-min": 1, "charges-max": 8 }, + { "item": "m4a1", "prob": 35, "charges-min": 1, "charges-max": 30 } + ] }, { "type": "item_group", @@ -387,14 +449,14 @@ "//": "Guns typically carried by survivors, either improvised or thematically appropriate.", "items": [ { "group": "guns_improvised", "prob": 200 }, - [ "ar15", 5 ], - [ "mossberg_500", 5 ], - [ "remington_870", 5 ], - [ "ruger_1022", 15 ], - [ "shotgun_s", 10 ], - [ "shotgun_d", 10 ], - [ "sten", 20 ], - [ "sks", 10 ] + { "item": "ar15", "prob": 5, "charges-min": 1, "charges-max": 30 }, + { "item": "mossberg_500", "prob": 5, "charges-min": 1, "charges-max": 8 }, + { "item": "remington_870", "prob": 5, "charges-min": 1, "charges-max": 6 }, + { "item": "ruger_1022", "prob": 15, "charges-min": 1, "charges-max": 10 }, + { "item": "shotgun_s", "prob": 10 }, + { "item": "shotgun_d", "prob": 10, "charges-min": 1, "charges-max": 2 }, + { "item": "sten", "prob": 20, "charges-min": 1, "charges-max": 32 }, + { "item": "sks", "prob": 10, "charges-min": 1, "charges-max": 10 } ] } ] From 41f875d5178d23158db348035276abc4a6e41376 Mon Sep 17 00:00:00 2001 From: Valiant Date: Wed, 8 May 2019 10:53:55 +0400 Subject: [PATCH 2/7] Allowed empty magazines to spawn too --- data/json/itemgroups/guns.json | 342 ++++++++++++++++----------------- 1 file changed, 171 insertions(+), 171 deletions(-) diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index c11fe6f3178bb..4821984f96c3e 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -4,21 +4,21 @@ "id": "guns_pistol_common", "//": "Pistols commonly owned by citizens and found in many locations.", "items": [ - { "item": "glock_17", "prob": 35, "charges-min": 1, "charges-max": 15 }, - { "item": "glock_19", "prob": 50, "charges-min": 1, "charges-max": 15 }, - { "item": "glock_22", "prob": 35, "charges-min": 1, "charges-max": 15 }, - { "item": "m1911", "prob": 50, "charges-min": 1, "charges-max": 7 }, - { "item": "m9", "prob": 30, "charges-min": 1, "charges-max": 15 }, - { "item": "ruger_lcr_38", "prob": 10, "charges-min": 1, "charges-max": 5 }, - { "item": "sig_mosquito", "prob": 15, "charges-min": 1, "charges-max": 10 }, - { "item": "sw_22", "prob": 15, "charges-min": 1, "charges-max": 10 }, - { "item": "sw_610", "prob": 20, "charges-min": 1, "charges-max": 6 }, - { "item": "sw_619", "prob": 25, "charges-min": 1, "charges-max": 7 }, - { "item": "p226_357sig", "prob": 20, "charges-min": 1, "charges-max": 15 }, - { "item": "kp32", "prob": 10, "charges-min": 1, "charges-max": 7 }, - { "item": "kp3at", "prob": 35, "charges-min": 1, "charges-max": 6 }, - { "item": "rugerlcp", "prob": 35, "charges-min": 1, "charges-max": 6 }, - { "item": "kpf9", "prob": 35, "charges-min": 1, "charges-max": 7 } + { "item": "glock_17", "prob": 35, "charges-min": 0, "charges-max": 15 }, + { "item": "glock_19", "prob": 50, "charges-min": 0, "charges-max": 15 }, + { "item": "glock_22", "prob": 35, "charges-min": 0, "charges-max": 15 }, + { "item": "m1911", "prob": 50, "charges-min": 0, "charges-max": 7 }, + { "item": "m9", "prob": 30, "charges-min": 0, "charges-max": 15 }, + { "item": "ruger_lcr_38", "prob": 10, "charges-min": 0, "charges-max": 5 }, + { "item": "sig_mosquito", "prob": 15, "charges-min": 0, "charges-max": 10 }, + { "item": "sw_22", "prob": 15, "charges-min": 0, "charges-max": 10 }, + { "item": "sw_610", "prob": 20, "charges-min": 0, "charges-max": 6 }, + { "item": "sw_619", "prob": 25, "charges-min": 0, "charges-max": 7 }, + { "item": "p226_357sig", "prob": 20, "charges-min": 0, "charges-max": 15 }, + { "item": "kp32", "prob": 10, "charges-min": 0, "charges-max": 7 }, + { "item": "kp3at", "prob": 35, "charges-min": 0, "charges-max": 6 }, + { "item": "rugerlcp", "prob": 35, "charges-min": 0, "charges-max": 6 }, + { "item": "kpf9", "prob": 35, "charges-min": 0, "charges-max": 7 } ] }, { @@ -26,21 +26,21 @@ "id": "guns_pistol_rare", "//": "Less common pistols including those only used by police/paramilitary forces.", "items": [ - { "item": "deagle_44", "prob": 35, "charges-min": 1, "charges-max": 8 }, - { "item": "fn57", "prob": 80, "charges-min": 1, "charges-max": 20 }, - { "item": "l_enforcer_45", "prob": 25, "charges-min": 1, "charges-max": 6 }, - { "item": "l_lookout_9mm", "prob": 20, "charges-min": 1, "charges-max": 7 }, - { "item": "l_sp_45", "prob": 35, "charges-min": 1, "charges-max": 12 }, - { "item": "l_sp_9mm", "prob": 60, "charges-min": 1, "charges-max": 21 }, - { "item": "ruger_lcr_22", "prob": 35, "charges-min": 1, "charges-max": 8 }, - { "item": "ruger_redhawk", "prob": 25, "charges-min": 1, "charges-max": 6 }, - { "item": "sig_40", "prob": 35, "charges-min": 1, "charges-max": 12 }, - { "item": "sig_p230", "prob": 45, "charges-min": 1, "charges-max": 8 }, - { "item": "sw_500", "prob": 25, "charges-min": 1, "charges-max": 5 }, - { "item": "sw629", "prob": 40, "charges-min": 1, "charges-max": 6 }, - { "item": "taurus_38", "prob": 35, "charges-min": 1, "charges-max": 10 }, - { "item": "usp_45", "prob": 70, "charges-min": 1, "charges-max": 12 }, - { "item": "usp_9mm", "prob": 120, "charges-min": 1, "charges-max": 15 } + { "item": "deagle_44", "prob": 35, "charges-min": 0, "charges-max": 8 }, + { "item": "fn57", "prob": 80, "charges-min": 0, "charges-max": 20 }, + { "item": "l_enforcer_45", "prob": 25, "charges-min": 0, "charges-max": 6 }, + { "item": "l_lookout_9mm", "prob": 20, "charges-min": 0, "charges-max": 7 }, + { "item": "l_sp_45", "prob": 35, "charges-min": 0, "charges-max": 12 }, + { "item": "l_sp_9mm", "prob": 60, "charges-min": 0, "charges-max": 21 }, + { "item": "ruger_lcr_22", "prob": 35, "charges-min": 0, "charges-max": 8 }, + { "item": "ruger_redhawk", "prob": 25, "charges-min": 0, "charges-max": 6 }, + { "item": "sig_40", "prob": 35, "charges-min": 0, "charges-max": 12 }, + { "item": "sig_p230", "prob": 45, "charges-min": 0, "charges-max": 8 }, + { "item": "sw_500", "prob": 25, "charges-min": 0, "charges-max": 5 }, + { "item": "sw629", "prob": 40, "charges-min": 0, "charges-max": 6 }, + { "item": "taurus_38", "prob": 35, "charges-min": 0, "charges-max": 10 }, + { "item": "usp_45", "prob": 70, "charges-min": 0, "charges-max": 12 }, + { "item": "usp_9mm", "prob": 120, "charges-min": 0, "charges-max": 15 } ] }, { @@ -48,11 +48,11 @@ "id": "guns_pistol_milspec", "//": "Military specification pistols only ever found at military sites.", "items": [ - { "item": "hk_ucp", "prob": 100, "charges-min": 1, "charges-max": 20 }, - { "item": "l_mp_45", "prob": 70, "charges-min": 1, "charges-max": 12 }, - { "item": "l_mp_9mm", "prob": 100, "charges-min": 1, "charges-max": 21 }, - { "item": "needlepistol", "prob": 45, "charges-min": 1, "charges-max": 50 }, - { "item": "rm103a_pistol", "prob": 35, "charges-min": 1, "charges-max": 10 } + { "item": "hk_ucp", "prob": 100, "charges-min": 0, "charges-max": 20 }, + { "item": "l_mp_45", "prob": 70, "charges-min": 0, "charges-max": 12 }, + { "item": "l_mp_9mm", "prob": 100, "charges-min": 0, "charges-max": 21 }, + { "item": "needlepistol", "prob": 45, "charges-min": 0, "charges-max": 50 }, + { "item": "rm103a_pistol", "prob": 35, "charges-min": 0, "charges-max": 10 } ] }, { @@ -60,16 +60,16 @@ "id": "guns_pistol_obscure", "//": "Imported or otherwise very obscure pistols.", "items": [ - { "item": "cop_38", "prob": 100, "charges-min": 1, "charges-max": 4 }, - { "item": "lemat_revolver", "prob": 150, "charges-min": 1, "charges-max": 9 }, - { "item": "makarov", "prob": 100, "charges-min": 1, "charges-max": 8 }, - { "item": "moss_brownie", "prob": 100, "charges-min": 1, "charges-max": 4 }, + { "item": "cop_38", "prob": 100, "charges-min": 0, "charges-max": 4 }, + { "item": "lemat_revolver", "prob": 150, "charges-min": 0, "charges-max": 9 }, + { "item": "makarov", "prob": 100, "charges-min": 0, "charges-max": 8 }, + { "item": "moss_brownie", "prob": 100, "charges-min": 0, "charges-max": 4 }, { "item": "pistol_flintlock", "prob": 150 }, - { "item": "raging_bull", "prob": 100, "charges-min": 1, "charges-max": 5 }, - { "item": "l_bak_223", "prob": 80, "charges-min": 1, "charges-max": 5 }, - { "item": "rm99_pistol", "prob": 150, "charges-min": 1, "charges-max": 5 }, - { "item": "tokarev", "prob": 100, "charges-min": 1, "charges-max": 8 }, - { "item": "walther_ppk", "prob": 100, "charges-min": 1, "charges-max": 8 } + { "item": "raging_bull", "prob": 100, "charges-min": 0, "charges-max": 5 }, + { "item": "l_bak_223", "prob": 80, "charges-min": 0, "charges-max": 5 }, + { "item": "rm99_pistol", "prob": 150, "charges-min": 0, "charges-max": 5 }, + { "item": "tokarev", "prob": 100, "charges-min": 0, "charges-max": 8 }, + { "item": "walther_ppk", "prob": 100, "charges-min": 0, "charges-max": 8 } ] }, { @@ -78,8 +78,8 @@ "//": "Makeshift or otherwise poor quality pistols.", "items": [ { "item": "ashot", "prob": 100 }, - { "item": "surv_hand_cannon", "prob": 100, "charges-min": 1, "charges-max": 5 }, - { "item": "surv_six_shooter", "prob": 100, "charges-min": 1, "charges-max": 6 } + { "item": "surv_hand_cannon", "prob": 100, "charges-min": 0, "charges-max": 5 }, + { "item": "surv_six_shooter", "prob": 100, "charges-min": 0, "charges-max": 6 } ] }, { @@ -87,10 +87,10 @@ "id": "guns_smg_common", "//": "SMGs commonly owned by citizens and found in many locations.", "items": [ - { "item": "tommygun", "prob": 70, "charges-min": 1, "charges-max": 20 }, - { "item": "briefcase_smg", "prob": 20, "charges-min": 1, "charges-max": 32 }, - { "item": "sten", "prob": 100, "charges-min": 1, "charges-max": 32 }, - { "item": "uzi", "prob": 100, "charges-min": 1, "charges-max": 32 } + { "item": "tommygun", "prob": 70, "charges-min": 0, "charges-max": 20 }, + { "item": "briefcase_smg", "prob": 20, "charges-min": 0, "charges-max": 32 }, + { "item": "sten", "prob": 100, "charges-min": 0, "charges-max": 32 }, + { "item": "uzi", "prob": 100, "charges-min": 0, "charges-max": 32 } ] }, { @@ -98,16 +98,16 @@ "id": "guns_smg_rare", "//": "Less common SMGs including those only used by police/paramilitary forces.", "items": [ - { "item": "calico", "prob": 30, "charges-min": 1, "charges-max": 50 }, - { "item": "fn_p90", "prob": 50, "charges-min": 1, "charges-max": 50 }, - { "item": "hk_mp5", "prob": 100, "charges-min": 1, "charges-max": 30 }, - { "item": "hk_ump45", "prob": 30, "charges-min": 1, "charges-max": 25 }, - { "item": "mac_10", "prob": 40, "charges-min": 1, "charges-max": 30 }, - { "item": "mac_11", "prob": 20, "charges-min": 1, "charges-max": 32 }, - { "item": "rm360_carbine", "prob": 30, "charges-min": 1, "charges-max": 100 }, - { "item": "TDI", "prob": 10, "charges-min": 1, "charges-max": 30 }, - { "item": "american_180", "prob": 50, "charges-min": 1, "charges-max": 100 }, - { "item": "tec9", "prob": 50, "charges-min": 1, "charges-max": 32 } + { "item": "calico", "prob": 30, "charges-min": 0, "charges-max": 50 }, + { "item": "fn_p90", "prob": 50, "charges-min": 0, "charges-max": 50 }, + { "item": "hk_mp5", "prob": 100, "charges-min": 0, "charges-max": 30 }, + { "item": "hk_ump45", "prob": 30, "charges-min": 0, "charges-max": 25 }, + { "item": "mac_10", "prob": 40, "charges-min": 0, "charges-max": 30 }, + { "item": "mac_11", "prob": 20, "charges-min": 0, "charges-max": 32 }, + { "item": "rm360_carbine", "prob": 30, "charges-min": 0, "charges-max": 100 }, + { "item": "TDI", "prob": 10, "charges-min": 0, "charges-max": 30 }, + { "item": "american_180", "prob": 50, "charges-min": 0, "charges-max": 100 }, + { "item": "tec9", "prob": 50, "charges-min": 0, "charges-max": 32 } ] }, { @@ -115,10 +115,10 @@ "id": "guns_smg_milspec", "//": "Military specification SMGs only ever found at military sites.", "items": [ - { "item": "hk_mp7", "prob": 100, "charges-min": 1, "charges-max": 20 }, - { "item": "needlegun", "prob": 30, "charges-min": 1, "charges-max": 50 }, - { "item": "rm2000_smg", "prob": 50, "charges-min": 1, "charges-max": 10 }, - { "item": "hk_mp5sd", "prob": 75, "charges-min": 1, "charges-max": 30 } + { "item": "hk_mp7", "prob": 100, "charges-min": 0, "charges-max": 20 }, + { "item": "needlegun", "prob": 30, "charges-min": 0, "charges-max": 50 }, + { "item": "rm2000_smg", "prob": 50, "charges-min": 0, "charges-max": 10 }, + { "item": "hk_mp5sd", "prob": 75, "charges-min": 0, "charges-max": 30 } ] }, { @@ -126,9 +126,9 @@ "id": "guns_smg_obscure", "//": "Imported or otherwise very obscure SMGs.", "items": [ - { "item": "ppsh", "prob": 150, "charges-min": 1, "charges-max": 35 }, - { "item": "skorpion_61", "prob": 100, "charges-min": 1, "charges-max": 20 }, - { "item": "skorpion_82", "prob": 100, "charges-min": 1, "charges-max": 20 } + { "item": "ppsh", "prob": 150, "charges-min": 0, "charges-max": 35 }, + { "item": "skorpion_61", "prob": 100, "charges-min": 0, "charges-max": 20 }, + { "item": "skorpion_82", "prob": 100, "charges-min": 0, "charges-max": 20 } ] }, { @@ -142,19 +142,19 @@ "id": "guns_rifle_common", "//": "Rifles commonly owned by citizens and found in many locations.", "items": [ - { "item": "browning_blr", "prob": 25, "charges-min": 1, "charges-max": 4 }, - { "item": "garand", "prob": 65, "charges-min": 1, "charges-max": 8 }, - { "item": "ar15", "prob": 30, "charges-min": 1, "charges-max": 30 }, - { "item": "cx4", "prob": 45, "charges-min": 1, "charges-max": 15 }, - { "item": "ksub2000", "prob": 30, "charges-min": 1, "charges-max": 15 }, - { "item": "m1a", "prob": 50, "charges-min": 1, "charges-max": 5 }, - { "item": "marlin_9a", "prob": 80, "charges-min": 1, "charges-max": 19 }, - { "item": "mosin44", "prob": 15, "charges-min": 1, "charges-max": 5 }, - { "item": "mosin91_30", "prob": 25, "charges-min": 1, "charges-max": 5 }, - { "item": "ruger_1022", "prob": 70, "charges-min": 1, "charges-max": 10 }, - { "item": "ruger_mini", "prob": 60, "charges-min": 1, "charges-max": 5 }, - { "item": "sks", "prob": 40, "charges-min": 1, "charges-max": 10 }, - { "item": "win70", "prob": 15, "charges-min": 1, "charges-max": 3 } + { "item": "browning_blr", "prob": 25, "charges-min": 0, "charges-max": 4 }, + { "item": "garand", "prob": 65, "charges-min": 0, "charges-max": 8 }, + { "item": "ar15", "prob": 30, "charges-min": 0, "charges-max": 30 }, + { "item": "cx4", "prob": 45, "charges-min": 0, "charges-max": 15 }, + { "item": "ksub2000", "prob": 30, "charges-min": 0, "charges-max": 15 }, + { "item": "m1a", "prob": 50, "charges-min": 0, "charges-max": 5 }, + { "item": "marlin_9a", "prob": 80, "charges-min": 0, "charges-max": 19 }, + { "item": "mosin44", "prob": 15, "charges-min": 0, "charges-max": 5 }, + { "item": "mosin91_30", "prob": 25, "charges-min": 0, "charges-max": 5 }, + { "item": "ruger_1022", "prob": 70, "charges-min": 0, "charges-max": 10 }, + { "item": "ruger_mini", "prob": 60, "charges-min": 0, "charges-max": 5 }, + { "item": "sks", "prob": 40, "charges-min": 0, "charges-max": 10 }, + { "item": "win70", "prob": 15, "charges-min": 0, "charges-max": 3 } ] }, { @@ -162,25 +162,25 @@ "id": "guns_rifle_rare", "//": "Less common rifles including those only used by police/paramilitary forces.", "items": [ - { "item": "acr", "prob": 25, "charges-min": 1, "charges-max": 30 }, - { "item": "fn_fal", "prob": 40, "charges-min": 1, "charges-max": 20 }, - { "item": "hk_g3", "prob": 40, "charges-min": 1, "charges-max": 20 }, - { "item": "hk_g36", "prob": 30, "charges-min": 1, "charges-max": 30 }, - { "item": "henry_big_boy", "prob": 10, "charges-min": 1, "charges-max": 10 }, - { "item": "l_base_223", "prob": 40, "charges-min": 1, "charges-max": 32 }, - { "item": "l_car_223", "prob": 10, "charges-min": 1, "charges-max": 32 }, - { "item": "l_dsr_223", "prob": 5, "charges-min": 1, "charges-max": 32 }, - { "item": "l_long_45", "prob": 30, "charges-min": 1, "charges-max": 12 }, - { "item": "m14ebr", "prob": 15, "charges-min": 1, "charges-max": 20 }, - { "item": "M24", "prob": 15, "charges-min": 1, "charges-max": 20 }, - { "item": "m4a1", "prob": 45, "charges-min": 1, "charges-max": 30 }, - { "item": "m1903", "prob": 15, "charges-min": 1, "charges-max": 5 }, - { "item": "m1918", "prob": 30, "charges-min": 1, "charges-max": 20 }, - { "item": "mosin44_ebr", "prob": 10, "charges-min": 1, "charges-max": 5 }, - { "item": "mosin91_30_ebr", "prob": 20, "charges-min": 1, "charges-max": 5 }, - { "item": "remington_700", "prob": 20, "charges-min": 1, "charges-max": 4 }, - { "item": "savage_111f", "prob": 15, "charges-min": 1, "charges-max": 3 }, - { "item": "weatherby_5", "prob": 15, "charges-min": 1, "charges-max": 3 } + { "item": "acr", "prob": 25, "charges-min": 0, "charges-max": 30 }, + { "item": "fn_fal", "prob": 40, "charges-min": 0, "charges-max": 20 }, + { "item": "hk_g3", "prob": 40, "charges-min": 0, "charges-max": 20 }, + { "item": "hk_g36", "prob": 30, "charges-min": 0, "charges-max": 30 }, + { "item": "henry_big_boy", "prob": 10, "charges-min": 0, "charges-max": 10 }, + { "item": "l_base_223", "prob": 40, "charges-min": 0, "charges-max": 32 }, + { "item": "l_car_223", "prob": 10, "charges-min": 0, "charges-max": 32 }, + { "item": "l_dsr_223", "prob": 5, "charges-min": 0, "charges-max": 32 }, + { "item": "l_long_45", "prob": 30, "charges-min": 0, "charges-max": 12 }, + { "item": "m14ebr", "prob": 15, "charges-min": 0, "charges-max": 20 }, + { "item": "M24", "prob": 15, "charges-min": 0, "charges-max": 20 }, + { "item": "m4a1", "prob": 45, "charges-min": 0, "charges-max": 30 }, + { "item": "m1903", "prob": 15, "charges-min": 0, "charges-max": 5 }, + { "item": "m1918", "prob": 30, "charges-min": 0, "charges-max": 20 }, + { "item": "mosin44_ebr", "prob": 10, "charges-min": 0, "charges-max": 5 }, + { "item": "mosin91_30_ebr", "prob": 20, "charges-min": 0, "charges-max": 5 }, + { "item": "remington_700", "prob": 20, "charges-min": 0, "charges-max": 4 }, + { "item": "savage_111f", "prob": 15, "charges-min": 0, "charges-max": 3 }, + { "item": "weatherby_5", "prob": 15, "charges-min": 0, "charges-max": 3 } ] }, { @@ -188,25 +188,25 @@ "id": "guns_rifle_milspec", "//": "Military specification rifles only ever found at military sites.", "items": [ - { "item": "h&k416a5", "prob": 50, "charges-min": 1, "charges-max": 30 }, - { "item": "l_lmg_223", "prob": 30, "charges-min": 1, "charges-max": 32 }, - { "item": "l_mbr_223", "prob": 100, "charges-min": 1, "charges-max": 32 }, - { "item": "m107a1", "prob": 30, "charges-min": 1, "charges-max": 10 }, - { "item": "m134", "prob": 10, "charges-min": 1, "charges-max": 100 }, - { "item": "m14ebr", "prob": 10, "charges-min": 1, "charges-max": 20 }, - { "item": "m2010", "prob": 20, "charges-min": 1, "charges-max": 5 }, - { "item": "m240", "prob": 15, "charges-min": 1, "charges-max": 100 }, - { "item": "m249", "prob": 25, "charges-min": 1, "charges-max": 10 }, - { "item": "m27iar", "prob": 50, "charges-min": 1, "charges-max": 30 }, - { "item": "m60", "prob": 15, "charges-min": 1, "charges-max": 100 }, - { "item": "rm11b_sniper_rifle", "prob": 15, "charges-min": 1, "charges-max": 10 }, - { "item": "rm298", "prob": 10, "charges-min": 1, "charges-max": 100 }, - { "item": "rm51_assault_rifle", "prob": 25, "charges-min": 1, "charges-max": 50 }, - { "item": "rm614_lmg", "prob": 10, "charges-min": 1, "charges-max": 100 }, - { "item": "rm88_battle_rifle", "prob": 25, "charges-min": 1, "charges-max": 50 }, - { "item": "sig552", "prob": 100, "charges-min": 1, "charges-max": 30 }, - { "item": "scar_l", "prob": 50, "charges-min": 1, "charges-max": 30 }, - { "item": "scar_h", "prob": 50, "charges-min": 1, "charges-max": 20 } + { "item": "h&k416a5", "prob": 50, "charges-min": 0, "charges-max": 30 }, + { "item": "l_lmg_223", "prob": 30, "charges-min": 0, "charges-max": 32 }, + { "item": "l_mbr_223", "prob": 100, "charges-min": 0, "charges-max": 32 }, + { "item": "m107a1", "prob": 30, "charges-min": 0, "charges-max": 10 }, + { "item": "m134", "prob": 10, "charges-min": 0, "charges-max": 100 }, + { "item": "m14ebr", "prob": 10, "charges-min": 0, "charges-max": 20 }, + { "item": "m2010", "prob": 20, "charges-min": 0, "charges-max": 5 }, + { "item": "m240", "prob": 15, "charges-min": 0, "charges-max": 100 }, + { "item": "m249", "prob": 25, "charges-min": 0, "charges-max": 10 }, + { "item": "m27iar", "prob": 50, "charges-min": 0, "charges-max": 30 }, + { "item": "m60", "prob": 15, "charges-min": 0, "charges-max": 100 }, + { "item": "rm11b_sniper_rifle", "prob": 15, "charges-min": 0, "charges-max": 10 }, + { "item": "rm298", "prob": 10, "charges-min": 0, "charges-max": 100 }, + { "item": "rm51_assault_rifle", "prob": 25, "charges-min": 0, "charges-max": 50 }, + { "item": "rm614_lmg", "prob": 10, "charges-min": 0, "charges-max": 100 }, + { "item": "rm88_battle_rifle", "prob": 25, "charges-min": 0, "charges-max": 50 }, + { "item": "sig552", "prob": 100, "charges-min": 0, "charges-max": 30 }, + { "item": "scar_l", "prob": 50, "charges-min": 0, "charges-max": 30 }, + { "item": "scar_h", "prob": 50, "charges-min": 0, "charges-max": 20 } ] }, { @@ -225,15 +225,15 @@ "id": "guns_rifle_obscure", "//": "Imported or otherwise very obscure rifles.", "items": [ - { "item": "ak47", "prob": 100, "charges-min": 1, "charges-max": 30 }, - { "item": "ak74", "prob": 60, "charges-min": 1, "charges-max": 30 }, - { "item": "an94", "prob": 40, "charges-min": 1, "charges-max": 30 }, - { "item": "bh_m89", "prob": 20, "charges-min": 1, "charges-max": 7 }, + { "item": "ak47", "prob": 100, "charges-min": 0, "charges-max": 30 }, + { "item": "ak74", "prob": 60, "charges-min": 0, "charges-max": 30 }, + { "item": "an94", "prob": 40, "charges-min": 0, "charges-max": 30 }, + { "item": "bh_m89", "prob": 20, "charges-min": 0, "charges-max": 7 }, { "item": "carbine_flintlock", "prob": 140 }, { "item": "rifle_flintlock", "prob": 180 }, - { "item": "steyr_aug", "prob": 40, "charges-min": 1, "charges-max": 30 }, + { "item": "steyr_aug", "prob": 40, "charges-min": 0, "charges-max": 30 }, { "item": "trex_gun", "prob": 60 }, - { "item": "arx160", "prob": 40, "charges-min": 1, "charges-max": 30 } + { "item": "arx160", "prob": 40, "charges-min": 0, "charges-max": 30 } ] }, { @@ -244,7 +244,7 @@ { "item": "rifle_22", "prob": 60 }, { "item": "rifle_3006", "prob": 30 }, { "item": "rifle_9mm", "prob": 60 }, - { "item": "surv_carbine_223", "prob": 120, "charges-min": 1, "charges-max": 5 } + { "item": "surv_carbine_223", "prob": 120, "charges-min": 0, "charges-max": 5 } ] }, { @@ -252,9 +252,9 @@ "id": "guns_shotgun_common", "//": "Shotguns commonly owned by citizens and found in many locations.", "items": [ - { "item": "mossberg_500", "prob": 50, "charges-min": 1, "charges-max": 8 }, - { "item": "remington_870", "prob": 100, "charges-min": 1, "charges-max": 6 }, - { "item": "shotgun_d", "prob": 30, "charges-min": 1, "charges-max": 2 }, + { "item": "mossberg_500", "prob": 50, "charges-min": 0, "charges-max": 8 }, + { "item": "remington_870", "prob": 100, "charges-min": 0, "charges-max": 6 }, + { "item": "shotgun_d", "prob": 30, "charges-min": 0, "charges-max": 2 }, { "item": "shotgun_s", "prob": 30 } ] }, @@ -263,11 +263,11 @@ "id": "guns_shotgun_rare", "//": "Less common shotguns including those only used by police/paramilitary forces.", "items": [ - { "item": "ksg", "prob": 50, "charges-min": 1, "charges-max": 7 }, - { "item": "m1014", "prob": 80, "charges-min": 1, "charges-max": 8 }, - { "item": "rm120c", "prob": 30, "charges-min": 1, "charges-max": 5 }, - { "item": "rm228", "prob": 30, "charges-min": 1, "charges-max": 10 }, - { "item": "saiga_12", "prob": 50, "charges-min": 1, "charges-max": 10 } + { "item": "ksg", "prob": 50, "charges-min": 0, "charges-max": 7 }, + { "item": "m1014", "prob": 80, "charges-min": 0, "charges-max": 8 }, + { "item": "rm120c", "prob": 30, "charges-min": 0, "charges-max": 5 }, + { "item": "rm228", "prob": 30, "charges-min": 0, "charges-max": 10 }, + { "item": "saiga_12", "prob": 50, "charges-min": 0, "charges-max": 10 } ] }, { @@ -275,8 +275,8 @@ "id": "guns_shotgun_milspec", "//": "Military specification shotguns only ever found at military sites.", "items": [ - { "item": "l_def_12", "prob": 100, "charges-min": 1, "charges-max": 8 }, - { "item": "rm20", "prob": 20, "charges-min": 1, "charges-max": 20 } + { "item": "l_def_12", "prob": 100, "charges-min": 0, "charges-max": 8 }, + { "item": "rm20", "prob": 20, "charges-min": 0, "charges-max": 20 } ] }, { @@ -291,11 +291,11 @@ "//": "Makeshift or otherwise poor quality shotguns.", "items": [ { "item": "blunderbuss", "prob": 70 }, - { "item": "bigun", "prob": 10, "charges-min": 1, "charges-max": 6 }, - { "item": "pipe_double_shotgun", "prob": 70, "charges-min": 1, "charges-max": 2 }, + { "item": "bigun", "prob": 10, "charges-min": 0, "charges-max": 6 }, + { "item": "pipe_double_shotgun", "prob": 70, "charges-min": 0, "charges-max": 2 }, { "item": "pipe_shotgun", "prob": 100 }, - { "item": "revolver_shotgun", "prob": 30, "charges-min": 1, "charges-max": 6 }, - { "item": "surv_levershotgun", "prob": 40, "charges-min": 1, "charges-max": 8 } + { "item": "revolver_shotgun", "prob": 30, "charges-min": 0, "charges-max": 6 }, + { "item": "surv_levershotgun", "prob": 40, "charges-min": 0, "charges-max": 8 } ] }, { @@ -314,9 +314,9 @@ "items": [ { "item": "m320", "prob": 75 }, { "item": "m79", "prob": 100 }, - { "item": "mark19", "prob": 10, "charges-min": 1, "charges-max": 10 }, - { "item": "mgl", "prob": 25, "charges-min": 1, "charges-max": 6 }, - { "item": "rm802", "prob": 15, "charges-min": 1, "charges-max": 4 } + { "item": "mark19", "prob": 10, "charges-min": 0, "charges-max": 10 }, + { "item": "mgl", "prob": 25, "charges-min": 0, "charges-max": 6 }, + { "item": "rm802", "prob": 15, "charges-min": 0, "charges-max": 4 } ] }, { @@ -411,25 +411,25 @@ "id": "guns_cop", "//": "Police issue weapons of all types", "items": [ - { "item": "ar15", "prob": 15, "charges-min": 1, "charges-max": 30 }, - { "item": "cx4", "prob": 20, "charges-min": 1, "charges-max": 15 }, - { "item": "fn57", "prob": 20, "charges-min": 1, "charges-max": 20 }, - { "item": "fn_p90", "prob": 5, "charges-min": 1, "charges-max": 50 }, - { "item": "glock_19", "prob": 15, "charges-min": 1, "charges-max": 15 }, - { "item": "glock_22", "prob": 20, "charges-min": 1, "charges-max": 15 }, - { "item": "hk_mp5", "prob": 10, "charges-min": 1, "charges-max": 30 }, - { "item": "l_enforcer_45", "prob": 10, "charges-min": 1, "charges-max": 6 }, - { "item": "m9", "prob": 5, "charges-min": 1, "charges-max": 15 }, - { "item": "mossberg_500", "prob": 15, "charges-min": 1, "charges-max": 8 }, - { "item": "remington_700", "prob": 5, "charges-min": 1, "charges-max": 4 }, - { "item": "remington_870", "prob": 20, "charges-min": 1, "charges-max": 6 }, - { "item": "sig_40", "prob": 20, "charges-min": 1, "charges-max": 12 }, - { "item": "usp_45", "prob": 10, "charges-min": 1, "charges-max": 12 }, - { "item": "usp_9mm", "prob": 10, "charges-min": 1, "charges-max": 15 }, - { "item": "kp32", "prob": 1, "charges-min": 1, "charges-max": 7 }, - { "item": "kp3at", "prob": 2, "charges-min": 1, "charges-max": 6 }, - { "item": "rugerlcp", "prob": 2, "charges-min": 1, "charges-max": 6 }, - { "item": "kpf9", "prob": 3, "charges-min": 1, "charges-max": 7 } + { "item": "ar15", "prob": 15, "charges-min": 0, "charges-max": 30 }, + { "item": "cx4", "prob": 20, "charges-min": 0, "charges-max": 15 }, + { "item": "fn57", "prob": 20, "charges-min": 0, "charges-max": 20 }, + { "item": "fn_p90", "prob": 5, "charges-min": 0, "charges-max": 50 }, + { "item": "glock_19", "prob": 15, "charges-min": 0, "charges-max": 15 }, + { "item": "glock_22", "prob": 20, "charges-min": 0, "charges-max": 15 }, + { "item": "hk_mp5", "prob": 10, "charges-min": 0, "charges-max": 30 }, + { "item": "l_enforcer_45", "prob": 10, "charges-min": 0, "charges-max": 6 }, + { "item": "m9", "prob": 5, "charges-min": 0, "charges-max": 15 }, + { "item": "mossberg_500", "prob": 15, "charges-min": 0, "charges-max": 8 }, + { "item": "remington_700", "prob": 5, "charges-min": 0, "charges-max": 4 }, + { "item": "remington_870", "prob": 20, "charges-min": 0, "charges-max": 6 }, + { "item": "sig_40", "prob": 20, "charges-min": 0, "charges-max": 12 }, + { "item": "usp_45", "prob": 10, "charges-min": 0, "charges-max": 12 }, + { "item": "usp_9mm", "prob": 10, "charges-min": 0, "charges-max": 15 }, + { "item": "kp32", "prob": 1, "charges-min": 0, "charges-max": 7 }, + { "item": "kp3at", "prob": 2, "charges-min": 0, "charges-max": 6 }, + { "item": "rugerlcp", "prob": 2, "charges-min": 0, "charges-max": 6 }, + { "item": "kpf9", "prob": 3, "charges-min": 0, "charges-max": 7 } ] }, { @@ -438,9 +438,9 @@ "//": "Guns issued to paramilitary forces in addition to standard police issue.", "items": [ { "group": "guns_cop", "prob": 100 }, - { "item": "hk_ump45", "prob": 15, "charges-min": 1, "charges-max": 25 }, - { "item": "m1014", "prob": 10, "charges-min": 1, "charges-max": 8 }, - { "item": "m4a1", "prob": 35, "charges-min": 1, "charges-max": 30 } + { "item": "hk_ump45", "prob": 15, "charges-min": 0, "charges-max": 25 }, + { "item": "m1014", "prob": 10, "charges-min": 0, "charges-max": 8 }, + { "item": "m4a1", "prob": 35, "charges-min": 0, "charges-max": 30 } ] }, { @@ -449,14 +449,14 @@ "//": "Guns typically carried by survivors, either improvised or thematically appropriate.", "items": [ { "group": "guns_improvised", "prob": 200 }, - { "item": "ar15", "prob": 5, "charges-min": 1, "charges-max": 30 }, - { "item": "mossberg_500", "prob": 5, "charges-min": 1, "charges-max": 8 }, - { "item": "remington_870", "prob": 5, "charges-min": 1, "charges-max": 6 }, - { "item": "ruger_1022", "prob": 15, "charges-min": 1, "charges-max": 10 }, + { "item": "ar15", "prob": 5, "charges-min": 0, "charges-max": 30 }, + { "item": "mossberg_500", "prob": 5, "charges-min": 0, "charges-max": 8 }, + { "item": "remington_870", "prob": 5, "charges-min": 0, "charges-max": 6 }, + { "item": "ruger_1022", "prob": 15, "charges-min": 0, "charges-max": 10 }, { "item": "shotgun_s", "prob": 10 }, - { "item": "shotgun_d", "prob": 10, "charges-min": 1, "charges-max": 2 }, - { "item": "sten", "prob": 20, "charges-min": 1, "charges-max": 32 }, - { "item": "sks", "prob": 10, "charges-min": 1, "charges-max": 10 } + { "item": "shotgun_d", "prob": 10, "charges-min": 0, "charges-max": 2 }, + { "item": "sten", "prob": 20, "charges-min": 0, "charges-max": 32 }, + { "item": "sks", "prob": 10, "charges-min": 0, "charges-max": 10 } ] } ] From 93a4f191b58672eede5ff6561c4ac390f3c9131e Mon Sep 17 00:00:00 2001 From: Valiant Date: Wed, 8 May 2019 10:55:43 +0400 Subject: [PATCH 3/7] Randomize gas mask charges on zombie soldier loot Also decreased chance to spawn cash card from guaranteed to 10%. --- data/json/monsterdrops/zombie_soldier.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/monsterdrops/zombie_soldier.json b/data/json/monsterdrops/zombie_soldier.json index 882cb34a2a996..ad708b90a70ab 100644 --- a/data/json/monsterdrops/zombie_soldier.json +++ b/data/json/monsterdrops/zombie_soldier.json @@ -37,7 +37,7 @@ "distribution": [ { "item": "LAW_Packed", "prob": 20 }, { "item": "e_tool", "prob": 100 }, - { "item": "mask_gas", "prob": 100, "damage-min": 1, "damage-max": 4 }, + { "item": "mask_gas", "prob": 100, "charges-min": 1, "charges-max": 100, "damage-min": 1, "damage-max": 4 }, { "item": "two_way_radio", "prob": 50 }, { "item": "c4", "prob": 10 } ], @@ -47,7 +47,7 @@ { "group": "drugs_soldier", "prob": 20 }, { "group": "mil_food", "prob": 15 }, { "item": "id_military", "prob": 5 }, - { "item": "cash_card", "charges-min": 0, "charges-max": 50000 }, + { "item": "cash_card", "prob": 10, "charges-min": 0, "charges-max": 50000 }, { "group": "misc_smoking", "prob": 30 } ] }, From fe0cd655e3966aaf24835d4534119463e75fabf6 Mon Sep 17 00:00:00 2001 From: Valiant Date: Wed, 8 May 2019 10:56:42 +0400 Subject: [PATCH 4/7] Randomized amount rolling tobacco, rolling paper and matches on spawn --- data/json/itemgroups/misc.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json index 1fecd8caec7f5..4a17b6e2e8062 100644 --- a/data/json/itemgroups/misc.json +++ b/data/json/itemgroups/misc.json @@ -10,8 +10,10 @@ { "item": "cig", "prob": 70, "charges": [ 1, 10 ] }, { "collection": [ - { "item": "tobacco" }, - { "distribution": [ { "item": "rolling_paper", "prob": 70 }, { "item": "pipe_tobacco", "prob": 30 } ] } + { "item": "tobacco", "charges-min": 1, "charges-max": 20 }, + { + "distribution": [ { "item": "rolling_paper", "prob": 70, "charges-min": 1, "charges-max": 30 }, { "item": "pipe_tobacco", "prob": 30 } ] + } ], "prob": 20 }, @@ -19,7 +21,7 @@ { "item": "joint", "prob": 5 } ] }, - { "distribution": [ { "item": "lighter" }, { "item": "matches" } ] } + { "distribution": [ { "item": "lighter" }, { "item": "matches", "charges-min": 1, "charges-max": 20 } ] } ] }, { From 0825c067fe350c534db3a1ca290fd6216ed8710e Mon Sep 17 00:00:00 2001 From: Valiant Date: Wed, 8 May 2019 10:57:57 +0400 Subject: [PATCH 5/7] Decreased chance to spawn cash card on zombie military pilot loot from guaranteed to 10% --- data/json/monsterdrops/zombie_military_pilot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsterdrops/zombie_military_pilot.json b/data/json/monsterdrops/zombie_military_pilot.json index a7c6ac57067b1..0df7e4cd0a742 100644 --- a/data/json/monsterdrops/zombie_military_pilot.json +++ b/data/json/monsterdrops/zombie_military_pilot.json @@ -11,7 +11,7 @@ { "item": "two_way_radio", "prob": 50, "damage-min": 1, "damage-max": 4 }, { "item": "adderall", "prob": 40 }, { "item": "id_military", "prob": 5 }, - { "item": "cash_card", "charges-min": 0, "charges-max": 50000 }, + { "item": "cash_card", "prob": 10, "charges-min": 0, "charges-max": 50000 }, { "group": "mil_food", "prob": 15 }, { "group": "misc_smoking", "prob": 30 } ] From 01e65205b3f1ee435f61b0d09e0949796ab5ad61 Mon Sep 17 00:00:00 2001 From: Valiant Date: Wed, 8 May 2019 11:01:41 +0400 Subject: [PATCH 6/7] Decreased chance to spawn cash card on zombie pilot and zombie soldier remains from guaranteed to 10% --- data/json/corpses.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/corpses.json b/data/json/corpses.json index 188b8e4930e13..3aab1f770f003 100644 --- a/data/json/corpses.json +++ b/data/json/corpses.json @@ -13,7 +13,7 @@ { "item": "adderall", "prob": 40 }, { "item": "id_military", "prob": 5 }, { "item": "militarymap", "prob": 5 }, - { "item": "cash_card", "charges-min": 0, "charges-max": 50000 }, + { "item": "cash_card", "prob": 10, "charges-min": 0, "charges-max": 50000 }, { "group": "mil_food", "prob": 15 }, { "item": "bone_human", "count": [ 5, 8 ], "prob": 100 }, { "item": "human_flesh", "count": [ 5, 8 ], "prob": 100 }, @@ -62,7 +62,7 @@ { "item": "two_way_radio", "prob": 50 }, { "item": "grenade", "prob": 5 }, { "item": "id_military", "prob": 5 }, - { "item": "cash_card", "charges-min": 0, "charges-max": 50000 }, + { "item": "cash_card", "prob": 10, "charges-min": 0, "charges-max": 50000 }, { "group": "misc_smoking", "prob": 30 } ] }, From 04e624536a0f4b8f56eab46770f85f7adad37c40 Mon Sep 17 00:00:00 2001 From: Valiant Date: Wed, 8 May 2019 11:15:35 +0400 Subject: [PATCH 7/7] Update guns.json --- data/json/itemgroups/guns.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index 4821984f96c3e..83493d0368675 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -347,7 +347,10 @@ "type": "item_group", "id": "guns_launcher_improvised", "//": "Makeshift or otherwise poor quality grenade and rocket launchers", - "items": [ { "item": "launcher_simple", "prob": 100 }, { "item": "triple_launcher_simple", "prob": 15 } ] + "items": [ + { "item": "launcher_simple", "prob": 100 }, + { "item": "triple_launcher_simple", "prob": 15, "charges-min": 0, "charges-max": 3 } + ] }, { "type": "item_group",