Skip to content
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 6 commits into from
Nov 3, 2018

Conversation

MustaphaTR
Copy link
Member

@MustaphaTR MustaphaTR commented Oct 17, 2018

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 to PauseOnCondition: !(value) to keep the behaviour, tho probably result of update rule would want manual adjustments, which is noted in the update rule.

@MustaphaTR MustaphaTR force-pushed the pausableconditional-cloak branch 2 times, most recently from eb44570 to 404f362 Compare October 17, 2018 10:28
reaperrr
reaperrr previously approved these changes Nov 1, 2018
@reaperrr
Copy link
Contributor

reaperrr commented Nov 1, 2018

Looks good to me, needs a rebase though.

@MustaphaTR
Copy link
Member Author

Rebased.

Copy link
Member

@pchote pchote left a 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.

@pchote pchote merged commit a3d9822 into OpenRA:bleed Nov 3, 2018
@MustaphaTR MustaphaTR deleted the pausableconditional-cloak branch November 4, 2018 07:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants