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

Move Shroud.IsTargetable to Player.

Browse Source
This commit is contained in:
Paul Chote
2015-06-13 18:27:00 +01:00
parent 1eb1841f2b
commit 0677c309f3
7 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Traits/Infiltration/InfiltrateForExploration.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.RA.Traits
public void Infiltrated(Actor self, Actor infiltrator)
{
infiltrator.Owner.Shroud.Explore(self.Owner.Shroud);
if (!self.Owner.Shroud.HasFogVisibility())
if (!self.Owner.HasFogVisibility)
self.Owner.Shroud.ResetExploration();
}
}

8
OpenRA.Mods.RA/Traits/SupportPowers/ChronoshiftPower.cs
View File

@@ -137,7 +137,7 @@ namespace OpenRA.Mods.RA.Traits
var targetUnits = power.UnitsInRange(xy).Where(a => !world.FogObscures(a));
foreach (var unit in targetUnits)
if (manager.Self.Owner.Shroud.IsTargetable(unit))
if (manager.Self.Owner.CanTargetActor(unit))
yield return new SelectionBoxRenderable(unit, Color.Red);
}
@@ -217,7 +217,7 @@ namespace OpenRA.Mods.RA.Traits
public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world)
{
foreach (var unit in power.UnitsInRange(sourceLocation))
if (manager.Self.Owner.Shroud.IsTargetable(unit))
if (manager.Self.Owner.CanTargetActor(unit))
yield return new SelectionBoxRenderable(unit, Color.Red);
}
@@ -238,7 +238,7 @@ namespace OpenRA.Mods.RA.Traits
foreach (var unit in power.UnitsInRange(sourceLocation))
{
var offset = world.Map.CenterOfCell(xy) - world.Map.CenterOfCell(sourceLocation);
if (manager.Self.Owner.Shroud.IsTargetable(unit))
if (manager.Self.Owner.CanTargetActor(unit))
foreach (var r in unit.Render(wr))
yield return r.OffsetBy(offset);
}
@@ -246,7 +246,7 @@ namespace OpenRA.Mods.RA.Traits
// Unit tiles
foreach (var unit in power.UnitsInRange(sourceLocation))
{
if (manager.Self.Owner.Shroud.IsTargetable(unit))
if (manager.Self.Owner.CanTargetActor(unit))
{
var targetCell = unit.Location + (xy - sourceLocation);
var canEnter = manager.Self.Owner.Shroud.IsExplored(targetCell) &&