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

Fixed team health colors and spy disguise interaction

Browse Source
This commit is contained in:
Curtis Shmyr
2014-03-16 19:32:44 -06:00
parent 76f7e87633
commit cc8284740c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Traits/Selectable.cs
View File

@@ -181,8 +181,11 @@ namespace OpenRA.Traits
Color GetHealthColor(Health health)
{
if (Game.Settings.Game.TeamHealthColors)
return self.Owner.IsAlliedWith(self.World.LocalPlayer) ? Color.LimeGreen :
self.Owner.NonCombatant ? Color.Tan : Color.Red;
{
var isAlly = self.Owner.IsAlliedWith(self.World.LocalPlayer)
|| (self.IsDisguised() && self.World.LocalPlayer.IsAlliedWith(self.EffectiveOwner.Owner));
return isAlly ? Color.LimeGreen : self.Owner.NonCombatant ? Color.Tan : Color.Red;
}
else
return health.DamageState == DamageState.Critical ? Color.Red :
health.DamageState == DamageState.Heavy ? Color.Yellow : Color.LimeGreen;