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

Merge pull request #12860 from abcdefg30/removeGroupProxy

Browse Source 
Remove the dead ActorGroupProxy trait
This commit is contained in:
reaperrr
2017-03-18 14:04:28 +01:00
committed by GitHub
parent d0e859cbeb 880f90345e
commit 02b82ae344
10 changed files with 4 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -371,7 +371,6 @@
<Compile Include="Traits\PaletteEffects\FlashPaletteEffect.cs" />
<Compile Include="Traits\PaletteEffects\MenuPaletteEffect.cs" />
<Compile Include="Traits\PaletteEffects\RotationPaletteEffect.cs" />
<Compile Include="Traits\Player\ActorGroupProxy.cs" />
<Compile Include="Traits\Player\AllyRepair.cs" />
<Compile Include="Traits\Player\BaseAttackNotifier.cs" />
<Compile Include="Traits\Player\ClassicProductionQueue.cs" />

37
OpenRA.Mods.Common/Traits/Player/ActorGroupProxy.cs
View File

@@ -1,37 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using System.Globalization;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Part of the unfinished group-movement system. Attach this to the player actor.")]
class ActorGroupProxyInfo : TraitInfo<ActorGroupProxy> { }
class ActorGroupProxy : IResolveOrder
{
public void ResolveOrder(Actor self, Order order)
{
if (order.OrderString == "CreateGroup")
{
/* create a group */
var actors = order.TargetString.Split(',')
.Select(id => uint.Parse(id, NumberStyles.Any, NumberFormatInfo.InvariantInfo))
.Select(id => self.World.GetActorById(id))
.Where(a => a != null);
new Group(actors);
}
}
}
}

4
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -578,6 +578,10 @@ namespace OpenRA.Mods.Common.UtilityCommands
if (node.Key.StartsWith("UncloakOn", StringComparison.Ordinal))
node.Value.Value = node.Value.Value.Replace("Damage", "Damage, Heal, SelfHeal");
// Removed dead ActorGroupProxy trait
if (engineVersion < 20170318)
node.Value.Nodes.RemoveAll(n => n.Key == "ActorGroupProxy");
UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
}