Fixed Creeps on non-Conquest RA maps

2016-04-23 14:42:52 +02:00
parent f1f8cc8763
commit 8bb2574e21
12 changed files with 6 additions and 57 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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