epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11163 from reaperrr/fix-11056

Browse Source 
Fix Creeps not considering players as enemies on some TD maps
This commit is contained in:
Paul Chote
2016-04-24 11:51:49 +01:00
parent eae96738b9 6f876e7441
commit b245e6e128
30 changed files with 6 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
mods/cnc/maps/_lostsouls.oramap
View File

Binary file not shown.

BIN
mods/cnc/maps/aggressivetendencies.oramap
View File

Binary file not shown.

BIN
mods/cnc/maps/escalations.oramap
View File

Binary file not shown.

BIN
mods/cnc/maps/llamas2.oramap
View File

Binary file not shown.

BIN
mods/cnc/maps/sandstorm.oramap
View File

Binary file not shown.

BIN
mods/cnc/maps/sea_and_cake.oramap
View File

Binary file not shown.

BIN
mods/cnc/maps/tiberium-oasis-cluster.oramap
View File

Binary file not shown.

BIN
mods/cnc/maps/vectorsofbattle.oramap
View File

Binary file not shown.

BIN
mods/ra/maps/alaska-anarchy-redux.oramap
View File

Binary file not shown.

BIN
mods/ra/maps/barracuda.oramap
View File

Binary file not shown.

BIN
mods/ra/maps/behind-the-veil.oramap
View File

Binary file not shown.

BIN
mods/ra/maps/bloody-delta.oramap
View File

Binary file not shown.

2
mods/ra/maps/bomber-john/map.yaml
View File

@@ -26,7 +26,7 @@ Players:
Name: Creeps Name: Creeps
NonCombatant: True NonCombatant: True
Faction: allies Faction: allies
Enemies: Creeps Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7
PlayerReference@Multi0: PlayerReference@Multi0:
Name: Multi0 Name: Multi0
Playable: True Playable: True

BIN
mods/ra/maps/cold-front.oramap
View File

Binary file not shown.

12
mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml
View File

@@ -22,66 +22,54 @@ Players:
OwnsWorld: True OwnsWorld: True
NonCombatant: True NonCombatant: True
Faction: allies Faction: allies
PlayerReference@Creeps:
Name: Creeps
NonCombatant: True
Faction: allies
PlayerReference@Multi0: PlayerReference@Multi0:
Name: Multi0 Name: Multi0
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi1: PlayerReference@Multi1:
Name: Multi1 Name: Multi1
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi2: PlayerReference@Multi2:
Name: Multi2 Name: Multi2
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi3: PlayerReference@Multi3:
Name: Multi3 Name: Multi3
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi4: PlayerReference@Multi4:
Name: Multi4 Name: Multi4
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi5: PlayerReference@Multi5:
Name: Multi5 Name: Multi5
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi6: PlayerReference@Multi6:
Name: Multi6 Name: Multi6
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi7: PlayerReference@Multi7:
Name: Multi7 Name: Multi7
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
Actors: Actors:
Actor0: apc Actor0: apc

12
mods/ra/maps/drop-zone/map.yaml
View File

@@ -22,66 +22,54 @@ Players:
OwnsWorld: True OwnsWorld: True
NonCombatant: True NonCombatant: True
Faction: allies Faction: allies
PlayerReference@Creeps:
Name: Creeps
NonCombatant: True
Faction: allies
PlayerReference@Multi0: PlayerReference@Multi0:
Name: Multi0 Name: Multi0
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi1: PlayerReference@Multi1:
Name: Multi1 Name: Multi1
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi2: PlayerReference@Multi2:
Name: Multi2 Name: Multi2
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi3: PlayerReference@Multi3:
Name: Multi3 Name: Multi3
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi4: PlayerReference@Multi4:
Name: Multi4 Name: Multi4
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi5: PlayerReference@Multi5:
Name: Multi5 Name: Multi5
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi6: PlayerReference@Multi6:
Name: Multi6 Name: Multi6
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi7: PlayerReference@Multi7:
Name: Multi7 Name: Multi7
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
Actors: Actors:
Actor0: apc Actor0: apc

BIN
mods/ra/maps/engagement.oramap
View File

Binary file not shown.

BIN
mods/ra/maps/mad-science.oramap
View File

Binary file not shown.

1
mods/ra/maps/soviet-02b/map.yaml
View File

@@ -27,6 +27,7 @@ Players:
PlayerReference@Creeps: PlayerReference@Creeps:
Name: Creeps Name: Creeps
NonCombatant: True NonCombatant: True
Enemies: USSR
PlayerReference@Germany: PlayerReference@Germany:
Name: Germany Name: Germany
Faction: allies Faction: allies

1
mods/ra/maps/soviet-03/map.yaml
View File

@@ -27,6 +27,7 @@ Players:
PlayerReference@Creeps: PlayerReference@Creeps:
Name: Creeps Name: Creeps
NonCombatant: True NonCombatant: True
Enemies: Germany, USSR
PlayerReference@England: PlayerReference@England:
Name: England Name: England
Faction: allies Faction: allies

4
mods/ra/maps/soviet-04a/map.yaml
View File

@@ -29,10 +29,6 @@ Players:
Faction: england Faction: england
Allies: Greece Allies: Greece
Enemies: USSR Enemies: USSR
PlayerReference@Creeps:
Name: Creeps
NonCombatant: True
Faction: england
PlayerReference@Greece: PlayerReference@Greece:
Name: Greece Name: Greece
Faction: allies Faction: allies

4
mods/ra/maps/soviet-04b/map.yaml
View File

@@ -29,10 +29,6 @@ Players:
Faction: england Faction: england
Allies: Greece Allies: Greece
Enemies: USSR Enemies: USSR
PlayerReference@Creeps:
Name: Creeps
NonCombatant: True
Faction: england
PlayerReference@Greece: PlayerReference@Greece:
Name: Greece Name: Greece
Faction: allies Faction: allies

4
mods/ra/maps/soviet-05/map.yaml
View File

@@ -24,10 +24,6 @@ Players:
OwnsWorld: True OwnsWorld: True
NonCombatant: True NonCombatant: True
Faction: england Faction: england
PlayerReference@Creeps:
Name: Creeps
NonCombatant: True
Faction: england
PlayerReference@Greece: PlayerReference@Greece:
Name: Greece Name: Greece
Faction: allies Faction: allies

5
mods/ra/maps/soviet-06a/map.yaml
View File

@@ -24,9 +24,6 @@ Players:
OwnsWorld: True OwnsWorld: True
NonCombatant: True NonCombatant: True
Faction: allies Faction: allies
PlayerReference@Creeps:
Name: Creeps
NonCombatant: True
PlayerReference@Greece: PlayerReference@Greece:
Name: Greece Name: Greece
Faction: allies Faction: allies
@@ -43,7 +40,7 @@ Players:
Color: FE1100 Color: FE1100
LockSpawn: True LockSpawn: True
LockTeam: True LockTeam: True
Enemies: Greece, Creeps Enemies: Greece
Actors: Actors:
Actor0: cycl Actor0: cycl

5
mods/ra/maps/soviet-06b/map.yaml
View File

@@ -24,9 +24,6 @@ Players:
OwnsWorld: True OwnsWorld: True
NonCombatant: True NonCombatant: True
Faction: allies Faction: allies
PlayerReference@Creeps:
Name: Creeps
NonCombatant: True
PlayerReference@Greece: PlayerReference@Greece:
Name: Greece Name: Greece
Faction: allies Faction: allies
@@ -43,7 +40,7 @@ Players:
Color: FE1100 Color: FE1100
LockSpawn: True LockSpawn: True
LockTeam: True LockTeam: True
Enemies: Greece, Creeps Enemies: Greece
Actors: Actors:
Actor0: cycl Actor0: cycl

1
mods/ra/maps/soviet-07/map.yaml
View File

@@ -28,6 +28,7 @@ Players:
Name: Creeps Name: Creeps
NonCombatant: True NonCombatant: True
Faction: england Faction: england
Enemies: Greece, USSR
PlayerReference@Greece: PlayerReference@Greece:
Name: Greece Name: Greece
Faction: allies Faction: allies

BIN
mods/ra/maps/sunstroke.oramap
View File

Binary file not shown.

BIN
mods/ra/maps/tabula-rasa.oramap
View File

Binary file not shown.

12
mods/ra/maps/training-camp/map.yaml
View File

@@ -22,66 +22,54 @@ Players:
OwnsWorld: True OwnsWorld: True
NonCombatant: True NonCombatant: True
Faction: allies Faction: allies
PlayerReference@Creeps:
Name: Creeps
NonCombatant: True
Faction: allies
PlayerReference@Multi0: PlayerReference@Multi0:
Name: Multi0 Name: Multi0
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi1: PlayerReference@Multi1:
Name: Multi1 Name: Multi1
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi2: PlayerReference@Multi2:
Name: Multi2 Name: Multi2
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi3: PlayerReference@Multi3:
Name: Multi3 Name: Multi3
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi4: PlayerReference@Multi4:
Name: Multi4 Name: Multi4
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi5: PlayerReference@Multi5:
Name: Multi5 Name: Multi5
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi6: PlayerReference@Multi6:
Name: Multi6 Name: Multi6
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
PlayerReference@Multi7: PlayerReference@Multi7:
Name: Multi7 Name: Multi7
Playable: True Playable: True
AllowBots: False AllowBots: False
LockFaction: True LockFaction: True
Faction: soviet Faction: soviet
Enemies: Creeps
Actors: Actors:
Actor93: barr Actor93: barr

BIN
mods/ra/maps/warwind.oramap
View File

Binary file not shown.