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

Draw border around capture area in ProximityCapturable

Browse Source
This commit is contained in:
Oliver Brakmann
2020-02-29 17:03:47 +01:00
committed by Paul Chote
parent c4acd8b361
commit 3904576574
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Traits/ProximityCapturable.cs
View File

@@ -9,6 +9,10 @@
*/
#endregion
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Primitives;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Actor can be captured by units within a certain range.")]
@@ -44,5 +48,10 @@ namespace OpenRA.Mods.Common.Traits
{
self.World.ActorMap.UpdateProximityTrigger(trigger, self.CenterPosition, Info.Range, WDist.Zero);
}
protected override IRenderable GetRenderable(Actor self, WorldRenderer wr)
{
return new RangeCircleAnnotationRenderable(self.CenterPosition, Info.Range, 0, self.Owner.Color, 1, Color.Black, 3);
}
}
}

17
OpenRA.Mods.Common/Traits/ProximityCapturableBase.cs
View File

@@ -11,6 +11,7 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Effects;
using OpenRA.Primitives;
using OpenRA.Traits;
@@ -33,6 +34,9 @@ namespace OpenRA.Mods.Common.Traits
"This option implies the `" + nameof(Sticky) + "` behaviour as well.")]
public readonly bool Permanent = false;
[Desc("If set, will draw a border in the owner's color around the capturable area.")]
public readonly bool DrawDecoration = true;
public void RulesetLoaded(Ruleset rules, ActorInfo info)
{
var pci = rules.Actors[SystemActors.Player].TraitInfoOrDefault<ProximityCaptorInfo>();
@@ -43,7 +47,7 @@ namespace OpenRA.Mods.Common.Traits
public abstract override object Create(ActorInitializer init);
}
public abstract class ProximityCapturableBase : ITick, INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyOwnerChanged
public abstract class ProximityCapturableBase : ITick, INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyOwnerChanged, IRenderAnnotations
{
public readonly Player OriginalOwner;
public bool Captured => Self.Owner != OriginalOwner;
@@ -66,6 +70,7 @@ namespace OpenRA.Mods.Common.Traits
protected abstract int CreateTrigger(Actor self);
protected abstract void RemoveTrigger(Actor self, int trigger);
protected abstract void TickInner(Actor self);
protected abstract IRenderable GetRenderable(Actor self, WorldRenderer wr);
void INotifyAddedToWorld.AddedToWorld(Actor self)
{
@@ -192,5 +197,15 @@ namespace OpenRA.Mods.Common.Traits
{
Game.RunAfterTick(() => skipTriggerUpdate = false);
}
IEnumerable<IRenderable> IRenderAnnotations.RenderAnnotations(Actor self, WorldRenderer wr)
{
if (!self.IsInWorld || !Info.DrawDecoration)
return Enumerable.Empty<IRenderable>();
return new[] { GetRenderable(self, wr) };
}
bool IRenderAnnotations.SpatiallyPartitionable { get { return false; } }
}
}

8
OpenRA.Mods.Common/Traits/RegionProximityCapturable.cs
View File

@@ -12,6 +12,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Primitives;
namespace OpenRA.Mods.Common.Traits
{
@@ -53,6 +56,11 @@ namespace OpenRA.Mods.Common.Traits
}
protected override void TickInner(Actor self) { }
protected override IRenderable GetRenderable(Actor self, WorldRenderer wr)
{
return new BorderedRegionRenderable(region, self.Owner.Color, 1, Color.Black, 3);
}
}
public class RegionInit : ValueActorInit<CVec[]>