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

implement order targeter for everything else

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

5
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -33,11 +33,6 @@ namespace OpenRA.Traits
public interface ITick { void Tick(Actor self); } public interface ITick { void Tick(Actor self); }
public interface IRender { IEnumerable<Renderable> Render(Actor self); } public interface IRender { IEnumerable<Renderable> Render(Actor self); }
public interface IIssueOrder
{
Order IssueOrder( Actor self, int2 xy, MouseInput mi, Actor underCursor );
int OrderPriority( Actor self, int2 xy, MouseInput mi, Actor underCursor );
}
public interface IIssueOrder2 public interface IIssueOrder2
{ {
IEnumerable<IOrderTargeter> Orders { get; } IEnumerable<IOrderTargeter> Orders { get; }

5
OpenRA.Mods.RA/Aircraft.cs
View File

@@ -30,6 +30,7 @@ namespace OpenRA.Mods.RA
public class Aircraft : IMove, IFacing, IOccupySpace public class Aircraft : IMove, IFacing, IOccupySpace
{ {
protected readonly Actor self;
[Sync] [Sync]
public int2 Location; public int2 Location;
[Sync] [Sync]
@@ -41,6 +42,7 @@ namespace OpenRA.Mods.RA
public Aircraft( ActorInitializer init , AircraftInfo info) public Aircraft( ActorInitializer init , AircraftInfo info)
{ {
this.self = init.self;
if (init.Contains<LocationInit>()) if (init.Contains<LocationInit>())
this.Location = init.Get<LocationInit,int2>(); this.Location = init.Get<LocationInit,int2>();
@@ -64,8 +66,9 @@ namespace OpenRA.Mods.RA
self.CenterLocation = Util.CenterOfCell(cell); self.CenterLocation = Util.CenterOfCell(cell);
} }
public bool AircraftCanEnter(Actor self, Actor a) public bool AircraftCanEnter(Actor a)
{ {
if( self.Owner != a.Owner ) return false;
return Info.RearmBuildings.Contains( a.Info.Name ) return Info.RearmBuildings.Contains( a.Info.Name )
|| Info.RepairBuildings.Contains( a.Info.Name ); || Info.RepairBuildings.Contains( a.Info.Name );
} }

31
OpenRA.Mods.RA/ChronoshiftDeploy.cs
View File

@@ -21,7 +21,7 @@ namespace OpenRA.Mods.RA
public readonly int ChargeTime = 120; // Seconds public readonly int ChargeTime = 120; // Seconds
} }
class ChronoshiftDeploy : IIssueOrder, IResolveOrder, ITick, IPips, IOrderCursor, IOrderVoice class ChronoshiftDeploy : IIssueOrder2, IResolveOrder, ITick, IPips, IOrderVoice
{ {
// Recharge logic // Recharge logic
[Sync] [Sync]
@@ -33,29 +33,22 @@ namespace OpenRA.Mods.RA
chargeTick--; chargeTick--;
} }
public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor) public IEnumerable<IOrderTargeter> Orders
{ {
return 5; get { yield return new DeployOrderTargeter( "ChronoshiftDeploy", 5, () => chargeTick <= 0 ); }
} }
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 && xy == self.Location) if( order.OrderID == "ChronoshiftDeploy" )
return new Order("ChronoshiftDeploy", self); if (chargeTick <= 0)
self.World.OrderGenerator = new SetChronoTankDestination( self );
return null; return null;
} }
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "ChronoshiftDeploy")
{
if (chargeTick <= 0)
if (self.Owner == self.World.LocalPlayer)
self.World.OrderGenerator = new SetChronoTankDestination(self);
return;
}
var movement = self.TraitOrDefault<IMove>(); var movement = self.TraitOrDefault<IMove>();
if (order.OrderString == "ChronoshiftSelf" && movement.CanEnterCell(order.TargetLocation)) if (order.OrderString == "ChronoshiftSelf" && movement.CanEnterCell(order.TargetLocation))
{ {
@@ -76,14 +69,6 @@ namespace OpenRA.Mods.RA
} }
} }
public string CursorForOrder(Actor self, Order order)
{
if (order.OrderString != "ChronoshiftDeploy")
return null;
return (chargeTick <= 0) ? "deploy" : "deploy-blocked";
}
public string VoicePhraseForOrder(Actor self, Order order) public string VoicePhraseForOrder(Actor self, Order order)
{ {
return (order.OrderString == "ChronoshiftDeploy" && chargeTick <= 0) ? "Move" : null; return (order.OrderString == "ChronoshiftDeploy" && chargeTick <= 0) ? "Move" : null;

40
OpenRA.Mods.RA/Helicopter.cs
View File

@@ -16,6 +16,7 @@ using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Traits.Activities; using OpenRA.Traits.Activities;
using System.Drawing; using System.Drawing;
using OpenRA.Mods.RA.Orders;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
{ {
@@ -29,7 +30,7 @@ namespace OpenRA.Mods.RA
public override object Create( ActorInitializer init ) { return new Helicopter( init, this); } public override object Create( ActorInitializer init ) { return new Helicopter( init, this); }
} }
class Helicopter : Aircraft, ITick, IIssueOrder, IResolveOrder, IOrderCursor, IOrderVoice class Helicopter : Aircraft, ITick, IIssueOrder2, IResolveOrder, IOrderVoice
{ {
public IDisposable reservation; public IDisposable reservation;
HelicopterInfo Info; HelicopterInfo Info;
@@ -39,32 +40,25 @@ namespace OpenRA.Mods.RA
Info = info; Info = info;
} }
public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor) public IEnumerable<IOrderTargeter> Orders
{ {
// Force move takes precidence get
return mi.Modifiers.HasModifier(Modifiers.Alt) ? int.MaxValue : 0; {
} yield return new EnterOrderTargeter<Building>( "Enter", 5, false, true,
target => AircraftCanEnter( target ), target => !Reservable.IsReserved( target ) );
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{
if (mi.Button == MouseButton.Left) return null;
if (underCursor != null && AircraftCanEnter(self, underCursor) yield return new AircraftMoveOrderTargeter();
&& underCursor.Owner == self.Owner) }
return new Order("Enter", self, underCursor);
if (self.TraitOrDefault<IMove>().CanEnterCell(xy))
return new Order("Move", self, xy);
return null;
} }
public string CursorForOrder(Actor self, Order order) public Order IssueOrder( Actor self, IOrderTargeter order, Target target )
{ {
if (order.OrderString == "Move") return "move"; if( order.OrderID == "Enter" )
if (order.OrderString == "Enter") return new Order( order.OrderID, self, target.Actor );
return Reservable.IsReserved(order.TargetActor) ? "enter-blocked" : "enter";
if( order.OrderID == "Move" )
return new Order( order.OrderID, self, Util.CellContaining( target.CenterLocation ) );
return null; return null;
} }

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

@@ -9,11 +9,13 @@
#endregion #endregion
using System; using System;
using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Effects; using OpenRA.Effects;
using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Activities;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Mods.RA.Orders;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
{ {
@@ -22,7 +24,7 @@ namespace OpenRA.Mods.RA
public override object Create( ActorInitializer init ) { return new Plane( init, this ); } public override object Create( ActorInitializer init ) { return new Plane( init, this ); }
} }
public class Plane : Aircraft, IIssueOrder, IResolveOrder, IOrderCursor, IOrderVoice, ITick public class Plane : Aircraft, IIssueOrder2, IResolveOrder, IOrderVoice, ITick
{ {
public IDisposable reservation; public IDisposable reservation;
@@ -46,31 +48,28 @@ namespace OpenRA.Mods.RA
} }
} }
public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor) public IEnumerable<IOrderTargeter> Orders
{ {
// Force move takes precidence get
return mi.Modifiers.HasModifier(Modifiers.Alt) ? int.MaxValue : 0; {
yield return new EnterOrderTargeter<Building>( "Enter", 5, false, true,
target => AircraftCanEnter( target ), target => !Reservable.IsReserved( target ) );
yield return new AircraftMoveOrderTargeter();
}
} }
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor) public Order IssueOrder( Actor self, IOrderTargeter order, Target target )
{ {
if (mi.Button == MouseButton.Left) return null; if( order.OrderID == "Enter" )
if (underCursor != null && AircraftCanEnter(self, underCursor) return new Order( order.OrderID, self, target.Actor );
&& underCursor.Owner == self.Owner)
return new Order("Enter", self, underCursor); if( order.OrderID == "Move" )
return new Order( order.OrderID, self, Util.CellContaining( target.CenterLocation ) );
return new Order("Move", self, xy);
}
public string CursorForOrder(Actor self, Order order)
{
if (order.OrderString == "Move") return "move";
if (order.OrderString == "Enter")
return Reservable.IsReserved(order.TargetActor) ? "enter-blocked" : "enter";
return null; return null;
} }
public string VoicePhraseForOrder(Actor self, Order order) public string VoicePhraseForOrder(Actor self, Order order)
{ {
return (order.OrderString == "Move" || order.OrderString == "Enter") ? "Move" : null; return (order.OrderString == "Move" || order.OrderString == "Enter") ? "Move" : null;
@@ -134,4 +133,21 @@ namespace OpenRA.Mods.RA
} }
} }
} }
class AircraftMoveOrderTargeter : IOrderTargeter
{
public string OrderID { get { return "Move"; } }
public int OrderPriority { get { return 4; } }
public bool CanTargetUnit( Actor self, Actor target, bool forceAttack, bool forceMove, ref string cursor )
{
return false;
}
public bool CanTargetLocation( Actor self, int2 location, List<Actor> actorsAtLocation, bool forceAttack, bool forceMove, ref string cursor )
{
cursor = "move";
return true;
}
}
} }

20
OpenRA.Mods.RA/Render/RenderSpy.cs
View File

@@ -11,6 +11,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Traits; using OpenRA.Traits;
using OpenRA.Mods.RA.Orders;
namespace OpenRA.Mods.RA.Render namespace OpenRA.Mods.RA.Render
{ {
@@ -19,7 +20,7 @@ namespace OpenRA.Mods.RA.Render
public override object Create(ActorInitializer init) { return new RenderSpy(init.self); } public override object Create(ActorInitializer init) { return new RenderSpy(init.self); }
} }
class RenderSpy : RenderInfantry, IRenderModifier, IIssueOrder, IResolveOrder, IOrderCursor, IOrderVoice class RenderSpy : RenderInfantry, IRenderModifier, IIssueOrder2, IResolveOrder, IOrderVoice
{ {
Player disguisedAsPlayer; Player disguisedAsPlayer;
string disguisedAsSprite; string disguisedAsSprite;
@@ -55,25 +56,20 @@ namespace OpenRA.Mods.RA.Render
} }
} }
} }
public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor) public IEnumerable<IOrderTargeter> Orders
{ {
return 5; get { yield return new UnitTraitOrderTargeter<RenderInfantry>( "Disguise", 5, "ability", true, true ); }
} }
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor) public Order IssueOrder( Actor self, IOrderTargeter order, Target target )
{ {
if (underCursor != null && underCursor.HasTrait<RenderInfantry>()) if( order.OrderID == "Disguise" )
return new Order("Disguise", self, underCursor); return new Order( order.OrderID, self, target.Actor );
return null; return null;
} }
public string CursorForOrder(Actor self, Order order)
{
return order.OrderString == "Disguise" ? "ability" : null;
}
public string VoicePhraseForOrder(Actor self, Order order) public string VoicePhraseForOrder(Actor self, Order order)
{ {
return order.OrderString == "Disguise" ? "Attack" : null; return order.OrderString == "Disguise" ? "Attack" : null;