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

more of attack-ground (order wiring, etc); doesn't work.

Browse Source
This commit is contained in:
Chris Forbes
2010-07-07 20:46:19 +12:00
parent 5c61c9d3a9
commit 73b6eb568b
12 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Traits/Activities/Move.cs
View File

@@ -70,6 +70,16 @@ namespace OpenRA.Traits.Activities
this.nearEnough = range; this.nearEnough = range;
} }
public Move(Target target, int range)
: this()
{
this.getPath = self => self.World.PathFinder.FindUnitPathToRange(
self.Location, Util.CellContaining(target.CenterLocation),
range, self);
this.destination = null;
this.nearEnough = range;
}
public Move(Func<List<int2>> getPath) public Move(Func<List<int2>> getPath)
: this() : this()
{ {

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

@@ -165,6 +165,9 @@ namespace OpenRA.Traits
public static Target FromActor(Actor a) { return new Target { actor = a, valid = true }; } public static Target FromActor(Actor a) { return new Target { actor = a, valid = true }; }
public static Target FromPos(float2 p) { return new Target { pos = p, valid = true }; } public static Target FromPos(float2 p) { return new Target { pos = p, valid = true }; }
public static Target FromOrder(Order o) { return o.TargetActor != null ? Target.FromActor(o.TargetActor) : Target.FromPos(o.TargetLocation); }
public static readonly Target None = new Target();
public bool IsValid { get { return valid && (actor == null || actor.IsInWorld); } } public bool IsValid { get { return valid && (actor == null || actor.IsInWorld); } }
public float2 CenterLocation { get { return actor != null ? actor.CenterLocation : pos; } } public float2 CenterLocation { get { return actor != null ? actor.CenterLocation : pos; } }

5
OpenRA.Mods.RA/Activities/Attack.cs
View File

@@ -57,9 +57,6 @@ namespace OpenRA.Mods.RA.Activities
return this; return this;
} }
public void Cancel(Actor self) public void Cancel(Actor self) { Target = Target.None; }
{
Target = new Target();
}
} }
} }

8
OpenRA.Mods.RA/Activities/FlyAttack.cs
View File

@@ -15,13 +15,13 @@ namespace OpenRA.Mods.RA.Activities
public class FlyAttack : IActivity public class FlyAttack : IActivity
{ {
public IActivity NextActivity { get; set; } public IActivity NextActivity { get; set; }
Actor Target; Target Target;
public FlyAttack(Actor target) { Target = target; } public FlyAttack(Target target) { Target = target; }
public IActivity Tick(Actor self) public IActivity Tick(Actor self)
{ {
if (Target == null || Target.IsDead) if (!Target.IsValid)
return NextActivity; return NextActivity;
var limitedAmmo = self.traits.GetOrDefault<LimitedAmmo>(); var limitedAmmo = self.traits.GetOrDefault<LimitedAmmo>();
@@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA.Activities
this); this);
} }
public void Cancel(Actor self) { Target = null; NextActivity = null; } public void Cancel(Actor self) { Target = Target.None; NextActivity = null; }
} }
public class FlyCircle : IActivity public class FlyCircle : IActivity

10
OpenRA.Mods.RA/Activities/Follow.cs
View File

@@ -15,10 +15,10 @@ namespace OpenRA.Mods.RA.Activities
{ {
public class Follow : IActivity public class Follow : IActivity
{ {
Actor Target; Target Target;
int Range; int Range;
public Follow(Actor target, int range) public Follow(Target target, int range)
{ {
Target = target; Target = target;
Range = range; Range = range;
@@ -28,10 +28,10 @@ namespace OpenRA.Mods.RA.Activities
public IActivity Tick( Actor self ) public IActivity Tick( Actor self )
{ {
if (Target == null || Target.IsDead) if (!Target.IsValid)
return NextActivity; return NextActivity;
var inRange = ( Target.Location - self.Location ).LengthSquared < Range * Range; var inRange = ( Util.CellContaining( Target.CenterLocation ) - self.Location ).LengthSquared < Range * Range;
if( !inRange ) if( !inRange )
return new Move( Target, Range ) { NextActivity = this }; return new Move( Target, Range ) { NextActivity = this };
@@ -41,7 +41,7 @@ namespace OpenRA.Mods.RA.Activities
public void Cancel(Actor self) public void Cancel(Actor self)
{ {
Target = null; Target = Target.None;
} }
} }
} }

8
OpenRA.Mods.RA/Activities/HeliAttack.cs
View File

@@ -16,14 +16,14 @@ namespace OpenRA.Mods.RA.Activities
{ {
public class HeliAttack : IActivity public class HeliAttack : IActivity
{ {
Actor target; Target target;
public HeliAttack( Actor target ) { this.target = target; } public HeliAttack( Target target ) { this.target = target; }
public IActivity NextActivity { get; set; } public IActivity NextActivity { get; set; }
public IActivity Tick(Actor self) public IActivity Tick(Actor self)
{ {
if (target == null || target.IsDead) if (!target.IsValid)
return NextActivity; return NextActivity;
var limitedAmmo = self.traits.GetOrDefault<LimitedAmmo>(); var limitedAmmo = self.traits.GetOrDefault<LimitedAmmo>();
@@ -55,6 +55,6 @@ namespace OpenRA.Mods.RA.Activities
return this; return this;
} }
public void Cancel(Actor self) { target = null; NextActivity = null; } public void Cancel(Actor self) { target = Target.None; NextActivity = null; }
} }
} }

37
OpenRA.Mods.RA/AttackBase.cs
View File

@@ -203,26 +203,36 @@ namespace OpenRA.Mods.RA
public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor) public Order IssueOrder(Actor self, int2 xy, MouseInput mi, Actor underCursor)
{ {
if (mi.Button == MouseButton.Left || underCursor == null || underCursor.Owner == null) return null; if (mi.Button == MouseButton.Left) return null;
if (self == underCursor) return null; if (self == underCursor) return null;
var target = underCursor == null ? Target.FromPos(Util.CenterOfCell(xy)) : Target.FromActor(underCursor);
var isHeal = self.GetPrimaryWeapon().Warheads.First().Damage < 0; var isHeal = self.GetPrimaryWeapon().Warheads.First().Damage < 0;
var forceFire = mi.Modifiers.HasModifier(Modifiers.Ctrl); var forceFire = mi.Modifiers.HasModifier(Modifiers.Ctrl);
if (isHeal) if (isHeal)
{ {
if (underCursor.Owner == null) // we can never "heal ground"; that makes no sense.
return null; if (!target.IsActor) return null;
if (self.Owner.Stances[ underCursor.Owner ] != Stance.Ally && !forceFire) // unless forced, only heal allies.
return null; if (self.Owner.Stances[underCursor.Owner] != Stance.Ally && !forceFire) return null;
if (underCursor.Health >= underCursor.GetMaxHP()) // don't allow healing of fully-healed stuff!
return null; // don't allow healing of fully-healed stuff! if (underCursor.Health >= underCursor.GetMaxHP()) return null;
} }
else else
if ((self.Owner.Stances[ underCursor.Owner ] != Stance.Enemy) && !forceFire) {
if (!target.IsActor)
{
if (!forceFire) return null;
return new Order("Attack", self, xy);
}
if ((self.Owner.Stances[underCursor.Owner] != Stance.Enemy) && !forceFire)
return null; return null;
}
if (!Combat.HasAnyValidWeapons(self, Target.FromActor(underCursor))) return null; if (!Combat.HasAnyValidWeapons(self, target)) return null;
return new Order(isHeal ? "Heal" : "Attack", self, underCursor); return new Order(isHeal ? "Heal" : "Attack", self, underCursor);
} }
@@ -234,11 +244,11 @@ namespace OpenRA.Mods.RA
self.CancelActivity(); self.CancelActivity();
QueueAttack(self, order); QueueAttack(self, order);
if (self.Owner == self.World.LocalPlayer) if (self.Owner == self.World.LocalPlayer && order.TargetActor != null)
self.World.AddFrameEndTask(w => w.Add(new FlashTarget(order.TargetActor))); self.World.AddFrameEndTask(w => w.Add(new FlashTarget(order.TargetActor)));
} }
else else
target = new Target(); target = Target.None;
} }
public string CursorForOrderString(string s, Actor a, int2 location) public string CursorForOrderString(string s, Actor a, int2 location)
@@ -255,8 +265,9 @@ namespace OpenRA.Mods.RA
{ {
/* todo: choose the appropriate weapon, when only one works against this target */ /* todo: choose the appropriate weapon, when only one works against this target */
var weapon = self.GetPrimaryWeapon() ?? self.GetSecondaryWeapon(); var weapon = self.GetPrimaryWeapon() ?? self.GetSecondaryWeapon();
self.QueueActivity(
self.QueueActivity(new Activities.Attack(Target.FromActor(order.TargetActor), new Activities.Attack(
Target.FromOrder(order),
Math.Max(0, (int)weapon.Range))); Math.Max(0, (int)weapon.Range)));
} }
} }

4
OpenRA.Mods.RA/AttackHeli.cs
View File

@@ -23,8 +23,8 @@ namespace OpenRA.Mods.RA
protected override void QueueAttack(Actor self, Order order) protected override void QueueAttack(Actor self, Order order)
{ {
target = Target.FromActor(order.TargetActor); target = Target.FromOrder(order);
self.QueueActivity(new HeliAttack(order.TargetActor)); self.QueueActivity(new HeliAttack(target));
} }
} }
} }

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

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA
protected override void QueueAttack(Actor self, Order order) protected override void QueueAttack(Actor self, Order order)
{ {
target = Target.FromActor(order.TargetActor); target = Target.FromOrder(order);
} }
} }
} }

4
OpenRA.Mods.RA/AttackPlane.cs
View File

@@ -23,8 +23,8 @@ namespace OpenRA.Mods.RA
protected override void QueueAttack(Actor self, Order order) protected override void QueueAttack(Actor self, Order order)
{ {
target = Target.FromActor(order.TargetActor); target = Target.FromOrder(order);
self.QueueActivity(new FlyAttack(order.TargetActor)); self.QueueActivity(new FlyAttack(target));
} }
} }
} }

9
OpenRA.Mods.RA/AttackTurreted.cs
View File

@@ -52,12 +52,11 @@ namespace OpenRA.Mods.RA
/* todo: choose the appropriate weapon, when only one works against this target */ /* todo: choose the appropriate weapon, when only one works against this target */
var weapon = order.Subject.GetPrimaryWeapon() ?? order.Subject.GetSecondaryWeapon(); var weapon = order.Subject.GetPrimaryWeapon() ?? order.Subject.GetSecondaryWeapon();
if (self.traits.Contains<Mobile>()) target = Target.FromOrder(order);
self.QueueActivity( new Follow( order.TargetActor,
Math.Max( 0, (int)weapon.Range - RangeTolerance ) ) );
target = Target.FromActor(order.TargetActor); if (self.traits.Contains<Mobile>())
self.QueueActivity( new Follow( target,
Math.Max( 0, (int)weapon.Range - RangeTolerance ) ) );
} }
bool buildComplete = false; bool buildComplete = false;

3
OpenRA.Mods.RA/Combat.cs
View File

@@ -162,7 +162,8 @@ namespace OpenRA.Mods.RA
public static bool WeaponValidForTarget(WeaponInfo weapon, Target target) public static bool WeaponValidForTarget(WeaponInfo weapon, Target target)
{ {
// todo: fix this properly. // todo: fix this properly.
if (!target.IsValid || !target.IsActor) return false; if (!target.IsValid) return false;
if (!target.IsActor) return weapon.ValidTargets.Contains("Ground"); // hack!
var ownedInfo = target.Actor.Info.Traits.GetOrDefault<OwnedActorInfo>(); var ownedInfo = target.Actor.Info.Traits.GetOrDefault<OwnedActorInfo>();