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

Merge pull request #9619 from abcdefg30/repulsionbug

Browse Source 
Fix aircraft repulsing other aircraft when not being repulsable themselves
This commit is contained in:
Matthias Mailänder
2015-12-05 19:20:40 +01:00
parent 142d3ef6ab 4432c071cc
commit a9d2ec5750
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -199,8 +199,14 @@ namespace OpenRA.Mods.Common.Traits
return WVec.Zero; return WVec.Zero;
var repulsionForce = self.World.FindActorsInCircle(self.CenterPosition, Info.IdealSeparation) var repulsionForce = self.World.FindActorsInCircle(self.CenterPosition, Info.IdealSeparation)
.Where(a => !a.IsDead && a.Info.HasTraitInfo<AircraftInfo>() .Where(a =>
&& a.Info.TraitInfo<AircraftInfo>().CruiseAltitude == Info.CruiseAltitude) {
if (a.IsDead)
return false;
var ai = a.Info.TraitInfoOrDefault<AircraftInfo>();
return ai != null && ai.Repulsable && ai.CruiseAltitude == Info.CruiseAltitude;
})
.Select(GetRepulsionForce) .Select(GetRepulsionForce)
.Aggregate(WVec.Zero, (a, b) => a + b); .Aggregate(WVec.Zero, (a, b) => a + b);