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

make attacks queuable

Browse Source
This commit is contained in:
Bob
2010-11-13 15:17:48 +13:00
parent 10ed3db71d
commit 7306de3730
9 changed files with 61 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/Actor.cs
View File

@@ -131,7 +131,14 @@ namespace OpenRA
return new RectangleF(loc.X, loc.Y, size.X, size.Y);
}
public bool IsInWorld { get; internal set; }
public bool IsInWorld { get; internal set; }
public void QueueActivity( bool queued, IActivity nextActivity )
{
if( !queued )
CancelActivity();
QueueActivity( nextActivity );
}
public void QueueActivity( IActivity nextActivity )
{

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

@@ -22,10 +22,10 @@ namespace OpenRA.Mods.RA.Air
{
public AttackHeli(Actor self, AttackHeliInfo info) : base(self, info) { }
protected override void QueueAttack(Actor self, Target newTarget)
protected override void QueueAttack(Actor self, bool queued, Target newTarget)
{
target = newTarget;
self.QueueActivity(new HeliAttack(newTarget));
self.QueueActivity(queued, new HeliAttack(newTarget));
}
}
}

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

@@ -22,10 +22,10 @@ namespace OpenRA.Mods.RA.Air
{
public AttackPlane(Actor self, AttackPlaneInfo info) : base(self, info) { }
protected override void QueueAttack(Actor self, Target newTarget)
protected override void QueueAttack(Actor self, bool queued, Target newTarget)
{
target = newTarget;
self.QueueActivity(new FlyAttack(newTarget));
self.QueueActivity(queued, new FlyAttack(newTarget));
}
protected override bool CanAttack(Actor self)

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

@@ -149,8 +149,7 @@ namespace OpenRA.Mods.RA
{
if (order.OrderString == "Attack")
{
self.CancelActivity();
QueueAttack(self, Target.FromOrder(order));
QueueAttack(self, order.Queued, Target.FromOrder(order));
if (self.Owner == self.World.LocalPlayer)
self.World.AddFrameEndTask(w =>
@@ -181,7 +180,7 @@ namespace OpenRA.Mods.RA
return (order.OrderString == "Attack") ? "Attack" : null;
}
protected abstract void QueueAttack(Actor self, Target newTarget);
protected abstract void QueueAttack(Actor self, bool queued, Target newTarget);
public bool HasAnyValidWeapons(Target t) { return Weapons.Any(w => w.IsValidAgainst(self.World, t)); }
public float GetMaximumRange() { return Weapons.Max(w => w.Info.Range); }

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

@@ -40,12 +40,12 @@ namespace OpenRA.Mods.RA
return true;
}
protected override void QueueAttack(Actor self, Target newTarget)
protected override void QueueAttack(Actor self, bool queued, Target newTarget)
{
var weapon = ChooseWeaponForTarget(newTarget);
if (weapon != null)
self.QueueActivity(
self.QueueActivity( queued,
new Activities.Attack(
newTarget,
Math.Max(0, (int)weapon.Info.Range)));

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

@@ -40,12 +40,12 @@ namespace OpenRA.Mods.RA
self.QueueActivity(new Leap(self, target));
}
protected override void QueueAttack(Actor self, Target newTarget)
protected override void QueueAttack(Actor self, bool queued, Target newTarget)
{
var weapon = ChooseWeaponForTarget(newTarget);
if (weapon != null)
self.QueueActivity(
self.QueueActivity( queued,
new Activities.Attack(
newTarget,
Math.Max(0, (int)weapon.Info.Range)));

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

@@ -10,6 +10,7 @@
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;
using OpenRA.Mods.RA.Activities;
namespace OpenRA.Mods.RA
{
@@ -37,9 +38,22 @@ namespace OpenRA.Mods.RA
DoAttack(self, target);
}
protected override void QueueAttack(Actor self, Target newTarget)
protected override void QueueAttack(Actor self, bool queued, Target newTarget)
{
target = newTarget;
self.QueueActivity( queued, new SetTarget( newTarget ) );
}
class SetTarget : CancelableActivity
{
readonly Target target;
public SetTarget( Target target ) { this.target = target; }
public override IActivity Tick( Actor self )
{
if( !IsCanceled )
self.Trait<AttackBase>().target = target;
return NextActivity;
}
}
}
}

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

@@ -46,24 +46,39 @@ namespace OpenRA.Mods.RA
DoAttack( self, target );
}
protected override void QueueAttack( Actor self, Target newTarget )
protected override void QueueAttack( Actor self, bool queued, Target newTarget )
{
if (self.TraitsImplementing<IDisable>().Any(d => d.Disabled))
return;
const int RangeTolerance = 1; /* how far inside our maximum range we should try to sit */
var weapon = ChooseWeaponForTarget(newTarget);
if (weapon == null)
return;
target = newTarget;
if (self.HasTrait<Mobile>() && !self.Info.Traits.Get<MobileInfo>().OnRails)
self.QueueActivity( new Follow( newTarget,
Math.Max( 0, (int)weapon.Info.Range - RangeTolerance ) ) );
self.QueueActivity( queued, new AttackActivity( newTarget ) );
}
bool buildComplete = false;
public void BuildingComplete(Actor self) { buildComplete = true; }
class AttackActivity : CancelableActivity
{
readonly Target newTarget;
public AttackActivity( Target newTarget ) { this.newTarget = newTarget; }
public override IActivity Tick( Actor self )
{
if( IsCanceled ) return NextActivity;
var attack = self.Trait<AttackTurreted>();
const int RangeTolerance = 1; /* how far inside our maximum range we should try to sit */
var weapon = attack.ChooseWeaponForTarget(newTarget);
if (weapon != null)
{
attack.target = newTarget;
if (self.HasTrait<Mobile>() && !self.Info.Traits.Get<MobileInfo>().OnRails)
self.QueueActivity( new Follow( newTarget,
Math.Max( 0, (int)weapon.Info.Range - RangeTolerance ) ) );
}
return NextActivity;
}
}
}
}

5
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -321,7 +321,4 @@
copy "$(TargetPath)" "$(SolutionDir)mods/ra/"
cd "$(SolutionDir)"</PostBuildEvent>
</PropertyGroup>
<ItemGroup>
<Folder Include="ServerTraits\" />
</ItemGroup>
</Project>