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

Merge pull request #11014 from dtluna/can_undeploy

Browse Source 
Added CanUndeploy property
This commit is contained in:
Matthias Mailänder
2016-04-17 10:37:44 +02:00
parent e127ada598 cf0a4bc21f
commit 3d1fadf24a
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,6 +53,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Sound to play when undeploying.")] [Desc("Sound to play when undeploying.")]
public readonly string UndeploySound = null; public readonly string UndeploySound = null;
[Desc("Can this actor undeploy?")]
public readonly bool CanUndeploy = true;
public object Create(ActorInitializer init) { return new DeployToUpgrade(init, this); } public object Create(ActorInitializer init) { return new DeployToUpgrade(init, this); }
} }
@@ -112,7 +115,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,
() => IsOnValidTerrain() ? info.DeployCursor : info.DeployBlockedCursor); } () => IsCursorBlocked() ? info.DeployBlockedCursor : info.DeployCursor); }
} }
public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued) public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
@@ -131,7 +134,7 @@ namespace OpenRA.Mods.Common.Traits
if (!order.Queued) if (!order.Queued)
self.CancelActivity(); self.CancelActivity();
if (deployState == DeployState.Deployed) if (deployState == DeployState.Deployed && info.CanUndeploy)
{ {
self.QueueActivity(new CallFunc(Undeploy)); self.QueueActivity(new CallFunc(Undeploy));
} }
@@ -145,6 +148,11 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
bool IsCursorBlocked()
{
return ((deployState == DeployState.Deployed) && !info.CanUndeploy) || (!IsOnValidTerrain() && (deployState != DeployState.Deployed));
}
bool IsOnValidTerrain() bool IsOnValidTerrain()
{ {
return IsOnValidTerrainType() && IsOnValidRampType(); return IsOnValidTerrainType() && IsOnValidRampType();