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

Disable GPS dots without active radar.

Browse Source
This commit is contained in:
Matthias Mailänder
2016-04-02 14:26:17 +02:00
parent a8471d9f54
commit ec87b18608
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/Traits/SupportPowers/GpsPower.cs
View File

@@ -31,17 +31,22 @@ namespace OpenRA.Mods.RA.Traits
[SequenceReference("SatelliteImage")] public readonly string SatelliteSequence = "idle";
[PaletteReference] public readonly string SatellitePalette = "effect";
[Desc("Requires an actor with an online `ProvidesRadar` to show GPS dots.")]
public readonly bool RequiresActiveRadar = true;
public override object Create(ActorInitializer init) { return new GpsPower(init.Self, this); }
}
class GpsPower : SupportPower, INotifyKilled, INotifySold, INotifyOwnerChanged, ITick
{
readonly Actor self;
readonly GpsPowerInfo info;
GpsWatcher owner;
public GpsPower(Actor self, GpsPowerInfo info)
: base(self, info)
{
this.self = self;
this.info = info;
owner = self.Owner.PlayerActor.Trait<GpsWatcher>();
owner.GpsAdd(self);
@@ -84,16 +89,17 @@ namespace OpenRA.Mods.RA.Traits
owner.GpsAdd(self);
}
bool NoActiveRadar { get { return !self.World.ActorsHavingTrait<ProvidesRadar>(r => r.IsActive).Any(a => a.Owner == self.Owner); } }
bool wasDisabled;
public void Tick(Actor self)
{
if (!wasDisabled && self.IsDisabled())
if (!wasDisabled && (self.IsDisabled() || (info.RequiresActiveRadar && NoActiveRadar)))
{
wasDisabled = true;
RemoveGps(self);
}
else if (wasDisabled && !self.IsDisabled())
else if (wasDisabled && !self.IsDisabled() && !(info.RequiresActiveRadar && NoActiveRadar))
{
wasDisabled = false;
owner.GpsAdd(self);