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

Flail weapon balance (Part 2 of melee weapon balance project) #39645

Merged
merged 2 commits into from
Apr 22, 2020
Merged

Flail weapon balance (Part 2 of melee weapon balance project) #39645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d692989
Flail balance
Brian-Otten Apr 17, 2020
0e020ee
Blackjack and sap tohit +1
Brian-Otten Apr 20, 2020
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
3 changes: 2 additions & 1 deletion data/json/items/generic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,8 @@
"material": [ "steel" ],
"techniques": [ "WRAP" ],
"volume": "1 L",
"bashing": 12,
"bashing": 26,
"to_hit": -2,
"price": 8000,
"price_postapoc": 50
},
Expand Down
26 changes: 13 additions & 13 deletions data/json/items/melee/bludgeons.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"volume": "3750 ml",
"price": 25000,
"price_postapoc": 3000,
"bashing": 40,
"bashing": 50,
"material": [ "wood", "steel" ],
"symbol": "\\",
"color": "dark_gray",
Expand All @@ -26,7 +26,7 @@
"volume": "3750 ml",
"price": 4000,
"price_postapoc": 1000,
"bashing": 19,
"bashing": 26,
"material": [ "wood" ],
"symbol": "\\",
"color": "brown",
Expand Down Expand Up @@ -474,13 +474,13 @@
"name": { "str": "homewrecker" },
"description": "A long piece of wood with several chunks of steel firmly tied to it. The resulting weapon is unwieldy and slow but very heavy hitting.",
"weight": "3024 g",
"to_hit": -3,
"to_hit": -2,
"color": "brown",
"symbol": "/",
"material": [ "wood", "steel" ],
"techniques": [ "WBLOCK_1" ],
"volume": "1250 ml",
"bashing": 28,
"bashing": 35,
"cutting": 2,
"qualities": [ [ "HAMMER", 1 ] ],
"flags": [ "STAB", "NONCONDUCTIVE" ],
Expand Down Expand Up @@ -661,7 +661,7 @@
"flags": [ "BELT_CLIP", "NONCONDUCTIVE" ],
"weight": "400 g",
"volume": "350 ml",
"bashing": 9,
"bashing": 12,
"to_hit": 1,
"price_postapoc": 50,
"category": "weapons"
Expand Down Expand Up @@ -689,14 +689,14 @@
"name": { "str": "morningstar" },
"description": "A medieval weapon consisting of a wood handle with a heavy, spiked iron ball on the end. It deals devastating crushing damage, with a small amount of piercing to boot.",
"weight": "1400 g",
"to_hit": 1,
"to_hit": -1,
"color": "dark_gray",
"symbol": "/",
"material": [ "iron", "wood" ],
"techniques": [ "SWEEP" ],
"volume": "1500 ml",
"bashing": 33,
"cutting": 4,
"bashing": 38,
"cutting": 6,
"flags": [ "DURABLE_MELEE", "SPEAR", "NONCONDUCTIVE" ],
"price": 120000,
"price_postapoc": 8000,
Expand All @@ -708,14 +708,14 @@
"name": { "str": "morningstar" },
"description": "A light, cheaply made replica of a medieval weapon that would normally consist of a wood handle with a heavy, spiked iron ball on the end.",
"weight": "700 g",
"to_hit": 1,
"to_hit": -1,
"color": "dark_gray",
"symbol": "/",
"looks_like": "morningstar",
"material": [ "aluminum", "wood" ],
"techniques": [ "SWEEP" ],
"volume": "1500 ml",
"bashing": 8,
"bashing": 26,
"cutting": 1,
"flags": [ "SPEAR", "NONCONDUCTIVE" ],
"price": 12000,
Expand All @@ -727,14 +727,14 @@
"name": { "str": "morningstar" },
"description": "A medieval weapon consisting of a wood handle with a heavy, spiked iron ball on the end. That end feels lighter than it should.",
"weight": "1000 g",
"to_hit": 1,
"to_hit": -1,
"color": "dark_gray",
"symbol": "/",
"looks_like": "morningstar",
"material": [ "budget_steel", "wood" ],
"techniques": [ "SWEEP" ],
"volume": "1500 ml",
"bashing": 11,
"bashing": 26,
"cutting": 1,
"flags": [ "SPEAR", "NONCONDUCTIVE" ],
"price": 12000,
Expand Down Expand Up @@ -862,7 +862,7 @@
"weight": "1007 g",
"volume": "500 ml",
"bashing": 8,
"to_hit": 1,
"to_hit": -1,
"qualities": [ [ "HAMMER", 1 ] ]
},
{
Expand Down