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

Add a CanDeployOnRamps property to DeployToUpgrade

Browse Source
This commit is contained in:
Pavel Penev
2015-10-09 16:36:34 +03:00
parent 50679cd6c4
commit db609b12a0
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenRA.Mods.Common/Traits/Upgrades/DeployToUpgrade.cs
View File

@@ -28,6 +28,9 @@ namespace OpenRA.Mods.Common.Traits
"Leave empty to allow any.")] "Leave empty to allow any.")]
public readonly HashSet<string> AllowedTerrainTypes = new HashSet<string>(); 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.")] [Desc("Cursor to display when able to (un)deploy the actor.")]
public readonly string DeployCursor = "deploy"; public readonly string DeployCursor = "deploy";
@@ -73,7 +76,7 @@ namespace OpenRA.Mods.Common.Traits
public IEnumerable<IOrderTargeter> Orders public IEnumerable<IOrderTargeter> Orders
{ {
get { yield return new DeployOrderTargeter("DeployToUpgrade", 5, 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) public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
@@ -89,7 +92,7 @@ namespace OpenRA.Mods.Common.Traits
if (order.OrderString != "DeployToUpgrade") if (order.OrderString != "DeployToUpgrade")
return; return;
if (!OnValidTerrain()) if (!IsOnValidTerrain())
return; return;
if (isUpgraded) if (isUpgraded)
@@ -141,7 +144,12 @@ namespace OpenRA.Mods.Common.Traits
isUpgraded = !isUpgraded; isUpgraded = !isUpgraded;
} }
bool OnValidTerrain() bool IsOnValidTerrain()
{
return IsOnValidTerrainType() && IsOnValidRampType();
}
bool IsOnValidTerrainType()
{ {
if (!self.World.Map.Contains(self.Location)) if (!self.World.Map.Contains(self.Location))
return false; return false;
@@ -156,6 +164,23 @@ namespace OpenRA.Mods.Common.Traits
return info.AllowedTerrainTypes.Contains(terrainType); 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() void GrantUpgrades()
{ {
foreach (var up in info.Upgrades) foreach (var up in info.Upgrades)