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

Added UncloakOn: SelfHeal (not overlapping with Heal).

Browse Source
This commit is contained in:
atlimit8
2017-03-14 23:45:14 -05:00
parent aa8c434668
commit d3e4720507
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,8 @@ namespace OpenRA.Mods.Common.Traits
Demolish = 16, Demolish = 16,
Damage = 32, Damage = 32,
Heal = 64, Heal = 64,
Dock = 128 SelfHeal = 128,
Dock = 256
} }
[Desc("This unit can cloak and uncloak in specific situations.")] [Desc("This unit can cloak and uncloak in specific situations.")]
@@ -42,7 +43,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Measured in game ticks.")] [Desc("Measured in game ticks.")]
public readonly int CloakDelay = 30; public readonly int CloakDelay = 30;
[Desc("Events leading to the actor getting uncloaked. Possible values are: Attack, Move, Unload, Infiltrate, Demolish, Dock and Damage")] [Desc("Events leading to the actor getting uncloaked. Possible values are: Attack, Move, Unload, Infiltrate, Demolish, Dock, Damage, Heal and SelfHeal.")]
public readonly UncloakType UncloakOn = UncloakType.Attack public readonly UncloakType UncloakOn = UncloakType.Attack
| UncloakType.Unload | UncloakType.Infiltrate | UncloakType.Demolish | UncloakType.Dock; | UncloakType.Unload | UncloakType.Infiltrate | UncloakType.Demolish | UncloakType.Dock;
@@ -105,7 +106,10 @@ namespace OpenRA.Mods.Common.Traits
if (e.Damage.Value == 0) if (e.Damage.Value == 0)
return; return;
if (Info.UncloakOn.HasFlag(e.Damage.Value > 0 ? UncloakType.Damage : UncloakType.Heal)) var type = e.Damage.Value < 0
? (e.Attacker == self ? UncloakType.SelfHeal : UncloakType.Heal)
: UncloakType.Damage;
if (Info.UncloakOn.HasFlag(type))
Uncloak(); Uncloak();
} }