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

Projects
None yet
3 participants
@MustaphaTR
Copy link
Member

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 MustaphaTR:pausableconditional-cloak branch 2 times, most recently from eb44570 to 404f362 Oct 17, 2018

@reaperrr

This comment has been minimized.

Copy link
Contributor

reaperrr commented Nov 1, 2018

Looks good to me, needs a rebase though.

@MustaphaTR MustaphaTR force-pushed the MustaphaTR:pausableconditional-cloak branch from 404f362 to b16d9be Nov 1, 2018

@MustaphaTR

This comment has been minimized.

Copy link
Member

MustaphaTR commented Nov 1, 2018

Rebased.

@pchote pchote force-pushed the MustaphaTR:pausableconditional-cloak branch from b16d9be to 1085e9c Nov 3, 2018

@pchote

pchote approved these changes Nov 3, 2018

Copy link
Member

pchote left a comment

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

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@MustaphaTR MustaphaTR deleted the MustaphaTR:pausableconditional-cloak branch Nov 4, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment