Merge pull request #6217 from Mailaender/starting-units-classname

Fixed lobby start unit notifications not showing class names
This commit is contained in:
Paul Chote
2014-08-19 10:15:12 +12:00
14 changed files with 111 additions and 46 deletions

View File

@@ -152,6 +152,7 @@ ServerTraits:
LobbyCommands
PlayerPinger
MasterServerPinger
LobbySettingsNotification
LobbyDefaults:
AllowCheats: false

View File

@@ -130,50 +130,60 @@ World:
CreateMPPlayers:
MPStartUnits@mcvonly:
Class: none
ClassName: MCV Only
Races: gdi, nod
BaseActor: mcv
MPStartUnits@defaultgdia:
Class: light
ClassName: Light Support
Races: gdi
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e1,e3,e3,jeep
MPStartUnits@defaultgdib:
Class: light
ClassName: Light Support
Races: gdi
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e1,e1,e3,apc
MPStartUnits@defaultnoda:
Class: light
ClassName: Light Support
Races: nod
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e3,bggy,bike
MPStartUnits@defaultnodb:
Class: light
ClassName: Light Support
Races: nod
BaseActor: mcv
SupportActors: e1,e1,e1,e3,e3,e3,bggy
MPStartUnits@defaultnodc:
Class: light
ClassName: Light Support
Races: nod
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e1,e1,e1,e3,bike
MPStartUnits@heavynoda:
Class: heavy
ClassName: Heavy Support
Races: nod
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e3,e3,ltnk,ltnk,ftnk
MPStartUnits@heavynodb:
Class: heavy
ClassName: Heavy Support
Races: nod
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e1,e3,e3,e3,ftnk,ftnk
MPStartUnits@heavygdia:
Class: heavy
ClassName: Heavy Support
Races: gdi
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e3,e3,jeep,mtnk,mtnk
MPStartUnits@heavygdib:
Class: heavy
ClassName: Heavy Support
Races: gdi
BaseActor: mcv
SupportActors: e1,e1,e1,e1,e1,e2,e2,e2,e3,e3,apc,mtnk

View File

@@ -134,6 +134,7 @@ ServerTraits:
LobbyCommands
PlayerPinger
MasterServerPinger
LobbySettingsNotification
LobbyDefaults:
AllowCheats: false

View File

@@ -132,18 +132,22 @@ World:
MPStartLocations:
MPStartUnits@mcvatreides:
Class: none
ClassName: MCV Only
Races: atreides
BaseActor: mcva
MPStartUnits@mcvharkonnen:
Class: none
Races: harkonnen
ClassName: MCV Only
BaseActor: mcvh
MPStartUnits@mcvordos:
Class: none
ClassName: MCV Only
Races: ordos
BaseActor: mcvo
MPStartUnits@lightatreides:
Class: light
ClassName: Light Support
Races: atreides
BaseActor: mcva
SupportActors: rifle, rifle, bazooka, trike, quad
@@ -151,6 +155,7 @@ World:
OuterSupportRadius: 5
MPStartUnits@lightharkonnen:
Class: light
ClassName: Light Support
Races: harkonnen
BaseActor: mcvh
SupportActors: rifle, bazooka, grenadier, trike, quad
@@ -158,6 +163,7 @@ World:
OuterSupportRadius: 5
MPStartUnits@lightordos:
Class: light
ClassName: Light Support
Races: ordos
BaseActor: mcvo
SupportActors: rifle, rifle, engineer, raider, quad
@@ -165,6 +171,7 @@ World:
OuterSupportRadius: 5
MPStartUnits@heavyatreides:
Class: heavy
ClassName: Heavy Support
Races: atreides
BaseActor: mcva
SupportActors: rifle, bazooka, grenadier, trike, combata, missiletank
@@ -172,6 +179,7 @@ World:
OuterSupportRadius: 5
MPStartUnits@heavyharkonnen:
Class: heavy
ClassName: Heavy Support
Races: harkonnen
BaseActor: mcvh
SupportActors: rifle, bazooka, engineer, quad, combath, siegetank
@@ -179,6 +187,7 @@ World:
OuterSupportRadius: 5
MPStartUnits@heavyordos:
Class: heavy
ClassName: Heavy Support
Races: ordos
BaseActor: mcvo
SupportActors: rifle, bazooka, engineer, raider, combato, missiletank

View File

@@ -150,6 +150,7 @@ ServerTraits:
LobbyCommands
PlayerPinger
MasterServerPinger
LobbySettingsNotification
LobbyDefaults:
AllowCheats: false

View File

@@ -137,10 +137,12 @@ World:
CreateMPPlayers:
MPStartUnits@mcvonly:
Class: none
ClassName: MCV Only
Races: soviet, allies
BaseActor: mcv
MPStartUnits@lightallies:
Class: light
ClassName: Light Support
Races: allies
BaseActor: mcv
SupportActors: e1,e1,e1,e3,e3,jeep,1tnk
@@ -148,6 +150,7 @@ World:
OuterSupportRadius: 5
MPStartUnits@lightsoviet:
Class: light
ClassName: Light Support
Races: soviet
BaseActor: mcv
SupportActors: e1,e1,e1,e3,e3,apc,ftrk
@@ -155,6 +158,7 @@ World:
OuterSupportRadius: 5
MPStartUnits@heavyallies:
Class: heavy
ClassName: Heavy Support
Races: allies
BaseActor: mcv
SupportActors: e1,e1,e1,e3,e3,jeep,1tnk,2tnk,2tnk,2tnk
@@ -162,6 +166,7 @@ World:
OuterSupportRadius: 5
MPStartUnits@heavysoviet:
Class: heavy
ClassName: Heavy Support
Races: soviet
BaseActor: mcv
SupportActors: e1,e1,e1,e3,e3,apc,ftrk,3tnk,3tnk

View File

@@ -179,6 +179,7 @@ ServerTraits:
LobbyCommands
PlayerPinger
MasterServerPinger
LobbySettingsNotification
LobbyDefaults:
AllowCheats: true

View File

@@ -132,10 +132,13 @@ World:
SpawnMapActors:
CreateMPPlayers:
MPStartUnits@MCV:
Class: none
ClassName: MCV Only
Races: gdi, nod
BaseActor: mcv
MPStartUnits@TEST:
Class: heavy
ClassName: Heavy Support
Races: gdi,nod
BaseActor: mcv
SupportActors: e1,e2,e3,cyborg,cyc2,jumpjet,umagon,ghost,mmch,smech,hmec,bggy,bike,art2,ttnk,hvr,sonic,subtank,repair,4tnk