Random cleanups part 3 (#68216)

* Initial commit * revert 223_mg * Update 223_mg.json * revert add private_resort_gambling_table
CleverRaven · Sep 21, 2023 · c14b1ec · c14b1ec
1 parent dfd91b9
commit c14b1ec
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 429 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",