Fixed tools activating for one turn even without charges (#35896)

* Fixed tools activation even without charges * Fixed some more tools
CleverRaven · Dec 6, 2019 · da86792 · da86792
1 parent cd4fe38
commit da86792
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json
@@ -298,6 +298,7 @@
     "symbol": "/",
     "color": "dark_gray",
     "ammo": "gasoline",
+    "charges_per_use": 1,
     "max_charges": 50,
     "techniques": "WBLOCK_2",
     "use_action": {
@@ -866,6 +867,7 @@
     "symbol": "/",
     "color": "light_gray",
     "ammo": "gasoline",
+    "charges_per_use": 1,
     "max_charges": 50,
     "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
     "use_action": {
@@ -1307,6 +1309,7 @@
     "symbol": "/",
     "color": "light_gray",
     "ammo": "gasoline",
+    "charges_per_use": 1,
     "max_charges": 50,
     "techniques": "WBLOCK_2",
     "use_action": {
@@ -1474,6 +1477,7 @@
     "symbol": "/",
     "color": "light_gray",
     "ammo": "gasoline",
+    "charges_per_use": 1,
     "max_charges": 50,
     "techniques": [ "RAPID", "WBLOCK_2" ],
     "use_action": {
@@ -1713,8 +1717,7 @@
     "color": "red",
     "ammo": "gasoline",
     "max_charges": 800,
-    "turns_per_charge": 1,
-    "revert_to": "chainsaw_off",
+    "charges_per_use": 5,
     "techniques": [ "WBLOCK_1", "SPIN", "SWEEP" ],
     "use_action": "CS_LAJATANG_OFF",
     "flags": [ "NONCONDUCTIVE", "ALWAYS_TWOHAND" ]
@@ -1730,6 +1733,7 @@
     "cutting": 140,
     "revert_to": "cs_lajatang_off",
     "use_action": "CS_LAJATANG_ON",
+    "turns_per_charge": 1,
     "qualities": [ [ "AXE", 3 ], [ "BUTCHER", -250 ] ],
     "flags": [ "MESSY", "HURT_WHEN_PULLED", "DURABLE_MELEE", "TRADER_AVOID", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ]
   },
@@ -1748,8 +1752,7 @@
     "symbol": "/",
     "color": "red",
     "ammo": "battery",
-    "power_draw": 4000000,
-    "revert_to": "elec_chainsaw_off",
+    "charges_per_use": 5,
     "techniques": [ "WBLOCK_1", "SPIN", "SWEEP" ],
     "use_action": "ECS_LAJATANG_OFF",
     "flags": [ "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
@@ -1767,6 +1770,7 @@
     "description": "A long wooden pole with electric chainsaws impractically attached to both ends.  They are currently on and draining power; use this item to turn them off.",
     "bashing": 4,
     "cutting": 140,
+    "power_draw": 4000000,
     "revert_to": "ecs_lajatang_off",
     "use_action": "ECS_LAJATANG_ON",
     "flags": [ "MESSY", "HURT_WHEN_PULLED", "DURABLE_MELEE", "TRADER_AVOID", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
@@ -1826,6 +1830,7 @@
     "symbol": "/",
     "color": "light_gray",
     "ammo": "gasoline",
+    "charges_per_use": 5,
     "max_charges": 450,
     "use_action": "COMBATSAW_OFF",
     "techniques": [ "WBLOCK_1", "SWEEP" ],
@@ -1862,6 +1867,7 @@
     "symbol": "/",
     "color": "light_gray",
     "ammo": "battery",
+    "charges_per_use": 5,
     "use_action": "E_COMBATSAW_OFF",
     "techniques": [ "WBLOCK_1", "SWEEP" ],
     "flags": [ "ALWAYS_TWOHAND" ],

diff --git a/data/json/items/tool/radio_tools.json b/data/json/items/tool/radio_tools.json
@@ -97,6 +97,7 @@
     "symbol": ";",
     "color": "light_gray",
     "ammo": "battery",
+    "charges_per_use": 1,
     "use_action": "RADIO_OFF",
     "magazines": [
       [
@@ -140,6 +141,7 @@
     "symbol": ";",
     "color": "green",
     "ammo": "battery",
+    "charges_per_use": 1,
     "flags": [ "TWO_WAY_RADIO" ],
     "magazines": [
       [

diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json
@@ -648,6 +648,7 @@
     "volume": "9 L",
     "to_hit": -3,
     "max_charges": 5000,
+    "charges_per_use": 5,
     "ammo": "plutonium",
     "use_action": "RM13ARMOR_OFF",
     "covers": [ "HEAD", "MOUTH", "EYES", "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],

diff --git a/data/json/items/tools.json b/data/json/items/tools.json
@@ -931,6 +931,7 @@
     "symbol": "/",
     "color": "yellow",
     "ammo": "battery",
+    "charges_per_use": 5,
     "use_action": "CARVER_OFF",
     "flags": [ "SHEATH_SWORD", "NONCONDUCTIVE" ],
     "magazines": [
@@ -1098,6 +1099,7 @@
     "symbol": "/",
     "color": "red",
     "ammo": "gasoline",
+    "charges_per_use": 5,
     "max_charges": 450,
     "techniques": "SWEEP",
     "use_action": "CHAINSAW_OFF",
@@ -2072,6 +2074,7 @@
     "symbol": "/",
     "color": "red",
     "ammo": "battery",
+    "charges_per_use": 5,
     "techniques": "SWEEP",
     "use_action": "ELEC_CHAINSAW_OFF",
     "flags": [ "NONCONDUCTIVE" ],
@@ -5309,6 +5312,7 @@
     "symbol": "/",
     "color": "light_gray",
     "ammo": "gasoline",
+    "charges_per_use": 1,
     "max_charges": 50,
     "use_action": {
       "type": "fireweapon_off",
@@ -6494,6 +6498,7 @@
     "color": "green",
     "ammo": "gasoline",
     "max_charges": 600,
+    "charges_per_use": 5,
     "use_action": "TRIMMER_OFF",
     "flags": [ "NONCONDUCTIVE" ]
   },