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

Make PlayerRelationShipColor static

Browse Source
This commit is contained in:
Gustas
2023-06-11 17:09:29 +03:00
committed by Matthias Mailänder
parent fa0254cb27
commit 34262fb33c
6 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Graphics/IsometricSelectionBarsAnnotationRenderable.cs
View File

@@ -127,7 +127,7 @@ namespace OpenRA.Mods.Common.Graphics
Color GetHealthColor(IHealth health)
{
if (Game.Settings.Game.UsePlayerStanceColors)
return actor.Owner.PlayerRelationshipColor(actor);
return Player.PlayerRelationshipColor(actor);
return health.DamageState == DamageState.Critical ? Color.Red :
health.DamageState == DamageState.Heavy ? Color.Yellow : Color.LimeGreen;

2
OpenRA.Mods.Common/Graphics/SelectionBarsAnnotationRenderable.cs
View File

@@ -84,7 +84,7 @@ namespace OpenRA.Mods.Common.Graphics
Color GetHealthColor(IHealth health)
{
if (Game.Settings.Game.UsePlayerStanceColors)
return actor.Owner.PlayerRelationshipColor(actor);
return Player.PlayerRelationshipColor(actor);
return health.DamageState == DamageState.Critical ? Color.Red :
health.DamageState == DamageState.Heavy ? Color.Yellow : Color.LimeGreen;

2
OpenRA.Mods.Common/Traits/Radar/AppearsOnRadar.cs
View File

@@ -47,7 +47,7 @@ namespace OpenRA.Mods.Common.Traits.Radar
if (IsTraitDisabled || (viewer != null && !Info.ValidRelationships.HasRelationship(self.Owner.RelationshipWith(viewer))))
return;
var color = Game.Settings.Game.UsePlayerStanceColors ? self.Owner.PlayerRelationshipColor(self) : self.Owner.Color;
var color = Game.Settings.Game.UsePlayerStanceColors ? Player.PlayerRelationshipColor(self) : self.Owner.Color;
if (modifier != null)
color = modifier.RadarColorOverride(self, color);

6
OpenRA.Mods.Common/Widgets/SupportPowerTimerWidget.cs
View File

@@ -61,11 +61,7 @@ namespace OpenRA.Mods.Common.Widgets
var time = WidgetUtils.FormatTime(p.RemainingTicks, false, self.World.Timestep);
var text = TranslationProvider.GetString(Format, Translation.Arguments("player", self.Owner.PlayerName, "support-power", p.Name, "time", time));
var playerColor = self.Owner.Color;
if (Game.Settings.Game.UsePlayerStanceColors)
playerColor = self.Owner.PlayerRelationshipColor(self);
var playerColor = Game.Settings.Game.UsePlayerStanceColors ? Player.PlayerRelationshipColor(self) : self.Owner.Color;
var color = !p.Ready || Game.LocalTick % 50 < 25 ? playerColor : Color.White;
return (text, color);