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

Replace the DisplayTimer field with a DisplayTimerStances field in SupportPowerInfo

Browse Source
This commit is contained in:
abcdefg30
2016-04-24 17:48:13 +02:00
parent 1cdc169ad0
commit 9848c98750
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs
View File

@@ -44,7 +44,8 @@ namespace OpenRA.Mods.Common.Traits
public readonly string IncomingSound = null; public readonly string IncomingSound = null;
public readonly string IncomingSpeechNotification = null; public readonly string IncomingSpeechNotification = null;
public readonly bool DisplayTimer = false; [Desc("Defines to which players the timer is shown.")]
public readonly Stance DisplayTimerStances = Stance.None;
[Desc("Palette used for the icon.")] [Desc("Palette used for the icon.")]
[PaletteReference] public readonly string IconPalette = "chrome"; [PaletteReference] public readonly string IconPalette = "chrome";

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

@@ -16,6 +16,7 @@ using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits;
using OpenRA.Widgets; using OpenRA.Widgets;
namespace OpenRA.Mods.Common.Widgets namespace OpenRA.Mods.Common.Widgets
@@ -36,7 +37,7 @@ namespace OpenRA.Mods.Common.Widgets
powers = world.ActorsWithTrait<SupportPowerManager>() powers = world.ActorsWithTrait<SupportPowerManager>()
.Where(p => !p.Actor.IsDead && !p.Actor.Owner.NonCombatant) .Where(p => !p.Actor.IsDead && !p.Actor.Owner.NonCombatant)
.SelectMany(s => s.Trait.Powers.Values) .SelectMany(s => s.Trait.Powers.Values)
.Where(p => p.Instances.Any() && p.Info.DisplayTimer && !p.Disabled); .Where(p => p.Instances.Any() && p.Info.DisplayTimerStances != Stance.None && !p.Disabled);
// Timers in replays should be synced to the effective game time, not the playback time. // Timers in replays should be synced to the effective game time, not the playback time.
timestep = world.Timestep; timestep = world.Timestep;
@@ -46,7 +47,14 @@ namespace OpenRA.Mods.Common.Widgets
public override void Tick() public override void Tick()
{ {
texts = powers.Select(p => var displayedPowers = powers.Where(p =>
{
var owner = p.Instances[0].Self.Owner;
var viewer = owner.World.RenderPlayer ?? owner.World.LocalPlayer;
return viewer == null || p.Info.DisplayTimerStances.HasStance(owner.Stances[viewer]);
});
texts = displayedPowers.Select(p =>
{ {
var time = WidgetUtils.FormatTime(p.RemainingTime, false, timestep); var time = WidgetUtils.FormatTime(p.RemainingTime, false, timestep);
var text = Format.F(p.Info.Description, time); var text = Format.F(p.Info.Description, time);