refactor: Energy Rework

data/json/items/battery.json

@@ -12,13 +12,12 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "max_capacity": "30 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
   },
   {
     "id": "light_minus_battery_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "category": "battery",
     "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.",
@@ -30,14 +29,14 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "capacity": 50,
+    "max_power": "50 kJ",
+    "initial_power": "50 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE" ]
   },
   {
     "id": "light_minus_atomic_battery_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "category": "battery",
     "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.",
@@ -49,15 +48,14 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "green",
-    "ammo_type": "battery",
-    "count": 500,
-    "capacity": 500,
+    "max_power": "500 kJ",
+    "initial_power": "500 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "LEAK_DAM", "RADIOACTIVE" ]
   },
   {
     "id": "light_minus_disposable_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "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.",
@@ -68,15 +66,14 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "count": 150,
-    "capacity": 150,
+    "max_power": "150 kJ",
+    "initial_power": "150 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD" ]
   },
   {
     "id": "light_battery_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "category": "battery",
     "name": { "str": "light battery", "str_pl": "light batteries" },
     "description": "This is a light battery cell, universally compatible with all kinds of small devices.",
@@ -88,14 +85,14 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "capacity": 100,
+    "max_power": "100 kJ",
+    "initial_power": "100 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE", "MAG_COMPACT" ]
   },
   {
     "id": "light_plus_battery_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "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.",
@@ -106,14 +103,14 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "capacity": 150,
+    "max_power": "150 kJ",
+    "initial_power": "150 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE", "MAG_COMPACT" ]
   },
   {
     "id": "light_atomic_battery_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "category": "battery",
     "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.",
@@ -125,15 +122,14 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "green",
-    "ammo_type": "battery",
-    "count": 1000,
-    "capacity": 1000,
+    "max_power": "1000 kJ",
+    "initial_power": "1000 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "LEAK_DAM", "RADIOACTIVE", "MAG_COMPACT" ]
   },
   {
     "id": "light_disposable_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "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.",
@@ -144,15 +140,14 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "count": 300,
-    "capacity": 300,
+    "max_power": "300 kJ",
+    "initial_power": "300 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "MAG_COMPACT" ]
   },
   {
     "id": "medium_battery_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "category": "battery",
     "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.",
@@ -164,14 +159,14 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "capacity": 500,
+    "max_power": "500 kJ",
+    "initial_power": "500 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE", "MAG_COMPACT" ]
   },
   {
     "id": "medium_plus_battery_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "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.",
@@ -182,14 +177,14 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "capacity": 750,
+    "max_power": "750 kJ",
+    "initial_power": "750 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE", "MAG_COMPACT" ]
   },
   {
     "id": "medium_atomic_battery_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "category": "battery",
     "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.",
@@ -201,15 +196,14 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "green",
-    "ammo_type": "battery",
-    "count": 5000,
-    "capacity": 5000,
+    "max_power": "5000 kJ",
+    "initial_power": "5000 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "LEAK_DAM", "RADIOACTIVE", "MAG_COMPACT" ]
   },
   {
     "id": "medium_disposable_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "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.",
@@ -220,15 +214,14 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "count": 1500,
-    "capacity": 1500,
+    "max_power": "1500 kJ",
+    "initial_power": "1500 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "MAG_COMPACT" ]
   },
   {
     "id": "heavy_battery_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "category": "battery",
     "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.",
@@ -240,14 +233,14 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "capacity": 1000,
+    "max_power": "1000 kJ",
+    "initial_power": "1000 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE", "MAG_BULKY" ]
   },
   {
     "id": "heavy_plus_battery_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "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.",
@@ -258,14 +251,14 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "capacity": 1500,
+    "max_power": "1500 kJ",
+    "initial_power": "1500 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "RECHARGE", "MAG_BULKY" ]
   },
   {
     "id": "heavy_atomic_battery_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "category": "battery",
     "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.",
@@ -277,15 +270,14 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "green",
-    "ammo_type": "battery",
-    "count": 10000,
-    "capacity": 10000,
+    "max_power": "10000 kJ",
+    "initial_power": "10000 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "LEAK_DAM", "RADIOACTIVE", "MAG_BULKY" ]
   },
   {
     "id": "huge_atomic_battery_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "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.",
@@ -296,15 +288,14 @@
     "material": [ "superalloy", "plastic" ],
     "symbol": "=",
     "color": "red",
-    "ammo_type": "battery",
-    "count": 100000,
-    "capacity": 100000,
+    "max_power": "100000 kJ",
+    "initial_power": "100000 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "MECH_BAT", "LEAK_DAM", "RADIOACTIVE" ]
   },
   {
     "id": "heavy_disposable_cell",
-    "type": "MAGAZINE",
+    "type": "BATTERY",
     "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.",
@@ -315,9 +306,8 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "count": 3000,
-    "capacity": 3000,
+    "max_power": "3000 kJ",
+    "initial_power": "3000 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "MAG_BULKY" ]
   }

data/json/items/generic.json

@@ -2545,46 +2545,6 @@
     "volume": "5 ml",
     "to_hit": -3,
     "max_charges": 200000000,
-    "rand_charges": [
-      0,
-      1,
-      2,
-      3,
-      4,
-      5,
-      6,
-      7,
-      8,
-      9,
-      10,
-      50,
-      100,
-      200,
-      300,
-      500,
-      800,
-      1000,
-      1200,
-      1400,
-      1600,
-      1800,
-      2000,
-      3000,
-      4000,
-      5000,
-      6000,
-      7000,
-      8000,
-      9000,
-      10000,
-      12000,
-      14000,
-      16000,
-      18000,
-      20000,
-      50000,
-      100000
-    ],
     "ammo": "money"
   },
   {

data/json/items/tool/cooking.json

@@ -738,7 +738,7 @@
     "symbol": ";",
     "color": "red",
     "ammo": "battery",
-    "power_draw": 1500000,
+    "power_draw": "1J",
     "qualities": [ [ "CONTAIN", 1 ] ],
     "use_action": "MULTICOOKER",
     "magazines": [

data/json/items/tool/electronics.json

@@ -576,7 +576,6 @@
       "target": "bionic_scanner_on",
       "msg": "You start scanning for bionics.",
       "active": true,
-      "need_charges": 1,
       "need_charges_msg": "The scanner doesn't have enough power.",
       "type": "transform"
     },
@@ -610,7 +609,7 @@
     "color": "magenta",
     "use_action": "NOTE_BIONICS",
     "revert_to": "bionic_scanner",
-    "power_draw": 10000,
+    "power_draw": "100 J",
     "revert_msg": "The %s shuts down."
   }
 ]

data/json/items/tool/fire.json

@@ -102,7 +102,6 @@
     "material": [ "plastic", "aluminum" ],
     "symbol": ",",
     "color": "blue",
-    "rand_charges": [ 1, 10, 12, 15, 16, 22, 44, 50, 67, 75, 82, 100 ],
     "max_charges": 100,
     "charges_per_use": 1,
     "use_action": { "type": "firestarter", "moves": 50 },

data/json/obsoletion/items.json

@@ -43,7 +43,6 @@
     "name": { "str": "active makeshift grenade" },
     "description": "This is an active grenade, and will explode any second now.  Better throw it!",
     "price": "0 cent",
-    "rand_charges": [ 2, 7 ],
     "max_charges": 7,
     "turns_per_charge": 1,
     "use_action": {