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.

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

Remove obsolete rock override #36649

Merged
merged 1 commit into from
Jan 3, 2020
Merged

Remove obsolete rock override #36649

merged 1 commit into from
Jan 3, 2020

Conversation

kevingranade
Copy link
Member

Summary

SUMMARY: None

Purpose of change

As pointed out here: https://www.reddit.com/r/cataclysmdda/comments/eiuyx5/psa_staff_slings_are_more_powerful_if_you_use/ the rock override in blazemod has drifted away from the definition in mainline, and upon examination no longer accomplishes its original goal of turning the rock into an ammunition type as the base type is now an ammunition as well.

Describe the solution

Remove the rock override, which causes the item to revert to default damage and dispersion, and restores the correct effects list.
See

"type": "AMMO",
"id": "rock",
"symbol": "*",
"color": "light_gray",
"name": "rock",
"description": "A rock the size of a baseball. Makes a decent melee weapon, and is also good for throwing at enemies.",
"category": "spare_parts",
"material": "stone",
"ammo_type": "rock",
"flags": "TRADER_AVOID",
"weight": "657 g",
"volume": "250 ml",
"bashing": 7,
"damage": 7,
"range": 10,
"dispersion": 14,
"loudness": 0,
"to_hit": -2,
"effects": [ "NEVER_MISFIRES", "NON-FOULING", "RECOVER_80" ],
"qualities": [ [ "HAMMER", 1 ] ]
for comparison.

Additional context

The count field is also erroneous, as it is specifying the default value.

@KorGgenT KorGgenT added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding labels Jan 2, 2020
@KorGgenT KorGgenT merged commit 07dc4f5 into master Jan 3, 2020
fengjixuchui added a commit to fengjixuchui/Cataclysm-DDA that referenced this pull request Jan 3, 2020
@kevingranade kevingranade deleted the kevingranade-rock-cleanup branch February 25, 2020 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JSON] Changes (can be) made in JSON Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants