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

added IIssueOrder2. most orders are broken, but Minelayer is fixed

Browse Source
This commit is contained in:
Bob
2010-10-02 18:16:02 +12:00
committed by Paul Chote
parent 0cd140849b
commit 3d805ff40d
7 changed files with 215 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
OpenRA.Mods.RA/Minelayer.cs
View File

@@ -26,44 +26,35 @@ namespace OpenRA.Mods.RA
public readonly string[] RearmBuildings = { "fix" };
}
class Minelayer : IIssueOrder, IResolveOrder, IOrderCursor, IPostRenderSelection
class Minelayer : IIssueOrder2, IResolveOrder, IPostRenderSelection
{
/* [Sync] when sync can cope with arrays! */
public int2[] minefield = null;
[Sync] int2 minefieldStart;
public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
public IEnumerable<IOrderTargeter> Orders
{
return 5;
get { yield return new BeginMinefieldOrderTargeter(); }
}
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{
if (mi.Button == MouseButton.Right && underCursor == null && mi.Modifiers.HasModifier(Modifiers.Ctrl))
return new Order("BeginMinefield", self, xy);
public Order IssueOrder( Actor self, IOrderTargeter order, Target target )
{
if( order is BeginMinefieldOrderTargeter )
{
var start = Util.CellContaining( target.CenterLocation );
self.World.OrderGenerator = new MinefieldOrderGenerator( self, start );
return new Order( "BeginMinefield", self, start );
}
return null;
}
public string CursorForOrder(Actor self, Order order)
{
return (order.OrderString == "BeginMinefield") ? "ability" : null;
}
public void ResolveOrder(Actor self, Order order)
{
if (order.OrderString == "BeginMinefield")
{
//minefieldStart = order.TargetLocation;
//if (self.Owner == self.World.LocalPlayer)
// self.World.OrderGenerator = new MinefieldOrderGenerator(self);
}
if( order.OrderString == "BeginMinefield" )
minefieldStart = order.TargetLocation;
if (order.OrderString == "PlaceMinefield")
{
if (self.Owner == self.World.LocalPlayer)
self.World.CancelInputMode();
var movement = self.Trait<IMove>();
minefield = GetMinefieldCells(minefieldStart, order.TargetLocation,
@@ -97,9 +88,10 @@ namespace OpenRA.Mods.RA
class MinefieldOrderGenerator : IOrderGenerator
{
Actor minelayer;
readonly Actor minelayer;
readonly int2 minefieldStart;
public MinefieldOrderGenerator(Actor self) { minelayer = self; }
public MinefieldOrderGenerator(Actor self, int2 xy ) { minelayer = self; minefieldStart = xy; }
public IEnumerable<Order> Order(World world, int2 xy, MouseInput mi)
{
@@ -114,8 +106,11 @@ namespace OpenRA.Mods.RA
? a.Info.Traits.Get<SelectableInfo>().Priority : int.MinValue)
.FirstOrDefault();
if (mi.Button == MouseButton.Right && underCursor == null)
yield return new Order("PlaceMinefield", minelayer, xy);
if( mi.Button == MouseButton.Right && underCursor == null )
{
minelayer.World.CancelInputMode();
yield return new Order( "PlaceMinefield", minelayer, xy );
}
}
public void Tick(World world)
@@ -132,7 +127,7 @@ namespace OpenRA.Mods.RA
var ml = minelayer.Trait<Minelayer>();
var movement = minelayer.Trait<IMove>();
var minefield = GetMinefieldCells(ml.minefieldStart, lastMousePos, minelayer.Info.Traits.Get<MinelayerInfo>().MinefieldDepth)
var minefield = GetMinefieldCells(minefieldStart, lastMousePos, minelayer.Info.Traits.Get<MinelayerInfo>().MinefieldDepth)
.Where(p => movement.CanEnterCell(p)).ToArray();
world.WorldRenderer.DrawLocus(Color.Cyan, minefield);
@@ -151,5 +146,22 @@ namespace OpenRA.Mods.RA
if (minefield != null)
self.World.WorldRenderer.DrawLocus(Color.Cyan, minefield);
}
class BeginMinefieldOrderTargeter : IOrderTargeter
{
public string OrderID { get { return "BeginMinefield"; } }
public int OrderPriority { get { return 5; } }
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 = "ability";
return ( actorsAtLocation.Count == 0 && forceAttack );
}
}
}
}

56
OpenRA.Mods.RA/Transforms.cs
View File

@@ -12,6 +12,7 @@ using OpenRA.Mods.RA.Activities;
using OpenRA.Traits;
using OpenRA.Traits.Activities;
using OpenRA.GameRules;
using System.Collections.Generic;
namespace OpenRA.Mods.RA
{
@@ -27,7 +28,7 @@ namespace OpenRA.Mods.RA
public virtual object Create(ActorInitializer init) { return new Transforms(this); }
}
class Transforms : IIssueOrder, IResolveOrder, IOrderCursor, IOrderVoice
class Transforms : IIssueOrder2, IResolveOrder, IOrderVoice
{
TransformsInfo Info;
BuildingInfo bi;
@@ -38,19 +39,6 @@ namespace OpenRA.Mods.RA
bi = Rules.Info[info.IntoActor].Traits.GetOrDefault<BuildingInfo>();
}
public int OrderPriority(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{
return 5;
}
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{
if (mi.Button == MouseButton.Right && self == underCursor)
return new Order("DeployTransform", self);
return null;
}
public string VoicePhraseForOrder(Actor self, Order order)
{
return (order.OrderString == "DeployTransform") ? "Move" : null;
@@ -60,7 +48,17 @@ namespace OpenRA.Mods.RA
{
return (bi == null || self.World.CanPlaceBuilding(Info.IntoActor, bi, self.Location + Info.Offset, self));
}
public IEnumerable<IOrderTargeter> Orders { get { yield return new TransformOrderTargeter(); } }
public Order IssueOrder( Actor self, IOrderTargeter order, Target target )
{
if( order is TransformOrderTargeter )
return new Order( "DeployTransform", self );
return null;
}
public void ResolveOrder( Actor self, Order order )
{
if (order.OrderString == "DeployTransform")
@@ -79,13 +77,29 @@ namespace OpenRA.Mods.RA
self.QueueActivity(new Transform(self, Info.IntoActor, Info.Offset, Info.Facing, Info.TransformSounds));
}
}
public string CursorForOrder(Actor self, Order order)
class TransformOrderTargeter : IOrderTargeter
{
if (order.OrderString != "DeployTransform")
return null;
return CanDeploy(self) ? "deploy" : "deploy-blocked";
public string OrderID
{
get { return "DeployTransform"; }
}
public int OrderPriority
{
get { return 5; }
}
public bool CanTargetUnit( Actor self, Actor target, bool forceAttack, bool forceMove, ref string cursor )
{
cursor = self.Trait<Transforms>().CanDeploy( self ) ? "deploy" : "deploy-blocked";
return self == target;
}
public bool CanTargetLocation( Actor self, int2 location, System.Collections.Generic.List<Actor> actorsAtLocation, bool forceAttack, bool forceMove, ref string cursor )
{
return false;
}
}
}
}