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

Merge pull request #12759 from forcecore/cloak_unhardcoding

Browse Source 
Unhardcode disableCloak on critical HP (#12741)
This commit is contained in:
Paul Chote
2017-03-03 22:31:37 +00:00
committed by GitHub
parent 6aa2f962b1 0483708487
commit 2e605bb6cb
11 changed files with 52 additions and 7 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
{
[Sync] int remainingTime;
[Sync] bool damageDisabled;
bool isDocking;
ConditionManager conditionManager;
@@ -102,8 +101,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyDamage.Damaged(Actor self, AttackInfo e)
{
damageDisabled = e.DamageState >= DamageState.Critical;
if (damageDisabled || Info.UncloakOn.HasFlag(UncloakType.Damage))
if (Info.UncloakOn.HasFlag(UncloakType.Damage))
Uncloak();
}
@@ -128,7 +126,7 @@ namespace OpenRA.Mods.Common.Traits
{
if (!IsTraitDisabled)
{
if (remainingTime > 0 && !damageDisabled && !isDocking)
if (remainingTime > 0 && !isDocking)
remainingTime--;
if (self.IsDisabled())