Merge pull request #12860 from abcdefg30/removeGroupProxy

Remove the dead ActorGroupProxy trait

OpenRA.Game/Actor.cs

@@ -45,7 +45,6 @@ namespace OpenRA
 
 		public Activity CurrentActivity { get; private set; }
 
-		public Group Group;
 		public int Generation;
 
 		public Rectangle Bounds { get; private set; }

OpenRA.Game/Group.cs

@@ -1,45 +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.Collections.Generic;
-using System.Linq;
-
-namespace OpenRA
-{
-	public class Group
-	{
-		readonly Actor[] actors;
-		readonly int id;
-
-		static int nextGroup;
-
-		public IEnumerable<Actor> Actors { get { return actors; } }
-
-		public Group(IEnumerable<Actor> actors)
-		{
-			this.actors = actors.ToArray();
-
-			foreach (var a in actors)
-				a.Group = this;
-
-			id = nextGroup++;
-		}
-
-		public void Dump()
-		{
-			/* debug crap */
-			Game.Debug("Group #{0}: {1}".F(
-				id, actors.Select(a => "#{0} {1}".F(a.ActorID, a.Info.Name)).JoinWith(",")));
-		}
-
-		/* TODO: add lazy group path crap, groupleader, pruning, etc */
-	}
-}

OpenRA.Game/OpenRA.Game.csproj

@@ -124,7 +124,6 @@
     <Compile Include="Graphics\Util.cs" />
     <Compile Include="Graphics\Viewport.cs" />
     <Compile Include="Graphics\WorldRenderer.cs" />
-    <Compile Include="Group.cs" />
     <Compile Include="IUtilityCommand.cs" />
     <Compile Include="ModData.cs" />
     <Compile Include="Network\Connection.cs" />

OpenRA.Mods.Common/OpenRA.Mods.Common.csproj

@@ -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" />

OpenRA.Mods.Common/Traits/Player/ActorGroupProxy.cs

@@ -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);
-			}
-		}
-	}
-}

OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs

@@ -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);
 			}
 

mods/cnc/rules/player.yaml

@@ -9,7 +9,6 @@ Player:
 	PowerManager:
 	AllyRepair:
 	PlayerResources:
-	ActorGroupProxy:
 	DeveloperMode:
 	BaseAttackNotifier:
 	Shroud:

mods/d2k/rules/player.yaml

@@ -62,7 +62,6 @@ Player:
 	PlayerResources:
 		SelectableCash: 2500, 5000, 7000, 10000, 20000
 		InsufficientFundsNotification: InsufficientFunds
-	ActorGroupProxy:
 	DeveloperMode:
 	BaseAttackNotifier:
 	Shroud:

mods/ra/rules/player.yaml

@@ -41,7 +41,6 @@ Player:
 	AllyRepair:
 	PlayerResources:
 		InsufficientFundsNotification: InsufficientFunds
-	ActorGroupProxy:
 	DeveloperMode:
 	GpsWatcher:
 	Shroud:

mods/ts/rules/player.yaml

@@ -41,7 +41,6 @@ Player:
 	AllyRepair:
 	PlayerResources:
 		InsufficientFundsNotification: InsufficientFunds
-	ActorGroupProxy:
 	DeveloperMode:
 		Enabled: true
 	Shroud: