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

Generalize HeliAttack activity Aircraft caching naming

Browse Source 
To make a possible future merger (or inheritance or other code-sharing) with FlyAttack easier.
This commit is contained in:
reaperrr
2018-08-04 23:11:28 +02:00
committed by reaperrr
parent c3a0d129a3
commit 6810ac92ba
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Mods.Common/Activities/Air/HeliAttack.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Activities
{ {
public class HeliAttack : Activity public class HeliAttack : Activity
{ {
readonly Aircraft helicopter; readonly Aircraft aircraft;
readonly AttackHeli attackHeli; readonly AttackHeli attackHeli;
readonly bool attackOnlyVisibleTargets; readonly bool attackOnlyVisibleTargets;
readonly bool autoReloads; readonly bool autoReloads;
@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Activities
public HeliAttack(Actor self, Target target, bool attackOnlyVisibleTargets = true) public HeliAttack(Actor self, Target target, bool attackOnlyVisibleTargets = true)
{ {
Target = target; Target = target;
helicopter = self.Trait<Aircraft>(); aircraft = self.Trait<Aircraft>();
attackHeli = self.Trait<AttackHeli>(); attackHeli = self.Trait<AttackHeli>();
this.attackOnlyVisibleTargets = attackOnlyVisibleTargets; this.attackOnlyVisibleTargets = attackOnlyVisibleTargets;
autoReloads = self.TraitsImplementing<AmmoPool>().All(p => p.AutoReloads); autoReloads = self.TraitsImplementing<AmmoPool>().All(p => p.AutoReloads);
@@ -53,7 +53,7 @@ namespace OpenRA.Mods.Common.Activities
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
{ {
// Refuse to take off if it would land immediately again. // Refuse to take off if it would land immediately again.
if (helicopter.ForceLanding) if (aircraft.ForceLanding)
{ {
Cancel(self); Cancel(self);
return NextActivity; return NextActivity;
@@ -75,21 +75,21 @@ namespace OpenRA.Mods.Common.Activities
} }
// If all valid weapons have depleted their ammo and RearmBuilding is defined, return to RearmBuilding to reload and then resume the activity // If all valid weapons have depleted their ammo and RearmBuilding is defined, return to RearmBuilding to reload and then resume the activity
if (!autoReloads && helicopter.Info.RearmBuildings.Any() && attackHeli.Armaments.All(x => x.IsTraitPaused || !x.Weapon.IsValidAgainst(target, self.World, self))) if (!autoReloads && aircraft.Info.RearmBuildings.Any() && attackHeli.Armaments.All(x => x.IsTraitPaused || !x.Weapon.IsValidAgainst(target, self.World, self)))
return ActivityUtils.SequenceActivities(new HeliReturnToBase(self, helicopter.Info.AbortOnResupply), this); return ActivityUtils.SequenceActivities(new HeliReturnToBase(self, aircraft.Info.AbortOnResupply), this);
var dist = targetPos - pos; var dist = targetPos - pos;
// Can rotate facing while ascending // Can rotate facing while ascending
var desiredFacing = dist.HorizontalLengthSquared != 0 ? dist.Yaw.Facing : helicopter.Facing; var desiredFacing = dist.HorizontalLengthSquared != 0 ? dist.Yaw.Facing : aircraft.Facing;
helicopter.Facing = Util.TickFacing(helicopter.Facing, desiredFacing, helicopter.TurnSpeed); aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, aircraft.TurnSpeed);
if (HeliFly.AdjustAltitude(self, helicopter, helicopter.Info.CruiseAltitude)) if (HeliFly.AdjustAltitude(self, aircraft, aircraft.Info.CruiseAltitude))
return this; return this;
// Fly towards the target // Fly towards the target
if (!target.IsInRange(pos, attackHeli.GetMaximumRangeVersusTarget(target))) if (!target.IsInRange(pos, attackHeli.GetMaximumRangeVersusTarget(target)))
helicopter.SetPosition(self, helicopter.CenterPosition + helicopter.FlyStep(desiredFacing)); aircraft.SetPosition(self, aircraft.CenterPosition + aircraft.FlyStep(desiredFacing));
// Fly backwards from the target // Fly backwards from the target
if (target.IsInRange(pos, attackHeli.GetMinimumRangeVersusTarget(target))) if (target.IsInRange(pos, attackHeli.GetMinimumRangeVersusTarget(target)))
@@ -98,9 +98,9 @@ namespace OpenRA.Mods.Common.Activities
var facing = 1; var facing = 1;
if (desiredFacing != 0) if (desiredFacing != 0)
facing = desiredFacing; facing = desiredFacing;
else if (helicopter.Facing != 0) else if (aircraft.Facing != 0)
facing = helicopter.Facing; facing = aircraft.Facing;
helicopter.SetPosition(self, helicopter.CenterPosition + helicopter.FlyStep(-facing)); aircraft.SetPosition(self, aircraft.CenterPosition + aircraft.FlyStep(-facing));
} }
attackHeli.DoAttack(self, target); attackHeli.DoAttack(self, target);