diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs index a12662d29e..1192346848 100644 --- a/OpenRA.Game/Actor.cs +++ b/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; } diff --git a/OpenRA.Game/Group.cs b/OpenRA.Game/Group.cs deleted file mode 100644 index 94d18a7a4e..0000000000 --- a/OpenRA.Game/Group.cs +++ /dev/null @@ -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 Actors { get { return actors; } } - - public Group(IEnumerable 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 */ - } -} diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index 30a49ca89d..183b49ddac 100644 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -124,7 +124,6 @@ - diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index fc98f2f131..2c89600621 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -371,7 +371,6 @@ - diff --git a/OpenRA.Mods.Common/Traits/Player/ActorGroupProxy.cs b/OpenRA.Mods.Common/Traits/Player/ActorGroupProxy.cs deleted file mode 100644 index 59abedbd4f..0000000000 --- a/OpenRA.Mods.Common/Traits/Player/ActorGroupProxy.cs +++ /dev/null @@ -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 { } - - 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); - } - } - } -} diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index 3d2727d883..310d07f40d 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/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); } diff --git a/mods/cnc/rules/player.yaml b/mods/cnc/rules/player.yaml index 1abb134acd..29639a1ae3 100644 --- a/mods/cnc/rules/player.yaml +++ b/mods/cnc/rules/player.yaml @@ -9,7 +9,6 @@ Player: PowerManager: AllyRepair: PlayerResources: - ActorGroupProxy: DeveloperMode: BaseAttackNotifier: Shroud: diff --git a/mods/d2k/rules/player.yaml b/mods/d2k/rules/player.yaml index 3cab2f57e6..3b847d703e 100644 --- a/mods/d2k/rules/player.yaml +++ b/mods/d2k/rules/player.yaml @@ -62,7 +62,6 @@ Player: PlayerResources: SelectableCash: 2500, 5000, 7000, 10000, 20000 InsufficientFundsNotification: InsufficientFunds - ActorGroupProxy: DeveloperMode: BaseAttackNotifier: Shroud: diff --git a/mods/ra/rules/player.yaml b/mods/ra/rules/player.yaml index 366cafcc6f..7656176580 100644 --- a/mods/ra/rules/player.yaml +++ b/mods/ra/rules/player.yaml @@ -41,7 +41,6 @@ Player: AllyRepair: PlayerResources: InsufficientFundsNotification: InsufficientFunds - ActorGroupProxy: DeveloperMode: GpsWatcher: Shroud: diff --git a/mods/ts/rules/player.yaml b/mods/ts/rules/player.yaml index 61fa7f4d64..d51bb0a005 100644 --- a/mods/ts/rules/player.yaml +++ b/mods/ts/rules/player.yaml @@ -41,7 +41,6 @@ Player: AllyRepair: PlayerResources: InsufficientFundsNotification: InsufficientFunds - ActorGroupProxy: DeveloperMode: Enabled: true Shroud: