Merge pull request #62175 from nopenoperson/nopenoperson-batonfix

baton fix
CleverRaven · Nov 12, 2022 · 45e6e56 · 45e6e56
2 parents 76eefb9 + 915705f
commit 45e6e56
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json
@@ -99,39 +99,39 @@
     "category": "weapons",
     "name": { "str": "expandable baton" },
     "description": "A telescoping baton that collapses for easy storage.  Right now, it's collapsed.  Activate to expand.",
-    "weight": "725 g",
-    "longest_side": "20 cm",
+    "weight": "606 g",
+    "volume": "140 ml",
+    "longest_side": "24 cm",
     "color": "dark_gray",
     "price_postapoc": 750,
     "symbol": "/",
-    "material": [ "aluminum" ],
+    "material": [ { "type": "steel", "portion": 7 }, { "type": "plastic", "portion": 3 } ],
     "flags": [ "DURABLE_MELEE", "BELT_CLIP" ],
     "use_action": { "menu_text": "Expand", "type": "transform", "target": "baton-extended", "msg": "You snap open your baton." },
-    "volume": "250 ml",
     "bashing": 4,
     "to_hit": { "grip": "weapon", "length": "hand", "surface": "any", "balance": "neutral" },
-    "price": 17500
+    "price": 22900
   },
   {
     "type": "GENERIC",
     "id": "baton-extended",
     "category": "weapons",
     "name": { "str": "expandable baton (extended)", "str_pl": "expandable batons (extended)" },
     "description": "A telescoping baton that collapses for easy storage.  Makes a good melee weapon.  Activate to collapse.",
-    "weight": "725 g",
+    "weight": "606 g",
+    "volume": "260 ml",
     "longest_side": "60 cm",
     "to_hit": { "grip": "weapon", "length": "short", "surface": "any", "balance": "good" },
     "price_postapoc": 750,
     "color": "dark_gray",
     "symbol": "/",
-    "material": [ "aluminum" ],
+    "material": [ { "type": "steel", "portion": 7 }, { "type": "plastic", "portion": 3 } ],
     "techniques": [ "WBLOCK_1", "RAPID", "PRECISE" ],
     "flags": [ "DURABLE_MELEE", "BELT_CLIP" ],
     "weapon_category": [ "BATONS", "FENCING_WEAPONRY" ],
     "use_action": { "menu_text": "Collapse", "type": "transform", "target": "baton", "msg": "You collapse your baton." },
-    "volume": "750 ml",
-    "bashing": 12,
-    "price": 17500
+    "bashing": 10,
+    "price": 22900
   },
   {
     "id": "battleaxe",

diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
@@ -6609,15 +6609,15 @@
     "activity_level": "MODERATE_EXERCISE",
     "time": "10 m",
     "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 2 } ],
-    "components": [ [ [ "scrap_aluminum", 14 ] ] ]
+    "components": [ [ [ "scrap", 8 ], [ "plastic_chunk", 3 ] ] ]
   },
   {
     "result": "baton-extended",
     "type": "uncraft",
     "activity_level": "MODERATE_EXERCISE",
     "time": "10 m",
     "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 2 } ],
-    "components": [ [ [ "scrap_aluminum", 14 ] ] ]
+    "components": [ [ [ "scrap", 8 ], [ "plastic_chunk", 3 ] ] ]
   },
   {
     "result": "pot_aluminum",

diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json
@@ -33,7 +33,6 @@
       "coffee_raw_kentucky",
       "bandages_makeshift",
       "candy5",
-      "baton",
       "homeopathic_pills",
       "tool_belt",
       "marloss_berry",

diff --git a/tests/effective_dps_test.cpp b/tests/effective_dps_test.cpp
@@ -405,7 +405,7 @@ static void check_clubs( const std::function<Approx( const std::string & )> &cal
         CHECK( calc_expected_dps( "morningstar" ) == 26.12 );
         CHECK( calc_expected_dps( "shillelagh_weighted" ) == 24.17 );
         CHECK( calc_expected_dps( "bwirebat" ) == 22.0 );
-        CHECK( calc_expected_dps( "baton-extended" ) == 12.0 );
+        CHECK( calc_expected_dps( "baton-extended" ) == 11.35 );
         CHECK( calc_expected_dps( "bat_metal" ) == 21.0 );
         CHECK( calc_expected_dps( "nailbat" ) == 21.0 );
         CHECK( calc_expected_dps( "bat" ) == 20.0 );