From 36753b5d997efeac5eb24cffa1176983053a4575 Mon Sep 17 00:00:00 2001
From: teees <teees200@gmail.com>
Date: Thu, 22 Oct 2015 10:29:26 +0200
Subject: [PATCH 1/2] change hovers trait to be upgradeable

---
 OpenRA.Mods.Common/Traits/Render/Hovers.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/OpenRA.Mods.Common/Traits/Render/Hovers.cs b/OpenRA.Mods.Common/Traits/Render/Hovers.cs
index 1b97a4509f..52c61219fe 100644
--- a/OpenRA.Mods.Common/Traits/Render/Hovers.cs
+++ b/OpenRA.Mods.Common/Traits/Render/Hovers.cs
@@ -18,20 +18,21 @@ using OpenRA.Traits;
 namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Changes the visual Z position periodically.")]
-	public class HoversInfo : ITraitInfo, Requires<IMoveInfo>
+	public class HoversInfo : UpgradableTraitInfo, Requires<IMoveInfo>
 	{
 		[Desc("Amount of Z axis changes in world units.")]
 		public readonly int OffsetModifier = -43;
 
-		public object Create(ActorInitializer init) { return new Hovers(this, init.Self); }
+		public override object Create(ActorInitializer init) { return new Hovers(this, init.Self); }
 	}
 
-	public class Hovers : IRenderModifier
+	public class Hovers : UpgradableTrait<HoversInfo>, IRenderModifier
 	{
 		readonly HoversInfo info;
 		readonly bool aircraft;
 
 		public Hovers(HoversInfo info, Actor self)
+			: base(info)
 		{
 			this.info = info;
 			aircraft = self.Info.HasTraitInfo<AircraftInfo>();
@@ -39,7 +40,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
 		{
-			if (self.World.Paused)
+			if (self.World.Paused || IsTraitDisabled)
 				return r;
 
 			var visualOffset = !aircraft || self.CenterPosition.Z > 0 ? (int)Math.Abs((self.ActorID + Game.LocalTick) / 5 % 4 - 1) - 1 : 0;

From 9292219d3b9a42fa94a35f6a2f8d9e584b863055 Mon Sep 17 00:00:00 2001
From: teees <teees200@gmail.com>
Date: Thu, 22 Oct 2015 10:30:33 +0200
Subject: [PATCH 2/2] hover only when airborne

---
 mods/ts/rules/aircraft.yaml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml
index bfe1196264..1c3a93a8ab 100644
--- a/mods/ts/rules/aircraft.yaml
+++ b/mods/ts/rules/aircraft.yaml
@@ -97,7 +97,9 @@ ORCA:
 		PipTypeEmpty: AmmoEmpty
 	AutoTarget:
 	RenderSprites:
-	Hovers:
+	Hovers@AIRBORNE:
+		UpgradeTypes: airborne
+		UpgradeMinEnabledLevel: 1
 
 ORCAB:
 	Inherits: ^Plane
@@ -139,7 +141,9 @@ ORCAB:
 		PipTypeEmpty: AmmoEmpty
 	AutoTarget:
 	RenderSprites:
-	Hovers:
+	Hovers@AIRBORNE:
+		UpgradeTypes: airborne
+		UpgradeMinEnabledLevel: 1
 
 ORCATRAN:
 	Inherits: ^Helicopter
@@ -172,7 +176,9 @@ ORCATRAN:
 		MaxWeight: 5
 		PipCount: 5
 		UnloadVoice: Move
-	Hovers:
+	Hovers@AIRBORNE:
+		UpgradeTypes: airborne
+		UpgradeMinEnabledLevel: 1
 
 TRNSPORT:
 	Inherits: ^Helicopter
@@ -202,7 +208,9 @@ TRNSPORT:
 		Range: 2c0
 		Type: CenterPosition
 	RenderSprites:
-	Hovers:
+	Hovers@AIRBORNE:
+		UpgradeTypes: airborne
+		UpgradeMinEnabledLevel: 1
 	Selectable:
 		Bounds: 44,32,0,-8
 
@@ -285,7 +293,9 @@ APACHE:
 	WithSpriteRotorOverlay:
 		Offset: 85,0,384
 	RenderSprites:
-	Hovers:
+	Hovers@AIRBORNE:
+		UpgradeTypes: airborne
+		UpgradeMinEnabledLevel: 1
 
 HUNTER:
 	Inherits@1: ^GainsExperience