get started on tools

CleverRaven · Dec 11, 2024 · 7651b52 · 7651b52
1 parent 79bfa8d
commit 7651b52
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 32 deletions.
diff --git a/data/json/items/tool/cables.json b/data/json/items/tool/cables.json
@@ -5,7 +5,6 @@
     "name": { "str": "power cord" },
     "description": "A power cord, like you've seen many times before: it's a short multi-stranded copper cord with a power outlet at the end.",
     "//": "This cable is automatically handled by vehicles/appliances and is used for connecting them to each other.  See vehicle part in furniture_and_terrain > appliances.json",
-    "to_hit": 1,
     "color": "dark_gray",
     "symbol": "&",
     "material": [ "copper", "plastic" ],
@@ -17,8 +16,7 @@
     "max_charges": 2,
     "initial_charges": 2,
     "use_action": { "type": "link_up", "menu_text": "Plug in / Manage connections", "targets": [ "vehicle_port" ] },
-    "flags": [ "CABLE_SPOOL", "NO_DROP", "SINGLE_USE" ],
-    "melee_damage": { "bash": 2 }
+    "flags": [ "CABLE_SPOOL", "NO_DROP", "SINGLE_USE" ]
   },
   {
     "type": "TOOL",
@@ -62,7 +60,7 @@
     "id": "extension_cable",
     "name": { "str": "extension cord" },
     "description": "A long 30-foot (or about 10 m) orange extension cord for extending cables or connecting appliances.  Could be used on any appliance or other household electrical system.",
-    "to_hit": 1,
+    "to_hit": { "grip": "bad", "length": "long", "surface": "line", "balance": "good" },
     "color": "light_blue",
     "symbol": "&",
     "material": [ "copper", "plastic" ],
@@ -99,7 +97,7 @@
     "id": "hd_tow_cable",
     "name": { "str": "heavy-duty tow cable" },
     "description": "An extremely heavy-duty 30-foot (or about 9 m) tow cable made from thick steel wire coated in plastic.  If attached to a vehicle, it could be used to pull another vehicle of any weight.",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "long", "surface": "line", "balance": "good" },
     "color": "light_blue",
     "symbol": "&",
     "material": [ "steel", "plastic" ],

diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json
@@ -94,7 +94,6 @@
     "longest_side": "60 cm",
     "price": "8 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": 1,
     "material": [ "copper", "wood" ],
     "symbol": ",",
     "color": "light_gray",
@@ -109,7 +108,6 @@
     "volume": "500 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": -8,
     "material": [ "plastic", "steel" ],
     "symbol": ";",
     "color": "white",
@@ -118,8 +116,7 @@
     "use_action": [ "EHANDCUFFS" ],
     "tick_action": [ "EHANDCUFFS_TICK" ],
     "//": "Don't add ELECTRONIC flag here, since these handcuffs have their own behavior when affected by EMP blast",
-    "flags": [ "ALWAYS_TWOHAND", "TRADER_AVOID", "WATER_BREAK" ],
-    "melee_damage": { "cut": 1 }
+    "flags": [ "ALWAYS_TWOHAND", "TRADER_AVOID", "WATER_BREAK" ]
   },
   {
     "id": "eink_tablet_pc",
@@ -132,8 +129,7 @@
     "longest_side": "158 mm",
     "price": "85 USD",
     "price_postapoc": "10 cent",
-    "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "neutral" },
-    "material": [ { "type": "aluminum", "portion": 75 }, { "type": "plastic", "portion": 25 } ],
+    "material": [ { "type": "aluminum", "portion": 3 }, { "type": "plastic", "portion": 1 } ],
     "symbol": ";",
     "color": "blue",
     "ammo": [ "battery" ],
@@ -200,7 +196,6 @@
     "volume": "478 ml",
     "price": "340 USD",
     "price_postapoc": "2 USD",
-    "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "uneven" },
     "material": [ "plastic", "aluminum" ],
     "ascii_picture": "electrohack",
     "symbol": ",",
@@ -215,7 +210,6 @@
         "default_magazine": "medium_battery_cell"
       }
     ],
-    "melee_damage": { "bash": 5 },
     "charges_per_use": 1,
     "qualities": [ [ "HACK", 2 ] ]
   },
@@ -465,7 +459,7 @@
     "volume": "1 L",
     "price": "0 cent",
     "price_postapoc": "50 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "solid", "length": "hand", "surface": "any", "balance": "neutral" },
     "material": [ "plastic", "aluminum" ],
     "symbol": ";",
     "color": "yellow",
@@ -487,7 +481,7 @@
         "default_magazine": "light_battery_cell"
       }
     ],
-    "melee_damage": { "bash": 6 }
+    "melee_damage": { "bash": 2 }
   },
   {
     "id": "noise_emitter_on",
@@ -518,7 +512,7 @@
     "volume": "355 ml",
     "price": "0 cent",
     "price_postapoc": "50 cent",
-    "to_hit": { "grip": "solid", "length": "hand", "surface": "point", "balance": "neutral" },
+    "to_hit": { "grip": "solid", "length": "hand", "surface": "any", "balance": "neutral" },
     "material": [ "plastic", "aluminum" ],
     "symbol": ";",
     "color": "yellow",
@@ -540,7 +534,7 @@
         "default_magazine": "medium_battery_cell"
       }
     ],
-    "melee_damage": { "bash": 6 }
+    "melee_damage": { "bash": 2 }
   },
   {
     "id": "emf_detector_on",
@@ -693,7 +687,7 @@
     "volume": "2500 ml",
     "price": "2 kUSD 800 USD",
     "price_postapoc": "15 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "uneven" },
     "material": [ "aluminum", "plastic" ],
     "symbol": ";",
     "color": "light_gray",
@@ -718,7 +712,7 @@
     "volume": "2500 ml",
     "price": "2 kUSD 800 USD",
     "price_postapoc": "15 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "uneven" },
     "material": [ "aluminum", "plastic" ],
     "symbol": ";",
     "color": "light_gray",
@@ -751,7 +745,7 @@
     "volume": "2500 ml",
     "price": "2 kUSD 800 USD",
     "price_postapoc": "15 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "uneven" },
     "material": [ "aluminum", "plastic" ],
     "symbol": ";",
     "color": "light_gray",
@@ -820,7 +814,7 @@
     "volume": "2500 ml",
     "price": "2 kUSD 800 USD",
     "price_postapoc": "15 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "uneven" },
     "material": [ "aluminum", "plastic" ],
     "symbol": ";",
     "color": "light_gray",
@@ -868,7 +862,7 @@
     "name": { "str": "super noise emitter (off)", "str_pl": "super noise emitters (off)" },
     "description": "This is a noisemaker that has been further enhanced with a series of amplifiers.  It's about as loud something can get without making you vomit from sound-induced nausea, and it's as sure to attract every zombie in town as it is to give you permanent hearing damage.",
     "//": "I estimate this thing is about 130 decibels.  Commercial amps can hit similar noise levels at a 100-200w of power input, the survivor's is less efficient.",
-    "weight": "6000 g",
+    "weight": "6 kg",
     "volume": "4 L",
     "longest_side": "30 cm",
     "price": "0 cent",

diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json
@@ -9,9 +9,6 @@
       "EMPbomb_act",
       "LAW",
       "M24",
-      "UPS_OFF",
-      "UPS_ON",
-      "UPS_off",
       "acidbomb",
       "adjustable_stock",
       "ak308",
@@ -133,14 +130,12 @@
       "deflated_wheel_slick",
       "deflated_wheel_wide",
       "digging_stick",
-      "directional_antenna",
       "diveknife",
       "draw_plate",
       "drift",
       "drill_rock_primitive",
       "dynamite",
       "dynamite_bomb",
-      "e_handcuffs",
       "elec_chainsaw_off",
       "elec_chainsaw_on",
       "elec_hairtrimmer",
@@ -154,7 +149,6 @@
       "engineering_engine_kit",
       "engineering_makerspace_kit",
       "engineering_robotics_kit",
-      "extension_cable",
       "extinguisher",
       "fake_dynamite_50lbs",
       "feral_human_thrown_rock",
@@ -181,7 +175,6 @@
       "funnel_separation",
       "g_shovel",
       "garand",
-      "gas_charger",
       "gas_forge",
       "gasbomb_makeshift_act",
       "gatling_mech_laser",
@@ -206,7 +199,6 @@
       "hand_controls",
       "hand_rims",
       "hard_plate",
-      "hd_tow_cable",
       "hdframe",
       "henry_big_boy",
       "hk417_13",
@@ -310,7 +302,6 @@
       "multimeter",
       "nitrogen_generator",
       "nitrogen_tank",
-      "noise_emitter",
       "number4_mki",
       "ny_hook",
       "office_letter_opener",
@@ -340,7 +331,6 @@
       "platinum_grille",
       "pockknife",
       "portal",
-      "power_cord",
       "pressure_tank",
       "primitive_knife",
       "pseudo_m203",