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 Crushable conditional #14507

Merged
merged 1 commit into from Dec 29, 2017

Conversation

Projects
None yet
4 participants
@MustaphaTR
Member

MustaphaTR commented Dec 13, 2017

This also fixes the multipile Crushable traits. Looks like it meant to be supported, but actually only the last one was affecting.

For testcase i made it so Shock Trooper can't be crushed by other crushers when elite, but can still be crushed by Mammoth Tank.

@Mailaender Mailaender referenced this pull request Dec 13, 2017

Open

Added GI sandbag deployment #394

1 of 3 tasks complete
@MustaphaTR

This comment has been minimized.

Show comment
Hide comment
@MustaphaTR

MustaphaTR Dec 13, 2017

Member

Updated.

Member

MustaphaTR commented Dec 13, 2017

Updated.

@GraionDilach

This comment has been minimized.

Show comment
Hide comment
@GraionDilach

GraionDilach Dec 27, 2017

Contributor

What's the expected thing to happen if an actor has multiple Crushable traits with one permitting a suitable crusher and another isn't?

Contributor

GraionDilach commented Dec 27, 2017

What's the expected thing to happen if an actor has multiple Crushable traits with one permitting a suitable crusher and another isn't?

@MustaphaTR

This comment has been minimized.

Show comment
Hide comment
@MustaphaTR

MustaphaTR Dec 27, 2017

Member

It should get crushed.

Member

MustaphaTR commented Dec 27, 2017

It should get crushed.

@GraionDilach

👍 then.

@ltem ltem added the PR: Needs +2 label Dec 28, 2017

@pchote

LGTM and works as advertised.

We can merge this as soon as you remove the testcase.

@MustaphaTR

This comment has been minimized.

Show comment
Hide comment
@MustaphaTR

MustaphaTR Dec 29, 2017

Member

Removed the testcase.

Member

MustaphaTR commented Dec 29, 2017

Removed the testcase.

@pchote

pchote approved these changes Dec 29, 2017

@pchote pchote merged commit 9871abe into OpenRA:bleed Dec 29, 2017

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:conditional-crushable branch Dec 29, 2017

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