epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

damageDisabled removed from Cloak.cs (#12741)

Browse Source 
To unhard code uncloak behavior getting disabled by the unit's critical HP.
This commit is contained in:
forcecore
2017-02-11 18:40:33 -06:00
parent e0ca38b878
commit 28ce32d8fa
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Cloak.cs
View File

@@ -64,7 +64,6 @@ namespace OpenRA.Mods.Common.Traits
INotifyAttack, ITick, IVisibilityModifier, IRadarColorModifier, INotifyCreated, INotifyHarvesterAction INotifyAttack, ITick, IVisibilityModifier, IRadarColorModifier, INotifyCreated, INotifyHarvesterAction
{ {
[Sync] int remainingTime; [Sync] int remainingTime;
[Sync] bool damageDisabled;
bool isDocking; bool isDocking;
ConditionManager conditionManager; ConditionManager conditionManager;
@@ -102,8 +101,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyDamage.Damaged(Actor self, AttackInfo e) void INotifyDamage.Damaged(Actor self, AttackInfo e)
{ {
damageDisabled = e.DamageState >= DamageState.Critical; if (Info.UncloakOn.HasFlag(UncloakType.Damage))
if (damageDisabled || Info.UncloakOn.HasFlag(UncloakType.Damage))
Uncloak(); Uncloak();
} }
@@ -128,7 +126,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
if (!IsTraitDisabled) if (!IsTraitDisabled)
{ {
if (remainingTime > 0 && !damageDisabled && !isDocking) if (remainingTime > 0 && !isDocking)
remainingTime--; remainingTime--;
if (self.IsDisabled()) if (self.IsDisabled())