Merge pull request #8659 from penev92/bleed_playerReference

Rename PlayerReference.Race to Faction

OpenRA.Game/Map/MapPlayers.cs

@@ -37,7 +37,7 @@ namespace OpenRA
 					"Neutral", new PlayerReference
 					{
 						Name = "Neutral",
-						Race = firstRace,
+						Faction = firstRace,
 						OwnsWorld = true,
 						NonCombatant = true
 					}
@@ -46,7 +46,7 @@ namespace OpenRA
 					"Creeps", new PlayerReference
 					{
 						Name = "Creeps",
-						Race = firstRace,
+						Faction = firstRace,
 						NonCombatant = true,
 						Enemies = Exts.MakeArray(playerCount, i => "Multi{0}".F(i))
 					}
@@ -58,7 +58,7 @@ namespace OpenRA
 				var p = new PlayerReference
 				{
 					Name = "Multi{0}".F(index),
-					Race = "Random",
+					Faction = "Random",
 					Playable = true,
 					Enemies = new[] { "Creeps" }
 				};

OpenRA.Game/Map/PlayerReference.cs

@@ -16,17 +16,17 @@ namespace OpenRA
 	{
 		public string Name;
 		public string Palette;
-		public bool OwnsWorld = false;
-		public bool NonCombatant = false;
-		public bool Playable = false;
-		public bool Spectating = false;
 		public string Bot = null;
 		public string StartingUnitsClass = null;
 		public bool AllowBots = true;
+		public bool Playable = false;
 		public bool Required = false;
+		public bool OwnsWorld = false;
+		public bool Spectating = false;
+		public bool NonCombatant = false;
 
-		public bool LockRace = false;
-		public string Race;
+		public bool LockFaction = false;
+		public string Faction;
 
 		// ColorRamp naming retained for backward compatibility
 		public bool LockColor = false;

OpenRA.Game/Player.cs

@@ -95,7 +95,7 @@ namespace OpenRA
 				Color = client.Color;
 				PlayerName = client.Name;
 				botType = client.Bot;
-				Country = ChooseCountry(world, client.Race, !pr.LockRace);
+				Country = ChooseCountry(world, client.Race, !pr.LockFaction);
 				DisplayCountry = ChooseDisplayCountry(world, client.Race);
 			}
 			else
@@ -108,8 +108,8 @@ namespace OpenRA
 				Playable = pr.Playable;
 				Spectating = pr.Spectating;
 				botType = pr.Bot;
-				Country = ChooseCountry(world, pr.Race, false);
-				DisplayCountry = ChooseDisplayCountry(world, pr.Race);
+				Country = ChooseCountry(world, pr.Faction, false);
+				DisplayCountry = ChooseDisplayCountry(world, pr.Faction);
 			}
 
 			PlayerActor = world.CreateActor("Player", new TypeDictionary { new OwnerInit(this) });

OpenRA.Game/Server/Server.cs

@@ -72,8 +72,8 @@ namespace OpenRA.Server
 			if (pr == null)
 				return;
 
-			if (pr.LockRace)
-				c.Race = pr.Race;
+			if (pr.LockFaction)
+				c.Race = pr.Faction;
 			if (pr.LockSpawn)
 				c.SpawnPoint = pr.Spawn;
 			if (pr.LockTeam)

OpenRA.Mods.Common/EditorBrushes/EditorActorBrush.cs

@@ -65,7 +65,7 @@ namespace OpenRA.Mods.Common.Widgets
 			td.Add(new FacingInit(facing));
 			td.Add(new TurretFacingInit(facing));
 			td.Add(new OwnerInit(owner.Name));
-			td.Add(new RaceInit(owner.Race));
+			td.Add(new RaceInit(owner.Faction));
 			preview.SetPreview(actor, td);
 
 			var ios = actor.Traits.GetOrDefault<IOccupySpaceInfo>();

OpenRA.Mods.Common/Lint/CheckPlayers.cs

@@ -40,8 +40,8 @@ namespace OpenRA.Mods.Common.Lint
 
 			var races = worldActor.Traits.WithInterface<CountryInfo>().Select(c => c.Race);
 			foreach (var player in players.Values)
-				if (!string.IsNullOrWhiteSpace(player.Race) && !races.Contains(player.Race))
-					emitError("Invalid race {0} chosen for player {1}.".F(player.Race, player.Name));
+				if (!string.IsNullOrWhiteSpace(player.Faction) && !races.Contains(player.Faction))
+					emitError("Invalid race {0} chosen for player {1}.".F(player.Faction, player.Name));
 
 			if (worldActor.Traits.Contains<MPStartLocationsInfo>())
 			{

OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.Scripting
 		public HSLColor Color { get { return Player.Color; } }
 
 		[Desc("The player's race.")]
-		public string Race { get { return Player.PlayerReference.Race; } }
+		public string Race { get { return Player.PlayerReference.Faction; } }
 
 		[Desc("The player's spawnpoint ID.")]
 		public int Spawn { get { return Player.SpawnPoint; } }

OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs

@@ -900,7 +900,7 @@ namespace OpenRA.Mods.Common.Server
 				PlayerReference = pr.Name,
 				Closed = false,
 				AllowBots = pr.AllowBots,
-				LockRace = pr.LockRace,
+				LockRace = pr.LockFaction,
 				LockColor = pr.LockColor,
 				LockTeam = pr.LockTeam,
 				LockSpawn = pr.LockSpawn,

OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs

@@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Traits
 				Name = "Everyone",
 				NonCombatant = true,
 				Spectating = true,
-				Race = "Random",
+				Faction = "Random",
 				Allies = w.Players.Where(p => !p.NonCombatant && p.Playable).Select(p => p.InternalName).ToArray()
 			}));
 

OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs

@@ -178,7 +178,7 @@ namespace OpenRA.Mods.Common.Traits
 				var pr = new PlayerReference
 				{
 					Name = "Multi{0}".F(index),
-					Race = "Random",
+					Faction = "Random",
 					Playable = true,
 					Enemies = new[] { "Creeps" }
 				};

OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs

@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Traits
 			this.worldRenderer = worldRenderer;
 
 			if (!actor.InitDict.Contains<RaceInit>())
-				actor.InitDict.Add(new RaceInit(owner.Race));
+				actor.InitDict.Add(new RaceInit(owner.Faction));
 
 			if (!actor.InitDict.Contains<OwnerInit>())
 				actor.InitDict.Add(new OwnerInit(owner.Name));
@@ -119,7 +119,7 @@ namespace OpenRA.Mods.Common.Traits
 			Func<object, bool> saveInit = init =>
 			{
 				var race = init as RaceInit;
-				if (race != null && race.Race == Owner.Race)
+				if (race != null && race.Race == Owner.Faction)
 					return false;
 
 				// TODO: Other default values will need to be filtered

OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs

@@ -500,7 +500,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
 				Name = section,
 				OwnsWorld = section == "Neutral",
 				NonCombatant = section == "Neutral",
-				Race = race,
+				Faction = race,
 				Color = namedColorMapping[c]
 			};
 

OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs

@@ -2013,8 +2013,22 @@ namespace OpenRA.Mods.Common.UtilityCommands
 		internal static void UpgradePlayers(int engineVersion, ref List<MiniYamlNode> nodes, MiniYamlNode parent, int depth)
 		{
 			foreach (var node in nodes)
+			{
+				// Rename PlayerReference.Race and LockRace to Faction and LockFaction
+				if (engineVersion < 20150706)
+				{
+					var race = node.Value.Nodes.FirstOrDefault(x => x.Key == "Race");
+					if (race != null)
+						race.Key = "Faction";
+
+					var lockRace = node.Value.Nodes.FirstOrDefault(x => x.Key == "LockRace");
+					if (lockRace != null)
+						lockRace.Key = "LockFaction";
+				}
+
 				UpgradePlayers(engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}
+		}
 
 		internal static void UpgradeActors(int engineVersion, ref List<MiniYamlNode> nodes, MiniYamlNode parent, int depth)
 		{

OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			var td = new TypeDictionary();
 			td.Add(new HideBibPreviewInit());
 			td.Add(new OwnerInit(world.WorldActor.Owner));
-			td.Add(new RaceInit(world.WorldActor.Owner.PlayerReference.Race));
+			td.Add(new RaceInit(world.WorldActor.Owner.PlayerReference.Faction));
 
 			if (preview != null)
 				preview.SetPreview(actor, td);

OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs

@@ -112,7 +112,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				td.Add(new TurretFacingInit(92));
 				td.Add(new HideBibPreviewInit());
 				td.Add(new OwnerInit(selectedOwner.Name));
-				td.Add(new RaceInit(selectedOwner.Race));
+				td.Add(new RaceInit(selectedOwner.Faction));
 
 				try
 				{

mods/cnc/maps/funpark01/map.yaml

@@ -31,24 +31,24 @@ Options:
 	FragileAlliances: False
 	StartingCash: 0
 	ConfigurableStartingUnits: False
+	Difficulties: Easy, Normal
 	ShortGame: False
-	Difficulties: Easy,Normal
 
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@Civilian:
 		Name: Civilian
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 		Enemies: Nod, Dinosaur
 	PlayerReference@Dinosaur:
 		Name: Dinosaur
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 		ColorRamp: 14,119,96
 		Enemies: Nod, Civilian
 	PlayerReference@Nod:
@@ -56,8 +56,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True

mods/cnc/maps/gdi01/map.yaml

@@ -39,7 +39,7 @@ Options:
 Players:
 	PlayerReference@Nod:
 		Name: Nod
-		Race: nod
+		Faction: nod
 		ColorRamp: 3,255,127
 		Allies: Nod
 		Enemies: GDI, Creeps
@@ -48,8 +48,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: gdi
+		LockFaction: True
+		Faction: gdi
 		LockColor: True
 		ColorRamp: 31,222,183
 		LockSpawn: True
@@ -60,11 +60,11 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: Random
+		Faction: Random
 		Enemies: Nod, GDI
 
 Actors:

mods/cnc/maps/gdi02/map.yaml

@@ -40,8 +40,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: gdi
+		LockFaction: True
+		Faction: gdi
 		LockColor: True
 		ColorRamp: 31,222,183
 		LockSpawn: True
@@ -50,7 +50,7 @@ Players:
 		Enemies: Nod
 	PlayerReference@Nod:
 		Name: Nod
-		Race: nod
+		Faction: nod
 		ColorRamp: 3,255,127
 		Allies: Nod
 		Enemies: GDI
@@ -58,11 +58,11 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: Random
+		Faction: Random
 		Enemies: Nod, GDI
 
 Actors:

mods/cnc/maps/gdi03/map.yaml

@@ -38,7 +38,7 @@ Options:
 Players:
 	PlayerReference@Nod:
 		Name: Nod
-		Race: nod
+		Faction: nod
 		ColorRamp: 3,255,127
 		Allies: Nod
 		Enemies: GDI
@@ -46,14 +46,14 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@GDI:
 		Name: GDI
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: gdi
+		LockFaction: True
+		Faction: gdi
 		LockColor: True
 		ColorRamp: 31,222,183
 		LockSpawn: True
@@ -63,7 +63,7 @@ Players:
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: Random
+		Faction: Random
 		Enemies: Nod, GDI
 
 Actors:

mods/cnc/maps/gdi04a/map.yaml

@@ -39,7 +39,7 @@ Options:
 Players:
 	PlayerReference@Nod:
 		Name: Nod
-		Race: nod
+		Faction: nod
 		ColorRamp: 3,255,127
 		Allies: Nod
 		Enemies: GDI
@@ -48,8 +48,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: gdi
+		LockFaction: True
+		Faction: gdi
 		LockColor: True
 		ColorRamp: 31,222,183
 		LockSpawn: True
@@ -60,11 +60,11 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: Random
+		Faction: Random
 		Enemies: Nod, GDI
 
 Actors:

mods/cnc/maps/gdi04b/map.yaml

@@ -39,7 +39,7 @@ Options:
 Players:
 	PlayerReference@Nod:
 		Name: Nod
-		Race: nod
+		Faction: nod
 		ColorRamp: 3,255,127
 		Allies: Nod
 		Enemies: GDI
@@ -48,8 +48,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: gdi
+		LockFaction: True
+		Faction: gdi
 		LockColor: True
 		ColorRamp: 31,222,183
 		LockSpawn: True
@@ -60,11 +60,11 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: Random
+		Faction: Random
 		Enemies: Nod, GDI
 
 Actors:

mods/cnc/maps/gdi04c/map.yaml

@@ -41,10 +41,10 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@Nod:
 		Name: Nod
-		Race: nod
+		Faction: nod
 		ColorRamp: 3,255,127
 		Allies: Nod
 		Enemies: GDI, Civillians
@@ -53,8 +53,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: gdi
+		LockFaction: True
+		Faction: gdi
 		LockColor: True
 		ColorRamp: 31,222,183
 		LockSpawn: True
@@ -64,12 +64,12 @@ Players:
 	PlayerReference@Civillians:
 		Name: Civillians
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 		Enemies: Nod
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: Random
+		Faction: Random
 		Enemies: Nod, GDI
 
 Actors:

mods/cnc/maps/gdi05a/map.yaml

@@ -39,7 +39,7 @@ Options:
 Players:
 	PlayerReference@Nod:
 		Name: Nod
-		Race: nod
+		Faction: nod
 		ColorRamp: 3,255,127
 		Allies: Nod
 		Enemies: GDI
@@ -48,8 +48,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: gdi
+		LockFaction: True
+		Faction: gdi
 		LockColor: True
 		ColorRamp: 31,222,183
 		LockSpawn: True
@@ -60,16 +60,16 @@ Players:
 		Name: AbandonedBase
 		NonCombatant: True
 		ColorRamp: 31,222,183
-		Race: gdi
+		Faction: gdi
 	PlayerReference@Neutral:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: Random
+		Faction: Random
 		Enemies: Nod, GDI
 
 Actors:

mods/cnc/maps/gdi05b/map.yaml

@@ -39,7 +39,7 @@ Options:
 Players:
 	PlayerReference@Nod:
 		Name: Nod
-		Race: nod
+		Faction: nod
 		ColorRamp: 3,255,127
 		Enemies: GDI, AbandonedBase
 	PlayerReference@GDI:
@@ -47,8 +47,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: gdi
+		LockFaction: True
+		Faction: gdi
 		LockColor: True
 		ColorRamp: 31,222,183
 		LockSpawn: True
@@ -58,12 +58,12 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 		ColorRamp: 31,222,183
 	PlayerReference@AbandonedBase:
 		Name: AbandonedBase
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 		ColorRamp: 31,222,183
 		Enemies: Nod
 

mods/cnc/maps/nod01/map.yaml

@@ -39,14 +39,14 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@Villagers:
 		Name: Villagers
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@GDI:
 		Name: GDI
-		Race: gdi
+		Faction: gdi
 		ColorRamp: 31,222,183
 		Allies: Villagers
 		Enemies: Nod
@@ -55,8 +55,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True
@@ -65,7 +65,7 @@ Players:
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: Random
+		Faction: Random
 		Enemies: Nod, GDI
 
 Actors:

mods/cnc/maps/nod02a/map.yaml

@@ -38,7 +38,7 @@ Options:
 Players:
 	PlayerReference@GDI:
 		Name: GDI
-		Race: gdi
+		Faction: gdi
 		ColorRamp: 31,222,183
 		Enemies: Nod
 	PlayerReference@Nod:
@@ -46,8 +46,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True
@@ -57,7 +57,7 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 
 Actors:
 	Actor0: t08

mods/cnc/maps/nod02b/map.yaml

@@ -38,7 +38,7 @@ Options:
 Players:
 	PlayerReference@GDI:
 		Name: GDI
-		Race: gdi
+		Faction: gdi
 		ColorRamp: 31,222,183
 		Allies: GDI
 		Enemies: Nod
@@ -47,8 +47,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True
@@ -58,7 +58,7 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 
 Actors:
 	Actor0: t08

mods/cnc/maps/nod03a/map.yaml

@@ -40,10 +40,10 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@GDI:
 		Name: GDI
-		Race: gdi
+		Faction: gdi
 		ColorRamp: 31,222,183
 		Allies: GDI
 		Enemies: Nod
@@ -52,8 +52,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True
@@ -63,7 +63,7 @@ Players:
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: Random
+		Faction: Random
 		Enemies: Nod, GDI
 
 Actors:

mods/cnc/maps/nod03b/map.yaml

@@ -40,10 +40,10 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@GDI:
 		Name: GDI
-		Race: gdi
+		Faction: gdi
 		ColorRamp: 31,222,183
 		Allies: GDI
 		Enemies: Nod
@@ -52,8 +52,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True
@@ -63,7 +63,7 @@ Players:
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: Random
+		Faction: Random
 		Enemies: Nod, GDI
 
 Actors:

mods/cnc/maps/nod04a/map.yaml

@@ -39,14 +39,14 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@NodSupporter:
 		Name: NodSupporter
 		NonCombatant: True
-		Race: nod
+		Faction: nod
 	PlayerReference@GDI:
 		Name: GDI
-		Race: gdi
+		Faction: gdi
 		ColorRamp: 31,222,183
 		Enemies: Nod
 	PlayerReference@Nod:
@@ -54,8 +54,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True

mods/cnc/maps/nod04b/map.yaml

@@ -36,21 +36,21 @@ Options:
 Players:
 	PlayerReference@GDI:
 		Name: GDI
-		Race: gdi
+		Faction: gdi
 		ColorRamp: 31,222,183
 		Enemies: Nod
 	PlayerReference@Neutral:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@Nod:
 		Name: Nod
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True

mods/cnc/maps/nod05/map.yaml

@@ -39,7 +39,7 @@ Options:
 Players:
 	PlayerReference@GDI:
 		Name: GDI
-		Race: gdi
+		Faction: gdi
 		ColorRamp: 31,222,183
 		Allies: GDI
 		Enemies: Nod
@@ -47,14 +47,14 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@Nod:
 		Name: Nod
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True

mods/cnc/maps/nod06a/map.yaml

@@ -39,11 +39,11 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@GDI:
 		Name: GDI
 		Playable: False
-		Race: gdi
+		Faction: gdi
 		ColorRamp: 31,222,183
 		Enemies: Nod
 	PlayerReference@Nod:
@@ -51,8 +51,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True

mods/cnc/maps/nod06b/map.yaml

@@ -38,26 +38,26 @@ Players:
 	PlayerReference@GDI:
 		Name: GDI
 		Playable: False
-		Race: gdi
+		Faction: gdi
 		ColorRamp: 31,222,183
 		Enemies: Nod
 	PlayerReference@Neutral:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@Civilians:
 		Name: Civilians
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 		Enemies: Nod
 	PlayerReference@Nod:
 		Name: Nod
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True

mods/cnc/maps/nod06c/map.yaml

@@ -38,7 +38,7 @@ Players:
 	PlayerReference@GDI:
 		Name: GDI
 		Playable: False
-		Race: gdi
+		Faction: gdi
 		ColorRamp: 31,222,183
 		Enemies: Nod
 	PlayerReference@Nod:
@@ -46,8 +46,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True
@@ -57,7 +57,7 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 
 Actors:
 	Actor0: brik

mods/cnc/maps/shellmap/map.yaml

@@ -25,13 +25,13 @@ Options:
 Players:
 	PlayerReference@Nod:
 		Name: Nod
-		Race: nod
+		Faction: nod
 		ColorRamp: 3,255,127
 		Allies: Nod
 		Enemies: GDI, Creeps
 	PlayerReference@GDI:
 		Name: GDI
-		Race: gdi
+		Faction: gdi
 		ColorRamp: 31,222,183
 		Allies: GDI
 		Enemies: Nod, Creeps
@@ -39,41 +39,41 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi4:
 		Name: Multi4
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi5:
 		Name: Multi5
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: Random
+		Faction: Random
 		Enemies: Nod, GDI, Multi0, Multi1, Multi2, Multi3, Multi4, Multi5
 
 Actors:

mods/cnc/maps/the-hot-box/map.yaml

@@ -27,89 +27,89 @@ Options:
 	AllyBuildRadius: False
 	FragileAlliances: False
 	StartingCash: 5000
-	ConfigurableStartingUnits: False
 	TechLevel: Unrestricted
+	ConfigurableStartingUnits: False
 
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		Enemies: Creeps
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		Enemies: Creeps
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		Enemies: Creeps
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		Enemies: Creeps
 	PlayerReference@Multi4:
 		Name: Multi4
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		Enemies: Creeps
 	PlayerReference@Multi5:
 		Name: Multi5
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		Enemies: Creeps
 	PlayerReference@Multi6:
 		Name: Multi6
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		Enemies: Creeps
 	PlayerReference@Multi7:
 		Name: Multi7
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		Enemies: Creeps
 	PlayerReference@Multi8:
 		Name: Multi8
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		Enemies: Creeps
 	PlayerReference@Multi9:
 		Name: Multi9
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: nod
+		LockFaction: True
+		Faction: nod
 		Enemies: Creeps
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: gdi
+		Faction: gdi
 		Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7, Multi8, Multi9
 
 Actors:

mods/d2k/maps/atreides-01a/map.yaml

@@ -29,33 +29,33 @@ Options:
 	AllyBuildRadius: False
 	FragileAlliances: False
 	StartingCash: 2300
-	ConfigurableStartingUnits: False
-	ShortGame: False
 	TechLevel: Low
+	ConfigurableStartingUnits: False
 	Difficulties: Easy, Normal, Hard
+	ShortGame: False
 
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: Random
+		Faction: Random
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: Random
+		Faction: Random
 	PlayerReference@Atreides:
 		Name: Atreides
 		Playable: true
-		Race: atreides
-		LockRace: true
+		Faction: atreides
+		LockFaction: true
 		ColorRamp: 170,255,200
 		LockColor: true
 		Enemies: Harkonnen
 	PlayerReference@Harkonnen:
 		Name: Harkonnen
-		Race: harkonnen
-		LockRace: true
+		Faction: harkonnen
+		LockFaction: true
 		ColorRamp: 0,255,127
 		LockColor: true
 		Enemies: Atreides

mods/d2k/maps/atreides-01b/map.yaml

@@ -29,33 +29,33 @@ Options:
 	AllyBuildRadius: False
 	FragileAlliances: False
 	StartingCash: 2300
-	ConfigurableStartingUnits: False
-	ShortGame: False
 	TechLevel: Low
+	ConfigurableStartingUnits: False
 	Difficulties: Easy, Normal, Hard
+	ShortGame: False
 
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: Random
+		Faction: Random
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: Random
+		Faction: Random
 	PlayerReference@Atreides:
 		Name: Atreides
 		Playable: true
-		Race: atreides
-		LockRace: true
+		Faction: atreides
+		LockFaction: true
 		ColorRamp: 170,255,200
 		LockColor: true
 		Enemies: Harkonnen
 	PlayerReference@Harkonnen:
 		Name: Harkonnen
-		Race: harkonnen
-		LockRace: true
+		Faction: harkonnen
+		LockFaction: true
 		ColorRamp: 0,255,127
 		LockColor: true
 		Enemies: Atreides

mods/d2k/maps/mount-idaho/map.yaml

@@ -25,21 +25,21 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: atreides
+		Faction: atreides
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: atreides
+		Faction: atreides
 		Enemies: Multi0, Multi1
 
 Actors:

mods/d2k/maps/oasis-conquest/map.yaml

@@ -27,41 +27,41 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: atreides
+		Faction: atreides
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi4:
 		Name: Multi4
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi5:
 		Name: Multi5
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: atreides
+		Faction: atreides
 		Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5
 
 Actors:

mods/d2k/maps/pasty-mesa/map.yaml

@@ -25,21 +25,21 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: atreides
+		Faction: atreides
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: atreides
+		Faction: atreides
 		Enemies: Multi0, Multi1
 
 Actors:

mods/d2k/maps/shellmap/map.yaml

@@ -27,15 +27,15 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: atreides
+		Faction: atreides
 	PlayerReference@Atreides:
 		Name: Atreides
-		Race: atreides
+		Faction: atreides
 		ColorRamp: 161,134,200
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: atreides
+		Faction: atreides
 		Enemies: Atreides
 		ColorRamp: 210,255,127
 

mods/ra/maps/allies-01/map.yaml

@@ -37,21 +37,21 @@ Options:
 Players:
 	PlayerReference@USSR:
 		Name: USSR
-		Race: soviet
+		Faction: soviet
 		ColorRamp: 3,255,127
 		Enemies: Greece, England
 	PlayerReference@Neutral:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@Greece:
 		Name: Greece
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		LockColor: True
 		ColorRamp: 161,134,200
 		LockSpawn: True
@@ -60,7 +60,7 @@ Players:
 		Enemies: USSR
 	PlayerReference@England:
 		Name: England
-		Race: allies
+		Faction: allies
 		ColorRamp: 76,196,190
 		Allies: Greece
 		Enemies: USSR

mods/ra/maps/allies-02/map.yaml

@@ -37,14 +37,14 @@ Options:
 Players:
 	PlayerReference@USSR:
 		Name: USSR
-		Race: soviet
+		Faction: soviet
 		ColorRamp: 3,255,127
 		Allies: Ukraine
 		Enemies: Greece, France
 	PlayerReference@France:
 		Name: France
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 		ColorRamp: 115,115,143
 		Allies: Greece, France
 		Enemies: USSR, Ukraine
@@ -52,10 +52,10 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@Ukraine:
 		Name: Ukraine
-		Race: soviet
+		Faction: soviet
 		ColorRamp: 3,255,127
 		Allies: USSR
 		Enemies: Greece, France
@@ -64,8 +64,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		LockColor: True
 		ColorRamp: 161,134,200
 		LockSpawn: True

mods/ra/maps/allies-03a/map.yaml

@@ -39,18 +39,18 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@USSR:
 		Name: USSR
-		Race: soviet
+		Faction: soviet
 		ColorRamp: 3,255,127
 		Enemies: Greece
 	PlayerReference@Greece:
 		Name: Greece
 		Playable: True
 		Required: True
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		LockColor: True
 		ColorRamp: 161,134,236
 		Enemies: USSR

mods/ra/maps/allies-03b/map.yaml

@@ -39,18 +39,18 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@USSR:
 		Name: USSR
-		Race: soviet
+		Faction: soviet
 		ColorRamp: 3,255,127
 		Enemies: Greece
 	PlayerReference@Greece:
 		Name: Greece
 		Playable: True
 		Required: True
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		LockColor: True
 		ColorRamp: 161,134,236
 		Enemies: USSR

mods/ra/maps/allies-05a/map.yaml

@@ -41,18 +41,18 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@USSR:
 		Name: USSR
-		Race: soviet
+		Faction: soviet
 		ColorRamp: 3,255,127
 		Enemies: Greece
 	PlayerReference@Greece:
 		Name: Greece
 		Playable: True
 		Required: True
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		LockColor: True
 		ColorRamp: 161,134,236
 		Enemies: USSR

mods/ra/maps/bomber-john/map.yaml

@@ -27,75 +27,75 @@ Options:
 	AllyBuildRadius: False
 	FragileAlliances: False
 	StartingCash: 60
-	ConfigurableStartingUnits: False
 	TechLevel: Unrestricted
+	ConfigurableStartingUnits: False
 
 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 		Enemies: Creeps
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: soviet
+		LockFaction: True
+		Faction: soviet
 		Enemies: Creeps
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: soviet
+		LockFaction: True
+		Faction: soviet
 		Enemies: Creeps
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: soviet
+		LockFaction: True
+		Faction: soviet
 		Enemies: Creeps
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: soviet
+		LockFaction: True
+		Faction: soviet
 		Enemies: Creeps
 	PlayerReference@Multi4:
 		Name: Multi4
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: soviet
+		LockFaction: True
+		Faction: soviet
 		Enemies: Creeps
 	PlayerReference@Multi5:
 		Name: Multi5
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: soviet
+		LockFaction: True
+		Faction: soviet
 		Enemies: Creeps
 	PlayerReference@Multi6:
 		Name: Multi6
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: soviet
+		LockFaction: True
+		Faction: soviet
 		Enemies: Creeps
 	PlayerReference@Multi7:
 		Name: Multi7
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: soviet
+		LockFaction: True
+		Faction: soviet
 		Enemies: Creeps
 
 Actors: