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

Fix TD gunboat attack behaviour

Browse Source
This commit is contained in:
Oliver Brakmann
2016-02-03 19:28:45 +01:00
parent dc6d31cec8
commit ce62e456d7
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
View File

@@ -58,16 +58,20 @@ namespace OpenRA.Mods.Common.Traits
readonly IMove move; readonly IMove move;
readonly Target target; readonly Target target;
readonly bool forceAttack; readonly bool forceAttack;
readonly bool onRailsHack;
public AttackActivity(Actor self, Target target, bool allowMove, bool forceAttack) public AttackActivity(Actor self, Target target, bool allowMove, bool forceAttack)
{ {
attack = self.Trait<AttackFollow>(); attack = self.Trait<AttackFollow>();
move = allowMove ? self.TraitOrDefault<IMove>() : null; move = allowMove ? self.TraitOrDefault<IMove>() : null;
// HACK: Mobile.OnRails is horrible // HACK: Mobile.OnRails is horrible. Blergh.
var mobile = move as Mobile; var mobile = move as Mobile;
if (mobile != null && mobile.Info.OnRails) if (mobile != null && mobile.Info.OnRails)
{
move = null; move = null;
onRailsHack = true;
}
this.target = target; this.target = target;
this.forceAttack = forceAttack; this.forceAttack = forceAttack;
@@ -96,11 +100,15 @@ namespace OpenRA.Mods.Common.Traits
if (move != null) if (move != null)
return ActivityUtils.SequenceActivities(move.MoveFollow(self, target, weapon.Weapon.MinRange, maxRange), this); return ActivityUtils.SequenceActivities(move.MoveFollow(self, target, weapon.Weapon.MinRange, maxRange), this);
if (target.IsInRange(self.CenterPosition, weapon.MaxRange()) && !target.IsInRange(self.CenterPosition, weapon.Weapon.MinRange)) if (!onRailsHack &&
target.IsInRange(self.CenterPosition, weapon.MaxRange()) &&
!target.IsInRange(self.CenterPosition, weapon.Weapon.MinRange))
return this; return this;
} }
attack.Target = Target.Invalid; if (!onRailsHack)
attack.Target = Target.Invalid;
return NextActivity; return NextActivity;
} }
} }