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 4fc30fa115..1db802e6ab 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 4b50e2f691..04745b5ce6 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 e5ae9d780d..61df72c4b9 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 04ffff3df0..cf4b21c8b3 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 04b1f09955..f29b1b3f5f 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 3f5d08e75e..94824e8394 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