Merge pull request #10213 from obrakmann/fix9851_prep-edition

[prep] Fix AttackMove not working properly under certain conditions

.travis.yml

@@ -2,7 +2,7 @@
 # see travis-ci.org for details
 
 language: csharp
-mono: 3.12.0
+mono: 4.0.0
 
 # http://docs.travis-ci.com/user/migrating-from-legacy
 sudo: false
@@ -14,6 +14,7 @@ cache:
 addons:
   apt:
     packages:
+    - lua5.1
     - nsis
     - nsis-common
     - dpkg
@@ -31,6 +32,7 @@ script:
  - travis_retry make all-dependencies
  - make all
  - make check
+ - make check-scripts
  - make test
 
 # Automatically update the trait documentation and Lua API

AUTHORS

@@ -35,13 +35,16 @@ Also thanks to:
     * Arik Lirette (Angusm3)
     * Barnaby Smith (mvi)
     * Bellator
+    * Biofreak
     * Braxton Williams (Buddytex)
     * Bryan Wilbur
     * Bugra Cuhadaroglu (BugraC)
     * Christer Ulfsparre (Holloweye)
     * Chris Grant (Unit158)
+    * clem
     * Cody Brittain (Generalcamo)
     * D2k Sardaukar
+    * D'Arcy Rush (r34ch)
     * Daniel Derejvanik (Harisson)
     * Danny Keary (Dan9550)
     * David Jiménez (Rydra)
@@ -50,6 +53,7 @@ Also thanks to:
     * Dmitri Suvorov (suvjunmd)
     * Erasmus Schroder (rasco)
     * Eric Bajumpaa (SteelPhase)
+    * Evgeniy Sergeev (evgeniysergeev)
     * Fahrradkette
     * Frank Razenberg (zzattack)
     * Gareth Needham (Ripley`)
@@ -58,17 +62,20 @@ Also thanks to:
     * Gordon Martin (Happy0)
     * Guido Lipke (LipkeGu)
     * Gyula Zimmermann (Graion Dilach)
+    * Hervé Matysiak (Herve-M)
     * Huw Pascoe
     * Ian T. Jacobsen (Smilex)
     * Imago
     * Iran
     * Jacob Dufault (jacobdufault)
     * James Dunne (jsd)
+    * James Gilbert (DSUK)
     * Jan-Willem Buurlage (jwbuurlage)
     * Jason (atlimit8)
     * Jeff Harris (jeff_1amstudios)
     * Jes
     * Joakim Lindberg (booom3)
+    * Joppy Furr
     * Kanar
     * Kenny Hoxworth (hoxworth)
     * Krishnakanth Mallik
@@ -150,6 +157,9 @@ Motmans and distributed under the MIT license.
 Using ICSharpCode.SharpZipLib initially by Mike
 Krueger and distributed under the GNU GPL terms.
 
+Using SmartIrc4Net developed by Mirco Bauer
+distributed under the LGPL version 2.1 or later.
+
 
 Finally, special thanks goes to the original teams
 at Westwood Studios and EA for creating the classic

Makefile

@@ -40,7 +40,7 @@
 CSC         = dmcs
 CSFLAGS     = -nologo -warn:4 -codepage:utf8 -unsafe -warnaserror
 DEFINE      = TRACE
-COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/Mono.Nat.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/MaxMind.GeoIP2.dll thirdparty/download/Eluant.dll
+COMMON_LIBS = System.dll System.Core.dll System.Data.dll System.Data.DataSetExtensions.dll System.Drawing.dll System.Xml.dll thirdparty/download/ICSharpCode.SharpZipLib.dll thirdparty/download/FuzzyLogicLibrary.dll thirdparty/download/Mono.Nat.dll thirdparty/download/MaxMind.Db.dll thirdparty/download/MaxMind.GeoIP2.dll thirdparty/download/Eluant.dll thirdparty/download/SmarIrc4net.dll
 
 DEBUG = true
 ifeq ($(DEBUG), $(filter $(DEBUG),false no n off 0))
@@ -79,7 +79,7 @@ INSTALL_PROGRAM = $(INSTALL) -m755
 INSTALL_DATA = $(INSTALL) -m644
 
 # program targets
-CORE = rsdl2 rnull game utility
+CORE = pdefault pnull game utility
 TOOLS = gamemonitor
 VERSION     = $(shell git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo git-`git rev-parse --short HEAD`)
 
@@ -100,25 +100,25 @@ endif
 game_SRCS := $(shell find OpenRA.Game/ -iname '*.cs')
 game_TARGET = OpenRA.Game.exe
 game_KIND = winexe
-game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/download/SDL2-CS.dll thirdparty/download/SharpFont.dll
+game_LIBS = $(COMMON_LIBS) $(game_DEPS) thirdparty/download/SharpFont.dll
 game_FLAGS = -win32icon:OpenRA.Game/OpenRA.ico
 PROGRAMS += game
 game: $(game_TARGET)
 
-# Renderer dlls
-rsdl2_SRCS := $(shell find OpenRA.Renderer.Sdl2/ -iname '*.cs')
-rsdl2_TARGET = OpenRA.Renderer.Sdl2.dll
-rsdl2_KIND = library
-rsdl2_DEPS = $(game_TARGET)
-rsdl2_LIBS = $(COMMON_LIBS) thirdparty/download/SDL2-CS.dll $(rsdl2_DEPS)
+# Platform dlls
+pdefault_SRCS := $(shell find OpenRA.Platforms.Default/ -iname '*.cs')
+pdefault_TARGET = OpenRA.Platforms.Default.dll
+pdefault_KIND = library
+pdefault_DEPS = $(game_TARGET)
+pdefault_LIBS = $(COMMON_LIBS) thirdparty/download/SDL2-CS.dll $(pdefault_DEPS)
 
-rnull_SRCS := $(shell find OpenRA.Renderer.Null/ -iname '*.cs')
-rnull_TARGET = OpenRA.Renderer.Null.dll
-rnull_KIND = library
-rnull_DEPS = $(game_TARGET)
-rnull_LIBS = $(COMMON_LIBS) $(rnull_DEPS)
-PROGRAMS += rsdl2 rnull
-renderers: $(rsdl2_TARGET) $(rnull_TARGET)
+pnull_SRCS := $(shell find OpenRA.Platforms.Null/ -iname '*.cs')
+pnull_TARGET = OpenRA.Platforms.Null.dll
+pnull_KIND = library
+pnull_DEPS = $(game_TARGET)
+pnull_LIBS = $(COMMON_LIBS) $(pnull_DEPS)
+PROGRAMS += pdefault pnull
+platforms: $(pdefault_TARGET) $(pnull_TARGET)
 
 # Mods Common
 mod_common_SRCS := $(shell find OpenRA.Mods.Common/ -iname '*.cs')
@@ -170,13 +170,22 @@ mod_ts_LIBS = $(COMMON_LIBS) $(STD_MOD_LIBS) $(mod_common_TARGET)
 PROGRAMS += mod_ts
 mod_ts: $(mod_ts_TARGET)
 
+check-scripts:
+	@echo
+	@echo "Checking for Lua syntax errors..."
+	@luac -p $(shell find mods/*/maps/* -iname '*.lua')
+	@luac -p $(shell find lua/* -iname '*.lua')
+
 check: utility mods
 	@echo
 	@echo "Checking for code style violations in OpenRA.Game..."
 	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Game
 	@echo
-	@echo "Checking for code style violations in OpenRA.Renderer.Null..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Renderer.Null
+	@echo "Checking for code style violations in OpenRA.Platforms.Default..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Platforms.Default
+	@echo
+	@echo "Checking for code style violations in OpenRA.Platforms.Null..."
+	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Platforms.Null
 	@echo
 	@echo "Checking for code style violations in OpenRA.GameMonitor..."
 	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.GameMonitor
@@ -196,9 +205,6 @@ check: utility mods
 	@echo "Checking for code style violations in OpenRA.Mods.TS..."
 	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Mods.TS
 	@echo
-	@echo "Checking for code style violations in OpenRA.Renderer.Sdl2..."
-	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Renderer.Sdl2
-	@echo
 	@echo "Checking for code style violations in OpenRA.Utility..."
 	@mono --debug OpenRA.Utility.exe ra --check-code-style OpenRA.Utility
 	@echo
@@ -269,7 +275,7 @@ $(foreach prog,$(PROGRAMS),$(eval $(call BUILD_ASSEMBLY,$(prog))))
 #
 default: core
 
-core: game renderers mods utility
+core: game platforms mods utility
 
 tools: gamemonitor
 
@@ -363,6 +369,7 @@ install-core: default
 	@$(INSTALL_PROGRAM) MaxMind.GeoIP2.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) Newtonsoft.Json.dll "$(DATA_INSTALL_DIR)"
 	@$(INSTALL_PROGRAM) RestSharp.dll "$(DATA_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) SmarIrc4net.dll "$(DATA_INSTALL_DIR)"
 
 ifneq ($(UNAME_S),Darwin)
 	@$(CP) *.sh "$(DATA_INSTALL_DIR)"

OpenRA.Game/Actor.cs

@@ -30,7 +30,7 @@ namespace OpenRA
 
 		public readonly uint ActorID;
 
-		[Sync] public Player Owner { get; set; }
+		public Player Owner { get; set; }
 
 		public bool IsInWorld { get; internal set; }
 		public bool Disposed { get; private set; }
@@ -40,37 +40,34 @@ namespace OpenRA
 		public Group Group;
 		public int Generation;
 
-		Lazy<Rectangle> bounds;
-		Lazy<Rectangle> visualBounds;
-		Lazy<IFacing> facing;
-		Lazy<Health> health;
-		Lazy<IOccupySpace> occupySpace;
-		Lazy<IEffectiveOwner> effectiveOwner;
-
-		public Rectangle Bounds { get { return bounds.Value; } }
-		public Rectangle VisualBounds { get { return visualBounds.Value; } }
-		public IOccupySpace OccupiesSpace { get { return occupySpace.Value; } }
-		public IEffectiveOwner EffectiveOwner { get { return effectiveOwner.Value; } }
+		public Rectangle Bounds { get; private set; }
+		public Rectangle VisualBounds { get; private set; }
+		public IEffectiveOwner EffectiveOwner { get; private set; }
+		public IOccupySpace OccupiesSpace { get; private set; }
 
 		public bool IsIdle { get { return currentActivity == null; } }
-		public bool IsDead { get { return Disposed || (health.Value == null ? false : health.Value.IsDead); } }
+		public bool IsDead { get { return Disposed || (health != null && health.IsDead); } }
 
-		public CPos Location { get { return occupySpace.Value.TopLeft; } }
-		public WPos CenterPosition { get { return occupySpace.Value.CenterPosition; } }
+		public CPos Location { get { return OccupiesSpace.TopLeft; } }
+		public WPos CenterPosition { get { return OccupiesSpace.CenterPosition; } }
 
 		public WRot Orientation
 		{
 			get
 			{
 				// TODO: Support non-zero pitch/roll in IFacing (IOrientation?)
-				var facingValue = facing.Value != null ? facing.Value.Facing : 0;
+				var facingValue = facing != null ? facing.Facing : 0;
 				return new WRot(WAngle.Zero, WAngle.Zero, WAngle.FromFacing(facingValue));
 			}
 		}
 
+		readonly IFacing facing;
+		readonly IHealth health;
 		readonly IRenderModifier[] renderModifiers;
 		readonly IRender[] renders;
 		readonly IDisable[] disables;
+		readonly IVisibilityModifier[] visibilityModifiers;
+		readonly IDefaultVisibility defaultVisibility;
 
 		internal Actor(World world, string name, TypeDictionary initDict)
 		{
@@ -81,8 +78,6 @@ namespace OpenRA
 			if (initDict.Contains<OwnerInit>())
 				Owner = init.Get<OwnerInit, Player>();
 
-			occupySpace = Exts.Lazy(() => TraitOrDefault<IOccupySpace>());
-
 			if (name != null)
 			{
 				name = name.ToLowerInvariant();
@@ -92,44 +87,54 @@ namespace OpenRA
 
 				Info = world.Map.Rules.Actors[name];
 				foreach (var trait in Info.TraitsInConstructOrder())
+				{
 					AddTrait(trait.Create(init));
+
+					// Some traits rely on properties provided by IOccupySpace in their initialization,
+					// so we must ready it now, we cannot wait until all traits have finished construction.
+					if (trait is IOccupySpaceInfo)
+						OccupiesSpace = Trait<IOccupySpace>();
+				}
 			}
 
-			facing = Exts.Lazy(() => TraitOrDefault<IFacing>());
-			health = Exts.Lazy(() => TraitOrDefault<Health>());
-			effectiveOwner = Exts.Lazy(() => TraitOrDefault<IEffectiveOwner>());
-
-			bounds = Exts.Lazy(() =>
-			{
-				var si = Info.Traits.GetOrDefault<SelectableInfo>();
-				var size = (si != null && si.Bounds != null) ? new int2(si.Bounds[0], si.Bounds[1]) :
-					TraitsImplementing<IAutoSelectionSize>().Select(x => x.SelectionSize(this)).FirstOrDefault();
-
-				var offset = -size / 2;
-				if (si != null && si.Bounds != null && si.Bounds.Length > 2)
-					offset += new int2(si.Bounds[2], si.Bounds[3]);
-
-				return new Rectangle(offset.X, offset.Y, size.X, size.Y);
-			});
-
-			visualBounds = Exts.Lazy(() =>
-			{
-				var sd = Info.Traits.GetOrDefault<ISelectionDecorationsInfo>();
-				if (sd == null || sd.SelectionBoxBounds == null)
-					return bounds.Value;
-
-				var size = new int2(sd.SelectionBoxBounds[0], sd.SelectionBoxBounds[1]);
-
-				var offset = -size / 2;
-				if (sd.SelectionBoxBounds.Length > 2)
-					offset += new int2(sd.SelectionBoxBounds[2], sd.SelectionBoxBounds[3]);
-
-				return new Rectangle(offset.X, offset.Y, size.X, size.Y);
-			});
-
+			Bounds = DetermineBounds();
+			VisualBounds = DetermineVisualBounds();
+			EffectiveOwner = TraitOrDefault<IEffectiveOwner>();
+			facing = TraitOrDefault<IFacing>();
+			health = TraitOrDefault<IHealth>();
 			renderModifiers = TraitsImplementing<IRenderModifier>().ToArray();
 			renders = TraitsImplementing<IRender>().ToArray();
 			disables = TraitsImplementing<IDisable>().ToArray();
+			visibilityModifiers = TraitsImplementing<IVisibilityModifier>().ToArray();
+			defaultVisibility = Trait<IDefaultVisibility>();
+		}
+
+		Rectangle DetermineBounds()
+		{
+			var si = Info.TraitInfoOrDefault<SelectableInfo>();
+			var size = (si != null && si.Bounds != null) ? new int2(si.Bounds[0], si.Bounds[1]) :
+				TraitsImplementing<IAutoSelectionSize>().Select(x => x.SelectionSize(this)).FirstOrDefault();
+
+			var offset = -size / 2;
+			if (si != null && si.Bounds != null && si.Bounds.Length > 2)
+				offset += new int2(si.Bounds[2], si.Bounds[3]);
+
+			return new Rectangle(offset.X, offset.Y, size.X, size.Y);
+		}
+
+		Rectangle DetermineVisualBounds()
+		{
+			var sd = Info.TraitInfoOrDefault<ISelectionDecorationsInfo>();
+			if (sd == null || sd.SelectionBoxBounds == null)
+				return Bounds;
+
+			var size = new int2(sd.SelectionBoxBounds[0], sd.SelectionBoxBounds[1]);
+
+			var offset = -size / 2;
+			if (sd.SelectionBoxBounds.Length > 2)
+				offset += new int2(sd.SelectionBoxBounds[2], sd.SelectionBoxBounds[3]);
+
+			return new Rectangle(offset.X, offset.Y, size.X, size.Y);
 		}
 
 		public void Tick()
@@ -222,11 +227,6 @@ namespace OpenRA
 			return World.TraitDict.WithInterface<T>(this);
 		}
 
-		public bool HasTrait<T>()
-		{
-			return World.TraitDict.Contains<T>(this);
-		}
-
 		public void AddTrait(object trait)
 		{
 			World.TraitDict.AddTrait(this, trait);
@@ -279,12 +279,28 @@ namespace OpenRA
 			});
 		}
 
-		public void Kill(Actor attacker)
+		public DamageState GetDamageState()
 		{
-			if (health.Value == null)
+			if (Disposed)
+				return DamageState.Dead;
+
+			return (health == null) ? DamageState.Undamaged : health.DamageState;
+		}
+
+		public void InflictDamage(Actor attacker, int damage, IWarhead warhead)
+		{
+			if (Disposed || health == null)
 				return;
 
-			health.Value.InflictDamage(this, attacker, health.Value.MaxHP, null, true);
+			health.InflictDamage(this, attacker, damage, warhead, false);
+		}
+
+		public void Kill(Actor attacker)
+		{
+			if (Disposed || health == null)
+				return;
+
+			health.Kill(this, attacker);
 		}
 
 		public bool IsDisabled()
@@ -295,6 +311,15 @@ namespace OpenRA
 			return false;
 		}
 
+		public bool CanBeViewedByPlayer(Player player)
+		{
+			foreach (var visibilityModifier in visibilityModifiers)
+				if (!visibilityModifier.IsVisible(this, player))
+					return false;
+
+			return defaultVisibility.IsVisible(this, player);
+		}
+
 		#region Scripting interface
 
 		Lazy<ScriptActorInterface> luaInterface;

OpenRA.Game/CPos.cs

@@ -44,15 +44,15 @@ namespace OpenRA
 
 		public MPos ToMPos(Map map)
 		{
-			return ToMPos(map.TileShape);
+			return ToMPos(map.Grid.Type);
 		}
 
-		public MPos ToMPos(TileShape shape)
+		public MPos ToMPos(MapGridType gridType)
 		{
-			if (shape == TileShape.Rectangle)
+			if (gridType == MapGridType.Rectangular)
 				return new MPos(X, Y);
 
-			// Convert from diamond cell (x, y) position to rectangular map position (u, v)
+			// Convert from RectangularIsometric cell (x, y) position to rectangular map position (u, v)
 			//  - The staggered rows make this fiddly (hint: draw a diagram!)
 			// (a) Consider the relationships:
 			//  - +1x (even -> odd) adds (0, 1) to (u, v)

OpenRA.Game/ContentInstaller.cs

@@ -0,0 +1,37 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+
+namespace OpenRA
+{
+	// Referenced from ModMetadata, so needs to be in OpenRA.Game :(
+	public class ContentInstaller : IGlobalModData
+	{
+		public readonly string[] TestFiles = { };
+		public readonly string[] DiskTestFiles = { };
+		public readonly string PackageToExtractFromCD = null;
+		public readonly bool OverwriteFiles = true;
+
+		public readonly Dictionary<string, string[]> CopyFilesFromCD = new Dictionary<string, string[]>();
+		public readonly Dictionary<string, string[]> ExtractFilesFromCD = new Dictionary<string, string[]>();
+
+		public readonly string PackageMirrorList = null;
+
+		public readonly string MusicPackageMirrorList = null;
+		public readonly int ShippedSoundtracks = 0;
+
+		/// <summary> InstallShield .CAB file IDs, used to extract Mod-specific files. </summary>
+		public readonly HashSet<int> InstallShieldCABFileIds = new HashSet<int>();
+
+		/// <summary> InstallShield .CAB file IDs, used to extract Mod-specific archives and extract contents of ExtractFilesFromCD. </summary>
+		public readonly HashSet<string> InstallShieldCABFilePackageIds = new HashSet<string>();
+	}
+}

OpenRA.Game/FieldLoader.cs

@@ -46,7 +46,7 @@ namespace OpenRA
 
 		public static Func<string, Type, string, object> InvalidValueAction = (s, t, f) =>
 		{
-			throw new InvalidOperationException("FieldLoader: Cannot parse `{0}` into `{1}.{2}` ".F(s, f, t));
+			throw new YamlException("FieldLoader: Cannot parse `{0}` into `{1}.{2}` ".F(s, f, t));
 		};
 
 		public static Action<string, Type> UnknownFieldAction = (s, f) =>
@@ -110,13 +110,8 @@ namespace OpenRA
 			if (!md.TryGetValue(yamlName, out yaml))
 				return false;
 
-			if (yaml.Nodes.Count == 0)
-			{
-				ret = GetValue(field.Name, field.FieldType, yaml.Value, field);
-				return true;
-			}
-
-			throw new InvalidOperationException("TryGetValueFromYaml: unable to load field {0} (of type {1})".F(yamlName, field.FieldType));
+			ret = GetValue(field.Name, field.FieldType, yaml, field);
+			return true;
 		}
 
 		public static T Load<T>(MiniYaml y) where T : new()
@@ -165,6 +160,12 @@ namespace OpenRA
 
 		public static object GetValue(string fieldName, Type fieldType, string value, MemberInfo field)
 		{
+			return GetValue(fieldName, fieldType, new MiniYaml(value), field);
+		}
+
+		public static object GetValue(string fieldName, Type fieldType, MiniYaml yaml, MemberInfo field)
+		{
+			var value = yaml.Value;
 			if (value != null) value = value.Trim();
 
 			if (fieldType == typeof(int))
@@ -417,7 +418,7 @@ namespace OpenRA
 			}
 			else if (fieldType == typeof(bool))
 				return ParseYesNo(value, fieldType, fieldName);
-			else if (fieldType.IsArray)
+			else if (fieldType.IsArray && fieldType.GetArrayRank() == 1)
 			{
 				if (value == null)
 					return Array.CreateInstance(fieldType.GetElementType(), 0);
@@ -429,6 +430,33 @@ namespace OpenRA
 					ret.SetValue(GetValue(fieldName, fieldType.GetElementType(), parts[i].Trim(), field), i);
 				return ret;
 			}
+			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(HashSet<>))
+			{
+				var set = Activator.CreateInstance(fieldType);
+				if (value == null)
+					return set;
+
+				var parts = value.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+				var addMethod = fieldType.GetMethod("Add", fieldType.GetGenericArguments());
+				for (var i = 0; i < parts.Length; i++)
+					addMethod.Invoke(set, new[] { GetValue(fieldName, fieldType.GetGenericArguments()[0], parts[i].Trim(), field) });
+				return set;
+			}
+			else if (fieldType.IsGenericType && fieldType.GetGenericTypeDefinition() == typeof(Dictionary<,>))
+			{
+				var dict = Activator.CreateInstance(fieldType);
+				var arguments = fieldType.GetGenericArguments();
+				var addMethod = fieldType.GetMethod("Add", arguments);
+
+				foreach (var node in yaml.Nodes)
+				{
+					var key = GetValue(fieldName, arguments[0], node.Key, field);
+					var val = GetValue(fieldName, arguments[1], node.Value, field);
+					addMethod.Invoke(dict, new[] { key, val });
+				}
+
+				return dict;
+			}
 			else if (fieldType == typeof(Size))
 			{
 				if (value != null)
@@ -576,7 +604,7 @@ namespace OpenRA
 
 				var loader = sa.GetLoader(type);
 				if (loader == null && sa.FromYamlKey)
-					loader = (yaml) => GetValue(yamlName, field.FieldType, yaml.Value, field);
+					loader = yaml => GetValue(yamlName, field.FieldType, yaml, field);
 
 				var fli = new FieldLoadInfo(field, sa, yamlName, loader);
 				ret.Add(fli);
@@ -620,6 +648,7 @@ namespace OpenRA
 			public string YamlName;
 			public string Loader;
 			public bool FromYamlKey;
+			public bool DictionaryFromYamlKey;
 			public bool Required;
 
 			public SerializeAttribute(bool serialize = true, bool required = false)
@@ -682,6 +711,17 @@ namespace OpenRA
 		}
 	}
 
+	// Special-cases FieldFromYamlKeyAttribute for use with Dictionary<K,V>.
+	[AttributeUsage(AttributeTargets.Field)]
+	public sealed class DictionaryFromYamlKeyAttribute : FieldLoader.SerializeAttribute
+	{
+		public DictionaryFromYamlKeyAttribute()
+		{
+			FromYamlKey = true;
+			DictionaryFromYamlKey = true;
+		}
+	}
+
 	// mirrors DescriptionAttribute from System.ComponentModel but we dont want to have to use that everywhere.
 	[AttributeUsage(AttributeTargets.All)]
 	public sealed class DescAttribute : Attribute

OpenRA.Game/FieldSaver.cs

@@ -28,7 +28,18 @@ namespace OpenRA
 
 			foreach (var info in FieldLoader.GetTypeLoadInfo(o.GetType(), includePrivateByDefault))
 			{
-				if (info.Attribute.FromYamlKey)
+				if (info.Attribute.DictionaryFromYamlKey)
+				{
+					var dict = (System.Collections.IDictionary)info.Field.GetValue(o);
+					foreach (var kvp in dict)
+					{
+						var key = ((System.Collections.DictionaryEntry)kvp).Key;
+						var value = ((System.Collections.DictionaryEntry)kvp).Value;
+
+						nodes.Add(new MiniYamlNode(FormatValue(key), FormatValue(value)));
+					}
+				}
+				else if (info.Attribute.FromYamlKey)
 					root = FormatValue(o, info.Field);
 				else
 					nodes.Add(new MiniYamlNode(info.YamlName, FormatValue(o, info.Field)));
@@ -55,11 +66,13 @@ namespace OpenRA
 			return new MiniYamlNode(field, FormatValue(o, o.GetType().GetField(field)));
 		}
 
-		public static string FormatValue(object v, Type t)
+		public static string FormatValue(object v)
 		{
 			if (v == null)
 				return "";
 
+			var t = v.GetType();
+
 			// Color.ToString() does the wrong thing; force it to format as an array
 			if (t == typeof(Color))
 			{
@@ -70,14 +83,6 @@ namespace OpenRA
 					((int)c.B).Clamp(0, 255));
 			}
 
-			// Don't save using country-specific decimal separators which can be misunderstood as group seperators.
-			if (t == typeof(float))
-				return ((float)v).ToString(CultureInfo.InvariantCulture);
-			if (t == typeof(decimal))
-				return ((decimal)v).ToString(CultureInfo.InvariantCulture);
-			if (t == typeof(double))
-				return ((double)v).ToString(CultureInfo.InvariantCulture);
-
 			if (t == typeof(ImageFormat))
 			{
 				return ((ImageFormat)v).ToString();
@@ -89,10 +94,33 @@ namespace OpenRA
 				return "{0},{1},{2},{3}".F(r.X, r.Y, r.Width, r.Height);
 			}
 
-			if (t.IsArray)
+			if (t.IsArray && t.GetArrayRank() == 1)
 			{
-				var elems = ((Array)v).OfType<object>();
-				return elems.JoinWith(", ");
+				return ((Array)v).Cast<object>().Select(FormatValue).JoinWith(", ");
+			}
+
+			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(HashSet<>))
+			{
+				return ((System.Collections.IEnumerable)v).Cast<object>().Select(FormatValue).JoinWith(", ");
+			}
+
+			// This is only for documentation generation
+			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Dictionary<,>))
+			{
+				var result = "";
+				var dict = (System.Collections.IDictionary)v;
+				foreach (var kvp in dict)
+				{
+					var key = ((System.Collections.DictionaryEntry)kvp).Key;
+					var value = ((System.Collections.DictionaryEntry)kvp).Value;
+
+					var formattedKey = FormatValue(key);
+					var formattedValue = FormatValue(value);
+
+					result += "{0}: {1}{2}".F(formattedKey, formattedValue, Environment.NewLine);
+				}
+
+				return result;
 			}
 
 			if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(OpenRA.Primitives.Cache<,>))
@@ -119,7 +147,7 @@ namespace OpenRA
 
 		public static string FormatValue(object o, FieldInfo f)
 		{
-			return FormatValue(f.GetValue(o), f.FieldType);
+			return FormatValue(f.GetValue(o));
 		}
 	}
 }

OpenRA.Game/FileFormats/BlowfishKeyProvider.cs

@@ -119,12 +119,6 @@ namespace OpenRA.FileFormats
 			pubkey.Len = BitLenBigNum(pubkey.KeyOne, 64) - 1;
 		}
 
-		uint LenPreData()
-		{
-			var a = (pubkey.Len - 1) / 8;
-			return (55 / a + 1) * (a + 1);
-		}
-
 		static int CompareBigNum(uint[] n1, uint[] n2, uint len)
 		{
 			while (len > 0)
@@ -462,46 +456,37 @@ namespace OpenRA.FileFormats
 			}
 		}
 
-		static unsafe void Memcopy(byte* dest, byte* src, int len)
-		{
-			while (len-- != 0) *dest++ = *src++;
-		}
-
-		unsafe void ProcessPredata(byte* pre, uint pre_len, byte* buf)
+		byte[] ProcessPredata(byte[] src)
 		{
+			var dest = new byte[256];
 			var n2 = new uint[64];
 			var n3 = new uint[64];
 
-			var a = (pubkey.Len - 1) / 8;
+			var a = (int)((pubkey.Len - 1) / 8);
+			var pre_len = (55 / a + 1) * (a + 1);
+			var srcOffset = 0;
+			var destOffset = 0;
+
 			while (a + 1 <= pre_len)
 			{
 				InitBigNum(n2, 0, 64);
-				fixed (uint* pn2 = &n2[0])
-					Memcopy((byte*)pn2, pre, (int)a + 1);
-				CalcKey(n3, n2, pubkey.KeyTwo, pubkey.KeyOne, 64);
 
-				fixed (uint* pn3 = &n3[0])
-					Memcopy(buf, (byte*)pn3, (int)a);
+				Buffer.BlockCopy(src, srcOffset, n2, 0, a + 1);
+				CalcKey(n3, n2, pubkey.KeyTwo, pubkey.KeyOne, 64);
+				Buffer.BlockCopy(n3, 0, dest, destOffset, a);
 
 				pre_len -= a + 1;
-				pre += a + 1;
-				buf += a;
+				srcOffset += a + 1;
+				destOffset += a;
 			}
+
+			return dest;
 		}
 
 		public byte[] DecryptKey(byte[] src)
 		{
 			InitPublicKey();
-			var dest = new byte[256];
-
-			unsafe
-			{
-				fixed (byte* pdest = &dest[0])
-				fixed (byte* psrc = &src[0])
-					ProcessPredata(psrc, LenPreData(), pdest);
-			}
-
-			return dest.Take(56).ToArray();
+			return ProcessPredata(src).Take(56).ToArray();
 		}
 	}
 }

OpenRA.Game/FileFormats/HvaReader.cs

@@ -9,7 +9,10 @@
 
 #endregion
 
+using System;
 using System.IO;
+using System.Linq;
+using OpenRA.Graphics;
 
 namespace OpenRA.FileFormats
 {
@@ -19,7 +22,7 @@ namespace OpenRA.FileFormats
 		public readonly uint LimbCount;
 		public readonly float[] Transforms;
 
-		public HvaReader(Stream s)
+		public HvaReader(Stream s, string fileName)
 		{
 			// Index swaps for transposing a matrix
 			var ids = new byte[] { 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14 };
@@ -31,6 +34,8 @@ namespace OpenRA.FileFormats
 			// Skip limb names
 			s.Seek(16 * LimbCount, SeekOrigin.Current);
 			Transforms = new float[16 * FrameCount * LimbCount];
+
+			var testMatrix = new float[16];
 			for (var j = 0; j < FrameCount; j++)
 				for (var i = 0; i < LimbCount; i++)
 				{
@@ -43,13 +48,19 @@ namespace OpenRA.FileFormats
 
 					for (var k = 0; k < 12; k++)
 						Transforms[c + ids[k]] = s.ReadFloat();
+
+					Array.Copy(Transforms, 16 * (LimbCount * j + i), testMatrix, 0, 16);
+					if (Util.MatrixInverse(testMatrix) == null)
+						throw new InvalidDataException(
+							"The transformation matrix for HVA file `{0}` section {1} frame {2} is invalid because it is not invertible!"
+							.F(fileName, i, j));
 				}
 		}
 
 		public static HvaReader Load(string filename)
 		{
 			using (var s = File.OpenRead(filename))
-				return new HvaReader(s);
+				return new HvaReader(s, Path.GetFileName(filename));
 		}
 	}
 }

OpenRA.Game/FileFormats/ReplayMetadata.cs

@@ -102,6 +102,10 @@ namespace OpenRA.FileFormats
 					{
 						return new ReplayMetadata(fs, path);
 					}
+					catch (YamlException ex)
+					{
+						Log.Write("debug", ex.ToString());
+					}
 					catch (InvalidOperationException ex)
 					{
 						Log.Write("debug", ex.ToString());

OpenRA.Game/FileSystem/InstallShieldCABExtractor.cs

@@ -443,6 +443,7 @@ namespace OpenRA.FileSystem
 
 		public void ExtractFile(uint index, string fileName)
 		{
+			Directory.CreateDirectory(Path.GetDirectoryName(fileName));
 			using (var destfile = File.Open(fileName, FileMode.Create))
 				GetContentById(index, destfile);
 		}

OpenRA.Game/Game.cs

@@ -16,6 +16,7 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Threading;
+using OpenRA.Chat;
 using OpenRA.FileSystem;
 using OpenRA.Graphics;
 using OpenRA.Network;
@@ -42,8 +43,11 @@ namespace OpenRA
 		public static MersenneTwister CosmeticRandom = new MersenneTwister(); // not synced
 
 		public static Renderer Renderer;
+		public static Sound Sound;
 		public static bool HasInputFocus = false;
 
+		public static GlobalChat GlobalChat;
+
 		public static OrderManager JoinServer(string host, int port, string password, bool recordReplay = true)
 		{
 			IConnection connection = new NetworkConnection(host, port);
@@ -147,7 +151,7 @@ namespace OpenRA
 			using (new PerfTimer("PrepareMap"))
 				map = ModData.PrepareMap(mapUID);
 			using (new PerfTimer("NewWorld"))
-				OrderManager.World = new World(map, OrderManager, type) { Timestep = Timestep };
+				OrderManager.World = new World(map, OrderManager, type);
 
 			worldRenderer = new WorldRenderer(OrderManager.World);
 
@@ -203,6 +207,7 @@ namespace OpenRA
 			Log.AddChannel("sound", "sound.log");
 			Log.AddChannel("graphics", "graphics.log");
 			Log.AddChannel("geoip", "geoip.log");
+			Log.AddChannel("irc", "irc.log");
 
 			if (Settings.Server.DiscoverNatDevices)
 				UPnP.TryNatDiscovery();
@@ -215,7 +220,7 @@ namespace OpenRA
 			GeoIP.Initialize();
 
 			GlobalFileSystem.Mount(Platform.GameDir); // Needed to access shaders
-			var renderers = new[] { Settings.Graphics.Renderer, "Sdl2", null };
+			var renderers = new[] { Settings.Graphics.Renderer, "Default", null };
 			foreach (var r in renderers)
 			{
 				if (r == null)
@@ -234,17 +239,9 @@ namespace OpenRA
 				}
 			}
 
-			try
-			{
-				Sound.Create(Settings.Sound.Engine);
-			}
-			catch (Exception e)
-			{
-				Log.Write("sound", "{0}", e);
-				Console.WriteLine("Creating the sound engine failed. Fallback in place. Check sound.log for details.");
-				Settings.Sound.Engine = "Null";
-				Sound.Create(Settings.Sound.Engine);
-			}
+			Sound = new Sound(Settings.Server.Dedicated ? "Null" : Settings.Sound.Engine);
+
+			GlobalChat = new GlobalChat();
 
 			Console.WriteLine("Available mods:");
 			foreach (var mod in ModMetadata.AllMods)
@@ -290,13 +287,30 @@ namespace OpenRA
 			Sound.Initialize();
 
 			ModData = new ModData(mod, !Settings.Server.Dedicated);
-			ModData.InitializeLoaders();
-			if (!Settings.Server.Dedicated)
-				Renderer.InitializeFonts(ModData.Manifest);
 
 			using (new PerfTimer("LoadMaps"))
 				ModData.MapCache.LoadMaps();
 
+			if (Settings.Server.Dedicated)
+			{
+				RunDedicatedServer();
+				Environment.Exit(0);
+			}
+
+			var installData = ModData.Manifest.Get<ContentInstaller>();
+			var isModContentInstalled = installData.TestFiles.All(f => File.Exists(Platform.ResolvePath(f)));
+
+			// Mod assets are missing!
+			if (!isModContentInstalled)
+			{
+				InitializeMod("modchooser", new Arguments());
+				return;
+			}
+
+			ModData.MountFiles();
+			ModData.InitializeLoaders();
+			Renderer.InitializeFonts(ModData.Manifest);
+
 			if (Cursor != null)
 				Cursor.Dispose();
 
@@ -315,7 +329,6 @@ namespace OpenRA
 					Console.WriteLine("Error was: " + e.Message);
 
 					Cursor = new SoftwareCursor(ModData.CursorProvider);
-					Settings.Graphics.HardwareCursors = false;
 				}
 			}
 			else
@@ -328,39 +341,38 @@ namespace OpenRA
 
 			JoinLocal();
 
-			if (Settings.Server.Dedicated)
+			ModData.LoadScreen.StartGame(args);
+		}
+
+		public static void RunDedicatedServer()
+		{
+			while (true)
 			{
+				Settings.Server.Map = WidgetUtils.ChooseInitialMap(Settings.Server.Map);
+				Settings.Save();
+				CreateServer(new ServerSettings(Settings.Server));
+
 				while (true)
 				{
-					Settings.Server.Map = WidgetUtils.ChooseInitialMap(Settings.Server.Map);
-					Settings.Save();
-					CreateServer(new ServerSettings(Settings.Server));
-					while (true)
+					Thread.Sleep(100);
+
+					if (server.State == Server.ServerState.GameStarted && server.Conns.Count < 1)
 					{
-						Thread.Sleep(100);
-
-						if (server.State == Server.ServerState.GameStarted && server.Conns.Count < 1)
-						{
-							Console.WriteLine("No one is playing, shutting down...");
-							server.Shutdown();
-							break;
-						}
+						Console.WriteLine("No one is playing, shutting down...");
+						server.Shutdown();
+						break;
 					}
-
-					if (Settings.Server.DedicatedLoop)
-					{
-						Console.WriteLine("Starting a new server instance...");
-						ModData.MapCache.LoadMaps();
-						continue;
-					}
-
-					break;
 				}
 
-				Environment.Exit(0);
+				if (Settings.Server.DedicatedLoop)
+				{
+					Console.WriteLine("Starting a new server instance...");
+					ModData.MapCache.LoadMaps();
+					continue;
+				}
+
+				break;
 			}
-			else
-				ModData.LoadScreen.StartGame(args);
 		}
 
 		public static void LoadEditor(string mapUid)
@@ -393,9 +405,9 @@ namespace OpenRA
 
 		// Note: These delayed actions should only be used by widgets or disposing objects
 		// - things that depend on a particular world should be queuing them on the worldactor.
-		static ActionQueue delayedActions = new ActionQueue();
-		public static void RunAfterTick(Action a) { delayedActions.Add(a); }
-		public static void RunAfterDelay(int delay, Action a) { delayedActions.Add(a, delay); }
+		static volatile ActionQueue delayedActions = new ActionQueue();
+		public static void RunAfterTick(Action a) { delayedActions.Add(a, Game.RunTime); }
+		public static void RunAfterDelay(int delayMilliseconds, Action a) { delayedActions.Add(a, Game.RunTime + delayMilliseconds); }
 
 		static void TakeScreenshotInner()
 		{
@@ -403,7 +415,7 @@ namespace OpenRA
 
 			Bitmap bitmap;
 			using (new PerfTimer("Renderer.TakeScreenshot"))
-				bitmap = Renderer.TakeScreenshot();
+				bitmap = Renderer.Device.TakeScreenshot();
 
 			ThreadPool.QueueUserWorkItem(_ =>
 			{
@@ -496,7 +508,7 @@ namespace OpenRA
 
 		static void LogicTick()
 		{
-			delayedActions.PerformActions();
+			delayedActions.PerformActions(Game.RunTime);
 
 			if (OrderManager.Connection.ConnectionState != lastConnectionState)
 			{
@@ -681,6 +693,9 @@ namespace OpenRA
 				worldRenderer.Dispose();
 			ModData.Dispose();
 			ChromeProvider.Deinitialize();
+
+			GlobalChat.Dispose();
+			Sound.Dispose();
 			Renderer.Dispose();
 
 			OnQuit();
@@ -751,7 +766,7 @@ namespace OpenRA
 
 		public static bool IsCurrentWorld(World world)
 		{
-			return OrderManager != null && OrderManager.World == world;
+			return OrderManager != null && OrderManager.World == world && !world.Disposing;
 		}
 	}
 }

OpenRA.Game/GameInformation.cs

@@ -24,20 +24,20 @@ namespace OpenRA
 		public string MapUid;
 		public string MapTitle;
 
+		/// <summary>Game start timestamp (when the recoding started).</summary>
 		public DateTime StartTimeUtc;
 
-		// Game end timestamp (when the recoding stopped).
+		/// <summary>Game end timestamp (when the recoding stopped).</summary>
 		public DateTime EndTimeUtc;
 
-		// Gets the game's duration, from the time the game started until the
-		// replay recording stopped.
+		/// <summary>Gets the game's duration, from the time the game started until the replay recording stopped.</summary>
 		public TimeSpan Duration { get { return EndTimeUtc > StartTimeUtc ? EndTimeUtc - StartTimeUtc : TimeSpan.Zero; } }
 		public IList<Player> Players { get; private set; }
 		public MapPreview MapPreview { get { return Game.ModData.MapCache[MapUid]; } }
 		public IEnumerable<Player> HumanPlayers { get { return Players.Where(p => p.IsHuman); } }
 		public bool IsSinglePlayer { get { return HumanPlayers.Count() == 1; } }
 
-		Dictionary<OpenRA.Player, Player> playersByRuntime;
+		readonly Dictionary<OpenRA.Player, Player> playersByRuntime;
 
 		public GameInformation()
 		{
@@ -70,7 +70,7 @@ namespace OpenRA
 
 				return info;
 			}
-			catch (InvalidOperationException)
+			catch (YamlException)
 			{
 				Log.Write("debug", "GameInformation deserialized invalid MiniYaml:\n{0}".F(data));
 				throw;
@@ -79,9 +79,10 @@ namespace OpenRA
 
 		public string Serialize()
 		{
-			var nodes = new List<MiniYamlNode>();
-
-			nodes.Add(new MiniYamlNode("Root", FieldSaver.Save(this)));
+			var nodes = new List<MiniYamlNode>
+			{
+				new MiniYamlNode("Root", FieldSaver.Save(this))
+			};
 
 			for (var i = 0; i < Players.Count; i++)
 				nodes.Add(new MiniYamlNode("Player@{0}".F(i), FieldSaver.Save(Players[i])));
@@ -89,7 +90,7 @@ namespace OpenRA
 			return nodes.WriteToString();
 		}
 
-		// Adds the player information at start-up.
+		/// <summary>Adds the player information at start-up.</summary>
 		public void AddPlayer(OpenRA.Player runtimePlayer, Session lobbyInfo)
 		{
 			if (runtimePlayer == null)
@@ -118,7 +119,7 @@ namespace OpenRA
 				Color = runtimePlayer.Color,
 				Team = client.Team,
 				SpawnPoint = runtimePlayer.SpawnPoint,
-				IsRandomFaction = runtimePlayer.Faction.InternalName != client.Race,
+				IsRandomFaction = runtimePlayer.Faction.InternalName != client.Faction,
 				IsRandomSpawnPoint = runtimePlayer.SpawnPoint != client.SpawnPoint
 			};
 
@@ -126,7 +127,7 @@ namespace OpenRA
 			Players.Add(player);
 		}
 
-		// Gets the player information for the specified runtime player instance.
+		/// <summary>Gets the player information for the specified runtime player instance.</summary>
 		public Player GetPlayer(OpenRA.Player runtimePlayer)
 		{
 			Player player;
@@ -138,38 +139,43 @@ namespace OpenRA
 
 		public class Player
 		{
-			// Start-up information
+			#region Start-up information
+
 			public int ClientIndex;
 
-			// The player name, not guaranteed to be unique.
+			/// <summary>The player name, not guaranteed to be unique.</summary>
 			public string Name;
 			public bool IsHuman;
 			public bool IsBot;
 
-			// The faction name (aka Country)
+			/// <summary>The faction's display name.</summary>
 			public string FactionName;
 
-			// The faction id (aka Country, aka Race)
+			/// <summary>The faction ID, a.k.a. the faction's internal name.</summary>
 			public string FactionId;
 			public HSLColor Color;
 
-			// The team id on start-up, or 0 if the player is not part of the team.
+			/// <summary>The team ID on start-up, or 0 if the player is not part of a team.</summary>
 			public int Team;
 			public int SpawnPoint;
 
-			// True if the faction was chosen at random; otherwise, false
+			/// <summary>True if the faction was chosen at random; otherwise, false.</summary>
 			public bool IsRandomFaction;
 
-			// True if the spawn point was chosen at random; otherwise, false.</summary>
+			/// <summary>True if the spawn point was chosen at random; otherwise, false.</summary>
 			public bool IsRandomSpawnPoint;
 
-			// Information gathered at a later stage
+			#endregion
 
-			// The game outcome for this player
+			#region
+
+			/// <summary>The game outcome for this player.</summary>
 			public WinState Outcome;
 
-			// The time when this player won or lost the game
+			/// <summary>The time when this player won or lost the game.</summary>
 			public DateTime OutcomeTimestampUtc;
+
+			#endregion
 		}
 	}
 }

OpenRA.Game/GameRules/ActorInfo.cs

@@ -28,7 +28,7 @@ namespace OpenRA
 		/// You can remove inherited traits by adding a - infront of them as in -TraitName: to inherit everything, but this trait.
 		/// </summary>
 		public readonly string Name;
-		public readonly TypeDictionary Traits = new TypeDictionary();
+		readonly TypeDictionary traits = new TypeDictionary();
 		List<ITraitInfo> constructOrderCache = null;
 
 		public ActorInfo(string name, MiniYaml node, Dictionary<string, MiniYaml> allUnits)
@@ -52,7 +52,7 @@ namespace OpenRA
 					if (t.Key != "Inherits" && !t.Key.StartsWith("Inherits@"))
 						try
 						{
-							Traits.Add(LoadTraitInfo(t.Key.Split('@')[0], t.Value));
+							traits.Add(LoadTraitInfo(t.Key.Split('@')[0], t.Value));
 						}
 						catch (FieldLoader.MissingFieldsException e)
 						{
@@ -67,6 +67,13 @@ namespace OpenRA
 			}
 		}
 
+		public ActorInfo(string name, params ITraitInfo[] traitInfos)
+		{
+			Name = name;
+			foreach (var t in traitInfos)
+				traits.Add(t);
+		}
+
 		static Dictionary<string, MiniYaml> GetParents(MiniYaml node, Dictionary<string, MiniYaml> allUnits)
 		{
 			return node.Nodes.Where(n => n.Key == "Inherits" || n.Key.StartsWith("Inherits@"))
@@ -121,7 +128,7 @@ namespace OpenRA
 			if (constructOrderCache != null)
 				return constructOrderCache;
 
-			var source = Traits.WithInterface<ITraitInfo>().Select(i => new
+			var source = traits.WithInterface<ITraitInfo>().Select(i => new
 			{
 				Trait = i,
 				Type = i.GetType(),
@@ -172,7 +179,7 @@ namespace OpenRA
 
 		public IEnumerable<Pair<string, Type>> GetInitKeys()
 		{
-			var inits = Traits.WithInterface<ITraitInfo>().SelectMany(
+			var inits = traits.WithInterface<ITraitInfo>().SelectMany(
 				t => t.GetType().GetInterfaces()
 					.Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(UsesInit<>))
 					.Select(i => i.GetGenericArguments()[0])).ToList();
@@ -183,5 +190,10 @@ namespace OpenRA
 				i => Pair.New(
 					i.Name.Replace("Init", ""), i));
 		}
+
+		public bool HasTraitInfo<T>() where T : ITraitInfo { return traits.Contains<T>(); }
+		public T TraitInfo<T>() where T : ITraitInfo { return traits.Get<T>(); }
+		public T TraitInfoOrDefault<T>() where T : ITraitInfo { return traits.GetOrDefault<T>(); }
+		public IEnumerable<T> TraitInfos<T>() where T : ITraitInfo { return traits.WithInterface<T>(); }
 	}
 }

OpenRA.Game/GameRules/MusicInfo.cs

@@ -32,21 +32,9 @@ namespace OpenRA.GameRules
 
 			var ext = nd.ContainsKey("Extension") ? nd["Extension"].Value : "aud";
 			Filename = (nd.ContainsKey("Filename") ? nd["Filename"].Value : key) + "." + ext;
-
-			if (!GlobalFileSystem.Exists(Filename))
-				return;
-
-			Exists = true;
-			using (var s = GlobalFileSystem.Open(Filename))
-			{
-				if (Filename.ToLowerInvariant().EndsWith("wav"))
-					Length = (int)WavLoader.WaveLength(s);
-				else
-					Length = (int)AudLoader.SoundLength(s);
-			}
 		}
 
-		public void Reload()
+		public void Load()
 		{
 			if (!GlobalFileSystem.Exists(Filename))
 				return;

OpenRA.Game/GameRules/Ruleset.cs

@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
+using OpenRA.Traits;
 
 namespace OpenRA
 {
@@ -41,6 +42,40 @@ namespace OpenRA
 			Music = new ReadOnlyDictionary<string, MusicInfo>(music);
 			TileSets = new ReadOnlyDictionary<string, TileSet>(tileSets);
 			Sequences = new ReadOnlyDictionary<string, SequenceProvider>(sequences);
+
+			foreach (var a in Actors.Values)
+			{
+				foreach (var t in a.TraitInfos<IRulesetLoaded>())
+				{
+					try
+					{
+						t.RulesetLoaded(this, a);
+					}
+					catch (YamlException e)
+					{
+						throw new YamlException("Actor type {0}: {1}".F(a.Name, e.Message));
+					}
+				}
+			}
+
+			foreach (var weapon in Weapons)
+			{
+				foreach (var warhead in weapon.Value.Warheads)
+				{
+					var cacher = warhead as IRulesetLoaded<WeaponInfo>;
+					if (cacher != null)
+					{
+						try
+						{
+							cacher.RulesetLoaded(this, weapon.Value);
+						}
+						catch (YamlException e)
+						{
+							throw new YamlException("Weapon type {0}: {1}".F(weapon.Key, e.Message));
+						}
+					}
+				}
+			}
 		}
 
 		public IEnumerable<KeyValuePair<string, MusicInfo>> InstalledMusic { get { return Music.Where(m => m.Value.Exists); } }

OpenRA.Game/GameRules/RulesetCache.cs

@@ -80,7 +80,7 @@ namespace OpenRA
 
 			using (new PerfTimer("Music"))
 				music = LoadYamlRules(musicCache, m.Music,
-					NoMapRules,
+					map != null ? map.MusicDefinitions : NoMapRules,
 					(k, _) => new MusicInfo(k.Key, k.Value));
 
 			using (new PerfTimer("TileSets"))

OpenRA.Game/GameRules/SoundInfo.cs

@@ -16,22 +16,14 @@ namespace OpenRA.GameRules
 {
 	public class SoundInfo
 	{
-		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Variants;
-		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Prefixes;
-		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Voices;
-		[FieldLoader.Ignore] public readonly Dictionary<string, string[]> Notifications;
+		public readonly Dictionary<string, string[]> Variants = new Dictionary<string, string[]>();
+		public readonly Dictionary<string, string[]> Prefixes = new Dictionary<string, string[]>();
+		public readonly Dictionary<string, string[]> Voices = new Dictionary<string, string[]>();
+		public readonly Dictionary<string, string[]> Notifications = new Dictionary<string, string[]>();
 		public readonly string DefaultVariant = ".aud";
 		public readonly string DefaultPrefix = "";
-		public readonly string[] DisableVariants = { };
-		public readonly string[] DisablePrefixes = { };
-
-		static Dictionary<string, string[]> Load(MiniYaml y, string name)
-		{
-			var nd = y.ToDictionary();
-			return nd.ContainsKey(name)
-				? nd[name].ToDictionary(my => FieldLoader.GetValue<string[]>("(value)", my.Value))
-				: new Dictionary<string, string[]>();
-		}
+		public readonly HashSet<string> DisableVariants = new HashSet<string>();
+		public readonly HashSet<string> DisablePrefixes = new HashSet<string>();
 
 		public readonly Lazy<Dictionary<string, SoundPool>> VoicePools;
 		public readonly Lazy<Dictionary<string, SoundPool>> NotificationsPools;
@@ -39,10 +31,6 @@ namespace OpenRA.GameRules
 		public SoundInfo(MiniYaml y)
 		{
 			FieldLoader.Load(this, y);
-			Variants = Load(y, "Variants");
-			Prefixes = Load(y, "Prefixes");
-			Voices = Load(y, "Voices");
-			Notifications = Load(y, "Notifications");
 
 			VoicePools = Exts.Lazy(() => Voices.ToDictionary(a => a.Key, a => new SoundPool(a.Value)));
 			NotificationsPools = Exts.Lazy(() => Notifications.ToDictionary(a => a.Key, a => new SoundPool(a.Value)));

OpenRA.Game/GameRules/WeaponInfo.cs

@@ -21,6 +21,7 @@ namespace OpenRA.GameRules
 		public WeaponInfo Weapon;
 		public int[] DamageModifiers;
 		public int[] InaccuracyModifiers;
+		public int[] RangeModifiers;
 		public int Facing;
 		public WPos Source;
 		public Actor SourceActor;
@@ -47,10 +48,10 @@ namespace OpenRA.GameRules
 		public readonly bool Charges = false;
 
 		[Desc("What types of targets are affected.")]
-		public readonly string[] ValidTargets = { "Ground", "Water" };
+		public readonly HashSet<string> ValidTargets = new HashSet<string> { "Ground", "Water" };
 
 		[Desc("What types of targets are unaffected.", "Overrules ValidTargets.")]
-		public readonly string[] InvalidTargets = { };
+		public readonly HashSet<string> InvalidTargets = new HashSet<string>();
 
 		[Desc("Delay in ticks between firing shots from the same ammo magazine.")]
 		public readonly int BurstDelay = 5;
@@ -64,14 +65,9 @@ namespace OpenRA.GameRules
 		[FieldLoader.LoadUsing("LoadWarheads")]
 		public readonly List<IWarhead> Warheads = new List<IWarhead>();
 
-		readonly HashSet<string> validTargetSet;
-		readonly HashSet<string> invalidTargetSet;
-
 		public WeaponInfo(string name, MiniYaml content)
 		{
 			FieldLoader.Load(this, content);
-			validTargetSet = new HashSet<string>(ValidTargets);
-			invalidTargetSet = new HashSet<string>(InvalidTargets);
 		}
 
 		static object LoadProjectile(MiniYaml yaml)
@@ -99,7 +95,7 @@ namespace OpenRA.GameRules
 
 		public bool IsValidTarget(IEnumerable<string> targetTypes)
 		{
-			return validTargetSet.Overlaps(targetTypes) && !invalidTargetSet.Overlaps(targetTypes);
+			return ValidTargets.Overlaps(targetTypes) && !InvalidTargets.Overlaps(targetTypes);
 		}
 
 		/// <summary>Checks if the weapon is valid against (can target) the target.</summary>
@@ -130,8 +126,8 @@ namespace OpenRA.GameRules
 		/// <summary>Checks if the weapon is valid against (can target) the actor.</summary>
 		public bool IsValidAgainst(Actor victim, Actor firedBy)
 		{
-			var targetable = victim.TraitOrDefault<ITargetable>();
-			if (targetable == null || !IsValidTarget(targetable.TargetTypes))
+			var targetable = victim.TraitsImplementing<ITargetable>().Where(Exts.IsTraitEnabled);
+			if (!IsValidTarget(targetable.SelectMany(t => t.TargetTypes)))
 				return false;
 
 			if (!Warheads.Any(w => w.IsValidAgainst(victim, firedBy)))
@@ -143,8 +139,7 @@ namespace OpenRA.GameRules
 		/// <summary>Checks if the weapon is valid against (can target) the frozen actor.</summary>
 		public bool IsValidAgainst(FrozenActor victim, Actor firedBy)
 		{
-			var targetable = victim.Info.Traits.GetOrDefault<ITargetableInfo>();
-			if (targetable == null || !IsValidTarget(targetable.GetTargetTypes()))
+			if (!IsValidTarget(victim.TargetTypes))
 				return false;
 
 			if (!Warheads.Any(w => w.IsValidAgainst(victim, firedBy)))

OpenRA.Game/GameSpeed.cs

@@ -0,0 +1,40 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Graphics;
+
+namespace OpenRA
+{
+	public class GameSpeed
+	{
+		[Translate]
+		public readonly string Name = "Default";
+		public readonly int Timestep = 40;
+		public readonly int OrderLatency = 3;
+	}
+
+	public class GameSpeeds : IGlobalModData
+	{
+		[FieldLoader.LoadUsing("LoadSpeeds")]
+		public readonly Dictionary<string, GameSpeed> Speeds;
+
+		static object LoadSpeeds(MiniYaml y)
+		{
+			var ret = new Dictionary<string, GameSpeed>();
+			foreach (var node in y.Nodes)
+				ret.Add(node.Key, FieldLoader.Load<GameSpeed>(node.Value));
+
+			return ret;
+		}
+	}
+}

OpenRA.Game/GlobalChat.cs

@@ -0,0 +1,382 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using Meebey.SmartIrc4net;
+using OpenRA;
+using OpenRA.Primitives;
+
+namespace OpenRA.Chat
+{
+	public enum ChatConnectionStatus { Disconnected, Connecting, Connected, Disconnecting, Joined, Error }
+	public enum ChatMessageType { Message, Notification }
+
+	public sealed class ChatUser
+	{
+		public readonly string Name;
+		public bool IsOp;
+		public bool IsVoiced;
+
+		public ChatUser(string name, bool isOp, bool isVoice)
+		{
+			Name = name;
+			IsOp = isOp;
+			IsVoiced = isVoice;
+		}
+	}
+
+	public sealed class ChatMessage
+	{
+		static long nextUID;
+
+		public readonly DateTime Time;
+		public readonly ChatMessageType Type;
+		public readonly string Nick;
+		public readonly string Message;
+		public readonly string UID;
+
+		public ChatMessage(DateTime time, ChatMessageType type, string nick, string message)
+		{
+			Time = time;
+			Type = type;
+			Nick = nick;
+			Message = message;
+
+			UID = Interlocked.Increment(ref nextUID).ToString();
+		}
+
+		public override string ToString()
+		{
+			var time = Time.ToString(Game.Settings.Chat.TimestampFormat);
+			if (Type == ChatMessageType.Notification)
+				return "{0} {1}".F(time, Message);
+
+			return "{0} {1}: {2}".F(time, Nick, Message);
+		}
+	}
+
+	public class GlobalChat : IDisposable
+	{
+		readonly IrcClient client = new IrcClient();
+		volatile Channel channel;
+
+		public readonly ObservableSortedDictionary<string, ChatUser> Users = new ObservableSortedDictionary<string, ChatUser>(StringComparer.InvariantCultureIgnoreCase);
+		public readonly ObservableList<ChatMessage> History = new ObservableList<ChatMessage>();
+
+		volatile string topic;
+		public string Topic { get { return topic; } }
+
+		volatile ChatConnectionStatus connectionStatus = ChatConnectionStatus.Disconnected;
+		public ChatConnectionStatus ConnectionStatus { get { return connectionStatus; } }
+
+		public GlobalChat()
+		{
+			client.Encoding = System.Text.Encoding.UTF8;
+			client.SendDelay = 100;
+			client.ActiveChannelSyncing = true;
+
+			client.OnConnecting += OnConnecting;
+			client.OnConnected += OnConnected;
+			client.OnDisconnecting += OnDisconnecting;
+			client.OnDisconnected += OnDisconnected;
+			client.OnError += OnError;
+			client.OnKick += OnKick;
+
+			client.OnRawMessage += (_, e) => Game.RunAfterTick(() => Log.Write("irc", e.Data.RawMessage));
+			client.OnJoin += OnJoin;
+			client.OnChannelActiveSynced += OnChannelActiveSynced;
+			client.OnTopic += (_, e) => topic = e.Topic;
+			client.OnTopicChange += (_, e) => topic = e.NewTopic;
+			client.OnNickChange += OnNickChange;
+
+			client.OnChannelMessage += (_, e) => AddMessage(e.Data.Nick, e.Data.Message);
+			client.OnOp += (_, e) => SetUserOp(e.Whom, true);
+			client.OnDeop += (_, e) => SetUserOp(e.Whom, false);
+			client.OnVoice += (_, e) => SetUserVoiced(e.Whom, true);
+			client.OnDevoice += (_, e) => SetUserVoiced(e.Whom, false);
+			client.OnPart += OnPart;
+			client.OnQuit += OnQuit;
+		}
+
+		void SetUserOp(string whom, bool isOp)
+		{
+			Game.RunAfterTick(() =>
+			{
+				ChatUser user;
+				if (Users.TryGetValue(whom, out user))
+					user.IsOp = isOp;
+			});
+		}
+
+		void SetUserVoiced(string whom, bool isVoiced)
+		{
+			Game.RunAfterTick(() =>
+			{
+				ChatUser user;
+				if (Users.TryGetValue(whom, out user))
+					user.IsVoiced = isVoiced;
+			});
+		}
+
+		public void Connect()
+		{
+			if (client.IsConnected)
+				return;
+
+			new Thread(() =>
+			{
+				try
+				{
+					client.Connect(Game.Settings.Chat.Hostname, Game.Settings.Chat.Port);
+				}
+				catch (Exception e)
+				{
+					connectionStatus = ChatConnectionStatus.Error;
+					AddNotification(e.Message);
+					Game.RunAfterTick(() => Log.Write("irc", e.ToString()));
+
+					return;
+				}
+
+				client.Listen();
+			}) { Name = "IrcListenThread", IsBackground = true }.Start();
+		}
+
+		void AddNotification(string text)
+		{
+			var message = new ChatMessage(DateTime.Now, ChatMessageType.Notification, null, text);
+			Game.RunAfterTick(() =>
+			{
+				History.Add(message);
+				Log.Write("irc", text);
+			});
+		}
+
+		void AddMessage(string nick, string text)
+		{
+			var message = new ChatMessage(DateTime.Now, ChatMessageType.Message, nick, text);
+			Game.RunAfterTick(() =>
+			{
+				History.Add(message);
+				Log.Write("irc", text);
+			});
+		}
+
+		void OnConnecting(object sender, EventArgs e)
+		{
+			AddNotification("Connecting to {0}:{1}...".F(Game.Settings.Chat.Hostname, Game.Settings.Chat.Port));
+			connectionStatus = ChatConnectionStatus.Connecting;
+		}
+
+		void OnConnected(object sender, EventArgs e)
+		{
+			AddNotification("Connected.");
+			connectionStatus = ChatConnectionStatus.Connected;
+
+			// Guard against settings.yaml modification
+			var nick = SanitizedName(Game.Settings.Chat.Nickname);
+			if (nick != Game.Settings.Chat.Nickname)
+				Game.RunAfterTick(() => Game.Settings.Chat.Nickname = nick);
+
+			client.Login(nick, "in-game IRC client", 0, "OpenRA");
+			client.RfcJoin("#" + Game.Settings.Chat.Channel);
+		}
+
+		void OnDisconnecting(object sender, EventArgs e)
+		{
+			if (connectionStatus != ChatConnectionStatus.Error)
+				connectionStatus = ChatConnectionStatus.Disconnecting;
+		}
+
+		void OnDisconnected(object sender, EventArgs e)
+		{
+			Game.RunAfterTick(Users.Clear);
+
+			// Keep the chat window open if there is an error
+			// It will be cleared by the Disconnect button
+			if (connectionStatus != ChatConnectionStatus.Error)
+			{
+				Game.RunAfterTick(History.Clear);
+				topic = null;
+				connectionStatus = ChatConnectionStatus.Disconnected;
+			}
+		}
+
+		void OnError(object sender, ErrorEventArgs e)
+		{
+			// Ignore any errors that happen during disconnect
+			if (connectionStatus != ChatConnectionStatus.Disconnecting)
+			{
+				connectionStatus = ChatConnectionStatus.Error;
+				AddNotification("Error: " + e.ErrorMessage);
+			}
+		}
+
+		void OnKick(object sender, KickEventArgs e)
+		{
+			Disconnect();
+			connectionStatus = ChatConnectionStatus.Error;
+			AddNotification("Error: You were kicked from the chat by {0}".F(e.Who));
+		}
+
+		void OnJoin(object sender, JoinEventArgs e)
+		{
+			if (e.Who == client.Nickname || e.Channel != channel.Name)
+				return;
+
+			AddNotification("{0} joined the chat.".F(e.Who));
+			Game.RunAfterTick(() => Users.Add(e.Who, new ChatUser(e.Who, false, false)));
+		}
+
+		void OnChannelActiveSynced(object sender, IrcEventArgs e)
+		{
+			channel = client.GetChannel(e.Data.Channel);
+			AddNotification("{0} users online".F(channel.Users.Count));
+			connectionStatus = ChatConnectionStatus.Joined;
+
+			foreach (DictionaryEntry user in channel.Users)
+			{
+				var u = (ChannelUser)user.Value;
+				Game.RunAfterTick(() => Users.Add(u.Nick, new ChatUser(u.Nick, u.IsOp, u.IsVoice)));
+			}
+		}
+
+		void OnNickChange(object sender, NickChangeEventArgs e)
+		{
+			AddNotification("{0} is now known as {1}.".F(e.OldNickname, e.NewNickname));
+
+			Game.RunAfterTick(() =>
+			{
+				ChatUser user;
+				if (!Users.TryGetValue(e.OldNickname, out user))
+					return;
+
+				Users.Remove(e.OldNickname);
+				Users.Add(e.NewNickname, new ChatUser(e.NewNickname, user.IsOp, user.IsVoiced));
+			});
+		}
+
+		void OnQuit(object sender, QuitEventArgs e)
+		{
+			AddNotification("{0} left the chat.".F(e.Who));
+			Game.RunAfterTick(() => Users.Remove(e.Who));
+		}
+
+		void OnPart(object sender, PartEventArgs e)
+		{
+			if (e.Data.Channel != channel.Name)
+				return;
+
+			AddNotification("{0} left the chat.".F(e.Who));
+			Game.RunAfterTick(() => Users.Remove(e.Who));
+		}
+
+		public string SanitizedName(string dirty)
+		{
+			if (string.IsNullOrEmpty(dirty))
+				return null;
+
+			// There is no need to mangle the nick if it is already valid
+			if (Rfc2812.IsValidNickname(dirty))
+				return dirty;
+
+			// TODO: some special chars are allowed as well, but not at every position
+			var clean = new string(dirty.Where(c => char.IsLetterOrDigit(c)).ToArray());
+
+			if (string.IsNullOrEmpty(clean))
+				return null;
+
+			if (char.IsDigit(clean[0]))
+				return SanitizedName(clean.Substring(1));
+
+			// Source: https://tools.ietf.org/html/rfc2812#section-1.2.1
+			if (clean.Length > 9)
+				clean = clean.Substring(0, 9);
+
+			return clean;
+		}
+
+		public bool IsValidNickname(string name)
+		{
+			return Rfc2812.IsValidNickname(name);
+		}
+
+		public void SendMessage(string text)
+		{
+			if (connectionStatus != ChatConnectionStatus.Joined)
+				return;
+
+			// Guard against a last-moment disconnection
+			try
+			{
+				client.SendMessage(SendType.Message, channel.Name, text);
+				AddMessage(client.Nickname, text);
+			}
+			catch (NotConnectedException) { }
+		}
+
+		public bool TrySetNickname(string nick)
+		{
+			// TODO: This is inconsistent with the other check
+			if (Rfc2812.IsValidNickname(nick))
+			{
+				client.RfcNick(nick);
+				Game.Settings.Chat.Nickname = nick;
+				return true;
+			}
+
+			return false;
+		}
+
+		public void Disconnect()
+		{
+			// Error is an alias for disconnect, but keeps the panel open
+			// so that clients can see the error
+			if (connectionStatus == ChatConnectionStatus.Error)
+			{
+				Game.RunAfterTick(History.Clear);
+				topic = null;
+				connectionStatus = ChatConnectionStatus.Disconnected;
+			}
+			else
+				connectionStatus = ChatConnectionStatus.Disconnecting;
+
+			if (!client.IsConnected)
+				return;
+
+			client.RfcQuit(Game.Settings.Chat.QuitMessage);
+
+			AddNotification("Disconnecting from {0}...".F(client.Address));
+
+			Game.RunAfterTick(() => Game.Settings.Chat.ConnectAutomatically = false);
+		}
+
+		public void Dispose()
+		{
+			// HACK: The IRC library we are using has terrible thread-handling code that relies on Thread.Abort.
+			// There is a thread reading from the network socket which is aborted, however on Windows this is inside
+			// native code so this abort call hangs until the network socket reads something and returns to managed
+			// code where it can then be aborted.
+			//
+			// This means we may hang for several seconds during shutdown (until we receive something over IRC!) before
+			// closing.
+			//
+			// Since our IRC client currently lives forever, the only time we call this Dispose method is during the
+			// shutdown of our process. Therefore, we can work around the problem by just not bothering to disconnect
+			// properly. Since our process is about to die anyway, it's not like anyone will care.
+			////if (client.IsConnected)
+			////	client.Disconnect();
+		}
+	}
+}

OpenRA.Game/Graphics/ChromeProvider.cs

@@ -106,7 +106,7 @@ namespace OpenRA.Graphics
 				sheet = cachedSheets[mi.Src];
 			else
 			{
-				sheet = new Sheet(mi.Src);
+				sheet = new Sheet(SheetType.BGRA, mi.Src);
 				cachedSheets.Add(mi.Src, sheet);
 			}
 

OpenRA.Game/Graphics/IGraphicsDevice.cs

@@ -15,11 +15,11 @@ using OpenRA.Graphics;
 namespace OpenRA
 {
 	[AttributeUsage(AttributeTargets.Assembly)]
-	public sealed class RendererAttribute : Attribute
+	public sealed class PlatformAttribute : Attribute
 	{
 		public readonly Type Type;
 
-		public RendererAttribute(Type graphicsDeviceType)
+		public PlatformAttribute(Type graphicsDeviceType)
 		{
 			if (!typeof(IDeviceFactory).IsAssignableFrom(graphicsDeviceType))
 				throw new InvalidOperationException("Incorrect type in RendererAttribute");
@@ -29,7 +29,8 @@ namespace OpenRA
 
 	public interface IDeviceFactory
 	{
-		IGraphicsDevice Create(Size size, WindowMode windowMode);
+		IGraphicsDevice CreateGraphics(Size size, WindowMode windowMode);
+		ISoundEngine CreateSound();
 	}
 
 	public interface IHardwareCursor : IDisposable { }
@@ -88,6 +89,7 @@ namespace OpenRA
 
 	public interface IShader
 	{
+		void SetBool(string name, bool value);
 		void SetVec(string name, float x);
 		void SetVec(string name, float x, float y);
 		void SetVec(string name, float[] vec, int length);

OpenRA.Game/Graphics/Minimap.cs

@@ -20,17 +20,17 @@ namespace OpenRA.Graphics
 	{
 		public static Bitmap TerrainBitmap(TileSet tileset, Map map, bool actualSize = false)
 		{
-			var isDiamond = map.TileShape == TileShape.Diamond;
+			var isRectangularIsometric = map.Grid.Type == MapGridType.RectangularIsometric;
 			var b = map.Bounds;
 
 			// Fudge the heightmap offset by adding as much extra as we need / can.
 			// This tries to correct for our incorrect assumption that MPos == PPos
-			var heightOffset = Math.Min(map.MaximumTerrainHeight, map.MapSize.Y - b.Bottom);
+			var heightOffset = Math.Min(map.Grid.MaximumTerrainHeight, map.MapSize.Y - b.Bottom);
 			var width = b.Width;
 			var height = b.Height + heightOffset;
 
 			var bitmapWidth = width;
-			if (isDiamond)
+			if (isRectangularIsometric)
 				bitmapWidth = 2 * bitmapWidth - 1;
 
 			if (!actualSize)
@@ -55,7 +55,7 @@ namespace OpenRA.Graphics
 						var type = tileset.GetTileInfo(mapTiles[uv]);
 						var leftColor = type != null ? type.LeftColor : Color.Black;
 
-						if (isDiamond)
+						if (isRectangularIsometric)
 						{
 							// Odd rows are shifted right by 1px
 							var dx = uv.V & 1;
@@ -81,16 +81,16 @@ namespace OpenRA.Graphics
 		static Bitmap AddStaticResources(TileSet tileset, Map map, Ruleset resourceRules, Bitmap terrainBitmap)
 		{
 			var terrain = new Bitmap(terrainBitmap);
-			var isDiamond = map.TileShape == TileShape.Diamond;
+			var isRectangularIsometric = map.Grid.Type == MapGridType.RectangularIsometric;
 			var b = map.Bounds;
 
 			// Fudge the heightmap offset by adding as much extra as we need / can
 			// This tries to correct for our incorrect assumption that MPos == PPos
-			var heightOffset = Math.Min(map.MaximumTerrainHeight, map.MapSize.Y - b.Bottom);
+			var heightOffset = Math.Min(map.Grid.MaximumTerrainHeight, map.MapSize.Y - b.Bottom);
 			var width = b.Width;
 			var height = b.Height + heightOffset;
 
-			var resources = resourceRules.Actors["world"].Traits.WithInterface<ResourceTypeInfo>()
+			var resources = resourceRules.Actors["world"].TraitInfos<ResourceTypeInfo>()
 				.ToDictionary(r => r.ResourceType, r => r.TerrainType);
 
 			var bitmapData = terrain.LockBits(terrain.Bounds(),
@@ -113,7 +113,7 @@ namespace OpenRA.Graphics
 							continue;
 
 						var color = tileset[tileset.GetTerrainIndex(res)].Color.ToArgb();
-						if (isDiamond)
+						if (isRectangularIsometric)
 						{
 							// Odd rows are shifted right by 1px
 							var dx = uv.V & 1;

OpenRA.Game/Graphics/PlayerColorRemap.cs

@@ -33,16 +33,17 @@ namespace OpenRA.Graphics
 			var c2 = new HSLColor(c.H, c.S, (byte)Math.Max(0, c.L - rampRange)).RGB;
 			var baseIndex = ramp[0];
 			var remapRamp = ramp.Select(r => r - ramp[0]);
+			var rampMaxIndex = ramp.Length - 1;
 
 			// reversed remapping
-			if (ramp[0] > ramp[15])
+			if (ramp[0] > ramp[rampMaxIndex])
 			{
-				baseIndex = ramp[15];
-				for (var i = 15; i > 0; i--)
-					remapRamp = ramp.Select(r => r - ramp[15]);
+				baseIndex = ramp[rampMaxIndex];
+				for (var i = rampMaxIndex; i > 0; i--)
+					remapRamp = ramp.Select(r => r - ramp[rampMaxIndex]);
 			}
 
-			remapColors = remapRamp.Select((x, i) => Pair.New(baseIndex + i, Exts.ColorLerp(x / 16f, c1, c2)))
+			remapColors = remapRamp.Select((x, i) => Pair.New(baseIndex + i, Exts.ColorLerp(x / (float)ramp.Length, c1, c2)))
 				.ToDictionary(u => u.First, u => u.Second);
 		}
 

OpenRA.Game/Graphics/SelectionBarsRenderable.cs

@@ -74,7 +74,7 @@ namespace OpenRA.Graphics
 			wlr.DrawLine(start + r, z + r, barColor2);
 		}
 
-		Color GetHealthColor(Health health)
+		Color GetHealthColor(IHealth health)
 		{
 			var player = actor.World.RenderPlayer ?? actor.World.LocalPlayer;
 
@@ -104,7 +104,7 @@ namespace OpenRA.Graphics
 					health.DamageState == DamageState.Heavy ? Color.Yellow : Color.LimeGreen;
 		}
 
-		void DrawHealthBar(WorldRenderer wr, Health health, float2 start, float2 end)
+		void DrawHealthBar(WorldRenderer wr, IHealth health, float2 start, float2 end)
 		{
 			if (health == null || health.IsDead)
 				return;
@@ -133,7 +133,7 @@ namespace OpenRA.Graphics
 			wlr.DrawLine(start + q, z + q, healthColor);
 			wlr.DrawLine(start + r, z + r, healthColor2);
 
-			if (health.DisplayHp != health.HP)
+			if (health.DisplayHP != health.HP)
 			{
 				var deltaColor = Color.OrangeRed;
 				var deltaColor2 = Color.FromArgb(
@@ -141,7 +141,7 @@ namespace OpenRA.Graphics
 					deltaColor.R / 2,
 					deltaColor.G / 2,
 					deltaColor.B / 2);
-				var zz = float2.Lerp(start, end, (float)health.DisplayHp / health.MaxHP);
+				var zz = float2.Lerp(start, end, (float)health.DisplayHP / health.MaxHP);
 
 				wlr.DrawLine(z + p, zz + p, deltaColor2);
 				wlr.DrawLine(z + q, zz + q, deltaColor);
@@ -155,7 +155,7 @@ namespace OpenRA.Graphics
 			if (!actor.IsInWorld || actor.IsDead)
 				return;
 
-			var health = actor.TraitOrDefault<Health>();
+			var health = actor.TraitOrDefault<IHealth>();
 
 			var screenPos = wr.ScreenPxPosition(pos);
 			var bounds = actor.VisualBounds;

OpenRA.Game/Graphics/Sheet.cs

@@ -24,6 +24,8 @@ namespace OpenRA.Graphics
 		byte[] data;
 
 		public readonly Size Size;
+		public readonly SheetType Type;
+
 		public byte[] GetData()
 		{
 			CreateBuffer();
@@ -32,18 +34,20 @@ namespace OpenRA.Graphics
 
 		public bool Buffered { get { return data != null || texture == null; } }
 
-		public Sheet(Size size)
+		public Sheet(SheetType type, Size size)
 		{
+			Type = type;
 			Size = size;
 		}
 
-		public Sheet(ITexture texture)
+		public Sheet(SheetType type, ITexture texture)
 		{
+			Type = type;
 			this.texture = texture;
 			Size = texture.Size;
 		}
 
-		public Sheet(string filename)
+		public Sheet(SheetType type, string filename)
 		{
 			using (var stream = GlobalFileSystem.Open(filename))
 			using (var bitmap = (Bitmap)Image.FromStream(stream))
@@ -54,6 +58,7 @@ namespace OpenRA.Graphics
 				Util.FastCopyIntoSprite(new Sprite(this, bitmap.Bounds(), TextureChannel.Red), bitmap);
 			}
 
+			Type = type;
 			ReleaseBuffer();
 		}
 

OpenRA.Game/Graphics/SheetBuilder.cs

@@ -40,16 +40,16 @@ namespace OpenRA.Graphics
 		int rowHeight = 0;
 		Point p;
 
-		public static Sheet AllocateSheet(int sheetSize)
+		public static Sheet AllocateSheet(SheetType type, int sheetSize)
 		{
-			return new Sheet(new Size(sheetSize, sheetSize));
+			return new Sheet(type, new Size(sheetSize, sheetSize));
 		}
 
 		public SheetBuilder(SheetType t)
 			: this(t, Game.Settings.Graphics.SheetSize) { }
 
 		public SheetBuilder(SheetType t, int sheetSize)
-			: this(t, () => AllocateSheet(sheetSize)) { }
+			: this(t, () => AllocateSheet(t, sheetSize)) { }
 
 		public SheetBuilder(SheetType t, Func<Sheet> allocateSheet)
 		{

OpenRA.Game/Graphics/Sprite.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System;
 using System.Drawing;
 
 namespace OpenRA.Graphics
@@ -37,10 +38,10 @@ namespace OpenRA.Graphics
 
 			FractionalOffset = offset / Size;
 
-			Left = (float)bounds.Left / sheet.Size.Width;
-			Top = (float)bounds.Top / sheet.Size.Height;
-			Right = (float)bounds.Right / sheet.Size.Width;
-			Bottom = (float)bounds.Bottom / sheet.Size.Height;
+			Left = (float)Math.Min(bounds.Left, bounds.Right) / sheet.Size.Width;
+			Top = (float)Math.Min(bounds.Top, bounds.Bottom) / sheet.Size.Height;
+			Right = (float)Math.Max(bounds.Left, bounds.Right) / sheet.Size.Width;
+			Bottom = (float)Math.Max(bounds.Top, bounds.Bottom) / sheet.Size.Height;
 		}
 	}
 

OpenRA.Game/Graphics/SpriteRenderer.cs

@@ -119,5 +119,10 @@ namespace OpenRA.Graphics
 			shader.SetVec("r1", zoom * 2f / screen.Width, -zoom * 2f / screen.Height);
 			shader.SetVec("r2", -1, 1);
 		}
+
+		public void SetDepthPreviewEnabled(bool enabled)
+		{
+			shader.SetBool("EnableDepthPreview", enabled);
+		}
 	}
 }

OpenRA.Game/Graphics/TerrainRenderer.cs

@@ -18,11 +18,13 @@ namespace OpenRA.Graphics
 		readonly TerrainSpriteLayer terrain;
 		readonly Theater theater;
 		readonly CellLayer<TerrainTile> mapTiles;
+		readonly CellLayer<byte> mapHeight;
 
 		public TerrainRenderer(World world, WorldRenderer wr)
 		{
 			theater = wr.Theater;
 			mapTiles = world.Map.MapTiles.Value;
+			mapHeight = world.Map.MapHeight.Value;
 
 			terrain = new TerrainSpriteLayer(world, wr, theater.Sheet, BlendMode.Alpha,
 				wr.Palette("terrain"), wr.World.Type != WorldType.Editor);
@@ -30,8 +32,8 @@ namespace OpenRA.Graphics
 			foreach (var cell in world.Map.AllCells)
 				UpdateCell(cell);
 
-			world.Map.MapTiles.Value.CellEntryChanged += UpdateCell;
-			world.Map.MapHeight.Value.CellEntryChanged += UpdateCell;
+			mapTiles.CellEntryChanged += UpdateCell;
+			mapHeight.CellEntryChanged += UpdateCell;
 		}
 
 		public void UpdateCell(CPos cell)
@@ -48,6 +50,8 @@ namespace OpenRA.Graphics
 
 		public void Dispose()
 		{
+			mapTiles.CellEntryChanged -= UpdateCell;
+			mapHeight.CellEntryChanged -= UpdateCell;
 			terrain.Dispose();
 		}
 	}

OpenRA.Game/Graphics/TerrainSpriteLayer.cs

@@ -33,7 +33,7 @@ namespace OpenRA.Graphics
 		readonly WorldRenderer worldRenderer;
 		readonly Map map;
 
-		float paletteIndex;
+		readonly PaletteReference palette;
 
 		public TerrainSpriteLayer(World world, WorldRenderer wr, Sheet sheet, BlendMode blendMode, PaletteReference palette, bool restrictToBounds)
 		{
@@ -41,7 +41,7 @@ namespace OpenRA.Graphics
 			this.restrictToBounds = restrictToBounds;
 			Sheet = sheet;
 			BlendMode = blendMode;
-			paletteIndex = palette.TextureIndex;
+			this.palette = palette;
 
 			map = world.Map;
 			rowStride = 4 * map.MapSize.X;
@@ -50,28 +50,28 @@ namespace OpenRA.Graphics
 			vertexBuffer = Game.Renderer.Device.CreateVertexBuffer(vertices.Length);
 			emptySprite = new Sprite(sheet, Rectangle.Empty, TextureChannel.Alpha);
 
-			wr.PaletteInvalidated += () =>
+			wr.PaletteInvalidated += UpdatePaletteIndices;
+		}
+
+		void UpdatePaletteIndices()
+		{
+			// Everything in the layer uses the same palette,
+			// so we can fix the indices in one pass
+			for (var i = 0; i < vertices.Length; i++)
 			{
-				paletteIndex = palette.TextureIndex;
+				var v = vertices[i];
+				vertices[i] = new Vertex(v.X, v.Y, v.Z, v.U, v.V, palette.TextureIndex, v.C);
+			}
 
-				// Everything in the layer uses the same palette,
-				// so we can fix the indices in one pass
-				for (var i = 0; i < vertices.Length; i++)
-				{
-					var v = vertices[i];
-					vertices[i] = new Vertex(v.X, v.Y, v.Z, v.U, v.V, paletteIndex, v.C);
-				}
-
-				for (var row = 0; row < map.MapSize.Y; row++)
-					dirtyRows.Add(row);
-			};
+			for (var row = 0; row < map.MapSize.Y; row++)
+				dirtyRows.Add(row);
 		}
 
 		public void Update(CPos cell, Sprite sprite)
 		{
 			var pos = sprite == null ? float2.Zero :
 				worldRenderer.ScreenPosition(map.CenterOfCell(cell)) + sprite.Offset - 0.5f * sprite.Size;
-			Update(cell.ToMPos(map.TileShape), sprite, pos);
+			Update(cell.ToMPos(map.Grid.Type), sprite, pos);
 		}
 
 		public void Update(MPos uv, Sprite sprite, float2 pos)
@@ -88,7 +88,7 @@ namespace OpenRA.Graphics
 				sprite = emptySprite;
 
 			var offset = rowStride * uv.V + 4 * uv.U;
-			Util.FastCreateQuad(vertices, pos, sprite, paletteIndex, offset, sprite.Size);
+			Util.FastCreateQuad(vertices, pos, sprite, palette.TextureIndex, offset, sprite.Size);
 
 			dirtyRows.Add(uv.V);
 		}
@@ -130,6 +130,7 @@ namespace OpenRA.Graphics
 
 		public void Dispose()
 		{
+			worldRenderer.PaletteInvalidated -= UpdatePaletteIndices;
 			vertexBuffer.Dispose();
 		}
 	}

OpenRA.Game/Graphics/Theater.cs

@@ -43,16 +43,18 @@ namespace OpenRA.Graphics
 		{
 			this.tileset = tileset;
 			var allocated = false;
+			var type = tileset.EnableDepth ? SheetType.DualIndexed : SheetType.Indexed;
+
 			Func<Sheet> allocate = () =>
 			{
 				if (allocated)
 					throw new SheetOverflowException("Terrain sheet overflow. Try increasing the tileset SheetSize parameter.");
 				allocated = true;
 
-				return new Sheet(new Size(tileset.SheetSize, tileset.SheetSize));
+				return new Sheet(type, new Size(tileset.SheetSize, tileset.SheetSize));
 			};
 
-			sheetBuilder = new SheetBuilder(SheetType.Indexed, allocate);
+			sheetBuilder = new SheetBuilder(type, allocate);
 			random = new MersenneTwister();
 
 			var frameCache = new FrameCache(Game.ModData.SpriteLoaders);
@@ -63,8 +65,19 @@ namespace OpenRA.Graphics
 				foreach (var i in t.Value.Images)
 				{
 					var allFrames = frameCache[i];
-					var frames = t.Value.Frames != null ? t.Value.Frames.Select(f => allFrames[f]).ToArray() : allFrames;
-					variants.Add(frames.Select(f => sheetBuilder.Add(f)).ToArray());
+					var frameCount = tileset.EnableDepth ? allFrames.Length / 2 : allFrames.Length;
+					var indices = t.Value.Frames != null ? t.Value.Frames : Enumerable.Range(0, frameCount);
+					variants.Add(indices.Select(j =>
+					{
+						var f = allFrames[j];
+						var s = sheetBuilder.Allocate(f.Size, f.Offset);
+						Util.FastCopyIntoChannel(s, 0, f.Data);
+
+						if (tileset.EnableDepth)
+							Util.FastCopyIntoChannel(s, 1, allFrames[j + frameCount].Data);
+
+						return s;
+					}).ToArray());
 				}
 
 				var allSprites = variants.SelectMany(s => s);
@@ -95,7 +108,7 @@ namespace OpenRA.Graphics
 			return template.Sprites[start * template.Stride + r.Index];
 		}
 
-		public Rectangle TemplateBounds(TerrainTemplateInfo template, Size tileSize, TileShape tileShape)
+		public Rectangle TemplateBounds(TerrainTemplateInfo template, Size tileSize, MapGridType mapGrid)
 		{
 			Rectangle? templateRect = null;
 
@@ -112,8 +125,8 @@ namespace OpenRA.Graphics
 						continue;
 
 					var sprite = TileSprite(tile);
-					var u = tileShape == TileShape.Rectangle ? x : (x - y) / 2f;
-					var v = tileShape == TileShape.Rectangle ? y : (x + y) / 2f;
+					var u = mapGrid == MapGridType.Rectangular ? x : (x - y) / 2f;
+					var v = mapGrid == MapGridType.Rectangular ? y : (x + y) / 2f;
 
 					var tl = new float2(u * tileSize.Width, (v - 0.5f * tileInfo.Height) * tileSize.Height) - 0.5f * sprite.Size;
 					var rect = new Rectangle((int)(tl.X + sprite.Offset.X), (int)(tl.Y + sprite.Offset.Y), (int)sprite.Size.X, (int)sprite.Size.Y);

OpenRA.Game/Graphics/Util.cs

@@ -19,7 +19,7 @@ namespace OpenRA.Graphics
 	{
 		// yes, our channel order is nuts.
 		static readonly int[] ChannelMasks = { 2, 1, 0, 3 };
-		static readonly float[] ChannelSelect = { 0.75f, 0.25f, -0.25f, -0.75f };
+		static readonly float[] ChannelSelect = { 0.2f, 0.4f, 0.6f, 0.8f };
 
 		public static void FastCreateQuad(Vertex[] vertices, float2 o, Sprite r, float paletteTextureIndex, int nv, float2 size)
 		{
@@ -32,6 +32,8 @@ namespace OpenRA.Graphics
 		public static void FastCreateQuad(Vertex[] vertices, float2 a, float2 b, float2 c, float2 d, Sprite r, float paletteTextureIndex, int nv)
 		{
 			var attribC = ChannelSelect[(int)r.Channel];
+			if (r.Sheet.Type == SheetType.DualIndexed)
+				attribC *= -1;
 
 			vertices[nv] = new Vertex(a, r.Left, r.Top, paletteTextureIndex, attribC);
 			vertices[nv + 1] = new Vertex(b, r.Right, r.Top, paletteTextureIndex, attribC);

OpenRA.Game/Graphics/Viewport.cs

@@ -9,7 +9,6 @@
 #endregion
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -92,15 +91,15 @@ namespace OpenRA.Graphics
 		public Viewport(WorldRenderer wr, Map map)
 		{
 			worldRenderer = wr;
+			var grid = Game.ModData.Manifest.Get<MapGrid>();
 
 			// Calculate map bounds in world-px
 			if (wr.World.Type == WorldType.Editor)
 			{
 				// The full map is visible in the editor
-				var ts = Game.ModData.Manifest.TileSize;
-				var width = map.MapSize.X * ts.Width;
-				var height = map.MapSize.Y * ts.Height;
-				if (wr.World.Map.TileShape == TileShape.Diamond)
+				var width = map.MapSize.X * grid.TileSize.Width;
+				var height = map.MapSize.Y * grid.TileSize.Height;
+				if (wr.World.Map.Grid.Type == MapGridType.RectangularIsometric)
 					height /= 2;
 
 				mapBounds = new Rectangle(0, 0, width, height);
@@ -115,23 +114,22 @@ namespace OpenRA.Graphics
 			}
 
 			Zoom = Game.Settings.Graphics.PixelDouble ? 2 : 1;
-			tileSize = Game.ModData.Manifest.TileSize;
+			tileSize = grid.TileSize;
 		}
 
 		public CPos ViewToWorld(int2 view)
 		{
 			var world = worldRenderer.Viewport.ViewToWorldPx(view);
 			var map = worldRenderer.World.Map;
-			var ts = Game.ModData.Manifest.TileSize;
-			var candidates = CandidateMouseoverCells(world);
+			var candidates = CandidateMouseoverCells(world).ToList();
 			var tileSet = worldRenderer.World.TileSet;
 
 			foreach (var uv in candidates)
 			{
 				// Coarse filter to nearby cells
-				var p = map.CenterOfCell(uv.ToCPos(map.TileShape));
+				var p = map.CenterOfCell(uv.ToCPos(map.Grid.Type));
 				var s = worldRenderer.ScreenPxPosition(p);
-				if (Math.Abs(s.X - world.X) <= ts.Width && Math.Abs(s.Y - world.Y) <= ts.Height)
+				if (Math.Abs(s.X - world.X) <= tileSize.Width && Math.Abs(s.Y - world.Y) <= tileSize.Height)
 				{
 					var ramp = 0;
 					if (map.Contains(uv))
@@ -153,11 +151,11 @@ namespace OpenRA.Graphics
 
 			// Mouse is not directly over a cell (perhaps on a cliff)
 			// Try and find the closest cell
-			if (candidates.Any())
+			if (candidates.Count > 0)
 			{
 				return candidates.OrderBy(uv =>
 				{
-					var p = map.CenterOfCell(uv.ToCPos(map.TileShape));
+					var p = map.CenterOfCell(uv.ToCPos(map.Grid.Type));
 					var s = worldRenderer.ScreenPxPosition(p);
 					var dx = Math.Abs(s.X - world.X);
 					var dy = Math.Abs(s.Y - world.Y);
@@ -177,8 +175,8 @@ namespace OpenRA.Graphics
 			var minPos = worldRenderer.ProjectedPosition(world);
 
 			// Find all the cells that could potentially have been clicked
-			var a = map.CellContaining(minPos - new WVec(1024, 0, 0)).ToMPos(map.TileShape);
-			var b = map.CellContaining(minPos + new WVec(512, 512 * map.MaximumTerrainHeight, 0)).ToMPos(map.TileShape);
+			var a = map.CellContaining(minPos - new WVec(1024, 0, 0)).ToMPos(map.Grid.Type);
+			var b = map.CellContaining(minPos + new WVec(512, 512 * map.Grid.MaximumTerrainHeight, 0)).ToMPos(map.Grid.Type);
 
 			for (var v = b.V; v >= a.V; v--)
 				for (var u = b.U; u >= a.U; u--)
@@ -241,10 +239,9 @@ namespace OpenRA.Graphics
 			var tl = (PPos)map.CellContaining(worldRenderer.ProjectedPosition(TopLeft)).ToMPos(map);
 			var br = (PPos)map.CellContaining(worldRenderer.ProjectedPosition(BottomRight)).ToMPos(map);
 
-			// Diamond tile shapes don't have straight edges, and so we need
-			// an additional cell margin to include the cells that are half
-			// visible on each edge.
-			if (map.TileShape == TileShape.Diamond)
+			// RectangularIsometric maps don't have straight edges, and so we need an additional
+			// cell margin to include the cells that are half visible on each edge.
+			if (map.Grid.Type == MapGridType.RectangularIsometric)
 			{
 				tl = new PPos(tl.U - 1, tl.V - 1);
 				br = new PPos(br.U + 1, br.V + 1);

OpenRA.Game/Graphics/VoxelLoader.cs

@@ -52,7 +52,7 @@ namespace OpenRA.Graphics
 				if (allocated)
 					throw new SheetOverflowException("");
 				allocated = true;
-				return SheetBuilder.AllocateSheet(Game.Settings.Graphics.SheetSize);
+				return SheetBuilder.AllocateSheet(SheetType.DualIndexed, Game.Settings.Graphics.SheetSize);
 			};
 
 			return new SheetBuilder(SheetType.DualIndexed, allocate);
@@ -220,7 +220,7 @@ namespace OpenRA.Graphics
 			using (var s = GlobalFileSystem.Open(files.First + ".vxl"))
 				vxl = new VxlReader(s);
 			using (var s = GlobalFileSystem.Open(files.Second + ".hva"))
-				hva = new HvaReader(s);
+				hva = new HvaReader(s, files.Second + ".hva");
 			return new Voxel(this, vxl, hva);
 		}
 

OpenRA.Game/Graphics/VoxelRenderer.cs

@@ -331,7 +331,7 @@ namespace OpenRA.Graphics
 
 			var size = new Size(renderer.SheetSize, renderer.SheetSize);
 			var framebuffer = renderer.Device.CreateFrameBuffer(size);
-			var sheet = new Sheet(framebuffer.Texture);
+			var sheet = new Sheet(SheetType.DualIndexed, framebuffer.Texture);
 			mappedBuffers.Add(sheet, framebuffer);
 
 			return sheet;

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -25,6 +25,7 @@ namespace OpenRA.Graphics
 		static readonly int[][] RangeCircleStartRotations = Exts.MakeArray(RangeCircleSegments, i => WRot.FromFacing(8 * i).AsMatrix());
 		static readonly int[][] RangeCircleEndRotations = Exts.MakeArray(RangeCircleSegments, i => WRot.FromFacing(8 * i + 6).AsMatrix());
 
+		public readonly Size TileSize;
 		public readonly World World;
 		public readonly Theater Theater;
 		public Viewport Viewport { get; private set; }
@@ -40,6 +41,7 @@ namespace OpenRA.Graphics
 		internal WorldRenderer(World world)
 		{
 			World = world;
+			TileSize = World.Map.Grid.TileSize;
 			Viewport = new Viewport(this, world.Map);
 
 			createPaletteReference = CreatePaletteReference;
@@ -130,6 +132,9 @@ namespace OpenRA.Graphics
 			if (World.WorldActor.Disposed)
 				return;
 
+			if (devTrait.Value != null)
+				Game.Renderer.WorldSpriteRenderer.SetDepthPreviewEnabled(devTrait.Value.ShowDepthPreview);
+
 			RefreshPalette();
 
 			if (World.Type == WorldType.Shellmap && !Game.Settings.Game.ShowShellmap)
@@ -145,7 +150,6 @@ namespace OpenRA.Graphics
 			for (var i = 0; i < renderables.Count; i++)
 				renderables[i].Render(this);
 
-			// added for contrails
 			foreach (var a in World.ActorsWithTrait<IPostRender>())
 				if (a.Actor.IsInWorld && !a.Actor.Disposed)
 					a.Trait.RenderAfterWorld(this, a.Actor);
@@ -182,7 +186,7 @@ namespace OpenRA.Graphics
 			if (World.Type == WorldType.Regular && Game.Settings.Game.AlwaysShowStatusBars)
 			{
 				foreach (var g in World.Actors.Where(a => !a.Disposed
-					&& a.HasTrait<Selectable>()
+					&& a.Info.HasTraitInfo<SelectableInfo>()
 					&& !World.FogObscures(a)
 					&& !World.Selection.Actors.Contains(a)))
 
@@ -194,7 +198,7 @@ namespace OpenRA.Graphics
 
 		public void DrawRollover(Actor unit)
 		{
-			if (unit.HasTrait<Selectable>())
+			if (unit.Info.HasTraitInfo<SelectableInfo>())
 				new SelectionBarsRenderable(unit).Render(this);
 		}
 
@@ -232,8 +236,7 @@ namespace OpenRA.Graphics
 		// Conversion between world and screen coordinates
 		public float2 ScreenPosition(WPos pos)
 		{
-			var ts = Game.ModData.Manifest.TileSize;
-			return new float2(ts.Width * pos.X / 1024f, ts.Height * (pos.Y - pos.Z) / 1024f);
+			return new float2(TileSize.Width * pos.X / 1024f, TileSize.Height * (pos.Y - pos.Z) / 1024f);
 		}
 
 		public int2 ScreenPxPosition(WPos pos)
@@ -246,10 +249,9 @@ namespace OpenRA.Graphics
 		// For scaling vectors to pixel sizes in the voxel renderer
 		public void ScreenVectorComponents(WVec vec, out float x, out float y, out float z)
 		{
-			var ts = Game.ModData.Manifest.TileSize;
-			x = ts.Width * vec.X / 1024f;
-			y = ts.Height * vec.Y / 1024f;
-			z = ts.Height * vec.Z / 1024f;
+			x = TileSize.Width * vec.X / 1024f;
+			y = TileSize.Height * vec.Y / 1024f;
+			z = TileSize.Height * vec.Z / 1024f;
 		}
 
 		// For scaling vectors to pixel sizes in the voxel renderer
@@ -270,8 +272,7 @@ namespace OpenRA.Graphics
 
 		public float ScreenZPosition(WPos pos, int offset)
 		{
-			var ts = Game.ModData.Manifest.TileSize;
-			return ZPosition(pos, offset) * ts.Height / 1024f;
+			return ZPosition(pos, offset) * TileSize.Height / 1024f;
 		}
 
 		static int ZPosition(WPos pos, int offset)
@@ -285,8 +286,7 @@ namespace OpenRA.Graphics
 		/// </summary>
 		public WPos ProjectedPosition(int2 screenPx)
 		{
-			var ts = Game.ModData.Manifest.TileSize;
-			return new WPos(1024 * screenPx.X / ts.Width, 1024 * screenPx.Y / ts.Height, 0);
+			return new WPos(1024 * screenPx.X / TileSize.Width, 1024 * screenPx.Y / TileSize.Height, 0);
 		}
 
 		public void Dispose()

OpenRA.Game/IUtilityCommand.cs

@@ -17,6 +17,8 @@ namespace OpenRA
 		/// </summary>
 		string Name { get; }
 
+		bool ValidateArguments(string[] args);
+
 		void Run(ModData modData, string[] args);
 	}
 }

OpenRA.Game/MPos.cs

@@ -38,15 +38,15 @@ namespace OpenRA
 
 		public CPos ToCPos(Map map)
 		{
-			return ToCPos(map.TileShape);
+			return ToCPos(map.Grid.Type);
 		}
 
-		public CPos ToCPos(TileShape shape)
+		public CPos ToCPos(MapGridType gridType)
 		{
-			if (shape == TileShape.Rectangle)
+			if (gridType == MapGridType.Rectangular)
 				return new CPos(U, V);
 
-			// Convert from rectangular map position to diamond cell position
+			// Convert from rectangular map position to RectangularIsometric cell position
 			//  - The staggered rows make this fiddly (hint: draw a diagram!)
 			// (a) Consider the relationships:
 			//  - +1u (even -> odd) adds (1, -1) to (x, y)

OpenRA.Game/Manifest.cs

@@ -10,14 +10,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using OpenRA.Primitives;
 
 namespace OpenRA
 {
-	public enum TileShape { Rectangle, Diamond }
 	public interface IGlobalModData { }
 
 	public sealed class SpriteSequenceFormat : IGlobalModData
@@ -47,31 +45,13 @@ namespace OpenRA
 		public readonly MiniYaml LobbyDefaults;
 
 		public readonly Dictionary<string, Pair<string, int>> Fonts;
-		public readonly Size TileSize = new Size(24, 24);
-		public readonly TileShape TileShape = TileShape.Rectangle;
-		public readonly byte MaximumTerrainHeight = 0;
 
 		public readonly string[] SpriteFormats = { };
 
-		[Desc("(x,y,z) offset of the full cell and each sub-cell", "X & Y should be between -512 ... 512 and Z >= 0")]
-		public readonly WVec[] SubCellOffsets =
-		{
-			new WVec(0, 0, 0),       // full cell - index 0
-			new WVec(-299, -256, 0), // top left - index 1
-			new WVec(256, -256, 0),  // top right - index 2
-			new WVec(0, 0, 0),       // center - index 3
-			new WVec(-299, 256, 0),  // bottom left - index 4
-			new WVec(256, 256, 0),   // bottom right - index 5
-		};
-
-		[Desc("Default subcell index used if SubCellInit is absent", "0 - full cell, 1 - first sub-cell")]
-		public readonly int SubCellDefaultIndex = 3;
-
 		readonly string[] reservedModuleNames = { "Metadata", "Folders", "MapFolders", "Packages", "Rules",
 			"Sequences", "VoxelSequences", "Cursors", "Chrome", "Assemblies", "ChromeLayout", "Weapons",
 			"Voices", "Notifications", "Music", "Translations", "TileSets", "ChromeMetrics", "Missions",
-			"ServerTraits", "LoadScreen", "LobbyDefaults", "Fonts", "TileSize", "MaximumTerrainHeight",
-			"TileShape", "SubCells", "SupportsMapsFrom", "SpriteFormats" };
+			"ServerTraits", "LoadScreen", "LobbyDefaults", "Fonts", "SupportsMapsFrom", "SpriteFormats" };
 
 		readonly TypeDictionary modules = new TypeDictionary();
 		readonly Dictionary<string, MiniYaml> yaml;
@@ -118,33 +98,6 @@ namespace OpenRA
 					return Pair.New(nd["Font"].Value, Exts.ParseIntegerInvariant(nd["Size"].Value));
 				});
 
-			if (yaml.ContainsKey("TileSize"))
-				TileSize = FieldLoader.GetValue<Size>("TileSize", yaml["TileSize"].Value);
-
-			if (yaml.ContainsKey("TileShape"))
-				TileShape = FieldLoader.GetValue<TileShape>("TileShape", yaml["TileShape"].Value);
-
-			if (yaml.ContainsKey("MaximumTerrainHeight"))
-				MaximumTerrainHeight = FieldLoader.GetValue<byte>("MaximumTerrainHeight", yaml["MaximumTerrainHeight"].Value);
-
-			if (yaml.ContainsKey("SubCells"))
-			{
-				var subcells = yaml["SubCells"].ToDictionary();
-
-				// Read (x,y,z) offset (relative to cell center) pairs for positioning subcells
-				if (subcells.ContainsKey("Offsets"))
-					SubCellOffsets = FieldLoader.GetValue<WVec[]>("Offsets", subcells["Offsets"].Value);
-
-				if (subcells.ContainsKey("DefaultIndex"))
-					SubCellDefaultIndex = FieldLoader.GetValue<int>("DefaultIndex", subcells["DefaultIndex"].Value);
-				else	// Otherwise set the default subcell index to the middle subcell entry
-					SubCellDefaultIndex = SubCellOffsets.Length / 2;
-			}
-
-			// Validate default index - 0 for no subcells, otherwise > 1 & <= subcell count (offset triples count - 1)
-			if (SubCellDefaultIndex < (SubCellOffsets.Length > 1 ? 1 : 0) || SubCellDefaultIndex >= SubCellOffsets.Length)
-				throw new InvalidDataException("Subcell default index must be a valid index into the offset triples and must be greater than 0 for mods with subcells");
-
 			// Allow inherited mods to import parent maps.
 			var compat = new List<string>();
 			compat.Add(mod);

OpenRA.Game/Map/CellLayer.cs

@@ -20,36 +20,36 @@ namespace OpenRA
 	{
 		public readonly Size Size;
 		readonly Rectangle bounds;
-		public readonly TileShape Shape;
+		public readonly MapGridType GridType;
 		public event Action<CPos> CellEntryChanged = null;
 
 		readonly T[] entries;
 
 		public CellLayer(Map map)
-			: this(map.TileShape, new Size(map.MapSize.X, map.MapSize.Y)) { }
+			: this(map.Grid.Type, new Size(map.MapSize.X, map.MapSize.Y)) { }
 
-		public CellLayer(TileShape shape, Size size)
+		public CellLayer(MapGridType gridType, Size size)
 		{
 			Size = size;
 			bounds = new Rectangle(0, 0, Size.Width, Size.Height);
-			Shape = shape;
+			GridType = gridType;
 			entries = new T[size.Width * size.Height];
 		}
 
 		public void CopyValuesFrom(CellLayer<T> anotherLayer)
 		{
-			if (Size != anotherLayer.Size || Shape != anotherLayer.Shape)
+			if (Size != anotherLayer.Size || GridType != anotherLayer.GridType)
 				throw new ArgumentException(
-					"layers must have a matching size and shape.", "anotherLayer");
+					"layers must have a matching size and shape (grid type).", "anotherLayer");
 			if (CellEntryChanged != null)
 				throw new InvalidOperationException(
 					"Cannot copy values when there are listeners attached to the CellEntryChanged event.");
 			Array.Copy(anotherLayer.entries, entries, entries.Length);
 		}
 
-		public static CellLayer<T> CreateInstance(Func<MPos, T> initialCellValueFactory, Size size, TileShape tileShape)
+		public static CellLayer<T> CreateInstance(Func<MPos, T> initialCellValueFactory, Size size, MapGridType mapGridType)
 		{
-			var cellLayer = new CellLayer<T>(tileShape, size);
+			var cellLayer = new CellLayer<T>(mapGridType, size);
 			for (var v = 0; v < size.Height; v++)
 			{
 				for (var u = 0; u < size.Width; u++)
@@ -65,7 +65,7 @@ namespace OpenRA
 		// Resolve an array index from cell coordinates
 		int Index(CPos cell)
 		{
-			return Index(cell.ToMPos(Shape));
+			return Index(cell.ToMPos(GridType));
 		}
 
 		// Resolve an array index from map coordinates
@@ -104,7 +104,7 @@ namespace OpenRA
 				entries[Index(uv)] = value;
 
 				if (CellEntryChanged != null)
-					CellEntryChanged(uv.ToCPos(Shape));
+					CellEntryChanged(uv.ToCPos(GridType));
 			}
 		}
 
@@ -128,12 +128,12 @@ namespace OpenRA
 		public bool Contains(CPos cell)
 		{
 			// .ToMPos() returns the same result if the X and Y coordinates
-			// are switched. X < Y is invalid in the Diamond coordinate system,
+			// are switched. X < Y is invalid in the RectangularIsometric coordinate system,
 			// so we pre-filter these to avoid returning the wrong result
-			if (Shape == TileShape.Diamond && cell.X < cell.Y)
+			if (GridType == MapGridType.RectangularIsometric && cell.X < cell.Y)
 				return false;
 
-			return Contains(cell.ToMPos(Shape));
+			return Contains(cell.ToMPos(GridType));
 		}
 
 		public bool Contains(MPos uv)
@@ -143,7 +143,7 @@ namespace OpenRA
 
 		public CPos Clamp(CPos uv)
 		{
-			return Clamp(uv.ToMPos(Shape)).ToCPos(Shape);
+			return Clamp(uv.ToMPos(GridType)).ToCPos(GridType);
 		}
 
 		public MPos Clamp(MPos uv)
@@ -155,10 +155,10 @@ namespace OpenRA
 	// Helper functions
 	public static class CellLayer
 	{
-		/// <summary>Create a new layer by resizing another layer.  New cells are filled with defaultValue.</summary>
+		/// <summary>Create a new layer by resizing another layer. New cells are filled with defaultValue.</summary>
 		public static CellLayer<T> Resize<T>(CellLayer<T> layer, Size newSize, T defaultValue)
 		{
-			var result = new CellLayer<T>(layer.Shape, newSize);
+			var result = new CellLayer<T>(layer.GridType, newSize);
 			var width = Math.Min(layer.Size.Width, newSize.Width);
 			var height = Math.Min(layer.Size.Height, newSize.Height);
 

OpenRA.Game/Map/CellRegion.cs

@@ -22,33 +22,33 @@ namespace OpenRA
 		// Corners of the region
 		public readonly CPos TopLeft;
 		public readonly CPos BottomRight;
-		readonly TileShape shape;
+		readonly MapGridType gridType;
 
 		// Corners in map coordinates
-		// These will only equal TopLeft and BottomRight for TileShape.Rectangular
+		// These will only equal TopLeft and BottomRight for MapGridType.Rectangular
 		readonly MPos mapTopLeft;
 		readonly MPos mapBottomRight;
 
-		public CellRegion(TileShape shape, CPos topLeft, CPos bottomRight)
+		public CellRegion(MapGridType gridType, CPos topLeft, CPos bottomRight)
 		{
-			this.shape = shape;
+			this.gridType = gridType;
 			TopLeft = topLeft;
 			BottomRight = bottomRight;
 
-			mapTopLeft = TopLeft.ToMPos(shape);
-			mapBottomRight = BottomRight.ToMPos(shape);
+			mapTopLeft = TopLeft.ToMPos(gridType);
+			mapBottomRight = BottomRight.ToMPos(gridType);
 		}
 
 		/// <summary>Expand the specified region with an additional cordon. This may expand the region outside the map borders.</summary>
 		public static CellRegion Expand(CellRegion region, int cordon)
 		{
-			var tl = new MPos(region.mapTopLeft.U - cordon, region.mapTopLeft.V - cordon).ToCPos(region.shape);
-			var br = new MPos(region.mapBottomRight.U + cordon, region.mapBottomRight.V + cordon).ToCPos(region.shape);
-			return new CellRegion(region.shape, tl, br);
+			var tl = new MPos(region.mapTopLeft.U - cordon, region.mapTopLeft.V - cordon).ToCPos(region.gridType);
+			var br = new MPos(region.mapBottomRight.U + cordon, region.mapBottomRight.V + cordon).ToCPos(region.gridType);
+			return new CellRegion(region.gridType, tl, br);
 		}
 
 		/// <summary>Returns the minimal region that covers at least the specified cells.</summary>
-		public static CellRegion BoundingRegion(TileShape shape, IEnumerable<CPos> cells)
+		public static CellRegion BoundingRegion(MapGridType shape, IEnumerable<CPos> cells)
 		{
 			if (cells == null || !cells.Any())
 				throw new ArgumentException("cells must not be null or empty.", "cells");
@@ -81,7 +81,7 @@ namespace OpenRA
 
 		public bool Contains(CPos cell)
 		{
-			var uv = cell.ToMPos(shape);
+			var uv = cell.ToMPos(gridType);
 			return uv.U >= mapTopLeft.U && uv.U <= mapBottomRight.U && uv.V >= mapTopLeft.V && uv.V <= mapBottomRight.V;
 		}
 
@@ -136,7 +136,7 @@ namespace OpenRA
 						return false;
 				}
 
-				current = new MPos(u, v).ToCPos(r.shape);
+				current = new MPos(u, v).ToCPos(r.gridType);
 				return true;
 			}
 

OpenRA.Game/Map/Map.cs

@@ -9,15 +9,14 @@
 #endregion
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using OpenRA.FileSystem;
+using OpenRA.GameRules;
 using OpenRA.Graphics;
 using OpenRA.Network;
 using OpenRA.Support;
@@ -114,6 +113,8 @@ namespace OpenRA
 
 	public class Map
 	{
+		public const int MinimumSupportedMapFormat = 6;
+
 		static readonly int[][] CellCornerHalfHeights = new int[][]
 		{
 			// Flat
@@ -151,8 +152,7 @@ namespace OpenRA
 		};
 
 		public const int MaxTilesInCircleRange = 50;
-		public readonly TileShape TileShape;
-		public readonly byte MaximumTerrainHeight;
+		public readonly MapGrid Grid;
 
 		[FieldLoader.Ignore] public readonly WVec[] SubCellOffsets;
 		public readonly SubCell DefaultSubCell;
@@ -229,6 +229,7 @@ namespace OpenRA
 		[FieldLoader.Ignore] public List<MiniYamlNode> VoxelSequenceDefinitions = new List<MiniYamlNode>();
 		[FieldLoader.Ignore] public List<MiniYamlNode> WeaponDefinitions = new List<MiniYamlNode>();
 		[FieldLoader.Ignore] public List<MiniYamlNode> VoiceDefinitions = new List<MiniYamlNode>();
+		[FieldLoader.Ignore] public List<MiniYamlNode> MusicDefinitions = new List<MiniYamlNode>();
 		[FieldLoader.Ignore] public List<MiniYamlNode> NotificationDefinitions = new List<MiniYamlNode>();
 		[FieldLoader.Ignore] public List<MiniYamlNode> TranslationDefinitions = new List<MiniYamlNode>();
 		[FieldLoader.Ignore] public List<MiniYamlNode> PlayerDefinitions = new List<MiniYamlNode>();
@@ -246,6 +247,7 @@ namespace OpenRA
 		[FieldLoader.Ignore] public Lazy<CellLayer<byte>> MapHeight;
 
 		[FieldLoader.Ignore] public CellLayer<byte> CustomTerrain;
+		[FieldLoader.Ignore] CellLayer<short> cachedTerrainIndexes;
 
 		[FieldLoader.Ignore] bool initializedCellProjection;
 		[FieldLoader.Ignore] CellLayer<PPos[]> cellProjection;
@@ -260,8 +262,6 @@ namespace OpenRA
 		[FieldLoader.Ignore] public ProjectedCellRegion ProjectedCellBounds;
 		[FieldLoader.Ignore] public CellRegion AllCells;
 
-		readonly Func<PPos, bool> containsTest;
-
 		void AssertExists(string filename)
 		{
 			using (var s = Container.GetContent(filename))
@@ -275,10 +275,8 @@ namespace OpenRA
 		/// </summary>
 		public Map(TileSet tileset, int width, int height)
 		{
-			containsTest = Contains;
-
 			var size = new Size(width, height);
-			var tileShape = Game.ModData.Manifest.TileShape;
+			Grid = Game.ModData.Manifest.Get<MapGrid>();
 			var tileRef = new TerrainTile(tileset.Templates.First().Key, (byte)0);
 
 			Title = "Name your map here";
@@ -290,25 +288,27 @@ namespace OpenRA
 			Videos = new MapVideos();
 			Options = new MapOptions();
 
-			MapResources = Exts.Lazy(() => new CellLayer<ResourceTile>(tileShape, size));
+			MapResources = Exts.Lazy(() => new CellLayer<ResourceTile>(Grid.Type, size));
 
 			MapTiles = Exts.Lazy(() =>
 			{
-				var ret = new CellLayer<TerrainTile>(tileShape, size);
+				var ret = new CellLayer<TerrainTile>(Grid.Type, size);
 				ret.Clear(tileRef);
+				if (Grid.MaximumTerrainHeight > 0)
+					ret.CellEntryChanged += UpdateProjection;
 				return ret;
 			});
 
 			MapHeight = Exts.Lazy(() =>
 			{
-				var ret = new CellLayer<byte>(tileShape, size);
+				var ret = new CellLayer<byte>(Grid.Type, size);
 				ret.Clear(0);
+				if (Grid.MaximumTerrainHeight > 0)
+					ret.CellEntryChanged += UpdateProjection;
 				return ret;
 			});
 
 			SpawnPoints = Exts.Lazy(() => new CPos[0]);
-			TileShape = tileShape;
-			MaximumTerrainHeight = Game.ModData.Manifest.MaximumTerrainHeight;
 
 			PostInit();
 		}
@@ -316,8 +316,6 @@ namespace OpenRA
 		/// <summary>Initializes a map loaded from disk.</summary>
 		public Map(string path)
 		{
-			containsTest = Contains;
-
 			Path = path;
 			Container = GlobalFileSystem.OpenPackage(path, null, int.MaxValue);
 
@@ -331,7 +329,7 @@ namespace OpenRA
 			// Use release-20110207 to convert older maps to format 4
 			// Use release-20110511 to convert older maps to format 5
 			// Use release-20141029 to convert older maps to format 6
-			if (MapFormat < 6)
+			if (MapFormat < MinimumSupportedMapFormat)
 				throw new InvalidDataException("Map format {0} is not supported.\n File: {1}".F(MapFormat, path));
 
 			var nd = yaml.ToDictionary();
@@ -364,6 +362,7 @@ namespace OpenRA
 			VoxelSequenceDefinitions = MiniYaml.NodesOrEmpty(yaml, "VoxelSequences");
 			WeaponDefinitions = MiniYaml.NodesOrEmpty(yaml, "Weapons");
 			VoiceDefinitions = MiniYaml.NodesOrEmpty(yaml, "Voices");
+			MusicDefinitions = MiniYaml.NodesOrEmpty(yaml, "Music");
 			NotificationDefinitions = MiniYaml.NodesOrEmpty(yaml, "Notifications");
 			TranslationDefinitions = MiniYaml.NodesOrEmpty(yaml, "Translations");
 			PlayerDefinitions = MiniYaml.NodesOrEmpty(yaml, "Players");
@@ -375,12 +374,11 @@ namespace OpenRA
 			MapResources = Exts.Lazy(LoadResourceTiles);
 			MapHeight = Exts.Lazy(LoadMapHeight);
 
-			TileShape = Game.ModData.Manifest.TileShape;
-			MaximumTerrainHeight = Game.ModData.Manifest.MaximumTerrainHeight;
+			Grid = Game.ModData.Manifest.Get<MapGrid>();
 
-			SubCellOffsets = Game.ModData.Manifest.SubCellOffsets;
+			SubCellOffsets = Grid.SubCellOffsets;
 			LastSubCell = (SubCell)(SubCellOffsets.Length - 1);
-			DefaultSubCell = (SubCell)Game.ModData.Manifest.SubCellDefaultIndex;
+			DefaultSubCell = (SubCell)Grid.SubCellDefaultIndex;
 
 			if (Container.Exists("map.png"))
 				using (var dataStream = Container.GetContent("map.png"))
@@ -418,7 +416,7 @@ namespace OpenRA
 
 			var tl = new MPos(0, 0).ToCPos(this);
 			var br = new MPos(MapSize.X - 1, MapSize.Y - 1).ToCPos(this);
-			AllCells = new CellRegion(TileShape, tl, br);
+			AllCells = new CellRegion(Grid.Type, tl, br);
 
 			var btl = new PPos(Bounds.Left, Bounds.Top);
 			var bbr = new PPos(Bounds.Right - 1, Bounds.Bottom - 1);
@@ -428,10 +426,10 @@ namespace OpenRA
 			foreach (var uv in AllCells.MapCoords)
 				CustomTerrain[uv] = byte.MaxValue;
 
-			var leftDelta = TileShape == TileShape.Diamond ? new WVec(-512, 0, 0) : new WVec(-512, -512, 0);
-			var topDelta = TileShape == TileShape.Diamond ? new WVec(0, -512, 0) : new WVec(512, -512, 0);
-			var rightDelta = TileShape == TileShape.Diamond ? new WVec(512, 0, 0) : new WVec(512, 512, 0);
-			var bottomDelta = TileShape == TileShape.Diamond ? new WVec(0, 512, 0) : new WVec(-512, 512, 0);
+			var leftDelta = Grid.Type == MapGridType.RectangularIsometric ? new WVec(-512, 0, 0) : new WVec(-512, -512, 0);
+			var topDelta = Grid.Type == MapGridType.RectangularIsometric ? new WVec(0, -512, 0) : new WVec(512, -512, 0);
+			var rightDelta = Grid.Type == MapGridType.RectangularIsometric ? new WVec(512, 0, 0) : new WVec(512, 512, 0);
+			var bottomDelta = Grid.Type == MapGridType.RectangularIsometric ? new WVec(0, 512, 0) : new WVec(-512, 512, 0);
 			CellCorners = CellCornerHalfHeights.Select(ramp => new WVec[]
 			{
 				leftDelta + new WVec(0, 0, 512 * ramp[0]),
@@ -448,34 +446,40 @@ namespace OpenRA
 
 			initializedCellProjection = true;
 
-			if (MaximumTerrainHeight != 0)
+			cellProjection = new CellLayer<PPos[]>(this);
+			inverseCellProjection = new CellLayer<List<MPos>>(this);
+
+			// Initialize collections
+			foreach (var cell in AllCells)
 			{
-				cellProjection = new CellLayer<PPos[]>(this);
-				inverseCellProjection = new CellLayer<List<MPos>>(this);
-
-				// Initialize collections
-				foreach (var cell in AllCells)
-				{
-					var uv = cell.ToMPos(TileShape);
-					cellProjection[uv] = new PPos[0];
-					inverseCellProjection[uv] = new List<MPos>();
-				}
-
-				// Initialize projections
-				foreach (var cell in AllCells)
-					UpdateProjection(cell);
+				var uv = cell.ToMPos(Grid.Type);
+				cellProjection[uv] = new PPos[0];
+				inverseCellProjection[uv] = new List<MPos>();
 			}
+
+			// Initialize projections
+			foreach (var cell in AllCells)
+				UpdateProjection(cell);
 		}
 
 		void UpdateProjection(CPos cell)
 		{
-			if (MaximumTerrainHeight == 0)
+			MPos uv;
+
+			if (Grid.MaximumTerrainHeight == 0)
+			{
+				uv = cell.ToMPos(Grid.Type);
+				cellProjection[cell] = new[] { (PPos)uv };
+				var inverse = inverseCellProjection[uv];
+				inverse.Clear();
+				inverse.Add(uv);
 				return;
+			}
 
 			if (!initializedCellProjection)
 				InitializeCellProjection();
 
-			var uv = cell.ToMPos(TileShape);
+			uv = cell.ToMPos(Grid.Type);
 
 			// Remove old reverse projection
 			foreach (var puv in cellProjection[uv])
@@ -571,6 +575,7 @@ namespace OpenRA
 			root.Add(new MiniYamlNode("VoxelSequences", null, VoxelSequenceDefinitions));
 			root.Add(new MiniYamlNode("Weapons", null, WeaponDefinitions));
 			root.Add(new MiniYamlNode("Voices", null, VoiceDefinitions));
+			root.Add(new MiniYamlNode("Music", null, MusicDefinitions));
 			root.Add(new MiniYamlNode("Notifications", null, NotificationDefinitions));
 			root.Add(new MiniYamlNode("Translations", null, TranslationDefinitions));
 
@@ -602,6 +607,9 @@ namespace OpenRA
 
 			// Update existing package
 			Container.Write(entries);
+
+			// Update UID to match the newly saved data
+			Uid = ComputeHash();
 		}
 
 		public CellLayer<TerrainTile> LoadMapTiles()
@@ -630,7 +638,8 @@ namespace OpenRA
 				}
 			}
 
-			tiles.CellEntryChanged += UpdateProjection;
+			if (Grid.MaximumTerrainHeight > 0)
+				tiles.CellEntryChanged += UpdateProjection;
 
 			return tiles;
 		}
@@ -646,11 +655,12 @@ namespace OpenRA
 					s.Position = header.HeightsOffset;
 					for (var i = 0; i < MapSize.X; i++)
 						for (var j = 0; j < MapSize.Y; j++)
-							tiles[new MPos(i, j)] = s.ReadUInt8().Clamp((byte)0, MaximumTerrainHeight);
+							tiles[new MPos(i, j)] = s.ReadUInt8().Clamp((byte)0, Grid.MaximumTerrainHeight);
 				}
 			}
 
-			tiles.CellEntryChanged += UpdateProjection;
+			if (Grid.MaximumTerrainHeight > 0)
+				tiles.CellEntryChanged += UpdateProjection;
 
 			return tiles;
 		}
@@ -694,8 +704,8 @@ namespace OpenRA
 
 				// Data offsets
 				var tilesOffset = 17;
-				var heightsOffset = MaximumTerrainHeight > 0 ? 3 * MapSize.X * MapSize.Y + 17 : 0;
-				var resourcesOffset = (MaximumTerrainHeight > 0 ? 4 : 3) * MapSize.X * MapSize.Y + 17;
+				var heightsOffset = Grid.MaximumTerrainHeight > 0 ? 3 * MapSize.X * MapSize.Y + 17 : 0;
+				var resourcesOffset = (Grid.MaximumTerrainHeight > 0 ? 4 : 3) * MapSize.X * MapSize.Y + 17;
 
 				writer.Write((uint)tilesOffset);
 				writer.Write((uint)heightsOffset);
@@ -742,9 +752,9 @@ namespace OpenRA
 		public bool Contains(CPos cell)
 		{
 			// .ToMPos() returns the same result if the X and Y coordinates
-			// are switched. X < Y is invalid in the Diamond coordinate system,
+			// are switched. X < Y is invalid in the RectangularIsometric coordinate system,
 			// so we pre-filter these to avoid returning the wrong result
-			if (TileShape == TileShape.Diamond && cell.X < cell.Y)
+			if (Grid.Type == MapGridType.RectangularIsometric && cell.X < cell.Y)
 				return false;
 
 			return Contains(cell.ToMPos(this));
@@ -755,7 +765,18 @@ namespace OpenRA
 			// The first check ensures that the cell is within the valid map region, avoiding
 			// potential crashes in deeper code.  All CellLayers have the same geometry, and
 			// CustomTerrain is convenient (cellProjection may be null and others are Lazy).
-			return CustomTerrain.Contains(uv) && ProjectedCellsCovering(uv).All(containsTest);
+			return CustomTerrain.Contains(uv) && ContainsAllProjectedCellsCovering(uv);
+		}
+
+		bool ContainsAllProjectedCellsCovering(MPos uv)
+		{
+			if (Grid.MaximumTerrainHeight == 0)
+				return Contains((PPos)uv);
+
+			foreach (var puv in ProjectedCellsCovering(uv))
+				if (!Contains(puv))
+					return false;
+			return true;
 		}
 
 		public bool Contains(PPos puv)
@@ -765,10 +786,10 @@ namespace OpenRA
 
 		public WPos CenterOfCell(CPos cell)
 		{
-			if (TileShape == TileShape.Rectangle)
+			if (Grid.Type == MapGridType.Rectangular)
 				return new WPos(1024 * cell.X + 512, 1024 * cell.Y + 512, 0);
 
-			// Convert from diamond cell position (x, y) to world position (u, v):
+			// Convert from isometric cell position (x, y) to world position (u, v):
 			// (a) Consider the relationships:
 			//  - Center of origin cell is (512, 512)
 			//  - +x adds (512, 512) to world pos
@@ -797,10 +818,10 @@ namespace OpenRA
 
 		public CPos CellContaining(WPos pos)
 		{
-			if (TileShape == TileShape.Rectangle)
+			if (Grid.Type == MapGridType.Rectangular)
 				return new CPos(pos.X / 1024, pos.Y / 1024);
 
-			// Convert from world position to diamond cell position:
+			// Convert from world position to isometric cell position:
 			// (a) Subtract (512, 512) to move the rotation center to the middle of the corner cell
 			// (b) Rotate axes by -pi/4
 			// (c) Divide through by sqrt(2) to bring us to an equivalent world pos aligned with u,v axes
@@ -816,16 +837,12 @@ namespace OpenRA
 		public PPos ProjectedCellCovering(WPos pos)
 		{
 			var projectedPos = pos - new WVec(0, pos.Z, pos.Z);
-			return (PPos)CellContaining(projectedPos).ToMPos(TileShape);
+			return (PPos)CellContaining(projectedPos).ToMPos(Grid.Type);
 		}
 
 		static readonly PPos[] NoProjectedCells = { };
 		public PPos[] ProjectedCellsCovering(MPos uv)
 		{
-			// Shortcut for mods that don't use heightmaps
-			if (MaximumTerrainHeight == 0)
-				return new[] { (PPos)uv };
-
 			if (!initializedCellProjection)
 				InitializeCellProjection();
 
@@ -835,21 +852,17 @@ namespace OpenRA
 			return cellProjection[uv];
 		}
 
-		public MPos[] Unproject(PPos puv)
+		public List<MPos> Unproject(PPos puv)
 		{
 			var uv = (MPos)puv;
 
-			// Shortcut for mods that don't use heightmaps
-			if (MaximumTerrainHeight == 0)
-				return new[] { uv };
-
 			if (!initializedCellProjection)
 				InitializeCellProjection();
 
 			if (!inverseCellProjection.Contains(uv))
-				return new MPos[0];
+				return new List<MPos>();
 
-			return inverseCellProjection[uv].ToArray();
+			return inverseCellProjection[uv];
 		}
 
 		public int FacingBetween(CPos cell, CPos towards, int fallbackfacing)
@@ -871,7 +884,7 @@ namespace OpenRA
 
 			var tl = new MPos(0, 0).ToCPos(this);
 			var br = new MPos(MapSize.X - 1, MapSize.Y - 1).ToCPos(this);
-			AllCells = new CellRegion(TileShape, tl, br);
+			AllCells = new CellRegion(Grid.Type, tl, br);
 		}
 
 		public void SetBounds(PPos tl, PPos br)
@@ -883,10 +896,10 @@ namespace OpenRA
 			// Directly calculate the projected map corners in world units avoiding unnecessary
 			// conversions.  This abuses the definition that the width of the cell is always
 			// 1024 units, and that the height of two rows is 2048 for classic cells and 1024
-			// for diamond cells.
+			// for isometric cells.
 			var wtop = tl.V * 1024;
 			var wbottom = (br.V + 1) * 1024;
-			if (TileShape == TileShape.Diamond)
+			if (Grid.Type == MapGridType.RectangularIsometric)
 			{
 				wtop /= 2;
 				wbottom /= 2;
@@ -945,9 +958,32 @@ namespace OpenRA
 
 		public byte GetTerrainIndex(CPos cell)
 		{
+			const short InvalidCachedTerrainIndex = -1;
+
+			// Lazily initialize a cache for terrain indexes.
+			if (cachedTerrainIndexes == null)
+			{
+				cachedTerrainIndexes = new CellLayer<short>(this);
+				cachedTerrainIndexes.Clear(InvalidCachedTerrainIndex);
+
+				// Invalidate the entry for a cell if anything could cause the terrain index to change.
+				Action<CPos> invalidateTerrainIndex = c => cachedTerrainIndexes[c] = InvalidCachedTerrainIndex;
+				CustomTerrain.CellEntryChanged += invalidateTerrainIndex;
+				MapTiles.Value.CellEntryChanged += invalidateTerrainIndex;
+			}
+
 			var uv = cell.ToMPos(this);
-			var custom = CustomTerrain[uv];
-			return custom != byte.MaxValue ? custom : cachedTileSet.Value.GetTerrainIndex(MapTiles.Value[uv]);
+			var terrainIndex = cachedTerrainIndexes[uv];
+
+			// Cache terrain indexes per cell on demand.
+			if (terrainIndex == InvalidCachedTerrainIndex)
+			{
+				var custom = CustomTerrain[uv];
+				terrainIndex = cachedTerrainIndexes[uv] =
+					custom != byte.MaxValue ? custom : cachedTileSet.Value.GetTerrainIndex(MapTiles.Value[uv]);
+			}
+
+			return (byte)terrainIndex;
 		}
 
 		public TerrainTypeInfo GetTerrainInfo(CPos cell)
@@ -962,11 +998,11 @@ namespace OpenRA
 
 		public MPos Clamp(MPos uv)
 		{
-			if (MaximumTerrainHeight == 0)
+			if (Grid.MaximumTerrainHeight == 0)
 				return (MPos)Clamp((PPos)uv);
 
 			// Already in bounds, so don't need to do anything.
-			if (ProjectedCellsCovering(uv).Any(containsTest))
+			if (ContainsAllProjectedCellsCovering(uv))
 				return uv;
 
 			// Clamping map coordinates is trickier than it might first look!
@@ -997,7 +1033,7 @@ namespace OpenRA
 			if (!unProjected.Any())
 			{
 				// Adjust V until we find a cell that works
-				for (var x = 2; x <= 2 * MaximumTerrainHeight; x++)
+				for (var x = 2; x <= 2 * Grid.MaximumTerrainHeight; x++)
 				{
 					var dv = ((x & 1) == 1 ? 1 : -1) * x / 2;
 					var test = new PPos(projected.U, projected.V + dv);
@@ -1028,7 +1064,7 @@ namespace OpenRA
 
 		public CPos ChooseRandomCell(MersenneTwister rand)
 		{
-			MPos[] cells;
+			List<MPos> cells;
 			do
 			{
 				var u = rand.Next(Bounds.Left, Bounds.Right);
@@ -1037,12 +1073,12 @@ namespace OpenRA
 				cells = Unproject(new PPos(u, v));
 			} while (!cells.Any());
 
-			return cells.Random(rand).ToCPos(TileShape);
+			return cells.Random(rand).ToCPos(Grid.Type);
 		}
 
 		public CPos ChooseClosestEdgeCell(CPos cell)
 		{
-			return ChooseClosestEdgeCell(cell.ToMPos(TileShape)).ToCPos(TileShape);
+			return ChooseClosestEdgeCell(cell.ToMPos(Grid.Type)).ToCPos(Grid.Type);
 		}
 
 		public MPos ChooseClosestEdgeCell(MPos uv)
@@ -1068,7 +1104,7 @@ namespace OpenRA
 			if (!unProjected.Any())
 			{
 				// Adjust V until we find a cell that works
-				for (var x = 2; x <= 2 * MaximumTerrainHeight; x++)
+				for (var x = 2; x <= 2 * Grid.MaximumTerrainHeight; x++)
 				{
 					var dv = ((x & 1) == 1 ? 1 : -1) * x / 2;
 					var test = new PPos(edge.U, edge.V + dv);
@@ -1093,7 +1129,7 @@ namespace OpenRA
 
 		public CPos ChooseRandomEdgeCell(MersenneTwister rand)
 		{
-			MPos[] cells;
+			List<MPos> cells;
 			do
 			{
 				var isU = rand.Next(2) == 0;
@@ -1104,7 +1140,7 @@ namespace OpenRA
 				cells = Unproject(new PPos(u, v));
 			} while (!cells.Any());
 
-			return cells.Random(rand).ToCPos(TileShape);
+			return cells.Random(rand).ToCPos(Grid.Type);
 		}
 
 		public WDist DistanceToEdge(WPos pos, WVec dir)

OpenRA.Game/Map/MapCache.cs

@@ -23,7 +23,7 @@ namespace OpenRA
 {
 	public sealed class MapCache : IEnumerable<MapPreview>, IDisposable
 	{
-		public static readonly MapPreview UnknownMap = new MapPreview(null, null);
+		public static readonly MapPreview UnknownMap = new MapPreview(null, MapGridType.Rectangular, null);
 		readonly Cache<string, MapPreview> previews;
 		readonly ModData modData;
 		readonly SheetBuilder sheetBuilder;
@@ -35,7 +35,9 @@ namespace OpenRA
 		public MapCache(ModData modData)
 		{
 			this.modData = modData;
-			previews = new Cache<string, MapPreview>(uid => new MapPreview(uid, this));
+
+			var gridType = Exts.Lazy(() => modData.Manifest.Get<MapGrid>().Type);
+			previews = new Cache<string, MapPreview>(uid => new MapPreview(uid, gridType.Value, this));
 			sheetBuilder = new SheetBuilder(SheetType.BGRA);
 		}
 

OpenRA.Game/Map/MapGrid.cs

@@ -0,0 +1,45 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Drawing;
+using System.IO;
+
+namespace OpenRA
+{
+	public enum MapGridType { Rectangular, RectangularIsometric }
+
+	public class MapGrid : IGlobalModData
+	{
+		public readonly MapGridType Type = MapGridType.Rectangular;
+		public readonly Size TileSize = new Size(24, 24);
+		public readonly byte MaximumTerrainHeight = 0;
+		public readonly byte SubCellDefaultIndex = byte.MaxValue;
+		public readonly WVec[] SubCellOffsets =
+		{
+			new WVec(0, 0, 0),       // full cell - index 0
+			new WVec(-299, -256, 0), // top left - index 1
+			new WVec(256, -256, 0),  // top right - index 2
+			new WVec(0, 0, 0),       // center - index 3
+			new WVec(-299, 256, 0),  // bottom left - index 4
+			new WVec(256, 256, 0),   // bottom right - index 5
+		};
+
+		public MapGrid(MiniYaml yaml)
+		{
+			FieldLoader.Load(this, yaml);
+
+			// The default subcell index defaults to the middle entry
+			if (SubCellDefaultIndex == byte.MaxValue)
+				SubCellDefaultIndex = (byte)(SubCellOffsets.Length / 2);
+			else if (SubCellDefaultIndex < (SubCellOffsets.Length > 1 ? 1 : 0) || SubCellDefaultIndex >= SubCellOffsets.Length)
+				throw new InvalidDataException("Subcell default index must be a valid index into the offset triples and must be greater than 0 for mods with subcells");
+		}
+	}
+}

OpenRA.Game/Map/MapPlayers.cs

@@ -28,8 +28,8 @@ namespace OpenRA
 
 		public MapPlayers(Ruleset rules, int playerCount)
 		{
-			var firstRace = rules.Actors["world"].Traits
-				.WithInterface<FactionInfo>().First(f => f.Selectable).InternalName;
+			var firstFaction = rules.Actors["world"].TraitInfos<FactionInfo>()
+				.First(f => f.Selectable).InternalName;
 
 			Players = new Dictionary<string, PlayerReference>
 			{
@@ -37,7 +37,7 @@ namespace OpenRA
 					"Neutral", new PlayerReference
 					{
 						Name = "Neutral",
-						Faction = firstRace,
+						Faction = firstFaction,
 						OwnsWorld = true,
 						NonCombatant = true
 					}
@@ -46,7 +46,7 @@ namespace OpenRA
 					"Creeps", new PlayerReference
 					{
 						Name = "Creeps",
-						Faction = firstRace,
+						Faction = firstFaction,
 						NonCombatant = true,
 						Enemies = Exts.MakeArray(playerCount, i => "Multi{0}".F(i))
 					}

OpenRA.Game/Map/MapPreview.cs

@@ -47,6 +47,7 @@ namespace OpenRA
 		public readonly int players;
 		public readonly Rectangle bounds;
 		public readonly int[] spawnpoints = { };
+		public readonly MapGridType map_grid_type;
 		public readonly string minimap;
 		public readonly bool downloading;
 	}
@@ -62,6 +63,7 @@ namespace OpenRA
 		public string Author { get; private set; }
 		public int PlayerCount { get; private set; }
 		public CPos[] SpawnPoints { get; private set; }
+		public MapGridType GridType { get; private set; }
 		public Rectangle Bounds { get; private set; }
 		public Bitmap CustomPreview { get; private set; }
 		public Map Map { get; private set; }
@@ -97,7 +99,7 @@ namespace OpenRA
 			generatingMinimap = false;
 		}
 
-		public MapPreview(string uid, MapCache cache)
+		public MapPreview(string uid, MapGridType gridType, MapCache cache)
 		{
 			this.cache = cache;
 			Uid = uid;
@@ -107,6 +109,7 @@ namespace OpenRA
 			PlayerCount = 0;
 			Bounds = Rectangle.Empty;
 			SpawnPoints = NoSpawns;
+			GridType = gridType;
 			Status = MapStatus.Unavailable;
 			Class = MapClassification.Unknown;
 		}
@@ -120,6 +123,7 @@ namespace OpenRA
 			Author = m.Author;
 			Bounds = m.Bounds;
 			SpawnPoints = m.SpawnPoints.Value;
+			GridType = m.Grid.Type;
 			CustomPreview = m.CustomPreview;
 			Status = MapStatus.Available;
 			Class = classification;
@@ -179,6 +183,7 @@ namespace OpenRA
 						for (var j = 0; j < r.spawnpoints.Length; j += 2)
 							spawns[j / 2] = new CPos(r.spawnpoints[j], r.spawnpoints[j + 1]);
 						SpawnPoints = spawns;
+						GridType = r.map_grid_type;
 
 						CustomPreview = new Bitmap(new MemoryStream(Convert.FromBase64String(r.minimap)));
 					}
@@ -210,20 +215,22 @@ namespace OpenRA
 				// Request the filename from the server
 				// Run in a worker thread to avoid network delays
 				var mapUrl = Game.Settings.Game.MapRepository + Uid;
+				var mapPath = string.Empty;
 				try
 				{
 					var request = WebRequest.Create(mapUrl);
 					request.Method = "HEAD";
-					var res = request.GetResponse();
-
-					// Map not found
-					if (res.Headers["Content-Disposition"] == null)
+					using (var res = request.GetResponse())
 					{
-						Status = MapStatus.DownloadError;
-						return;
-					}
+						// Map not found
+						if (res.Headers["Content-Disposition"] == null)
+						{
+							Status = MapStatus.DownloadError;
+							return;
+						}
 
-					var mapPath = Path.Combine(baseMapPath, res.Headers["Content-Disposition"].Replace("attachment; filename = ", ""));
+						mapPath = Path.Combine(baseMapPath, res.Headers["Content-Disposition"].Replace("attachment; filename = ", ""));
+					}
 
 					Action<DownloadProgressChangedEventArgs> onDownloadProgress = i => { DownloadBytes = i.BytesReceived; DownloadPercentage = i.ProgressPercentage; };
 					Action<AsyncCompletedEventArgs, bool> onDownloadComplete = (i, cancelled) =>

OpenRA.Game/Map/ProjectedCellRegion.cs

@@ -8,10 +8,8 @@
  */
 #endregion
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace OpenRA
 {
@@ -41,8 +39,9 @@ namespace OpenRA
 			// The bottom edge is trickier: cells at MPos.V > bottomRight.V may have
 			// been projected into this region if they have height > 0.
 			// Each height step is equivalent to 512 WRange units, which is one MPos
-			// step for diamond cells, but only half a MPos step for classic cells. Doh!
-			var heightOffset = map.TileShape == TileShape.Diamond ? map.MaximumTerrainHeight : map.MaximumTerrainHeight / 2;
+			// step for isometric cells, but only half a MPos step for classic cells. Doh!
+			var maxHeight = map.Grid.MaximumTerrainHeight;
+			var heightOffset = map.Grid.Type == MapGridType.RectangularIsometric ? maxHeight : maxHeight / 2;
 
 			// Use the MapHeight data array to clamp the bottom coordinate so it doesn't overflow the map
 			mapBottomRight = map.MapHeight.Value.Clamp(new MPos(bottomRight.U, bottomRight.V + heightOffset));

OpenRA.Game/Map/TileSet.cs

@@ -49,8 +49,8 @@ namespace OpenRA
 		static readonly TerrainTypeInfo Default = new TerrainTypeInfo();
 
 		public readonly string Type;
-		public readonly string[] TargetTypes = { };
-		public readonly string[] AcceptsSmudgeType = { };
+		public readonly HashSet<string> TargetTypes = new HashSet<string>();
+		public readonly HashSet<string> AcceptsSmudgeType = new HashSet<string>();
 		public readonly bool IsWater = false; // TODO: Remove this
 		public readonly Color Color;
 		public readonly string CustomCursor;
@@ -74,7 +74,7 @@ namespace OpenRA
 		public readonly bool PickAny;
 		public readonly string Category;
 
-		TerrainTileInfo[] tileInfo;
+		readonly TerrainTileInfo[] tileInfo;
 
 		public TerrainTemplateInfo(ushort id, string[] images, int2 size, byte[] tiles)
 		{
@@ -171,13 +171,13 @@ namespace OpenRA
 		public readonly int SheetSize = 512;
 		public readonly string Palette;
 		public readonly string PlayerPalette;
-		public readonly int WaterPaletteRotationBase = 0x60;
 		public readonly Color[] HeightDebugColors = new[] { Color.Red };
 		public readonly string[] EditorTemplateOrder;
 		public readonly bool IgnoreTileSpriteOffsets;
+		public readonly bool EnableDepth = false;
 
 		[FieldLoader.Ignore]
-		public readonly Dictionary<ushort, TerrainTemplateInfo> Templates = new Dictionary<ushort, TerrainTemplateInfo>();
+		public readonly IReadOnlyDictionary<ushort, TerrainTemplateInfo> Templates;
 
 		[FieldLoader.Ignore]
 		public readonly TerrainTypeInfo[] TerrainInfo;
@@ -217,7 +217,7 @@ namespace OpenRA
 
 			// Templates
 			Templates = yaml["Templates"].ToDictionary().Values
-				.Select(y => new TerrainTemplateInfo(this, y)).ToDictionary(t => t.Id);
+				.Select(y => new TerrainTemplateInfo(this, y)).ToDictionary(t => t.Id).AsReadOnly();
 		}
 
 		public TileSet(string name, string id, string palette, TerrainTypeInfo[] terrainInfo)

OpenRA.Game/ModData.cs

@@ -74,11 +74,6 @@ namespace OpenRA
 			SpriteSequenceLoader = (ISpriteSequenceLoader)ctor.Invoke(new[] { this });
 			SpriteSequenceLoader.OnMissingSpriteError = s => Log.Write("debug", s);
 
-			// HACK: Mount only local folders so we have a half-working environment for the asset installer
-			GlobalFileSystem.UnmountAll();
-			foreach (var dir in Manifest.Folders)
-				GlobalFileSystem.Mount(dir);
-
 			defaultRules = Exts.Lazy(() => RulesetCache.Load());
 
 			initialThreadId = System.Threading.Thread.CurrentThread.ManagedThreadId;
@@ -92,6 +87,11 @@ namespace OpenRA
 				LoadScreen.Display();
 		}
 
+		public void MountFiles()
+		{
+			GlobalFileSystem.LoadFromManifest(Manifest);
+		}
+
 		public void InitializeLoaders()
 		{
 			// all this manipulation of static crap here is nasty and breaks
@@ -171,6 +171,11 @@ namespace OpenRA
 			using (new Support.PerfTimer("Map.SequenceProvider.Preload"))
 				map.SequenceProvider.Preload();
 
+			// Load music with map assets mounted
+			using (new Support.PerfTimer("Map.Music"))
+				foreach (var entry in map.Rules.Music)
+					entry.Value.Load();
+
 			VoxelProvider.Initialize(Manifest.VoxelSequences, map.VoxelSequenceDefinitions);
 			VoxelLoader.Finish();
 

OpenRA.Game/ModMetadata.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -24,6 +25,7 @@ namespace OpenRA
 		public string Version;
 		public string Author;
 		public bool Hidden;
+		public ContentInstaller Content;
 
 		static Dictionary<string, ModMetadata> ValidateMods()
 		{
@@ -34,19 +36,30 @@ namespace OpenRA
 			var ret = new Dictionary<string, ModMetadata>();
 			foreach (var m in mods)
 			{
-				var yamlPath = Platform.ResolvePath(".", "mods", m, "mod.yaml");
-				if (!File.Exists(yamlPath))
-					continue;
+				try
+				{
+					var yamlPath = Platform.ResolvePath(".", "mods", m, "mod.yaml");
+					if (!File.Exists(yamlPath))
+						continue;
 
-				var yaml = new MiniYaml(null, MiniYaml.FromFile(yamlPath));
-				var nd = yaml.ToDictionary();
-				if (!nd.ContainsKey("Metadata"))
-					continue;
+					var yaml = new MiniYaml(null, MiniYaml.FromFile(yamlPath));
+					var nd = yaml.ToDictionary();
+					if (!nd.ContainsKey("Metadata"))
+						continue;
 
-				var mod = FieldLoader.Load<ModMetadata>(nd["Metadata"]);
-				mod.Id = m;
+					var mod = FieldLoader.Load<ModMetadata>(nd["Metadata"]);
+					mod.Id = m;
 
-				ret.Add(m, mod);
+					if (nd.ContainsKey("ContentInstaller"))
+						mod.Content = FieldLoader.Load<ContentInstaller>(nd["ContentInstaller"]);
+
+					ret.Add(m, mod);
+				}
+				catch (Exception ex)
+				{
+					Console.WriteLine("An exception occured when trying to load ModMetadata for `{0}`:".F(m));
+					Console.WriteLine(ex.Message);
+				}
 			}
 
 			return ret;

OpenRA.Game/Network/FrameData.cs

@@ -19,6 +19,11 @@ namespace OpenRA.Network
 		{
 			public int Client;
 			public Order Order;
+
+			public override string ToString()
+			{
+				return "ClientId: {0} {1}".F(Client, Order);
+			}
 		}
 
 		readonly Dictionary<int, int> clientQuitTimes = new Dictionary<int, int>();

OpenRA.Game/Network/Order.cs

@@ -72,7 +72,7 @@ namespace OpenRA
 						var subjectId = r.ReadUInt32();
 						var flags = (OrderFields)r.ReadByte();
 
-						var targetActorId = flags.HasField(OrderFields.TargetActor) ? r.ReadUInt32() : 0xffffffff;
+						var targetActorId = flags.HasField(OrderFields.TargetActor) ? r.ReadUInt32() : uint.MaxValue;
 						var targetLocation = (CPos)(flags.HasField(OrderFields.TargetLocation) ? r.ReadInt2() : int2.Zero);
 						var targetString = flags.HasField(OrderFields.TargetString) ? r.ReadString() : null;
 						var queued = flags.HasField(OrderFields.Queued);
@@ -104,28 +104,20 @@ namespace OpenRA
 
 		static uint UIntFromActor(Actor a)
 		{
-			if (a == null) return 0xffffffff;
+			if (a == null) return uint.MaxValue;
 			return a.ActorID;
 		}
 
 		static bool TryGetActorFromUInt(World world, uint aID, out Actor ret)
 		{
-			if (aID == 0xFFFFFFFF)
+			if (aID == uint.MaxValue)
 			{
 				ret = null;
 				return true;
 			}
-			else
-			{
-				foreach (var a in world.Actors.Where(x => x.ActorID == aID))
-				{
-					ret = a;
-					return true;
-				}
 
-				ret = null;
-				return false;
-			}
+			ret = world.GetActorById(aID);
+			return ret != null;
 		}
 
 		// Named constructors for Orders.

OpenRA.Game/Network/OrderIO.cs

@@ -35,14 +35,13 @@ namespace OpenRA.Network
 			return ret;
 		}
 
-		public static byte[] SerializeSync(this List<int> sync)
+		public static byte[] SerializeSync(int sync)
 		{
 			var ms = new MemoryStream();
 			using (var writer = new BinaryWriter(ms))
 			{
 				writer.Write((byte)0x65);
-				foreach (var s in sync)
-					writer.Write(s);
+				writer.Write(sync);
 			}
 
 			return ms.ToArray();

OpenRA.Game/Network/OrderManager.cs

@@ -43,8 +43,6 @@ namespace OpenRA.Network
 		public bool GameStarted { get { return NetFrameNumber != 0; } }
 		public IConnection Connection { get; private set; }
 
-		public readonly int SyncHeaderSize = 9;
-
 		List<Order> localOrders = new List<Order>();
 
 		List<ChatLine> chatCache = new List<ChatLine>();
@@ -53,16 +51,12 @@ namespace OpenRA.Network
 
 		bool disposed;
 
-		static void OutOfSync(int frame)
+		void OutOfSync(int frame)
 		{
+			syncReport.DumpSyncReport(frame, frameData.OrdersForFrame(World, frame));
 			throw new InvalidOperationException("Out of sync in frame {0}.\n Compare syncreport.log with other players.".F(frame));
 		}
 
-		static void OutOfSync(int frame, string blame)
-		{
-			throw new InvalidOperationException("Out of sync in frame {0}: Blame {1}.\n Compare syncreport.log with other players.".F(frame, blame));
-		}
-
 		public void StartGame()
 		{
 			if (GameStarted) return;
@@ -145,41 +139,16 @@ namespace OpenRA.Network
 			if (syncForFrame.TryGetValue(frame, out existingSync))
 			{
 				if (packet.Length != existingSync.Length)
-				{
-					syncReport.DumpSyncReport(frame);
 					OutOfSync(frame);
-				}
 				else
-				{
 					for (var i = 0; i < packet.Length; i++)
-					{
 						if (packet[i] != existingSync[i])
-						{
-							syncReport.DumpSyncReport(frame);
-
-							if (i < SyncHeaderSize)
-								OutOfSync(frame, "Tick");
-							else
-								OutOfSync(frame, (i - SyncHeaderSize) / 4);
-						}
-					}
-				}
+							OutOfSync(frame);
 			}
 			else
 				syncForFrame.Add(frame, packet);
 		}
 
-		void OutOfSync(int frame, int index)
-		{
-			var orders = frameData.OrdersForFrame(World, frame);
-
-			// Invalid index
-			if (index >= orders.Count())
-				OutOfSync(frame);
-
-			throw new InvalidOperationException("Out of sync in frame {0}.\n {1}\n Compare syncreport.log with other players.".F(frame, orders.ElementAt(index).Order.ToString()));
-		}
-
 		public bool IsReadyForNextFrame
 		{
 			get { return NetFrameNumber >= 1 && frameData.IsReadyForFrame(NetFrameNumber); }
@@ -204,17 +173,10 @@ namespace OpenRA.Network
 			Connection.Send(NetFrameNumber + FramesAhead, localOrders.Select(o => o.Serialize()).ToList());
 			localOrders.Clear();
 
-			var sync = new List<int>();
-			sync.Add(World.SyncHash());
-
 			foreach (var order in frameData.OrdersForFrame(World, NetFrameNumber))
-			{
 				UnitOrders.ProcessOrder(this, World, order.Client, order.Order);
-				sync.Add(World.SyncHash());
-			}
 
-			var ss = sync.SerializeSync();
-			Connection.SendSync(NetFrameNumber, ss);
+			Connection.SendSync(NetFrameNumber, OrderIO.SerializeSync(World.SyncHash()));
 
 			syncReport.UpdateSyncReport();
 

OpenRA.Game/Network/ReplayConnection.cs

@@ -27,6 +27,7 @@ namespace OpenRA.Network
 		Queue<Chunk> chunks = new Queue<Chunk>();
 		List<byte[]> sync = new List<byte[]>();
 		int ordersFrame;
+		Dictionary<int, int> lastClientsFrame = new Dictionary<int, int>();
 
 		public int LocalClientId { get { return 0; } }
 		public ConnectionState ConnectionState { get { return ConnectionState.Connected; } }
@@ -55,6 +56,10 @@ namespace OpenRA.Network
 					var frame = BitConverter.ToInt32(packet, 0);
 					chunk.Packets.Add(Pair.New(client, packet));
 
+					if (frame != int.MaxValue &&
+						(!lastClientsFrame.ContainsKey(client) || frame > lastClientsFrame[client]))
+						lastClientsFrame[client] = frame;
+
 					if (packet.Length == 5 && packet[4] == 0xBF)
 						continue; // disconnect
 					else if (packet.Length >= 5 && packet[4] == 0x65)
@@ -81,6 +86,31 @@ namespace OpenRA.Network
 						TickCount = Math.Max(TickCount, frame);
 					}
 				}
+
+				var lastClientToDisconnect = lastClientsFrame.MaxBy(kvp => kvp.Value).Key;
+
+				// 2nd parse : replace all disconnect packets without frame with real
+				// disconnect frame
+				// NOTE: to modify/remove if a reconnect feature is set
+				foreach (var tmpChunk in chunks)
+				{
+					foreach (var tmpPacketPair in tmpChunk.Packets)
+					{
+						var client = tmpPacketPair.First;
+
+						// Don't replace the final disconnection packet - we still want this to end the replay.
+						if (client == lastClientToDisconnect)
+							continue;
+
+						var packet = tmpPacketPair.Second;
+						if (packet.Length == 5 && packet[4] == 0xBF)
+						{
+							var lastClientFrame = lastClientsFrame[client];
+							var lastFramePacket = BitConverter.GetBytes(lastClientFrame);
+							Array.Copy(lastFramePacket, packet, lastFramePacket.Length);
+						}
+					}
+				}
 			}
 
 			ordersFrame = LobbyInfo.GlobalSettings.OrderLatency;

OpenRA.Game/Network/Session.cs

@@ -59,9 +59,13 @@ namespace OpenRA.Network
 
 				return session;
 			}
-			catch (InvalidOperationException e)
+			catch (YamlException)
 			{
-				throw new InvalidOperationException("Session deserialized invalid MiniYaml:\n{0}".F(data), e);
+				throw new YamlException("Session deserialized invalid MiniYaml:\n{0}".F(data));
+			}
+			catch (InvalidOperationException)
+			{
+				throw new YamlException("Session deserialized invalid MiniYaml:\n{0}".F(data));
 			}
 		}
 
@@ -102,13 +106,13 @@ namespace OpenRA.Network
 			public int Index;
 			public HSLColor PreferredColor; // Color that the client normally uses from settings.yaml.
 			public HSLColor Color; // Actual color that the client is using. Usually the same as PreferredColor but can be different on maps with locked colors.
-			public string Race;
+			public string Faction;
 			public int SpawnPoint;
 			public string Name;
 			public string IpAddress;
 			public ClientState State = ClientState.Invalid;
 			public int Team;
-			public string Slot;	// slot ID, or null for observer
+			public string Slot;	// Slot ID, or null for observer
 			public string Bot; // Bot type, null for real clients
 			public int BotControllerClientIndex; // who added the bot to the slot
 			public bool IsAdmin;
@@ -118,7 +122,7 @@ namespace OpenRA.Network
 
 			public MiniYamlNode Serialize()
 			{
-				return new MiniYamlNode("Client@{0}".F(this.Index), FieldSaver.Save(this));
+				return new MiniYamlNode("Client@{0}".F(Index), FieldSaver.Save(this));
 			}
 		}
 
@@ -141,17 +145,17 @@ namespace OpenRA.Network
 
 			public MiniYamlNode Serialize()
 			{
-				return new MiniYamlNode("ClientPing@{0}".F(this.Index), FieldSaver.Save(this));
+				return new MiniYamlNode("ClientPing@{0}".F(Index), FieldSaver.Save(this));
 			}
 		}
 
 		public class Slot
 		{
-			public string PlayerReference;	// playerReference to bind against.
-			public bool Closed;	// host has explicitly closed this slot.
+			public string PlayerReference;	// PlayerReference to bind against.
+			public bool Closed;	// Host has explicitly closed this slot.
 
 			public bool AllowBots;
-			public bool LockRace;
+			public bool LockFaction;
 			public bool LockColor;
 			public bool LockTeam;
 			public bool LockSpawn;
@@ -164,7 +168,7 @@ namespace OpenRA.Network
 
 			public MiniYamlNode Serialize()
 			{
-				return new MiniYamlNode("Slot@{0}".F(this.PlayerReference), FieldSaver.Save(this));
+				return new MiniYamlNode("Slot@{0}".F(PlayerReference), FieldSaver.Save(this));
 			}
 		}
 
@@ -172,6 +176,7 @@ namespace OpenRA.Network
 		{
 			public string ServerName;
 			public string Map;
+			public int Timestep = 40;
 			public int OrderLatency = 3; // net tick frames (x 120 = ms)
 			public int RandomSeed = 0;
 			public bool FragileAlliances = false; // Allow diplomatic stance changes after game start.
@@ -187,6 +192,7 @@ namespace OpenRA.Network
 			public int StartingCash = 5000;
 			public string TechLevel = "none";
 			public string StartingUnitsClass = "none";
+			public string GameSpeedType = "default";
 			public bool ShortGame = true;
 			public bool AllowVersionMismatch;
 			public string GameUid;

OpenRA.Game/Network/SyncReport.cs

@@ -95,7 +95,7 @@ namespace OpenRA.Network
 			}
 		}
 
-		internal void DumpSyncReport(int frame)
+		internal void DumpSyncReport(int frame, IEnumerable<FrameData.ClientOrder> orders)
 		{
 			foreach (var r in syncReports)
 			{
@@ -128,6 +128,10 @@ namespace OpenRA.Network
 								Log.Write("sync", "\t\t {0}: {1}".F(nvp.First[i], nvp.Second[i]));
 					}
 
+					Log.Write("sync", "Orders Issued:");
+					foreach (var o in orders)
+						Log.Write("sync", "\t {0}", o.ToString());
+
 					return;
 				}
 			}

OpenRA.Game/Network/UnitOrders.cs

@@ -161,7 +161,7 @@ namespace OpenRA.Network
 							Name = Game.Settings.Player.Name,
 							PreferredColor = Game.Settings.Player.Color,
 							Color = Game.Settings.Player.Color,
-							Race = "Random",
+							Faction = "Random",
 							SpawnPoint = 0,
 							Team = 0,
 							State = Session.ClientState.Invalid

OpenRA.Game/OpenRA.Game.csproj

@@ -84,8 +84,8 @@
       <HintPath>..\thirdparty\download\MaxMind.Db.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="SDL2-CS">
-      <HintPath>..\thirdparty\download\SDL2-CS.dll</HintPath>
+    <Reference Include="SmarIrc4net">
+      <HintPath>..\thirdparty\download\SmarIrc4net.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
@@ -98,7 +98,9 @@
     <Compile Include="LogProxy.cs" />
     <Compile Include="FileFormats\IdxReader.cs" />
     <Compile Include="FileSystem\BagFile.cs" />
+    <Compile Include="Map\MapGrid.cs" />
     <Compile Include="Map\MapPlayers.cs" />
+    <Compile Include="ContentInstaller.cs" />
     <Compile Include="MPos.cs" />
     <Compile Include="Graphics\QuadRenderer.cs" />
     <Compile Include="Download.cs" />
@@ -120,7 +122,6 @@
     <Compile Include="Graphics\LineRenderer.cs" />
     <Compile Include="Graphics\MappedImage.cs" />
     <Compile Include="Graphics\Minimap.cs" />
-    <Compile Include="Graphics\Renderer.cs" />
     <Compile Include="Graphics\SequenceProvider.cs" />
     <Compile Include="Graphics\Sheet.cs" />
     <Compile Include="Graphics\SheetBuilder.cs" />
@@ -171,7 +172,6 @@
     <Compile Include="TraitDictionary.cs" />
     <Compile Include="Traits\DrawLineToTarget.cs" />
     <Compile Include="Traits\EditorTilesetFilter.cs" />
-    <Compile Include="Traits\Health.cs" />
     <Compile Include="Traits\LintAttributes.cs" />
     <Compile Include="Traits\RejectsOrders.cs" />
     <Compile Include="Traits\Player\DeveloperMode.cs" />
@@ -196,7 +196,6 @@
     <Compile Include="Graphics\VoxelRenderer.cs" />
     <Compile Include="Graphics\VoxelLoader.cs" />
     <Compile Include="Graphics\VoxelProvider.cs" />
-    <Compile Include="Traits\BodyOrientation.cs" />
     <Compile Include="Graphics\VoxelAnimation.cs" />
     <Compile Include="Traits\Player\FrozenActorLayer.cs" />
     <Compile Include="Graphics\Theater.cs" />
@@ -228,8 +227,6 @@
     <Compile Include="Graphics\IGraphicsDevice.cs" />
     <Compile Include="Sound\Sound.cs" />
     <Compile Include="Sound\SoundDevice.cs" />
-    <Compile Include="Sound\OpenAlSound.cs" />
-    <Compile Include="Sound\NullSound.cs" />
     <Compile Include="Effects\SpriteEffect.cs" />
     <Compile Include="Graphics\SelectionBarsRenderable.cs" />
     <Compile Include="Graphics\TargetLineRenderable.cs" />
@@ -249,6 +246,11 @@
     <Compile Include="Graphics\TerrainSpriteLayer.cs" />
     <Compile Include="Map\ProjectedCellRegion.cs" />
     <Compile Include="Map\MapCoordsRegion.cs" />
+    <Compile Include="Renderer.cs" />
+    <Compile Include="Platform.cs" />
+    <Compile Include="GameSpeed.cs" />
+    <Compile Include="GlobalChat.cs" />
+    <Compile Include="Primitives\ObservableList.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FileSystem\D2kSoundResources.cs" />
@@ -298,7 +300,6 @@
     <Compile Include="Support\PerfTimer.cs" />
     <Compile Include="Exts.cs" />
     <Compile Include="MiniYaml.cs" />
-    <Compile Include="Platform.cs" />
     <Compile Include="StreamExts.cs" />
     <Compile Include="Map\Map.cs" />
     <Compile Include="Map\MapCache.cs" />

OpenRA.Game/Orders/GenericSelectTarget.cs

@@ -13,19 +13,19 @@ using OpenRA.Graphics;
 
 namespace OpenRA.Orders
 {
-	public class GenericSelectTarget : IOrderGenerator
+	public class GenericSelectTarget : UnitOrderGenerator
 	{
-		readonly IEnumerable<Actor> subjects;
-		readonly string order;
-		readonly string cursor;
-		readonly MouseButton expectedButton;
+		protected readonly IEnumerable<Actor> Subjects;
+		protected readonly string OrderName;
+		protected readonly string Cursor;
+		protected readonly MouseButton ExpectedButton;
 
 		public GenericSelectTarget(IEnumerable<Actor> subjects, string order, string cursor, MouseButton button)
 		{
-			this.subjects = subjects;
-			this.order = order;
-			this.cursor = cursor;
-			expectedButton = button;
+			Subjects = subjects;
+			OrderName = order;
+			Cursor = cursor;
+			ExpectedButton = button;
 		}
 
 		public GenericSelectTarget(IEnumerable<Actor> subjects, string order, string cursor)
@@ -37,26 +37,23 @@ namespace OpenRA.Orders
 		public GenericSelectTarget(Actor subject, string order, string cursor, MouseButton button)
 			: this(new Actor[] { subject }, order, cursor, button) { }
 
-		public IEnumerable<Order> Order(World world, CPos xy, MouseInput mi)
+		public override IEnumerable<Order> Order(World world, CPos xy, MouseInput mi)
 		{
-			if (mi.Button != expectedButton)
+			if (mi.Button != ExpectedButton)
 				world.CancelInputMode();
 			return OrderInner(world, xy, mi);
 		}
 
-		IEnumerable<Order> OrderInner(World world, CPos xy, MouseInput mi)
+		protected virtual IEnumerable<Order> OrderInner(World world, CPos xy, MouseInput mi)
 		{
-			if (mi.Button == expectedButton && world.Map.Contains(xy))
+			if (mi.Button == ExpectedButton && world.Map.Contains(xy))
 			{
 				world.CancelInputMode();
-				foreach (var subject in subjects)
-					yield return new Order(order, subject, false) { TargetLocation = xy };
+				foreach (var subject in Subjects)
+					yield return new Order(OrderName, subject, false) { TargetLocation = xy };
 			}
 		}
 
-		public virtual void Tick(World world) { }
-		public IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
-		public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world) { yield break; }
-		public string GetCursor(World world, CPos xy, MouseInput mi) { return world.Map.Contains(xy) ? cursor : "generic-blocked"; }
+		public override string GetCursor(World world, CPos xy, MouseInput mi) { return world.Map.Contains(xy) ? Cursor : "generic-blocked"; }
 	}
 }

OpenRA.Game/Orders/UnitOrderGenerator.cs

@@ -15,12 +15,12 @@ using OpenRA.Traits;
 
 namespace OpenRA.Orders
 {
-	class UnitOrderGenerator : IOrderGenerator
+	public class UnitOrderGenerator : IOrderGenerator
 	{
-		public IEnumerable<Order> Order(World world, CPos xy, MouseInput mi)
+		public virtual IEnumerable<Order> Order(World world, CPos xy, MouseInput mi)
 		{
 			var underCursor = world.ScreenMap.ActorsAt(mi)
-				.Where(a => !world.FogObscures(a) && a.HasTrait<ITargetable>())
+				.Where(a => !world.FogObscures(a) && a.Info.HasTraitInfo<ITargetableInfo>())
 				.WithHighestSelectionPriority();
 
 			Target target;
@@ -29,7 +29,7 @@ namespace OpenRA.Orders
 			else
 			{
 				var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, mi)
-					.Where(a => a.Info.Traits.Contains<ITargetableInfo>() && !a.Footprint.All(world.ShroudObscures))
+					.Where(a => a.Info.HasTraitInfo<ITargetableInfo>() && a.Visible && a.HasRenderables)
 					.WithHighestSelectionPriority();
 				target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(world, xy);
 			}
@@ -50,20 +50,20 @@ namespace OpenRA.Orders
 				yield return CheckSameOrder(o.Order, o.Trait.IssueOrder(o.Actor, o.Order, o.Target, mi.Modifiers.HasModifier(Modifiers.Shift)));
 		}
 
-		public void Tick(World world) { }
-		public IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
-		public IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world) { yield break; }
+		public virtual void Tick(World world) { }
+		public virtual IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
+		public virtual IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr, World world) { yield break; }
 
-		public string GetCursor(World world, CPos xy, MouseInput mi)
+		public virtual string GetCursor(World world, CPos xy, MouseInput mi)
 		{
 			var useSelect = false;
 			var underCursor = world.ScreenMap.ActorsAt(mi)
-				.Where(a => !world.FogObscures(a) && a.HasTrait<ITargetable>())
+				.Where(a => !world.FogObscures(a) && a.Info.HasTraitInfo<ITargetableInfo>())
 				.WithHighestSelectionPriority();
 
 			if (underCursor != null && (mi.Modifiers.HasModifier(Modifiers.Shift) || !world.Selection.Actors.Any()))
 			{
-				if (underCursor.HasTrait<Selectable>())
+				if (underCursor.Info.HasTraitInfo<SelectableInfo>())
 					useSelect = true;
 			}
 
@@ -73,7 +73,7 @@ namespace OpenRA.Orders
 			else
 			{
 				var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, mi)
-					.Where(a => a.Info.Traits.Contains<ITargetableInfo>() && !a.Footprint.All(world.ShroudObscures))
+					.Where(a => a.Info.HasTraitInfo<ITargetableInfo>() && a.Visible && a.HasRenderables)
 					.WithHighestSelectionPriority();
 				target = frozen != null ? Target.FromFrozenActor(frozen) : Target.FromCell(world, xy);
 			}
@@ -119,7 +119,7 @@ namespace OpenRA.Orders
 						.Select(x => new { Trait = trait, Order = x }))
 					.OrderByDescending(x => x.Order.OrderPriority))
 				{
-					var actorsAt = self.World.ActorMap.GetUnitsAt(self.World.Map.CellContaining(target.CenterPosition)).ToList();
+					var actorsAt = self.World.ActorMap.GetActorsAt(self.World.Map.CellContaining(target.CenterPosition)).ToList();
 
 					var modifiers = TargetModifiers.None;
 					if (mi.Modifiers.HasModifier(Modifiers.Ctrl))
@@ -130,7 +130,7 @@ namespace OpenRA.Orders
 						modifiers |= TargetModifiers.ForceMove;
 
 					string cursor = null;
-					if (o.Order.CanTarget(self, target, actorsAt, modifiers, ref cursor))
+					if (o.Order.CanTarget(self, target, actorsAt, ref modifiers, ref cursor))
 						return new UnitOrderResult(self, o.Order, o.Trait, cursor, target);
 				}
 			}

OpenRA.Game/Player.cs

@@ -53,8 +53,8 @@ namespace OpenRA
 
 		static FactionInfo ChooseFaction(World world, string name, bool requireSelectable = true)
 		{
-			var selectableFactions = world.Map.Rules.Actors["world"].Traits
-				.WithInterface<FactionInfo>().Where(f => !requireSelectable || f.Selectable)
+			var selectableFactions = world.Map.Rules.Actors["world"].TraitInfos<FactionInfo>()
+				.Where(f => !requireSelectable || f.Selectable)
 				.ToList();
 
 			var selected = selectableFactions.FirstOrDefault(f => f.InternalName == name)
@@ -75,7 +75,7 @@ namespace OpenRA
 
 		static FactionInfo ChooseDisplayFaction(World world, string factionName)
 		{
-			var factions = world.Map.Rules.Actors["world"].Traits.WithInterface<FactionInfo>().ToArray();
+			var factions = world.Map.Rules.Actors["world"].TraitInfos<FactionInfo>().ToArray();
 
 			return factions.FirstOrDefault(f => f.InternalName == factionName) ?? factions.First();
 		}
@@ -95,8 +95,8 @@ namespace OpenRA
 				Color = client.Color;
 				PlayerName = client.Name;
 				botType = client.Bot;
-				Faction = ChooseFaction(world, client.Race, !pr.LockFaction);
-				DisplayFaction = ChooseDisplayFaction(world, client.Race);
+				Faction = ChooseFaction(world, client.Faction, !pr.LockFaction);
+				DisplayFaction = ChooseDisplayFaction(world, client.Faction);
 			}
 			else
 			{
@@ -154,24 +154,18 @@ namespace OpenRA
 
 		public bool CanViewActor(Actor a)
 		{
-			if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(a, this)))
-				return false;
-
-			return a.Trait<IDefaultVisibility>().IsVisible(a, this);
+			return a.CanBeViewedByPlayer(this);
 		}
 
 		public bool CanTargetActor(Actor a)
 		{
-			if (HasFogVisibility)
+			if (HasFogVisibility && fogVisibilities.Any(f => f.IsVisible(a)))
 				return true;
 
-			if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(a, this)))
-				return false;
-
-			return a.Trait<IDefaultVisibility>().IsVisible(a, this);
+			return CanViewActor(a);
 		}
 
-		public bool HasFogVisibility { get { return fogVisibilities.Any(f => f.HasFogVisibility(this)); } }
+		public bool HasFogVisibility { get { return fogVisibilities.Any(f => f.HasFogVisibility()); } }
 
 		#region Scripting interface
 

OpenRA.Game/Primitives/ActionQueue.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System;
+using System.Collections.Generic;
 
 namespace OpenRA.Primitives
 {
@@ -17,37 +18,56 @@ namespace OpenRA.Primitives
 	/// </summary>
 	public class ActionQueue
 	{
-		object syncRoot = new object();
-		PriorityQueue<DelayedAction> actions = new PriorityQueue<DelayedAction>();
+		readonly List<DelayedAction> actions = new List<DelayedAction>();
 
-		public void Add(Action a) { Add(a, 0); }
-		public void Add(Action a, int delay)
+		public void Add(Action a, int desiredTime)
 		{
-			lock (syncRoot)
-				actions.Add(new DelayedAction(a, Game.RunTime + delay));
+			if (a == null)
+				throw new ArgumentNullException("a");
+
+			lock (actions)
+			{
+				var action = new DelayedAction(a, desiredTime);
+				var index = Index(action);
+				actions.Insert(index, action);
+			}
 		}
 
-		public void PerformActions()
+		public void PerformActions(int currentTime)
 		{
-			Action a = () => { };
-			lock (syncRoot)
+			DelayedAction[] pendingActions;
+			lock (actions)
 			{
-				var t = Game.RunTime;
-				while (!actions.Empty && actions.Peek().Time <= t)
-				{
-					var da = actions.Pop();
-					a = da.Action + a;
-				}
+				var dummyAction = new DelayedAction(null, currentTime);
+				var index = Index(dummyAction);
+				if (index <= 0)
+					return;
+
+				pendingActions = new DelayedAction[index];
+				actions.CopyTo(0, pendingActions, 0, index);
+				actions.RemoveRange(0, index);
 			}
 
-			a();
+			foreach (var delayedAction in pendingActions)
+				delayedAction.Action();
+		}
+
+		int Index(DelayedAction action)
+		{
+			// Returns the index of the next action with a strictly greater time.
+			var index = actions.BinarySearch(action);
+			if (index < 0)
+				return ~index;
+			while (index < actions.Count && action.CompareTo(actions[index]) >= 0)
+				index++;
+			return index;
 		}
 	}
 
 	struct DelayedAction : IComparable<DelayedAction>
 	{
-		public int Time;
-		public Action Action;
+		public readonly int Time;
+		public readonly Action Action;
 
 		public DelayedAction(Action action, int time)
 		{
@@ -59,5 +79,10 @@ namespace OpenRA.Primitives
 		{
 			return Time.CompareTo(other.Time);
 		}
+
+		public override string ToString()
+		{
+			return "Time: " + Time + " Action: " + Action;
+		}
 	}
 }

OpenRA.Game/Primitives/ObservableList.cs

@@ -0,0 +1,118 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace OpenRA.Primitives
+{
+	public class ObservableList<T> : IList<T>, IObservableCollection
+	{
+		protected IList<T> innerList;
+
+		public event Action<object> OnAdd = k => { };
+		public event Action<object> OnRemove = k => { };
+
+		// TODO Workaround for https://github.com/OpenRA/OpenRA/issues/6101
+		#pragma warning disable 67
+		public event Action<int> OnRemoveAt = i => { };
+		public event Action<object, object> OnSet = (o, n) => { };
+		#pragma warning restore
+		public event Action OnRefresh = () => { };
+
+		protected void FireOnRefresh()
+		{
+			OnRefresh();
+		}
+
+		public ObservableList()
+		{
+			innerList = new List<T>();
+		}
+
+		public virtual void Add(T item)
+		{
+			innerList.Add(item);
+			OnAdd(item);
+		}
+
+		public bool Remove(T item)
+		{
+			var found = innerList.Remove(item);
+			if (found)
+				OnRemove(item);
+
+			return found;
+		}
+
+		public void Clear()
+		{
+			innerList.Clear();
+			OnRefresh();
+		}
+
+		public void Insert(int index, T item)
+		{
+			innerList.Insert(index, item);
+			OnRefresh();
+		}
+
+		public int Count { get { return innerList.Count; } }
+		public int IndexOf(T item) { return innerList.IndexOf(item); }
+		public bool Contains(T item) { return innerList.Contains(item); }
+
+		public void RemoveAt(int index)
+		{
+			innerList.RemoveAt(index);
+			OnRemoveAt(index);
+		}
+
+		public T this[int index]
+		{
+			get
+			{
+				return innerList[index];
+			}
+
+			set
+			{
+				var oldValue = innerList[index];
+				innerList[index] = value;
+				OnSet(oldValue, value);
+			}
+		}
+
+		public void CopyTo(T[] array, int arrayIndex)
+		{
+			innerList.CopyTo(array, arrayIndex);
+		}
+
+		public IEnumerator<T> GetEnumerator()
+		{
+			return innerList.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return innerList.GetEnumerator();
+		}
+
+		public IEnumerable ObservedItems
+		{
+			get { return innerList; }
+		}
+
+		public bool IsReadOnly
+		{
+			get { return innerList.IsReadOnly; }
+		}
+	}
+}

OpenRA.Game/Renderer.cs

@@ -13,9 +13,10 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Reflection;
+using OpenRA.Graphics;
 using OpenRA.Support;
 
-namespace OpenRA.Graphics
+namespace OpenRA
 {
 	public sealed class Renderer : IDisposable
 	{
@@ -49,7 +50,7 @@ namespace OpenRA.Graphics
 			var resolution = GetResolution(graphicSettings);
 
 			var rendererName = serverSettings.Dedicated ? "Null" : graphicSettings.Renderer;
-			var rendererPath = Platform.ResolvePath(".", "OpenRA.Renderer." + rendererName + ".dll");
+			var rendererPath = Platform.ResolvePath(".", "OpenRA.Platforms." + rendererName + ".dll");
 
 			Device = CreateDevice(Assembly.LoadFile(rendererPath), resolution.Width, resolution.Height, graphicSettings.Mode);
 
@@ -79,12 +80,12 @@ namespace OpenRA.Graphics
 			return new Size(size.X, size.Y);
 		}
 
-		static IGraphicsDevice CreateDevice(Assembly rendererDll, int width, int height, WindowMode window)
+		static IGraphicsDevice CreateDevice(Assembly platformDll, int width, int height, WindowMode window)
 		{
-			foreach (RendererAttribute r in rendererDll.GetCustomAttributes(typeof(RendererAttribute), false))
+			foreach (PlatformAttribute r in platformDll.GetCustomAttributes(typeof(PlatformAttribute), false))
 			{
 				var factory = (IDeviceFactory)r.Type.GetConstructor(Type.EmptyTypes).Invoke(null);
-				return factory.Create(new Size(width, height), window);
+				return factory.CreateGraphics(new Size(width, height), window);
 			}
 
 			throw new InvalidOperationException("Renderer DLL is missing RendererAttribute to tell us what type to use!");
@@ -160,11 +161,6 @@ namespace OpenRA.Graphics
 			DrawBatch(tempBuffer, 0, numVertices, type);
 		}
 
-		public Bitmap TakeScreenshot()
-		{
-			return Device.TakeScreenshot();
-		}
-
 		public void DrawBatch<T>(IVertexBuffer<T> vertices,
 			int firstVertex, int numVertices, PrimitiveType type)
 			where T : struct

OpenRA.Game/Scripting/ScriptContext.cs

@@ -254,9 +254,9 @@ namespace OpenRA.Scripting
 		static readonly object[] NoArguments = new object[0];
 		Type[] FilterActorCommands(ActorInfo ai)
 		{
-			var method = typeof(TypeDictionary).GetMethod("Contains");
+			var method = typeof(ActorInfo).GetMethod("HasTraitInfo");
 			return knownActorCommands.Where(c => ExtractRequiredTypes(c)
-				.All(t => (bool)method.MakeGenericMethod(t).Invoke(ai.Traits, NoArguments)))
+				.All(t => (bool)method.MakeGenericMethod(t).Invoke(ai, NoArguments)))
 				.ToArray();
 		}
 

OpenRA.Game/SelectableExts.cs

@@ -18,7 +18,7 @@ namespace OpenRA.Traits
 	{
 		public static int SelectionPriority(this ActorInfo a)
 		{
-			var selectableInfo = a.Traits.GetOrDefault<SelectableInfo>();
+			var selectableInfo = a.TraitInfoOrDefault<SelectableInfo>();
 			return selectableInfo != null ? selectableInfo.Priority : int.MinValue;
 		}
 
@@ -26,7 +26,7 @@ namespace OpenRA.Traits
 
 		public static int SelectionPriority(this Actor a)
 		{
-			var basePriority = a.Info.Traits.Get<SelectableInfo>().Priority;
+			var basePriority = a.Info.TraitInfo<SelectableInfo>().Priority;
 			var lp = a.World.LocalPlayer;
 
 			if (a.Owner == lp || lp == null)

OpenRA.Game/Selection.cs

@@ -75,7 +75,7 @@ namespace OpenRA
 				if (actor.Owner != world.LocalPlayer || !actor.IsInWorld)
 					continue;
 
-				var selectable = actor.Info.Traits.GetOrDefault<SelectableInfo>();
+				var selectable = actor.Info.TraitInfoOrDefault<SelectableInfo>();
 				if (selectable == null || !actor.HasVoice(selectable.Voice))
 					continue;
 

OpenRA.Game/Server/Server.cs

@@ -73,7 +73,7 @@ namespace OpenRA.Server
 				return;
 
 			if (pr.LockFaction)
-				c.Race = pr.Faction;
+				c.Faction = pr.Faction;
 			if (pr.LockSpawn)
 				c.SpawnPoint = pr.Spawn;
 			if (pr.LockTeam)
@@ -308,7 +308,7 @@ namespace OpenRA.Server
 					Slot = LobbyInfo.FirstEmptySlot(),
 					PreferredColor = handshake.Client.Color,
 					Color = handshake.Client.Color,
-					Race = "Random",
+					Faction = "Random",
 					SpawnPoint = 0,
 					Team = 0,
 					State = Session.ClientState.Invalid,
@@ -372,6 +372,9 @@ namespace OpenRA.Server
 
 				SyncLobbyInfo();
 
+				Log.Write("server", "{0} ({1}) has joined the game.",
+					client.Name, newConn.Socket.RemoteEndPoint);
+
 				if (!LobbyInfo.IsSinglePlayer)
 					SendMessage("{0} has joined the game.".F(client.Name));
 
@@ -408,7 +411,19 @@ namespace OpenRA.Server
 
 		void SetOrderLag()
 		{
-			LobbyInfo.GlobalSettings.OrderLatency = LobbyInfo.IsSinglePlayer ? 1 : 3;
+			int latency = 1;
+			if (!LobbyInfo.IsSinglePlayer)
+			{
+				var gameSpeeds = Game.ModData.Manifest.Get<GameSpeeds>();
+				GameSpeed speed;
+				if (gameSpeeds.Speeds.TryGetValue(LobbyInfo.GlobalSettings.GameSpeedType, out speed))
+					latency = speed.OrderLatency;
+				else
+					latency = 3;
+			}
+
+			LobbyInfo.GlobalSettings.OrderLatency = latency;
+
 			SyncLobbyGlobalSettings();
 		}
 

OpenRA.Game/Settings.cs

@@ -19,7 +19,7 @@ using OpenRA.Traits;
 
 namespace OpenRA
 {
-	public enum MouseScrollType { Disabled, Standard, Inverted }
+	public enum MouseScrollType { Disabled, Standard, Inverted, Joystick }
 
 	public class ServerSettings
 	{
@@ -72,7 +72,7 @@ namespace OpenRA
 		[Desc("Disallow AI bots.")]
 		public bool LockBots = false;
 
-		public string TimestampFormat = "HH:mm";
+		public string TimestampFormat = "s";
 
 		public ServerSettings() { }
 
@@ -111,7 +111,7 @@ namespace OpenRA
 
 	public class GraphicSettings
 	{
-		public string Renderer = "Sdl2";
+		public string Renderer = "Default";
 		public WindowMode Mode = WindowMode.PseudoFullscreen;
 		public int2 FullscreenSize = new int2(0, 0);
 		public int2 WindowedSize = new int2(1024, 768);
@@ -139,7 +139,7 @@ namespace OpenRA
 		public bool Shuffle = false;
 		public bool Repeat = false;
 
-		public string Engine = "AL";
+		public string Engine = "Default";
 		public string Device = null;
 
 		public bool CashTicks = true;
@@ -167,6 +167,7 @@ namespace OpenRA
 		public float ViewportEdgeScrollStep = 10f;
 		public float UIScrollSpeed = 50f;
 		public int SelectionDeadzone = 24;
+		public int JoystickScrollDeadzone = 8;
 
 		public bool UseClassicMouseStyle = false;
 		public bool AlwaysShowStatusBars = false;
@@ -178,7 +179,6 @@ namespace OpenRA
 
 		public bool FetchNews = true;
 		public string NewsUrl = "http://www.openra.net/gamenews";
-		public DateTime NewsFetchedDate;
 	}
 
 	public class KeySettings
@@ -189,6 +189,11 @@ namespace OpenRA
 		public Hotkey SelectAllUnitsKey = new Hotkey(Keycode.Q, Modifiers.None);
 		public Hotkey SelectUnitsByTypeKey = new Hotkey(Keycode.W, Modifiers.None);
 
+		public Hotkey MapScrollUp = new Hotkey(Keycode.UP, Modifiers.None);
+		public Hotkey MapScrollDown = new Hotkey(Keycode.DOWN, Modifiers.None);
+		public Hotkey MapScrollLeft = new Hotkey(Keycode.LEFT, Modifiers.None);
+		public Hotkey MapScrollRight = new Hotkey(Keycode.RIGHT, Modifiers.None);
+
 		public Hotkey PauseKey = new Hotkey(Keycode.PAUSE, Modifiers.None);
 		public Hotkey PlaceBeaconKey = new Hotkey(Keycode.B, Modifiers.None);
 		public Hotkey SellKey = new Hotkey(Keycode.Z, Modifiers.None);
@@ -288,6 +293,17 @@ namespace OpenRA
 		}
 	}
 
+	public class ChatSettings
+	{
+		public string Hostname = "irc.openra.net";
+		public int Port = 6667;
+		public string Channel = "lobby";
+		public string Nickname = "Newbie";
+		public string QuitMessage = "Battle control terminated!";
+		public string TimestampFormat = "HH:mm";
+		public bool ConnectAutomatically = false;
+	}
+
 	public class Settings
 	{
 		string settingsFile;
@@ -299,6 +315,7 @@ namespace OpenRA
 		public ServerSettings Server = new ServerSettings();
 		public DebugSettings Debug = new DebugSettings();
 		public KeySettings Keys = new KeySettings();
+		public ChatSettings Chat = new ChatSettings();
 
 		public Dictionary<string, object> Sections;
 
@@ -314,6 +331,7 @@ namespace OpenRA
 				{ "Server", Server },
 				{ "Debug", Debug },
 				{ "Keys", Keys },
+				{ "Chat", Chat }
 			};
 
 			// Override fieldloader to ignore invalid entries
@@ -381,7 +399,7 @@ namespace OpenRA
 		public static string SanitizedPlayerName(string dirty)
 		{
 			var forbiddenNames = new string[] { "Open", "Closed" };
-			var botNames = OpenRA.Game.ModData.DefaultRules.Actors["player"].Traits.WithInterface<IBotInfo>().Select(t => t.Name);
+			var botNames = OpenRA.Game.ModData.DefaultRules.Actors["player"].TraitInfos<IBotInfo>().Select(t => t.Name);
 
 			var clean = SanitizedName(dirty);
 

OpenRA.Game/Sound/Sound.cs

@@ -11,26 +11,42 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using OpenRA.FileFormats;
 using OpenRA.FileSystem;
 using OpenRA.GameRules;
 using OpenRA.Primitives;
 using OpenRA.Traits;
-using OpenTK;
-using OpenTK.Audio.OpenAL;
 
 namespace OpenRA
 {
-	public static class Sound
+	public sealed class Sound : IDisposable
 	{
-		static ISoundEngine soundEngine;
-		static Cache<string, ISoundSource> sounds;
-		static ISoundSource rawSource;
-		static ISound music;
-		static ISound video;
-		static MusicInfo currentMusic;
+		readonly ISoundEngine soundEngine;
+		Cache<string, ISoundSource> sounds;
+		ISoundSource rawSource;
+		ISound music;
+		ISound video;
+		MusicInfo currentMusic;
 
-		static ISoundSource LoadSound(string filename)
+		public Sound(string engineName)
+		{
+			var enginePath = Platform.ResolvePath(".", "OpenRA.Platforms." + engineName + ".dll");
+			soundEngine = CreateDevice(Assembly.LoadFile(enginePath));
+		}
+
+		static ISoundEngine CreateDevice(Assembly platformDll)
+		{
+			foreach (PlatformAttribute r in platformDll.GetCustomAttributes(typeof(PlatformAttribute), false))
+			{
+				var factory = (IDeviceFactory)r.Type.GetConstructor(Type.EmptyTypes).Invoke(null);
+				return factory.CreateSound();
+			}
+
+			throw new InvalidOperationException("Platform DLL is missing PlatformAttribute to tell us what type to use!");
+		}
+
+		ISoundSource LoadSound(string filename)
 		{
 			if (!GlobalFileSystem.Exists(filename))
 			{
@@ -46,35 +62,17 @@ namespace OpenRA
 				return LoadSoundRaw(AudLoader.LoadSound(s), 1, 16, 22050);
 		}
 
-		static ISoundSource LoadWave(WavLoader wave)
+		ISoundSource LoadWave(WavLoader wave)
 		{
 			return soundEngine.AddSoundSourceFromMemory(wave.RawOutput, wave.Channels, wave.BitsPerSample, wave.SampleRate);
 		}
 
-		static ISoundSource LoadSoundRaw(byte[] rawData, int channels, int sampleBits, int sampleRate)
+		ISoundSource LoadSoundRaw(byte[] rawData, int channels, int sampleBits, int sampleRate)
 		{
 			return soundEngine.AddSoundSourceFromMemory(rawData, channels, sampleBits, sampleRate);
 		}
 
-		static ISoundEngine CreateEngine(string engine)
-		{
-			engine = Game.Settings.Server.Dedicated ? "Null" : engine;
-			switch (engine)
-			{
-				case "AL": return new OpenAlSoundEngine();
-				case "Null": return new NullSoundEngine();
-
-				default:
-					throw new InvalidOperationException("Unsupported sound engine: {0}".F(engine));
-			}
-		}
-
-		public static void Create(string engine)
-		{
-			soundEngine = CreateEngine(engine);
-		}
-
-		public static void Initialize()
+		public void Initialize()
 		{
 			sounds = new Cache<string, ISoundSource>(LoadSound);
 			music = null;
@@ -82,26 +80,23 @@ namespace OpenRA
 			video = null;
 		}
 
-		public static SoundDevice[] AvailableDevices()
+		public SoundDevice[] AvailableDevices()
 		{
 			var defaultDevices = new[]
 			{
-				new SoundDevice("AL", null, "Default Output"),
+				new SoundDevice("Default", null, "Default Output"),
 				new SoundDevice("Null", null, "Output Disabled")
 			};
 
-			var devices = OpenAlSoundEngine.AvailableDevices()
-				.Select(d => new SoundDevice("AL", d, d));
-
-			return defaultDevices.Concat(devices).ToArray();
+			return defaultDevices.Concat(soundEngine.AvailableDevices()).ToArray();
 		}
 
-		public static void SetListenerPosition(WPos position)
+		public void SetListenerPosition(WPos position)
 		{
 			soundEngine.SetListenerPosition(position);
 		}
 
-		static ISound Play(Player player, string name, bool headRelative, WPos pos, float volumeModifier = 1f, bool loop = false)
+		ISound Play(Player player, string name, bool headRelative, WPos pos, float volumeModifier = 1f, bool loop = false)
 		{
 			if (string.IsNullOrEmpty(name))
 				return null;
@@ -113,45 +108,45 @@ namespace OpenRA
 				InternalSoundVolume * volumeModifier, true);
 		}
 
-		public static void StopAudio()
+		public void StopAudio()
 		{
 			soundEngine.StopAllSounds();
 		}
 
-		public static ISound Play(string name) { return Play(null, name, true, WPos.Zero, 1f); }
-		public static ISound Play(string name, WPos pos) { return Play(null, name, false, pos, 1f); }
-		public static ISound Play(string name, float volumeModifier) { return Play(null, name, true, WPos.Zero, volumeModifier); }
-		public static ISound Play(string name, WPos pos, float volumeModifier) { return Play(null, name, false, pos, volumeModifier); }
-		public static ISound PlayToPlayer(Player player, string name) { return Play(player, name, true, WPos.Zero, 1f); }
-		public static ISound PlayToPlayer(Player player, string name, WPos pos) { return Play(player, name, false, pos, 1f); }
-		public static ISound PlayLooped(string name) { return PlayLooped(name, WPos.Zero); }
-		public static ISound PlayLooped(string name, WPos pos) { return Play(null, name, true, pos, 1f, true); }
+		public ISound Play(string name) { return Play(null, name, true, WPos.Zero, 1f); }
+		public ISound Play(string name, WPos pos) { return Play(null, name, false, pos, 1f); }
+		public ISound Play(string name, float volumeModifier) { return Play(null, name, true, WPos.Zero, volumeModifier); }
+		public ISound Play(string name, WPos pos, float volumeModifier) { return Play(null, name, false, pos, volumeModifier); }
+		public ISound PlayToPlayer(Player player, string name) { return Play(player, name, true, WPos.Zero, 1f); }
+		public ISound PlayToPlayer(Player player, string name, WPos pos) { return Play(player, name, false, pos, 1f); }
+		public ISound PlayLooped(string name) { return PlayLooped(name, WPos.Zero); }
+		public ISound PlayLooped(string name, WPos pos) { return Play(null, name, true, pos, 1f, true); }
 
-		public static void PlayVideo(byte[] raw, int channels, int sampleBits, int sampleRate)
+		public void PlayVideo(byte[] raw, int channels, int sampleBits, int sampleRate)
 		{
 			rawSource = LoadSoundRaw(raw, channels, sampleBits, sampleRate);
 			video = soundEngine.Play2D(rawSource, false, true, WPos.Zero, InternalSoundVolume, false);
 		}
 
-		public static void PlayVideo()
+		public void PlayVideo()
 		{
 			if (video != null)
 				soundEngine.PauseSound(video, false);
 		}
 
-		public static void PauseVideo()
+		public void PauseVideo()
 		{
 			if (video != null)
 				soundEngine.PauseSound(video, true);
 		}
 
-		public static void StopVideo()
+		public void StopVideo()
 		{
 			if (video != null)
 				soundEngine.StopSound(video);
 		}
 
-		public static void Tick()
+		public void Tick()
 		{
 			// Song finished
 			if (MusicPlaying && !music.Playing)
@@ -161,16 +156,16 @@ namespace OpenRA
 			}
 		}
 
-		static Action onMusicComplete;
-		public static bool MusicPlaying { get; private set; }
-		public static MusicInfo CurrentMusic { get { return currentMusic; } }
+		Action onMusicComplete;
+		public bool MusicPlaying { get; private set; }
+		public MusicInfo CurrentMusic { get { return currentMusic; } }
 
-		public static void PlayMusic(MusicInfo m)
+		public void PlayMusic(MusicInfo m)
 		{
 			PlayMusicThen(m, () => { });
 		}
 
-		public static void PlayMusicThen(MusicInfo m, Action then)
+		public void PlayMusicThen(MusicInfo m, Action then)
 		{
 			if (m == null || !m.Exists)
 				return;
@@ -195,7 +190,7 @@ namespace OpenRA
 			MusicPlaying = true;
 		}
 
-		public static void PlayMusic()
+		public void PlayMusic()
 		{
 			if (music == null)
 				return;
@@ -204,13 +199,13 @@ namespace OpenRA
 			soundEngine.PauseSound(music, false);
 		}
 
-		public static void StopSound(ISound sound)
+		public void StopSound(ISound sound)
 		{
 			if (sound != null)
 				soundEngine.StopSound(sound);
 		}
 
-		public static void StopMusic()
+		public void StopMusic()
 		{
 			if (music != null)
 				soundEngine.StopSound(music);
@@ -219,7 +214,7 @@ namespace OpenRA
 			currentMusic = null;
 		}
 
-		public static void PauseMusic()
+		public void PauseMusic()
 		{
 			if (music == null)
 				return;
@@ -228,14 +223,14 @@ namespace OpenRA
 			soundEngine.PauseSound(music, true);
 		}
 
-		public static float GlobalVolume
+		public float GlobalVolume
 		{
 			get { return soundEngine.Volume; }
 			set { soundEngine.Volume = value; }
 		}
 
-		static float soundVolumeModifier = 1.0f;
-		public static float SoundVolumeModifier
+		float soundVolumeModifier = 1.0f;
+		public float SoundVolumeModifier
 		{
 			get
 			{
@@ -249,8 +244,8 @@ namespace OpenRA
 			}
 		}
 
-		static float InternalSoundVolume { get { return SoundVolume * soundVolumeModifier; } }
-		public static float SoundVolume
+		float InternalSoundVolume { get { return SoundVolume * soundVolumeModifier; } }
+		public float SoundVolume
 		{
 			get
 			{
@@ -264,7 +259,7 @@ namespace OpenRA
 			}
 		}
 
-		public static float MusicVolume
+		public float MusicVolume
 		{
 			get
 			{
@@ -279,7 +274,7 @@ namespace OpenRA
 			}
 		}
 
-		public static float VideoVolume
+		public float VideoVolume
 		{
 			get
 			{
@@ -294,18 +289,18 @@ namespace OpenRA
 			}
 		}
 
-		public static float MusicSeekPosition
+		public float MusicSeekPosition
 		{
 			get { return music != null ? music.SeekPosition : 0; }
 		}
 
-		public static float VideoSeekPosition
+		public float VideoSeekPosition
 		{
 			get { return video != null ? video.SeekPosition : 0; }
 		}
 
 		// Returns true if played successfully
-		public static bool PlayPredefined(Ruleset ruleset, Player p, Actor voicedActor, string type, string definition, string variant,
+		public bool PlayPredefined(Ruleset ruleset, Player p, Actor voicedActor, string type, string definition, string variant,
 			bool relative, WPos pos, float volumeModifier, bool attenuateVolume)
 		{
 			if (ruleset == null)
@@ -363,7 +358,7 @@ namespace OpenRA
 			return true;
 		}
 
-		public static bool PlayNotification(Ruleset rules, Player player, string type, string notification, string variant)
+		public bool PlayNotification(Ruleset rules, Player player, string type, string notification, string variant)
 		{
 			if (rules == null)
 				throw new ArgumentNullException("rules");
@@ -373,5 +368,10 @@ namespace OpenRA
 
 			return PlayPredefined(rules, player, null, type.ToLowerInvariant(), notification, variant, true, WPos.Zero, 1f, false);
 		}
+
+		public void Dispose()
+		{
+			soundEngine.Dispose();
+		}
 	}
 }

OpenRA.Game/Sound/SoundDevice.cs

@@ -8,10 +8,13 @@
  */
 #endregion
 
+using System;
+
 namespace OpenRA
 {
-	interface ISoundEngine
+	public interface ISoundEngine : IDisposable
 	{
+		SoundDevice[] AvailableDevices();
 		ISoundSource AddSoundSourceFromMemory(byte[] data, int channels, int sampleBits, int sampleRate);
 		ISound Play2D(ISoundSource sound, bool loop, bool relative, WPos pos, float volume, bool attenuateVolume);
 		float Volume { get; set; }
@@ -41,7 +44,7 @@ namespace OpenRA
 		}
 	}
 
-	interface ISoundSource { }
+	public interface ISoundSource { }
 
 	public interface ISound
 	{

OpenRA.Game/Support/Log.cs

@@ -61,6 +61,18 @@ namespace OpenRA
 				catch (IOException) { }
 		}
 
+		public static void Write(string channel, string value)
+		{
+			ChannelInfo info;
+			if (!Channels.TryGetValue(channel, out info))
+				throw new Exception("Tried logging to non-existant channel " + channel);
+
+			if (info.Writer == null)
+				return;
+
+			info.Writer.WriteLine(value);
+		}
+
 		public static void Write(string channel, string format, params object[] args)
 		{
 			ChannelInfo info;

OpenRA.Game/Support/Program.cs

@@ -55,6 +55,12 @@ namespace OpenRA
 				Log.Write("exception", "{0} Mod at Version {1}", mod.Title, mod.Version);
 			}
 
+			if (Game.OrderManager != null && Game.OrderManager.World != null && Game.OrderManager.World.Map != null)
+			{
+				var map = Game.OrderManager.World.Map;
+				Log.Write("exception", "on map {0} ({1} by {2}).", map.Uid, map.Title, map.Author);
+			}
+
 			Log.Write("exception", "Operating System: {0} ({1})", Platform.CurrentPlatform, Environment.OSVersion);
 			Log.Write("exception", "Runtime Version: {0}", Platform.RuntimeVersion);
 			var rpt = BuildExceptionReport(e).ToString();

OpenRA.Game/TraitDictionary.cs

@@ -84,12 +84,6 @@ namespace OpenRA
 				throw new InvalidOperationException("Attempted to get trait from destroyed object ({0})".F(actor));
 		}
 
-		public bool Contains<T>(Actor actor)
-		{
-			CheckDestroyed(actor);
-			return InnerGet<T>().GetMultiple(actor.ActorID).Any();
-		}
-
 		public T Get<T>(Actor actor)
 		{
 			CheckDestroyed(actor);

OpenRA.Game/Traits/EditorTilesetFilter.cs

@@ -8,12 +8,14 @@
  */
 #endregion
 
+using System.Collections.Generic;
+
 namespace OpenRA.Traits
 {
 	public class EditorTilesetFilterInfo : TraitInfo<EditorTilesetFilter>
 	{
-		public readonly string[] RequireTilesets = null;
-		public readonly string[] ExcludeTilesets = null;
+		public readonly HashSet<string> RequireTilesets = null;
+		public readonly HashSet<string> ExcludeTilesets = null;
 	}
 
 	public class EditorTilesetFilter { }

OpenRA.Game/Traits/LintAttributes.cs

@@ -43,4 +43,30 @@ namespace OpenRA.Traits
 
 	[AttributeUsage(AttributeTargets.Field)]
 	public sealed class UpgradeUsedReferenceAttribute : Attribute { }
+
+	[AttributeUsage(AttributeTargets.Field)]
+	public sealed class PaletteDefinitionAttribute : Attribute
+	{
+		public readonly bool IsPlayerPalette;
+		public PaletteDefinitionAttribute(bool isPlayerPalette = false)
+		{
+			IsPlayerPalette = isPlayerPalette;
+		}
+	}
+
+	[AttributeUsage(AttributeTargets.Field)]
+	public sealed class PaletteReferenceAttribute : Attribute
+	{
+		public readonly bool IsPlayerPalette;
+		public PaletteReferenceAttribute(bool isPlayerPalette = false)
+		{
+			IsPlayerPalette = isPlayerPalette;
+		}
+
+		public readonly string PlayerPaletteReferenceSwitch;
+		public PaletteReferenceAttribute(string playerPaletteReferenceSwitch)
+		{
+			PlayerPaletteReferenceSwitch = playerPaletteReferenceSwitch;
+		}
+	}
 }

OpenRA.Game/Traits/Player/DeveloperMode.cs

@@ -23,6 +23,7 @@ namespace OpenRA.Traits
 		public bool BuildAnywhere;
 		public bool ShowCombatGeometry;
 		public bool ShowDebugGeometry;
+		public bool ShowDepthPreview;
 
 		public object Create(ActorInitializer init) { return new DeveloperMode(this); }
 	}
@@ -41,6 +42,8 @@ namespace OpenRA.Traits
 		// Client side only
 		public bool ShowCombatGeometry;
 		public bool ShowDebugGeometry;
+		public bool ShowDepthPreview;
+
 		public bool EnableAll;
 
 		public DeveloperMode(DeveloperModeInfo info)
@@ -54,6 +57,7 @@ namespace OpenRA.Traits
 			BuildAnywhere = info.BuildAnywhere;
 			ShowCombatGeometry = info.ShowCombatGeometry;
 			ShowDebugGeometry = info.ShowDebugGeometry;
+			ShowDepthPreview = info.ShowDepthPreview;
 		}
 
 		public void ResolveOrder(Actor self, Order order)
@@ -123,7 +127,7 @@ namespace OpenRA.Traits
 						break;
 					}
 
-				case "DevShroudDisable":
+				case "DevVisibility":
 					{
 						DisableShroud ^= true;
 						self.Owner.Shroud.Disabled = DisableShroud;

OpenRA.Game/Traits/Player/FixedColorPalette.cs

@@ -16,15 +16,20 @@ namespace OpenRA.Traits
 	public class FixedColorPaletteInfo : ITraitInfo
 	{
 		[Desc("The name of the palette to base off.")]
-		public readonly string Base = "terrain";
+		[PaletteReference] public readonly string Base = "terrain";
+
 		[Desc("The name of the resulting palette")]
-		public readonly string Name = "resources";
+		[PaletteDefinition] public readonly string Name = "resources";
+
 		[Desc("Remap these indices to pre-defined colors.")]
 		public readonly int[] RemapIndex = { };
+
 		[Desc("The fixed color to remap.")]
 		public readonly HSLColor Color;
+
 		[Desc("Luminosity range to span.")]
 		public readonly float Ramp = 0.05f;
+
 		[Desc("Allow palette modifiers to change the palette.")]
 		public readonly bool AllowModifiers = true;
 

OpenRA.Game/Traits/Player/FrozenActorLayer.cs

@@ -27,6 +27,8 @@ namespace OpenRA.Traits
 		public readonly PPos[] Footprint;
 		public readonly WPos CenterPosition;
 		public readonly Rectangle Bounds;
+		public readonly HashSet<string> TargetTypes;
+		readonly IRemoveFrozenActor[] removeFrozenActors;
 		readonly Actor actor;
 		readonly Shroud shroud;
 
@@ -39,13 +41,19 @@ namespace OpenRA.Traits
 		public DamageState DamageState;
 
 		public bool Visible = true;
-		public bool NeedRenderables;
-		public bool IsRendering { get; private set; }
+		public bool Shrouded { get; private set; }
+		public bool NeedRenderables { get; set; }
+		public IRenderable[] Renderables = NoRenderables;
+		static readonly IRenderable[] NoRenderables = new IRenderable[0];
 
-		public FrozenActor(Actor self, PPos[] footprint, Shroud shroud)
+		int flashTicks;
+
+		public FrozenActor(Actor self, PPos[] footprint, Shroud shroud, bool startsRevealed)
 		{
 			actor = self;
 			this.shroud = shroud;
+			NeedRenderables = startsRevealed;
+			removeFrozenActors = self.TraitsImplementing<IRemoveFrozenActor>().ToArray();
 
 			// Consider all cells inside the map area (ignoring the current map bounds)
 			Footprint = footprint
@@ -54,6 +62,7 @@ namespace OpenRA.Traits
 
 			CenterPosition = self.CenterPosition;
 			Bounds = self.Bounds;
+			TargetTypes = self.TraitsImplementing<ITargetable>().Where(Exts.IsTraitEnabled).SelectMany(t => t.TargetTypes).ToHashSet();
 
 			UpdateVisibility();
 		}
@@ -63,11 +72,6 @@ namespace OpenRA.Traits
 		public ActorInfo Info { get { return actor.Info; } }
 		public Actor Actor { get { return !actor.IsDead ? actor : null; } }
 
-		static readonly IRenderable[] NoRenderables = new IRenderable[0];
-
-		int flashTicks;
-		IRenderable[] renderables = NoRenderables;
-
 		public void Tick()
 		{
 			UpdateVisibility();
@@ -79,22 +83,25 @@ namespace OpenRA.Traits
 		void UpdateVisibility()
 		{
 			var wasVisible = Visible;
-			var isVisibleTest = shroud.IsVisibleTest;
+			Shrouded = true;
 
 			// We are doing the following LINQ manually for performance since this is a hot path.
-			// Visible = !Footprint.Any(isVisibleTest);
+			// Visible = !Footprint.Any(shroud.IsVisible);
 			Visible = true;
-			foreach (var uv in Footprint)
+			foreach (var puv in Footprint)
 			{
-				if (isVisibleTest(uv))
+				if (shroud.IsVisible(puv))
 				{
 					Visible = false;
+					Shrouded = false;
 					break;
 				}
+
+				if (Shrouded && shroud.IsExplored(puv))
+					Shrouded = false;
 			}
 
-			if (Visible && !wasVisible)
-				NeedRenderables = true;
+			NeedRenderables = Visible && !wasVisible;
 		}
 
 		public void Flash()
@@ -104,28 +111,30 @@ namespace OpenRA.Traits
 
 		public IEnumerable<IRenderable> Render(WorldRenderer wr)
 		{
-			if (NeedRenderables)
-			{
-				NeedRenderables = false;
-				if (!actor.Disposed)
-				{
-					IsRendering = true;
-					renderables = actor.Render(wr).ToArray();
-					IsRendering = false;
-				}
-			}
+			if (Shrouded)
+				return NoRenderables;
 
 			if (flashTicks > 0 && flashTicks % 2 == 0)
 			{
 				var highlight = wr.Palette("highlight");
-				return renderables.Concat(renderables.Where(r => !r.IsDecoration)
+				return Renderables.Concat(Renderables.Where(r => !r.IsDecoration)
 					.Select(r => r.WithPalette(highlight)));
 			}
 
-			return renderables;
+			return Renderables;
 		}
 
-		public bool HasRenderables { get { return renderables.Any(); } }
+		public bool HasRenderables { get { return !Shrouded && Renderables.Any(); } }
+
+		public bool ShouldBeRemoved(Player owner)
+		{
+			// We use a loop here for performance reasons
+			foreach (var rfa in removeFrozenActors)
+				if (rfa.RemoveActor(actor, owner))
+					return true;
+
+			return false;
+		}
 
 		public override string ToString()
 		{
@@ -140,7 +149,7 @@ namespace OpenRA.Traits
 
 		readonly World world;
 		readonly Player owner;
-		Dictionary<uint, FrozenActor> frozen;
+		readonly Dictionary<uint, FrozenActor> frozen;
 
 		public FrozenActorLayer(Actor self)
 		{
@@ -161,6 +170,8 @@ namespace OpenRA.Traits
 			VisibilityHash = 0;
 			FrozenHash = 0;
 
+			// TODO: Track shroud updates using Shroud.CellsChanged
+			// and then only tick FrozenActors that might have changed
 			foreach (var kvp in frozen)
 			{
 				var hash = (int)kvp.Key;
@@ -169,7 +180,9 @@ namespace OpenRA.Traits
 				var frozenActor = kvp.Value;
 				frozenActor.Tick();
 
-				if (frozenActor.Visible)
+				if (frozenActor.ShouldBeRemoved(owner))
+					remove.Add(kvp.Key);
+				else if (frozenActor.Visible)
 					VisibilityHash += hash;
 				else if (frozenActor.Actor == null)
 					remove.Add(kvp.Key);

OpenRA.Game/Traits/Player/PlayerColorPalette.cs

@@ -17,13 +17,17 @@ namespace OpenRA.Traits
 	public class PlayerColorPaletteInfo : ITraitInfo
 	{
 		[Desc("The name of the palette to base off.")]
-		public readonly string BasePalette = null;
+		[PaletteReference] public readonly string BasePalette = null;
+
 		[Desc("The prefix for the resulting player palettes")]
-		public readonly string BaseName = "player";
+		[PaletteDefinition(true)] public readonly string BaseName = "player";
+
 		[Desc("Remap these indices to player colors.")]
 		public readonly int[] RemapIndex = { };
+
 		[Desc("Luminosity range to span.")]
 		public readonly float Ramp = 0.05f;
+
 		[Desc("Allow palette modifiers to change the palette.")]
 		public readonly bool AllowModifiers = true;
 

OpenRA.Game/Traits/Player/PlayerHighlightPalette.cs

@@ -19,7 +19,7 @@ namespace OpenRA.Traits
 	public class PlayerHighlightPaletteInfo : ITraitInfo
 	{
 		[Desc("The prefix for the resulting player palettes")]
-		public readonly string BaseName = "highlight";
+		[PaletteDefinition(true)] public readonly string BaseName = "highlight";
 
 		public object Create(ActorInitializer init) { return new PlayerHighlightPalette(this); }
 	}

OpenRA.Game/Traits/Player/PlayerResources.cs

@@ -145,7 +145,7 @@ namespace OpenRA.Traits
 			{
 				if (Resources > 0.8 * ResourceCapacity)
 				{
-					Sound.PlayNotification(self.World.Map.Rules, owner, "Speech", "SilosNeeded", owner.Faction.InternalName);
+					Game.Sound.PlayNotification(self.World.Map.Rules, owner, "Speech", "SilosNeeded", owner.Faction.InternalName);
 					AlertSilo = true;
 				}
 				else
@@ -187,14 +187,14 @@ namespace OpenRA.Traits
 		public void PlayCashTickUp(Actor self)
 		{
 			if (Game.Settings.Sound.CashTicks)
-				Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Sounds", "CashTickUp", self.Owner.Faction.InternalName);
+				Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Sounds", "CashTickUp", self.Owner.Faction.InternalName);
 		}
 
 		public void PlayCashTickDown(Actor self)
 		{
 			if (Game.Settings.Sound.CashTicks && nextCashTickTime == 0)
 			{
-				Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Sounds", "CashTickDown", self.Owner.Faction.InternalName);
+				Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Sounds", "CashTickDown", self.Owner.Faction.InternalName);
 				nextCashTickTime = 2;
 			}
 		}

OpenRA.Game/Traits/RejectsOrders.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System.Collections.Generic;
 using System.Linq;
 
 namespace OpenRA.Traits
@@ -16,14 +17,14 @@ namespace OpenRA.Traits
 	public class RejectsOrdersInfo : ITraitInfo
 	{
 		[Desc("Possible values include Attack, AttackMove, Guard, Move.")]
-		public readonly string[] Except = { };
+		public readonly HashSet<string> Except = new HashSet<string>();
 
 		public object Create(ActorInitializer init) { return new RejectsOrders(this); }
 	}
 
 	public class RejectsOrders
 	{
-		public string[] Except { get { return info.Except; } }
+		public HashSet<string> Except { get { return info.Except; } }
 
 		readonly RejectsOrdersInfo info;
 

OpenRA.Game/Traits/Target.cs

@@ -22,7 +22,7 @@ namespace OpenRA.Traits
 
 		TargetType type;
 		Actor actor;
-		ITargetable targetable;
+		IEnumerable<ITargetable> targetable;
 		FrozenActor frozen;
 		WPos pos;
 		int generation;
@@ -48,7 +48,7 @@ namespace OpenRA.Traits
 			return new Target
 			{
 				actor = a,
-				targetable = a.TraitOrDefault<ITargetable>(),
+				targetable = a.TraitsImplementing<ITargetable>(),
 				type = TargetType.Actor,
 				generation = a.Generation,
 			};
@@ -83,15 +83,18 @@ namespace OpenRA.Traits
 			if (targeter == null || Type == TargetType.Invalid)
 				return false;
 
-			if (targetable != null && !targetable.TargetableBy(actor, targeter))
+			var targeted = this.actor;
+			if (targeted != null && !targetable.Any(t => t.IsTraitEnabled() && t.TargetableBy(targeted, targeter)))
 				return false;
 
 			return true;
 		}
 
+		// Currently all or nothing.
+		// TODO: either replace based on target type or put in singleton trait
 		public bool RequiresForceFire
 		{
-			get { return targetable != null && targetable.RequiresForceFire; }
+			get { return targetable != null && targetable.Any(Exts.IsTraitEnabled) && targetable.Where(Exts.IsTraitEnabled).All(t => t.RequiresForceFire); }
 		}
 
 		// Representative position - see Positions for the full set of targetable positions.
@@ -123,12 +126,19 @@ namespace OpenRA.Traits
 				switch (Type)
 				{
 					case TargetType.Actor:
-						var targetable = actor.TraitOrDefault<ITargetable>();
-						if (targetable == null)
+						var targetable = actor.TraitsImplementing<ITargetable>().Where(Exts.IsTraitEnabled);
+						if (!targetable.Any())
 							return new[] { actor.CenterPosition };
 
-						var positions = targetable.TargetablePositions(actor);
-						return positions.Any() ? positions : new[] { actor.CenterPosition };
+						var targetablePositions = actor.TraitOrDefault<ITargetablePositions>();
+						if (targetablePositions != null)
+						{
+							var positions = targetablePositions.TargetablePositions(actor);
+							if (positions.Any())
+								return positions;
+						}
+
+						return new[] { actor.CenterPosition };
 					case TargetType.FrozenActor:
 						return new[] { frozen.CenterPosition };
 					case TargetType.Terrain:

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -19,6 +19,20 @@ using OpenRA.Primitives;
 
 namespace OpenRA.Traits
 {
+	public enum DamageState { Undamaged, Light, Medium, Heavy, Critical, Dead }
+
+	public interface IHealth
+	{
+		DamageState DamageState { get; }
+		int HP { get; }
+		int MaxHP { get; }
+		int DisplayHP { get; }
+		bool IsDead { get; }
+
+		void InflictDamage(Actor self, Actor attacker, int damage, IWarhead warhead, bool ignoreModifiers);
+		void Kill(Actor self, Actor attacker);
+	}
+
 	// depends on the order of pips in WorldRenderer.cs!
 	public enum PipType { Transparent, Green, Yellow, Red, Gray, Blue, Ammo, AmmoEmpty }
 	public enum TagType { None, Fake, Primary }
@@ -83,7 +97,7 @@ namespace OpenRA.Traits
 	{
 		string OrderID { get; }
 		int OrderPriority { get; }
-		bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor);
+		bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, ref TargetModifiers modifiers, ref string cursor);
 		bool IsQueued { get; }
 		bool OverrideSelection { get; }
 	}
@@ -115,7 +129,7 @@ namespace OpenRA.Traits
 
 	public interface ISeedableResource { void Seed(Actor self); }
 
-	public interface ISelectionDecorationsInfo
+	public interface ISelectionDecorationsInfo : ITraitInfo
 	{
 		int[] SelectionBoxBounds { get; }
 	}
@@ -128,7 +142,7 @@ namespace OpenRA.Traits
 		bool HasVoice(Actor self, string voice);
 	}
 
-	public interface IDemolishableInfo { bool IsValidTarget(ActorInfo actorInfo, Actor saboteur); }
+	public interface IDemolishableInfo : ITraitInfo { bool IsValidTarget(ActorInfo actorInfo, Actor saboteur); }
 	public interface IDemolishable
 	{
 		void Demolish(Actor self, Actor saboteur);
@@ -144,13 +158,13 @@ namespace OpenRA.Traits
 		Player Owner { get; }
 	}
 
-	public interface IToolTip
+	public interface ITooltip
 	{
 		ITooltipInfo TooltipInfo { get; }
 		Player Owner { get; }
 	}
 
-	public interface ITooltipInfo
+	public interface ITooltipInfo : ITraitInfo
 	{
 		string TooltipForPlayerStance(Stance stance);
 		bool IsOwnerRowVisible { get; }
@@ -172,10 +186,15 @@ namespace OpenRA.Traits
 		IEnumerable<Pair<CPos, Color>> RadarSignatureCells(Actor self);
 	}
 
-	public interface IDefaultVisibilityInfo { }
+	public interface IDefaultVisibilityInfo : ITraitInfo { }
 	public interface IDefaultVisibility { bool IsVisible(Actor self, Player byPlayer); }
 	public interface IVisibilityModifier { bool IsVisible(Actor self, Player byPlayer); }
-	public interface IFogVisibilityModifier { bool HasFogVisibility(Player byPlayer); }
+
+	public interface IFogVisibilityModifier
+	{
+		bool IsVisible(Actor actor);
+		bool HasFogVisibility();
+	}
 
 	public interface IRadarColorModifier { Color RadarColorOverride(Actor self); }
 
@@ -218,6 +237,8 @@ namespace OpenRA.Traits
 	public interface IFirepowerModifier { int GetFirepowerModifier(); }
 	public interface IReloadModifier { int GetReloadModifier(); }
 	public interface IInaccuracyModifier { int GetInaccuracyModifier(); }
+	public interface IRangeModifier { int GetRangeModifier(); }
+	public interface IRangeModifierInfo : ITraitInfo { int GetRangeModifierDefault(); }
 	public interface IPowerModifier { int GetPowerModifier(); }
 	public interface ILoadsPalettes { void LoadPalettes(WorldRenderer wr); }
 	public interface ILoadsPlayerPalettes { void LoadPlayerPalettes(WorldRenderer wr, string playerName, HSLColor playerColor, bool replaceExisting); }
@@ -226,6 +247,7 @@ namespace OpenRA.Traits
 	public interface ITags { IEnumerable<TagType> GetTags(); }
 	public interface ISelectionBar { float GetValue(); Color GetColor(); }
 
+	public interface IPositionableInfo : ITraitInfo { }
 	public interface IPositionable : IOccupySpace
 	{
 		bool IsLeavingCell(CPos location, SubCell subCell = SubCell.Any);
@@ -268,7 +290,7 @@ namespace OpenRA.Traits
 	{
 		void OnCrush(Actor crusher);
 		void WarnCrush(Actor crusher);
-		bool CrushableBy(string[] crushClasses, Player owner);
+		bool CrushableBy(HashSet<string> crushClasses, Player owner);
 	}
 
 	public interface ITraitInfo { object Create(ActorInitializer init); }
@@ -278,14 +300,14 @@ namespace OpenRA.Traits
 	[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1302:InterfaceNamesMustBeginWithI", Justification = "Not a real interface, but more like a tag.")]
 	public interface Requires<T> where T : class, ITraitInfo { }
 	[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1302:InterfaceNamesMustBeginWithI", Justification = "Not a real interface, but more like a tag.")]
-	public interface UsesInit<T> where T : IActorInit { }
+	public interface UsesInit<T> : ITraitInfo where T : IActorInit { }
 
 	public interface INotifySelected { void Selected(Actor self); }
 	public interface INotifySelection { void SelectionChanged(); }
 	public interface IWorldLoaded { void WorldLoaded(World w, WorldRenderer wr); }
 	public interface ICreatePlayers { void CreatePlayers(World w); }
 
-	public interface IBotInfo { string Name { get; } }
+	public interface IBotInfo : ITraitInfo { string Name { get; } }
 	public interface IBot
 	{
 		void Activate(Player p);
@@ -296,7 +318,6 @@ namespace OpenRA.Traits
 	public interface INotifyBecomingIdle { void OnBecomingIdle(Actor self); }
 	public interface INotifyIdle { void TickIdle(Actor self); }
 
-	public interface IBlocksProjectiles { }
 	public interface IRenderInfantrySequenceModifier
 	{
 		bool IsModifyingSequence { get; }
@@ -304,46 +325,38 @@ namespace OpenRA.Traits
 	}
 
 	public interface IPostRender { void RenderAfterWorld(WorldRenderer wr, Actor self); }
+
 	public interface IRenderShroud { void RenderShroud(WorldRenderer wr, Shroud shroud); }
 
 	public interface IPostRenderSelection { IEnumerable<IRenderable> RenderAfterWorld(WorldRenderer wr); }
 
-	public interface IBodyOrientation
+	public interface ITargetableInfo : ITraitInfo
 	{
-		WAngle CameraPitch { get; }
-		int QuantizedFacings { get; }
-		WVec LocalToWorld(WVec vec);
-		WRot QuantizeOrientation(Actor self, WRot orientation);
-	}
-
-	public interface IBodyOrientationInfo : ITraitInfo
-	{
-		WVec LocalToWorld(WVec vec);
-		WRot QuantizeOrientation(WRot orientation, int facings);
-	}
-
-	public interface IQuantizeBodyOrientationInfo { int QuantizedBodyFacings(ActorInfo ai, SequenceProvider sequenceProvider, string race); }
-
-	public interface ITargetableInfo
-	{
-		string[] GetTargetTypes();
+		HashSet<string> GetTargetTypes();
 	}
 
 	public interface ITargetable
 	{
-		string[] TargetTypes { get; }
-		IEnumerable<WPos> TargetablePositions(Actor self);
+		// Check IsTraitEnabled or !IsTraitDisabled first
+		HashSet<string> TargetTypes { get; }
 		bool TargetableBy(Actor self, Actor byActor);
 		bool RequiresForceFire { get; }
 	}
 
+	public interface ITargetablePositions
+	{
+		IEnumerable<WPos> TargetablePositions(Actor self);
+	}
+
 	public interface INotifyStanceChanged
 	{
 		void StanceChanged(Actor self, Player a, Player b,
 			Stance oldStance, Stance newStance);
 	}
 
-	public interface ILintPass { void Run(Action<string> emitError, Action<string> emitWarning, Map map); }
+	public interface ILintPass { void Run(Action<string> emitError, Action<string> emitWarning); }
+	public interface ILintMapPass { void Run(Action<string> emitError, Action<string> emitWarning, Map map); }
+	public interface ILintRulesPass { void Run(Action<string> emitError, Action<string> emitWarning, Ruleset rules); }
 
 	public interface IObjectivesPanel
 	{
@@ -369,4 +382,12 @@ namespace OpenRA.Traits
 		bool IsValidAgainst(FrozenActor victim, Actor firedBy);
 		void DoImpact(Target target, Actor firedBy, IEnumerable<int> damageModifiers);
 	}
+
+	public interface IRemoveFrozenActor
+	{
+		bool RemoveActor(Actor self, Player owner);
+	}
+
+	public interface IRulesetLoaded<TInfo> { void RulesetLoaded(Ruleset rules, TInfo info); }
+	public interface IRulesetLoaded : IRulesetLoaded<ActorInfo>, ITraitInfo { }
 }

OpenRA.Game/Traits/Util.cs

@@ -74,6 +74,9 @@ namespace OpenRA.Traits
 
 		public static Activity RunActivity(Actor self, Activity act)
 		{
+			if (act == null)
+				return act;
+
 			// Note - manual iteration here for performance due to high call volume.
 			var longTickThresholdInStopwatchTicks = PerfTimer.LongTickThresholdInStopwatchTicks;
 			var start = Stopwatch.GetTimestamp();
@@ -146,5 +149,20 @@ namespace OpenRA.Traits
 
 			return (int)a;
 		}
+
+		public static IEnumerable<CPos> RandomWalk(CPos p, MersenneTwister r)
+		{
+			for (;;)
+			{
+				var dx = r.Next(-1, 2);
+				var dy = r.Next(-1, 2);
+
+				if (dx == 0 && dy == 0)
+					continue;
+
+				p += new CVec(dx, dy);
+				yield return p;
+			}
+		}
 	}
 }

OpenRA.Game/Traits/World/ActorMap.cs

@@ -9,6 +9,7 @@
 #endregion
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
@@ -67,7 +68,7 @@ namespace OpenRA.Traits
 					return;
 
 				var oldActors = currentActors;
-				currentActors = Footprint.SelectMany(actorMap.GetUnitsAt).ToList();
+				currentActors = Footprint.SelectMany(actorMap.GetActorsAt).ToList();
 
 				var entered = currentActors.Except(oldActors);
 				var exited = oldActors.Except(currentActors);
@@ -186,22 +187,51 @@ namespace OpenRA.Traits
 			actorShouldBeRemoved = removeActorPosition.Contains;
 		}
 
-		public IEnumerable<Actor> GetUnitsAt(CPos a)
+		sealed class ActorsAtEnumerator : IEnumerator<Actor>
 		{
-			if (!influence.Contains(a))
-				yield break;
+			InfluenceNode node;
+			public ActorsAtEnumerator(InfluenceNode node) { this.node = node; }
+			public void Reset() { throw new NotSupportedException(); }
+			public Actor Current { get; private set; }
+			object IEnumerator.Current { get { return Current; } }
+			public void Dispose() { }
+			public bool MoveNext()
+			{
+				while (node != null)
+				{
+					Current = node.Actor;
+					node = node.Next;
+					if (!Current.Disposed)
+						return true;
+				}
 
-			for (var i = influence[a]; i != null; i = i.Next)
-				if (!i.Actor.Disposed)
-					yield return i.Actor;
+				return false;
+			}
 		}
 
-		public IEnumerable<Actor> GetUnitsAt(CPos a, SubCell sub)
+		sealed class ActorsAtEnumerable : IEnumerable<Actor>
 		{
-			if (!influence.Contains(a))
+			readonly InfluenceNode node;
+			public ActorsAtEnumerable(InfluenceNode node) { this.node = node; }
+			public IEnumerator<Actor> GetEnumerator() { return new ActorsAtEnumerator(node); }
+			IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); }
+		}
+
+		public IEnumerable<Actor> GetActorsAt(CPos a)
+		{
+			var uv = a.ToMPos(map);
+			if (!influence.Contains(uv))
+				return Enumerable.Empty<Actor>();
+			return new ActorsAtEnumerable(influence[uv]);
+		}
+
+		public IEnumerable<Actor> GetActorsAt(CPos a, SubCell sub)
+		{
+			var uv = a.ToMPos(map);
+			if (!influence.Contains(uv))
 				yield break;
 
-			for (var i = influence[a]; i != null; i = i.Next)
+			for (var i = influence[uv]; i != null; i = i.Next)
 				if (!i.Actor.Disposed && (i.SubCell == sub || i.SubCell == SubCell.FullCell))
 					yield return i.Actor;
 		}
@@ -213,14 +243,14 @@ namespace OpenRA.Traits
 
 		public SubCell FreeSubCell(CPos cell, SubCell preferredSubCell = SubCell.Any, bool checkTransient = true)
 		{
-			if (preferredSubCell > SubCell.Any && !AnyUnitsAt(cell, preferredSubCell, checkTransient))
+			if (preferredSubCell > SubCell.Any && !AnyActorsAt(cell, preferredSubCell, checkTransient))
 				return preferredSubCell;
 
-			if (!AnyUnitsAt(cell))
+			if (!AnyActorsAt(cell))
 				return map.DefaultSubCell;
 
 			for (var i = (int)SubCell.First; i < map.SubCellOffsets.Length; i++)
-				if (i != (int)preferredSubCell && !AnyUnitsAt(cell, (SubCell)i, checkTransient))
+				if (i != (int)preferredSubCell && !AnyActorsAt(cell, (SubCell)i, checkTransient))
 					return (SubCell)i;
 
 			return SubCell.Invalid;
@@ -228,35 +258,37 @@ namespace OpenRA.Traits
 
 		public SubCell FreeSubCell(CPos cell, SubCell preferredSubCell, Func<Actor, bool> checkIfBlocker)
 		{
-			if (preferredSubCell > SubCell.Any && !AnyUnitsAt(cell, preferredSubCell, checkIfBlocker))
+			if (preferredSubCell > SubCell.Any && !AnyActorsAt(cell, preferredSubCell, checkIfBlocker))
 				return preferredSubCell;
 
-			if (!AnyUnitsAt(cell))
+			if (!AnyActorsAt(cell))
 				return map.DefaultSubCell;
 
 			for (var i = (int)SubCell.First; i < map.SubCellOffsets.Length; i++)
-				if (i != (int)preferredSubCell && !AnyUnitsAt(cell, (SubCell)i, checkIfBlocker))
+				if (i != (int)preferredSubCell && !AnyActorsAt(cell, (SubCell)i, checkIfBlocker))
 					return (SubCell)i;
 			return SubCell.Invalid;
 		}
 
 		// NOTE: always includes transients with influence
-		public bool AnyUnitsAt(CPos a)
+		public bool AnyActorsAt(CPos a)
 		{
-			if (!influence.Contains(a))
+			var uv = a.ToMPos(map);
+			if (!influence.Contains(uv))
 				return false;
 
-			return influence[a] != null;
+			return influence[uv] != null;
 		}
 
 		// NOTE: can not check aircraft
-		public bool AnyUnitsAt(CPos a, SubCell sub, bool checkTransient = true)
+		public bool AnyActorsAt(CPos a, SubCell sub, bool checkTransient = true)
 		{
-			if (!influence.Contains(a))
+			var uv = a.ToMPos(map);
+			if (!influence.Contains(uv))
 				return false;
 
 			var always = sub == SubCell.FullCell || sub == SubCell.Any;
-			for (var i = influence[a]; i != null; i = i.Next)
+			for (var i = influence[uv]; i != null; i = i.Next)
 			{
 				if (always || i.SubCell == sub || i.SubCell == SubCell.FullCell)
 				{
@@ -273,13 +305,14 @@ namespace OpenRA.Traits
 		}
 
 		// NOTE: can not check aircraft
-		public bool AnyUnitsAt(CPos a, SubCell sub, Func<Actor, bool> withCondition)
+		public bool AnyActorsAt(CPos a, SubCell sub, Func<Actor, bool> withCondition)
 		{
-			if (!influence.Contains(a))
+			var uv = a.ToMPos(map);
+			if (!influence.Contains(uv))
 				return false;
 
 			var always = sub == SubCell.FullCell || sub == SubCell.Any;
-			for (var i = influence[a]; i != null; i = i.Next)
+			for (var i = influence[uv]; i != null; i = i.Next)
 				if ((always || i.SubCell == sub || i.SubCell == SubCell.FullCell) && !i.Actor.Disposed && withCondition(i.Actor))
 					return true;
 
@@ -290,10 +323,11 @@ namespace OpenRA.Traits
 		{
 			foreach (var c in ios.OccupiedCells())
 			{
-				if (!influence.Contains(c.First))
+				var uv = c.First.ToMPos(map);
+				if (!influence.Contains(uv))
 					continue;
 
-				influence[c.First] = new InfluenceNode { Next = influence[c.First], SubCell = c.Second, Actor = self };
+				influence[uv] = new InfluenceNode { Next = influence[uv], SubCell = c.Second, Actor = self };
 
 				List<CellTrigger> triggers;
 				if (cellTriggerInfluence.TryGetValue(c.First, out triggers))
@@ -306,12 +340,13 @@ namespace OpenRA.Traits
 		{
 			foreach (var c in ios.OccupiedCells())
 			{
-				if (!influence.Contains(c.First))
+				var uv = c.First.ToMPos(map);
+				if (!influence.Contains(uv))
 					continue;
 
-				var temp = influence[c.First];
+				var temp = influence[uv];
 				RemoveInfluenceInner(ref temp, self);
-				influence[c.First] = temp;
+				influence[uv] = temp;
 
 				List<CellTrigger> triggers;
 				if (cellTriggerInfluence.TryGetValue(c.First, out triggers))

OpenRA.Game/Traits/World/Faction.cs

@@ -8,6 +8,8 @@
  */
 #endregion
 
+using System.Collections.Generic;
+
 namespace OpenRA.Traits
 {
 	[Desc("Attach this to the `World` actor.")]
@@ -20,7 +22,7 @@ namespace OpenRA.Traits
 		public readonly string InternalName = null;
 
 		[Desc("Pick a random faction as the player's facton out of this list.")]
-		public readonly string[] RandomFactionMembers = { };
+		public readonly HashSet<string> RandomFactionMembers = new HashSet<string>();
 
 		[Desc("The side that the faction belongs to. For example, England belongs to the 'Allies' side.")]
 		public readonly string Side = null;

OpenRA.Game/Traits/World/ResourceType.cs

@@ -15,9 +15,9 @@ namespace OpenRA.Traits
 {
 	public class ResourceTypeInfo : ITraitInfo
 	{
-		public readonly string[] Variants = { };
-		public readonly string Palette = "terrain";
 		public readonly string Sequence = "resources";
+		[SequenceReference("Sequence")] public readonly string[] Variants = { };
+		[PaletteReference] public readonly string Palette = "terrain";
 		public readonly int ResourceType = 1;
 
 		public readonly int ValuePerUnit = 0;
@@ -25,7 +25,7 @@ namespace OpenRA.Traits
 		public readonly string Name = null;
 		public readonly string TerrainType = "Ore";
 
-		public readonly string[] AllowedTerrainTypes = { };
+		public readonly HashSet<string> AllowedTerrainTypes = new HashSet<string>();
 		public readonly bool AllowUnderActors = false;
 		public readonly bool AllowUnderBuildings = false;
 		public readonly bool AllowOnRamps = false;

OpenRA.Game/Traits/World/ScreenMap.cs

@@ -36,9 +36,9 @@ namespace OpenRA.Traits
 
 		public ScreenMap(World world, ScreenMapInfo info)
 		{
-			var ts = Game.ModData.Manifest.TileSize;
-			var width = world.Map.MapSize.X * ts.Width;
-			var height = world.Map.MapSize.Y * ts.Height;
+			var size = world.Map.Grid.TileSize;
+			var width = world.Map.MapSize.X * size.Width;
+			var height = world.Map.MapSize.Y * size.Height;
 			partitionedFrozenActors = new Cache<Player, SpatiallyPartitioned<FrozenActor>>(
 				_ => new SpatiallyPartitioned<FrozenActor>(width, height, info.BinSize));
 			partitionedActors = new SpatiallyPartitioned<Actor>(width, height, info.BinSize);

OpenRA.Game/Traits/World/Shroud.cs

@@ -20,7 +20,7 @@ namespace OpenRA.Traits
 		public object Create(ActorInitializer init) { return new Shroud(init.Self); }
 	}
 
-	public class Shroud
+	public class Shroud : ISync
 	{
 		[Sync] public bool Disabled;
 
@@ -40,11 +40,6 @@ namespace OpenRA.Traits
 
 		public int Hash { get; private set; }
 
-		static readonly Func<PPos, bool> TruthPredicate = _ => true;
-		readonly Func<PPos, bool> shroudEdgeTest;
-		readonly Func<PPos, bool> isExploredTest;
-		readonly Func<PPos, bool> isVisibleTest;
-
 		public Shroud(Actor self)
 		{
 			this.self = self;
@@ -53,11 +48,6 @@ namespace OpenRA.Traits
 			visibleCount = new CellLayer<short>(map);
 			generatedShroudCount = new CellLayer<short>(map);
 			explored = new CellLayer<bool>(map);
-
-			shroudEdgeTest = map.Contains;
-
-			isExploredTest = IsExplored;
-			isVisibleTest = IsVisible;
 		}
 
 		void Invalidate(IEnumerable<PPos> changed)
@@ -270,7 +260,11 @@ namespace OpenRA.Traits
 			if (!map.Contains(uv))
 				return false;
 
-			return map.ProjectedCellsCovering(uv).Any(isExploredTest);
+			foreach (var puv in map.ProjectedCellsCovering(uv))
+				if (IsExplored(puv))
+					return true;
+
+			return false;
 		}
 
 		public bool IsExplored(PPos puv)
@@ -282,24 +276,7 @@ namespace OpenRA.Traits
 			return explored.Contains(uv) && explored[uv] && (generatedShroudCount[uv] == 0 || visibleCount[uv] > 0);
 		}
 
-		public bool ShroudEnabled { get { return !Disabled && self.World.LobbyInfo.GlobalSettings.Shroud; } }
-
-		/// <summary>
-		/// Returns a fast exploration lookup that skips the usual validation.
-		/// The return value should not be cached across ticks, and should not
-		/// be called with cells outside the map bounds.
-		/// </summary>
-		public Func<PPos, bool> IsExploredTest
-		{
-			get
-			{
-				// If shroud isn't enabled, then we can see everything inside the map.
-				if (!ShroudEnabled)
-					return shroudEdgeTest;
-
-				return isExploredTest;
-			}
-		}
+		public bool ShroudEnabled { get { return !Disabled; } }
 
 		public bool IsVisible(WPos pos)
 		{
@@ -316,7 +293,11 @@ namespace OpenRA.Traits
 			if (!visibleCount.Contains(uv))
 				return false;
 
-			return map.ProjectedCellsCovering(uv).Any(isVisibleTest);
+			foreach (var puv in map.ProjectedCellsCovering(uv))
+				if (IsVisible(puv))
+					return true;
+
+			return false;
 		}
 
 		// In internal shroud coords
@@ -331,24 +312,6 @@ namespace OpenRA.Traits
 
 		public bool FogEnabled { get { return !Disabled && self.World.LobbyInfo.GlobalSettings.Fog; } }
 
-		/// <summary>
-		/// Returns a fast visibility lookup that skips the usual validation.
-		/// The return value should not be cached across ticks, and should not
-		/// be called with cells outside the map bounds.
-		/// </summary>
-		public Func<PPos, bool> IsVisibleTest
-		{
-			get
-			{
-				// If fog isn't enabled, then we can see everything.
-				if (!FogEnabled)
-					return TruthPredicate;
-
-				// If fog is enabled, we can use the fast test that just does the core check.
-				return isVisibleTest;
-			}
-		}
-
 		public bool Contains(PPos uv)
 		{
 			// Check that uv is inside the map area. There is nothing special

OpenRA.Game/WDist.cs

@@ -27,6 +27,7 @@ namespace OpenRA
 
 		public WDist(int r) { Length = r; }
 		public static readonly WDist Zero = new WDist(0);
+		public static readonly WDist MaxValue = new WDist(int.MaxValue);
 		public static WDist FromCells(int cells) { return new WDist(1024 * cells); }
 
 		public static WDist operator +(WDist a, WDist b) { return new WDist(a.Length + b.Length); }

OpenRA.Game/Widgets/Widget.cs

@@ -46,7 +46,7 @@ namespace OpenRA.Widgets
 		{
 			var window = Game.ModData.WidgetLoader.LoadWidget(args, Root, id);
 			if (WindowList.Count > 0)
-				Root.RemoveChild(WindowList.Peek());
+				Root.HideChild(WindowList.Peek());
 			WindowList.Push(window);
 			return window;
 		}
@@ -140,6 +140,13 @@ namespace OpenRA.Widgets
 		}
 	}
 
+	public class ChromeLogic : IDisposable
+	{
+		public void Dispose() { Dispose(true); GC.SuppressFinalize(this); }
+		public virtual void Tick() { }
+		protected virtual void Dispose(bool disposing) { }
+	}
+
 	public abstract class Widget
 	{
 		public readonly List<Widget> Children = new List<Widget>();
@@ -151,7 +158,7 @@ namespace OpenRA.Widgets
 		public string Width = "0";
 		public string Height = "0";
 		public string[] Logic = { };
-		public object[] LogicObjects { get; private set; }
+		public ChromeLogic[] LogicObjects { get; private set; }
 		public bool Visible = true;
 		public bool IgnoreMouseOver;
 		public bool IgnoreChildMouseOver;
@@ -244,7 +251,7 @@ namespace OpenRA.Widgets
 
 			args["widget"] = this;
 
-			LogicObjects = Logic.Select(l => Game.ModData.ObjectCreator.CreateObject<object>(l, args))
+			LogicObjects = Logic.Select(l => Game.ModData.ObjectCreator.CreateObject<ChromeLogic>(l, args))
 				.ToArray();
 
 			args.Remove("widget");
@@ -430,6 +437,10 @@ namespace OpenRA.Widgets
 				Tick();
 				foreach (var child in Children)
 					child.TickOuter();
+
+				if (LogicObjects != null)
+					foreach (var l in LogicObjects)
+						l.Tick();
 			}
 		}
 
@@ -448,12 +459,32 @@ namespace OpenRA.Widgets
 			}
 		}
 
+		public virtual void HideChild(Widget child)
+		{
+			if (child != null)
+			{
+				Children.Remove(child);
+				child.Hidden();
+			}
+		}
+
 		public virtual void RemoveChildren()
 		{
 			while (Children.Count > 0)
 				RemoveChild(Children[Children.Count - 1]);
 		}
 
+		public virtual void Hidden()
+		{
+			// Using the forced versions because the widgets
+			// have been removed
+			ForceYieldKeyboardFocus();
+			ForceYieldMouseFocus();
+
+			foreach (var c in Children.OfType<Widget>().Reverse())
+				c.Hidden();
+		}
+
 		public virtual void Removed()
 		{
 			// Using the forced versions because the widgets
@@ -463,6 +494,10 @@ namespace OpenRA.Widgets
 
 			foreach (var c in Children.OfType<Widget>().Reverse())
 				c.Removed();
+
+			if (LogicObjects != null)
+				foreach (var l in LogicObjects)
+					l.Dispose();
 		}
 
 		public Widget GetOrNull(string id)

OpenRA.Game/Widgets/WidgetUtils.cs

@@ -158,14 +158,14 @@ namespace OpenRA.Widgets
 				DrawRGBA(cornerBottomRight, new float2(bounds.Right - cornerBottomRight.Size.X, bounds.Bottom - cornerBottomRight.Size.Y));
 		}
 
-		public static string FormatTime(int ticks)
+		public static string FormatTime(int ticks, int timestep)
 		{
-			return FormatTime(ticks, true);
+			return FormatTime(ticks, true, timestep);
 		}
 
-		public static string FormatTime(int ticks, bool leadingMinuteZero)
+		public static string FormatTime(int ticks, bool leadingMinuteZero, int timestep)
 		{
-			var seconds = (int)Math.Ceiling(ticks / 25f);
+			var seconds = (int)Math.Ceiling(ticks * timestep / 1000f);
 			return FormatTimeSeconds(seconds, leadingMinuteZero);
 		}
 
@@ -227,6 +227,22 @@ namespace OpenRA.Widgets
 			return text;
 		}
 
+		public static string TruncateText(string text, int width, SpriteFont font)
+		{
+			var trimmedWidth = font.Measure(text).X;
+			if (trimmedWidth <= width)
+				return text;
+
+			var trimmed = text;
+			while (trimmedWidth > width && trimmed.Length > 3)
+			{
+				trimmed = text.Substring(0, trimmed.Length - 4) + "...";
+				trimmedWidth = font.Measure(trimmed).X;
+			}
+
+			return trimmed;
+		}
+
 		public static Action Once(Action a) { return () => { if (a != null) { a(); a = null; } }; }
 
 		public static string ChooseInitialMap(string initialUid)
@@ -242,6 +258,32 @@ namespace OpenRA.Widgets
 		}
 	}
 
+	public class CachedTransform<T, U>
+	{
+		readonly Func<T, U> transform;
+
+		bool initialized;
+		T lastInput;
+		U lastOutput;
+
+		public CachedTransform(Func<T, U> transform)
+		{
+			this.transform = transform;
+		}
+
+		public U Update(T input)
+		{
+			if (initialized && ((input == null && lastInput == null) || (input != null && input.Equals(lastInput))))
+				return lastOutput;
+
+			lastInput = input;
+			lastOutput = transform(input);
+			initialized = true;
+
+			return lastOutput;
+		}
+	}
+
 	[Flags]
 	public enum PanelSides
 	{

OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs

@@ -89,8 +89,8 @@ namespace OpenRA.Widgets
 					{
 						if (!hasBox && World.Selection.Actors.Any() && !multiClick)
 						{
-							if (!(World.ScreenMap.ActorsAt(xy).Where(x => x.HasTrait<Selectable>() &&
-								(x.Owner.IsAlliedWith(World.RenderPlayer) || !World.FogObscures(x))).Any() && !mi.Modifiers.HasModifier(Modifiers.Ctrl) &&
+							if (!(World.ScreenMap.ActorsAt(xy).Any(x => x.Info.HasTraitInfo<SelectableInfo>() &&
+								(x.Owner.IsAlliedWith(World.RenderPlayer) || !World.FogObscures(x))) && !mi.Modifiers.HasModifier(Modifiers.Ctrl) &&
 								!mi.Modifiers.HasModifier(Modifiers.Alt) && UnitOrderGenerator.InputOverridesSelection(World, xy, mi)))
 							{
 								// Order units instead of selecting
@@ -120,19 +120,33 @@ namespace OpenRA.Widgets
 							}
 						}
 					}
-					else if (dragStart.HasValue)
+					else
 					{
-						// Select actors in the dragbox
-						var newSelection = SelectActorsInBoxWithDeadzone(World, dragStart.Value, xy);
-						World.Selection.Combine(World, newSelection, mi.Modifiers.HasModifier(Modifiers.Shift), dragStart == xy);
+						/* The block below does three things:
+						// 1. Allows actor selection using a selection box regardless of input mode.
+						// 2. Allows actor deselection with a single click in the default input mode (UnitOrderGenerator).
+						// 3. Prevents units from getting deselected when exiting input modes (eg. AttackMove or Guard).
+						//
+						// We cannot check for UnitOrderGenerator here since it's the default order generator that gets activated in
+						// World.CancelInputMode. If we did check it, actor de-selection would not be possible by just clicking somewhere,
+						// only by dragging an empty selection box.
+						*/
+						if (dragStart.HasValue && (!(World.OrderGenerator is GenericSelectTarget) || hasBox))
+						{
+							// Select actors in the dragbox
+							var newSelection = SelectActorsInBoxWithDeadzone(World, dragStart.Value, xy);
+							World.Selection.Combine(World, newSelection, mi.Modifiers.HasModifier(Modifiers.Shift), dragStart == xy);
+						}
 					}
+
+					World.CancelInputMode();
 				}
 
 				dragStart = dragEnd = null;
 				YieldMouseFocus(mi);
 			}
 
-			if (mi.Button == MouseButton.Right && mi.Event == MouseInputEvent.Down)
+			if (mi.Button == MouseButton.Right && mi.Event == MouseInputEvent.Up)
 			{
 				// Don't do anything while selecting
 				if (!hasBox)
@@ -242,7 +256,7 @@ namespace OpenRA.Widgets
 				{
 					// Get all the selected actors' selection classes
 					var selectedClasses = World.Selection.Actors
-						.Where(x => x.Owner == player)
+						.Where(x => !x.IsDead && x.Owner == player)
 						.Select(a => a.Trait<Selectable>().Class)
 						.ToHashSet();
 
@@ -301,7 +315,7 @@ namespace OpenRA.Widgets
 				a = b;
 
 			return world.ScreenMap.ActorsInBox(a, b)
-				.Where(x => x.HasTrait<Selectable>() && (x.Owner.IsAlliedWith(world.RenderPlayer) || !world.FogObscures(x)))
+				.Where(x => x.Info.HasTraitInfo<SelectableInfo>() && (x.Owner.IsAlliedWith(world.RenderPlayer) || !world.FogObscures(x)))
 				.SubsetWithHighestSelectionPriority();
 		}
 
@@ -318,4 +332,4 @@ namespace OpenRA.Widgets
 			return true;
 		}
 	}
-}
+}

OpenRA.Game/World.cs

@@ -26,15 +26,8 @@ namespace OpenRA
 
 	public sealed class World : IDisposable
 	{
-		class ActorIDComparer : IComparer<Actor>
-		{
-			public static readonly ActorIDComparer Instance = new ActorIDComparer();
-			ActorIDComparer() { }
-			public int Compare(Actor x, Actor y) { return x.ActorID.CompareTo(y.ActorID); }
-		}
-
 		internal readonly TraitDictionary TraitDict = new TraitDictionary();
-		readonly SortedSet<Actor> actors = new SortedSet<Actor>(ActorIDComparer.Instance);
+		readonly SortedDictionary<uint, Actor> actors = new SortedDictionary<uint, Actor>();
 		readonly List<IEffect> effects = new List<IEffect>();
 		readonly Queue<Action<World>> frameEndActions = new Queue<Action<World>>();
 
@@ -151,6 +144,7 @@ namespace OpenRA
 			OrderManager = orderManager;
 			orderGenerator = new UnitOrderGenerator();
 			Map = map;
+			Timestep = orderManager.LobbyInfo.GlobalSettings.Timestep;
 
 			TileSet = map.Rules.TileSets[Map.Tileset];
 			SharedRandom = new MersenneTwister(orderManager.LobbyInfo.GlobalSettings.RandomSeed);
@@ -170,7 +164,7 @@ namespace OpenRA
 					if (!p.Stances.ContainsKey(q))
 						p.Stances[q] = Stance.Neutral;
 
-			Sound.SoundVolumeModifier = 1.0f;
+			Game.Sound.SoundVolumeModifier = 1.0f;
 
 			gameInfo = new GameInformation
 			{
@@ -180,6 +174,10 @@ namespace OpenRA
 				MapUid = Map.Uid,
 				MapTitle = Map.Title
 			};
+
+			if (!LobbyInfo.GlobalSettings.Shroud)
+				foreach (var player in Players)
+					player.Shroud.ExploreAll(this);
 		}
 
 		public void LoadComplete(WorldRenderer wr)
@@ -225,7 +223,7 @@ namespace OpenRA
 		public void Add(Actor a)
 		{
 			a.IsInWorld = true;
-			actors.Add(a);
+			actors.Add(a.ActorID, a);
 			ActorAdded(a);
 
 			foreach (var t in a.TraitsImplementing<INotifyAddedToWorld>())
@@ -235,7 +233,7 @@ namespace OpenRA
 		public void Remove(Actor a)
 		{
 			a.IsInWorld = false;
-			actors.Remove(a);
+			actors.Remove(a.ActorID);
 			ActorRemoved(a);
 
 			foreach (var t in a.TraitsImplementing<INotifyRemovedFromWorld>())
@@ -283,7 +281,7 @@ namespace OpenRA
 							ni.Trait.TickIdle(ni.Actor);
 
 				using (new PerfSample("tick_activities"))
-					foreach (var a in actors)
+					foreach (var a in actors.Values)
 						a.Tick();
 
 				ActorsWithTrait<ITick>().DoTimed(x => x.Trait.Tick(x.Actor), "Trait");
@@ -301,9 +299,17 @@ namespace OpenRA
 			ActorsWithTrait<ITickRender>().DoTimed(x => x.Trait.TickRender(wr, x.Actor), "Render");
 		}
 
-		public IEnumerable<Actor> Actors { get { return actors; } }
+		public IEnumerable<Actor> Actors { get { return actors.Values; } }
 		public IEnumerable<IEffect> Effects { get { return effects; } }
 
+		public Actor GetActorById(uint actorId)
+		{
+			Actor a;
+			if (actors.TryGetValue(actorId, out a))
+				return a;
+			return null;
+		}
+
 		uint nextAID = 0;
 		internal uint NextAID()
 		{
@@ -363,11 +369,11 @@ namespace OpenRA
 
 			frameEndActions.Clear();
 
-			Sound.StopAudio();
-			Sound.StopVideo();
+			Game.Sound.StopAudio();
+			Game.Sound.StopVideo();
 
 			// Dispose newer actors first, and the world actor last
-			foreach (var a in actors.Reverse())
+			foreach (var a in actors.Values.Reverse())
 				a.Dispose();
 
 			// Actor disposals are done in a FrameEndTask