tools: rebalance the makeshift glaive (#45658)

The makeshift glaive is really good for an easy, improvised weapon. Add it to the effective DPS tests and nerf its accuracy to bring it in line with other makeshift polearms.
CleverRaven · Nov 28, 2020 · 799c623 · 799c623
1 parent 3778bbb
commit 799c623
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json
@@ -441,9 +441,9 @@
     "longest_side": "180 cm",
     "price": 5000,
     "price_postapoc": 250,
-    "to_hit": 2,
+    "to_hit": -1,
     "bashing": 13,
-    "cutting": 36,
+    "cutting": 31,
     "material": [ "steel", "wood" ],
     "symbol": "/",
     "color": "light_gray",

diff --git a/tests/effective_dps_test.cpp b/tests/effective_dps_test.cpp
@@ -299,6 +299,7 @@ TEST_CASE( "expected weapon dps", "[expected][dps]" )
         calc_expected_dps( test_guy, "halberd_fake", 15.0 );
         calc_expected_dps( test_guy, "ji", 35.0 );
         calc_expected_dps( test_guy, "glaive", 34.5 );
+        calc_expected_dps( test_guy, "makeshift_halberd", 20.5 );
         calc_expected_dps( test_guy, "naginata", 35.0 );
         calc_expected_dps( test_guy, "naginata_inferior", 21.5 );
         calc_expected_dps( test_guy, "naginata_fake", 10.0 );