Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upPit construction fix #31838
+29
−10
Conversation
davidpwbrown
added some commits
Jun 24, 2019
This comment has been minimized.
This comment has been minimized.
|
This pull request has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there: https://discourse.cataclysmdda.org/t/spike-trap-error/20524/4 |
kevingranade
merged commit 609a6b8
into
CleverRaven:master
Jun 26, 2019
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.
davidpwbrown commentedJun 25, 2019
Summary
SUMMARY: Bugfixes "Pit construction fix"Purpose of change
Fixes #31590
Describe the solution
Added a check for existing trap before placing a new partial_construction one.
If there is a situation witha partial_construction with no associated trap maker( such as with a pit construction) , then the iexamine code will pick that up and react accordingly.
Also changed the remove_trap() calls in complete_construction() so it dosnt try and disarm the pit, fail, and throw the player into it.
Describe alternatives you've considered
N/A
Additional context
N/A