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

Don't reserve airfields/helipads for husks that just fall down

Browse Source 
fixes #3376
This commit is contained in:
Matthias Mailänder
2013-06-16 11:24:03 +02:00
parent 886099a948
commit 11755798cc
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.RA/Air/Aircraft.cs
View File

@@ -86,10 +86,8 @@ namespace OpenRA.Mods.RA.Air
protected void ReserveSpawnBuilding()
{
/* not spawning in the air, so try to assoc. with our afld. this is a hack. */
/* HACK: not spawning in the air, so try to assoc. with our afld. */
var afld = GetActorBelow();
if (afld == null)
return;
@@ -102,10 +100,10 @@ namespace OpenRA.Mods.RA.Air
public void SetPosition(Actor self, CPos cell)
{
SetPxPosition( self, Util.CenterOfCell( cell ) );
SetPxPosition(self, Util.CenterOfCell(cell));
}
public void SetPxPosition( Actor self, PPos px )
public void SetPxPosition(Actor self, PPos px)
{
SubPxPosition = px.ToPSubPos();
}
@@ -114,9 +112,9 @@ namespace OpenRA.Mods.RA.Air
public bool AircraftCanEnter(Actor a)
{
if( self.AppearsHostileTo(a) ) return false;
return Info.RearmBuildings.Contains( a.Info.Name )
|| Info.RepairBuildings.Contains( a.Info.Name );
if (self.AppearsHostileTo(a)) return false;
return Info.RearmBuildings.Contains(a.Info.Name)
|| Info.RepairBuildings.Contains(a.Info.Name);
}
public bool CanEnterCell(CPos location) { return true; }
@@ -126,7 +124,7 @@ namespace OpenRA.Mods.RA.Air
get
{
decimal ret = Info.Speed;
foreach( var t in self.TraitsImplementing<ISpeedModifier>() )
foreach (var t in self.TraitsImplementing<ISpeedModifier>())
ret *= t.GetSpeedModifier();
return (int)ret;
}
@@ -135,7 +133,7 @@ namespace OpenRA.Mods.RA.Air
Pair<CPos, SubCell>[] noCells = new Pair<CPos, SubCell>[] { };
public IEnumerable<Pair<CPos, SubCell>> OccupiedCells() { return noCells; }
public void TickMove( int speed, int facing )
public void TickMove(int speed, int facing)
{
var rawspeed = speed * 7 / (32 * PSubPos.PerPx);
SubPxPosition += rawspeed * -Util.SubPxVector[facing];
@@ -186,7 +184,7 @@ namespace OpenRA.Mods.RA.Air
public string VoicePhraseForOrder(Actor self, Order order)
{
switch( order.OrderString )
switch (order.OrderString)
{
case "Move":
case "Enter":

3
OpenRA.Mods.RA/Air/Helicopter.cs
View File

@@ -106,7 +106,8 @@ namespace OpenRA.Mods.RA.Air
if (firstTick)
{
firstTick = false;
ReserveSpawnBuilding();
if (!self.HasTrait<FallsToEarth>()) // TODO: Aircraft husks don't properly unreserve.
ReserveSpawnBuilding();
}
/* repulsion only applies when we're flying */

3
OpenRA.Mods.RA/Air/Plane.cs
View File

@@ -32,7 +32,8 @@ namespace OpenRA.Mods.RA.Air
if (firstTick)
{
firstTick = false;
ReserveSpawnBuilding();
if (!self.HasTrait<FallsToEarth>()) // TODO: Aircraft husks don't properly unreserve.
ReserveSpawnBuilding();
}
}