[READY] Battery overhaul 2 electric boogaloo

data/json/item_groups.json

@@ -185,6 +185,8 @@
   {
     "type": "item_group",
     "id": "livingroom",
+    "ammo": 50,
+    "magazine": 100,
     "items": [
       [ "rootbeer", 65 ],
       [ "mag_computer", 35 ],
@@ -878,7 +880,7 @@
       [ "banjo", 5 ],
       [ "ukulele", 15 ],
       [ "gobag", 5 ],
-      [ "battery", 50 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "bb", 8 ],
       [ "bbgun", 10 ],
       [ "fan", 10 ],
@@ -1514,7 +1516,7 @@
       [ "ecig", 10 ],
       [ "advanced_ecig", 8 ],
       [ "nicotine_liquid", 8 ],
-      [ "battery", 50 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "l_enforcer_45", 4 ],
       [ "l_sp_45", 3 ],
       [ "l_mp_45", 2 ],
@@ -1915,7 +1917,7 @@
       [ "amplifier", 8 ],
       [ "mag_electronics", 15 ],
       [ "antenna", 18 ],
-      [ "battery", 50 ],
+      { "group": "ammo_any_batteries_full", "prob": 50 },
       [ "soldering_iron", 70 ],
       [ "solder_wire", 70 ],
       [ "solar_cell", 5 ],
@@ -2698,6 +2700,8 @@
   {
     "type": "item_group",
     "id": "winter",
+    "ammo": 50,
+    "magazine": 100,
     "items": [
       [ "coat_winter", 50 ],
       [ "peacoat", 30 ],
@@ -3226,7 +3230,7 @@
       [ "rope_6", 5 ],
       [ "rope_30", 2 ],
       [ "duct_tape", 10 ],
-      [ "battery", 15 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 15 },
       [ "matches", 10 ],
       [ "gum", 10 ],
       [ "cable", 5 ],
@@ -3516,7 +3520,7 @@
       [ "briefcase", 40 ],
       [ "purse", 40 ],
       [ "mbag", 20 ],
-      [ "battery", 50 ],
+      { "group": "ammo_pocket_batteries", "prob": 50 },
       [ "mag_news", 35 ],
       [ "manual_business", 40 ],
       [ "textbook_business", 12 ],
@@ -3595,7 +3599,7 @@
       [ "briefcase", 40 ],
       [ "purse", 40 ],
       [ "mbag", 20 ],
-      [ "battery", 50 ],
+      { "group": "ammo_pocket_batteries", "prob": 50 },
       [ "mag_news", 35 ],
       [ "manual_business", 40 ],
       [ "textbook_business", 12 ],
@@ -3685,7 +3689,7 @@
       [ "glasses_eye", 30 ],
       [ "contacts", 30 ],
       [ "radio", 100 ],
-      [ "battery", 50 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "umbrella", 50 ],
       [ "teleumbrella", 20 ],
       [ "mag_barter", 10 ],
@@ -3713,7 +3717,7 @@
       [ "glasses_reading", 90 ],
       [ "purse", 40 ],
       [ "mbag", 20 ],
-      [ "battery", 50 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "mag_news", 35 ],
       [ "file", 20 ],
       [ "manual_computers", 20 ],
@@ -4567,7 +4571,7 @@
       [ "backpack", 38 ],
       [ "backpack_leather", 8 ],
       [ "slingpack", 8 ],
-      [ "battery", 50 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "novel_scifi", 20 ],
       [ "novel_drama", 40 ],
       [ "mag_dodge", 20 ],
@@ -5062,14 +5066,13 @@
       [ "mask_dust", 65 ],
       [ "glasses_safety", 40 ],
       [ "goggles_welding", 70 ],
-      [ "battery", 50 ],
+      { "group": "ammo_any_batteries_full", "prob": 50 },
       [ "plut_cell", 10 ],
       [ "manual_electronics", 20 ],
       [ "textbook_electronics", 6 ],
       [ "radio_book", 16 ],
       [ "advanced_electronics", 6 ],
       [ "small_lcd_screen", 20 ],
-      [ "battery_compartment", 20 ],
       [ "double_plutonium_core", 2 ],
       [ "battery_ups", 15 ],
       [ "cell_phone", 15 ],
@@ -5140,7 +5143,7 @@
       [ "purse", 40 ],
       [ "mbag", 20 ],
       [ "fanny", 10 ],
-      [ "battery", 50 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "bb", 8 ],
       [ "bbgun", 10 ],
       [ "fan", 10 ],
@@ -6013,7 +6016,7 @@
       [ "hat_hard_hooded", 25 ],
       [ "wearable_light", 5 ],
       [ "ear_plugs", 50 ],
-      [ "battery", 50 ],
+      { "group": "ammo_any_batteries_full", "prob": 50 },
       [ "flashlight", 40 ],
       [ "boots_rubber", 20 ],
       [ "toolbox", 1 ],
@@ -6061,7 +6064,7 @@
       [ "slingpack", 19 ],
       [ "briefcase", 20 ],
       [ "backpack_leather", 18 ],
-      [ "battery", 50 ],
+      { "group": "ammo_any_batteries", "prob": 50 },
       [ "flashlight", 40 ],
       [ "heavy_flashlight", 10 ],
       [ "pickaxe", 1 ],
@@ -6134,7 +6137,7 @@
       [ "camera_pro", 2 ],
       [ "screwdriver", 40 ],
       [ "screwdriver_set", 10 ],
-      [ "battery", 50 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "file", 30 ],
       [ "mag_porn", 20 ],
       [ "mag_tv", 40 ],
@@ -6538,7 +6541,7 @@
       [ "kevlar_plate", 10 ],
       [ "ceramic_armor", 15 ],
       [ "motor", 2 ],
-      [ "battery", 50 ],
+      { "group": "ammo_heavy_batteries_full", "prob": 50 },
       [ "plut_cell", 10 ]
     ]
   },
@@ -6684,7 +6687,7 @@
       [ "mask_gas", 10 ],
       [ "helmet_army", 40 ],
       [ "helmet_liner", 10 ],
-      [ "battery", 50 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "plut_cell", 10 ],
       [ "m249", 1 ],
       [ "m240", 1 ],
@@ -6991,7 +6994,6 @@
       [ "eyedrops", 20 ],
       [ "adderall", 10 ],
       [ "id_science", 2 ],
-      [ "battery_compartment", 5 ],
       [ "double_plutonium_core", 1 ],
       [ "cleansuit", 5 ],
       [ "laptop", 10 ],
@@ -7315,7 +7317,7 @@
       [ "crackpipe", 37 ],
       [ "lsd", 10 ],
       [ "chemistry_set", 50 ],
-      [ "battery", 70 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 70 },
       [ "flashlight", 40 ],
       [ "chem_acetone", 40 ],
       [ "chem_hexamine", 15 ]
@@ -7417,7 +7419,7 @@
       [ "mintpatties", 20 ],
       [ "electrohack", 3 ],
       [ "usb_drive", 5 ],
-      [ "battery", 50 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "file", 10 ],
       [ "manual_computers", 20 ],
       [ "textbook_computer", 8 ],
@@ -7587,7 +7589,7 @@
       [ "UPS_off", 5 ],
       [ "adv_UPS_off", 2 ],
       [ "emer_blanket", 5 ],
-      [ "battery", 10 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 50 },
       [ "tool_belt", 5 ],
       [ "oxygen_tank", 15 ],
       [ "fireman_belt", 15 ],
@@ -8485,7 +8487,7 @@
     "items": [
       [ "jumpsuit", 90 ],
       [ "mask_filter", 10 ],
-      [ "battery", 10 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 10 },
       { "item": "radio", "prob": 10, "charges-min": 10, "charges-max": 95 },
       [ "boots_combat", 20 ],
       { "item": "bandages", "prob": 10, "charges-min": 1, "charges-max": 3 },
@@ -8525,7 +8527,7 @@
       [ "winter_jacket_army", 20 ],
       [ "winter_gloves_army", 20 ],
       [ "army_top", 70 ],
-      [ "battery", 40 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 40 },
       { "item": "radio", "prob": 10, "charges-min": 10, "charges-max": 95 },
       [ "boots_combat", 50 ],
       { "item": "bandages", "prob": 10, "charges-min": 1, "charges-max": 3 },
@@ -9062,7 +9064,7 @@
     "id": "recycle_battery",
     "type": "item_group",
     "items": [
-      { "item": "battery", "prob": 70, "charges-min": 0, "charges-max": 30 },
+      { "group": "ammo_any_batteries", "prob": 70 },
       [ "storage_battery", 25 ],
       [ "medium_storage_battery", 35 ],
       [ "small_storage_battery", 45 ],
@@ -9206,7 +9208,7 @@
       [ "duct_tape", 25 ],
       [ "flashlight", 25 ],
       [ "thread", 20 ],
-      [ "battery", 25 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 25 },
       [ "superglue", 25 ],
       [ "candle", 25 ],
       [ "hammer", 20 ],

data/json/itemgroups/ammo.json

@@ -377,5 +377,83 @@
       { "item": "9x18mm_casing", "prob": 80, "count": 20 },
       { "item": "shot_hull", "prob": 100, "count": 20 }
     ]
+  },
+  {
+    "type": "item_group",
+    "id": "ammo_light_batteries",
+    "items": [
+      { "item": "light_battery_cell", "prob": 50, "charges-min": 0, "charges-max": 100 },
+      { "item": "light_minus_battery_cell", "prob": 30, "charges-min": 0, "charges-max": 50 },
+      { "item": "light_plus_battery_cell", "prob": 20, "charges-min": 0, "charges-max": 150 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "ammo_light_batteries_full",
+    "items": [
+      { "item": "light_battery_cell", "prob": 50, "charges-min": 100, "charges-max": 100 },
+      { "item": "light_minus_battery_cell", "prob": 30, "charges-min": 50, "charges-max": 50 },
+      { "item": "light_plus_battery_cell", "prob": 20, "charges-min": 150, "charges-max": 150 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "ammo_medium_batteries",
+    "items": [
+      { "item": "medium_battery_cell", "prob": 80, "charges-min": 0, "charges-max": 500 },
+      { "item": "medium_plus_battery_cell", "prob": 20, "charges-min": 0, "charges-max": 600 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "ammo_medium_batteries_full",
+    "items": [
+      { "item": "medium_battery_cell", "prob": 80, "charges-min": 500, "charges-max": 500 },
+      { "item": "medium_plus_battery_cell", "prob": 20, "charges-min": 600, "charges-max": 600 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "ammo_heavy_batteries",
+    "items": [
+      { "item": "heavy_battery_cell", "prob": 80, "charges-min": 0, "charges-max": 1000 },
+      { "item": "heavy_plus_battery_cell", "prob": 20, "charges-min": 0, "charges-max": 1250 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "ammo_heavy_batteries_full",
+    "items": [
+      { "item": "heavy_battery_cell", "prob": 80, "charges-min": 1000, "charges-max": 1000 },
+      { "item": "heavy_plus_battery_cell", "prob": 20, "charges-min": 1250, "charges-max": 1250 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "ammo_any_batteries_full",
+    "items": [
+      { "group": "ammo_light_batteries_full", "prob": 5 },
+      { "group": "ammo_medium_batteries_full", "prob": 5 },
+      { "group": "ammo_heavy_batteries_full", "prob": 5 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "ammo_any_batteries",
+    "items": [
+      { "group": "ammo_light_batteries", "prob": 5 },
+      { "group": "ammo_medium_batteries", "prob": 5 },
+      { "group": "ammo_heavy_batteries", "prob": 5 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "ammo_pocket_batteries",
+    "items": [ { "group": "ammo_light_batteries", "prob": 10 }, { "group": "ammo_medium_batteries", "prob": 1 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "ammo_pocket_batteries_full",
+    "items": [ { "group": "ammo_light_batteries_full", "prob": 5 }, { "group": "ammo_medium_batteries_full", "prob": 5 } ]
   }
 ]

data/json/itemgroups/collections_domestic.json

@@ -2,6 +2,8 @@
   {
     "type": "item_group",
     "id": "home_hw",
+    "ammo": 50,
+    "magazine": 100,
     "items": [
       { "group": "tools_home", "prob": 150 },
       { "group": "tools_general", "prob": 30 },

data/json/itemgroups/defense_mode.json

@@ -84,7 +84,7 @@
       { "item": "hose" },
       { "item": "pot" },
       { "item": "2x4" },
-      { "item": "battery" },
+      { "group": "ammo_any_batteries_full" },
       { "item": "nail" },
       { "item": "gasoline" }
     ]

data/json/itemgroups/gear.json

@@ -43,7 +43,7 @@
       [ "portable_game", 50 ],
       [ "vibrator", 5 ],
       [ "gum", 50 ],
-      [ "battery", 50 ],
+      { "group": "ammo_pocket_batteries", "prob": 50 },
       [ "wrapper", 50 ],
       [ "string_6", 50 ],
       [ "pocket_firstaid", 5 ],
@@ -132,7 +132,7 @@
       { "group": "tools_lighting", "prob": 50 },
       { "group": "tools_survival", "prob": 100 },
       { "group": "tools_tailor", "prob": 20 },
-      [ "battery", 10 ],
+      { "group": "ammo_pocket_batteries_full", "prob": 10 },
       [ "duct_tape", 10 ],
       [ "survivormap", 5 ]
     ]

data/json/itemgroups/mall_item_groups.json

@@ -68,7 +68,7 @@
   {
     "id": "music_shop",
     "type": "item_group",
-    "items": [ [ "battery", 30 ], [ "radio", 30 ], [ "mp3", 30 ] ]
+    "items": [ { "group": "ammo_any_batteries_full", "prob": 50 }, [ "radio", 30 ], [ "mp3", 30 ] ]
   },
   {
     "id": "vitamin_shop",
@@ -203,7 +203,7 @@
     "items": [
       [ "portable_game", 20 ],
       [ "antenna", 25 ],
-      [ "battery", 70 ],
+      { "group": "ammo_any_batteries_full", "prob": 50 },
       [ "mp3", 40 ],
       [ "usb_drive", 10 ],
       [ "manual_electronics", 20 ],

data/json/itemgroups/mansion.json

@@ -747,7 +747,7 @@
     "items": [
       [ "socks", 90 ],
       [ "sneakers", 50 ],
-      [ "battery", 50 ],
+      { "group": "ammo_pocket_batteries", "prob": 50 },
       [ "sunglasses", 40 ],
       [ "socks_wool", 40 ],
       [ "towel", 40 ],