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

filtering of unusable cells in minefield support; rationalize mobile a bit

Browse Source
This commit is contained in:
Chris Forbes
2010-05-23 16:07:59 +12:00
parent 9dd1032683
commit 027d7e2c2b
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Game/Traits/Mobile.cs
View File

@@ -114,26 +114,16 @@ namespace OpenRA.Traits
return self.Info.Traits.Get<MobileInfo>().MovementType;
}
public bool CanEnterCell(int2 a)
public bool CanEnterCell(int2 p)
{
if (!self.World.WorldActor.traits.Get<BuildingInfluence>().CanMoveHere(a)) return false;
if (!self.World.WorldActor.traits.Get<BuildingInfluence>().CanMoveHere(p)) return false;
var crushable = true;
foreach (Actor actor in self.World.WorldActor.traits.Get<UnitInfluence>().GetUnitsAt(a))
{
if (actor == self) continue;
if (!self.World.IsActorCrushableByActor(actor, self))
{
crushable = false;
break;
}
}
if (self.World.WorldActor.traits.Get<UnitInfluence>().GetUnitsAt(p).Any(
a => a != self && !self.World.IsActorCrushableByActor(a, self)))
return false;
if (!crushable) return false;
return self.World.Map.IsInMap(a.X, a.Y) &&
Rules.TerrainTypes[self.World.TileSet.GetTerrainType(self.World.Map.MapTiles[a.X, a.Y])]
return self.World.Map.IsInMap(p.X, p.Y) &&
Rules.TerrainTypes[self.World.TileSet.GetTerrainType(self.World.Map.MapTiles[p.X, p.Y])]
.GetCost(GetMovementType()) < float.PositiveInfinity;
}

7
OpenRA.Mods.RA/Minelayer.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA
class Minelayer : IIssueOrder, IResolveOrder
{
int2[] minefield = null;
public int2[] minefield = null;
int2 minefieldStart; /* nosync! */
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
@@ -60,8 +60,11 @@ namespace OpenRA.Mods.RA
if (self.Owner == self.World.LocalPlayer)
Game.controller.CancelInputMode();
var movement = self.traits.Get<IMovement>();
minefield = GetMinefieldCells(minefieldStart, order.TargetLocation,
self.Info.Traits.Get<MinelayerInfo>().MinefieldDepth).ToArray();
self.Info.Traits.Get<MinelayerInfo>().MinefieldDepth)
.Where(p => movement.CanEnterCell(p)).ToArray();
/* todo: start the mnly actually laying mines there */
}