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

Merge pull request #3233 from ScottNZ/follow

Browse Source 
Add unit following/guarding
This commit is contained in:
Chris Forbes
2013-05-16 14:02:32 -07:00
parent 3f1805c1ea 6e5d58379f
commit 8b4814e399
9 changed files with 154 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Widgets/Logic/SettingsMenuLogic.cs
View File

@@ -208,6 +208,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic
SetupKeyBinding(deployKey, "Deploy:", () => keyConfig.DeployKey, k => keyConfig.DeployKey = k);
unitCommandHotkeyList.AddChild(deployKey);
var guardKey = ScrollItemWidget.Setup(unitCommandHotkeyTemplate, () => false, () => { });
SetupKeyBinding(guardKey, "Guard: ", () => keyConfig.GuardKey, k => keyConfig.GuardKey = k);
unitCommandHotkeyList.AddChild(guardKey);
// Debug
var debug = bg.Get("DEBUG_PANE");

22
OpenRA.Mods.RA/Widgets/WorldCommandWidget.cs
View File

@@ -70,6 +70,9 @@ namespace OpenRA.Mods.RA.Widgets
if (e.KeyName == Game.Settings.Keys.StanceCycleKey)
return PerformStanceCycle();
if (e.KeyName == Game.Settings.Keys.GuardKey)
return PerformGuard();
}
return false;
@@ -79,12 +82,11 @@ namespace OpenRA.Mods.RA.Widgets
bool PerformAttackMove()
{
var actors = World.Selection.Actors
.Where(a => a.Owner == World.LocalPlayer).ToArray();
var actors = World.Selection.Actors.Where(a => a.Owner == World.LocalPlayer).ToArray();
if (actors.Length > 0)
World.OrderGenerator = new GenericSelectTarget(actors, "AttackMove",
"attackmove", Game.mouseButtonPreference.Action);
if (actors.Any())
World.OrderGenerator = new GenericSelectTarget(actors,
"AttackMove", "attackmove", Game.mouseButtonPreference.Action);
return true;
}
@@ -146,6 +148,16 @@ namespace OpenRA.Mods.RA.Widgets
return true;
}
bool PerformGuard()
{
var actors = World.Selection.Actors.Where(a => a.Owner == World.LocalPlayer && a.HasTrait<Guard>());
if (actors.Any())
World.OrderGenerator = new GuardOrderGenerator(actors);
return true;
}
bool CycleBases()
{
var bases = World.ActorsWithTrait<BaseBuilding>()