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

UncloakOn: Damage, Heal, SelfHeal split #12969

Merged
merged 5 commits into from Mar 17, 2017

Conversation

Projects
None yet
7 participants
@atlimit8
Member

atlimit8 commented Mar 15, 2017

This PR splits UncloakOn: Damage into UncloakOn: Damage, UncloakOn: Heal, UncloakOn: SelfHeal.
Damage if damage > 0.
Heal if damage < 0 and caused by another actor.
SelfHeal if damage < 0 and caused by self (ex. SelfHealing).

Fixes #12964 & fixes #12956.

@atlimit8

This comment has been minimized.

Show comment
Hide comment
@atlimit8

atlimit8 Mar 15, 2017

Member

With #12964 clarified, and and the exclusion of SelfHeal from the mods requested, I marked this PR as fixing #12964.

Member

atlimit8 commented Mar 15, 2017

With #12964 clarified, and and the exclusion of SelfHeal from the mods requested, I marked this PR as fixing #12964.

@GraionDilach

This comment has been minimized.

Show comment
Hide comment
@GraionDilach

GraionDilach Mar 15, 2017

Contributor

With my nit being addressed, I believe this will also fix #12956 as well.

Contributor

GraionDilach commented Mar 15, 2017

With my nit being addressed, I believe this will also fix #12956 as well.

@atlimit8

This comment has been minimized.

Show comment
Hide comment
@atlimit8

atlimit8 Mar 15, 2017

Member

Made requested change.

Member

atlimit8 commented Mar 15, 2017

Made requested change.

@@ -101,7 +103,12 @@ void INotifyCreated.Created(Actor self)
void INotifyDamage.Damaged(Actor self, AttackInfo e)
{
if (Info.UncloakOn.HasFlag(UncloakType.Damage))
if (e.Damage.Value == 0)
return;

This comment has been minimized.

@MunWolf

MunWolf Mar 15, 2017

Contributor

Missing newline?
Edit: Sorry for nitpick.

@MunWolf

MunWolf Mar 15, 2017

Contributor

Missing newline?
Edit: Sorry for nitpick.

This comment has been minimized.

@atlimit8

atlimit8 Mar 16, 2017

Member

Added.

@atlimit8

atlimit8 Mar 16, 2017

Member

Added.

@GraionDilach

👍

@abcdefg30 abcdefg30 merged commit fbd62c2 into OpenRA:bleed Mar 17, 2017

1 check passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
@abcdefg30

This comment has been minimized.

Show comment
Hide comment
@abcdefg30
Member

abcdefg30 commented Mar 17, 2017

@atlimit8 atlimit8 deleted the atlimit8:UncloakOnDamageSign branch Apr 9, 2017

@atlimit8 atlimit8 restored the atlimit8:UncloakOnDamageSign branch May 1, 2017

@atlimit8 atlimit8 deleted the atlimit8:UncloakOnDamageSign branch May 1, 2017

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