diff --git a/OpenRA.Game/Map/MapPlayers.cs b/OpenRA.Game/Map/MapPlayers.cs index 61eed5d90e..1bf44d0321 100644 --- a/OpenRA.Game/Map/MapPlayers.cs +++ b/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" } }; diff --git a/OpenRA.Game/Map/PlayerReference.cs b/OpenRA.Game/Map/PlayerReference.cs index c77da7606c..9a6b56bce8 100644 --- a/OpenRA.Game/Map/PlayerReference.cs +++ b/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; diff --git a/OpenRA.Game/Player.cs b/OpenRA.Game/Player.cs index 08ca34656b..22228f796e 100644 --- a/OpenRA.Game/Player.cs +++ b/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) }); diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index 05578dc239..a808c73f12 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/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) diff --git a/OpenRA.Mods.Common/EditorBrushes/EditorActorBrush.cs b/OpenRA.Mods.Common/EditorBrushes/EditorActorBrush.cs index ee4436a73e..e8a1d720a7 100644 --- a/OpenRA.Mods.Common/EditorBrushes/EditorActorBrush.cs +++ b/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(); diff --git a/OpenRA.Mods.Common/Lint/CheckPlayers.cs b/OpenRA.Mods.Common/Lint/CheckPlayers.cs index fca834d303..fcf0118e1a 100644 --- a/OpenRA.Mods.Common/Lint/CheckPlayers.cs +++ b/OpenRA.Mods.Common/Lint/CheckPlayers.cs @@ -40,8 +40,8 @@ namespace OpenRA.Mods.Common.Lint var races = worldActor.Traits.WithInterface().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()) { diff --git a/OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs index e5841b1596..02066913a3 100644 --- a/OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs +++ b/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; } } diff --git a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs index 2867ff62c3..ffa18b3719 100644 --- a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs +++ b/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, diff --git a/OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs b/OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs index 48dc63019a..3d3a4b7bcc 100644 --- a/OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs +++ b/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() })); diff --git a/OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs b/OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs index 8f717b69a9..8c956627e1 100644 --- a/OpenRA.Mods.Common/Traits/World/EditorActorLayer.cs +++ b/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" } }; diff --git a/OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs b/OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs index 9ee059e964..b101940746 100644 --- a/OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs +++ b/OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs @@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Traits this.worldRenderer = worldRenderer; if (!actor.InitDict.Contains()) - actor.InitDict.Add(new RaceInit(owner.Race)); + actor.InitDict.Add(new RaceInit(owner.Faction)); if (!actor.InitDict.Contains()) actor.InitDict.Add(new OwnerInit(owner.Name)); @@ -119,7 +119,7 @@ namespace OpenRA.Mods.Common.Traits Func 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 diff --git a/OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs b/OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs index e7d1f24007..9cf4f76163 100644 --- a/OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs +++ b/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] }; diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index 2e23c7453a..5e889d7d51 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -2013,7 +2013,21 @@ namespace OpenRA.Mods.Common.UtilityCommands internal static void UpgradePlayers(int engineVersion, ref List 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 nodes, MiniYamlNode parent, int depth) diff --git a/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs index 26fa32c46b..0724e535d8 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs +++ b/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); diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs index 40cff401cf..74772978ab 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs +++ b/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 { diff --git a/mods/cnc/maps/Instant_Karma.oramap b/mods/cnc/maps/Instant_Karma.oramap index 78e136404d..64794c8b88 100644 Binary files a/mods/cnc/maps/Instant_Karma.oramap and b/mods/cnc/maps/Instant_Karma.oramap differ diff --git a/mods/cnc/maps/Nullpeter.oramap b/mods/cnc/maps/Nullpeter.oramap index 817b8b45a0..129574900d 100644 Binary files a/mods/cnc/maps/Nullpeter.oramap and b/mods/cnc/maps/Nullpeter.oramap differ diff --git a/mods/cnc/maps/break_of_day.oramap b/mods/cnc/maps/break_of_day.oramap index aae94e3047..7f7b893542 100644 Binary files a/mods/cnc/maps/break_of_day.oramap and b/mods/cnc/maps/break_of_day.oramap differ diff --git a/mods/cnc/maps/chokepoint.oramap b/mods/cnc/maps/chokepoint.oramap index 70e0b2736c..b65c8f0399 100644 Binary files a/mods/cnc/maps/chokepoint.oramap and b/mods/cnc/maps/chokepoint.oramap differ diff --git a/mods/cnc/maps/chord_simple.oramap b/mods/cnc/maps/chord_simple.oramap index 45453c0a24..ed7c5be0a1 100644 Binary files a/mods/cnc/maps/chord_simple.oramap and b/mods/cnc/maps/chord_simple.oramap differ diff --git a/mods/cnc/maps/dead_in_motion_2.oramap b/mods/cnc/maps/dead_in_motion_2.oramap index bafbacbb24..98886f930e 100644 Binary files a/mods/cnc/maps/dead_in_motion_2.oramap and b/mods/cnc/maps/dead_in_motion_2.oramap differ diff --git a/mods/cnc/maps/deterring_democracy.oramap b/mods/cnc/maps/deterring_democracy.oramap index 2c14cd4fba..2335208416 100644 Binary files a/mods/cnc/maps/deterring_democracy.oramap and b/mods/cnc/maps/deterring_democracy.oramap differ diff --git a/mods/cnc/maps/deterring_democracy_plus.oramap b/mods/cnc/maps/deterring_democracy_plus.oramap index 94dc6e8746..dd9fef207f 100644 Binary files a/mods/cnc/maps/deterring_democracy_plus.oramap and b/mods/cnc/maps/deterring_democracy_plus.oramap differ diff --git a/mods/cnc/maps/eastwest3.oramap b/mods/cnc/maps/eastwest3.oramap index 79028797e3..5bfd87dd83 100644 Binary files a/mods/cnc/maps/eastwest3.oramap and b/mods/cnc/maps/eastwest3.oramap differ diff --git a/mods/cnc/maps/funpark01/map.yaml b/mods/cnc/maps/funpark01/map.yaml index e8fc1baf2e..6b0f7fbc7b 100644 --- a/mods/cnc/maps/funpark01/map.yaml +++ b/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 diff --git a/mods/cnc/maps/garden2.oramap b/mods/cnc/maps/garden2.oramap index 62249085aa..36a3d512c4 100644 Binary files a/mods/cnc/maps/garden2.oramap and b/mods/cnc/maps/garden2.oramap differ diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml index f5ad68a83f..3b11049537 100644 --- a/mods/cnc/maps/gdi01/map.yaml +++ b/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: diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml index f70a34397f..ae7dab6147 100644 --- a/mods/cnc/maps/gdi02/map.yaml +++ b/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: diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml index 0ea63bc6bb..cfb7e7cc91 100644 --- a/mods/cnc/maps/gdi03/map.yaml +++ b/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: diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml index f0315f2e5a..d94b9ed847 100644 --- a/mods/cnc/maps/gdi04a/map.yaml +++ b/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: diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml index eb0777c620..ccdfe6b072 100644 --- a/mods/cnc/maps/gdi04b/map.yaml +++ b/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: diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml index 9b2f384ba3..54028c4faa 100644 --- a/mods/cnc/maps/gdi04c/map.yaml +++ b/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: diff --git a/mods/cnc/maps/gdi05a/map.yaml b/mods/cnc/maps/gdi05a/map.yaml index 5a938477b7..319c02deeb 100644 --- a/mods/cnc/maps/gdi05a/map.yaml +++ b/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: diff --git a/mods/cnc/maps/gdi05b/map.yaml b/mods/cnc/maps/gdi05b/map.yaml index 07925a9106..89c8062cef 100644 --- a/mods/cnc/maps/gdi05b/map.yaml +++ b/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 diff --git a/mods/cnc/maps/haos_ridges_cnc.oramap b/mods/cnc/maps/haos_ridges_cnc.oramap index 17a0877c08..0f8c4967d0 100644 Binary files a/mods/cnc/maps/haos_ridges_cnc.oramap and b/mods/cnc/maps/haos_ridges_cnc.oramap differ diff --git a/mods/cnc/maps/hegemony_or_survival.oramap b/mods/cnc/maps/hegemony_or_survival.oramap index 20ddbeca74..c61cda97e7 100644 Binary files a/mods/cnc/maps/hegemony_or_survival.oramap and b/mods/cnc/maps/hegemony_or_survival.oramap differ diff --git a/mods/cnc/maps/hegemony_or_survival_8p.oramap b/mods/cnc/maps/hegemony_or_survival_8p.oramap index 5e2240be31..5c6638bcfe 100644 Binary files a/mods/cnc/maps/hegemony_or_survival_8p.oramap and b/mods/cnc/maps/hegemony_or_survival_8p.oramap differ diff --git a/mods/cnc/maps/into_the_river_below.oramap b/mods/cnc/maps/into_the_river_below.oramap index 1a4585d499..ef4593adf9 100644 Binary files a/mods/cnc/maps/into_the_river_below.oramap and b/mods/cnc/maps/into_the_river_below.oramap differ diff --git a/mods/cnc/maps/lessons_from_kosovo.oramap b/mods/cnc/maps/lessons_from_kosovo.oramap index 73d7917138..2e949b00c7 100644 Binary files a/mods/cnc/maps/lessons_from_kosovo.oramap and b/mods/cnc/maps/lessons_from_kosovo.oramap differ diff --git a/mods/cnc/maps/letters_from_lexington.oramap b/mods/cnc/maps/letters_from_lexington.oramap index 86a3a30649..e87410fd2f 100644 Binary files a/mods/cnc/maps/letters_from_lexington.oramap and b/mods/cnc/maps/letters_from_lexington.oramap differ diff --git a/mods/cnc/maps/llamas.oramap b/mods/cnc/maps/llamas.oramap index 9672a1ceae..b39de8eb37 100644 Binary files a/mods/cnc/maps/llamas.oramap and b/mods/cnc/maps/llamas.oramap differ diff --git a/mods/cnc/maps/llamas2.oramap b/mods/cnc/maps/llamas2.oramap index f1aeb549ef..2991e087bf 100644 Binary files a/mods/cnc/maps/llamas2.oramap and b/mods/cnc/maps/llamas2.oramap differ diff --git a/mods/cnc/maps/manufacturing_consent.oramap b/mods/cnc/maps/manufacturing_consent.oramap index e40b631201..8c70f69b66 100644 Binary files a/mods/cnc/maps/manufacturing_consent.oramap and b/mods/cnc/maps/manufacturing_consent.oramap differ diff --git a/mods/cnc/maps/minus_two.oramap b/mods/cnc/maps/minus_two.oramap index 8c786dc1f3..708575e423 100644 Binary files a/mods/cnc/maps/minus_two.oramap and b/mods/cnc/maps/minus_two.oramap differ diff --git a/mods/cnc/maps/necessary_illusions.oramap b/mods/cnc/maps/necessary_illusions.oramap index 6e31009921..5c019a7e8d 100644 Binary files a/mods/cnc/maps/necessary_illusions.oramap and b/mods/cnc/maps/necessary_illusions.oramap differ diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml index c31cd8885a..ddf0b36d6e 100644 --- a/mods/cnc/maps/nod01/map.yaml +++ b/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: diff --git a/mods/cnc/maps/nod02a/map.yaml b/mods/cnc/maps/nod02a/map.yaml index e4ad3d67c0..6ca8a6161a 100644 --- a/mods/cnc/maps/nod02a/map.yaml +++ b/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 diff --git a/mods/cnc/maps/nod02b/map.yaml b/mods/cnc/maps/nod02b/map.yaml index 0a1fe599aa..73ce9dd527 100644 --- a/mods/cnc/maps/nod02b/map.yaml +++ b/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 diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml index 0d7f550c0e..619fa2b1be 100644 --- a/mods/cnc/maps/nod03a/map.yaml +++ b/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: diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml index 502dce0af4..e53ca1d882 100644 --- a/mods/cnc/maps/nod03b/map.yaml +++ b/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: diff --git a/mods/cnc/maps/nod04a/map.yaml b/mods/cnc/maps/nod04a/map.yaml index 0f49bf9141..61a5c3c3dc 100644 --- a/mods/cnc/maps/nod04a/map.yaml +++ b/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 diff --git a/mods/cnc/maps/nod04b/map.yaml b/mods/cnc/maps/nod04b/map.yaml index 88b788e9de..d3d811be25 100644 --- a/mods/cnc/maps/nod04b/map.yaml +++ b/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 diff --git a/mods/cnc/maps/nod05/map.yaml b/mods/cnc/maps/nod05/map.yaml index 348a4d1058..95351d7f8c 100644 --- a/mods/cnc/maps/nod05/map.yaml +++ b/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 diff --git a/mods/cnc/maps/nod06a/map.yaml b/mods/cnc/maps/nod06a/map.yaml index 3b7e726ffa..8f27e1ab12 100644 --- a/mods/cnc/maps/nod06a/map.yaml +++ b/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 diff --git a/mods/cnc/maps/nod06b/map.yaml b/mods/cnc/maps/nod06b/map.yaml index 74d7601728..04a471d6e5 100644 --- a/mods/cnc/maps/nod06b/map.yaml +++ b/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 diff --git a/mods/cnc/maps/nod06c/map.yaml b/mods/cnc/maps/nod06c/map.yaml index bcd786271f..91832caf9e 100644 --- a/mods/cnc/maps/nod06c/map.yaml +++ b/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 diff --git a/mods/cnc/maps/pirates_and_emperors.oramap b/mods/cnc/maps/pirates_and_emperors.oramap index d99f46cb00..780be9d965 100644 Binary files a/mods/cnc/maps/pirates_and_emperors.oramap and b/mods/cnc/maps/pirates_and_emperors.oramap differ diff --git a/mods/cnc/maps/pressure_cnc.oramap b/mods/cnc/maps/pressure_cnc.oramap index 27f54e5236..af9e7b5848 100644 Binary files a/mods/cnc/maps/pressure_cnc.oramap and b/mods/cnc/maps/pressure_cnc.oramap differ diff --git a/mods/cnc/maps/profit_over_people.oramap b/mods/cnc/maps/profit_over_people.oramap index b59437abee..b543af39ac 100644 Binary files a/mods/cnc/maps/profit_over_people.oramap and b/mods/cnc/maps/profit_over_people.oramap differ diff --git a/mods/cnc/maps/rogue_states.oramap b/mods/cnc/maps/rogue_states.oramap index 6b1da99fb6..3a29f191de 100644 Binary files a/mods/cnc/maps/rogue_states.oramap and b/mods/cnc/maps/rogue_states.oramap differ diff --git a/mods/cnc/maps/rubicon.oramap b/mods/cnc/maps/rubicon.oramap index e31a1469cd..26cfac07f8 100644 Binary files a/mods/cnc/maps/rubicon.oramap and b/mods/cnc/maps/rubicon.oramap differ diff --git a/mods/cnc/maps/sea_and_cake.oramap b/mods/cnc/maps/sea_and_cake.oramap index 3be4ed3580..850726bf08 100644 Binary files a/mods/cnc/maps/sea_and_cake.oramap and b/mods/cnc/maps/sea_and_cake.oramap differ diff --git a/mods/cnc/maps/shellmap/map.yaml b/mods/cnc/maps/shellmap/map.yaml index 6bf0fb3dc3..2c1f73a826 100644 --- a/mods/cnc/maps/shellmap/map.yaml +++ b/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: diff --git a/mods/cnc/maps/the-hot-box/map.yaml b/mods/cnc/maps/the-hot-box/map.yaml index 87ff2d14db..3b41212c4a 100644 --- a/mods/cnc/maps/the-hot-box/map.yaml +++ b/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: diff --git a/mods/cnc/maps/the_hourglass.oramap b/mods/cnc/maps/the_hourglass.oramap index d26b5d5726..178b030a6a 100644 Binary files a/mods/cnc/maps/the_hourglass.oramap and b/mods/cnc/maps/the_hourglass.oramap differ diff --git a/mods/cnc/maps/thesentinel.oramap b/mods/cnc/maps/thesentinel.oramap index 047c13f297..33f410503c 100644 Binary files a/mods/cnc/maps/thesentinel.oramap and b/mods/cnc/maps/thesentinel.oramap differ diff --git a/mods/cnc/maps/tiberium-oasis-cluster.oramap b/mods/cnc/maps/tiberium-oasis-cluster.oramap index 21a1d22444..09d93362fb 100644 Binary files a/mods/cnc/maps/tiberium-oasis-cluster.oramap and b/mods/cnc/maps/tiberium-oasis-cluster.oramap differ diff --git a/mods/cnc/maps/white_acres.oramap b/mods/cnc/maps/white_acres.oramap index 2bf7d5ebe5..2db0e737a5 100644 Binary files a/mods/cnc/maps/white_acres.oramap and b/mods/cnc/maps/white_acres.oramap differ diff --git a/mods/d2k/maps/atreides-01a/map.yaml b/mods/d2k/maps/atreides-01a/map.yaml index 1769f95b26..3ffb640744 100644 --- a/mods/d2k/maps/atreides-01a/map.yaml +++ b/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 diff --git a/mods/d2k/maps/atreides-01b/map.yaml b/mods/d2k/maps/atreides-01b/map.yaml index e60b9d0dd4..8e670cdba3 100644 --- a/mods/d2k/maps/atreides-01b/map.yaml +++ b/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 diff --git a/mods/d2k/maps/battle-for-dune.oramap b/mods/d2k/maps/battle-for-dune.oramap index 6d113b93aa..74f1cb578f 100644 Binary files a/mods/d2k/maps/battle-for-dune.oramap and b/mods/d2k/maps/battle-for-dune.oramap differ diff --git a/mods/d2k/maps/death-depths.oramap b/mods/d2k/maps/death-depths.oramap index 143b261130..da24e042a5 100644 Binary files a/mods/d2k/maps/death-depths.oramap and b/mods/d2k/maps/death-depths.oramap differ diff --git a/mods/d2k/maps/desert-twister.oramap b/mods/d2k/maps/desert-twister.oramap index 4da2aec2ce..bb3791d3f8 100644 Binary files a/mods/d2k/maps/desert-twister.oramap and b/mods/d2k/maps/desert-twister.oramap differ diff --git a/mods/d2k/maps/eyesofthedesert.oramap b/mods/d2k/maps/eyesofthedesert.oramap index 5080d0071a..d8aa0901de 100644 Binary files a/mods/d2k/maps/eyesofthedesert.oramap and b/mods/d2k/maps/eyesofthedesert.oramap differ diff --git a/mods/d2k/maps/imperial-basin.oramap b/mods/d2k/maps/imperial-basin.oramap index 7c574b61d7..deca587c26 100644 Binary files a/mods/d2k/maps/imperial-basin.oramap and b/mods/d2k/maps/imperial-basin.oramap differ diff --git a/mods/d2k/maps/kanly.oramap b/mods/d2k/maps/kanly.oramap index ac70b6eeec..c9e999570b 100644 Binary files a/mods/d2k/maps/kanly.oramap and b/mods/d2k/maps/kanly.oramap differ diff --git a/mods/d2k/maps/mount-idaho/map.yaml b/mods/d2k/maps/mount-idaho/map.yaml index 2dccb2f9d2..adcc2007a3 100644 --- a/mods/d2k/maps/mount-idaho/map.yaml +++ b/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: diff --git a/mods/d2k/maps/oasis-conquest/map.yaml b/mods/d2k/maps/oasis-conquest/map.yaml index 60ac7b9e0f..1193681df4 100644 --- a/mods/d2k/maps/oasis-conquest/map.yaml +++ b/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: diff --git a/mods/d2k/maps/pasty-mesa/map.yaml b/mods/d2k/maps/pasty-mesa/map.yaml index ae82952d9b..991fd4985b 100644 --- a/mods/d2k/maps/pasty-mesa/map.yaml +++ b/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: diff --git a/mods/d2k/maps/shellmap/map.yaml b/mods/d2k/maps/shellmap/map.yaml index 2bb6499885..791822c3df 100644 --- a/mods/d2k/maps/shellmap/map.yaml +++ b/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 diff --git a/mods/d2k/maps/the-duell.oramap b/mods/d2k/maps/the-duell.oramap index 2bf820c7c5..33023d2e46 100644 Binary files a/mods/d2k/maps/the-duell.oramap and b/mods/d2k/maps/the-duell.oramap differ diff --git a/mods/d2k/maps/tucks-sietch.oramap b/mods/d2k/maps/tucks-sietch.oramap index 0863f77e37..4eecfe32d1 100644 Binary files a/mods/d2k/maps/tucks-sietch.oramap and b/mods/d2k/maps/tucks-sietch.oramap differ diff --git a/mods/d2k/maps/venac-ditch.oramap b/mods/d2k/maps/venac-ditch.oramap index 1ed88ac3ba..b3d11bd546 100644 Binary files a/mods/d2k/maps/venac-ditch.oramap and b/mods/d2k/maps/venac-ditch.oramap differ diff --git a/mods/d2k/maps/vladimirs-folly.oramap b/mods/d2k/maps/vladimirs-folly.oramap index effe83a196..a88e6e772e 100644 Binary files a/mods/d2k/maps/vladimirs-folly.oramap and b/mods/d2k/maps/vladimirs-folly.oramap differ diff --git a/mods/ra/maps/Sahara.oramap b/mods/ra/maps/Sahara.oramap index f08f88c08c..bdfef7d7d9 100644 Binary files a/mods/ra/maps/Sahara.oramap and b/mods/ra/maps/Sahara.oramap differ diff --git a/mods/ra/maps/a-path-beyond.oramap b/mods/ra/maps/a-path-beyond.oramap index d5ee3a0668..68e6ace503 100644 Binary files a/mods/ra/maps/a-path-beyond.oramap and b/mods/ra/maps/a-path-beyond.oramap differ diff --git a/mods/ra/maps/alaska-anarchy-redux.oramap b/mods/ra/maps/alaska-anarchy-redux.oramap index ee3092bef9..715bb935cb 100644 Binary files a/mods/ra/maps/alaska-anarchy-redux.oramap and b/mods/ra/maps/alaska-anarchy-redux.oramap differ diff --git a/mods/ra/maps/all-connected.oramap b/mods/ra/maps/all-connected.oramap index fbe5fc38df..287d661e0a 100644 Binary files a/mods/ra/maps/all-connected.oramap and b/mods/ra/maps/all-connected.oramap differ diff --git a/mods/ra/maps/allies-01/map.yaml b/mods/ra/maps/allies-01/map.yaml index f6d09254d6..5d81bc0de3 100644 --- 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 diff --git a/mods/ra/maps/allies-02/map.yaml b/mods/ra/maps/allies-02/map.yaml index 1d918f7fe2..a63ff33729 100644 --- 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 diff --git a/mods/ra/maps/allies-03a/map.yaml b/mods/ra/maps/allies-03a/map.yaml index 3771f96b66..414d0613e7 100644 --- 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 diff --git a/mods/ra/maps/allies-03b/map.yaml b/mods/ra/maps/allies-03b/map.yaml index 5740bc6431..efefa00743 100644 --- 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 diff --git a/mods/ra/maps/allies-05a/map.yaml b/mods/ra/maps/allies-05a/map.yaml index cf66949521..a10535ad54 100644 --- 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 diff --git a/mods/ra/maps/arctic-triangle-affair.oramap b/mods/ra/maps/arctic-triangle-affair.oramap index 498a750b6f..0275a3758d 100644 Binary files a/mods/ra/maps/arctic-triangle-affair.oramap and b/mods/ra/maps/arctic-triangle-affair.oramap differ diff --git a/mods/ra/maps/asymetric-battle.oramap b/mods/ra/maps/asymetric-battle.oramap index 3a9e33a12c..89157222a9 100644 Binary files a/mods/ra/maps/asymetric-battle.oramap and b/mods/ra/maps/asymetric-battle.oramap differ diff --git a/mods/ra/maps/bad-neighbors.oramap b/mods/ra/maps/bad-neighbors.oramap index 0047b602d7..47c8f23fae 100644 Binary files a/mods/ra/maps/bad-neighbors.oramap and b/mods/ra/maps/bad-neighbors.oramap differ diff --git a/mods/ra/maps/blitzkrieg.oramap b/mods/ra/maps/blitzkrieg.oramap index 89a74cd0ab..b73bac6e0a 100644 Binary files a/mods/ra/maps/blitzkrieg.oramap and b/mods/ra/maps/blitzkrieg.oramap differ diff --git a/mods/ra/maps/bloody-delta.oramap b/mods/ra/maps/bloody-delta.oramap index f5366e1169..22b9f81b7d 100644 Binary files a/mods/ra/maps/bloody-delta.oramap and b/mods/ra/maps/bloody-delta.oramap differ diff --git a/mods/ra/maps/bombardment-islands.oramap b/mods/ra/maps/bombardment-islands.oramap index d0601190eb..1e179c9255 100644 Binary files a/mods/ra/maps/bombardment-islands.oramap and b/mods/ra/maps/bombardment-islands.oramap differ diff --git a/mods/ra/maps/bomber-john/map.yaml b/mods/ra/maps/bomber-john/map.yaml index 03495c3d58..4a0036553f 100644 --- 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: diff --git a/mods/ra/maps/breaking-point.oramap b/mods/ra/maps/breaking-point.oramap index 46d1baec05..e9358db2b9 100644 Binary files a/mods/ra/maps/breaking-point.oramap and b/mods/ra/maps/breaking-point.oramap differ diff --git a/mods/ra/maps/burlesca/map.yaml b/mods/ra/maps/burlesca/map.yaml index 4b20ca2d9b..549f558b23 100644 --- 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: diff --git a/mods/ra/maps/caffeinated.oramap b/mods/ra/maps/caffeinated.oramap index d757ef5678..c9bf12b86b 100644 Binary files a/mods/ra/maps/caffeinated.oramap and b/mods/ra/maps/caffeinated.oramap differ diff --git a/mods/ra/maps/calm-before-storm.oramap b/mods/ra/maps/calm-before-storm.oramap index f48ea67f9d..49f141b7a0 100644 Binary files a/mods/ra/maps/calm-before-storm.oramap and b/mods/ra/maps/calm-before-storm.oramap differ diff --git a/mods/ra/maps/center-of-attention-redux-2/map.yaml b/mods/ra/maps/center-of-attention-redux-2/map.yaml index 1a067cea68..6fc7d42db9 100644 --- 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: diff --git a/mods/ra/maps/central-conflict.oramap b/mods/ra/maps/central-conflict.oramap index 60088619d6..ef7bbd86d4 100644 Binary files a/mods/ra/maps/central-conflict.oramap and b/mods/ra/maps/central-conflict.oramap differ diff --git a/mods/ra/maps/chaos-canyon.oramap b/mods/ra/maps/chaos-canyon.oramap index 8a63576365..06fb3702f5 100644 Binary files a/mods/ra/maps/chaos-canyon.oramap and b/mods/ra/maps/chaos-canyon.oramap differ diff --git a/mods/ra/maps/chokepoint.oramap b/mods/ra/maps/chokepoint.oramap index 128b76c678..8dc6a0a833 100644 Binary files a/mods/ra/maps/chokepoint.oramap and b/mods/ra/maps/chokepoint.oramap differ diff --git a/mods/ra/maps/coastal-influence.oramap b/mods/ra/maps/coastal-influence.oramap index 928e6d48db..80fca440cb 100644 Binary files a/mods/ra/maps/coastal-influence.oramap and b/mods/ra/maps/coastal-influence.oramap differ diff --git a/mods/ra/maps/contact.oramap b/mods/ra/maps/contact.oramap index f538b51551..decf2f4fa9 100644 Binary files a/mods/ra/maps/contact.oramap and b/mods/ra/maps/contact.oramap differ diff --git a/mods/ra/maps/desert-shellmap/map.yaml b/mods/ra/maps/desert-shellmap/map.yaml index 816f9062a8..664d90db32 100644 --- 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 diff --git a/mods/ra/maps/doubles.oramap b/mods/ra/maps/doubles.oramap index f62f412535..5d480b8ba7 100644 Binary files a/mods/ra/maps/doubles.oramap and b/mods/ra/maps/doubles.oramap differ diff --git a/mods/ra/maps/doughnut.oramap b/mods/ra/maps/doughnut.oramap index 52c4b7c71b..f1d8e89a52 100644 Binary files a/mods/ra/maps/doughnut.oramap and b/mods/ra/maps/doughnut.oramap differ diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml index b0ac6bc37a..de6db7ac81 100644 --- 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: diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index a7eaf5c504..4d47be0ff6 100644 --- 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: diff --git a/mods/ra/maps/drop-zone/map.yaml b/mods/ra/maps/drop-zone/map.yaml index 5fd67493e9..ab0414a3ee 100644 --- 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: diff --git a/mods/ra/maps/east-vs-west.oramap b/mods/ra/maps/east-vs-west.oramap index dcd74c479a..014d01b2b3 100644 Binary files a/mods/ra/maps/east-vs-west.oramap and b/mods/ra/maps/east-vs-west.oramap differ diff --git a/mods/ra/maps/encounter.oramap b/mods/ra/maps/encounter.oramap index 214e3f1f80..a0a313ffae 100644 Binary files a/mods/ra/maps/encounter.oramap and b/mods/ra/maps/encounter.oramap differ diff --git a/mods/ra/maps/engagement.oramap b/mods/ra/maps/engagement.oramap index 95f3ec2e47..133ce6db25 100644 Binary files a/mods/ra/maps/engagement.oramap and b/mods/ra/maps/engagement.oramap differ diff --git a/mods/ra/maps/equal-opportunity.oramap b/mods/ra/maps/equal-opportunity.oramap index 79b4cbf49e..b4be9a297a 100644 Binary files a/mods/ra/maps/equal-opportunity.oramap and b/mods/ra/maps/equal-opportunity.oramap differ diff --git a/mods/ra/maps/first-come-first-served.oramap b/mods/ra/maps/first-come-first-served.oramap index 1d473b4c6b..3066fb910f 100644 Binary files a/mods/ra/maps/first-come-first-served.oramap and b/mods/ra/maps/first-come-first-served.oramap differ diff --git a/mods/ra/maps/forest-path.oramap b/mods/ra/maps/forest-path.oramap index e8460ecf6f..9f9b713286 100644 Binary files a/mods/ra/maps/forest-path.oramap and b/mods/ra/maps/forest-path.oramap differ diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml index 71d8d667d0..2d462ee672 100644 --- 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 diff --git a/mods/ra/maps/ghost-town.oramap b/mods/ra/maps/ghost-town.oramap index fe38074080..c56c9b58b6 100644 Binary files a/mods/ra/maps/ghost-town.oramap and b/mods/ra/maps/ghost-town.oramap differ diff --git a/mods/ra/maps/haos-ridges.oramap b/mods/ra/maps/haos-ridges.oramap index 9b085215f2..12e0da1779 100644 Binary files a/mods/ra/maps/haos-ridges.oramap and b/mods/ra/maps/haos-ridges.oramap differ diff --git a/mods/ra/maps/high-and-low-extended.oramap b/mods/ra/maps/high-and-low-extended.oramap index ff795ef6c6..8005fc1a80 100644 Binary files a/mods/ra/maps/high-and-low-extended.oramap and b/mods/ra/maps/high-and-low-extended.oramap differ diff --git a/mods/ra/maps/high-and-low.oramap b/mods/ra/maps/high-and-low.oramap index 4a8a9553e1..4e2117f891 100644 Binary files a/mods/ra/maps/high-and-low.oramap and b/mods/ra/maps/high-and-low.oramap differ diff --git a/mods/ra/maps/intervention/map.yaml b/mods/ra/maps/intervention/map.yaml index 1701f34bb6..dceee72b0e 100644 --- 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 diff --git a/mods/ra/maps/island-hoppers.oramap b/mods/ra/maps/island-hoppers.oramap index cbf675ef11..8f8bfe163b 100644 Binary files a/mods/ra/maps/island-hoppers.oramap and b/mods/ra/maps/island-hoppers.oramap differ diff --git a/mods/ra/maps/keep-off-the-grass-2.oramap b/mods/ra/maps/keep-off-the-grass-2.oramap index c09aaf7190..46fb5e7e2e 100644 Binary files a/mods/ra/maps/keep-off-the-grass-2.oramap and b/mods/ra/maps/keep-off-the-grass-2.oramap differ diff --git a/mods/ra/maps/koth-hopes-anchor/map.yaml b/mods/ra/maps/koth-hopes-anchor/map.yaml index dfa0317730..d413d0e478 100644 --- 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: diff --git a/mods/ra/maps/man-to-man.oramap b/mods/ra/maps/man-to-man.oramap index 5474d8060f..8116d6d60c 100644 Binary files a/mods/ra/maps/man-to-man.oramap and b/mods/ra/maps/man-to-man.oramap differ diff --git a/mods/ra/maps/marooned-2.oramap b/mods/ra/maps/marooned-2.oramap index 63c3bdb5c0..b18f4c6990 100644 Binary files a/mods/ra/maps/marooned-2.oramap and b/mods/ra/maps/marooned-2.oramap differ diff --git a/mods/ra/maps/mass-confliction.oramap b/mods/ra/maps/mass-confliction.oramap index 5bf9680bce..a4a92204b7 100644 Binary files a/mods/ra/maps/mass-confliction.oramap and b/mods/ra/maps/mass-confliction.oramap differ diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml index 6f9dbcc37a..df78d0750d 100644 --- 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: diff --git a/mods/ra/maps/north-by-northwest.oramap b/mods/ra/maps/north-by-northwest.oramap index 46a0536062..7f98d1f2d3 100644 Binary files a/mods/ra/maps/north-by-northwest.oramap and b/mods/ra/maps/north-by-northwest.oramap differ diff --git a/mods/ra/maps/ore-lord.oramap b/mods/ra/maps/ore-lord.oramap index bd9c253ee0..130d58bb0f 100644 Binary files a/mods/ra/maps/ore-lord.oramap and b/mods/ra/maps/ore-lord.oramap differ diff --git a/mods/ra/maps/pearly-wastelands.oramap b/mods/ra/maps/pearly-wastelands.oramap index 7b33edc5c2..883486d44c 100644 Binary files a/mods/ra/maps/pearly-wastelands.oramap and b/mods/ra/maps/pearly-wastelands.oramap differ diff --git a/mods/ra/maps/poland-raid/map.yaml b/mods/ra/maps/poland-raid/map.yaml index f03de45450..568bfa226b 100644 --- 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: diff --git a/mods/ra/maps/pressure.oramap b/mods/ra/maps/pressure.oramap index 4a79dd5a7e..7f3375c8ef 100644 Binary files a/mods/ra/maps/pressure.oramap and b/mods/ra/maps/pressure.oramap differ diff --git a/mods/ra/maps/puddles-redux.oramap b/mods/ra/maps/puddles-redux.oramap index 69eafc7ae5..3e9cf86823 100644 Binary files a/mods/ra/maps/puddles-redux.oramap and b/mods/ra/maps/puddles-redux.oramap differ diff --git a/mods/ra/maps/raraku.oramap b/mods/ra/maps/raraku.oramap index e1918fe7d6..70e45a42ac 100644 Binary files a/mods/ra/maps/raraku.oramap and b/mods/ra/maps/raraku.oramap differ diff --git a/mods/ra/maps/regeneration-basin.oramap b/mods/ra/maps/regeneration-basin.oramap index df4b6b2e4f..23d0c8cf3c 100644 Binary files a/mods/ra/maps/regeneration-basin.oramap and b/mods/ra/maps/regeneration-basin.oramap differ diff --git a/mods/ra/maps/ring-of-fire.oramap b/mods/ra/maps/ring-of-fire.oramap index a07ce2de00..284939ed73 100644 Binary files a/mods/ra/maps/ring-of-fire.oramap and b/mods/ra/maps/ring-of-fire.oramap differ diff --git a/mods/ra/maps/seaside-2.oramap b/mods/ra/maps/seaside-2.oramap index c4b9973ea8..c62921ee57 100644 Binary files a/mods/ra/maps/seaside-2.oramap and b/mods/ra/maps/seaside-2.oramap differ diff --git a/mods/ra/maps/singles.oramap b/mods/ra/maps/singles.oramap index b4703fca2c..399916b6c4 100644 Binary files a/mods/ra/maps/singles.oramap and b/mods/ra/maps/singles.oramap differ diff --git a/mods/ra/maps/snow town.oramap b/mods/ra/maps/snow town.oramap index de6566c67a..b99cb56e82 100644 Binary files a/mods/ra/maps/snow town.oramap and b/mods/ra/maps/snow town.oramap differ diff --git a/mods/ra/maps/snowy-island.oramap b/mods/ra/maps/snowy-island.oramap index 3541055a3d..7cc5601d9c 100644 Binary files a/mods/ra/maps/snowy-island.oramap and b/mods/ra/maps/snowy-island.oramap differ diff --git a/mods/ra/maps/snowyridge.oramap b/mods/ra/maps/snowyridge.oramap index 79d54522f5..dc22a4cb16 100644 Binary files a/mods/ra/maps/snowyridge.oramap and b/mods/ra/maps/snowyridge.oramap differ diff --git a/mods/ra/maps/soviet-01/map.yaml b/mods/ra/maps/soviet-01/map.yaml index 069bb2db6b..d5e2242907 100644 --- 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 diff --git a/mods/ra/maps/soviet-02a/map.yaml b/mods/ra/maps/soviet-02a/map.yaml index e4d4ee055b..65eb85be4a 100644 --- 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 diff --git a/mods/ra/maps/soviet-05/map.yaml b/mods/ra/maps/soviet-05/map.yaml index b085344d63..2b027609f2 100644 --- 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: @@ -741,4 +742,4 @@ Voices: Notifications: -Translations: \ No newline at end of file +Translations: diff --git a/mods/ra/maps/styrian-mountains.oramap b/mods/ra/maps/styrian-mountains.oramap index 973f56c5bc..3119e67781 100644 Binary files a/mods/ra/maps/styrian-mountains.oramap and b/mods/ra/maps/styrian-mountains.oramap differ diff --git a/mods/ra/maps/suffrage.oramap b/mods/ra/maps/suffrage.oramap index 9427dd5263..bace545280 100644 Binary files a/mods/ra/maps/suffrage.oramap and b/mods/ra/maps/suffrage.oramap differ diff --git a/mods/ra/maps/survival01/map.yaml b/mods/ra/maps/survival01/map.yaml index a548dad3ac..ae3252d6fc 100644 --- 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 diff --git a/mods/ra/maps/survival02/map.yaml b/mods/ra/maps/survival02/map.yaml index 469ba69653..eee39055e3 100644 --- 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 diff --git a/mods/ra/maps/synergy.oramap b/mods/ra/maps/synergy.oramap index eecff47cd3..94c718143e 100644 Binary files a/mods/ra/maps/synergy.oramap and b/mods/ra/maps/synergy.oramap differ diff --git a/mods/ra/maps/tainted-peak.oramap b/mods/ra/maps/tainted-peak.oramap index 2369256e3d..4071cfd95d 100644 Binary files a/mods/ra/maps/tainted-peak.oramap and b/mods/ra/maps/tainted-peak.oramap differ diff --git a/mods/ra/maps/temperal.oramap b/mods/ra/maps/temperal.oramap index 23629974c6..9a4bbf060d 100644 Binary files a/mods/ra/maps/temperal.oramap and b/mods/ra/maps/temperal.oramap differ diff --git a/mods/ra/maps/tournament-island.oramap b/mods/ra/maps/tournament-island.oramap index e0e18c8d04..90596eb192 100644 Binary files a/mods/ra/maps/tournament-island.oramap and b/mods/ra/maps/tournament-island.oramap differ diff --git a/mods/ra/maps/training-camp/map.yaml b/mods/ra/maps/training-camp/map.yaml index f1b078fc38..1519afd549 100644 --- 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: diff --git a/mods/ra/maps/vegetation.oramap b/mods/ra/maps/vegetation.oramap index 13f24e9f71..39296415c9 100644 Binary files a/mods/ra/maps/vegetation.oramap and b/mods/ra/maps/vegetation.oramap differ diff --git a/mods/ts/maps/arivruns/map.yaml b/mods/ts/maps/arivruns/map.yaml index 7b53f0454e..ff51d0a50a 100644 --- a/mods/ts/maps/arivruns/map.yaml +++ b/mods/ts/maps/arivruns/map.yaml @@ -27,41 +27,41 @@ Players: Name: Neutral OwnsWorld: True NonCombatant: True - Race: Random + Faction: Random PlayerReference@Creeps: Name: Creeps NonCombatant: True - Race: Random + Faction: Random Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5 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 Actors: diff --git a/mods/ts/maps/rivrrad4/map.yaml b/mods/ts/maps/rivrrad4/map.yaml index da4756f43f..6960937394 100644 --- a/mods/ts/maps/rivrrad4/map.yaml +++ b/mods/ts/maps/rivrrad4/map.yaml @@ -27,51 +27,51 @@ Players: Name: Neutral OwnsWorld: True NonCombatant: True - Race: Random + Faction: Random PlayerReference@Creeps: Name: Creeps NonCombatant: True - Race: Random + Faction: Random 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: diff --git a/mods/ts/maps/springs/map.yaml b/mods/ts/maps/springs/map.yaml index f71fa21ffc..29e4750b6f 100644 --- a/mods/ts/maps/springs/map.yaml +++ b/mods/ts/maps/springs/map.yaml @@ -27,21 +27,21 @@ Players: Name: Neutral OwnsWorld: True NonCombatant: True - Race: Random + Faction: Random PlayerReference@Creeps: Name: Creeps NonCombatant: True - Race: Random + Faction: Random Enemies: Multi0, Multi1 PlayerReference@Multi0: Name: Multi0 Playable: True - Race: Random + Faction: Random Enemies: Creeps PlayerReference@Multi1: Name: Multi1 Playable: True - Race: Random + Faction: Random Enemies: Creeps Actors: diff --git a/mods/ts/maps/tread_l/map.yaml b/mods/ts/maps/tread_l/map.yaml index 303345255c..4a6fe1ba1b 100644 --- a/mods/ts/maps/tread_l/map.yaml +++ b/mods/ts/maps/tread_l/map.yaml @@ -27,51 +27,51 @@ Players: Name: Neutral OwnsWorld: True NonCombatant: True - Race: Random + Faction: Random PlayerReference@Creeps: Name: Creeps NonCombatant: True - Race: Random + Faction: Random 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: