From 264635e891ff952cab4a95c7475ab9f19146df90 Mon Sep 17 00:00:00 2001 From: nopenoperson <75625092+nopenoperson@users.noreply.github.com> Date: Fri, 11 Nov 2022 15:00:49 +0100 Subject: [PATCH 1/8] baton fix --- data/json/items/melee/bludgeons.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index 06e7b1626763a..de1ccd0311d4f 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -98,19 +98,19 @@ "id": "baton", "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", + "description": "A telescoping baton that collapses for easy storage. Right now, it's collapsed. Activate to expand.", + "weight": "606 g", + "volume": "140 ml", + "longest_side": "24 cm", "color": "dark_gray", "price_postapoc": 750, "symbol": "/", - "material": [ "aluminum" ], - "flags": [ "DURABLE_MELEE", "BELT_CLIP" ], + "material": [ "steel" ], + "flags": [ "DURABLE_MELEE" ], "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", @@ -118,20 +118,20 @@ "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": [ "steel" ], "techniques": [ "WBLOCK_1", "RAPID", "PRECISE" ], - "flags": [ "DURABLE_MELEE", "BELT_CLIP" ], + "flags": [ "DURABLE_MELEE" ], "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 + "price": 22900 }, { "id": "battleaxe", From 4ec3f95a492fc04c5ecb1aa8230b810cbc7466e4 Mon Sep 17 00:00:00 2001 From: nopenoperson <75625092+nopenoperson@users.noreply.github.com> Date: Fri, 11 Nov 2022 15:22:01 +0100 Subject: [PATCH 2/8] belt clip --- data/json/items/melee/bludgeons.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index de1ccd0311d4f..c82bae420d107 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -106,7 +106,7 @@ "price_postapoc": 750, "symbol": "/", "material": [ "steel" ], - "flags": [ "DURABLE_MELEE" ], + "flags": [ "DURABLE_MELEE", "BELT_CLIP" ], "use_action": { "menu_text": "Expand", "type": "transform", "target": "baton-extended", "msg": "You snap open your baton." }, "bashing": 4, "to_hit": { "grip": "weapon", "length": "hand", "surface": "any", "balance": "neutral" }, @@ -127,7 +127,7 @@ "symbol": "/", "material": [ "steel" ], "techniques": [ "WBLOCK_1", "RAPID", "PRECISE" ], - "flags": [ "DURABLE_MELEE" ], + "flags": [ "DURABLE_MELEE", "BELT_CLIP" ], "weapon_category": [ "BATONS", "FENCING_WEAPONRY" ], "use_action": { "menu_text": "Collapse", "type": "transform", "target": "baton", "msg": "You collapse your baton." }, "bashing": 12, From fe78eaaa7c19367d1787456b2fcb14307c1b1734 Mon Sep 17 00:00:00 2001 From: nopenoperson <75625092+nopenoperson@users.noreply.github.com> Date: Fri, 11 Nov 2022 15:45:55 +0100 Subject: [PATCH 3/8] 1 less bashing, 1 more space --- data/json/items/melee/bludgeons.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index c82bae420d107..51cef210f51c3 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -98,7 +98,7 @@ "id": "baton", "category": "weapons", "name": { "str": "expandable baton" }, - "description": "A telescoping baton that collapses for easy storage. Right now, it's collapsed. Activate to expand.", + "description": "A telescoping baton that collapses for easy storage. Right now, it's collapsed. Activate to expand.", "weight": "606 g", "volume": "140 ml", "longest_side": "24 cm", @@ -130,7 +130,7 @@ "flags": [ "DURABLE_MELEE", "BELT_CLIP" ], "weapon_category": [ "BATONS", "FENCING_WEAPONRY" ], "use_action": { "menu_text": "Collapse", "type": "transform", "target": "baton", "msg": "You collapse your baton." }, - "bashing": 12, + "bashing": 11, "price": 22900 }, { From 4653eda4cf5997628e4aa69efaf5fa0f73d9ef53 Mon Sep 17 00:00:00 2001 From: nopenoperson <75625092+nopenoperson@users.noreply.github.com> Date: Fri, 11 Nov 2022 16:06:55 +0100 Subject: [PATCH 4/8] 1 less bashing --- data/json/items/melee/bludgeons.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index 51cef210f51c3..33212af7b9db5 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -130,7 +130,7 @@ "flags": [ "DURABLE_MELEE", "BELT_CLIP" ], "weapon_category": [ "BATONS", "FENCING_WEAPONRY" ], "use_action": { "menu_text": "Collapse", "type": "transform", "target": "baton", "msg": "You collapse your baton." }, - "bashing": 11, + "bashing": 10, "price": 22900 }, { From 44ae94ffdee7dffac52f2640fb240cde8c42f07f Mon Sep 17 00:00:00 2001 From: nopenoperson <75625092+nopenoperson@users.noreply.github.com> Date: Fri, 11 Nov 2022 17:10:53 +0100 Subject: [PATCH 5/8] materials --- data/json/items/melee/bludgeons.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index 33212af7b9db5..76a3b5a8a283a 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -105,7 +105,7 @@ "color": "dark_gray", "price_postapoc": 750, "symbol": "/", - "material": [ "steel" ], + "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." }, "bashing": 4, @@ -125,7 +125,7 @@ "price_postapoc": 750, "color": "dark_gray", "symbol": "/", - "material": [ "steel" ], + "material": [ { "type": "steel", "portion": 7 }, { "type": "plastic", "portion": 3 } ], "techniques": [ "WBLOCK_1", "RAPID", "PRECISE" ], "flags": [ "DURABLE_MELEE", "BELT_CLIP" ], "weapon_category": [ "BATONS", "FENCING_WEAPONRY" ], From b11705693c5738136454d51cd63417e409101719 Mon Sep 17 00:00:00 2001 From: nopenoperson <75625092+nopenoperson@users.noreply.github.com> Date: Fri, 11 Nov 2022 17:32:24 +0100 Subject: [PATCH 6/8] Update known_bad_density.json --- data/mods/TEST_DATA/known_bad_density.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 222654c209787..178e102bfe771 100644 --- 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", From 34de3e7926a42d86d246b2fd411bebfd9a8f3633 Mon Sep 17 00:00:00 2001 From: nopenoperson <75625092+nopenoperson@users.noreply.github.com> Date: Fri, 11 Nov 2022 17:50:51 +0100 Subject: [PATCH 7/8] Update recipe_deconstruction.json --- data/json/recipes/recipe_deconstruction.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 4a75715c90bc1..998432fb272e9 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -6609,7 +6609,7 @@ "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", @@ -6617,7 +6617,7 @@ "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", From 915705fbd209f0a646065dc78ce2a9859b4d7961 Mon Sep 17 00:00:00 2001 From: nopenoperson <75625092+nopenoperson@users.noreply.github.com> Date: Fri, 11 Nov 2022 18:08:45 +0100 Subject: [PATCH 8/8] Update effective_dps_test.cpp --- tests/effective_dps_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/effective_dps_test.cpp b/tests/effective_dps_test.cpp index 6eff61a6f79ac..35dcfe4d675fb 100644 --- a/tests/effective_dps_test.cpp +++ b/tests/effective_dps_test.cpp @@ -405,7 +405,7 @@ static void check_clubs( const std::function &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 );