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

Treat transit-only tiles as invalid locations for minelayers

Browse Source
This commit is contained in:
abcdefg30
2020-04-17 11:28:59 +02:00
committed by Paul Chote
parent 3ba86f329f
commit 4e548291ce
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Cnc/Activities/LayMines.cs
View File

@@ -107,9 +107,11 @@ namespace OpenRA.Mods.Cnc.Activities
if (minefield != null) if (minefield != null)
{ {
var positionable = (IPositionable)movement; var positionable = (IPositionable)movement;
var mobile = positionable as Mobile;
minefield.RemoveAll(c => self.World.ActorMap.GetActorsAt(c) minefield.RemoveAll(c => self.World.ActorMap.GetActorsAt(c)
.Any(a => a.Info.Name == minelayer.Info.Mine.ToLowerInvariant() && a.CanBeViewedByPlayer(self.Owner)) || .Any(a => a.Info.Name == minelayer.Info.Mine.ToLowerInvariant() && a.CanBeViewedByPlayer(self.Owner)) ||
(!positionable.CanEnterCell(c, null, BlockedByActor.Immovable) && self.Owner.Shroud.IsVisible(c))); ((!positionable.CanEnterCell(c, null, BlockedByActor.Immovable) || (mobile != null && !mobile.CanStayInCell(c)))
&& self.Owner.Shroud.IsVisible(c)));
} }
} }

3
OpenRA.Mods.Cnc/Traits/Minelayer.cs
View File

@@ -231,13 +231,14 @@ namespace OpenRA.Mods.Cnc.Traits
minelayers.Max(m => m.Info.TraitInfo<MinelayerInfo>().MinefieldDepth)); minelayers.Max(m => m.Info.TraitInfo<MinelayerInfo>().MinefieldDepth));
var movement = minelayer.Trait<IPositionable>(); var movement = minelayer.Trait<IPositionable>();
var mobile = movement as Mobile;
var pal = wr.Palette(TileSet.TerrainPaletteInternalName); var pal = wr.Palette(TileSet.TerrainPaletteInternalName);
foreach (var c in minefield) foreach (var c in minefield)
{ {
var tile = tileOk; var tile = tileOk;
if (world.FogObscures(c)) if (world.FogObscures(c))
tile = tileUnknown; tile = tileUnknown;
else if (!movement.CanEnterCell(c, null, BlockedByActor.Immovable)) else if (!movement.CanEnterCell(c, null, BlockedByActor.Immovable) || (mobile != null && !mobile.CanStayInCell(c)))
tile = tileBlocked; tile = tileBlocked;
yield return new SpriteRenderable(tile, world.Map.CenterOfCell(c), yield return new SpriteRenderable(tile, world.Map.CenterOfCell(c),