feat(balance): consistency updates for battery weight, volume, power …

…capacity (part 1) (cataclysmbnteam#3836)

* feat(balance): consistency updates for battery weight, volume, power capacity (part 1)

* Update charges and stuff and junk

* And more stuff hecc

data/json/itemgroups/Weapons_Mods_Ammo/ammo.json

@@ -639,8 +639,8 @@
     "subtype": "distribution",
     "entries": [
       { "item": "medium_battery_cell", "prob": 40, "charges-min": 0, "charges-max": 500 },
-      { "item": "medium_plus_battery_cell", "prob": 10, "charges-min": 0, "charges-max": 600 },
-      { "item": "medium_disposable_cell", "prob": 80, "charges-min": 0, "charges-max": 1200 }
+      { "item": "medium_plus_battery_cell", "prob": 10, "charges-min": 0, "charges-max": 750 },
+      { "item": "medium_disposable_cell", "prob": 80, "charges-min": 0, "charges-max": 1500 }
     ]
   },
   {
@@ -649,8 +649,8 @@
     "subtype": "distribution",
     "entries": [
       { "item": "medium_battery_cell", "prob": 40, "charges-min": 500, "charges-max": 500 },
-      { "item": "medium_plus_battery_cell", "prob": 10, "charges-min": 600, "charges-max": 600 },
-      { "item": "medium_disposable_cell", "prob": 80, "charges-min": 1200, "charges-max": 1200 }
+      { "item": "medium_plus_battery_cell", "prob": 10, "charges-min": 750, "charges-max": 750 },
+      { "item": "medium_disposable_cell", "prob": 80, "charges-min": 1500, "charges-max": 1500 }
     ]
   },
   {
@@ -659,8 +659,8 @@
     "subtype": "distribution",
     "entries": [
       { "item": "heavy_battery_cell", "prob": 40, "charges-min": 0, "charges-max": 1000 },
-      { "item": "heavy_plus_battery_cell", "prob": 10, "charges-min": 0, "charges-max": 1250 },
-      { "item": "heavy_disposable_cell", "prob": 80, "charges-min": 0, "charges-max": 2500 }
+      { "item": "heavy_plus_battery_cell", "prob": 10, "charges-min": 0, "charges-max": 1500 },
+      { "item": "heavy_disposable_cell", "prob": 80, "charges-min": 0, "charges-max": 3000 }
     ]
   },
   {
@@ -669,8 +669,8 @@
     "subtype": "distribution",
     "entries": [
       { "item": "heavy_battery_cell", "prob": 40, "charges-min": 1000, "charges-max": 1000 },
-      { "item": "heavy_plus_battery_cell", "prob": 10, "charges-min": 1250, "charges-max": 1250 },
-      { "item": "heavy_disposable_cell", "prob": 80, "charges-min": 2500, "charges-max": 2500 }
+      { "item": "heavy_plus_battery_cell", "prob": 10, "charges-min": 1500, "charges-max": 1500 },
+      { "item": "heavy_disposable_cell", "prob": 80, "charges-min": 3000, "charges-max": 3000 }
     ]
   },
   {

data/json/items/battery.json

@@ -23,8 +23,8 @@
     "name": { "str": "ultra-light battery", "str_pl": "ultra-light batteries" },
     "description": "This is a light battery cell designed for small size over everything else.  It retains its universal compatibility, though.",
     "ascii_picture": "ultra_light_battery",
-    "weight": "5 g",
-    "volume": "1 ml",
+    "weight": "75 g",
+    "volume": "50 ml",
     "price": "15 USD",
     "price_postapoc": "50 cent",
     "material": [ "iron", "plastic" ],
@@ -42,8 +42,8 @@
     "name": { "str": "ultra-light plutonium battery", "str_pl": "ultra-light plutonium batteries" },
     "description": "This battery uses a thin plutonium-244 rod to stabilize an exotic nanocompound, manufactured from repurposed plutonium fission cells.  It is universally compatible with small devices.  Although it stores a huge amount of power, it cannot be recharged.",
     "ascii_picture": "ultra_light_battery_plut",
-    "weight": "80 g",
-    "volume": "1 ml",
+    "weight": "75 g",
+    "volume": "50 ml",
     "price": "150 USD",
     "price_postapoc": "2 USD",
     "material": [ "iron", "plastic" ],
@@ -61,16 +61,16 @@
     "category": "battery",
     "name": { "str": "ultra-light disposable battery", "str_pl": "ultra-light disposable batteries" },
     "description": "This is a light battery cell designed for small size over everything else.  It retains its universal compatibility, though.  The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
-    "weight": "5 g",
-    "volume": "1 ml",
+    "weight": "75 g",
+    "volume": "50 ml",
     "price": "30 USD",
     "price_postapoc": "1 USD",
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
     "ammo_type": "battery",
-    "count": 100,
-    "capacity": 100,
+    "count": 150,
+    "capacity": 150,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD" ]
   },
@@ -81,8 +81,8 @@
     "name": { "str": "light battery", "str_pl": "light batteries" },
     "description": "This is a light battery cell, universally compatible with all kinds of small devices.",
     "ascii_picture": "light_battery",
-    "weight": "30 g",
-    "volume": "25ml",
+    "weight": "150 g",
+    "volume": "100 ml",
     "price": "35 USD",
     "price_postapoc": "1 USD",
     "material": [ "iron", "plastic" ],
@@ -99,8 +99,8 @@
     "category": "battery",
     "name": { "str": "light battery (high-capacity)", "str_pl": "light batteries (high-capacity)" },
     "description": "This is a high-capacity light battery cell, universally compatible with all kinds of small devices.",
-    "weight": "45 g",
-    "volume": "35ml",
+    "weight": "150 g",
+    "volume": "100 ml",
     "price": "50 USD",
     "price_postapoc": "150 cent",
     "material": [ "iron", "plastic" ],
@@ -118,8 +118,8 @@
     "name": { "str": "light plutonium battery", "str_pl": "light plutonium batteries" },
     "description": "This battery uses a thin plutonium-244 rod to stabilize an exotic nanocompound, manufactured from repurposed plutonium fission cells.  It is universally compatible with all kinds of personal electronic devices.  Although it stores a huge amount of power, it cannot be recharged.",
     "ascii_picture": "light_battery_plut",
-    "weight": "160 g",
-    "volume": "35ml",
+    "weight": "150 g",
+    "volume": "100 ml",
     "price": "500 USD",
     "price_postapoc": "4 USD",
     "material": [ "iron", "plastic" ],
@@ -137,8 +137,8 @@
     "category": "battery",
     "name": { "str": "light disposable battery", "str_pl": "light disposable batteries" },
     "description": "This is a light battery cell, universally compatible with all kinds of small devices.  The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
-    "weight": "45 g",
-    "volume": "35ml",
+    "weight": "150 g",
+    "volume": "100 ml",
     "price": "100 USD",
     "price_postapoc": "2 USD",
     "material": [ "iron", "plastic" ],
@@ -157,8 +157,8 @@
     "name": { "str": "medium battery", "str_pl": "medium batteries" },
     "description": "This is a medium battery cell, universally compatible with all kinds of appliances and power tools.",
     "ascii_picture": "medium_battery",
-    "weight": "600 g",
-    "volume": "450ml",
+    "weight": "750 g",
+    "volume": "500 ml",
     "price": "100 USD",
     "price_postapoc": "3 USD",
     "material": [ "iron", "plastic" ],
@@ -175,15 +175,15 @@
     "category": "battery",
     "name": { "str": "medium battery (high-capacity)", "str_pl": "medium batteries (high-capacity)" },
     "description": "This is a high-capacity medium battery cell, universally compatible with all kinds of appliances and power tools.",
-    "weight": "725 g",
-    "volume": "525ml",
+    "weight": "750 g",
+    "volume": "500 ml",
     "price": "125 USD",
     "price_postapoc": "4 USD",
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
     "ammo_type": "battery",
-    "capacity": 600,
+    "capacity": 750,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE", "MAG_COMPACT" ]
   },
@@ -194,8 +194,8 @@
     "name": { "str": "medium plutonium battery", "str_pl": "medium plutonium batteries" },
     "description": "This battery uses a thin plutonium-244 rod to stabilize an exotic nanocompound, manufactured from repurposed plutonium fission cells.  It is universally compatible with all kinds of appliances and power tools.  Although it stores a huge amount of power, it cannot be recharged.",
     "ascii_picture": "medium_battery_plut",
-    "weight": "1000 g",
-    "volume": "525ml",
+    "weight": "750 g",
+    "volume": "500 ml",
     "price": "1 kUSD",
     "price_postapoc": "10 USD",
     "material": [ "iron", "plastic" ],
@@ -213,16 +213,16 @@
     "category": "battery",
     "name": { "str": "medium disposable battery", "str_pl": "medium disposable batteries" },
     "description": "This is a medium battery cell, universally compatible with all kinds of appliances and power tools.  The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
-    "weight": "725 g",
-    "volume": "525ml",
+    "weight": "750 g",
+    "volume": "500 ml",
     "price": "100 USD",
     "price_postapoc": "5 USD",
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
     "ammo_type": "battery",
-    "count": 1200,
-    "capacity": 1200,
+    "count": 1500,
+    "capacity": 1500,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "MAG_COMPACT" ]
   },
@@ -233,8 +233,8 @@
     "name": { "str": "heavy battery", "str_pl": "heavy batteries" },
     "description": "This is a heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.",
     "ascii_picture": "heavy_battery",
-    "weight": "1000 g",
-    "volume": "1225ml",
+    "weight": "1500 g",
+    "volume": "1 L",
     "price": "100 USD",
     "price_postapoc": "5 USD",
     "material": [ "iron", "plastic" ],
@@ -251,15 +251,15 @@
     "category": "battery",
     "name": { "str": "heavy battery (high-capacity)", "str_pl": "heavy batteries (high-capacity)" },
     "description": "This is a high-capacity heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.",
-    "weight": "1250 g",
-    "volume": "1500ml",
+    "weight": "1500 g",
+    "volume": "1 L",
     "price": "125 USD",
     "price_postapoc": "6 USD",
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
     "ammo_type": "battery",
-    "capacity": 1250,
+    "capacity": 1500,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE", "MAG_BULKY" ]
   },
@@ -270,8 +270,8 @@
     "name": { "str": "heavy plutonium battery", "str_pl": "heavy plutonium batteries" },
     "description": "This battery uses a thin plutonium-244 rod to stabilize an exotic nanocompound, manufactured from repurposed plutonium fission cells.  It is universally compatible with all kinds of industrial-grade equipment and large tools.  Although it stores a huge amount of power, it cannot be recharged.",
     "ascii_picture": "heavy_battery_plut",
-    "weight": "1600 g",
-    "volume": "1500ml",
+    "weight": "1500 g",
+    "volume": "1 L",
     "price": "1 kUSD",
     "price_postapoc": "15 USD",
     "material": [ "iron", "plastic" ],
@@ -289,8 +289,8 @@
     "category": "battery",
     "name": { "str": "military plutonium fuel cell" },
     "description": "This battery uses a huge plutonium-244 rod to stabilize an exotic nanocompound, manufactured from repurposed plutonium fission cells.  It was used in military mech-suits, was highly experimental, and had no civilian applications.  Although it stores a stupendous amount of power, it cannot be recharged.",
-    "weight": "64000 g",
-    "volume": "30 L",
+    "weight": "15 kg",
+    "volume": "10 L",
     "price": "1 kUSD",
     "price_postapoc": "50 USD",
     "material": [ "superalloy", "plastic" ],
@@ -308,16 +308,16 @@
     "category": "battery",
     "name": { "str": "heavy disposable battery", "str_pl": "heavy disposable batteries" },
     "description": "This is a heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.  The battery's chemistry means that it has a very high capacity, but cannot be recharged.",
-    "weight": "1250 g",
-    "volume": "1500ml",
+    "weight": "1500 g",
+    "volume": "1 L",
     "price": "100 USD",
     "price_postapoc": "750 cent",
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
     "ammo_type": "battery",
-    "count": 2500,
-    "capacity": 2500,
+    "count": 3000,
+    "capacity": 3000,
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "MAG_BULKY" ]
   }

data/json/items/melee/misc.json

@@ -94,13 +94,12 @@
     "category": "weapons",
     "name": { "str": "tazer" },
     "description": "This is a high-powered stun gun.  Use this item to attempt to electrocute an adjacent enemy, damaging and temporarily paralyzing them.  Because the shock can actually jump through the air, it is difficult to miss.",
-    "weight": "151 g",
-    "volume": "250 ml",
+    "weight": "300 g",
+    "volume": "500 ml",
     "price": 14000,
     "price_postapoc": 1500,
     "to_hit": -1,
     "bashing": 6,
-    "//": "Yes, this is smaller than its magazine well. Go with it.",
     "material": [ "plastic", "aluminum" ],
     "symbol": ";",
     "color": "dark_gray",
@@ -113,6 +112,7 @@
         [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ]
       ]
     ],
-    "magazine_well": "500 ml"
+    "magazine_well": "500 ml",
+    "flags": [ "BELT_CLIP" ]
   }
 ]

data/json/items/tool/electronics.json

@@ -110,7 +110,7 @@
         ]
       ]
     ],
-    "magazine_well": "250 ml"
+    "magazine_well": "100 ml"
   },
   {
     "id": "cell_phone_flashlight",
@@ -518,7 +518,7 @@
     "magazines": [
       [ "battery", [ "heavy_plus_battery_cell", "heavy_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ]
     ],
-    "magazine_well": "1500 ml",
+    "magazine_well": "1000 ml",
     "flags": [ "IS_UPS" ]
   },
   {

data/json/items/tool/fire.json

@@ -268,8 +268,8 @@
     "name": { "str": "electric lighter" },
     "description": "A battery-powered lighter.  More efficient than a crude electric firestarter, its batteries last for quite a while.",
     "copy-from": "lighter",
-    "volume": "25 ml",
-    "magazine_well": "25 ml",
+    "volume": "50 ml",
+    "magazine_well": "50 ml",
     "max_charges": 5,
     "price": "1 USD",
     "price_postapoc": "10 cent",
@@ -278,19 +278,6 @@
     "looks_like": "lighter",
     "ammo": "battery",
     "use_action": { "type": "firestarter", "moves": 50 },
-    "magazines": [
-      [
-        "battery",
-        [
-          "light_battery_cell",
-          "light_minus_battery_cell",
-          "light_plus_battery_cell",
-          "light_atomic_battery_cell",
-          "light_minus_atomic_battery_cell",
-          "light_minus_disposable_cell",
-          "light_disposable_cell"
-        ]
-      ]
-    ]
+    "magazines": [ [ "battery", [ "light_minus_battery_cell", "light_minus_atomic_battery_cell", "light_minus_disposable_cell" ] ] ]
   }
 ]

data/json/items/tool/lighting.json

@@ -228,7 +228,7 @@
         ]
       ]
     ],
-    "magazine_well": "250 ml"
+    "magazine_well": "100 ml"
   },
   {
     "id": "flashlight_on",
@@ -592,7 +592,7 @@
       "type": "transform"
     },
     "magazines": [ [ "battery", [ "light_minus_disposable_cell", "light_minus_battery_cell", "light_minus_atomic_battery_cell" ] ] ],
-    "magazine_well": "250 ml"
+    "magazine_well": "100 ml"
   },
   {
     "id": "reading_light_on",