diff --git a/mods/ra/maps/bomber-john/map.yaml b/mods/ra/maps/bomber-john/map.yaml index 8925d30fab..fd882bd517 100644 --- a/mods/ra/maps/bomber-john/map.yaml +++ b/mods/ra/maps/bomber-john/map.yaml @@ -26,7 +26,7 @@ Players: Name: Creeps NonCombatant: True Faction: allies - Enemies: Creeps + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7 PlayerReference@Multi0: Name: Multi0 Playable: True 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 84b9ad5cea..b62a5c6dc3 100644 --- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml +++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml @@ -22,66 +22,54 @@ Players: OwnsWorld: True NonCombatant: True Faction: allies - PlayerReference@Creeps: - Name: Creeps - NonCombatant: True - Faction: allies PlayerReference@Multi0: Name: Multi0 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi1: Name: Multi1 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi2: Name: Multi2 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi3: Name: Multi3 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi4: Name: Multi4 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi5: Name: Multi5 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi6: Name: Multi6 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi7: Name: Multi7 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps Actors: Actor0: apc diff --git a/mods/ra/maps/drop-zone/map.yaml b/mods/ra/maps/drop-zone/map.yaml index cf06be842d..9afb4fe2c7 100644 --- a/mods/ra/maps/drop-zone/map.yaml +++ b/mods/ra/maps/drop-zone/map.yaml @@ -22,66 +22,54 @@ Players: OwnsWorld: True NonCombatant: True Faction: allies - PlayerReference@Creeps: - Name: Creeps - NonCombatant: True - Faction: allies PlayerReference@Multi0: Name: Multi0 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi1: Name: Multi1 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi2: Name: Multi2 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi3: Name: Multi3 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi4: Name: Multi4 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi5: Name: Multi5 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi6: Name: Multi6 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi7: Name: Multi7 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps Actors: Actor0: apc diff --git a/mods/ra/maps/soviet-02b/map.yaml b/mods/ra/maps/soviet-02b/map.yaml index a9c696dc2d..7834dd3019 100644 --- a/mods/ra/maps/soviet-02b/map.yaml +++ b/mods/ra/maps/soviet-02b/map.yaml @@ -27,6 +27,7 @@ Players: PlayerReference@Creeps: Name: Creeps NonCombatant: True + Enemies: USSR PlayerReference@Germany: Name: Germany Faction: allies diff --git a/mods/ra/maps/soviet-03/map.yaml b/mods/ra/maps/soviet-03/map.yaml index e26c6aa5a0..03848436b8 100644 --- a/mods/ra/maps/soviet-03/map.yaml +++ b/mods/ra/maps/soviet-03/map.yaml @@ -27,6 +27,7 @@ Players: PlayerReference@Creeps: Name: Creeps NonCombatant: True + Enemies: Germany, USSR PlayerReference@England: Name: England Faction: allies diff --git a/mods/ra/maps/soviet-04a/map.yaml b/mods/ra/maps/soviet-04a/map.yaml index 362901b0b6..fd00636bbc 100644 --- a/mods/ra/maps/soviet-04a/map.yaml +++ b/mods/ra/maps/soviet-04a/map.yaml @@ -29,10 +29,6 @@ Players: Faction: england Allies: Greece Enemies: USSR - PlayerReference@Creeps: - Name: Creeps - NonCombatant: True - Faction: england PlayerReference@Greece: Name: Greece Faction: allies diff --git a/mods/ra/maps/soviet-04b/map.yaml b/mods/ra/maps/soviet-04b/map.yaml index b8749dd362..7f48181e4e 100644 --- a/mods/ra/maps/soviet-04b/map.yaml +++ b/mods/ra/maps/soviet-04b/map.yaml @@ -29,10 +29,6 @@ Players: Faction: england Allies: Greece Enemies: USSR - PlayerReference@Creeps: - Name: Creeps - NonCombatant: True - Faction: england PlayerReference@Greece: Name: Greece Faction: allies diff --git a/mods/ra/maps/soviet-05/map.yaml b/mods/ra/maps/soviet-05/map.yaml index 7356e317a1..aa030a9fde 100644 --- a/mods/ra/maps/soviet-05/map.yaml +++ b/mods/ra/maps/soviet-05/map.yaml @@ -24,10 +24,6 @@ Players: OwnsWorld: True NonCombatant: True Faction: england - PlayerReference@Creeps: - Name: Creeps - NonCombatant: True - Faction: england PlayerReference@Greece: Name: Greece Faction: allies diff --git a/mods/ra/maps/soviet-06a/map.yaml b/mods/ra/maps/soviet-06a/map.yaml index 6571ce0ece..d6033d5b0d 100644 --- a/mods/ra/maps/soviet-06a/map.yaml +++ b/mods/ra/maps/soviet-06a/map.yaml @@ -24,9 +24,6 @@ Players: OwnsWorld: True NonCombatant: True Faction: allies - PlayerReference@Creeps: - Name: Creeps - NonCombatant: True PlayerReference@Greece: Name: Greece Faction: allies @@ -43,7 +40,7 @@ Players: Color: FE1100 LockSpawn: True LockTeam: True - Enemies: Greece, Creeps + Enemies: Greece Actors: Actor0: cycl diff --git a/mods/ra/maps/soviet-06b/map.yaml b/mods/ra/maps/soviet-06b/map.yaml index 6f78fe29e2..8cde2d6e86 100644 --- a/mods/ra/maps/soviet-06b/map.yaml +++ b/mods/ra/maps/soviet-06b/map.yaml @@ -24,9 +24,6 @@ Players: OwnsWorld: True NonCombatant: True Faction: allies - PlayerReference@Creeps: - Name: Creeps - NonCombatant: True PlayerReference@Greece: Name: Greece Faction: allies @@ -43,7 +40,7 @@ Players: Color: FE1100 LockSpawn: True LockTeam: True - Enemies: Greece, Creeps + Enemies: Greece Actors: Actor0: cycl diff --git a/mods/ra/maps/soviet-07/map.yaml b/mods/ra/maps/soviet-07/map.yaml index ac5371d59a..8b9ef9d4dd 100644 --- a/mods/ra/maps/soviet-07/map.yaml +++ b/mods/ra/maps/soviet-07/map.yaml @@ -28,6 +28,7 @@ Players: Name: Creeps NonCombatant: True Faction: england + Enemies: Greece, USSR PlayerReference@Greece: Name: Greece Faction: allies diff --git a/mods/ra/maps/training-camp/map.yaml b/mods/ra/maps/training-camp/map.yaml index b600a9be95..56056c284c 100644 --- a/mods/ra/maps/training-camp/map.yaml +++ b/mods/ra/maps/training-camp/map.yaml @@ -22,66 +22,54 @@ Players: OwnsWorld: True NonCombatant: True Faction: allies - PlayerReference@Creeps: - Name: Creeps - NonCombatant: True - Faction: allies PlayerReference@Multi0: Name: Multi0 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi1: Name: Multi1 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi2: Name: Multi2 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi3: Name: Multi3 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi4: Name: Multi4 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi5: Name: Multi5 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi6: Name: Multi6 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps PlayerReference@Multi7: Name: Multi7 Playable: True AllowBots: False LockFaction: True Faction: soviet - Enemies: Creeps Actors: Actor93: barr