-
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 hacksaw activity #50155
Merged
Merged
Jsonize hacksaw activity #50155
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
<Enhancement / Feature>
New features, or enhancements on existing
[C++]
Changes (can be) made in C++. Previously named `Code`
[JSON]
Changes (can be) made in JSON
Code: Infrastructure / Style / Static Analysis
Code internal infrastructure and style
Fields / Furniture / Terrain / Traps
Objects that are part of the map or its features.
labels
Jul 23, 2021
4 tasks
Saicchi
force-pushed
the
jsonizehacksaw
branch
from
August 21, 2021 17:36
5beb05f
to
c7e60d8
Compare
Rebase to current experimental. |
Saicchi
force-pushed
the
jsonizehacksaw
branch
from
August 31, 2021 22:52
e5164b6
to
6416e1a
Compare
Need to remove unused |
Venera3
pushed a commit
to Venera3/Cataclysm-DDA
that referenced
this pull request
Sep 21, 2021
Co-authored-by: Saicchi <Saicchi@users.noreply.github.com> Co-authored-by: Kevin Granade <kevin.granade@gmail.com>
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`
Code: Infrastructure / Style / Static Analysis
Code internal infrastructure and style
<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 terrain and furniture hacksaw result"
Purpose of change
Hacksaw result in
activity_handlers::oxytorch_finish
is hardcoded, jsonizing it will allow easy addition of more terrain which it can be used and also new items which can use the hacksaw activity.Describe the solution
Add a new field for terrain and furniture,
hacksaw
which is an object.Describe alternatives you've considered
Keep hardcoding the results instead.
Testing
Additional context
This is essentially a copy and paste of #50133 but modified for the hacksaw.
When there is no
result
and the player finishes the hacksaw action, an error will show up on screen and the action won't finish.Some terrains have special conditions, like
t_bars
which turns intot_sewage
if around sewage tiles, otherwise it turns intot_floor
. Best way to replicate it would be to have two identicalt_bars
, one just sewers.