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

Explicitly implement ISelectionBar

Browse Source
This commit is contained in:
Taryn Hill
2015-12-30 08:19:50 -06:00
parent e3229f4cd8
commit 25eddb9567
9 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/Buildings/BaseProvider.cs
View File

@@ -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; }
}
}

4
OpenRA.Mods.Common/Traits/ExternalCapturableBar.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.Traits
capturable = self.Trait<ExternalCapturable>();
}
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; }
}
}

4
OpenRA.Mods.Common/Traits/Power/AffectedByPowerOutage.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.Traits
playerPower = self.Owner.PlayerActor.Trait<PowerManager>();
}
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;
}

4
OpenRA.Mods.Common/Traits/Render/ProductionBar.cs
View File

@@ -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)
{

4
OpenRA.Mods.Common/Traits/Render/SupportPowerChargeBar.cs
View File

@@ -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; }
}
}

4
OpenRA.Mods.Common/Traits/Render/TimedUpgradeBar.cs
View File

@@ -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; }
}
}

4
OpenRA.Mods.D2k/Traits/TemporaryOwnerManager.cs
View File

@@ -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;
}

4
OpenRA.Mods.RA/Traits/Chronoshiftable.cs
View File

@@ -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)
{

4
OpenRA.Mods.RA/Traits/PortableChrono.cs
View File

@@ -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