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

implement order targeter for passenger

Browse Source
This commit is contained in:
Bob
2010-10-03 06:15:47 +13:00
committed by Paul Chote
parent f525c3808e
commit 39e62354a8
6 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA
{
get
{
yield return new EnterBuildingOrderTargeter<Building>( "CaptureBuilding", 5, true, false,
yield return new EnterOrderTargeter<Building>( "CaptureBuilding", 5, true, false,
_ => true, target => target.Info.Traits.Get<BuildingInfo>().Capturable );
}
}

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

@@ -98,7 +98,7 @@ namespace OpenRA.Mods.RA
{
get
{
yield return new EnterBuildingOrderTargeter<IAcceptOre>( "Deliver", 5, false, true, _ => true, _ => !IsEmpty );
yield return new EnterOrderTargeter<IAcceptOre>( "Deliver", 5, false, true, _ => true, _ => !IsEmpty );
yield return new HarvestOrderTargeter();
}
}

4
OpenRA.Mods.RA/Orders/EnterBuildingOrderTargeter.cs
View File

@@ -6,12 +6,12 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA.Orders
{
class EnterBuildingOrderTargeter<T> : UnitTraitOrderTargeter<T>
class EnterOrderTargeter<T> : UnitTraitOrderTargeter<T>
{
readonly Func<Actor, bool> canTarget;
readonly Func<Actor, bool> useEnterCursor;
public EnterBuildingOrderTargeter( string order, int priority, bool targetEnemy, bool targetAlly,
public EnterOrderTargeter( string order, int priority, bool targetEnemy, bool targetAlly,
Func<Actor, bool> canTarget, Func<Actor, bool> useEnterCursor )
: base( order, priority, "enter", targetEnemy, targetAlly )
{

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

@@ -14,58 +14,58 @@ using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using System.Linq;
using System.Collections.Generic;
using OpenRA.Mods.RA.Orders;
namespace OpenRA.Mods.RA
{
class PassengerInfo : TraitInfo<Passenger>
class PassengerInfo : ITraitInfo
{
public readonly string CargoType = null;
public readonly PipType PipType = PipType.Green;
public object Create( ActorInitializer init ) { return new Passenger( init.self ); }
}
class Passenger : IIssueOrder, IResolveOrder, IOrderCursor, IOrderVoice
class Passenger : IIssueOrder2, IResolveOrder, IOrderVoice
{
public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
readonly Actor self;
public Passenger( Actor self ) { this.self = self; }
public IEnumerable<IOrderTargeter> Orders
{
return 5;
get
{
yield return new EnterOrderTargeter<Cargo>( "EnterTransport", 6, false, true,
target => IsCorrectCargoType( target ), target => CanEnter( target ) );
}
}
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
public Order IssueOrder( Actor self, IOrderTargeter order, Target target )
{
if (mi.Button != MouseButton.Right)
return null;
if( order.OrderID == "EnterTransport" )
return new Order( order.OrderID, self, target.Actor );
if (underCursor == null || underCursor.Owner != self.Owner)
return null;
var cargo = underCursor.TraitOrDefault<Cargo>();
if (cargo == null)
return null;
return null;
}
bool IsCorrectCargoType( Actor target )
{
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);
var ci = target.Info.Traits.Get<CargoInfo>();
return ci.Types.Contains( pi.CargoType );
}
bool CanEnter(Actor self, Actor a)
bool CanEnter( Actor target )
{
var cargo = a.TraitOrDefault<Cargo>();
return (cargo != null && !cargo.IsFull(a));
}
public string CursorForOrder(Actor self, Order order)
{
if (order.OrderString != "EnterTransport") return null;
return CanEnter(self, order.TargetActor) ? "enter" : "enter-blocked";
var cargo = target.TraitOrDefault<Cargo>();
return (cargo != null && !cargo.IsFull(target));
}
public string VoicePhraseForOrder(Actor self, Order order)
{
if (order.OrderString != "EnterTransport" ||
!CanEnter(self, order.TargetActor)) return null;
!CanEnter(order.TargetActor)) return null;
return "Move";
}
@@ -73,7 +73,7 @@ namespace OpenRA.Mods.RA
{
if (order.OrderString == "EnterTransport")
{
if (!CanEnter(self, order.TargetActor)) return;
if (!CanEnter(order.TargetActor)) return;
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>

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

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<IOrderTargeter> Orders
{
get { yield return new EnterBuildingOrderTargeter<Building>( "Repair", 5, false, true, target => CanRepairAt( target ), _ => CanRepair() ); }
get { yield return new EnterOrderTargeter<Building>( "Repair", 5, false, true, target => CanRepairAt( target ), _ => CanRepair() ); }
}
public Order IssueOrder( Actor self, IOrderTargeter order, Target target )

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

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA
{
get
{
yield return new EnterBuildingOrderTargeter<Building>( "RepairNear", 5, false, true,
yield return new EnterOrderTargeter<Building>( "RepairNear", 5, false, true,
target => CanRepairAt( target ), _ => ShouldRepair() );
}
}