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

Fix #1269 - Transport Helicopter Loading while in the Air

Browse Source 
Note that weight is now checked for cargo (this might break things)
This commit is contained in:
alzeih
2011-12-11 22:19:59 +13:00
committed by Chris Forbes
parent 7e590b05c1
commit b508f7c300
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.RA/Activities/EnterTransport.cs
View File

@@ -27,10 +27,9 @@ namespace OpenRA.Mods.RA.Activities
if (transport == null || !transport.IsInWorld) return NextActivity; if (transport == null || !transport.IsInWorld) return NextActivity;
var cargo = transport.Trait<Cargo>(); var cargo = transport.Trait<Cargo>();
if (!cargo.HasSpace(1)) if (!cargo.CanLoad(transport, self))
return NextActivity; return NextActivity;
// Todo: Queue a move order to the transport? need to be // Todo: Queue a move order to the transport? need to be
// careful about units that can't path to the transport // careful about units that can't path to the transport
if ((transport.Location - self.Location).LengthSquared > 2) if ((transport.Location - self.Location).LengthSquared > 2)

10
OpenRA.Mods.RA/Cargo.cs
View File

@@ -87,6 +87,16 @@ namespace OpenRA.Mods.RA
return true; return true;
} }
public bool CanLoad(Actor self, Actor a)
{
if (!HasSpace(GetWeight(a)))
return false;
// Cannot load mid-air
var move = self.TraitOrDefault<IMove>();
return move == null || move.Altitude == 0;
}
public string CursorForOrder(Actor self, Order order) public string CursorForOrder(Actor self, Order order)
{ {
if (order.OrderString != "Unload") return null; if (order.OrderString != "Unload") return null;