Merge pull request #41079 from mlangsdorf/melee_validation

weapons: add tests to confirm melee weapon value and adjust some weapons (part 1)

data/json/items/melee/bludgeons.json

@@ -129,9 +129,8 @@
     "volume": "2500 ml",
     "price": 40000,
     "price_postapoc": 12000,
-    "to_hit": 1,
-    "bashing": 22,
-    "cutting": 40,
+    "bashing": 19,
+    "cutting": 38,
     "material": [ "steel", "wood" ],
     "symbol": "/",
     "color": "light_gray",
@@ -153,7 +152,7 @@
     "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
     "weight": "2068 g",
     "volume": "3250 ml",
-    "bashing": 21,
+    "bashing": 19,
     "cutting": 3,
     "to_hit": 1,
     "category": "weapons"
@@ -170,11 +169,10 @@
     "material": [ "budget_steel", "wood" ],
     "weight": "2002 g",
     "volume": "2500 ml",
-    "bashing": 42,
+    "bashing": 38,
     "cutting": 10,
     "flags": [ "NONCONDUCTIVE", "SHEATH_AXE" ],
     "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
-    "to_hit": 1,
     "category": "weapons",
     "qualities": [ [ "AXE", 2 ], [ "BUTCHER", -20 ] ]
   },
@@ -477,7 +475,7 @@
     "techniques": [ "WBLOCK_1" ],
     "weight": "420 g",
     "volume": "1750 ml",
-    "bashing": 18,
+    "bashing": 14,
     "cutting": 1,
     "to_hit": 2
   },
@@ -514,7 +512,7 @@
     "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
     "weight": "2200 g",
     "volume": "3 L",
-    "bashing": 29,
+    "bashing": 32,
     "category": "weapons",
     "to_hit": 3,
     "qualities": [ [ "HAMMER", 1 ] ]
@@ -581,8 +579,8 @@
     "techniques": [ "WBLOCK_1", "WIDE", "SWEEP" ],
     "weight": "3200 g",
     "volume": "3750 ml",
-    "bashing": 34,
-    "cutting": 34,
+    "bashing": 44,
+    "cutting": 33,
     "to_hit": 1,
     "price_postapoc": 10000,
     "qualities": [ [ "COOK", 1 ] ]
@@ -601,8 +599,8 @@
     "techniques": [ "WBLOCK_1", "SWEEP" ],
     "weight": "2700 g",
     "volume": "3750 ml",
-    "bashing": 48,
-    "cutting": 8,
+    "bashing": 25,
+    "cutting": 2,
     "to_hit": 1,
     "qualities": [ [ "COOK", 1 ] ]
   },
@@ -963,7 +961,7 @@
     "price": 8000,
     "to_hit": 3,
     "price_postapoc": 4500,
-    "bashing": 29,
+    "bashing": 32,
     "material": [ "wood", "iron" ],
     "symbol": "/",
     "color": "brown",

data/json/items/melee/misc.json

@@ -42,8 +42,8 @@
     "price": 25000,
     "price_postapoc": 1250,
     "to_hit": -1,
-    "bashing": 19,
-    "cutting": 39,
+    "bashing": 18,
+    "cutting": 37,
     "material": [ "steel" ],
     "symbol": "/",
     "color": "dark_gray",

data/json/items/melee/spears_and_polearms.json

@@ -105,7 +105,7 @@
     "price_postapoc": 150,
     "to_hit": 1,
     "bashing": 5,
-    "cutting": 17,
+    "cutting": 19,
     "material": [ "wood", "iron" ],
     "symbol": "/",
     "color": "brown",
@@ -125,7 +125,7 @@
     "price_postapoc": 500,
     "to_hit": 1,
     "bashing": 5,
-    "cutting": 17,
+    "cutting": 19,
     "material": [ "wood", "iron" ],
     "symbol": "/",
     "color": "brown",
@@ -143,8 +143,8 @@
     "volume": "1500 ml",
     "price": 1400,
     "price_postapoc": 750,
-    "bashing": 6,
-    "cutting": 22,
+    "bashing": 7,
+    "cutting": 24,
     "material": [ "wood", "iron" ],
     "symbol": "/",
     "color": "brown",
@@ -184,7 +184,7 @@
     "techniques": [ "WBLOCK_1" ],
     "volume": "1500 ml",
     "bashing": 6,
-    "cutting": 18,
+    "cutting": 20,
     "flags": [ "SPEAR", "REACH_ATTACK", "NONCONDUCTIVE", "SHEATH_SPEAR" ],
     "price": 1400,
     "qualities": [ [ "COOK", 1 ] ]
@@ -223,7 +223,7 @@
     "techniques": [ "WBLOCK_1", "IMPALE" ],
     "volume": "1250 ml",
     "bashing": 6,
-    "cutting": 22,
+    "cutting": 25,
     "flags": [ "SPEAR", "REACH_ATTACK", "SHEATH_SPEAR" ],
     "price": 8000,
     "qualities": [ [ "COOK", 1 ] ]
@@ -315,8 +315,8 @@
     "techniques": [ "WIDE", "WBLOCK_1" ],
     "weight": "2100 g",
     "volume": "2500 ml",
-    "bashing": 14,
-    "cutting": 38,
+    "bashing": 17,
+    "cutting": 40,
     "price_postapoc": 8000
   },
   {
@@ -387,7 +387,7 @@
     "volume": "2250 ml",
     "bashing": 6,
     "cutting": 40,
-    "flags": [ "STAB", "POLEARM", "REACH_ATTACK", "SHEATH_SPEAR" ],
+    "flags": [ "POLEARM", "REACH_ATTACK", "SHEATH_SPEAR" ],
     "//": "Description says it can slash. STAB currently doesn't slash, but at least it doesn't give the spear bonus",
     "price": 8000,
     "price_postapoc": 4500,
@@ -522,7 +522,6 @@
     "volume": "3500 ml",
     "price": 40000,
     "price_postapoc": 1250,
-    "to_hit": -1,
     "bashing": 25,
     "cutting": 8,
     "material": [ "budget_steel", "wood" ],
@@ -580,7 +579,6 @@
     "volume": "3750 ml",
     "price": 50000,
     "price_postapoc": 3500,
-    "to_hit": 2,
     "bashing": 11,
     "cutting": 57,
     "material": [ "wood", "bronze" ],

data/json/items/melee/swords_and_blades.json

@@ -1610,7 +1610,7 @@
     "longest_side": "290 cm",
     "price": 40000,
     "price_postapoc": 2000,
-    "to_hit": -3,
+    "to_hit": -2,
     "bashing": 20,
     "material": [ "plastic", "steel" ],
     "symbol": "/",
@@ -1630,7 +1630,7 @@
     "description": "A long wooden pole with chainsaws impractically attached to both ends.  They are currently on and draining gasoline; use this item to turn them off.",
     "bashing": 4,
     "cutting": 140,
-    "to_hit": -1,
+    "to_hit": -4,
     "revert_to": "cs_lajatang_off",
     "use_action": "CS_LAJATANG_ON",
     "turns_per_charge": 1,
@@ -1648,7 +1648,7 @@
     "longest_side": "290 cm",
     "price": 40000,
     "price_postapoc": 2000,
-    "to_hit": -3,
+    "to_hit": -2,
     "bashing": 20,
     "material": [ "plastic", "steel" ],
     "symbol": "/",
@@ -1674,7 +1674,7 @@
     "type": "TOOL",
     "name": { "str": "electric chainsaw lajatang (on)", "str_pl": "electric chainsaw lajatangs (on)" },
     "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.",
-    "to_hit": -1,
+    "to_hit": -4,
     "bashing": 4,
     "cutting": 140,
     "power_draw": 4000000,
@@ -1753,7 +1753,7 @@
     "type": "TOOL",
     "name": { "str": "combat chainsaw (on)", "str_pl": "combat chainsaws (on)" },
     "description": "This combat chainsaw is on, and is continuously draining gasoline.  Use it to turn it off.",
-    "to_hit": 1,
+    "to_hit": -3,
     "cutting": 82,
     "turns_per_charge": 4,
     "charges_per_use": 0,
@@ -1799,7 +1799,7 @@
     "type": "TOOL",
     "name": { "str": "electric combat chainsaw (on)", "str_pl": "electric combat chainsaws (on)" },
     "description": "This electric combat chainsaw is on, and is continuously draining power.  Use it to turn it off.",
-    "to_hit": 1,
+    "to_hit": -3,
     "cutting": 82,
     "power_draw": 2000000,
     "charges_per_use": 0,

data/json/items/tool/firefighting.json

@@ -48,8 +48,8 @@
     "volume": "2 L",
     "price": 20000,
     "price_postapoc": 1500,
-    "bashing": 21,
-    "cutting": 35,
+    "bashing": 17,
+    "cutting": 34,
     "material": [ "steel", "wood" ],
     "symbol": "/",
     "color": "light_gray",

data/json/items/tool/woodworking.json

@@ -8,8 +8,7 @@
     "volume": "2500 ml",
     "price": 10500,
     "price_postapoc": 750,
-    "to_hit": 1,
-    "bashing": 20,
+    "bashing": 15,
     "cutting": 30,
     "material": [ "wood", "steel" ],
     "symbol": "/",
@@ -45,7 +44,7 @@
     "type": "TOOL",
     "name": { "str": "chainsaw (on)", "str_pl": "chainsaws (on)" },
     "description": "This chainsaw is on and making a lot of noise.  Use it to turn it off.",
-    "to_hit": -1,
+    "to_hit": -4,
     "bashing": 4,
     "cutting": 70,
     "turns_per_charge": 4,
@@ -93,7 +92,7 @@
     "//": "Circular saw would be very fast but imprecise butchering tool - alas the qualities are not separate and so speed is sacrificed.",
     "description": "A lightweight handheld cordless circular saw.  It is currently on and the blade is spinning; use this item to turn it off.",
     "cutting": 50,
-    "to_hit": -1,
+    "to_hit": -4,
     "power_draw": 1200000,
     "charges_per_use": 0,
     "revert_to": "circsaw_off",
@@ -175,7 +174,7 @@
     "type": "TOOL",
     "name": { "str": "electric chainsaw (on)", "str_pl": "electric chainsaws (on)" },
     "description": "This electric chainsaw is on and making a lot of noise.  Use it to turn it off.",
-    "to_hit": -1,
+    "to_hit": -4,
     "bashing": 4,
     "cutting": 70,
     "power_draw": 2000000,