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

Replace UnitTraitOrderTargeter with TargetTypeOrderTargeter.

Browse Source 
This also makes naval buildings untargetable for c4 and demo trucks, as they don't make much sense.
This commit is contained in:
Paul Chote
2013-04-15 22:31:09 +12:00
parent e545865599
commit 4ca777597f
16 changed files with 81 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<IOrderTargeter> Orders
{
get { yield return new UnitTraitOrderTargeter<C4Demolishable>("C4", 6, "c4", true, false); }
get { yield return new TargetTypeOrderTargeter("C4", "C4", 6, "c4", true, false); }
}
public Order IssueOrder( Actor self, IOrderTargeter order, Target target, bool queued )
@@ -62,7 +62,4 @@ namespace OpenRA.Mods.RA
return (order.OrderString == "C4") ? "Attack" : null;
}
}
class C4DemolishableInfo : TraitInfo<C4Demolishable> { }
class C4Demolishable { }
}

32
OpenRA.Mods.RA/Captures.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.RA
public Order IssueOrder( Actor self, IOrderTargeter order, Target target, bool queued )
{
if( order.OrderID == "CaptureActor" )
if (order.OrderID == "CaptureActor")
return new Order(order.OrderID, self, queued) { TargetActor = target.Actor };
return null;
@@ -64,7 +64,8 @@ namespace OpenRA.Mods.RA
{
if (order.OrderString == "CaptureActor")
{
if (!CanCapture(order.TargetActor)) return;
if (!CanCapture(order.TargetActor))
return;
self.SetTargetLine(Target.FromOrder(order), Color.Red);
@@ -76,17 +77,17 @@ namespace OpenRA.Mods.RA
bool CanCapture(Actor target)
{
var c = target.TraitOrDefault<Capturable>();
return c != null && ( !c.CaptureInProgress || c.Captor.Owner.Stances[self.Owner] != Stance.Ally );
return c != null && (!c.CaptureInProgress || c.Captor.Owner.Stances[self.Owner] != Stance.Ally);
}
}
class CaptureOrderTargeter : UnitTraitOrderTargeter<Capturable>
class CaptureOrderTargeter : UnitOrderTargeter
{
readonly string[] captureTypes;
readonly Func<Actor, bool> useEnterCursor;
public CaptureOrderTargeter(string[] captureTypes, Func<Actor, bool> useEnterCursor)
: base( "CaptureActor", 6, "enter", true, true)
: base("CaptureActor", 6, "enter", true, true)
{
this.captureTypes = captureTypes;
this.useEnterCursor = useEnterCursor;
@@ -94,19 +95,26 @@ namespace OpenRA.Mods.RA
public override bool CanTargetActor(Actor self, Actor target, bool forceAttack, bool forceQueued, ref string cursor)
{
if( !base.CanTargetActor( self, target, forceAttack, forceQueued, ref cursor ) ) return false;
if (!base.CanTargetActor(self, target, forceAttack, forceQueued, ref cursor))
return false;
var ci = target.Info.Traits.Get<CapturableInfo>();
var playerRelationship = self.Owner.Stances[ target.Owner ];
var ci = target.Info.Traits.GetOrDefault<CapturableInfo>();
if (ci == null)
return false;
if( playerRelationship == Stance.Ally && !ci.AllowAllies ) return false;
if( playerRelationship == Stance.Enemy && !ci.AllowEnemies ) return false;
if( playerRelationship == Stance.Neutral && !ci.AllowNeutral ) return false;
var playerRelationship = self.Owner.Stances[target.Owner];
if (playerRelationship == Stance.Ally && !ci.AllowAllies)
return false;
if (playerRelationship == Stance.Enemy && !ci.AllowEnemies)
return false;
if (playerRelationship == Stance.Neutral && !ci.AllowNeutral)
return false;
IsQueued = forceQueued;
var Info = self.Info.Traits.Get<CapturesInfo>();
if (captureTypes.Contains(ci.Type))
{
cursor = (Info.WastedAfterwards) ? (useEnterCursor(target) ? "enter" : "enter-blocked") : "attack";

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

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA
{
get
{
yield return new UnitTraitOrderTargeter<Building>("DemoAttack", 5, "attack", true, false) { ForceAttack = false };
yield return new TargetTypeOrderTargeter("DemoTruck", "DemoAttack", 5, "attack", true, false) { ForceAttack = false };
yield return new DeployOrderTargeter("DemoDeploy", 5);
}
}

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

@@ -52,7 +52,7 @@ namespace OpenRA.Mods.RA
}
}
class EngineerRepairOrderTargeter : UnitTraitOrderTargeter<Building>
class EngineerRepairOrderTargeter : UnitOrderTargeter
{
public EngineerRepairOrderTargeter()
: base("EngineerRepair", 6, "goldwrench", false, true) { }

12
OpenRA.Mods.RA/Infiltrates.cs
View File

@@ -88,13 +88,14 @@ namespace OpenRA.Mods.RA
return false;
}
class InfiltratorOrderTargeter : UnitTraitOrderTargeter<IAcceptInfiltrator>
class InfiltratorOrderTargeter : UnitOrderTargeter
{
readonly Func<Actor, bool> useEnterCursor;
public InfiltratorOrderTargeter(Func<Actor, bool> useEnterCursor) : base("Infiltrate", 7, "enter", true, false)
public InfiltratorOrderTargeter(Func<Actor, bool> useEnterCursor)
: base("Infiltrate", 7, "enter", true, false)
{
ForceAttack=false;
ForceAttack = false;
this.useEnterCursor = useEnterCursor;
}
@@ -102,7 +103,10 @@ namespace OpenRA.Mods.RA
{
if (!base.CanTargetActor(self, target, forceAttack, forceQueued, ref cursor))
return false;
if (!target.HasTrait<IAcceptInfiltrator>())
return false;
if (!useEnterCursor(target))
cursor = "enter-blocked";

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

@@ -12,14 +12,14 @@ using System;
namespace OpenRA.Mods.RA.Orders
{
public class EnterOrderTargeter<T> : UnitTraitOrderTargeter<T>
public class EnterOrderTargeter<T> : UnitOrderTargeter
{
readonly Func<Actor, bool> canTarget;
readonly Func<Actor, bool> useEnterCursor;
public EnterOrderTargeter( string order, int priority, bool targetEnemy, bool targetAlly,
Func<Actor, bool> canTarget, Func<Actor, bool> useEnterCursor )
: base( order, priority, "enter", targetEnemy, 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)
{
this.canTarget = canTarget;
this.useEnterCursor = useEnterCursor;
@@ -27,8 +27,15 @@ namespace OpenRA.Mods.RA.Orders
public override bool CanTargetActor(Actor self, Actor target, bool forceAttack, bool forceQueued, ref string cursor)
{
if( !base.CanTargetActor( self, target, forceAttack, forceQueued, ref cursor ) ) return false;
if( !canTarget( target ) ) return false;
if (!base.CanTargetActor(self, target, forceAttack, forceQueued, ref cursor))
return false;
if (!target.HasTrait<T>())
return false;
if (!canTarget(target))
return false;
cursor = useEnterCursor(target) ? "enter" : "enter-blocked";
IsQueued = forceQueued;
return true;

17
OpenRA.Mods.RA/Orders/UnitOrderTargeter.cs
View File

@@ -10,6 +10,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Orders
@@ -57,17 +58,23 @@ namespace OpenRA.Mods.RA.Orders
public virtual bool IsQueued { get; protected set; }
}
public class UnitTraitOrderTargeter<T> : UnitOrderTargeter
public class TargetTypeOrderTargeter : UnitOrderTargeter
{
public UnitTraitOrderTargeter( string order, int priority, string cursor, bool targetEnemyUnits, bool targetAllyUnits )
: base( order, priority, cursor, targetEnemyUnits, targetAllyUnits )
string targetType;
public TargetTypeOrderTargeter(string targetType, string order, int priority, string cursor, bool targetEnemyUnits, bool targetAllyUnits)
: base(order, priority, cursor, targetEnemyUnits, targetAllyUnits)
{
this.targetType = targetType;
}
public override bool CanTargetActor(Actor self, Actor target, bool forceAttack, bool forceQueued, ref string cursor)
{
if( !base.CanTargetActor( self, target, forceAttack, forceQueued, ref cursor ) ) return false;
if( !target.HasTrait<T>() ) return false;
if (!base.CanTargetActor(self, target, forceAttack, forceQueued, ref cursor))
return false;
if (!target.TraitsImplementing<ITargetable>().Any(t => t.TargetTypes.Contains(targetType)))
return false;
IsQueued = forceQueued;

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

@@ -84,7 +84,7 @@ namespace OpenRA.Mods.RA
{
get
{
yield return new UnitTraitOrderTargeter<RenderInfantry>("Disguise", 7, "ability", true, true) { ForceAttack=false };
yield return new TargetTypeOrderTargeter("Disguise", "Disguise", 7, "ability", true, true) { ForceAttack=false };
}
}

13
OpenRA.Mods.RA/SupplyTruck.cs
View File

@@ -63,7 +63,7 @@ namespace OpenRA.Mods.RA
}
}
class SupplyTruckOrderTargeter : UnitTraitOrderTargeter<Building>
class SupplyTruckOrderTargeter : UnitOrderTargeter
{
public SupplyTruckOrderTargeter()
: base("DeliverSupplies", 5, "enter", false, true)
@@ -72,9 +72,14 @@ namespace OpenRA.Mods.RA
public override bool CanTargetActor(Actor self, Actor target, bool forceAttack, bool forceQueued, ref string cursor)
{
if (!base.CanTargetActor(self, target, forceAttack, forceQueued, ref cursor)) return false;
if (target.AppearsHostileTo(self)) return false;
if (!target.HasTrait<AcceptsSupplies>()) return false;
if (!base.CanTargetActor(self, target, forceAttack, forceQueued, ref cursor))
return false;
if (target.AppearsHostileTo(self))
return false;
if (!target.HasTrait<AcceptsSupplies>())
return false;
IsQueued = forceQueued;
return true;