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

Fix cargo/passenger interaction

Browse Source
This commit is contained in:
Paul Chote
2010-08-08 19:16:37 +12:00
parent e5878e8207
commit 6fc945ac91
8 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
OpenRA.Mods.RA/Passenger.cs
View File

@@ -13,34 +13,36 @@ using OpenRA.Effects;
using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using System.Linq;
namespace OpenRA.Mods.RA
{
class PassengerInfo : TraitInfo<Passenger>
{
public readonly PipType ColorOfCargoPip = PipType.Green;
public readonly string CargoType = null;
public readonly PipType PipType = PipType.Green;
}
class Passenger : IIssueOrder, IResolveOrder, IOrderCursor, IOrderVoice
{
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{
// Disable cargo support until someone fixes it
return null;
{
if (mi.Button != MouseButton.Right)
return null;
if (underCursor == null || underCursor.Owner != self.Owner)
return null;
var cargo = underCursor.traits.GetOrDefault<Cargo>();
if (cargo == null)
return null;
//if (mi.Button != MouseButton.Right)
// return null;
//if (underCursor == null || underCursor.Owner != self.Owner)
// return null;
//var cargo = underCursor.traits.GetOrDefault<Cargo>();
//if (cargo == null)
// return null;
//// Todo: Check if we can enter the transport
var pi = self.Info.Traits.Get<PassengerInfo>();
var ci = underCursor.Info.Traits.Get<CargoInfo>();
if (!ci.Types.Contains(pi.CargoType))
return null;
//return new Order("EnterTransport", self, underCursor);
return new Order("EnterTransport", self, underCursor);
}
bool CanEnter(Actor self, Actor a)
@@ -85,7 +87,7 @@ namespace OpenRA.Mods.RA
public PipType ColorOfCargoPip( Actor self )
{
return self.Info.Traits.Get<PassengerInfo>().ColorOfCargoPip;
return self.Info.Traits.Get<PassengerInfo>().PipType;
}
}
}