Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bludgeons: nerf the damage of war flails #45137

Merged
merged 1 commit into from
Oct 29, 2020
Merged

bludgeons: nerf the damage of war flails #45137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/items/melee/bludgeons.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"volume": "2250 ml",
"price": 25000,
"price_postapoc": 3000,
"bashing": 65,
"bashing": 50,
"material": [ "wood", "steel" ],
"symbol": "\\",
"color": "dark_gray",
Expand Down
4 changes: 2 additions & 2 deletions tests/effective_dps_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,8 @@ TEST_CASE( "expected weapon dps", "[expected][dps]" )
calc_expected_dps( test_guy, "halligan", 15.25 );
calc_expected_dps( test_guy, "stick_long", 6.0 );
}
SECTION( "two-handed flails" ) { // expected value ideally around 28
calc_expected_dps( test_guy, "2h_flail_steel", 25.0 );
SECTION( "two-handed flails" ) { // expected value ideally around 20
calc_expected_dps( test_guy, "2h_flail_steel", 21.0 );
calc_expected_dps( test_guy, "2h_flail_wood", 20.0 );
calc_expected_dps( test_guy, "homewrecker", 13.0 );
}
Expand Down