refactor: Energy Rework

data/json/item_actions.json

@@ -164,16 +164,6 @@
     "id": "enzlave",
     "name": { "str": "Create a zombie slave" }
   },
-  {
-    "type": "item_action",
-    "id": "fireweapon_off",
-    "name": { "str": "Turn on" }
-  },
-  {
-    "type": "item_action",
-    "id": "fireweapon_on",
-    "name": { "str": "Turn off" }
-  },
   {
     "type": "item_action",
     "id": "transform",
@@ -409,21 +399,11 @@
     "id": "FILL_PIT",
     "name": { "str": "Fill pit / tamp ground" }
   },
-  {
-    "type": "item_action",
-    "id": "FIRECRACKER",
-    "name": { "str": "Light up" }
-  },
   {
     "type": "item_action",
     "id": "FIRECRACKER_ACT",
     "name": { "str": "Light up" }
   },
-  {
-    "type": "item_action",
-    "id": "FIRECRACKER_PACK",
-    "name": { "str": "Light up" }
-  },
   {
     "type": "item_action",
     "id": "FIRECRACKER_PACK_ACT",

data/json/items/armor/power_armor.json

@@ -573,8 +573,7 @@
     "warmth": 20,
     "material_thickness": 6,
     "environmental_protection": 3,
-    "max_charges": 500,
-    "ammo": "battery",
+    "max_power": "500 kJ",
     "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ACTIVE", "values": [ { "value": "STRENGTH", "add": 2 } ] } ] },
     "use_action": {
       "type": "transform",
@@ -620,8 +619,7 @@
     "storage": "7 L",
     "warmth": 10,
     "material_thickness": 8,
-    "max_charges": 500,
-    "ammo": "battery",
+    "max_power": "500 kJ",
     "relic_data": {
       "passive_effects": [
         {
@@ -688,8 +686,7 @@
     "storage": "15 L",
     "warmth": 10,
     "material_thickness": 8,
-    "max_charges": 500,
-    "ammo": "battery",
+    "max_power": "500 kJ",
     "relic_data": {
       "passive_effects": [
         {

data/json/items/battery.json

@@ -1,24 +1,7 @@
 [
-  {
-    "id": "battery_test",
-    "type": "BATTERY",
-    "category": "battery",
-    "name": { "str": "test battery", "str_pl": "test batteries" },
-    "description": "This is a testing item for the BATTERY item type.  If you found one in game, it's a bug.",
-    "weight": "200 g",
-    "volume": "250 ml",
-    "price": "15 USD",
-    "price_postapoc": "0 cent",
-    "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 +13,13 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "capacity": 50,
+    "max_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 +31,13 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "green",
-    "ammo_type": "battery",
-    "count": 500,
-    "capacity": 500,
+    "max_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 +48,13 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "count": 150,
-    "capacity": 150,
+    "max_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 +66,13 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "capacity": 100,
+    "max_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 +83,13 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "capacity": 150,
+    "max_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 +101,13 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "green",
-    "ammo_type": "battery",
-    "count": 1000,
-    "capacity": 1000,
+    "max_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 +118,13 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "count": 300,
-    "capacity": 300,
+    "max_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 +136,13 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "capacity": 500,
+    "max_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 +153,13 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "capacity": 750,
+    "max_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 +171,13 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "green",
-    "ammo_type": "battery",
-    "count": 5000,
-    "capacity": 5000,
+    "max_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 +188,13 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "count": 1500,
-    "capacity": 1500,
+    "max_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 +206,13 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "capacity": 1000,
+    "max_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 +223,13 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "capacity": 1500,
+    "max_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 +241,13 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "green",
-    "ammo_type": "battery",
-    "count": 10000,
-    "capacity": 10000,
+    "max_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 +258,13 @@
     "material": [ "superalloy", "plastic" ],
     "symbol": "=",
     "color": "red",
-    "ammo_type": "battery",
-    "count": 100000,
-    "capacity": 100000,
+    "max_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 +275,7 @@
     "material": [ "iron", "plastic" ],
     "symbol": "=",
     "color": "yellow",
-    "ammo_type": "battery",
-    "count": 3000,
-    "capacity": 3000,
+    "max_power": "3000 kJ",
     "looks_like": "battery",
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "MAG_BULKY" ]
   }

data/json/items/biosignatures.json

@@ -67,7 +67,7 @@
       "scent_typeid": "sc_fetid",
       "moves": 200,
       "duration": "1 h",
-      "charges_to_use": 1,
+      "cost": 1,
       "effects": [ { "id": "fetid_goop", "duration": 3600 } ]
     }
   }