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

Add a new DisplayStances field to SupportPowerChargeBarInfo

Browse Source 
other
This commit is contained in:
abcdefg30
2016-04-24 18:23:20 +02:00
parent 9848c98750
commit e9e49a5d02
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,9 +15,12 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits.Render namespace OpenRA.Mods.Common.Traits.Render
{ {
[Desc("Display the time remaining until the super weapon attached to the actor is ready to the player and his allies.")] [Desc("Display the time remaining until the super weapon attached to the actor is ready.")]
class SupportPowerChargeBarInfo : ITraitInfo class SupportPowerChargeBarInfo : ITraitInfo
{ {
[Desc("Defines to which players the bar is to be shown.")]
public readonly Stance DisplayStances = Stance.Ally;
public readonly Color Color = Color.Magenta; public readonly Color Color = Color.Magenta;
public object Create(ActorInitializer init) { return new SupportPowerChargeBar(init.Self, this); } public object Create(ActorInitializer init) { return new SupportPowerChargeBar(init.Self, this); }
@@ -36,13 +39,15 @@ namespace OpenRA.Mods.Common.Traits.Render
float ISelectionBar.GetValue() float ISelectionBar.GetValue()
{ {
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
return 0;
var spm = self.Owner.PlayerActor.Trait<SupportPowerManager>(); var spm = self.Owner.PlayerActor.Trait<SupportPowerManager>();
var power = spm.GetPowersForActor(self).FirstOrDefault(sp => !sp.Disabled); var power = spm.GetPowersForActor(self).FirstOrDefault(sp => !sp.Disabled);
if (power == null) return 0; if (power == null)
return 0;
var viewer = self.World.RenderPlayer ?? self.World.LocalPlayer;
if (viewer != null && info.DisplayStances.HasStance(self.Owner.Stances[viewer]))
return 0;
return 1 - (float)power.RemainingTime / power.TotalTime; return 1 - (float)power.RemainingTime / power.TotalTime;
} }