Upgrade RA maps

2015-07-06 00:05:07 +03:00
parent 8ecc6ffbf6
commit 7873a326cd
78 changed files with 202 additions and 201 deletions
--- a/mods/ra/maps/Sahara.oramap
+++ b/mods/ra/maps/Sahara.oramap
--- a/mods/ra/maps/a-path-beyond.oramap
+++ b/mods/ra/maps/a-path-beyond.oramap
--- a/mods/ra/maps/alaska-anarchy-redux.oramap
+++ b/mods/ra/maps/alaska-anarchy-redux.oramap
--- a/mods/ra/maps/all-connected.oramap
+++ b/mods/ra/maps/all-connected.oramap
--- a/mods/ra/maps/allies-01/map.yaml
+++ b/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
--- a/mods/ra/maps/allies-02/map.yaml
+++ b/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
--- a/mods/ra/maps/allies-03a/map.yaml
+++ b/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
--- a/mods/ra/maps/allies-03b/map.yaml
+++ b/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
--- a/mods/ra/maps/allies-05a/map.yaml
+++ b/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
--- a/mods/ra/maps/arctic-triangle-affair.oramap
+++ b/mods/ra/maps/arctic-triangle-affair.oramap
--- a/mods/ra/maps/asymetric-battle.oramap
+++ b/mods/ra/maps/asymetric-battle.oramap
--- a/mods/ra/maps/bad-neighbors.oramap
+++ b/mods/ra/maps/bad-neighbors.oramap
--- a/mods/ra/maps/blitzkrieg.oramap
+++ b/mods/ra/maps/blitzkrieg.oramap
--- a/mods/ra/maps/bloody-delta.oramap
+++ b/mods/ra/maps/bloody-delta.oramap
--- a/mods/ra/maps/bombardment-islands.oramap
+++ b/mods/ra/maps/bombardment-islands.oramap
--- a/mods/ra/maps/bomber-john/map.yaml
+++ b/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:
--- a/mods/ra/maps/breaking-point.oramap
+++ b/mods/ra/maps/breaking-point.oramap
--- a/mods/ra/maps/burlesca/map.yaml
+++ b/mods/ra/maps/burlesca/map.yaml
@@ -25,23 +25,23 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
 		AllowBots: False
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
 		AllowBots: False
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 		Enemies: Multi0, Multi1

 Actors:
--- a/mods/ra/maps/caffeinated.oramap
+++ b/mods/ra/maps/caffeinated.oramap
--- a/mods/ra/maps/calm-before-storm.oramap
+++ b/mods/ra/maps/calm-before-storm.oramap
--- a/mods/ra/maps/center-of-attention-redux-2/map.yaml
+++ b/mods/ra/maps/center-of-attention-redux-2/map.yaml
@@ -25,51 +25,51 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 		Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7
 	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@Multi6:
 		Name: Multi6
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi7:
 		Name: Multi7
 		Playable: True
-		Race: Random
+		Faction: Random
 		Enemies: Creeps

 Actors:
--- a/mods/ra/maps/central-conflict.oramap
+++ b/mods/ra/maps/central-conflict.oramap
--- a/mods/ra/maps/chaos-canyon.oramap
+++ b/mods/ra/maps/chaos-canyon.oramap
--- a/mods/ra/maps/chokepoint.oramap
+++ b/mods/ra/maps/chokepoint.oramap
--- a/mods/ra/maps/coastal-influence.oramap
+++ b/mods/ra/maps/coastal-influence.oramap
--- a/mods/ra/maps/contact.oramap
+++ b/mods/ra/maps/contact.oramap
--- a/mods/ra/maps/desert-shellmap/map.yaml
+++ b/mods/ra/maps/desert-shellmap/map.yaml
@@ -27,19 +27,19 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@Allies:
 		Name: Allies
-		Race: allies
+		Faction: allies
 		ColorRamp: 161,134,200
 		Enemies: Soviets
 	PlayerReference@Soviets:
 		Name: Soviets
-		Race: soviet
+		Faction: soviet
 		ColorRamp: 3,255,127
 		Enemies: Allies

--- a/mods/ra/maps/doubles.oramap
+++ b/mods/ra/maps/doubles.oramap
--- a/mods/ra/maps/doughnut.oramap
+++ b/mods/ra/maps/doughnut.oramap
--- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml
+++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml
@@ -27,74 +27,74 @@ Options:
 	AllyBuildRadius: False
 	FragileAlliances: False
 	StartingCash: 5000
-	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
 	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:
--- a/mods/ra/maps/drop-zone-w/map.yaml
+++ b/mods/ra/maps/drop-zone-w/map.yaml
@@ -27,75 +27,75 @@ Options:
 	AllyBuildRadius: False
 	FragileAlliances: False
 	StartingCash: 5000
-	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: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		Enemies: Creeps
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		Enemies: Creeps
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		Enemies: Creeps
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		Enemies: Creeps
 	PlayerReference@Multi4:
 		Name: Multi4
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		Enemies: Creeps
 	PlayerReference@Multi5:
 		Name: Multi5
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		Enemies: Creeps
 	PlayerReference@Multi6:
 		Name: Multi6
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		Enemies: Creeps
 	PlayerReference@Multi7:
 		Name: Multi7
 		Playable: True
 		AllowBots: False
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		Enemies: Creeps

 Actors:
--- a/mods/ra/maps/drop-zone/map.yaml
+++ b/mods/ra/maps/drop-zone/map.yaml
@@ -27,74 +27,74 @@ Options:
 	AllyBuildRadius: False
 	FragileAlliances: False
 	StartingCash: 5000
-	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
 	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:
--- a/mods/ra/maps/east-vs-west.oramap
+++ b/mods/ra/maps/east-vs-west.oramap
--- a/mods/ra/maps/encounter.oramap
+++ b/mods/ra/maps/encounter.oramap
--- a/mods/ra/maps/engagement.oramap
+++ b/mods/ra/maps/engagement.oramap
--- a/mods/ra/maps/equal-opportunity.oramap
+++ b/mods/ra/maps/equal-opportunity.oramap
--- a/mods/ra/maps/first-come-first-served.oramap
+++ b/mods/ra/maps/first-come-first-served.oramap
--- a/mods/ra/maps/forest-path.oramap
+++ b/mods/ra/maps/forest-path.oramap
--- a/mods/ra/maps/fort-lonestar/map.yaml
+++ b/mods/ra/maps/fort-lonestar/map.yaml
@@ -26,24 +26,24 @@ Options:
 	AllyBuildRadius: False
 	FragileAlliances: False
 	StartingCash: 50
+	TechLevel: Unrestricted
 	ConfigurableStartingUnits: False
 	ShortGame: False
-	TechLevel: Unrestricted

 Players:
 	PlayerReference@Neutral:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
 		AllowBots: False
 		LockTeam: True
 		Team: 1
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		Allies: Multi1, Multi2, Multi3
 		Enemies: Soviets
 	PlayerReference@Multi1:
@@ -52,8 +52,8 @@ Players:
 		AllowBots: False
 		LockTeam: True
 		Team: 1
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		Allies: Multi0, Multi2, Multi3
 		Enemies: Soviets
 	PlayerReference@Multi2:
@@ -62,8 +62,8 @@ Players:
 		AllowBots: False
 		LockTeam: True
 		Team: 1
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		Allies: Multi0, Multi1, Multi3
 		Enemies: Soviets
 	PlayerReference@Multi3:
@@ -72,13 +72,13 @@ Players:
 		AllowBots: False
 		LockTeam: True
 		Team: 1
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		Allies: Multi0, Multi1, Multi2
 		Enemies: Soviets
 	PlayerReference@Soviets:
 		Name: Soviets
-		Race: soviet
+		Faction: soviet
 		LockTeam: True
 		Team: 2
 		ColorRamp: 0,255,128
--- a/mods/ra/maps/ghost-town.oramap
+++ b/mods/ra/maps/ghost-town.oramap
--- a/mods/ra/maps/haos-ridges.oramap
+++ b/mods/ra/maps/haos-ridges.oramap
--- a/mods/ra/maps/high-and-low-extended.oramap
+++ b/mods/ra/maps/high-and-low-extended.oramap
--- a/mods/ra/maps/high-and-low.oramap
+++ b/mods/ra/maps/high-and-low.oramap
--- a/mods/ra/maps/intervention/map.yaml
+++ b/mods/ra/maps/intervention/map.yaml
@@ -36,11 +36,11 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@Civilians:
 		Name: Civilians
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 		ColorRamp: 0,0,0
 		Allies: Allies
 	PlayerReference@Allies:
@@ -48,8 +48,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		LockColor: True
 		ColorRamp: 161,134,200
 		LockSpawn: True
@@ -58,7 +58,7 @@ Players:
 		Enemies: Soviets
 	PlayerReference@Soviets:
 		Name: Soviets
-		Race: soviet
+		Faction: soviet
 		ColorRamp: 3,255,127
 		Enemies: Civilians, Allies

--- a/mods/ra/maps/island-hoppers.oramap
+++ b/mods/ra/maps/island-hoppers.oramap
--- a/mods/ra/maps/keep-off-the-grass-2.oramap
+++ b/mods/ra/maps/keep-off-the-grass-2.oramap
--- a/mods/ra/maps/koth-hopes-anchor/map.yaml
+++ b/mods/ra/maps/koth-hopes-anchor/map.yaml
@@ -27,59 +27,59 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
 		AllowBots: False
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
 		AllowBots: False
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
 		AllowBots: False
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
 		AllowBots: False
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi4:
 		Name: Multi4
 		Playable: True
 		AllowBots: False
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi5:
 		Name: Multi5
 		Playable: True
 		AllowBots: False
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi6:
 		Name: Multi6
 		Playable: True
 		AllowBots: False
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi7:
 		Name: Multi7
 		Playable: True
 		AllowBots: False
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 		Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7

 Actors:
--- a/mods/ra/maps/man-to-man.oramap
+++ b/mods/ra/maps/man-to-man.oramap
--- a/mods/ra/maps/marooned-2.oramap
+++ b/mods/ra/maps/marooned-2.oramap
--- a/mods/ra/maps/mass-confliction.oramap
+++ b/mods/ra/maps/mass-confliction.oramap
--- a/mods/ra/maps/monster-tank-madness/map.yaml
+++ b/mods/ra/maps/monster-tank-madness/map.yaml
@@ -36,8 +36,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		LockColor: True
 		ColorRamp: 161,134,200
 		LockSpawn: True
@@ -45,13 +45,13 @@ Players:
 		Enemies: BadGuy, USSR, Ukraine, Turkey
 	PlayerReference@BadGuy:
 		Name: BadGuy
-		Race: soviet
+		Faction: soviet
 		ColorRamp: 3,255,127
 		Allies: USSR
 		Enemies: Greece, Turkey
 	PlayerReference@USSR:
 		Name: USSR
-		Race: soviet
+		Faction: soviet
 		ColorRamp: 3,255,127
 		Allies: BadGuy, Ukraine
 		Enemies: Greece, Turkey
@@ -59,22 +59,22 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@Ukraine:
 		Name: Ukraine
-		Race: soviet
+		Faction: soviet
 		ColorRamp: 32,255,202
 		Allies: BadGuy, USSR
 		Enemies: Greece, Turkey
 	PlayerReference@Turkey:
 		Name: Turkey
-		Race: soviet
+		Faction: soviet
 		ColorRamp: 14,123,167
 		Enemies: Greece, BadGuy, USSR, Ukraine, Outpost
 	PlayerReference@Outpost:
 		Name: Outpost
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 		Enemies: BadGuy, USSR, Ukraine, Turkey

 Actors:
--- a/mods/ra/maps/north-by-northwest.oramap
+++ b/mods/ra/maps/north-by-northwest.oramap
--- a/mods/ra/maps/ore-lord.oramap
+++ b/mods/ra/maps/ore-lord.oramap
--- a/mods/ra/maps/pearly-wastelands.oramap
+++ b/mods/ra/maps/pearly-wastelands.oramap
--- a/mods/ra/maps/poland-raid/map.yaml
+++ b/mods/ra/maps/poland-raid/map.yaml
@@ -27,41 +27,41 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@Multi0:
 		Name: Multi0
 		Playable: True
 		AllowBots: False
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi1:
 		Name: Multi1
 		Playable: True
 		AllowBots: False
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi2:
 		Name: Multi2
 		Playable: True
 		AllowBots: False
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi3:
 		Name: Multi3
 		Playable: True
 		AllowBots: False
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Multi4:
 		Name: Multi4
 		Playable: True
 		AllowBots: False
-		Race: Random
+		Faction: Random
 		Enemies: Creeps
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 		Enemies: Multi0, Multi1, Multi2, Multi3, Multi4

 Actors:
--- a/mods/ra/maps/pressure.oramap
+++ b/mods/ra/maps/pressure.oramap
--- a/mods/ra/maps/puddles-redux.oramap
+++ b/mods/ra/maps/puddles-redux.oramap
--- a/mods/ra/maps/raraku.oramap
+++ b/mods/ra/maps/raraku.oramap
--- a/mods/ra/maps/regeneration-basin.oramap
+++ b/mods/ra/maps/regeneration-basin.oramap
--- a/mods/ra/maps/ring-of-fire.oramap
+++ b/mods/ra/maps/ring-of-fire.oramap
--- a/mods/ra/maps/seaside-2.oramap
+++ b/mods/ra/maps/seaside-2.oramap
--- a/mods/ra/maps/singles.oramap
+++ b/mods/ra/maps/singles.oramap
--- a/mods/ra/maps/snow
+++ b/mods/ra/maps/snow
--- a/mods/ra/maps/snowy-island.oramap
+++ b/mods/ra/maps/snowy-island.oramap
--- a/mods/ra/maps/snowyridge.oramap
+++ b/mods/ra/maps/snowyridge.oramap
--- a/mods/ra/maps/soviet-01/map.yaml
+++ b/mods/ra/maps/soviet-01/map.yaml
@@ -38,14 +38,14 @@ Options:
 Players:
 	PlayerReference@France:
 		Name: France
-		Race: allies
+		Faction: allies
 		ColorRamp: 115,115,143
 		Allies: Germany
 		Enemies: USSR
 	PlayerReference@Germany:
 		Name: Germany
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 		ColorRamp: 0,0,80
 		Allies: France
 		Enemies: USSR
@@ -54,8 +54,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: soviet
+		LockFaction: True
+		Faction: soviet
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True
@@ -65,7 +65,7 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies

 Actors:
 	Actor0: wood
--- a/mods/ra/maps/soviet-02a/map.yaml
+++ b/mods/ra/maps/soviet-02a/map.yaml
@@ -40,8 +40,8 @@ Players:
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: soviet
+		LockFaction: True
+		Faction: soviet
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True
@@ -49,14 +49,14 @@ Players:
 		Enemies: Germany
 	PlayerReference@Germany:
 		Name: Germany
-		Race: allies
+		Faction: allies
 		ColorRamp: 161,134,236
 		Enemies: USSR
 	PlayerReference@Neutral:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies

 Actors:
 	Actor0: t02
--- a/mods/ra/maps/soviet-05/map.yaml
+++ b/mods/ra/maps/soviet-05/map.yaml
@@ -41,24 +41,24 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: england
+		Faction: england
 	PlayerReference@Creeps:
 		Name: Creeps
 		NonCombatant: True
-		Race: england
+		Faction: england
 	PlayerReference@Greece:
 		Name: Greece
-		Race: allies
+		Faction: allies
 		ColorRamp: 161,134,236
 		Allies: GoodGuy
 		Enemies: USSR
 	PlayerReference@USSR:
 		Name: USSR
-		Race: soviet
+		Faction: soviet
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
+		LockFaction: True
 		LockColor: True
 		ColorRamp: 3,255,127
 		LockSpawn: True
@@ -66,7 +66,7 @@ Players:
 		Enemies: Greece, GoodGuy
 	PlayerReference@GoodGuy:
 		Name: GoodGuy
-		Race: allies
+		Faction: allies
 		ColorRamp: 161,134,236
 		Allies: Greece
 		Enemies: USSR
@@ -620,6 +620,7 @@ Actors:
 	StartCamPoint: waypoint
 		Location: 21,80
 		Owner: Neutral
+
 Smudges:

 Rules:
--- a/mods/ra/maps/styrian-mountains.oramap
+++ b/mods/ra/maps/styrian-mountains.oramap
--- a/mods/ra/maps/suffrage.oramap
+++ b/mods/ra/maps/suffrage.oramap
--- a/mods/ra/maps/survival01/map.yaml
+++ b/mods/ra/maps/survival01/map.yaml
@@ -36,14 +36,14 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@Allies:
 		Name: Allies
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		LockColor: True
 		ColorRamp: 115,240,130
 		LockSpawn: True
@@ -51,7 +51,7 @@ Players:
 		Enemies: Soviets
 	PlayerReference@Soviets:
 		Name: Soviets
-		Race: soviet
+		Faction: soviet
 		ColorRamp: 0,255,128
 		Enemies: Allies

--- a/mods/ra/maps/survival02/map.yaml
+++ b/mods/ra/maps/survival02/map.yaml
@@ -35,14 +35,14 @@ Players:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
-		Race: allies
+		Faction: allies
 	PlayerReference@Allies:
 		Name: Allies
 		Playable: True
 		AllowBots: False
 		Required: True
-		LockRace: True
-		Race: allies
+		LockFaction: True
+		Faction: allies
 		LockColor: True
 		ColorRamp: 115,240,130
 		LockSpawn: True
@@ -50,7 +50,7 @@ Players:
 		Enemies: Soviets
 	PlayerReference@Soviets:
 		Name: Soviets
-		Race: soviet
+		Faction: soviet
 		ColorRamp: 0,255,128
 		Enemies: Allies

--- a/mods/ra/maps/synergy.oramap
+++ b/mods/ra/maps/synergy.oramap
--- a/mods/ra/maps/tainted-peak.oramap
+++ b/mods/ra/maps/tainted-peak.oramap
--- a/mods/ra/maps/temperal.oramap
+++ b/mods/ra/maps/temperal.oramap
--- a/mods/ra/maps/tournament-island.oramap
+++ b/mods/ra/maps/tournament-island.oramap
--- a/mods/ra/maps/training-camp/map.yaml
+++ b/mods/ra/maps/training-camp/map.yaml
@@ -27,74 +27,74 @@ Options:
 	AllyBuildRadius: False
 	FragileAlliances: False
 	StartingCash: 100
-	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
 	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:
--- a/mods/ra/maps/vegetation.oramap
+++ b/mods/ra/maps/vegetation.oramap