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

Merge pull request #6127 from cjshmyr/attackcharge

Browse Source 
Fixes #5568
This commit is contained in:
Matthias Mailänder
2014-08-03 17:51:28 +02:00
parent b6fd757672 52aedf4b75
commit 33655afe21
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenRA.Mods.RA/Attack/AttackCharge.cs
View File

@@ -17,15 +17,16 @@ namespace OpenRA.Mods.RA
[Desc("Charges up before being able to attack.")] [Desc("Charges up before being able to attack.")]
class AttackChargeInfo : AttackOmniInfo class AttackChargeInfo : AttackOmniInfo
{ {
[Desc("How many charges this actor has to attack with, once charged.")]
public readonly int MaxCharges = 1; public readonly int MaxCharges = 1;
[Desc("Reload time (for all charges).")] [Desc("Reload time for all charges (in ticks).")]
public readonly int ReloadTime = 120; public readonly int ReloadTime = 120;
[Desc("Delay for first charge. Needs to match FireDelay for Obelisk.")] [Desc("Delay for initial charge attack (in ticks).")]
public readonly int InitialChargeDelay = 22; public readonly int InitialChargeDelay = 22;
[Desc("Delay for additional charges if MaxCharge is larger than 1.")] [Desc("Delay between charge attacks (in ticks).")]
public readonly int ChargeDelay = 3; public readonly int ChargeDelay = 3;
public override object Create(ActorInitializer init) { return new AttackCharge(init.self, this); } public override object Create(ActorInitializer init) { return new AttackCharge(init.self, this); }
@@ -51,6 +52,14 @@ namespace OpenRA.Mods.RA
charges = info.MaxCharges; charges = info.MaxCharges;
} }
protected override bool CanAttack(Actor self, Target target)
{
if (!IsReachableTarget(target, true))
return false;
return base.CanAttack(self, target);
}
public void Attacking(Actor self, Target target, Armament a, Barrel barrel) public void Attacking(Actor self, Target target, Armament a, Barrel barrel)
{ {
--charges; --charges;
@@ -83,13 +92,14 @@ namespace OpenRA.Mods.RA
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
{ {
if (IsCanceled || !target.IsValidFor(self)) if (IsCanceled || !attack.CanAttack(self, target))
return NextActivity; return NextActivity;
if (attack.charges == 0 || !attack.CanAttack(self, target)) if (attack.charges == 0)
return this; return this;
self.Trait<RenderBuildingCharge>().PlayCharge(self); self.Trait<RenderBuildingCharge>().PlayCharge(self);
return Util.SequenceActivities(new Wait(attack.info.InitialChargeDelay), new ChargeFire(attack, target), this); return Util.SequenceActivities(new Wait(attack.info.InitialChargeDelay), new ChargeFire(attack, target), this);
} }
} }
@@ -98,6 +108,7 @@ namespace OpenRA.Mods.RA
{ {
readonly AttackCharge attack; readonly AttackCharge attack;
readonly Target target; readonly Target target;
public ChargeFire(AttackCharge attack, Target target) public ChargeFire(AttackCharge attack, Target target)
{ {
this.attack = attack; this.attack = attack;
@@ -106,7 +117,7 @@ namespace OpenRA.Mods.RA
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
{ {
if (IsCanceled || !target.IsValidFor(self)) if (IsCanceled || !attack.CanAttack(self, target))
return NextActivity; return NextActivity;
if (attack.charges == 0) if (attack.charges == 0)