diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index 77e75dfdb323c..fbd10c48ca763 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -556,27 +556,6 @@ "//": "for ws_regional_dump", "items": [ [ "ash", 100 ] ] }, - { - "id": "library_elec", - "type": "item_group", - "items": [ - [ "superglue", 30 ], - [ "processor", 15 ], - [ "RAM", 22 ], - [ "power_supply", 16 ], - [ "amplifier", 8 ], - [ "transponder", 5 ], - [ "receiver", 10 ], - [ "antenna", 18 ], - [ "screwdriver", 40 ], - { "group": "ammo_pocket_batteries_full", "prob": 50 }, - [ "manual_electronics", 20 ], - [ "memory_card_unread", 20 ], - [ "usb_drive", 5 ], - [ "software_useless", 10 ], - [ "survnote", 1 ] - ] - }, { "id": "fishing_items", "type": "item_group", @@ -1275,23 +1254,6 @@ [ "plunger_futuristic", 5 ] ] }, - { - "type": "item_group", - "id": "mine_storage", - "items": [ - [ "shovel", 10 ], - [ "pickaxe", 2 ], - [ "bucket", 20 ], - [ "rock", 40 ], - [ "rock_large", 10 ], - { "group": "tools_toolbox", "prob": 5 }, - [ "coal_lump", 20 ], - [ "material_shrd_limestone", 40 ], - [ "material_niter", 5 ], - [ "chem_rdx", 5 ], - [ "chem_hmtd", 10 ] - ] - }, { "type": "item_group", "id": "mine_materials", @@ -1410,11 +1372,6 @@ "id": "forest_trail", "items": [ { "group": "forest", "prob": 100 } ] }, - { - "type": "item_group", - "id": "hive_center", - "items": [ [ "honeycomb", 10 ], [ "royal_jelly", 8 ] ] - }, { "type": "item_group", "id": "road", diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json index 92243f4285ce2..c20b047d7c885 100644 --- a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json +++ b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json @@ -33,37 +33,6 @@ "type": "item_group", "items": [ { "group": "candy_chocolate", "prob": 460 }, [ "cookies", 50 ], { "prob": 50, "group": "licorice_bag_plastic_4" } ] }, - { - "id": "tux_shop", - "type": "item_group", - "items": [ - [ "blazer", 75 ], - [ "tie_skinny", 40 ], - [ "tie_necktie", 40 ], - [ "tie_bow", 30 ], - [ "tie_clipon", 20 ], - [ "tieclip", 25 ], - [ "polo_shirt", 35 ], - [ "dress_shirt", 70 ], - [ "pants", 75 ], - [ "dress_shoes", 50 ], - [ "briefcase", 35 ], - [ "gold_watch", 20 ], - [ "pocketwatch", 20 ], - [ "collarpin", 10 ], - { "item": "tailors_kit", "prob": 40, "charges": 400 } - ] - }, - { - "id": "flower_shop", - "type": "item_group", - "items": [ - { "item": "trimmer_off", "prob": 30, "charges": [ 50, 100 ] }, - [ "fertilizer_liquid", 50 ], - [ "dahlia_root", 30 ], - { "group": "fertilizer_commercial_bag_canvas_60", "prob": 25 } - ] - }, { "id": "music_shop", "type": "item_group", @@ -180,23 +149,6 @@ [ "fancy_transition_glasses_eye", 10 ] ] }, - { - "id": "victoria_shop", - "type": "item_group", - "items": [ - [ "bra", 70 ], - [ "panties", 70 ], - [ "boy_shorts", 50 ], - [ "boxer_shorts", 70 ], - [ "briefs", 50 ], - [ "swim_briefs", 15 ], - [ "speedo", 10 ], - [ "bikini_top", 15 ], - [ "bikini_top_short", 5 ], - [ "bikini_bottom", 15 ], - [ "bikini_bottom_short", 5 ] - ] - }, { "id": "knife_shop", "type": "item_group", @@ -271,30 +223,6 @@ [ "tanned_pelt", 20 ] ] }, - { - "id": "key_shop", - "type": "item_group", - "ammo": 75, - "magazine": 100, - "items": [ - [ "screwdriver", 40 ], - [ "hammer", 35 ], - [ "wrench", 30 ], - [ "wrench_small", 30 ], - [ "hacksaw", 50 ], - [ "xacto", 10 ], - { "item": "flashlight", "prob": 40, "charges": 300 }, - [ "crowbar", 30 ], - { "item": "carver_off", "prob": 25, "charges": 500 }, - [ "press", 40 ], - [ "puller", 20 ], - [ "boltcutters", 35 ], - [ "chisel", 20 ], - { "item": "misc_repairkit", "prob": 45, "charges": 200 }, - [ "tool_belt", 35 ], - [ "multitool", 20 ] - ] - }, { "id": "smoke_shop", "type": "item_group", diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json index 81f952c6ea62f..f45f7694137fa 100644 --- a/data/json/itemgroups/Locations_MapExtras/mansion.json +++ b/data/json/itemgroups/Locations_MapExtras/mansion.json @@ -1270,28 +1270,6 @@ { "group": "magazines", "prob": 20 } ] }, - { - "id": "sewing_room", - "type": "item_group", - "subtype": "distribution", - "items": [ - { "group": "suits", "prob": 50, "damage": [ 0, 2 ] }, - [ "scissors", 50 ], - [ "thread", 50 ], - { "group": "pants", "prob": 40, "damage": [ 0, 2 ] }, - { "group": "shirts", "prob": 40, "damage": [ 0, 2 ] }, - [ "knitting_needles", 40 ], - [ "string_36", 40 ], - [ "yarn", 40 ], - { "group": "bed", "prob": 30, "damage": [ 0, 2 ] }, - { "item": "sewing_kit", "prob": 30, "charges": [ 0, 25 ] }, - [ "cotton_patchwork", 30 ], - [ "lycra_patch", 15 ], - [ "nylon", 10 ], - { "item": "tailors_kit", "prob": 20, "charges": [ 0, 100 ] }, - [ "kevlar_shears", 5 ] - ] - }, { "id": "vanity", "type": "item_group", @@ -1588,31 +1566,6 @@ { "group": "ammo_cannon", "prob": 10 } ] }, - { - "id": "voyer", - "type": "item_group", - "subtype": "distribution", - "items": [ - { "item": "camera_pro", "prob": 50, "charges": [ 0, 150 ] }, - { "item": "camera_pro", "container-item": "camera_bag", "prob": 40, "charges": [ 0, 150 ] }, - [ "hot_pants_leather", 50 ], - [ "photo_album", 50 ], - [ "sports_bra", 50 ], - [ "briefs", 20 ], - [ "swim_briefs", 10 ], - [ "speedo", 10 ], - [ "bikini_top", 30 ], - [ "bikini_top_short", 25 ], - [ "bikini_bottom", 30 ], - [ "bikini_bottom_short", 25 ], - [ "panties", 50 ], - [ "mag_porn", 40 ], - { "item": "camera", "prob": 20, "charges": [ 0, 150 ] }, - { "item": "camera", "container-item": "camera_bag", "prob": 10, "charges": [ 0, 150 ] }, - { "item": "flashlight", "prob": 30, "charges": [ 0, 300 ] }, - [ "binoculars", 20 ] - ] - }, { "id": "garden_shed", "type": "item_group", diff --git a/data/json/itemgroups/SUS/library.json b/data/json/itemgroups/SUS/library.json index 913e65114019e..e64e22a1fa0b3 100644 --- a/data/json/itemgroups/SUS/library.json +++ b/data/json/itemgroups/SUS/library.json @@ -429,27 +429,6 @@ { "item": "book_pieces", "count": [ 0, 26 ], "prob": 100 } ] }, - { - "id": "SUS_books_fict_soft_romc", - "type": "item_group", - "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", - "//2": "This group returns a small collection of three or four romance novels.", - "//3": "Note the plural books. Not to be confused with SUS_book_fict_soft_romc", - "subtype": "collection", - "entries": [ - { "item": "novel_romance", "prob": 100 }, - { "item": "paperback_romance_circuses", "prob": 20 }, - { "item": "paperback_romance_cloven", "prob": 20 }, - { "item": "paperback_romance_conq", "prob": 20 }, - { "item": "paperback_romance_dd", "prob": 20 }, - { "item": "paperback_romance_diodes", "prob": 20 }, - { "item": "paperback_romance_envyh", "prob": 20 }, - { "item": "paperback_romance_grue", "prob": 20 }, - { "item": "paperback_romance_rider", "prob": 20 }, - { "item": "paperback_romance_rogue", "prob": 20 }, - { "item": "paperback_romance_secret", "prob": 20 } - ] - }, { "id": "SUS_book", "type": "item_group", @@ -601,7 +580,6 @@ "type": "item_group", "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", "//2": "This group is for a single paperback book of the romance genre.", - "//3": "This id is book singular. Not to be confused w the collection item_group plural SUS_books_fict_soft_romc", "subtype": "distribution", "entries": [ { "item": "novel_romance", "prob": 1 }, diff --git a/data/json/itemgroups/SUS/mre_packages.json b/data/json/itemgroups/SUS/mre_packages.json index 11f330a2346f2..996129680e4c9 100644 --- a/data/json/itemgroups/SUS/mre_packages.json +++ b/data/json/itemgroups/SUS/mre_packages.json @@ -124,32 +124,6 @@ { "item": "dry_fruit", "container-item": "wrapper" } ] }, - { - "type": "item_group", - "id": "mre_used_accessory_pack", - "container-item": "bag_plastic", - "subtype": "collection", - "entries": [ - { "item": "gummy_vitamins" }, - { "item": "matches", "charges": [ 0, 20 ] }, - { "item": "napkin", "count": [ 0, 8 ] }, - { "item": "gum", "count": [ 0, 2 ] }, - { "group": "pur_tablets_beverage_bag_0_6" }, - { "group": "sugar_beverage_bag_0_2" }, - { "item": "spork" }, - { - "distribution": [ - { "item": "instant_coffee", "count": [ 0, 2 ], "container-item": "beverage_bag" }, - { "item": "herbal_tea_bag", "count": [ 0, 2 ], "container-item": "beverage_bag" }, - { "item": "tea_bag", "count": [ 0, 2 ], "container-item": "beverage_bag" }, - { "item": "tea_bag_chamomile", "count": [ 0, 2 ], "container-item": "beverage_bag" }, - { "item": "tea_bag_dandelion", "count": [ 0, 2 ], "container-item": "beverage_bag" }, - { "item": "tea_fruit_bag", "count": [ 0, 2 ], "container-item": "beverage_bag" }, - { "item": "tea_green_bag", "count": [ 0, 2 ], "container-item": "beverage_bag" } - ] - } - ] - }, { "type": "item_group", "id": "mre_used_contents", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json index d744bad22d1b3..daf8dad5d16cb 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json @@ -236,13 +236,6 @@ "subtype": "distribution", "entries": [ { "group": "ammo_pistol_obscure", "prob": 100 } ] }, - { - "type": "item_group", - "id": "ammo_smg_reloaded", - "//": "Reloaded SMG ammo balanced according to rarity.", - "subtype": "distribution", - "entries": [ { "group": "ammo_pistol_reloaded", "prob": 100 } ] - }, { "type": "item_group", "id": "ammo_rifle_common", @@ -829,17 +822,6 @@ [ "30carbine_casing", 40 ] ] }, - { - "id": "ammo_casings_bulk", - "type": "item_group", - "subtype": "distribution", - "entries": [ - { "group": "ammo_casings", "prob": 25, "charges-min": 50, "charges-max": 50 }, - { "group": "ammo_casings", "prob": 10, "charges-min": 100, "charges-max": 100 }, - { "group": "ammo_casings", "prob": 2, "charges-min": 250, "charges-max": 250 }, - { "group": "ammo_casings", "prob": 1, "charges-min": 500, "charges-max": 500 } - ] - }, { "id": "ammo_casings_gunsmith_bulk", "type": "item_group", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300blk.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300blk.json index 49e3d3a7a61e0..76111774ffcce 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300blk.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/300blk.json @@ -47,7 +47,7 @@ "type": "item_group", "id": "ammo_can_300blk_part", "container-item": "ammunition_can_30", - "items": [ { "group": "ammo_box_308", "count": [ 1, 8 ] } ] + "items": [ { "group": "ammo_box_300blk", "count": [ 1, 8 ] } ] }, { "type": "item_group", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json index 0cc67af713b03..73efd098b7f86 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/arsenal/police_armory.json @@ -120,20 +120,6 @@ "container-item": "usp9mag", "entries": [ { "item": "9mmfmj", "charges": [ 15, 15 ] } ] }, - { - "id": "police_armory_full_usp9mag_9mmP", - "type": "item_group", - "subtype": "collection", - "container-item": "usp9mag", - "entries": [ { "item": "9mmP", "charges": [ 15, 15 ] } ] - }, - { - "id": "police_armory_full_usp9mag_9mmP2", - "type": "item_group", - "subtype": "collection", - "container-item": "usp9mag", - "entries": [ { "item": "9mmP2", "charges": [ 15, 15 ] } ] - }, { "id": "police_armory_full_glockmag_9mm", "type": "item_group", @@ -148,20 +134,6 @@ "container-item": "glockmag", "entries": [ { "item": "9mmfmj", "charges": [ 15, 15 ] } ] }, - { - "id": "police_armory_full_glockmag_9mmP", - "type": "item_group", - "subtype": "collection", - "container-item": "glockmag", - "entries": [ { "item": "9mmP", "charges": [ 15, 15 ] } ] - }, - { - "id": "police_armory_full_glockmag_9mmP2", - "type": "item_group", - "subtype": "collection", - "container-item": "glockmag", - "entries": [ { "item": "9mmP2", "charges": [ 15, 15 ] } ] - }, { "id": "police_armory_full_m9mag_9mm", "type": "item_group", @@ -176,20 +148,6 @@ "container-item": "m9mag", "entries": [ { "item": "9mmfmj", "charges": [ 15, 15 ] } ] }, - { - "id": "police_armory_full_m9mag_9mmP", - "type": "item_group", - "subtype": "collection", - "container-item": "m9mag", - "entries": [ { "item": "9mmP", "charges": [ 15, 15 ] } ] - }, - { - "id": "police_armory_full_m9mag_9mmP2", - "type": "item_group", - "subtype": "collection", - "container-item": "m9mag", - "entries": [ { "item": "9mmP2", "charges": [ 15, 15 ] } ] - }, { "id": "police_armory_boxes_9mm", "type": "item_group", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json b/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json index f5f606bc3adf0..d417a01227e3b 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json @@ -77,43 +77,6 @@ [ "sword_bayonet", 10 ] ] }, - { - "type": "item_group", - "id": "sights_all", - "//": "All aftermarket sights.", - "items": [ - [ "improve_sights", 84 ], - [ "offset_sights", 6 ], - [ "red_dot_sight", 42 ], - [ "holo_sight", 18 ], - [ "laser_sight", 15 ], - [ "rail_laser_sight", 6 ], - [ "acog_scope", 21 ], - [ "hybrid_sight_4x", 15 ], - [ "rifle_scope", 25 ], - [ "rifle_scope_high_end_mount", 10 ], - [ "pistol_scope", 4 ] - ] - }, - { - "type": "item_group", - "id": "sights_pistol", - "//": "Aftermarket sights that are for pistols.", - "items": [ [ "improve_sights", 84 ], [ "red_dot_sight", 42 ], [ "laser_sight", 15 ], [ "pistol_scope", 4 ] ] - }, - { - "type": "item_group", - "id": "sights_SMG", - "//": "Aftermarket sights that are for SMG's.", - "items": [ - [ "improve_sights", 84 ], - [ "red_dot_sight", 42 ], - [ "holo_sight", 18 ], - [ "laser_sight", 15 ], - [ "rail_laser_sight", 6 ], - [ "pistol_scope", 4 ] - ] - }, { "type": "item_group", "id": "sights_rifle", @@ -192,12 +155,6 @@ "subtype": "collection", "entries": [ { "item": "suppressor" }, { "item": "laser_sight" } ] }, - { - "type": "item_group", - "id": "sights_launcher", - "//": "Aftermarket sights that are for launchers.", - "items": [ [ "improve_sights", 84 ], [ "red_dot_sight", 42 ], [ "holo_sight", 18 ] ] - }, { "type": "item_group", "id": "gunmod_energy", @@ -209,11 +166,5 @@ [ "effective_emitter", 40 ], [ "high_density_capacitor", 60 ] ] - }, - { - "type": "item_group", - "id": "gunmod_archery", - "//": "Gunmods for bows and crossbows.", - "items": [ [ "arrowrest", 100 ], [ "bow_sight", 100 ], [ "bow_stabilizer", 100 ] ] } ] diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index 6b3e8282f7014..7bd1cf7bf1d33 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -477,7 +477,6 @@ { "group": "nested_bren2_556", "prob": 1 }, { "group": "nested_mdrx", "prob": 1 }, { "group": "nested_cz600", "prob": 1 }, - { "group": "nested_zpapm90", "prob": 1 }, { "group": "nested_converted_ar15", "prob": 6 }, { "group": "nested_converted_mdrx", "prob": 1 }, { "group": "nested_converted_cz600", "prob": 1 }, @@ -608,7 +607,11 @@ { "group": "nested_savage112", "prob": 15 }, { "group": "nested_mrad_smr", "prob": 6 }, { "group": "nested_axmc", "prob": 6 }, - { "group": "nested_converted_axmc", "prob": 3 } + { "group": "nested_converted_axmc", "prob": 3 }, + { "group": "nested_zpapm90", "prob": 1 }, + { "group": "nested_zpap85", "prob": 1 }, + { "group": "nested_rfb_308", "prob": 5 }, + { "group": "nested_greasegun", "prob": 1 } ] }, { @@ -903,16 +906,6 @@ { "item": "winchester_1897", "prob": 7, "charges-min": 0, "charges-max": 6 } ] }, - { - "type": "item_group", - "id": "guns_shotgun_rare_static_display", - "subtype": "distribution", - "entries": [ - { "group": "guns_shotgun_rare_display", "prob": 22, "contents-group": "sights_shotgun_static" }, - { "item": "winchester_1887", "prob": 10 }, - { "item": "winchester_1897", "prob": 7 } - ] - }, { "type": "item_group", "id": "guns_shotgun_milspec", diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json index 83117450c1a1a..dd1b4715c8b86 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -495,12 +495,6 @@ "//": "Makeshift or otherwise poor quality magazines that have no better category.", "items": [ [ "nailmag", 20 ], [ "pressurized_tank_chem", 5 ], [ "aux_pressurized_tank", 10 ] ] }, - { - "type": "item_group", - "id": "mags_other_rare", - "//": "Aftermarket or otherwise uncommon magazines excluding milspec that have no better category.", - "items": [ [ "8x40_25_mag", 10 ] ] - }, { "type": "item_group", "id": "mags_common", @@ -569,24 +563,6 @@ [ "greasegun32mag", 2 ] ] }, - { - "type": "item_group", - "id": "mags_obscure_gunstore", - "//": "Magazines for imported firearms.", - "items": [ - [ "762x39_clip", 10 ], - [ "762R_clip", 10 ], - [ "clip9mm_10rd", 5 ], - [ "vz58mag30", 8 ], - [ "vz58mag10", 8 ], - [ "makarovmag", 10 ], - [ "mausermag_10rd", 3 ], - [ "mausermag_20rd", 2 ], - [ "p08mag_32rd", 1 ], - [ "p08mag_8rd", 10 ], - [ "tokarevmag", 10 ] - ] - }, { "type": "item_group", "id": "mags_crime", diff --git a/data/json/itemgroups/main.json b/data/json/itemgroups/main.json index 2ef67f2d8e400..61d638e6a074c 100644 --- a/data/json/itemgroups/main.json +++ b/data/json/itemgroups/main.json @@ -43,38 +43,6 @@ { "item": "v29", "prob": 10 } ] }, - { - "type": "item_group", - "id": "player_crafted", - "//": "items that should only be crafted by the player. Excluded from all other item groups. this is just an FYI list, it's not used to spawn items in game.", - "subtype": "distribution", - "entries": [ - { "item": "chemical_thrower", "prob": 0 }, - { "item": "diamond_bayonet", "prob": 0 }, - { "item": "diamond_bayonet", "prob": 0 }, - { "item": "diamond_broadsword", "prob": 0 }, - { "item": "diamond_katana", "prob": 0 }, - { "item": "diamond_knife", "prob": 0 }, - { "item": "diamond_kukri", "prob": 0 }, - { "item": "diamond_machete", "prob": 0 }, - { "item": "diamond_nodachi", "prob": 0 }, - { "item": "diamond_rapier", "prob": 0 }, - { "item": "diamond_sword_bayonet", "prob": 0 }, - { "item": "diamond_wakizashi", "prob": 0 }, - { "item": "diamond_punch_dagger", "prob": 0 }, - { "item": "diamond_zweihander", "prob": 0 }, - { "item": "fertilizer_bomb", "prob": 0 }, - { "item": "iv_mutagen_alpha", "prob": 0 }, - { "item": "iv_mutagen_chimera", "prob": 0 }, - { "item": "iv_mutagen_elfa", "prob": 0 }, - { "item": "iv_mutagen_medical", "prob": 0 }, - { "item": "m2browning_sawn", "prob": 0 }, - { "item": "mutagen_alpha", "prob": 0 }, - { "item": "mutagen_chimera", "prob": 0 }, - { "item": "mutagen_elfa", "prob": 0 }, - { "item": "mutagen_medical", "prob": 0 } - ] - }, { "type": "item_group", "id": "ammo", diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index c0187cca6bc4e..c1cdf95db2bb1 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -128,18 +128,6 @@ "subtype": "collection", "entries": [ { "item": "esapi_plate" }, { "item": "esapi_plate" } ] }, - { - "id": "some_front_plates", - "type": "item_group", - "//": "random collection of two matching plates", - "subtype": "distribution", - "entries": [ - { "group": "some_esapi_front_plates", "prob": 20 }, - { "group": "some_steel_front_plates", "prob": 50 }, - { "group": "some_heavy_steel_front_plates", "prob": 20 }, - { "group": "some_stab_front_plates", "prob": 50 } - ] - }, { "id": "kitted_heavy_vest", "type": "item_group", @@ -846,28 +834,6 @@ { "item": "mag_rifle", "prob": 10 } ] }, - { - "type": "item_group", - "id": "mil_bulk", - "//": "A bulk of uniform goods all of the same type likely found in a shipping crate", - "subtype": "distribution", - "entries": [ - { "item": "mess_kit", "prob": 10, "count": 32 }, - { "item": "voltmeter", "prob": 10, "count": 32 }, - { "item": "multimeter", "prob": 10, "count": 32 }, - { "item": "drivebelt", "prob": 10, "count": 64 }, - { "item": "grapnel", "prob": 10, "count": 32 }, - { "item": "string_floss", "prob": 5, "count": 128 }, - { "item": "toothbrush_plain", "prob": 5, "count": 128 }, - { "item": "sm_extinguisher", "prob": 5, "count": 16, "charges": 10 }, - { "item": "fire_ax", "prob": 5, "count": 16 }, - { "item": "manual_stabbing", "prob": 5, "count": 64 }, - { "item": "manual_rifle", "prob": 5, "count": 64 }, - { "item": "m11", "prob": 1, "count": 16 }, - { "item": "m17", "prob": 3, "count": 32 }, - { "item": "m18", "prob": 2, "count": 16 } - ] - }, { "type": "item_group", "id": "mil_food", diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index b43cdb9fad5f0..bb8bfa18a2194 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -895,13 +895,6 @@ { "item": "plastichoboreel", "prob": 1 } ] }, - { - "id": "tools_fishing_makeshift", - "type": "item_group", - "subtype": "distribution", - "//": "Post-cataclysm makeshift fishing implements", - "items": [ [ "fishing_rod_basic", 100 ], [ "fish_trap_basket", 100 ], [ "fishing_hook_bone", 100 ] ] - }, { "type": "item_group", "id": "pur_tablets_bottle_plastic_small_15",