glass, metal, and home improvement

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

Hide file tree

Showing 4 changed files with 9 additions and 20 deletions.
diff --git a/data/json/items/resources/glass.json b/data/json/items/resources/glass.json
@@ -18,7 +18,7 @@
       "done_message": "You carefully place the shards on the ground, ready to be cracked by something passing by."
     },
     "flags": [ "HURT_WHEN_WIELDED", "TRADER_AVOID", "SINGLE_USE", "FRAGILE_MELEE", "ALLOWS_BODY_BLOCK" ],
-    "to_hit": -1,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "point", "balance": "neutral" },
     "melee_damage": { "cut": 6 },
     "weapon_category": [ "SHIVS" ]
   },
@@ -36,7 +36,7 @@
     "weight": "6577 g",
     "volume": "2655 ml",
     "longest_side": "122 cm",
-    "to_hit": -5,
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" },
     "use_action": {
       "type": "place_trap",
       "trap": "tr_glass",
@@ -61,7 +61,7 @@
     "weight": "45900 g",
     "volume": "21200 ml",
     "longest_side": "122 cm",
-    "to_hit": -6,
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 6 }
   },
   {
@@ -94,7 +94,7 @@
     "weight": "17514 g",
     "volume": "7070 ml",
     "longest_side": "122 cm",
-    "to_hit": -5,
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" },
     "melee_damage": { "bash": 6 }
   }
 ]
diff --git a/data/json/items/resources/home_improvement.json b/data/json/items/resources/home_improvement.json
@@ -182,8 +182,7 @@
     "price_postapoc": "50 cent",
     "material": [ "brass", "glass" ],
     "weight": "5 g",
-    "volume": "250 ml",
-    "to_hit": -3
+    "volume": "250 ml"
   },
   {
     "type": "GENERIC",
@@ -198,7 +197,6 @@
     "price_postapoc": "50 cent",
     "material": [ "plastic" ],
     "weight": "25 g",
-    "volume": "1000 ml",
-    "to_hit": -3
+    "volume": "1000 ml"
   }
 ]
diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json
@@ -65,7 +65,7 @@
     "category": "spare_parts",
     "weight": "345 g",
     "longest_side": "60 cm",
-    "to_hit": -1,
+    "to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "neutral" },
     "color": "light_red",
     "symbol": "/",
     "material": [ "copper" ],
@@ -248,7 +248,7 @@
     "//": "Roughly in the 15cm×15cm to 20cm×20cm range. Compact and stacks well, so equally dense as a solid block.",
     "price": "20 USD",
     "price_postapoc": "10 cent",
-    "to_hit": -3,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
     "stack_size": 8,
     "material": [ "lc_steel" ],
     "symbol": "]",
@@ -288,7 +288,7 @@
     "//1": "250ml × 8.0 = 2kg -> 1000g/unit @ stack 2; formed as a solid ingot so weight is 100% of this",
     "price": "20 USD",
     "price_postapoc": "50 cent",
-    "to_hit": -4,
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
     "stack_size": 2,
     "material": [ "steel" ],
     "symbol": ",",

diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json
@@ -122,7 +122,6 @@
       "counterweight",
       "crafted_suppressor",
       "crater_bomb",
-      "cu_pipe",
       "cuvettes",
       "cz600",
       "damaged_shelter_kit",
@@ -188,8 +187,6 @@
       "gatling_mech_laser",
       "gelbox",
       "glass_prism",
-      "glass_shard",
-      "glass_sheet",
       "glass_thermometer",
       "glass_tube_small",
       "glowstick",
@@ -331,7 +328,6 @@
       "pedal_extenders",
       "pedal_extenders_makeshift",
       "pedal_grindstone",
-      "peephole",
       "ph_meter",
       "pike_pole",
       "pipe_shotgun",
@@ -359,7 +355,6 @@
       "recharge_station",
       "recoil_stock",
       "recovery_pump",
-      "reinforced_glass_sheet",
       "remington700_270",
       "remington_700",
       "remington_870",
@@ -399,15 +394,13 @@
       "scrambler",
       "scrambler_act",
       "scraper_steel",
-      "screen_mesh",
       "screw_press_tool",
       "seat",
       "seat_bench",
       "sextant",
       "sharps",
       "shavingkit",
       "shears",
-      "sheet_metal_small",
       "shelter_kit",
       "shot_suppressor",
       "shotgun_s",
@@ -425,7 +418,6 @@
       "spring_plate",
       "stand_ring_clamps",
       "steel_grille",
-      "steel_lump",
       "steel_plate",
       "steyr_aug",
       "still_lab",
@@ -442,7 +434,6 @@
       "tearer",
       "telepad",
       "teleporter",
-      "tempered_glass_sheet",
       "tent_kit",
       "tent_pole",
       "test_2x4",