Pruning the old to-hit syntax - Part 4 (#75923)

* ``tool\cooking.json`` * ``appliances.json`` * ``tool\smoking.json`` * ``tool\misc.json`` minus the flaming chunk of steel, fuck that shit * I hate those DPS tests * Update junk_dps.json
CleverRaven · Aug 27, 2024 · bc3ba72 · bc3ba72
1 parent 1c8edf6
commit bc3ba72
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 170 deletions.
diff --git a/data/json/items/appliances.json b/data/json/items/appliances.json
@@ -176,7 +176,7 @@
     "volume": "76 L",
     "price": "1 kUSD 626 USD 54 cent",
     "price_postapoc": "20 USD",
-    "to_hit": -6,
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" },
     "material": [ "steel" ],
     "symbol": "A",
     "color": "yellow",
@@ -200,23 +200,23 @@
     "name": { "str": "disconnected wall light" },
     "description": "A wall light that provides illumination when plugged into a grid.",
     "weight": "500 g",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "uneven" },
     "material": [ "plastic", "steel" ],
     "volume": "400 ml",
     "longest_side": "20 cm",
     "price": "90 USD",
     "price_postapoc": "5 USD",
     "symbol": "L",
     "color": "white",
-    "melee_damage": { "bash": 5 }
+    "melee_damage": { "bash": 2 }
   },
   {
     "type": "GENERIC",
     "id": "standing_lamp",
     "name": { "str": "disconnected standing lamp" },
     "description": "A tall standing lamp that provides illumination when plugged into a power outlet.",
     "weight": "2500 g",
-    "to_hit": -1,
+    "to_hit": { "grip": "solid", "length": "long", "surface": "any", "balance": "uneven" },
     "material": [ "plastic", "steel" ],
     "volume": "2 L",
     "longest_side": "170 cm",
@@ -233,7 +233,7 @@
     "name": { "str": "disconnected standing floodlight" },
     "description": "A large, heavy light designed to illuminate wide areas when plugged into a power outlet.",
     "weight": "2750 g",
-    "to_hit": -1,
+    "to_hit": { "grip": "solid", "length": "long", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic", "steel" ],
     "volume": "2 L",
     "longest_side": "170 cm",
@@ -249,7 +249,7 @@
     "name": { "str": "disconnected standing directed floodlight" },
     "description": "A large, heavy light designed to illuminate a wide semicircle in a chosen direction when plugged into a power outlet.",
     "weight": "2750 g",
-    "to_hit": -1,
+    "to_hit": { "grip": "solid", "length": "long", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic", "steel" ],
     "volume": "2 L",
     "longest_side": "170 cm",
@@ -317,7 +317,7 @@
     "//0": "the base unit is 39x46x76cm (136 liters) and weighs 32 kg. I am assuming that XEDRA or another org added a lot of armor as a hedge against portal fuckery",
     "//1": "being enclosed in a solid box of milcomp plating I'm assuming about another 68 kg (3 armor platings' worth + shocks etc)",
     "weight": "100 kg",
-    "to_hit": -10,
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" },
     "material": [ "lead", "steel" ],
     "volume": "150 L",
     "longest_side": "80 cm",
@@ -337,7 +337,7 @@
     "looks_like": "f_active_backup_generator",
     "description": "A ubiquitous piece of compact machinery meant for running anything from the bathroom lights to electric stoves and other necessities when grid electricity is unavailable.  It just needs to be plugged in, fueled up, and then turned on.",
     "weight": "200 kg",
-    "to_hit": -10,
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" },
     "material": [ "steel" ],
     "volume": "200 L",
     "longest_side": "80 cm",
@@ -358,7 +358,8 @@
     "symbol": "O",
     "color": "green_white",
     "//2": "Prevent loading items into the generator while it's not in appliance form.",
-    "flags": [ "NO_RELOAD" ]
+    "flags": [ "NO_RELOAD" ],
+    "melee_damage": { "bash": 5 }
   },
   {
     "type": "GENERIC",

diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json
@@ -71,6 +71,7 @@
     "type": "TOOL",
     "name": { "str": "electric carver (off)", "str_pl": "electric carvers (off)" },
     "description": "An electric meat carver powered by batteries.  It has two serrated blades that vibrate together to slice just about anything from turkey to ham… even zombies!",
+    "to_hit": { "grip": "solid", "length": "hand", "surface": "line", "balance": "neutral" },
     "weight": "1106 g",
     "volume": "1500 ml",
     "longest_side": "30 cm",
@@ -117,7 +118,6 @@
     "type": "TOOL",
     "name": { "str": "electric carver (on)", "str_pl": "electric carvers (on)" },
     "description": "This carver is on and the blades are buzzing.  Use it to turn it off.",
-    "to_hit": 1,
     "power_draw": "150 W",
     "charges_per_use": 0,
     "revert_to": "carver_off",
@@ -163,7 +163,7 @@
     "longest_side": "30 cm",
     "price": "40 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -3,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic" ],
     "symbol": ";",
     "color": "light_gray",
@@ -187,7 +187,7 @@
     "longest_side": "45 cm",
     "price": "40 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "clay" ],
     "symbol": ";",
     "color": "light_gray",
@@ -232,7 +232,7 @@
     "longest_side": "30 cm",
     "price": "50 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "steel" ],
     "symbol": ";",
     "color": "green",
@@ -243,7 +243,7 @@
     "charges_per_use": 5,
     "qualities": [ [ "HOTPLATE", 2 ] ],
     "use_action": [ "HEAT_SOLID_ITEMS" ],
-    "melee_damage": { "bash": 4 }
+    "melee_damage": { "bash": 3 }
   },
   {
     "id": "clay_pot",
@@ -288,7 +288,7 @@
     "volume": "787 ml",
     "price": "20 USD",
     "price_postapoc": "10 cent",
-    "to_hit": 1,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "uneven" },
     "material": [ "clay" ],
     "symbol": ")",
     "color": "brown",
@@ -302,12 +302,12 @@
     "type": "TOOL",
     "name": { "str": "coffeemaker" },
     "description": "A heating element with a pot and a frame for holding coffee or other powders.  You can use it to make coffee, or other drinks if you so choose.",
-    "weight": "1000 g",
+    "weight": "1 kg",
     "volume": "7 L",
     "longest_side": "25 cm",
     "price": "20 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -5,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic" ],
     "symbol": ";",
     "color": "light_gray",
@@ -371,7 +371,6 @@
     "volume": "147 ml",
     "price": "20 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -1,
     "material": [ "aluminum" ],
     "symbol": ";",
     "color": "light_gray",
@@ -380,8 +379,7 @@
     "flags": [ "ALLOWS_REMOTE_USE" ],
     "charges_per_use": 2,
     "qualities": [ [ "HOTPLATE", 2 ] ],
-    "use_action": [ "HEAT_SOLID_ITEMS" ],
-    "melee_damage": { "bash": 2 }
+    "use_action": [ "HEAT_SOLID_ITEMS" ]
   },
   {
     "id": "flask_yeast",
@@ -422,7 +420,7 @@
     "longest_side": "40 cm",
     "price": "120 USD",
     "price_postapoc": "7 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic", "steel" ],
     "symbol": "%",
     "color": "white",
@@ -440,7 +438,7 @@
     "volume": "1250 ml",
     "price": "50 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "steel" ],
     "symbol": ";",
     "color": "green",
@@ -461,12 +459,10 @@
     "volume": "128 ml",
     "price": "1 USD",
     "price_postapoc": "50 cent",
-    "to_hit": 1,
     "material": [ "plastic" ],
     "symbol": ";",
     "color": "light_gray",
-    "use_action": [ "HEATPACK" ],
-    "melee_damage": { "bash": 1, "cut": 1 }
+    "use_action": [ "HEATPACK" ]
   },
   {
     "id": "heatpack_used",
@@ -478,11 +474,9 @@
     "volume": "128 ml",
     "price": "0 cent",
     "price_postapoc": "0 cent",
-    "to_hit": 1,
     "material": [ "plastic" ],
     "symbol": ";",
-    "color": "light_gray",
-    "melee_damage": { "bash": 1, "cut": 1 }
+    "color": "light_gray"
   },
   {
     "id": "hotplate",
@@ -494,7 +488,7 @@
     "longest_side": "35 cm",
     "price": "25 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "aluminum", "plastic" ],
     "symbol": ";",
     "color": "green",
@@ -516,7 +510,7 @@
     "longest_side": "35 cm",
     "price": "600 USD",
     "price_postapoc": "10 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "aluminum", "plastic" ],
     "symbol": ";",
     "color": "green",
@@ -537,7 +531,7 @@
     "longest_side": "35 cm",
     "price": "10 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "aluminum", "plastic" ],
     "symbol": ";",
     "color": "white",
@@ -561,18 +555,18 @@
     "description": "A self-contained camping mess kit, containing everything you might need for wilderness cooking.",
     "weight": "520 g",
     "volume": "2100 ml",
-    "//": "This item is based off https://www.amazon.com/gp/product/B01743BX1A/ref=as_li_ss_tl?ie=UTF8&linkCode=sl1&language=en_US&th=1 ",
+    "//": "Based on https://www.amazon.com/dp/B01743BX1A",
     "longest_side": "15 cm",
     "price": "30 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "aluminum" ],
     "symbol": ";",
     "color": "green",
     "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "CHEM", 1 ] ],
     "use_action": [ "HEAT_ALL_ITEMS" ],
     "pocket_data": [ { "max_contains_volume": "1000 ml", "max_contains_weight": "2 kg", "watertight": true, "rigid": true } ],
-    "melee_damage": { "bash": 4 }
+    "melee_damage": { "bash": 3 }
   },
   {
     "id": "milk_cream_jar",
@@ -626,7 +620,7 @@
     "longest_side": "12 cm",
     "price": "0 cent",
     "price_postapoc": "10 cent",
-    "to_hit": -4,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "uneven" },
     "material": [ "stone" ],
     "symbol": ":",
     "color": "light_gray",
@@ -643,7 +637,7 @@
     "volume": "3750 ml",
     "price": "200 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -3,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "steel", "plastic" ],
     "symbol": ";",
     "color": "red",
@@ -682,7 +676,7 @@
     "volume": "1250 ml",
     "price": "50 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "steel" ],
     "symbol": ";",
     "color": "green",
@@ -800,7 +794,7 @@
     "description": "A sealable pot, designed to cook food at higher pressures and temperatures.  Useful for all kinds of cooking, and it can also be used for pressure-sensitive chemical reactions.",
     "price": "65 USD",
     "price_postapoc": "50 cent",
-    "to_hit": 1,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "steel" ],
     "symbol": ")",
     "color": "light_gray",
@@ -820,7 +814,7 @@
     "volume": "12 L",
     "longest_side": "30 cm",
     "price": "1 USD",
-    "to_hit": -4,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "stone" ],
     "symbol": ":",
     "color": "light_gray",
@@ -864,7 +858,7 @@
     "//": "size, weight, pricing, power, etc. was based on https://www.amazon.com/Hawaiian-Shaved-Ice-S900A-Machine/dp/B004UBMRKG/ref=asc_df_B004UBMRKG",
     "price": "50 USD",
     "price_postapoc": "1 USD 50 cent",
-    "to_hit": -3,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic", "steel" ],
     "symbol": ";",
     "color": "white",
@@ -927,11 +921,11 @@
     "type": "TOOL",
     "name": { "str": "still" },
     "description": "A large still, useful for creating distillations of alcohol and other, more curious substances.  Features a slot for a thermometer.",
-    "weight": "10000 g",
+    "weight": "10 kg",
     "volume": "10 L",
     "price": "300 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -6,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "copper" ],
     "symbol": "L",
     "color": "white",
@@ -949,7 +943,7 @@
     "longest_side": "24 cm",
     "price": "20 USD",
     "price_postapoc": "1 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "steel", "glass" ],
     "symbol": ";",
     "color": "brown",
@@ -994,7 +988,7 @@
     "longest_side": "35 cm",
     "price": "25 USD",
     "price_postapoc": "20 USD",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "aluminum", "plastic" ],
     "symbol": ";",
     "color": "white",
@@ -1041,7 +1035,7 @@
     "volume": "3 L",
     "price": "100 USD",
     "price_postapoc": "15 USD",
-    "to_hit": -3,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic", "steel" ],
     "symbol": ";",
     "color": "light_blue",
@@ -1070,7 +1064,6 @@
     "volume": "21000 ml",
     "price": 1000,
     "price_postapoc": 150,
-    "to_hit": -3,
     "material": [ { "type": "sand", "portion": 29 }, { "type": "plastic", "portion": 1 } ],
     "symbol": ";",
     "color": "light_blue"
@@ -1084,7 +1077,7 @@
     "volume": "1250 ml",
     "price": "50 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "steel" ],
     "symbol": ";",
     "color": "green",
@@ -1124,7 +1117,7 @@
     "volume": "1500 ml",
     "price": "50 USD",
     "price_postapoc": "2 USD 50 cent",
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" },
     "material": [ "brass", "steel" ],
     "symbol": ";",
     "color": "green",