-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
Jsonize Prying #51778
Merged
Merged
Jsonize Prying #51778
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
398f461
to
910f6e1
Compare
910f6e1
to
ce32f7e
Compare
Mark my words: As soon as this gets merged I'm making a PR to make metal doors pry-able with halligan bars. |
As soon as this gets merged I'll make another PR removing duplicate code and changing how batteries are contsumed for electric tools in the |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
[C++]
Changes (can be) made in C++. Previously named `Code`
Crafting / Construction / Recipes
Includes: Uncrafting / Disassembling
<Enhancement / Feature>
New features, or enhancements on existing
Fields / Furniture / Terrain / Traps
Objects that are part of the map or its features.
[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
Infrastructure "Jsonize crowbar and hammer terrain and furniture results"
Purpose of change
Closes #51706
Continuation of #50155, #50133 and #50365.
Instead of making two separate PRs, since they're exactly the same I bundled them into one PR, also because the hammer uses both
iuse::hammer
andiuse::crowbar
.Describe the solution
A new field for terrain and furniture,
prying
which are both an object, this object can have two variations.On failure, if the
breakable
roll fails, the terrain/furniturebash
field will be used.Create a new activity actor
prying_activity_actor
which handles both prying with nails and without nails.Describe alternatives you've considered
Keep hardcoding the results instead.
Testing
difficulty
levelprying_level
noisy
alarm
breakable
Additional context
When there is no
result
and the player finishes the prying action, an error will show up on screen and the action won't finish.The
iuse::hammer
was redirected toiuse::crowbar
. It's set to be removed after 0.G. Because of that I modified the description when using the hammer to be the same as the crowbar.