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

Kill Crewed and move WaterBound onto building

Browse Source
This commit is contained in:
Paul Chote
2010-07-28 20:48:50 +12:00
parent 5ca7218eb6
commit 6854d9853b
11 changed files with 24 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.RA/Combat.cs
View File

@@ -163,19 +163,20 @@ namespace OpenRA.Mods.RA
{
// todo: fix this properly.
if (!target.IsValid) return false;
if (!target.IsActor) return weapon.ValidTargets.Contains("Ground"); // hack!
if (!target.IsActor) return weapon.ValidTargets.Contains("Ground") // hack!
|| (weapon.ValidTargets.Contains("Water") &&
Game.world.GetTerrainType(Util.CellContaining(target.CenterLocation)) == "Water"); // even bigger hack!
var ownedInfo = target.Actor.Info.Traits.GetOrDefault<OwnedActorInfo>();
if (!weapon.ValidTargets.Contains(ownedInfo.TargetType))
if (!weapon.ValidTargets.Intersect(ownedInfo.TargetType).Any())
return false;
if (weapon.Warheads.All( w => w.EffectivenessAgainst(ownedInfo.Armor) <= 0))
return false;
if (weapon.Underwater && !ownedInfo.WaterBound)
return false;
return true;
}

2
OpenRA.Mods.RA/ProductionSurround.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRA.Mods.RA
public override int2? CreationLocation(Actor self, ActorInfo producee)
{
return FindAdjacentTile(self, producee.Traits.Get<OwnedActorInfo>().WaterBound);
return FindAdjacentTile(self, self.Info.Traits.Get<BuildingInfo>().WaterBound);
}
public override int CreationFacing(Actor self, Actor newUnit)