Skip to content

Commit

Permalink
Prune a few military related itemgroups (#78860)
Browse files Browse the repository at this point in the history
  • Loading branch information
Holli-Git authored Jan 1, 2025
1 parent 19c0aa2 commit 23c17a7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 34 deletions.
6 changes: 1 addition & 5 deletions data/json/itemgroups/Weapons_Mods_Ammo/guns.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@
{ "group": "nested_m17", "prob": 100 },
{ "group": "nested_m18", "prob": 100 },
{ "group": "nested_usp_45_mk23", "prob": 5 },
{ "group": "nested_m1911_MEU", "prob": 5 },
{ "group": "nested_rm103a_pistol", "prob": 1 }
{ "group": "nested_m1911_MEU", "prob": 5 }
]
},
{
Expand Down Expand Up @@ -164,7 +163,6 @@
"//": "Military specification SMGs only ever found at military sites.",
"items": [
{ "group": "nested_hk_mp7", "prob": 5 },
{ "group": "nested_rm2000_smg", "prob": 1 },
{ "group": "nested_hk_mp5", "prob": 100 },
{ "group": "nested_hk_mp5k", "prob": 10 },
{ "group": "nested_hk_mp5sd", "prob": 5 }
Expand Down Expand Up @@ -322,8 +320,6 @@
{ "group": "nested_m249", "prob": 25 },
{ "group": "nested_m27iar", "prob": 50 },
{ "group": "nested_m60", "prob": 15 },
{ "group": "nested_rm11b_sniper_rifle", "prob": 1 },
{ "group": "nested_rm51_assault_rifle", "prob": 1 },
{ "group": "nested_scar_l", "prob": 50 },
{ "group": "nested_scar_h", "prob": 50 },
{ "group": "nested_m110a1", "prob": 50 },
Expand Down
29 changes: 0 additions & 29 deletions data/json/itemgroups/military.json
Original file line number Diff line number Diff line change
Expand Up @@ -588,8 +588,6 @@
{ "item": "small_repairkit", "prob": 10 },
{ "item": "50_incendiary", "prob": 2 },
{ "item": "water_clean", "prob": 90 },
{ "item": "knuckle_brass", "prob": 10 },
{ "item": "knuckle_steel_forged", "prob": 5 },
{ "item": "battery_ups", "prob": 10 },
{ "item": "bandages", "prob": 30, "count": [ 1, 3 ] },
{ "group": "adhesive_bandages_box_used", "prob": 20 },
Expand All @@ -600,7 +598,6 @@
{ "item": "adrenaline_injector", "prob": 4 },
{ "group": "tobacco_products", "prob": 146 },
{ "group": "infantry_knives", "prob": 14 },
{ "item": "kukri", "prob": 2 },
{ "item": "throwing_knife", "prob": 7 },
{ "item": "boots_steel", "prob": 50 },
{ "item": "sneakers_steel", "prob": 35 },
Expand All @@ -622,7 +619,6 @@
{ "item": "mess_kit", "prob": 9 },
{ "item": "tent_kit", "prob": 10 },
{ "item": "large_tent_kit", "prob": 10 },
{ "item": "pistol_bayonet", "prob": 4 },
{ "item": "9mm", "prob": 8 },
{ "item": "9mmfmj", "prob": 4 },
{ "item": "45_acp", "prob": 7 },
Expand Down Expand Up @@ -655,14 +651,12 @@
{ "item": "m240", "prob": 1 },
{ "item": "modular_m27_assault_rifle", "variant": "modular_m27iar", "prob": 1 },
{ "item": "modular_m27_assault_rifle", "variant": "modular_m38dmr", "contents-group": "m38dmr_mods", "prob": 1 },
{ "item": "plasma_gun", "prob": 1 },
{ "item": "m320", "prob": 5 },
{ "item": "m320_mod", "prob": 10 },
{ "item": "ugl_buttstock", "prob": 10 },
{ "item": "mgl", "prob": 6 },
{ "item": "suppressor", "prob": 15 },
{ "item": "shot_suppressor", "prob": 1 },
{ "item": "brass_catcher", "prob": 15 },
{ "item": "lighter", "prob": 60, "charges": [ 0, 100 ] },
{ "item": "small_lighter", "prob": 5, "charges": [ 0, 50 ] },
{ "item": "ref_lighter", "prob": 5, "charges": [ 0, 50 ] },
Expand All @@ -675,13 +669,11 @@
{ "item": "EMPbomb", "prob": 2 },
{ "item": "gasbomb", "prob": 3 },
{ "item": "smokebomb", "prob": 5 },
{ "item": "tazer", "prob": 3, "charges": [ 0, 500 ] },
{ "item": "c4", "prob": 5 },
{ "item": "flamethrower", "prob": 1 },
{ "item": "binoculars", "prob": 20 },
{ "item": "masterkey", "prob": 2 },
{ "item": "m26_mass", "prob": 3 },
{ "item": "shot_flechette", "prob": 5 },
{ "item": "canteen", "prob": 15 },
{ "item": "2lcanteen", "prob": 10 },
{ "item": "camelbak", "prob": 5 },
Expand All @@ -698,12 +690,6 @@
{ "item": "atgm_heat", "prob": 1 },
{ "item": "m202_flash", "prob": 2 },
{ "item": "m74_clip", "prob": 3 },
{ "item": "rm51_assault_rifle", "prob": 1 },
{ "item": "rm2000_smg", "prob": 1 },
{ "item": "8mm_jhp", "prob": 2 },
{ "item": "8mm_caseless", "prob": 2 },
{ "item": "laser_rifle", "prob": 1 },
{ "item": "rm103a_pistol", "prob": 1 },
{ "item": "laser_sight", "prob": 15 },
{ "item": "rail_laser_sight", "prob": 10 },
{ "item": "tac_helmet", "prob": 10 },
Expand Down Expand Up @@ -735,20 +721,13 @@
{ "item": "throwing_knife", "count": [ 1, 6 ], "entry-wrapper": "leg_sheath6", "prob": 1 },
{ "group": "tools_toolbox", "prob": 1 },
{ "item": "survnote", "prob": 1 },
{ "item": "rm11b_sniper_rifle", "prob": 1 },
{ "item": "shoulder_strap", "prob": 16 },
{ "item": "shoulder_strap_simple", "prob": 4 },
{ "item": "single_sling", "prob": 16 },
{ "item": "bot_manhack", "prob": 1 },
{ "item": "bot_grenade_hack", "prob": 1 },
{ "item": "chem_hexamine", "prob": 5 },
{ "item": "esbit_stove", "prob": 8 },
{ "item": "beam_scatterer", "prob": 1 },
{ "item": "focusing_lens", "prob": 1 },
{ "item": "electrolaser_conversion", "prob": 1 },
{ "item": "effective_emitter", "prob": 1 },
{ "item": "high_density_capacitor", "prob": 1 },
{ "item": "emp_gun", "prob": 1 },
{ "item": "bt_apc9k", "prob": 1 },
{ "item": "kevlar_nape_protector", "prob": 5 },
{ "item": "counterweight_pouch", "prob": 5 }
Expand Down Expand Up @@ -850,8 +829,6 @@
{ "prob": 20, "group": "pur_tablets_bottle_plastic_small_1_50" },
{ "prob": 5, "group": "fungicide_bag_plastic_400" },
{ "group": "insecticide_bag_plastic", "prob": 5 },
{ "item": "rx12_injector", "prob": 8, "charges": [ 0, 2 ] },
{ "item": "rx11_stimpack", "prob": 8, "charges": [ 0, 5 ] },
{ "item": "oxygen_tank", "prob": 10, "charges": [ 0, 24 ] },
{ "item": "smoxygen_tank", "prob": 20, "charges": [ 0, 12 ] },
{ "prob": 15, "group": "bfipowder_bottle_plastic_small_1_4" },
Expand Down Expand Up @@ -931,13 +908,11 @@
{ "item": "helmet_army", "prob": 40 },
{ "item": "helmet_liner", "prob": 10 },
{ "group": "ammo_pocket_batteries_full", "prob": 50 },
{ "item": "plut_cell", "prob": 10, "charges": [ 1, 5 ] },
{ "item": "m249", "prob": 1, "charges": [ 0, 30 ] },
{ "item": "m240", "prob": 1, "charges": [ 0, 200 ] },
{ "item": "m134", "prob": 1, "charges": [ 0, 200 ] },
{ "item": "atgm_launcher", "prob": 1 },
{ "item": "atgm_heat", "prob": 3 },
{ "item": "v8_combustion", "prob": 10 },
{ "item": "extinguisher", "prob": 20, "charges": 100 },
{ "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
{ "item": "UPS_OFF", "prob": 8, "charges": [ 0, 1000 ] },
Expand All @@ -947,7 +922,6 @@
{ "item": "rucksack", "prob": 20 },
{ "item": "gobag", "prob": 2 },
{ "group": "full_survival_kit", "prob": 3 },
{ "item": "recipe_raptor", "prob": 2 },
{ "item": "tac_helmet", "prob": 5 },
{ "item": "tac_fullhelmet", "prob": 2 },
{ "item": "cowboy_hat", "prob": 4 },
Expand All @@ -958,12 +932,9 @@
{ "item": "glasses_bal", "prob": 10 },
{ "item": "55gal_drum", "prob": 1 },
{ "item": "30gal_drum", "prob": 2 },
{ "item": "optical_cloak", "prob": 1 },
{ "item": "holo_cloak", "prob": 1, "charges": [ 0, 1000 ] },
{ "item": "grapnel", "prob": 1 },
{ "item": "briefcase", "prob": 5 },
{ "item": "survnote", "prob": 2 },
{ "item": "robot_controls", "prob": 3 },
{ "item": "solarpack", "prob": 1 },
{ "item": "flight_helmet", "prob": 20, "ammo-item": "light_battery_cell", "charges": [ 0, 150 ] },
{ "item": "mil_flight_suit", "prob": 20 }
Expand Down

0 comments on commit 23c17a7

Please sign in to comment.