-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Fix and jsonize item dropping and trap conversion in trap-vehicle interaction #33459
Merged
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
Also fix item duplication when traps are run over by vehicles
…p when run over by vehicles
ZhilkinSerg
added
[C++]
Changes (can be) made in C++. Previously named `Code`
[JSON]
Changes (can be) made in JSON
Fields / Furniture / Terrain / Traps
Objects that are part of the map or its features.
Vehicles
Vehicles, parts, mechanics & interactions
labels
Aug 22, 2019
ZhilkinSerg
reviewed
Aug 24, 2019
ZhilkinSerg
reviewed
Aug 24, 2019
ZhilkinSerg
reviewed
Aug 24, 2019
ZhilkinSerg
reviewed
Aug 24, 2019
ZhilkinSerg
reviewed
Aug 24, 2019
Co-Authored-By: ZhilkinSerg <[email protected]>
# Conflicts: # gfx/RetroDaysTileset/tile_config.json
misterprimus
pushed a commit
to misterprimus/Cataclysm-DDA
that referenced
this pull request
Sep 21, 2019
…eraction (CleverRaven#33459) * JSONize trap-vehicle run-over drops and trap conversions Also fix item duplication when traps are run over by vehicles * Keep known traps known, and make seen traps in action known * Fix double barrel shotgun trap turning into single barrel shotgun trap when run over by vehicles * Fix vehicle triggering traps when moving off them * Update gfx configs * Apply suggestions from code review Co-Authored-By: ZhilkinSerg <[email protected]>
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`
Fields / Furniture / Terrain / Traps
Objects that are part of the map or its features.
[JSON]
Changes (can be) made in JSON
Vehicles
Vehicles, parts, mechanics & interactions
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 "Fix bugs in trap-vehicle interaction"
Purpose of change
tr_shotgun_2
converted totr_shotgun_1
).Describe the solution
1 is fixed with json modification.
4 is fixed by adding a new "tr_shotgun_2_1" trap type as the half-fired double-barrel shotgun trap.
5 is fixed by handling trap-vehicle interaction after moving vehicles.
Additional context
There are some inconsistencies between trap-vehicle interaction and player-trap interaction (such as those of shotgun traps), but that's out of the reach of this PR.