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

Moved ROT from Mobile/Heli/Plane to Unit.

Browse Source
This commit is contained in:
Bob
2010-01-12 21:11:38 +13:00
parent 06969138aa
commit 901d48edfa
14 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRa.Game/Traits/Activities/Fly.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRa.Game.Traits.Activities
var desiredFacing = Util.GetFacing(d, unit.Facing);
if (unit.Altitude == CruiseAltitude)
Util.TickFacing(ref unit.Facing, desiredFacing, self.Info.Traits.Get<PlaneInfo>().ROT);
Util.TickFacing(ref unit.Facing, desiredFacing, self.Info.Traits.Get<UnitInfo>().ROT);
var speed = .2f * Util.GetEffectiveSpeed(self);
var angle = unit.Facing / 128f * Math.PI;

2
OpenRa.Game/Traits/Activities/HeliAttack.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRa.Game.Traits.Activities
var dist = target.CenterLocation - self.CenterLocation;
var desiredFacing = Util.GetFacing(dist, unit.Facing);
Util.TickFacing(ref unit.Facing, desiredFacing, self.Info.Traits.Get<HelicopterInfo>().ROT);
Util.TickFacing(ref unit.Facing, desiredFacing, self.Info.Traits.Get<UnitInfo>().ROT);
if (!float2.WithinEpsilon(float2.Zero, dist, range * Game.CellSize))
{

2
OpenRa.Game/Traits/Activities/HeliFly.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRa.Game.Traits.Activities
var desiredFacing = Util.GetFacing(dist, unit.Facing);
Util.TickFacing(ref unit.Facing, desiredFacing,
self.Info.Traits.Get<HelicopterInfo>().ROT);
self.Info.Traits.Get<UnitInfo>().ROT);
var rawSpeed = .2f * Util.GetEffectiveSpeed(self);
self.CenterLocation += (rawSpeed / dist.Length) * dist;

2
OpenRa.Game/Traits/Activities/Land.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRa.Game.Traits.Activities
--unit.Altitude;
var desiredFacing = Util.GetFacing(d, unit.Facing);
Util.TickFacing(ref unit.Facing, desiredFacing, self.Info.Traits.Get<PlaneInfo>().ROT);
Util.TickFacing(ref unit.Facing, desiredFacing, self.Info.Traits.Get<UnitInfo>().ROT);
var speed = .2f * Util.GetEffectiveSpeed(self);
var angle = unit.Facing / 128f * Math.PI;

2
OpenRa.Game/Traits/Activities/ReturnToBase.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRa.Game.Traits.Activities
var unit = self.traits.Get<Unit>();
var speed = .2f * Util.GetEffectiveSpeed(self);
var approachStart = landPos - new float2(unit.Altitude * speed, 0);
var turnRadius = (128f / self.Info.Traits.Get<PlaneInfo>().ROT) * speed / (float)Math.PI;
var turnRadius = (128f / self.Info.Traits.Get<UnitInfo>().ROT) * speed / (float)Math.PI;
/* work out the center points */
var fwd = -float2.FromAngle(unit.Facing / 128f * (float)Math.PI);

2
OpenRa.Game/Traits/Activities/Turn.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRa.Game.Traits.Activities
if( desiredFacing == unit.Facing )
return NextActivity;
Util.TickFacing( ref unit.Facing, desiredFacing, self.Info.Traits.Get<MobileInfo>().ROT );
Util.TickFacing( ref unit.Facing, desiredFacing, self.Info.Traits.Get<UnitInfo>().ROT );
return this;
}

1
OpenRa.Game/Traits/Helicopter.cs
View File

@@ -7,7 +7,6 @@ namespace OpenRa.Game.Traits
{
class HelicopterInfo : ITraitInfo
{
public readonly int ROT = 0;
public readonly int Speed = 0;
public object Create(Actor self) { return new Helicopter(self); }

1
OpenRa.Game/Traits/Plane.cs
View File

@@ -5,7 +5,6 @@ namespace OpenRa.Game.Traits
{
class PlaneInfo : ITraitInfo
{
public readonly int ROT = 0;
public readonly int Speed = 0;
public object Create(Actor self) { return new Plane(self); }

4
OpenRa.Game/Traits/Unit.cs
View File

@@ -4,7 +4,9 @@ namespace OpenRa.Game.Traits
{
class UnitInfo : OwnedActorInfo, ITraitInfo
{
public object Create(Actor self) { return new Unit(self); }
public readonly int ROT = 0;
public object Create( Actor self ) { return new Unit( self ); }
}
class Unit : INotifyDamage