Remove bogus WorldGameOver trait.

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -305,7 +305,6 @@
     <Compile Include="World\SmudgeLayer.cs" />
     <Compile Include="Scripting\Media.cs" />
     <Compile Include="OpenWidgetAtGameStart.cs" />
-    <Compile Include="World\WorldGameOver.cs" />
     <Compile Include="ServerTraits\MasterServerPinger.cs" />
     <Compile Include="ServerTraits\PlayerCommands.cs" />
     <Compile Include="ServerTraits\LobbyCommands.cs" />

OpenRA.Mods.RA/World/WorldGameOver.cs

@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using OpenRA.Traits;
-
-namespace OpenRA.Mods.RA
-{
-	class WorldGameOverInfo : TraitInfo<WorldGameOver>
-	{
-		public readonly bool ReturnToLobby = false;
-		public readonly int Delay = 30;
-		public readonly string EndMessage = "The game will end in {0} seconds.";
-	}
-
-	class WorldGameOver : ITick
-	{
-		public WorldGameOverInfo Info = null;
-		int? _delayLeft = null;
-
-		public void Tick(Actor self)
-		{
-			if (Info == null)
-				Info = self.Info.Traits.GetOrDefault<WorldGameOverInfo>();
-
-			if (Info == null || !Info.ReturnToLobby)
-				return;
-
-			// See if there is anyone left who hasnt won / lost (if not, means game over)
-			if (!self.World.players.Any(p => !p.Value.NonCombatant && p.Value.WinState == WinState.Undefined))
-			{
-				if (_delayLeft == null)
-				{
-					_delayLeft = Info.Delay * 25;
-					if (Info.EndMessage.Trim() != "" && Info.EndMessage.Contains("{0}"))
-					Game.AddChatLine(Color.Green, "",
-						Info.EndMessage.Trim().F( ((int)(_delayLeft / 25)) + ""));
-					else if (Info.EndMessage.Trim() != "")
-						Game.AddChatLine(Color.Green, "",Info.EndMessage.Trim());
-				}
-
-				_delayLeft--;
-
-				if (_delayLeft <= 0 )
-					Game.RejoinLobby(self.World);
-			}
-		}
-	}
-}

mods/ra/rules/system.yaml

@@ -224,10 +224,6 @@ World:
 		BinSize: 4
 	Shroud:
 	PathFinder:
-	WorldGameOver:
-		Delay: 10
-		ReturnToLobby: yes
-		EndMessage: The game will end in {0} seconds.
 	ValidateOrder:
 	GotoNextBase: