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

Migrate ProvidesRadar to conditions and remove JamsRadar.

Browse Source
This commit is contained in:
Paul Chote
2017-01-21 11:08:46 +00:00
parent bb972fa46d
commit 1f44e91746
15 changed files with 130 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Mods.RA/Traits/Render/RenderJammerCircle.cs
View File

@@ -35,17 +35,6 @@ namespace OpenRA.Mods.RA.Traits
Color.FromArgb(96, Color.Black));
}
var jamsRadar = ai.TraitInfoOrDefault<JamsRadarInfo>();
if (jamsRadar != null)
{
yield return new RangeCircleRenderable(
centerPosition,
jamsRadar.Range,
0,
Color.FromArgb(128, Color.Blue),
Color.FromArgb(96, Color.Black));
}
foreach (var a in w.ActorsWithTrait<RenderJammerCircle>())
if (a.Actor.Owner.IsAlliedWith(w.RenderPlayer))
foreach (var r in a.Trait.RenderAboveShroud(a.Actor, wr))
@@ -70,17 +59,6 @@ namespace OpenRA.Mods.RA.Traits
Color.FromArgb(128, Color.Red),
Color.FromArgb(96, Color.Black));
}
var jamsRadar = self.Info.TraitInfoOrDefault<JamsRadarInfo>();
if (jamsRadar != null)
{
yield return new RangeCircleRenderable(
self.CenterPosition,
jamsRadar.Range,
0,
Color.FromArgb(128, Color.Blue),
Color.FromArgb(96, Color.Black));
}
}
}
}

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

@@ -100,7 +100,7 @@ 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 NoActiveRadar { get { return !self.World.ActorsHavingTrait<ProvidesRadar>(r => !r.IsTraitDisabled).Any(a => a.Owner == self.Owner); } }
bool wasDisabled;
void ITick.Tick(Actor self)