diff --git a/OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs b/OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs index cf491915c2..0facf33c22 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs @@ -78,8 +78,7 @@ namespace OpenRA.Mods.Common.Traits Color.FromArgb(96, Color.Black)); } - // Selection bar - public float GetValue() + float ISelectionBar.GetValue() { // Visible to player and allies if (!ValidRenderPlayer()) @@ -92,6 +91,6 @@ namespace OpenRA.Mods.Common.Traits return (float)progress / total; } - public Color GetColor() { return Color.Purple; } + Color ISelectionBar.GetColor() { return Color.Purple; } } } diff --git a/OpenRA.Mods.Common/Traits/ExternalCapturableBar.cs b/OpenRA.Mods.Common/Traits/ExternalCapturableBar.cs index 2634392f15..57837084c7 100644 --- a/OpenRA.Mods.Common/Traits/ExternalCapturableBar.cs +++ b/OpenRA.Mods.Common/Traits/ExternalCapturableBar.cs @@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.Traits capturable = self.Trait(); } - public float GetValue() + float ISelectionBar.GetValue() { // only show when building is being captured if (!capturable.CaptureInProgress) @@ -37,6 +37,6 @@ namespace OpenRA.Mods.Common.Traits return (float)capturable.CaptureProgressTime / (capturable.Info.CaptureCompleteTime * 25); } - public Color GetColor() { return Color.Orange; } + Color ISelectionBar.GetColor() { return Color.Orange; } } } diff --git a/OpenRA.Mods.Common/Traits/Power/AffectedByPowerOutage.cs b/OpenRA.Mods.Common/Traits/Power/AffectedByPowerOutage.cs index 8355be4f28..105b2daeda 100644 --- a/OpenRA.Mods.Common/Traits/Power/AffectedByPowerOutage.cs +++ b/OpenRA.Mods.Common/Traits/Power/AffectedByPowerOutage.cs @@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.Traits playerPower = self.Owner.PlayerActor.Trait(); } - public float GetValue() + float ISelectionBar.GetValue() { if (playerPower.PowerOutageRemainingTicks <= 0) return 0; @@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Traits return (float)playerPower.PowerOutageRemainingTicks / playerPower.PowerOutageTotalTicks; } - public Color GetColor() + Color ISelectionBar.GetColor() { return Color.Yellow; } diff --git a/OpenRA.Mods.Common/Traits/Render/ProductionBar.cs b/OpenRA.Mods.Common/Traits/Render/ProductionBar.cs index 7e4ecea686..20492f46ee 100644 --- a/OpenRA.Mods.Common/Traits/Render/ProductionBar.cs +++ b/OpenRA.Mods.Common/Traits/Render/ProductionBar.cs @@ -70,7 +70,7 @@ namespace OpenRA.Mods.Common.Traits value = current != null ? 1 - (float)current.RemainingCost / current.TotalCost : 0; } - public float GetValue() + float ISelectionBar.GetValue() { // only people we like should see our production status. if (!self.Owner.IsAlliedWith(self.World.RenderPlayer)) @@ -79,7 +79,7 @@ namespace OpenRA.Mods.Common.Traits return value; } - public Color GetColor() { return info.Color; } + Color ISelectionBar.GetColor() { return info.Color; } public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) { diff --git a/OpenRA.Mods.Common/Traits/Render/SupportPowerChargeBar.cs b/OpenRA.Mods.Common/Traits/Render/SupportPowerChargeBar.cs index 9ef7495053..6320160eb4 100644 --- a/OpenRA.Mods.Common/Traits/Render/SupportPowerChargeBar.cs +++ b/OpenRA.Mods.Common/Traits/Render/SupportPowerChargeBar.cs @@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Traits this.info = info; } - public float GetValue() + float ISelectionBar.GetValue() { if (!self.Owner.IsAlliedWith(self.World.RenderPlayer)) return 0; @@ -46,6 +46,6 @@ namespace OpenRA.Mods.Common.Traits return 1 - (float)power.RemainingTime / power.TotalTime; } - public Color GetColor() { return info.Color; } + Color ISelectionBar.GetColor() { return info.Color; } } } diff --git a/OpenRA.Mods.Common/Traits/Render/TimedUpgradeBar.cs b/OpenRA.Mods.Common/Traits/Render/TimedUpgradeBar.cs index 58ae1669a9..1440484ad3 100644 --- a/OpenRA.Mods.Common/Traits/Render/TimedUpgradeBar.cs +++ b/OpenRA.Mods.Common/Traits/Render/TimedUpgradeBar.cs @@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Traits value = remaining * 1f / duration; } - public float GetValue() + float ISelectionBar.GetValue() { if (!self.Owner.IsAlliedWith(self.World.RenderPlayer)) return 0; @@ -57,6 +57,6 @@ namespace OpenRA.Mods.Common.Traits return value; } - public Color GetColor() { return info.Color; } + Color ISelectionBar.GetColor() { return info.Color; } } } diff --git a/OpenRA.Mods.D2k/Traits/TemporaryOwnerManager.cs b/OpenRA.Mods.D2k/Traits/TemporaryOwnerManager.cs index 5a22a0f9e2..53fad7e016 100644 --- a/OpenRA.Mods.D2k/Traits/TemporaryOwnerManager.cs +++ b/OpenRA.Mods.D2k/Traits/TemporaryOwnerManager.cs @@ -66,7 +66,7 @@ namespace OpenRA.Mods.D2k.Traits changingOwner = null; // It was triggered by this trait: reset } - public float GetValue() + float ISelectionBar.GetValue() { if (remaining <= 0) return 0; @@ -74,7 +74,7 @@ namespace OpenRA.Mods.D2k.Traits return (float)remaining / duration; } - public Color GetColor() + Color ISelectionBar.GetColor() { return info.BarColor; } diff --git a/OpenRA.Mods.RA/Traits/Chronoshiftable.cs b/OpenRA.Mods.RA/Traits/Chronoshiftable.cs index 613f74812b..4f038e686b 100644 --- a/OpenRA.Mods.RA/Traits/Chronoshiftable.cs +++ b/OpenRA.Mods.RA/Traits/Chronoshiftable.cs @@ -114,7 +114,7 @@ namespace OpenRA.Mods.RA.Traits } // Show the remaining time as a bar - public float GetValue() + float ISelectionBar.GetValue() { if (!info.ReturnToOrigin) return 0f; @@ -126,7 +126,7 @@ namespace OpenRA.Mods.RA.Traits return (float)ReturnTicks / duration; } - public Color GetColor() { return info.TimeBarColor; } + Color ISelectionBar.GetColor() { return info.TimeBarColor; } public void ModifyDeathActorInit(Actor self, TypeDictionary init) { diff --git a/OpenRA.Mods.RA/Traits/PortableChrono.cs b/OpenRA.Mods.RA/Traits/PortableChrono.cs index 67a4fd7161..9e4fb26ead 100644 --- a/OpenRA.Mods.RA/Traits/PortableChrono.cs +++ b/OpenRA.Mods.RA/Traits/PortableChrono.cs @@ -105,12 +105,12 @@ namespace OpenRA.Mods.RA.Traits get { return chargeTick <= 0; } } - public float GetValue() + float ISelectionBar.GetValue() { return (float)(Info.ChargeDelay - chargeTick) / Info.ChargeDelay; } - public Color GetColor() { return Color.Magenta; } + Color ISelectionBar.GetColor() { return Color.Magenta; } } class PortableChronoOrderTargeter : IOrderTargeter