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

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

Browse Source 
Fixed lobby start unit notifications not showing class names
This commit is contained in:
Paul Chote
2014-08-19 10:15:12 +12:00
parent f161d87d07 fa2b2bea0b
commit 520df8242d
14 changed files with 111 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -371,17 +371,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 = _ =>