trimming 'using' crap

OpenRa.FileFormats/AudLoader.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
 
 namespace OpenRa.FileFormats

OpenRa.FileFormats/Blowfish.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenRa.FileFormats
 {

OpenRa.FileFormats/BlowfishKeyProvider.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Linq;
 
 namespace OpenRa.FileFormats

OpenRa.FileFormats/Dune2ShpReader.cs

@@ -1,10 +1,7 @@
-using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections;
-using System.IO;
 using System.Drawing;
+using System.IO;
 
 namespace OpenRa.FileFormats
 {

OpenRa.FileFormats/FileSystem.cs

@@ -1,8 +1,5 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
-using OpenRa.FileFormats;
 
 namespace OpenRa.FileFormats
 {

OpenRa.FileFormats/Folder.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 
 namespace OpenRa.FileFormats

OpenRa.FileFormats/Format2.cs

@@ -1,8 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace OpenRa.FileFormats
 {
 	public static class Format2

OpenRa.FileFormats/Format40.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
 
 namespace OpenRa.FileFormats
 {

OpenRa.FileFormats/Format80.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
 
 namespace OpenRa.FileFormats
 {

OpenRa.FileFormats/IniFile.cs

@@ -1,9 +1,8 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using System.Text.RegularExpressions;
-using System.Collections;
 
 namespace OpenRa.FileFormats
 {

OpenRa.FileFormats/IniWriter.cs

@@ -1,9 +1,6 @@
-using System;
+using System.IO;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Runtime.InteropServices;
-using System.IO;
+using System.Text;
 
 namespace OpenRa.FileFormats
 {

OpenRa.FileFormats/Map.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
-using System.Drawing;
+using System.Text;
-using System.Linq;
 
 namespace OpenRa.FileFormats
 {

OpenRa.FileFormats/Package.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
 using System.Linq;
 

OpenRa.FileFormats/PackageEntry.cs

@@ -1,7 +1,6 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
+using System.Text;
 
 namespace OpenRa.FileFormats
 {

OpenRa.FileFormats/Palette.cs

@@ -1,8 +1,6 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
-using System.IO;
 using System.Drawing;
+using System.IO;
 
 namespace OpenRa.FileFormats
 {

OpenRa.FileFormats/PaletteRemap.cs

@@ -1,8 +1,6 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
-using System.IO;
 using System.Drawing;
+using System.IO;
 
 namespace OpenRa.FileFormats
 {

OpenRa.FileFormats/ShpReader.cs

@@ -1,9 +1,7 @@
-using System;
+using System.Collections;
 using System.Collections.Generic;
-using System.Text;
 using System.Drawing;
 using System.IO;
-using System.Collections;
 
 namespace OpenRa.FileFormats
 {

OpenRa.FileFormats/Terrain.cs

@@ -1,8 +1,5 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
-using System.Drawing;
 
 namespace OpenRa.FileFormats
 {

OpenRa.FileFormats/TileReference.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace OpenRa.FileFormats
 {

OpenRa.FileFormats/TileSet.cs

@@ -1,8 +1,6 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
-using System.IO;
 using System.Globalization;
+using System.IO;
 
 namespace OpenRa.FileFormats
 {

OpenRa.FileFormats/TreeReference.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Drawing;
 
 namespace OpenRa.FileFormats

OpenRa.FileFormats/Walkability.cs

@@ -1,7 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
-using System.IO;
 using System.Text.RegularExpressions;
 
 namespace OpenRa.FileFormats

OpenRa.Game/Actor.cs

@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
+using System.Drawing;
 using System.Linq;
-using System.Text;
-using IjwFramework.Types;
-using OpenRa.FileFormats;
 using OpenRa.Game.GameRules;
 using OpenRa.Game.Graphics;
-using System.Drawing;
 using OpenRa.Game.Traits;
 using OpenRa.Game.Traits.Activities;
 
@@ -47,13 +43,6 @@ namespace OpenRa.Game
 					+ "; add Traits= to units.ini for appropriate unit" );
 		}
 
-		//public Actor( TreeReference tree, TreeCache treeRenderer )
-		//{
-		//    ActorID = 0xffffffff;
-		//    Location = new int2( tree.Location );
-		//    traits.Add( new Traits.Tree( treeRenderer.GetImage( tree.Image ) ) );
-		//}
-
 		public void Tick()
 		{
 			var nextActivity = currentActivity;

OpenRa.Game/BuildingInfluenceMap.cs

@@ -1,11 +1,5 @@
-using System;
+using IjwFramework.Types;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using OpenRa.Game.GameRules;
-using IjwFramework.Types;
-using IjwFramework.Collections;
-using OpenRa.Game.Graphics;
 using OpenRa.Game.Traits;
 
 namespace OpenRa.Game

OpenRa.Game/Bullet.cs

@@ -1,20 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using OpenRa.Game.GameRules;
-using IjwFramework.Types;
 using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game
 {
-	interface IEffect
-	{
-		void Tick();
-		IEnumerable<Tuple<Sprite, float2, int>> Render();
-		Player Owner { get; }
-	}
-
 	class Bullet : IEffect
 	{
 		public Player Owner { get; private set; }

OpenRa.Game/Chat.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using IjwFramework.Types;
 using System.Drawing;
 
 namespace OpenRa.Game

OpenRa.Game/Chrome.cs

@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
-using System.Text;
+using System.Windows.Forms;
+using IjwFramework.Collections;
+using IjwFramework.Types;
 using OpenRa.Game.Graphics;
 using OpenRa.Game.Support;
-using System.Drawing;
-using IjwFramework.Types;
-using IjwFramework.Collections;
-using System.Windows.Forms;
 
 namespace OpenRa.Game
 {

OpenRa.Game/Controller.cs

@@ -1,13 +1,10 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 using IjwFramework.Types;
-using System.Drawing;
-using OpenRa.Game.Traits;
-using OpenRa.Game.Graphics;
 using OpenRa.Game.GameRules;
+using OpenRa.Game.Graphics;
+using OpenRa.Game.Traits;
 
 namespace OpenRa.Game
 {

OpenRa.Game/Cursor.cs

@@ -1,9 +1,4 @@
-using System;
+using OpenRa.Game.Graphics;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using OpenRa.Game.Graphics;
-using System.IO;
 
 namespace OpenRa.Game
 {

OpenRa.Game/Explosion.cs

@@ -1,10 +1,5 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using OpenRa.Game.Graphics;
-using IjwFramework.Types;
-using OpenRa.Game.GameRules;
 
 namespace OpenRa.Game
 {

OpenRa.Game/Exts.cs

@@ -1,8 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace OpenRa.Game
 {
 	static class Exts

OpenRa.Game/Game.cs

@@ -2,16 +2,15 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using System.Net.Sockets;
 using IjwFramework.Collections;
 using IjwFramework.Types;
 using IrrKlang;
 using OpenRa.FileFormats;
 using OpenRa.Game.GameRules;
 using OpenRa.Game.Graphics;
-using OpenRa.Game.Traits;
 using OpenRa.Game.Support;
-using System.Net.Sockets;
+using OpenRa.Game.Traits;
-using System.Windows.Forms;
 
 namespace OpenRa.Game
 {

OpenRa.Game/GameRules/FieldLoader.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using OpenRa.FileFormats;
 
 namespace OpenRa.Game.GameRules

OpenRa.Game/GameRules/Footprint.cs

@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.IO;
-using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game.GameRules
 {

OpenRa.Game/GameRules/GeneralInfo.cs

@@ -1,8 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace OpenRa.Game.GameRules
 {
 	class GeneralInfo

OpenRa.Game/GameRules/ProjectileInfo.cs

@@ -1,8 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace OpenRa.Game.GameRules
 {
 	class ProjectileInfo

OpenRa.Game/GameRules/Rules.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using IjwFramework.Types;
 using OpenRa.FileFormats;
 using OpenRa.Game.GameRules;
-using IjwFramework.Types;
 
 namespace OpenRa.Game
 {

OpenRa.Game/GameRules/TechTree.cs

@@ -1,7 +1,5 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using IjwFramework.Collections;
 
 namespace OpenRa.Game.GameRules

OpenRa.Game/GameRules/UnitInfo.cs

@@ -1,10 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.Game.Graphics;
-using IjwFramework.Types;
-
 namespace OpenRa.Game.GameRules
 {
 	public enum ArmorType

OpenRa.Game/GameRules/WarheadInfo.cs

@@ -1,10 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using OpenRa.FileFormats;
-using OpenRa.Game.Graphics;
-
 namespace OpenRa.Game.GameRules
 {
 	class WarheadInfo

OpenRa.Game/GameRules/WeaponInfo.cs

@@ -1,9 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.Game.Graphics;
-
 namespace OpenRa.Game.GameRules
 {
 	class WeaponInfo

OpenRa.Game/Graphics/CursorSequence.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Xml;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml;
 
 namespace OpenRa.Game.Graphics
 {

OpenRa.Game/Graphics/CursorSheetBuilder.cs

@@ -1,7 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using OpenRa.FileFormats;
 
 namespace OpenRa.Game.Graphics

OpenRa.Game/Graphics/HardwarePalette.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Ijw.DirectX;
 using System.Drawing;
-using System.IO;
 using OpenRa.FileFormats;
 
 namespace OpenRa.Game.Graphics

OpenRa.Game/Graphics/LineRenderer.cs

@@ -1,10 +1,5 @@
-using System;
+using System.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Ijw.DirectX;
-using System.Runtime.InteropServices;
-using System.Drawing;
 
 namespace OpenRa.Game.Graphics
 {

OpenRa.Game/Graphics/OverlayRenderer.cs

@@ -1,7 +1,4 @@
-using System;
+using System.Linq;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using OpenRa.FileFormats;
 
 namespace OpenRa.Game.Graphics

OpenRa.Game/Graphics/Renderer.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Drawing;
 using System.Windows.Forms;
 using Ijw.DirectX;

OpenRa.Game/Graphics/SequenceProvider.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using System.Xml;
 using System.Linq;
+using System.Xml;
 using OpenRa.FileFormats;
 
 namespace OpenRa.Game.Graphics

OpenRa.Game/Graphics/Sheet.cs

@@ -1,8 +1,6 @@
 using System.Drawing;
-using System.IO;
 using Ijw.DirectX;
 using OpenRa.FileFormats;
-using System.Drawing.Imaging;
 
 namespace OpenRa.Game.Graphics
 {

OpenRa.Game/Graphics/SheetBuilder.cs

@@ -25,14 +25,6 @@ namespace OpenRa.Game.Graphics
 			return Add(data, size);
 		}
 
-		public static void ForceNewSheet()
-		{
-			if( p == Point.Empty )
-				return;
-			current = NewSheet();
-			channel = NextChannel(null);
-		}
-
 		static Sheet NewSheet() { return new Sheet( renderer, new Size( Renderer.SheetSize, Renderer.SheetSize ) ); }
 
 		static Renderer renderer;

OpenRa.Game/Graphics/Sprite.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Drawing;
 
 namespace OpenRa.Game.Graphics

OpenRa.Game/Graphics/SpriteRenderer.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using OpenRa.FileFormats;
-using System.Drawing;
 using Ijw.DirectX;
 
 namespace OpenRa.Game.Graphics

OpenRa.Game/Graphics/TerrainRenderer.cs

@@ -1,5 +1,4 @@
-using System.Drawing;
+using System.Drawing;
-using System.Windows.Forms;
 using Ijw.DirectX;
 using IjwFramework.Collections;
 using OpenRa.FileFormats;
@@ -22,8 +21,6 @@ namespace OpenRa.Game.Graphics
 			this.map = map;
 
 			Size tileSize = new Size( Game.CellSize, Game.CellSize );
-
-	//		SheetBuilder.ForceNewSheet();
 
 			var tileMapping = new Cache<TileReference, Sprite>(
 				x => SheetBuilder.Add(Rules.TileSet.GetBytes(x), tileSize));

OpenRa.Game/Graphics/Viewport.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System;
 using System.Linq;
 
 namespace OpenRa.Game.Graphics

OpenRa.Game/IEffect.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using OpenRa.Game.Graphics;
+
+namespace OpenRa.Game
+{
+	interface IEffect
+	{
+		void Tick();
+		IEnumerable<Tuple<Sprite, float2, int>> Render();
+		Player Owner { get; }
+	}
+}

OpenRa.Game/IOrderGenerator.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace OpenRa.Game
 {

OpenRa.Game/MainWindow.cs

@@ -1,11 +1,10 @@
+using System;
 using System.Drawing;
+using System.IO;
+using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using OpenRa.FileFormats;
 using OpenRa.Game.Graphics;
-using System.Runtime.InteropServices;
-using OpenRa.Game.Traits;
-using System.IO;
-using System;
 
 namespace OpenRa.Game
 {

OpenRa.Game/OpenRa.Game.csproj

@@ -82,6 +82,7 @@
     <Compile Include="Exts.cs" />
     <Compile Include="GameRules\GeneralInfo.cs" />
     <Compile Include="GameRules\TechTree.cs" />
+    <Compile Include="IEffect.cs" />
     <Compile Include="IOrderSource.cs" />
     <Compile Include="LocalOrderSource.cs" />
     <Compile Include="NetworkOrderSource.cs" />

OpenRa.Game/Order.cs

@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Linq;
-using OpenRa.Game.Traits;
 using System.IO;
+using System.Linq;
 
 namespace OpenRa.Game
 {

OpenRa.Game/OrderIO.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
 
 namespace OpenRa.Game

OpenRa.Game/Smudge.cs

@@ -1,8 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace OpenRa.Game
 {
 	static class Smudge

OpenRa.Game/Support/Log.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 
 namespace OpenRa.Game

OpenRa.Game/Support/PerfHistory.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using IjwFramework.Collections;
 using System.Drawing;
+using System.Linq;
+using IjwFramework.Collections;
 using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game.Support

OpenRa.Game/Support/Program.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
+using System.Diagnostics;
-using System.Windows.Forms;
-using System.IO;
 
 namespace OpenRa.Game
 {
@@ -10,7 +8,7 @@ namespace OpenRa.Game
 		[STAThread]
 		static void Main( string[] args )
 		{
-			if( System.Diagnostics.Debugger.IsAttached )
+			if( Debugger.IsAttached )
 			{
 				Run( args );
 				return;

OpenRa.Game/Support/Stopwatch.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Runtime.InteropServices;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Runtime.InteropServices;
 
 namespace OpenRa.Game.Support
 {

OpenRa.Game/Traits/AcceptsOre.cs

@@ -1,7 +1,4 @@
-using System;
+using OpenRa.Game.Traits.Activities;
-using System.Collections.Generic;
-using System.Linq;
-using OpenRa.Game.Traits.Activities;
 
 namespace OpenRa.Game.Traits
 {
@@ -9,17 +6,16 @@ namespace OpenRa.Game.Traits
 	{
 		public AcceptsOre(Actor self)
 		{
-		//	if (!Game.skipMakeAnims)
+			Game.world.AddFrameEndTask(
-				Game.world.AddFrameEndTask(
+				w =>
-					w =>
+				{		/* create the free harvester! */
-					{		/* create the free harvester! */
+					var harvester = new Actor("harv", self.Location + new int2(1, 2), self.Owner);
-						var harvester = new Actor("harv", self.Location + new int2(1, 2), self.Owner);
+					var unit = harvester.traits.Get<Unit>();
-						var unit = harvester.traits.Get<Unit>();
+					var mobile = harvester.traits.Get<Mobile>();
-						var mobile = harvester.traits.Get<Mobile>();
+					unit.Facing = 64;
-						unit.Facing = 64;
+					harvester.QueueActivity(new Harvest());
-						harvester.QueueActivity(new Harvest());
+					w.Add(harvester);
-						w.Add(harvester);
+				});
-					});
 		}
 	}
 }

OpenRa.Game/Traits/Activities/Attack.cs

@@ -1,7 +1,4 @@
-using System;
+using System.Linq;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OpenRa.Game.Traits.Activities
 {

OpenRa.Game/Traits/Activities/DeliverOre.cs

@@ -1,7 +1,4 @@
-using System;
+using System.Linq;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OpenRa.Game.Traits.Activities
 {

OpenRa.Game/Traits/Activities/DeployMcv.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OpenRa.Game.Traits.Activities
 {

OpenRa.Game/Traits/Activities/Follow.cs

@@ -1,8 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace OpenRa.Game.Traits.Activities
 {
 	class Follow : IActivity

OpenRa.Game/Traits/Activities/Harvest.cs

@@ -1,7 +1,4 @@
-using System;
+using System.Linq;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OpenRa.Game.Traits.Activities
 {

OpenRa.Game/Traits/Activities/IActivity.cs

@@ -1,8 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace OpenRa.Game.Traits.Activities
 {
 	interface IActivity

OpenRa.Game/Traits/Activities/Move.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using OpenRa.Game.GameRules;
-using System.Diagnostics;
 
 namespace OpenRa.Game.Traits.Activities
 {

OpenRa.Game/Traits/Activities/Turn.cs

@@ -1,8 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace OpenRa.Game.Traits.Activities
 {
 	class Turn : IActivity

OpenRa.Game/Traits/Building.cs

@@ -1,8 +1,4 @@
-using System;
+using OpenRa.Game.GameRules;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using OpenRa.Game.GameRules;
 
 namespace OpenRa.Game.Traits
 {

OpenRa.Game/Traits/Harvester.cs

@@ -1,8 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace OpenRa.Game.Traits
 {
 	class Harvester : IOrder

OpenRa.Game/Traits/Helicopter.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using OpenRa.Game.GameRules;
 
 namespace OpenRa.Game.Traits

OpenRa.Game/Traits/InfantrySquad.cs

@@ -1,10 +1,7 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using OpenRa.Game.Graphics;
-using IjwFramework.Types;
 using OpenRa.Game.GameRules;
+using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game.Traits
 {

OpenRa.Game/Traits/McvDeploy.cs

@@ -1,8 +1,4 @@
-using System;
+using OpenRa.Game.GameRules;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using OpenRa.Game.GameRules;
 
 namespace OpenRa.Game.Traits
 {

OpenRa.Game/Traits/Mobile.cs

@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using OpenRa.Game.GameRules;
-using OpenRa.Game.Graphics;
-using OpenRa.Game.Traits.Activities;
 
 namespace OpenRa.Game.Traits
 {

OpenRa.Game/Traits/Production.cs

@@ -1,8 +1,4 @@
-using System;
+using OpenRa.Game.GameRules;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using OpenRa.Game.GameRules;
 
 namespace OpenRa.Game.Traits
 {

OpenRa.Game/Traits/RallyPoint.cs

@@ -1,10 +1,5 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using IjwFramework.Types;
 using OpenRa.Game.Graphics;
-using OpenRa.Game.GameRules;
 
 namespace OpenRa.Game.Traits
 {

OpenRa.Game/Traits/RenderBuilding.cs

@@ -1,12 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using IjwFramework.Types;
 using OpenRa.Game.Graphics;
-using OpenRa.Game.GameRules;
-using OpenRa.FileFormats;
-using OpenRa.Game;
 
 namespace OpenRa.Game.Traits
 {

OpenRa.Game/Traits/RenderBuildingOre.cs

@@ -1,8 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace OpenRa.Game.Traits
 {
 	class RenderBuildingOre : RenderBuilding

OpenRa.Game/Traits/RenderBuildingTurreted.cs

@@ -1,8 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace OpenRa.Game.Traits
 {
 	class RenderBuildingTurreted : RenderBuilding

OpenRa.Game/Traits/RenderBuildingWarFactory.cs

@@ -1,9 +1,5 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using OpenRa.Game.Graphics;
-using IjwFramework.Types;
 
 namespace OpenRa.Game.Traits
 {

OpenRa.Game/Traits/RenderSimple.cs

@@ -1,9 +1,5 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using OpenRa.Game.Graphics;
-using IjwFramework.Types;
 
 namespace OpenRa.Game.Traits
 {

OpenRa.Game/Traits/RenderUnit.cs

@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using OpenRa.Game.Graphics;
-using IjwFramework.Types;
 
 namespace OpenRa.Game.Traits
 {

OpenRa.Game/Traits/RenderUnitMuzzleFlash.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game.Traits

OpenRa.Game/Traits/RenderUnitReload.cs

@@ -1,7 +1,4 @@
-using System;
+using System.Linq;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace OpenRa.Game.Traits
 {

OpenRa.Game/Traits/RenderUnitRotor.cs

@@ -1,7 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using IjwFramework.Types;
 using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game.Traits

OpenRa.Game/Traits/RenderUnitSpinner.cs

@@ -1,7 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game.Traits

OpenRa.Game/Traits/RenderUnitTurreted.cs

@@ -1,9 +1,6 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using OpenRa.Game.Graphics;
-using IjwFramework.Types;
 
 namespace OpenRa.Game.Traits
 {

OpenRa.Game/Traits/SeedsOre.cs

@@ -1,15 +1,11 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace OpenRa.Game.Traits
 {
 	class SeedsOre : ITick
 	{
 		public SeedsOre( Actor self ) {}
 
-		const double OreSeedProbability = .05;
+		const double OreSeedProbability = .05;	// todo: push this out into rules
 
 		public void Tick(Actor self)
 		{

OpenRa.Game/Traits/TraitsInterfaces.cs

@@ -1,10 +1,6 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using OpenRa.Game.Graphics;
-using IjwFramework.Types;
 using OpenRa.Game.GameRules;
+using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game.Traits
 {

OpenRa.Game/Traits/Tree.cs

@@ -1,9 +1,5 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using OpenRa.Game.Graphics;
-using IjwFramework.Types;
 
 namespace OpenRa.Game.Traits
 {

OpenRa.Game/Traits/Turreted.cs

@@ -1,8 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace OpenRa.Game.Traits
 {
 	class Turreted : ITick

OpenRa.Game/Traits/Unit.cs

@@ -1,8 +1,4 @@
-using System;
+
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace OpenRa.Game.Traits
 {
 	class Unit

OpenRa.Game/Traits/Util.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using IjwFramework.Types;
 using OpenRa.Game.Graphics;
 
 namespace OpenRa.Game.Traits