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

Use Target range checks in attack activities.

Browse Source
This commit is contained in:
Paul Chote
2013-07-06 15:25:13 +12:00
parent 399aac7e0f
commit 6f67602d57
12 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.FileFormats/WRange.cs
View File

@@ -22,6 +22,7 @@ namespace OpenRA
public WRange(int r) { Range = r; } public WRange(int r) { Range = r; }
public static readonly WRange Zero = new WRange(0); public static readonly WRange Zero = new WRange(0);
public static WRange FromCells(int cells) { return new WRange(1024*cells); }
public static WRange operator +(WRange a, WRange b) { return new WRange(a.Range + b.Range); } public static WRange operator +(WRange a, WRange b) { return new WRange(a.Range + b.Range); }
public static WRange operator -(WRange a, WRange b) { return new WRange(a.Range - b.Range); } public static WRange operator -(WRange a, WRange b) { return new WRange(a.Range - b.Range); }

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

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.RA.Activities
{ {
protected Target Target; protected Target Target;
ITargetable targetable; ITargetable targetable;
int Range; WRange Range;
bool AllowMovement; bool AllowMovement;
int nextPathTime; int nextPathTime;
@@ -27,7 +27,10 @@ namespace OpenRA.Mods.RA.Activities
const int delayBetweenPathingAttempts = 20; const int delayBetweenPathingAttempts = 20;
const int delaySpread = 5; const int delaySpread = 5;
public Attack(Target target, int range, bool allowMovement) public Attack(Target target, WRange range)
: this(target, range, true) {}
public Attack(Target target, WRange range, bool allowMovement)
{ {
Target = target; Target = target;
if (target.IsActor) if (target.IsActor)
@@ -37,20 +40,18 @@ namespace OpenRA.Mods.RA.Activities
AllowMovement = allowMovement; AllowMovement = allowMovement;
} }
public Attack(Target target, int range) : this(target, range, true) {} public override Activity Tick(Actor self)
public override Activity Tick( Actor self )
{ {
var attack = self.Trait<AttackBase>(); var attack = self.Trait<AttackBase>();
var ret = InnerTick(self, attack);
var ret = InnerTick( self, attack ); attack.IsAttacking = (ret == this);
attack.IsAttacking = ( ret == this );
return ret; return ret;
} }
protected virtual Activity InnerTick( Actor self, AttackBase attack ) protected virtual Activity InnerTick(Actor self, AttackBase attack)
{ {
if (IsCanceled) return NextActivity; if (IsCanceled)
return NextActivity;
if (!Target.IsValid) if (!Target.IsValid)
return NextActivity; return NextActivity;
@@ -61,7 +62,7 @@ namespace OpenRA.Mods.RA.Activities
if (targetable != null && !targetable.TargetableBy(Target.Actor, self)) if (targetable != null && !targetable.TargetableBy(Target.Actor, self))
return NextActivity; return NextActivity;
if (!Combat.IsInRange(self.CenterLocation, Range, Target)) if (!Target.IsInRange(self.CenterPosition, Range))
{ {
if (--nextPathTime > 0) if (--nextPathTime > 0)
return this; return this;
@@ -69,13 +70,13 @@ namespace OpenRA.Mods.RA.Activities
nextPathTime = self.World.SharedRandom.Next(delayBetweenPathingAttempts - delaySpread, nextPathTime = self.World.SharedRandom.Next(delayBetweenPathingAttempts - delaySpread,
delayBetweenPathingAttempts + delaySpread); delayBetweenPathingAttempts + delaySpread);
return (AllowMovement) ? Util.SequenceActivities(self.Trait<Mobile>().MoveWithinRange(Target, Range), this) : NextActivity; return (AllowMovement) ? Util.SequenceActivities(self.Trait<Mobile>().MoveWithinRange(Target, Range.Range / 1024), this) : NextActivity;
} }
var desiredFacing = Util.GetFacing(Target.CenterLocation - self.CenterLocation, 0); var desiredFacing = Util.GetFacing(Target.CenterLocation - self.CenterLocation, 0);
var facing = self.Trait<IFacing>(); var facing = self.Trait<IFacing>();
if (facing.Facing != desiredFacing) if (facing.Facing != desiredFacing)
return Util.SequenceActivities( new Turn( desiredFacing ), this ); return Util.SequenceActivities(new Turn(desiredFacing), this);
attack.DoAttack(self, Target); attack.DoAttack(self, Target);
return this; return this;

4
OpenRA.Mods.RA/Activities/Heal.cs
View File

@@ -17,10 +17,10 @@ namespace OpenRA.Mods.RA.Activities
/* non-turreted attack */ /* non-turreted attack */
public class Heal : Attack public class Heal : Attack
{ {
public Heal(Target target, int range, bool allowMovement) public Heal(Target target, WRange range, bool allowMovement)
: base(target, range, allowMovement) {} : base(target, range, allowMovement) {}
protected override Activity InnerTick( Actor self, AttackBase attack ) protected override Activity InnerTick(Actor self, AttackBase attack)
{ {
if (Target.IsActor && Target.Actor.GetDamageState() == DamageState.Undamaged) if (Target.IsActor && Target.Actor.GetDamageState() == DamageState.Undamaged)
return NextActivity; return NextActivity;

15
OpenRA.Mods.RA/Attack/AttackFrontal.cs
View File

@@ -28,15 +28,15 @@ namespace OpenRA.Mods.RA
public AttackFrontal(Actor self, AttackFrontalInfo info) public AttackFrontal(Actor self, AttackFrontalInfo info)
: base( self ) { this.info = info; } : base( self ) { this.info = info; }
protected override bool CanAttack( Actor self, Target target ) protected override bool CanAttack(Actor self, Target target)
{ {
if( !base.CanAttack( self, target ) ) if (!base.CanAttack(self, target))
return false; return false;
var facing = self.Trait<IFacing>().Facing; var facing = self.Trait<IFacing>().Facing;
var facingToTarget = Util.GetFacing(target.CenterLocation - self.CenterLocation, facing); var facingToTarget = Util.GetFacing(target.CenterLocation - self.CenterLocation, facing);
if( Math.Abs( facingToTarget - facing ) % 256 > info.FacingTolerance ) if (Math.Abs(facingToTarget - facing) % 256 > info.FacingTolerance)
return false; return false;
return true; return true;
@@ -44,10 +44,13 @@ namespace OpenRA.Mods.RA
public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove) public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove)
{ {
var weapon = ChooseArmamentForTarget(newTarget); var a = ChooseArmamentForTarget(newTarget);
if (weapon == null) if (a == null)
return null; return null;
return new Activities.Attack(newTarget, Math.Max(0, (int)weapon.Weapon.Range), allowMove);
// TODO: Define weapon ranges as WRange
var range = new WRange(Math.Max(0,(int)(1024*a.Weapon.Range)));
return new Activities.Attack(newTarget, range, allowMove);
} }
} }
} }

8
OpenRA.Mods.RA/Attack/AttackLeap.cs
View File

@@ -42,13 +42,5 @@ namespace OpenRA.Mods.RA
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new Leap(self, target)); self.QueueActivity(new Leap(self, target));
} }
public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove)
{
var a = ChooseArmamentForTarget(newTarget);
if (a == null)
return null;
return new Activities.Attack(newTarget, Math.Max(0, (int)a.Weapon.Range), allowMove);
}
} }
} }

9
OpenRA.Mods.RA/Attack/AttackMedic.cs
View File

@@ -29,10 +29,13 @@ namespace OpenRA.Mods.RA
public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove) public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove)
{ {
var weapon = ChooseArmamentForTarget(newTarget); var a = ChooseArmamentForTarget(newTarget);
if (weapon == null) if (a == null)
return null; return null;
return new Activities.Heal(newTarget, Math.Max(0, (int)weapon.Weapon.Range), allowMove);
// TODO: Define weapon ranges as WRange
var range = new WRange(Math.Max(0,(int)(1024*a.Weapon.Range)));
return new Activities.Heal(newTarget, range, allowMove);
} }
} }
} }

2
OpenRA.Mods.RA/Missions/Allies03Script.cs
View File

@@ -297,7 +297,7 @@ namespace OpenRA.Mods.RA.Missions
var enemy = FirstUnshroudedOrDefault(enemies.OrderBy(u => (self.CenterLocation - u.CenterLocation).LengthSquared), world, 10); var enemy = FirstUnshroudedOrDefault(enemies.OrderBy(u => (self.CenterLocation - u.CenterLocation).LengthSquared), world, 10);
if (enemy != null) if (enemy != null)
self.QueueActivity(new AttackMove.AttackMoveActivity(self, new Attack(Target.FromActor(enemy), 3))); self.QueueActivity(new AttackMove.AttackMoveActivity(self, new Attack(Target.FromActor(enemy), WRange.FromCells(3))));
} }
void ManageSovietUnits() void ManageSovietUnits()

4
OpenRA.Mods.RA/Missions/Allies04Script.cs
View File

@@ -125,7 +125,7 @@ namespace OpenRA.Mods.RA.Missions
if (world.FrameNumber == frameInfiltrated + 1500 * 12 && !bridgeTank.IsDead() && bridgeTank.IsInWorld && !bridge.IsDead()) if (world.FrameNumber == frameInfiltrated + 1500 * 12 && !bridgeTank.IsDead() && bridgeTank.IsInWorld && !bridge.IsDead())
{ {
bridgeTank.QueueActivity(new Attack(Target.FromPos(bridge.CenterLocation), 4)); bridgeTank.QueueActivity(new Attack(Target.FromPos(bridge.CenterLocation), WRange.FromCells(4)));
attackingBridge = true; attackingBridge = true;
} }
if (attackingBridge && bridge.IsDead()) if (attackingBridge && bridge.IsDead())
@@ -152,7 +152,7 @@ namespace OpenRA.Mods.RA.Missions
var enemy = enemies.OrderBy(u => (attacker.CenterLocation - u.CenterLocation).LengthSquared).FirstOrDefault(); var enemy = enemies.OrderBy(u => (attacker.CenterLocation - u.CenterLocation).LengthSquared).FirstOrDefault();
if (enemy != null) if (enemy != null)
attacker.QueueActivity(new AttackMove.AttackMoveActivity(attacker, new Attack(Target.FromActor(enemy), 3))); attacker.QueueActivity(new AttackMove.AttackMoveActivity(attacker, new Attack(Target.FromActor(enemy), WRange.FromCells(3))));
else else
{ {
attackingTown = false; attackingTown = false;

2
OpenRA.Mods.RA/Missions/FortLonestarScript.cs
View File

@@ -82,7 +82,7 @@ namespace OpenRA.Mods.RA.Missions
var targetEnemy = enemies.OrderBy(u => (self.CenterLocation - u.CenterLocation).LengthSquared).FirstOrDefault(); var targetEnemy = enemies.OrderBy(u => (self.CenterLocation - u.CenterLocation).LengthSquared).FirstOrDefault();
if (targetEnemy != null) if (targetEnemy != null)
{ {
self.QueueActivity(new AttackMove.AttackMoveActivity(self, new Attack(Target.FromActor(targetEnemy), 6))); self.QueueActivity(new AttackMove.AttackMoveActivity(self, new Attack(Target.FromActor(targetEnemy), WRange.FromCells(6))));
} }
} }

2
OpenRA.Mods.RA/Missions/MissionUtils.cs
View File

@@ -213,7 +213,7 @@ namespace OpenRA.Mods.RA.Missions
var enemy = enemies.OrderBy(u => (self.CenterLocation - u.CenterLocation).LengthSquared).FirstOrDefault(); var enemy = enemies.OrderBy(u => (self.CenterLocation - u.CenterLocation).LengthSquared).FirstOrDefault();
if (enemy != null) if (enemy != null)
self.QueueActivity(queued, new AttackMove.AttackMoveActivity(self, new Attack(Target.FromActor(enemy), 3))); self.QueueActivity(queued, new AttackMove.AttackMoveActivity(self, new Attack(Target.FromActor(enemy), WRange.FromCells(3))));
} }
} }

2
OpenRA.Mods.RA/Missions/Survival01Script.cs
View File

@@ -214,7 +214,7 @@ namespace OpenRA.Mods.RA.Missions
var targetEnemy = enemies.OrderBy(u => (self.CenterLocation - u.CenterLocation).LengthSquared).FirstOrDefault(); var targetEnemy = enemies.OrderBy(u => (self.CenterLocation - u.CenterLocation).LengthSquared).FirstOrDefault();
if (targetEnemy != null) if (targetEnemy != null)
{ {
self.QueueActivity(new AttackMove.AttackMoveActivity(self, new Attack(Target.FromActor(targetEnemy), 3))); self.QueueActivity(new AttackMove.AttackMoveActivity(self, new Attack(Target.FromActor(targetEnemy), WRange.FromCells(3))));
} }
} }

2
OpenRA.Mods.RA/Missions/Survival02Script.cs
View File

@@ -139,7 +139,7 @@ namespace OpenRA.Mods.RA.Missions
var enemy = FirstUnshroudedOrDefault(enemies.OrderBy(u => (self.CenterLocation - u.CenterLocation).LengthSquared), world, 20); var enemy = FirstUnshroudedOrDefault(enemies.OrderBy(u => (self.CenterLocation - u.CenterLocation).LengthSquared), world, 20);
if (enemy != null) if (enemy != null)
self.QueueActivity(new AttackMove.AttackMoveActivity(self, new Attack(Target.FromActor(enemy), 3))); self.QueueActivity(new AttackMove.AttackMoveActivity(self, new Attack(Target.FromActor(enemy), WRange.FromCells(3))));
} }
void SpawnAndAttack(string[] squad, Player owner, CPos location) void SpawnAndAttack(string[] squad, Player owner, CPos location)