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

Revert "Expose Plane turn-to-attack delay to yaml."

Browse Source 
This reverts commit 02da41e5c5.
This commit is contained in:
Oliver Brakmann
2015-04-03 23:42:35 +02:00
parent a8d7140c1a
commit 32ed63727d
13 changed files with 45 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Activities/Air/Fly.cs
View File

@@ -22,14 +22,14 @@ namespace OpenRA.Mods.Common.Activities
readonly WRange maxRange;
readonly WRange minRange;
public Fly(Actor self, Target t, Plane plane)
public Fly(Actor self, Target t)
{
plane = self.Trait<Plane>();
target = t;
this.plane = plane;
}
public Fly(Actor self, Target t, Plane plane, WRange minRange, WRange maxRange)
: this(self, t, plane)
public Fly(Actor self, Target t, WRange minRange, WRange maxRange)
: this(self, t)
{
this.maxRange = maxRange;
this.minRange = minRange;

11
OpenRA.Mods.Common/Activities/Air/FlyAttack.cs
View File

@@ -21,16 +21,13 @@ namespace OpenRA.Mods.Common.Activities
{
readonly Target target;
readonly AttackPlane attackPlane;
readonly Plane plane;
readonly IEnumerable<AmmoPool> ammoPools;
Activity inner;
int ticksUntilTurn;
int ticksUntilTurn = 50;
public FlyAttack(Actor self, Target target, Plane plane)
public FlyAttack(Actor self, Target target)
{
this.target = target;
this.plane = plane;
ticksUntilTurn = plane.Info.AttackTurnDelay;
attackPlane = self.TraitOrDefault<AttackPlane>();
ammoPools = self.TraitsImplementing<AmmoPool>();
}
@@ -55,9 +52,9 @@ namespace OpenRA.Mods.Common.Activities
// TODO: This should fire each weapon at its maximum range
if (target.IsInRange(self.CenterPosition, attackPlane.Armaments.Select(a => a.Weapon.MinRange).Min()))
inner = Util.SequenceActivities(new FlyTimed(ticksUntilTurn, self), new Fly(self, target, plane), new FlyTimed(ticksUntilTurn, self));
inner = Util.SequenceActivities(new FlyTimed(ticksUntilTurn, self), new Fly(self, target), new FlyTimed(ticksUntilTurn, self));
else
inner = Util.SequenceActivities(new Fly(self, target, plane), new FlyTimed(ticksUntilTurn, self));
inner = Util.SequenceActivities(new Fly(self, target), new FlyTimed(ticksUntilTurn, self));
}
inner = Util.RunActivity(self, inner);

6
OpenRA.Mods.Common/Activities/Air/FlyFollow.cs
View File

@@ -21,10 +21,10 @@ namespace OpenRA.Mods.Common.Activities
WRange minRange;
WRange maxRange;
public FlyFollow(Actor self, Target target, Plane plane, WRange minRange, WRange maxRange)
public FlyFollow(Actor self, Target target, WRange minRange, WRange maxRange)
{
this.target = target;
this.plane = plane;
plane = self.Trait<Plane>();
this.minRange = minRange;
this.maxRange = maxRange;
}
@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Activities
return this;
}
return Util.SequenceActivities(new Fly(self, target, plane, minRange, maxRange), this);
return Util.SequenceActivities(new Fly(self, target, minRange, maxRange), this);
}
}
}

14
OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
View File

@@ -24,11 +24,11 @@ namespace OpenRA.Mods.Common.Activities
Actor dest;
WPos w1, w2, w3;
public ReturnToBase(Actor self, Actor dest, Plane plane)
public ReturnToBase(Actor self, Actor dest)
{
this.dest = dest;
this.plane = plane;
planeInfo = plane.Info;
plane = self.Trait<Plane>();
planeInfo = self.Info.Traits.Get<PlaneInfo>();
}
public static Actor ChooseAirfield(Actor self, bool unreservedOnly)
@@ -113,15 +113,15 @@ namespace OpenRA.Mods.Common.Activities
self.CancelActivity();
if (nearestAfld != null)
return Util.SequenceActivities(new Fly(self, Target.FromActor(nearestAfld), plane), new FlyCircle(self));
return Util.SequenceActivities(new Fly(self, Target.FromActor(nearestAfld)), new FlyCircle(self));
else
return new FlyCircle(self);
}
return Util.SequenceActivities(
new Fly(self, Target.FromPos(w1), plane),
new Fly(self, Target.FromPos(w2), plane),
new Fly(self, Target.FromPos(w3), plane),
new Fly(self, Target.FromPos(w1)),
new Fly(self, Target.FromPos(w2)),
new Fly(self, Target.FromPos(w3)),
new Land(self, Target.FromActor(dest)),
NextActivity);
}