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 93e882740c..ff6f3b15e0 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 8a350ccf64..71521f6d9b 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 b88f777d1e..304ee83278 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 e0612e91f2..58a71df3eb 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 c63f3f55bf..90983b0b5c 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 abb91362a3..0e91aad7b1 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 510093acc9..2ee44214f1 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 4659bdfc18..54387223dd 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 d80299897b..7df3e4ad81 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 387a6fb8ff..bf8f70d9d7 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 cb756333a9..8a36d51a20 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 644728419c..4002df1bb5 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 dfb3ef6411..ad5b4c5a4f 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 6e64d0d6b2..3528400713 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 17eb11a634..2efe1e9aee 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 9565289096..3efa9ddbae 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 d30094141a..d1d53e488e 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 0975a13452..5937318a79 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 67d197cce7..59bfc9c883 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 32df9a1ded..95825a1c20 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 2596ac7b31..3988b4c86e 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