Blazemod fix rock override #35486
Merged
Blazemod fix rock override #35486
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ZhilkinSerg
added
<Bugfix>
AMurkin
pushed a commit
to AMurkin/Cataclysm-DDA
that referenced
this pull request
Nov 13, 2019
AMurkin
added a commit
to AMurkin/Cataclysm-DDA
that referenced
this pull request
Nov 13, 2019
This reverts commit 2832f02.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: Bugfixes "Blazemod fix rock override"Purpose of change
Fixes an issue with rock override introduced by #35417. No seperate issue for this exists, it was just mentioned in the comments of #35417.
Describe the solution
Remove the ammo_type from the rock override. The error will not show up anymore because the rock will now copy-from rock and use the rock ammotype. This does mean that the rock from blazemod is no longer a heavy_projectile but there are other heavy projectiles one can use.
Describe alternatives you've considered
Remove the rock override entirely but I don't know much about the purpose of the override.
Testing
Added mod 'vehicle additions pack' before the change, the error showed up.
Added mod 'vehicle additions pack' after the change, the error did not show up.
Additional context
N/A