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
Updating/expanding pickable furniture #50436
Merged
kevingranade
merged 21 commits into
CleverRaven:master
from
Invalidated-User:updating-pickable-furniture
Aug 12, 2021
Merged
Updating/expanding pickable furniture #50436
kevingranade
merged 21 commits into
CleverRaven:master
from
Invalidated-User:updating-pickable-furniture
Aug 12, 2021
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
actual-nh
added
[JSON]
Changes (can be) made in JSON
Fields / Furniture / Terrain / Traps
Objects that are part of the map or its features.
Items / Item Actions / Item Qualities
Items and how they work and interact
labels
Aug 2, 2021
Maleclypse
reviewed
Aug 9, 2021
Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
…lidated-User/Cataclysm-DDA into updating-pickable-furniture
Invalidated-User
added a commit
to Invalidated-User/Cataclysm-DDA
that referenced
this pull request
Aug 10, 2021
Invalidated-User
added a commit
to Invalidated-User/Cataclysm-DDA
that referenced
this pull request
Aug 12, 2021
This reverts commit 974cfcb.
Invalidated-User
added a commit
to Invalidated-User/Cataclysm-DDA
that referenced
this pull request
Aug 12, 2021
This reverts commit 7e99312.
Merged
satheon49
pushed a commit
to satheon49/Cataclysm-DDA
that referenced
this pull request
Aug 14, 2021
Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Fields / Furniture / Terrain / Traps
Objects that are part of the map or its features.
Items / Item Actions / Item Qualities
Items and how they work and interact
[JSON]
Changes (can be) made in JSON
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
Content "Adds a locked display rack, makes the display case pickable, and removes the "MINEABLE" tag from all safe types."
Purpose of change
Allow the player to unlock display cases if they desire to repurpose them for displaying their own items as well as allowing the player to practice their lockpicking proficiency.
Add a locked display rack to create a method of justifying high-value items remaining unlooted in locations such as military surpluses, gun stores, hunting supply stores, etc. Increased strength requirement to destroy both racks to be in line with the difficulty of tearing sheet metal into pieces.
Took away the ability of the player to jackhammer their way into a safe. The thick metal walls of safes could not be pierced with a jackhammer, all that it would achieve would be indenting the walls of the safe and damaging its contents.
Describe the solution
added the "PICKABLE" tag to "t_displaycase" and created "t_displaycase_o" for its open state
created t_rack_l which has the "SEALED" and "PICKABLE" tags, which reverts to t_rack after being picked, and increased str necessary to destroy both rack types from 6 to 10.
Removed the "MINEABLE" tag from all safe types.
Describe alternatives you've considered
creating "t_displaycase_c" to allow the player to close the display case if they want as well as creating the "open_displaycase" examine action to allow the player to subsequently reopen the display case into "t_displaycase_o" after closing it. Couldn't figure out how it implement it in src\iexamine.h
Testing
Used a hairpin to unlock both the display cases and the locked racks and they turned into their unlocked states.
Tried to use both a jackhammer and a pick on a safe, which did not work. Used an acetylene torch and it did.