From db609b12a04c8ebe86bf1c3cbc9f1e0f289207d0 Mon Sep 17 00:00:00 2001
From: Pavel Penev <penev92@gmail.com>
Date: Fri, 9 Oct 2015 16:36:34 +0300
Subject: [PATCH] Add a CanDeployOnRamps property to DeployToUpgrade

---
 .../Traits/Upgrades/DeployToUpgrade.cs        | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/OpenRA.Mods.Common/Traits/Upgrades/DeployToUpgrade.cs b/OpenRA.Mods.Common/Traits/Upgrades/DeployToUpgrade.cs
index 5efa1dba2a..ee42381119 100644
--- a/OpenRA.Mods.Common/Traits/Upgrades/DeployToUpgrade.cs
+++ b/OpenRA.Mods.Common/Traits/Upgrades/DeployToUpgrade.cs
@@ -28,6 +28,9 @@ namespace OpenRA.Mods.Common.Traits
 			"Leave empty to allow any.")]
 		public readonly HashSet<string> AllowedTerrainTypes = new HashSet<string>();
 
+		[Desc("Can this actor deploy on slopes?")]
+		public readonly bool CanDeployOnRamps = false;
+
 		[Desc("Cursor to display when able to (un)deploy the actor.")]
 		public readonly string DeployCursor = "deploy";
 
@@ -73,7 +76,7 @@ namespace OpenRA.Mods.Common.Traits
 		public IEnumerable<IOrderTargeter> Orders
 		{
 			get { yield return new DeployOrderTargeter("DeployToUpgrade", 5,
-				() => OnValidTerrain() ? info.DeployCursor : info.DeployBlockedCursor); }
+				() => IsOnValidTerrain() ? info.DeployCursor : info.DeployBlockedCursor); }
 		}
 
 		public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
@@ -89,7 +92,7 @@ namespace OpenRA.Mods.Common.Traits
 			if (order.OrderString != "DeployToUpgrade")
 				return;
 
-			if (!OnValidTerrain())
+			if (!IsOnValidTerrain())
 				return;
 
 			if (isUpgraded)
@@ -141,7 +144,12 @@ namespace OpenRA.Mods.Common.Traits
 			isUpgraded = !isUpgraded;
 		}
 
-		bool OnValidTerrain()
+		bool IsOnValidTerrain()
+		{
+			return IsOnValidTerrainType() && IsOnValidRampType();
+		}
+
+		bool IsOnValidTerrainType()
 		{
 			if (!self.World.Map.Contains(self.Location))
 				return false;
@@ -156,6 +164,23 @@ namespace OpenRA.Mods.Common.Traits
 			return info.AllowedTerrainTypes.Contains(terrainType);
 		}
 
+		bool IsOnValidRampType()
+		{
+			if (info.CanDeployOnRamps)
+				return true;
+
+			var ramp = 0;
+			if (self.World.Map.Contains(self.Location))
+			{
+				var tile = self.World.Map.MapTiles.Value[self.Location];
+				var ti = self.World.TileSet.GetTileInfo(tile);
+				if (ti != null)
+					ramp = ti.RampType;
+			}
+
+			return ramp == 0;
+		}
+
 		void GrantUpgrades()
 		{
 			foreach (var up in info.Upgrades)