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

Merge pull request #10210 from pchote/other-enter-traits

Browse Source 
Add enter behaviour field to Infiltrates/EngineerRepair/RepairsBridges.
This commit is contained in:
Matthias Mailänder
2016-01-01 12:01:26 +01:00
parent b3c474ebf9 5b99a0c2da
commit be235eb9fb
12 changed files with 64 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/EngineerRepair.cs
View File

@@ -21,6 +21,10 @@ namespace OpenRA.Mods.Common.Traits
{
[VoiceReference] public readonly string Voice = "Action";
[Desc("Behaviour when entering the structure.",
"Possible values are Exit, Suicide, Dispose.")]
public readonly EnterBehaviour EnterBehaviour = EnterBehaviour.Dispose;
public object Create(ActorInitializer init) { return new EngineerRepair(init, this); }
}
@@ -91,7 +95,7 @@ namespace OpenRA.Mods.Common.Traits
self.CancelActivity();
self.SetTargetLine(target, Color.Yellow);
self.QueueActivity(new RepairBuilding(self, target.Actor));
self.QueueActivity(new RepairBuilding(self, target.Actor, info.EnterBehaviour));
}
class EngineerRepairOrderTargeter : UnitOrderTargeter

6
OpenRA.Mods.Common/Traits/RepairsBridges.cs
View File

@@ -21,6 +21,10 @@ namespace OpenRA.Mods.Common.Traits
{
[VoiceReference] public readonly string Voice = "Action";
[Desc("Behaviour when entering the structure.",
"Possible values are Exit, Suicide, Dispose.")]
public readonly EnterBehaviour EnterBehaviour = EnterBehaviour.Dispose;
public object Create(ActorInitializer init) { return new RepairsBridges(this); }
}
@@ -72,7 +76,7 @@ namespace OpenRA.Mods.Common.Traits
self.SetTargetLine(Target.FromOrder(self.World, order), Color.Yellow);
self.CancelActivity();
self.QueueActivity(new RepairBridge(self, order.TargetActor));
self.QueueActivity(new RepairBridge(self, order.TargetActor, info.EnterBehaviour));
}
}