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

Fix vehicle production; Basic 5-to-a-cell logic. cnc only. Infantry stack; need to give a graphical offset.

Browse Source
This commit is contained in:
Paul Chote
2010-06-23 20:23:47 +12:00
parent b7c8e55d14
commit b42589b479
7 changed files with 74 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,12 +121,28 @@ namespace OpenRA.Traits
public bool CanEnterCell(int2 p)
{
if (!self.World.WorldActor.traits.Get<BuildingInfluence>().CanMoveHere(p)) return false;
return CanEnterCell(p, null);
}
public bool CanEnterCell(int2 p, Actor ignoreBuilding)
{
if (!self.World.WorldActor.traits.Get<BuildingInfluence>().CanMoveHere(p, ignoreBuilding)) return false;
if (self.World.WorldActor.traits.Get<UnitInfluence>().GetUnitsAt(p).Any(
a => a != self && !self.World.IsActorCrushableByActor(a, self)))
var canShare = self.traits.Contains<SharesCell>();
var actors = self.World.WorldActor.traits.Get<UnitInfluence>().GetUnitsAt(p);
var nonshareable = actors.Where(a => a != self && !(canShare && a.traits.Contains<SharesCell>()));
var shareable = actors.Where(a => a != self && canShare && a.traits.Contains<SharesCell>());
// only allow 5 in a cell
if (shareable.Count() >= 5)
return false;
// We can enter a cell with nonshareable units if we can crush all of them
if (nonshareable.Any(
a => !self.World.IsActorCrushableByActor(a, self)))
return false;
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;