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

show a user friendly description of the starting unit template

Browse Source 
closes #6209
This commit is contained in:
Matthias Mailänder
2014-08-09 13:07:45 +02:00
parent 381505cd19
commit 24a3fd3196
7 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.RA/MPStartUnits.cs
View File

@@ -15,10 +15,19 @@ namespace OpenRA.Mods.RA
[Desc("Used by SpawnMPUnits. Attach these to the world actor. You can have multiple variants by adding @suffixes.")]
public class MPStartUnitsInfo : TraitInfo<MPStartUnits>
{
[Desc("Internal class ID.")]
public readonly string Class = "none";
[Desc("Exposed via the UI to the player.")]
public readonly string ClassName = "Unlabeled";
[Desc("Only available when selecting this faction.", "Leave empty for no restrictions.")]
public readonly string[] Races = { };
[Desc("The mobile construction vehicle.")]
public readonly string BaseActor = null;
[Desc("A group of units ready to defend or scout.")]
public readonly string[] SupportActors = { };
[Desc("Inner radius for spawning support actors")]

6
OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs
View File

@@ -552,9 +552,13 @@ namespace OpenRA.Mods.RA.Server
return true;
}
var startUnitsInfo = server.Map.Rules.Actors["world"].Traits.WithInterface<MPStartUnitsInfo>();
var selectedClass = startUnitsInfo.Where(u => u.Class == s).Select(u => u.ClassName).FirstOrDefault();
var className = selectedClass != null ? selectedClass : s;
server.LobbyInfo.GlobalSettings.StartingUnitsClass = s;
server.SyncLobbyGlobalSettings();
server.SendMessage("{0} changed Starting Units to {1}.".F(client.Name, s));
server.SendMessage("{0} changed Starting Units to {1}.".F(client.Name, className));
return true;
}},

13
OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
View File

@@ -367,17 +367,14 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var startingUnits = optionsBin.GetOrNull<DropDownButtonWidget>("STARTINGUNITS_DROPDOWNBUTTON");
if (startingUnits != null)
{
var classNames = new Dictionary<string, string>()
var startUnitsInfo = modRules.Actors["world"].Traits.WithInterface<MPStartUnitsInfo>();
var classes = startUnitsInfo.Select(a => a.Class).Distinct();
Func<string, string> className = c =>
{
{ "none", "MCV Only" },
{ "light", "Light Support" },
{ "heavy", "Heavy Support" },
var selectedClass = startUnitsInfo.Where(s => s.Class == c).Select(u => u.ClassName).FirstOrDefault();
return selectedClass != null ? selectedClass : c;
};
Func<string, string> className = c => classNames.ContainsKey(c) ? classNames[c] : c;
var classes = modRules.Actors["world"].Traits.WithInterface<MPStartUnitsInfo>()
.Select(a => a.Class).Distinct();
startingUnits.IsDisabled = () => Map.Status != MapStatus.Available || !Map.Map.Options.ConfigurableStartingUnits || configurationDisabled();
startingUnits.GetText = () => Map.Status != MapStatus.Available || !Map.Map.Options.ConfigurableStartingUnits ? "Not Available" : className(orderManager.LobbyInfo.GlobalSettings.StartingUnitsClass);
startingUnits.OnMouseDown = _ =>

10
mods/cnc/rules/world.yaml
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

9
mods/d2k/rules/world.yaml
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

5
mods/ra/rules/world.yaml
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

3
mods/ts/rules/world.yaml
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