diff --git a/OpenRa.Game/Traits/Activities/Fly.cs b/OpenRa.Game/Traits/Activities/Fly.cs index b9b820d8c0..7c6a497a17 100644 --- a/OpenRa.Game/Traits/Activities/Fly.cs +++ b/OpenRa.Game/Traits/Activities/Fly.cs @@ -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().ROT); + Util.TickFacing(ref unit.Facing, desiredFacing, self.Info.Traits.Get().ROT); var speed = .2f * Util.GetEffectiveSpeed(self); var angle = unit.Facing / 128f * Math.PI; diff --git a/OpenRa.Game/Traits/Activities/HeliAttack.cs b/OpenRa.Game/Traits/Activities/HeliAttack.cs index 71b27ab22f..3bfd902388 100644 --- a/OpenRa.Game/Traits/Activities/HeliAttack.cs +++ b/OpenRa.Game/Traits/Activities/HeliAttack.cs @@ -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().ROT); + Util.TickFacing(ref unit.Facing, desiredFacing, self.Info.Traits.Get().ROT); if (!float2.WithinEpsilon(float2.Zero, dist, range * Game.CellSize)) { diff --git a/OpenRa.Game/Traits/Activities/HeliFly.cs b/OpenRa.Game/Traits/Activities/HeliFly.cs index 9699a01853..32ba04e293 100644 --- a/OpenRa.Game/Traits/Activities/HeliFly.cs +++ b/OpenRa.Game/Traits/Activities/HeliFly.cs @@ -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().ROT); + self.Info.Traits.Get().ROT); var rawSpeed = .2f * Util.GetEffectiveSpeed(self); self.CenterLocation += (rawSpeed / dist.Length) * dist; diff --git a/OpenRa.Game/Traits/Activities/Land.cs b/OpenRa.Game/Traits/Activities/Land.cs index 2164f2bfd2..e6f6145c7e 100644 --- a/OpenRa.Game/Traits/Activities/Land.cs +++ b/OpenRa.Game/Traits/Activities/Land.cs @@ -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().ROT); + Util.TickFacing(ref unit.Facing, desiredFacing, self.Info.Traits.Get().ROT); var speed = .2f * Util.GetEffectiveSpeed(self); var angle = unit.Facing / 128f * Math.PI; diff --git a/OpenRa.Game/Traits/Activities/ReturnToBase.cs b/OpenRa.Game/Traits/Activities/ReturnToBase.cs index aed998b9be..51cac44f92 100644 --- a/OpenRa.Game/Traits/Activities/ReturnToBase.cs +++ b/OpenRa.Game/Traits/Activities/ReturnToBase.cs @@ -41,7 +41,7 @@ namespace OpenRa.Game.Traits.Activities var unit = self.traits.Get(); var speed = .2f * Util.GetEffectiveSpeed(self); var approachStart = landPos - new float2(unit.Altitude * speed, 0); - var turnRadius = (128f / self.Info.Traits.Get().ROT) * speed / (float)Math.PI; + var turnRadius = (128f / self.Info.Traits.Get().ROT) * speed / (float)Math.PI; /* work out the center points */ var fwd = -float2.FromAngle(unit.Facing / 128f * (float)Math.PI); diff --git a/OpenRa.Game/Traits/Activities/Turn.cs b/OpenRa.Game/Traits/Activities/Turn.cs index 2f29a1bab5..a992a2aedd 100755 --- a/OpenRa.Game/Traits/Activities/Turn.cs +++ b/OpenRa.Game/Traits/Activities/Turn.cs @@ -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().ROT ); + Util.TickFacing( ref unit.Facing, desiredFacing, self.Info.Traits.Get().ROT ); return this; } diff --git a/OpenRa.Game/Traits/Helicopter.cs b/OpenRa.Game/Traits/Helicopter.cs index 58e570fe2f..8084b9dc0e 100644 --- a/OpenRa.Game/Traits/Helicopter.cs +++ b/OpenRa.Game/Traits/Helicopter.cs @@ -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); } diff --git a/OpenRa.Game/Traits/Plane.cs b/OpenRa.Game/Traits/Plane.cs index fefa10a17c..235ea7c151 100644 --- a/OpenRa.Game/Traits/Plane.cs +++ b/OpenRa.Game/Traits/Plane.cs @@ -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); } diff --git a/OpenRa.Game/Traits/Unit.cs b/OpenRa.Game/Traits/Unit.cs index 9b44ae78b2..015de81265 100755 --- a/OpenRa.Game/Traits/Unit.cs +++ b/OpenRa.Game/Traits/Unit.cs @@ -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 diff --git a/RulesConverter/Program.cs b/RulesConverter/Program.cs index b31943f87b..7181f5fe98 100644 --- a/RulesConverter/Program.cs +++ b/RulesConverter/Program.cs @@ -41,6 +41,7 @@ namespace RulesConverter { "Armor", "Armor" }, { "Crewed", "Crewed" }, { "InitialFacing", "InitialFacing" }, + { "ROT", "ROT" }, { "Sight", "Sight" }, { "WaterBound", "WaterBound" } } }, @@ -52,18 +53,15 @@ namespace RulesConverter }, { "Mobile", new PL { - { "ROT", "ROT" }, { "Speed", "Speed" } } //{ "MovementType", ... }, }, { "Plane", new PL { - { "ROT", "ROT" }, { "Speed", "Speed" } } }, { "Helicopter", new PL { - { "ROT", "ROT" }, { "Speed", "Speed" } } }, diff --git a/aftermath.yaml b/aftermath.yaml index cef2b7f987..43c5095b8d 100644 --- a/aftermath.yaml +++ b/aftermath.yaml @@ -105,10 +105,10 @@ MSUB: Unit: HP: 150 Armor: light + ROT: 7 Sight: 6 WaterBound: yes Mobile: - ROT: 7 Speed: 5 AttackBase: PrimaryWeapon: SubSCUD diff --git a/defaults.yaml b/defaults.yaml index 4f3a4bc637..6d2a18160b 100644 --- a/defaults.yaml +++ b/defaults.yaml @@ -1,6 +1,7 @@ DefaultVehicle: - Mobile: + Unit: ROT: 5 + Mobile: Selectable: Voice: VehicleVoice Repairable: diff --git a/ra.yaml b/ra.yaml index 550acc3110..a586d3a4aa 100644 --- a/ra.yaml +++ b/ra.yaml @@ -358,10 +358,10 @@ SS: Unit: HP: 120 Armor: light + ROT: 7 Sight: 6 WaterBound: yes Mobile: - ROT: 7 Speed: 6 RenderUnit: Submarine: @@ -386,10 +386,10 @@ DD: Unit: HP: 400 Armor: heavy + ROT: 7 Sight: 6 WaterBound: yes Mobile: - ROT: 7 Speed: 6 Turreted: AttackTurreted: @@ -415,10 +415,10 @@ CA: Unit: HP: 700 Armor: heavy + ROT: 5 Sight: 7 WaterBound: yes Mobile: - ROT: 5 Speed: 4 Turreted: AttackTurreted: @@ -444,10 +444,10 @@ LST: Unit: HP: 350 Armor: heavy + ROT: 10 Sight: 6 WaterBound: yes Mobile: - ROT: 10 Speed: 14 RenderUnit: Cargo: @@ -470,10 +470,10 @@ PT: Unit: HP: 200 Armor: heavy + ROT: 7 Sight: 7 WaterBound: yes Mobile: - ROT: 7 Speed: 9 Turreted: AttackTurreted: @@ -500,11 +500,11 @@ MIG: HP: 50 Armor: light InitialFacing: 192 + ROT: 5 Sight: 0 AttackPlane: PrimaryWeapon: Maverick Plane: - ROT: 5 Speed: 20 RenderUnit: WithShadow: @@ -529,11 +529,11 @@ YAK: Armor: light Crewed: yes InitialFacing: 192 + ROT: 5 Sight: 0 AttackPlane: PrimaryWeapon: ChainGun Plane: - ROT: 5 Speed: 16 RenderUnit: WithShadow: @@ -557,9 +557,9 @@ TRAN: HP: 90 Armor: light InitialFacing: 20 + ROT: 5 Sight: 0 Helicopter: - ROT: 5 Speed: 12 RenderUnitRotor: PrimaryOffset: 0,14,0,-4 @@ -587,13 +587,13 @@ HELI: Armor: heavy Crewed: yes InitialFacing: 20 + ROT: 4 Sight: 0 AttackHeli: PrimaryWeapon: Hellfire PrimaryOffset: -5,0,0,2 SecondaryOffset: 5,0,0,2 Helicopter: - ROT: 4 Speed: 16 RenderUnitRotor: PrimaryOffset: 0,0,0,-2 @@ -619,13 +619,13 @@ HIND: Armor: heavy Crewed: yes InitialFacing: 20 + ROT: 4 Sight: 0 AttackHeli: PrimaryWeapon: ChainGun PrimaryOffset: -5,0,0,2 SecondaryOffset: 5,0,0,2 Helicopter: - ROT: 4 Speed: 12 RenderUnitRotor: WithShadow: diff --git a/session.ini b/session.ini index d63ac62a10..8df61230ca 100644 --- a/session.ini +++ b/session.ini @@ -10,4 +10,9 @@ s2=Multi1,mcv,600,12505,0,Guard,None ;s2=Multi1,e3,600,12505,0,Guard,None s3=Multi3,mcv,600,2910,0,Guard,None ;s4=Multi1,ctnk,600,12506,Gaurd,None -s5=Multi1,apc,600,12510,Gaurd,None \ No newline at end of file +s5=Multi1,apc,600,12510,Gaurd,None + + + +s6=Multi0,heli,600,2842,0,Guard,None +