bugfix: Allow Booby Traps to be placed on a previously booby-trapped object - #3060
Open
Stubbjax wants to merge 2 commits into
Open
bugfix: Allow Booby Traps to be placed on a previously booby-trapped object#3060Stubbjax wants to merge 2 commits into
Stubbjax wants to merge 2 commits into
Conversation
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This change fixes an issue where an object could no longer be booby trapped if it had previously been cleared of booby traps.
Previously,
OBJECT_STATUS_BOOBY_TRAPPEDwas only removed upon detonation, but did not account for deletion via disarming. This meant that disarming the trap did not remove the status, and no more booby traps could be placed as a result. With this change, the status is removed upon deletion, which covers all cases.Note
Booby Traps do not exist in Generals.
Before
The Barracks cannot be booby trapped after the Worker disarms the first trap
BEFORE.mp4
After
The Barracks can be booby trapped again after the Worker disarms the first trap
AFTER.mp4