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

Fix some stupid bugs; remove hardcoded references to water/ore/tree terraintypes

Browse Source
This commit is contained in:
Paul Chote
2010-06-26 12:02:30 +12:00
parent bf6b2da1a8
commit 08ee425415
13 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,6 +144,9 @@ namespace OpenRA.Traits
var building = self.World.WorldActor.traits.Get<BuildingInfluence>().GetBuildingBlocking(cell);
if (building != null && building != ignoreActor)
{
if (Info.Crushes == null)
return false;
var crushable = building.traits.WithInterface<ICrushable>();
if (crushable.Count() == 0)
return false;
@@ -164,7 +167,10 @@ namespace OpenRA.Traits
if (shareable.Count() >= 5)
return false;
// We can enter a cell with nonshareable units if we can crush all of them
// We can enter a cell with nonshareable units only if we can crush all of them
if (Info.Crushes == null && nonshareable.Count() > 0)
return false;
if (nonshareable.Any(a => !(a.traits.Contains<ICrushable>() &&
a.traits.WithInterface<ICrushable>().Any(b => b.CrushClasses.Intersect(Info.Crushes).Any()))))
return false;
@@ -191,11 +197,9 @@ namespace OpenRA.Traits
// Custom terrain types don't stack: pick one
var customTerrain = self.World.WorldActor.traits.WithInterface<ITerrainTypeModifier>()
.Where( t => t.GetTerrainType(cell) != null )
.Select( t => t.GetTerrainType(cell) )
.FirstOrDefault();
.FirstOrDefault( t => t != null );
// Todo: Hack this until i finish migrating TerrainType to a string
var type = (customTerrain != null) ? customTerrain : self.World.GetTerrainType(cell);
var additionalCost = self.World.WorldActor.traits.WithInterface<ITerrainCost>()
.Select( t => t.GetTerrainCost(cell, self) ).Sum();
@@ -211,11 +215,9 @@ namespace OpenRA.Traits
// Custom terrain types don't stack: pick one
var customTerrain = self.World.WorldActor.traits.WithInterface<ITerrainTypeModifier>()
.Where( t => t.GetTerrainType(cell) != null )
.Select( t => t.GetTerrainType(cell) )
.FirstOrDefault();
.FirstOrDefault( t => t != null );
// Todo: Hack this until i finish migrating TerrainType to a string
var type = (customTerrain != null) ? customTerrain : self.World.GetTerrainType(cell);
var modifier = self.traits