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

Give ally players a yellow hp bar for team health colors

Browse Source
This commit is contained in:
Curtis Shmyr
2015-05-10 11:12:10 -06:00
parent 3bd4a97d11
commit 6ca51e47c1
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Game/Graphics/SelectionBarsRenderable.cs
View File

@@ -76,12 +76,28 @@ namespace OpenRA.Graphics
Color GetHealthColor(Health health) Color GetHealthColor(Health health)
{ {
if (Game.Settings.Game.TeamHealthColors) var player = actor.World.RenderPlayer ?? actor.World.LocalPlayer;
if (Game.Settings.Game.TeamHealthColors && player != null && !player.Spectating)
{ {
var isAlly = actor.Owner.IsAlliedWith(actor.World.LocalPlayer) var apparentOwner = actor.EffectiveOwner != null && actor.EffectiveOwner.Disguised
|| (actor.EffectiveOwner != null && actor.EffectiveOwner.Disguised ? actor.EffectiveOwner.Owner
&& actor.World.LocalPlayer.IsAlliedWith(actor.EffectiveOwner.Owner)); : actor.Owner;
return isAlly ? Color.LimeGreen : actor.Owner.NonCombatant ? Color.Tan : Color.Red;
// For friendly spies, treat the unit's owner as the actual owner
if (actor.Owner.IsAlliedWith(actor.World.RenderPlayer))
apparentOwner = actor.Owner;
if (apparentOwner == player)
return Color.LimeGreen;
if (apparentOwner.IsAlliedWith(player))
return Color.Yellow;
if (apparentOwner.NonCombatant)
return Color.Tan;
return Color.Red;
} }
else else
return health.DamageState == DamageState.Critical ? Color.Red : return health.DamageState == DamageState.Critical ? Color.Red :

2
OpenRA.Game/Player.cs
View File

@@ -33,7 +33,6 @@ namespace OpenRA
public readonly string InternalName; public readonly string InternalName;
public readonly CountryInfo Country; public readonly CountryInfo Country;
public readonly bool NonCombatant = false; public readonly bool NonCombatant = false;
public readonly bool Spectating = false;
public readonly bool Playable = true; public readonly bool Playable = true;
public readonly int ClientIndex; public readonly int ClientIndex;
public readonly PlayerReference PlayerReference; public readonly PlayerReference PlayerReference;
@@ -45,6 +44,7 @@ namespace OpenRA
public bool IsBot; public bool IsBot;
public int SpawnPoint; public int SpawnPoint;
public bool HasObjectives = false; public bool HasObjectives = false;
public bool Spectating;
public Shroud Shroud; public Shroud Shroud;
public World World { get; private set; } public World World { get; private set; }

1
OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs
View File

@@ -35,6 +35,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (world.ObserveAfterWinOrLose && world.LocalPlayer.WinState != WinState.Undefined) if (world.ObserveAfterWinOrLose && world.LocalPlayer.WinState != WinState.Undefined)
Game.RunAfterTick(() => Game.RunAfterTick(() =>
{ {
world.LocalPlayer.Spectating = true;
playerRoot.RemoveChildren(); playerRoot.RemoveChildren();
Game.LoadWidget(world, "OBSERVER_WIDGETS", playerRoot, new WidgetArgs()); Game.LoadWidget(world, "OBSERVER_WIDGETS", playerRoot, new WidgetArgs());
}); });