Flesh out e-device item groups (#79471)

* flesh out e-device item groups adds older variants of USB drive, memory card * fix double space * fix double space --------- Co-authored-by: Anton Simakov <[email protected]>
CleverRaven · Feb 2, 2025 · 806f84f · 806f84f
1 parent acd9d2f
commit 806f84f
Show file tree

Hide file tree

Showing 23 changed files with 381 additions and 153 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/gear.json b/data/json/itemgroups/Clothing_Gear/gear.json
@@ -191,7 +191,7 @@
       { "item": "cordless_drill", "prob": 30 },
       { "item": "rope_30", "prob": 50 },
       { "item": "pliers", "prob": 50 },
-      { "item": "laptop", "prob": 70 },
+      { "group": "new_laptops", "prob": 70 },
       { "item": "cable", "prob": 40 },
       { "item": "manual_traps_mil", "prob": 80 },
       { "group": "gear_eod_light_or_heavy", "prob": 100 }
@@ -255,8 +255,7 @@
       [ "hammer_sledge_engineer", 5 ],
       [ "hammer_sledge_heavy", 1 ],
       [ "shovel", 20 ],
-      { "item": "cell_phone", "prob": 5, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 20, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" },
+      { "group": "civilian_phones", "prob": 20 },
       [ "airhorn", 5 ],
       [ "boltcutters", 5 ],
       [ "tacvest", 10 ],

diff --git a/data/json/itemgroups/Clothing_Gear/gear_civilian.json b/data/json/itemgroups/Clothing_Gear/gear_civilian.json
@@ -7,8 +7,7 @@
     "//": "Small common items carried in a person's pockets, purse, etc. Wallets at roughly 50%.",
     "items": [
       { "group": "wallets", "prob": 1600 },
-      { "item": "cell_phone", "prob": 26, "charges": [ 0, 300 ] },
-      { "item": "smart_phone", "prob": 204, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" },
+      { "group": "civilian_phones", "prob": 204 },
       { "prob": 250, "group": "cig_box_cigarette_1_20" },
       { "item": "lighter", "prob": 50, "charges": [ 0, -1 ] },
       { "item": "small_lighter", "prob": 25, "charges": [ 0, -1 ] },
@@ -44,10 +43,10 @@
       { "item": "camera_pro", "prob": 1, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "container-item": "camera_bag", "prob": 4, "charges": [ 0, 150 ] },
       [ "camera_bag", 10 ],
-      { "item": "eink_tablet_pc", "prob": 30, "charges": [ 0, 100 ], "contents-group": "civilian_einktablet_efiles" },
-      { "item": "laptop", "prob": 15, "charges": [ 0, 500 ], "contents-group": "civilian_laptop_efiles" },
-      [ "memory_card", 50 ],
-      [ "usb_drive", 50 ],
+      { "group": "civilian_eink_tablet_pcs", "prob": 30 },
+      { "group": "civilian_laptops", "prob": 15 },
+      { "group": "civilian_memory_cards", "prob": 50 },
+      { "group": "civilian_usb_drives", "prob": 50 },
       { "item": "mp3", "prob": 20, "charges": [ 0, 100 ] },
       { "item": "portable_game", "prob": 50, "charges": [ 0, 100 ] },
       { "item": "vibrator", "prob": 5, "charges": [ 0, 100 ] },
@@ -114,7 +113,7 @@
       [ "pockknife", 14 ],
       [ "knife_swissarmy", 10 ],
       [ "teleumbrella", 2 ],
-      [ "usb_drive", 10 ],
+      { "group": "civilian_usb_drives", "prob": 10 },
       { "group": "writing_utensils", "prob": 40 },
       { "group": "child_schoolbag_1", "prob": 500 },
       { "group": "child_schoolbag_2", "prob": 150 },
@@ -161,7 +160,7 @@
       [ "knife_swissarmy", 10 ],
       [ "umbrella", 5 ],
       [ "teleumbrella", 2 ],
-      [ "usb_drive", 10 ],
+      { "group": "civilian_usb_drives", "prob": 10 },
       { "group": "writing_utensils", "prob": 40 },
       { "group": "child_schoolbag_1", "prob": 500 },
       { "group": "child_schoolbag_2", "prob": 150 },
@@ -302,7 +301,7 @@
       [ "onion_rings", 10 ],
       [ "mintpatties", 20 ],
       { "item": "electrohack", "prob": 3, "charges": [ 0, 100 ] },
-      [ "usb_drive", 5 ],
+      { "group": "civilian_usb_drives", "prob": 5 },
       { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "file", 10 ],
       [ "manual_computer", 20 ],

diff --git a/data/json/itemgroups/Labs/labs_common.json b/data/json/itemgroups/Labs/labs_common.json
@@ -61,7 +61,7 @@
         "distribution": [ { "item": "camera", "prob": 70, "charges": [ 0, 50 ] }, { "item": "camera_pro", "prob": 30, "charges": [ 0, 50 ] } ],
         "prob": 10
       },
-      { "item": "memory_card", "prob": 15, "count": [ 2, 8 ] },
+      { "group": "used_memory_cards", "prob": 15, "count": [ 2, 4 ], "contents-group": "efiles_science" },
       { "item": "badge_doctor", "prob": 5, "count": [ 1, 2 ] },
       { "item": "wrapped_rad_badge", "prob": 7, "count": [ 1, 3 ] },
       { "item": "plastic_chunk", "prob": 30, "count": [ 1, 3 ] },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -161,7 +161,7 @@
       [ "mask_dust", 65 ],
       [ "glasses_safety", 40 ],
       [ "vacutainer", 10 ],
-      [ "usb_drive", 5 ],
+      { "group": "used_usb_drives", "prob": 5, "contents-group": "efiles_medical" },
       [ "recipe_elfa", 1 ],
       [ "recipe_medicalmut", 2 ],
       [ "disinfectant", 35 ],
@@ -211,7 +211,7 @@
       { "item": "mp3", "prob": 8, "charges": [ 0, 100 ] },
       { "item": "portable_game", "prob": 10, "charges": [ 0, 100 ] },
       { "item": "game_watch", "prob": 2, "charges": [ 0, 100 ] },
-      { "item": "laptop", "prob": 5, "charges": [ 0, 500 ], "contents-group": "civilian_laptop_efiles" },
+      { "group": "civilian_laptops", "prob": 5 },
       [ "fish_bowl", 1 ],
       { "group": "box_of_contact_lens_any", "prob": 15 },
       { "item": "transition_contacts", "prob": 1, "count": 6 },
@@ -663,21 +663,21 @@
     "id": "recycle_electronic",
     "type": "item_group",
     "items": [
-      [ "usb_drive", 45 ],
+      { "group": "used_usb_drives", "prob": 45, "contents-group": "efiles_scrap" },
+      { "group": "used_memory_cards", "prob": 80, "contents-group": "efiles_scrap" },
       { "item": "two_way_radio", "prob": 30, "charges": [ 0, 15 ] },
       [ "transponder", 25 ],
       [ "receiver", 25 ],
       [ "small_lcd_screen", 10 ],
       [ "large_lcd_screen", 10 ],
-      [ "memory_card", 80 ],
       { "item": "radiocontrol", "prob": 15, "charges": [ 0, 25 ] },
       { "item": "radio_car", "prob": 15, "charges": [ 0, 25 ] },
       [ "RAM", 45 ],
       { "item": "radio", "prob": 25, "charges": [ 0, 15 ] },
       [ "power_supply", 25 ],
       [ "processor", 25 ],
       { "item": "mp3", "prob": 20, "charges": [ 0, 15 ] },
-      { "item": "laptop", "prob": 20, "charges": [ 0, 500 ] },
+      { "group": "used_laptops", "prob": 20, "contents-group": "efiles_scrap" },
       { "item": "hotplate", "prob": 20 },
       { "item": "flashlight", "prob": 30, "charges": [ 0, 10 ] },
       { "item": "coffeemaker", "prob": 20 },
@@ -929,12 +929,11 @@
       { "item": "matches", "prob": 60, "charges": [ 0, 20 ] },
       { "item": "ref_matches", "prob": 60, "charges": [ 0, 32 ] },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
-      { "item": "laptop", "prob": 20, "charges": [ 0, 500 ] },
       [ "atomic_light", 1 ],
-      { "item": "eink_tablet_pc", "prob": 1, "charges": [ 0, 100 ] },
-      [ "memory_card", 5 ],
-      { "item": "cell_phone", "prob": 5, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 35, "charges": [ 0, -1 ] },
+      { "group": "civilian_memory_cards", "prob": 5 },
+      { "group": "civilian_phones", "prob": 35 },
+      { "group": "civilian_eink_tablet_pcs", "prob": 1 },
+      { "group": "civilian_laptops", "prob": 20 },
       [ "cotton_patchwork", 1 ],
       [ "claw_bar", 3 ],
       [ "crowbar", 18 ],
@@ -1257,7 +1256,7 @@
       { "item": "wearable_light", "prob": 15, "charges": [ 0, 100 ] },
       [ "ear_plugs", 50 ],
       { "item": "extinguisher", "prob": 20, "charges": 100 },
-      { "item": "laptop", "prob": 20, "charges": [ 0, 500 ] },
+      { "group": "used_laptops", "prob": 20, "contents-group": "SUS_efiles_sewage" },
       { "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
       { "item": "water_purifier", "prob": 5 },
       [ "flyer", 10 ],
@@ -1649,8 +1648,8 @@
       { "item": "mag_traps", "prob": 10 },
       { "item": "mp3", "prob": 9, "charges": [ 0, 100 ] },
       { "item": "cell_phone", "prob": 80, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 10, "charges": [ 0, -1 ] },
-      { "item": "eink_tablet_pc", "prob": 5, "charges": [ 0, 100 ] },
+      { "group": "civilian_phones", "prob": 10 },
+      { "group": "used_eink_tablet_pcs", "prob": 5, "contents-group": "efiles_contraband" },
       { "item": "camera", "prob": 3, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "prob": 1, "charges": [ 0, 150 ] },
       { "item": "gold_watch", "prob": 3 },
@@ -1933,14 +1932,14 @@
       [ "recipe_labchem", 1 ],
       [ "textbook_anarch", 1 ],
       [ "recipe_caseless", 1 ],
-      { "item": "laptop", "prob": 30, "charges": [ 0, 500 ] },
+      { "group": "used_laptops", "prob": 30, "contents-group": "civilian_laptop_efiles" },
       [ "atomic_light", 3 ],
       [ "atomic_lamp", 3 ],
       { "item": "smart_lamp", "prob": 5, "charges": [ 0, 100 ] },
-      { "item": "cell_phone", "prob": 7, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 54, "charges": [ 0, 150 ] },
-      { "item": "eink_tablet_pc", "prob": 15, "charges": [ 0, 100 ] },
-      [ "memory_card", 40 ],
+      { "group": "civilian_phones", "prob": 61 },
+      { "group": "civilian_eink_tablet_pcs", "prob": 15 },
+      { "group": "civilian_memory_cards", "prob": 40 },
+      { "group": "civilian_usb_drives", "prob": 8 },
       [ "memory_card_science", 10 ],
       [ "standard_template_construct", 5 ],
       [ "standard_template_construct_combat_exoskeleton", 5 ],
@@ -1964,7 +1963,6 @@
       { "item": "portable_game", "prob": 8, "charges": [ 0, 100 ] },
       { "item": "game_watch", "prob": 2, "charges": [ 0, 50 ] },
       { "item": "vibrator", "prob": 6, "charges": [ 0, 100 ] },
-      [ "usb_drive", 8 ],
       [ "firecracker_pack", 1 ],
       [ "firecracker", 1 ],
       [ "fried_seeds", 10 ],
@@ -2028,7 +2026,7 @@
       [ "file", 20 ],
       [ "howto_computer", 20 ],
       [ "manual_fabrication", 30 ],
-      [ "usb_drive", 5 ],
+      { "group": "used_usb_drives", "prob": 5, "contents-group": "efiles_school" },
       { "group": "book_mag_tech", "prob": 70 },
       { "group": "book_mag_gen", "prob": 150 },
       { "group": "book_mag_interests", "prob": 20 },
@@ -2221,7 +2219,7 @@
       { "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
       [ "bubblewrap", 50 ],
       [ "instant_coffee", 15 ],
-      [ "usb_drive", 5 ],
+      { "group": "new_usb_drives", "prob": 5 },
       { "item": "usb_drive", "contents-item": "software_useless", "prob": 10 },
       { "item": "usb_drive", "contents-item": "software_electronics_reference", "prob": 2 },
       [ "umbrella", 5 ],
@@ -2288,7 +2286,7 @@
       { "group": "toy_robot_kit", "prob": 1 },
       { "group": "toy_engine_kit", "prob": 1 },
       { "item": "instant_coffee", "prob": 15 },
-      { "item": "usb_drive", "prob": 15 },
+      { "group": "used_usb_drives", "prob": 15, "contents-group": "SUS_efiles_office" },
       { "item": "coat_rain", "prob": 50 },
       { "item": "hood_rain", "prob": 10 },
       { "item": "poncho", "prob": 15 },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -228,10 +228,10 @@
       [ "silver_watch", 20 ],
       [ "sf_watch", 7 ],
       [ "platinum_watch", 1 ],
-      { "item": "smart_phone", "prob": 31, "charges": [ 0, -1 ] },
+      { "group": "civilian_phones", "prob": 31 },
       { "item": "goggles_nv", "prob": 1, "charges": [ 0, 100 ] },
       { "item": "goggles_ir", "prob": 1, "charges": [ 0, 100 ] },
-      { "item": "eink_tablet_pc", "prob": 12, "charges": [ 0, 100 ] },
+      { "group": "civilian_eink_tablet_pcs", "prob": 12 },
       { "item": "camera_pro", "prob": 5, "charges": [ 0, 150 ] },
       { "item": "portable_game", "prob": 8, "charges": [ 0, 100 ] },
       [ "knife_rm42", 1 ],
@@ -453,7 +453,7 @@
       [ "elec_jackhammer", 1 ],
       [ "pickaxe", 1 ],
       [ "bracelet_friendship", 1 ],
-      [ "usb_drive", 5 ],
+      { "group": "civilian_usb_drives", "prob": 5 },
       [ "cot", 40 ],
       [ "rollmat", 40 ],
       [ "tent_kit", 17 ],
@@ -738,7 +738,7 @@
       [ "radio", 20 ],
       [ "geiger_off", 8 ],
       [ "rad_monitor", 2 ],
-      [ "usb_drive", 5 ],
+      { "group": "civilian_usb_drives", "prob": 5 },
       [ "canteen", 15 ],
       [ "2lcanteen", 10 ],
       [ "camelbak", 5 ],
@@ -1288,8 +1288,7 @@
       [ "pie_maple", 70 ],
       [ "pork_beans", 15 ],
       [ "glazed_tenderloin", 5 ],
-      { "item": "cell_phone", "prob": 1, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 3, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" },
+      { "group": "civilian_phones", "prob": 4 },
       [ "glass", 40 ],
       [ "spoon", 25 ],
       [ "fork", 25 ],
@@ -1723,7 +1722,7 @@
     "//": "For s_electronics shops",
     "ammo": 75,
     "magazine": 100,
-    "items": [ [ "eink_tablet_pc", 60 ], [ "laptop", 75 ] ]
+    "items": [ { "group": "new_laptops", "prob": 75 }, { "group": "new_eink_tablet_pcs", "prob": 60 } ]
   },
   {
     "id": "elecsto_entapl",
@@ -1741,8 +1740,7 @@
     "magazine": 100,
     "items": [
       { "item": "portable_game", "prob": 65, "charges": 100 },
-      { "item": "cell_phone", "prob": 11, "charges": 150 },
-      { "item": "smart_phone", "prob": 85, "charges": 120 },
+      { "group": "new_phones", "prob": 11 },
       { "item": "waterproof_smart_phone_case", "prob": 40 },
       { "item": "mp3", "prob": 45, "charges": 100 },
       { "group": "toy_radio_car", "prob": 35 },
@@ -1810,7 +1808,7 @@
     "//": "For s_electronics shops",
     "ammo": 75,
     "magazine": 100,
-    "items": [ [ "television", 50 ], [ "eink_tablet_pc", 50 ], [ "stereo", 30 ], [ "microwave", 40 ] ]
+    "items": [ [ "television", 50 ], { "group": "new_eink_tablet_pcs", "prob": 50 }, [ "stereo", 30 ], [ "microwave", 40 ] ]
   },
   {
     "id": "elecsto_books",
@@ -1830,12 +1828,9 @@
     "type": "item_group",
     "//": "For s_electronics shops",
     "items": [
-      [ "usb_drive", 65 ],
-      [ "memory_card", 95 ],
-      { "item": "usb_drive", "contents-item": "software_useless", "prob": 25 },
-      { "item": "usb_drive", "contents-item": "software_math", "prob": 15 },
-      { "item": "usb_drive", "contents-item": "software_medical", "prob": 5 },
-      { "item": "usb_drive", "contents-item": "software_hacking", "prob": 1 }
+      { "group": "new_usb_drives", "prob": 65 },
+      { "group": "new_memory_cards", "prob": 95 },
+      { "group": "new_usb_drives", "prob": 25, "contents-group": "efiles_software" }
     ]
   },
   {
@@ -1903,7 +1898,7 @@
       [ "eyedrops", 20 ],
       [ "mag_electronics", 20 ],
       [ "ecig", 20 ],
-      [ "usb_drive", 20 ]
+      { "group": "new_usb_drives", "prob": 20 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json
@@ -160,8 +160,7 @@
       [ "crackpipe", 10 ],
       { "item": "weed", "prob": 10, "count": [ 1, 5 ] },
       [ "joint", 10 ],
-      { "item": "cell_phone", "prob": 3, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 17, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" },
+      { "group": "civilian_phones", "prob": 20 },
       { "item": "camera", "prob": 15, "charges": [ 0, 150 ] },
       { "item": "camera", "container-item": "camera_bag", "prob": 5, "charges": [ 0, 150 ] },
       [ "camera_bag", 10 ],
@@ -213,8 +212,7 @@
       { "prob": 20, "group": "cig_box_cigarette_1_20" },
       { "item": "weed", "prob": 10, "count": [ 1, 5 ] },
       [ "joint", 10 ],
-      { "item": "cell_phone", "prob": 6, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 44, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" }
+      { "group": "civilian_phones", "prob": 50 }
     ]
   },
   {
@@ -256,8 +254,7 @@
       { "prob": 20, "group": "cig_box_cigarette_1_20" },
       { "item": "weed", "prob": 10, "count": [ 1, 5 ] },
       [ "joint", 10 ],
-      { "item": "cell_phone", "prob": 6, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 44, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" }
+      { "group": "civilian_phones", "prob": 50 }
     ]
   }
 ]
diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json
@@ -263,13 +263,12 @@
       [ "antenna", 25 ],
       { "group": "ammo_any_batteries_full", "prob": 50 },
       { "item": "mp3", "prob": 30, "charges": 100 },
-      [ "usb_drive", 10 ],
+      { "group": "new_phones", "prob": 90 },
+      { "group": "new_usb_drives", "prob": 10 },
+      { "group": "new_memory_cards", "prob": 10 },
       [ "manual_electronics", 20 ],
       [ "cable", 60 ],
-      { "item": "cell_phone", "prob": 30, "charges": 150 },
-      { "item": "smart_phone", "prob": 90, "charges": 120 },
       [ "wristwatch", 60 ],
-      [ "memory_card", 10 ],
       [ "fitness_band", 5 ]
     ]
   },

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -1215,8 +1215,7 @@
       [ "bandana", 10 ],
       { "item": "mp3", "prob": 6, "charges": [ 0, 100 ] },
       { "item": "portable_game", "prob": 5, "charges": [ 0, 100 ] },
-      { "item": "cell_phone", "prob": 1, "charges": [ 0, 150 ] },
-      { "item": "smart_phone", "prob": 5, "charges": [ 0, -1 ], "contents-group": "civilian_smartphone_efiles" },
+      { "group": "civilian_phones", "prob": 6 },
       [ "phonebook", 5 ],
       [ "hairpin", 5 ],
       { "group": "tinware", "prob": 5 },

diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json
@@ -257,9 +257,10 @@
       { "item": "transponder", "prob": 5 },
       { "item": "receiver", "prob": 10 },
       { "item": "antenna", "prob": 18 },
-      { "item": "laptop", "prob": 20, "charges": [ 0, 500 ], "contents-group": "civilian_laptop_efiles" },
-      { "item": "eink_tablet_pc", "prob": 8, "charges": [ 0, 500 ], "contents-group": "civilian_einktablet_efiles" },
-      { "item": "memory_card", "prob": 5 },
+      { "group": "civilian_laptops", "prob": 20 },
+      { "group": "civilian_eink_tablet_pcs", "prob": 8 },
+      { "group": "civilian_memory_cards", "prob": 5 },
+      { "group": "civilian_usb_drives", "prob": 15 },
       { "item": "camera", "prob": 3, "charges": [ 0, 150 ] },
       { "item": "camera", "container-item": "camera_bag", "prob": 2, "charges": [ 0, 150 ] },
       { "item": "camera_pro", "prob": 1, "charges": [ 0, 150 ] },
@@ -278,7 +279,6 @@
       { "item": "mp3", "prob": 6, "charges": [ 0, 100 ] },
       { "item": "solar_cell", "prob": 5 },
       { "item": "flyer", "prob": 10 },
-      { "item": "usb_drive", "prob": 15 },
       { "item": "lsd", "prob": 1, "count": [ 1, 5 ] },
       { "item": "gum", "prob": 20, "count": [ 1, 10 ] },
       { "item": "caff_gum", "prob": 8, "count": [ 1, 10 ] },

diff --git a/data/json/itemgroups/SUS/combos.json b/data/json/itemgroups/SUS/combos.json
@@ -22,8 +22,8 @@
       { "group": "wallets_science", "prob": 15 },
       [ "badge_doctor", 2 ],
       [ "lanyard", 15 ],
-      { "item": "smart_phone", "prob": 80, "charges": [ 0, 120 ] },
-      [ "memory_card", 30 ],
+      { "group": "civilian_phones", "prob": 80 },
+      { "group": "civilian_memory_cards", "prob": 30 },
       [ "mask_dust", 30 ],
       { "group": "box_of_contact_lens_any", "prob": 16 },
       { "group": "clothing_glasses", "prob": 65 },