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

Jump to bottom

Rebalance guitars (and similar instruments) as melee weapons. #50034

Merged
merged 5 commits into from Aug 1, 2021
Merged

Rebalance guitars (and similar instruments) as melee weapons. #50034

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
707b993
Update musical_instruments.json
Aerin-of-the-Toast Jul 18, 2021
3048f62
Update data/json/items/tool/musical_instruments.json
Aerin-of-the-Toast Jul 18, 2021
4d966b0
Update data/json/items/tool/musical_instruments.json
Aerin-of-the-Toast Jul 18, 2021
ebec0c4
Update musical_instruments.json
Aerin-of-the-Toast Jul 18, 2021
7596636
Merge branch 'guitar-fix' of https://github.com/jumjummju/Cataclysm-D…
Aerin-of-the-Toast Jul 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 15 additions & 12 deletions data/json/items/tool/musical_instruments.json
View file
Open in desktop
Expand Up @@ -10,8 +10,9 @@
"longest_side": "72 cm",
"price": 7500,
"price_postapoc": 500,
"to_hit": 2,
"bashing": 7,
"to_hit": -1,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"to_hit": -1,
"to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" },

"bashing": 16,
"flags": [ "FRAGILE_MELEE" ],
"material": [ "wood", "iron" ],
"symbol": "|",
"color": "white",
Expand Down Expand Up @@ -159,8 +160,9 @@
"longest_side": "58 cm",
"price": 7500,
"price_postapoc": 250,
"to_hit": 2,
"bashing": 5,
"to_hit": -1,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"to_hit": -1,
"to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" },

"bashing": 14,
"flags": [ "FRAGILE_MELEE" ],
"material": [ "wood" ],
"symbol": "(",
"color": "brown",
Expand Down Expand Up @@ -189,8 +191,9 @@
"longest_side": "60 cm",
"price": 7500,
"price_postapoc": 600,
"to_hit": 2,
"bashing": 5,
"to_hit": -1,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"to_hit": -1,
"to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" },

"bashing": 12,
"flags": [ "FRAGILE_MELEE" ],
"material": [ "wood" ],
"symbol": "}",
"color": "brown",
Expand Down Expand Up @@ -273,7 +276,7 @@
"category": "tools",
"weight": "2200 g",
"color": "brown",
"to_hit": 2,
"to_hit": -1,
Aerin-of-the-Toast marked this conversation as resolved.
Show resolved Hide resolved
"use_action": {
"type": "musical_instrument",
"speed_penalty": 15,
Expand All @@ -296,8 +299,8 @@
"volume": "6750 ml",
"longest_side": "97 cm",
"warmth": 2,
"bashing": 8,
"flags": [ "BELTED", "SLEEP_IGNORE" ],
"bashing": 18,
"flags": [ "FRAGILE_MELEE", "BELTED", "SLEEP_IGNORE" ],
"material_thickness": 2,
"armor": [ { "encumbrance": 27, "coverage": 10, "covers": [ "torso" ] } ]
},
Expand All @@ -308,7 +311,7 @@
"category": "tools",
"weight": "3750 g",
"color": "red",
"to_hit": 2,
"to_hit": -1,
Aerin-of-the-Toast marked this conversation as resolved.
Show resolved Hide resolved
"use_action": {
"type": "musical_instrument",
"speed_penalty": 15,
Expand Down Expand Up @@ -336,8 +339,8 @@
"volume": "6750 ml",
"longest_side": "97 cm",
"warmth": 2,
"bashing": 8,
"flags": [ "BELTED", "SLEEP_IGNORE" ],
"bashing": 26,
"flags": [ "FRAGILE_MELEE", "BELTED", "SLEEP_IGNORE" ],
"material_thickness": 2,
"armor": [ { "encumbrance": 27, "coverage": 10, "covers": [ "torso" ] } ]
},
Expand Down