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

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

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

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

@@ -15,13 +15,13 @@ namespace OpenRA.Mods.RA.Activities
public class FlyAttack : IActivity
{
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)
{
if (Target == null || Target.IsDead)
if (!Target.IsValid)
return NextActivity;
var limitedAmmo = self.traits.GetOrDefault<LimitedAmmo>();
@@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA.Activities
this);
}
public void Cancel(Actor self) { Target = null; NextActivity = null; }
public void Cancel(Actor self) { Target = Target.None; NextActivity = null; }
}
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
{
Actor Target;
Target Target;
int Range;
public Follow(Actor target, int range)
public Follow(Target target, int range)
{
Target = target;
Range = range;
@@ -28,10 +28,10 @@ namespace OpenRA.Mods.RA.Activities
public IActivity Tick( Actor self )
{
if (Target == null || Target.IsDead)
if (!Target.IsValid)
return NextActivity;
var inRange = ( Target.Location - self.Location ).LengthSquared < Range * Range;
var inRange = ( Util.CellContaining( Target.CenterLocation ) - self.Location ).LengthSquared < Range * Range;
if( !inRange )
return new Move( Target, Range ) { NextActivity = this };
@@ -41,7 +41,7 @@ namespace OpenRA.Mods.RA.Activities
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
{
Actor target;
public HeliAttack( Actor target ) { this.target = target; }
Target target;
public HeliAttack( Target target ) { this.target = target; }
public IActivity NextActivity { get; set; }
public IActivity Tick(Actor self)
{
if (target == null || target.IsDead)
if (!target.IsValid)
return NextActivity;
var limitedAmmo = self.traits.GetOrDefault<LimitedAmmo>();
@@ -55,6 +55,6 @@ namespace OpenRA.Mods.RA.Activities
return this;
}
public void Cancel(Actor self) { target = null; NextActivity = null; }
public void Cancel(Actor self) { target = Target.None; NextActivity = null; }
}
}