-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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
Make Cloak PauseableConditional #15711
Merged
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
MustaphaTR
force-pushed
the
pausableconditional-cloak
branch
2 times, most recently
from
October 17, 2018 10:28
eb44570
to
404f362
Compare
reaperrr
previously approved these changes
Nov 1, 2018
Looks good to me, needs a rebase though. |
MustaphaTR
force-pushed
the
pausableconditional-cloak
branch
from
November 1, 2018 06:20
404f362
to
b16d9be
Compare
Rebased. |
If disabled now it CloakDelay resets to InitialCloakDelay when reenabled, if paused it continues with CloakDelay when resumed.
pchote
force-pushed
the
pausableconditional-cloak
branch
from
November 3, 2018 22:31
b16d9be
to
1085e9c
Compare
pchote
approved these changes
Nov 3, 2018
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
This needed a rebase again, so I did that and pushed over the branch to avoid delaying this further.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I forgot to PR this, some time passes after i made this.
Currently disabling cloak doesn't reset the timer to InitialCloakDelay, there are places where modder may want the timer to reset or not, so i made Cloak trait pausable conditional, pausing doesn't reset time timer, disabling does.
A update rule, changes the existing traits'
RequiresCondition: value
toPauseOnCondition: !(value)
to keep the behaviour, tho probably result of update rule would want manual adjustments, which is noted in the update rule.