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

remove unnecessary parameters from Aircraft.MovementSpeedForCell, and rename to MovementSpeed

Browse Source
This commit is contained in:
Bob
2010-11-04 00:43:18 +13:00
committed by Chris Forbes
parent 8129d5d7dc
commit 5c0cd50797
7 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Activities/Fly.cs
View File

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.RA.Activities
public static void Fly(Actor self, int desiredAltitude )
{
var aircraft = self.Trait<Aircraft>();
var speed = .2f * aircraft.MovementSpeedForCell(self, self.Location);
var speed = .2f * aircraft.MovementSpeed;
var angle = aircraft.Facing / 128f * Math.PI;
aircraft.center += speed * -float2.FromAngle((float)angle);
aircraft.Altitude += Math.Sign(desiredAltitude - aircraft.Altitude);

2
OpenRA.Mods.RA/Activities/HeliAttack.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.RA.Activities
var desiredFacing = Util.GetFacing(dist, aircraft.Facing);
aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, aircraft.ROT);
var rawSpeed = .2f * aircraft.MovementSpeedForCell(self, self.Location);
var rawSpeed = .2f * aircraft.MovementSpeed;
if (!float2.WithinEpsilon(float2.Zero, dist, range * Game.CellSize))
aircraft.center += (rawSpeed / dist.Length) * dist;

2
OpenRA.Mods.RA/Activities/HeliFly.cs
View File

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA.Activities
aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing,
aircraft.ROT);
var rawSpeed = .2f * aircraft.MovementSpeedForCell(self, self.Location);
var rawSpeed = .2f * aircraft.MovementSpeed;
aircraft.center += (rawSpeed / dist.Length) * dist;
return this;

2
OpenRA.Mods.RA/Activities/Land.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA.Activities
var desiredFacing = Util.GetFacing(d, aircraft.Facing);
aircraft.Facing = Util.TickFacing(aircraft.Facing, desiredFacing, aircraft.ROT);
var speed = .2f * aircraft.MovementSpeedForCell(self, self.Location);
var speed = .2f * aircraft.MovementSpeed;
var angle = aircraft.Facing / 128f * Math.PI;
aircraft.center += speed * -float2.FromAngle((float)angle);

2
OpenRA.Mods.RA/Activities/ReturnToBase.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.RA.Activities
var landPos = dest.CenterLocation;
var aircraft = self.Trait<Aircraft>();
var speed = .2f * aircraft.MovementSpeedForCell(self, self.Location);
var speed = .2f * aircraft.MovementSpeed;
var approachStart = landPos - new float2(aircraft.Altitude * speed, 0);
var turnRadius = (128f / self.Info.Traits.Get<AircraftInfo>().ROT) * speed / (float)Math.PI;

19
OpenRA.Mods.RA/Aircraft.cs
View File

@@ -80,14 +80,17 @@ namespace OpenRA.Mods.RA
}
public bool CanEnterCell(int2 location) { return true; }
public float MovementSpeedForCell(Actor self, int2 cell)
{
var modifier = self
.TraitsImplementing<ISpeedModifier>()
.Select(t => t.GetSpeedModifier())
.Product();
return Info.Speed * modifier;
public float MovementSpeed
{
get
{
var modifier = self
.TraitsImplementing<ISpeedModifier>()
.Select( t => t.GetSpeedModifier() )
.Product();
return Info.Speed * modifier;
}
}
int2[] noCells = new int2[] { };

2
OpenRA.Mods.RA/Helicopter.cs
View File

@@ -133,7 +133,7 @@ namespace OpenRA.Mods.RA
if (aircraft.Altitude <= 0)
return;
var rawSpeed = .2f * aircraft.MovementSpeedForCell(self, self.Location);
var rawSpeed = .2f * aircraft.MovementSpeed;
var otherHelis = self.World.FindUnitsInCircle(self.CenterLocation, Info.IdealSeparation)
.Where(a => a.HasTrait<Helicopter>());