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 GrantConditionOnDeploy PausableConditional. #15328

Merged
merged 4 commits into from Jul 28, 2018

Conversation

Projects
None yet
4 participants
@MustaphaTR
Copy link
Member

MustaphaTR commented Jul 6, 2018

@abcdefg30

This comment has been minimized.

Copy link
Member

abcdefg30 commented Jul 6, 2018

Looks like CanUndeploy was not removed entirely:

OpenRA.Utility(1,1): Error: d2k|rules/vehicles.yaml:359 refers to a trait field CanUndeploy that does not exist on GrantConditionOnDeploy.

@@ -20,7 +20,9 @@

namespace OpenRA.Mods.Common.Traits
{
public class GrantConditionOnDeployInfo : ITraitInfo
[Desc("Grants a condition when given a deploy order." +

This comment has been minimized.

@GraionDilach

GraionDilach Jul 19, 2018

Contributor

when a deploy order was issued IMO.

@GraionDilach

This comment has been minimized.

Copy link
Contributor

GraionDilach commented Jul 19, 2018

Otherwise yes, that's what I meant with the desc.

@MustaphaTR MustaphaTR force-pushed the MustaphaTR:pausable-gcod branch from 7a75fbc to 201d01f Jul 19, 2018

@pchote pchote added the PR: Needs +2 label Jul 26, 2018

@abcdefg30

This comment has been minimized.

Copy link
Member

abcdefg30 commented Jul 26, 2018

Needs a rebase, though.

Convert GrantConditionOnDeploy to a pausableconditional trait.
Also remove CanUndeploy as pausing achieves the same effect.

@MustaphaTR MustaphaTR force-pushed the MustaphaTR:pausable-gcod branch from 201d01f to a717c83 Jul 26, 2018

@MustaphaTR MustaphaTR force-pushed the MustaphaTR:pausable-gcod branch from a717c83 to 388054d Jul 26, 2018

@MustaphaTR

This comment has been minimized.

Copy link
Member Author

MustaphaTR commented Jul 26, 2018

Rebased.

@pchote

pchote approved these changes Jul 28, 2018

@pchote pchote merged commit 34d887e into OpenRA:bleed Jul 28, 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:pausable-gcod branch Jul 28, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.