Merge pull request #11163 from reaperrr/fix-11056

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
30 changed files with 6 additions and 57 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -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

Binary file not shown.

View File

@@ -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

View File

@@ -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

Binary file not shown.

Binary file not shown.

View File

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

View File

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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

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

Binary file not shown.

Binary file not shown.

View File

@@ -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

Binary file not shown.