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

Allow outside code to specify the map chooser visibility filter.

Browse Source
This commit is contained in:
Paul Chote
2014-12-15 17:47:27 +13:00
parent 2ed594fd86
commit 6f0927069a
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,7 +173,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{ {
{ "initialMap", Map.Uid }, { "initialMap", Map.Uid },
{ "onExit", DoNothing }, { "onExit", DoNothing },
{ "onSelect", onSelect } { "onSelect", onSelect },
{ "filter", MapVisibility.Lobby },
}); });
}; };
} }

16
OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
string gameMode; string gameMode;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
internal MapChooserLogic(Widget widget, string initialMap, Action onExit, Action<string> onSelect) internal MapChooserLogic(Widget widget, string initialMap, Action onExit, Action<string> onSelect, MapVisibility filter)
{ {
selectedUid = WidgetUtils.ChooseInitialMap(initialMap); selectedUid = WidgetUtils.ChooseInitialMap(initialMap);
@@ -47,7 +47,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var gameModeDropdown = widget.GetOrNull<DropDownButtonWidget>("GAMEMODE_FILTER"); var gameModeDropdown = widget.GetOrNull<DropDownButtonWidget>("GAMEMODE_FILTER");
if (gameModeDropdown != null) if (gameModeDropdown != null)
{ {
var selectableMaps = Game.modData.MapCache.Where(m => m.Status == MapStatus.Available && m.Map.Visibility.HasFlag(MapVisibility.Lobby)); var selectableMaps = Game.modData.MapCache.Where(m => m.Status == MapStatus.Available && (m.Map.Visibility & filter) != 0);
var gameModes = selectableMaps var gameModes = selectableMaps
.GroupBy(m => m.Type) .GroupBy(m => m.Type)
.Select(g => Pair.New(g.Key, g.Count())).ToList(); .Select(g => Pair.New(g.Key, g.Count())).ToList();
@@ -62,7 +62,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{ {
var item = ScrollItemWidget.Setup(template, var item = ScrollItemWidget.Setup(template,
() => gameMode == ii.First, () => gameMode == ii.First,
() => { gameMode = ii.First; EnumerateMaps(onSelect); }); () => { gameMode = ii.First; EnumerateMaps(onSelect, filter); });
item.Get<LabelWidget>("LABEL").GetText = () => showItem(ii); item.Get<LabelWidget>("LABEL").GetText = () => showItem(ii);
return item; return item;
}; };
@@ -84,13 +84,13 @@ namespace OpenRA.Mods.RA.Widgets.Logic
else else
{ {
mapFilter = mapfilterInput.Text = null; mapFilter = mapfilterInput.Text = null;
EnumerateMaps(onSelect); EnumerateMaps(onSelect, filter);
} }
return true; return true;
}; };
mapfilterInput.OnEnterKey = () => { approving(); return true; }; mapfilterInput.OnEnterKey = () => { approving(); return true; };
mapfilterInput.OnTextEdited = () => mapfilterInput.OnTextEdited = () =>
{ mapFilter = mapfilterInput.Text; EnumerateMaps(onSelect); }; { mapFilter = mapfilterInput.Text; EnumerateMaps(onSelect, filter); };
} }
var randomMapButton = widget.GetOrNull<ButtonWidget>("RANDOMMAP_BUTTON"); var randomMapButton = widget.GetOrNull<ButtonWidget>("RANDOMMAP_BUTTON");
@@ -105,13 +105,13 @@ namespace OpenRA.Mods.RA.Widgets.Logic
randomMapButton.IsDisabled = () => visibleMaps == null || visibleMaps.Count == 0; randomMapButton.IsDisabled = () => visibleMaps == null || visibleMaps.Count == 0;
} }
EnumerateMaps(onSelect); EnumerateMaps(onSelect, filter);
} }
void EnumerateMaps(Action<string> onSelect) void EnumerateMaps(Action<string> onSelect, MapVisibility filter)
{ {
var maps = Game.modData.MapCache var maps = Game.modData.MapCache
.Where(m => m.Status == MapStatus.Available && m.Map.Visibility.HasFlag(MapVisibility.Lobby)) .Where(m => m.Status == MapStatus.Available && (m.Map.Visibility & filter) != 0)
.Where(m => gameMode == null || m.Type == gameMode) .Where(m => gameMode == null || m.Type == gameMode)
.Where(m => mapFilter == null || m.Title.IndexOf(mapFilter, StringComparison.OrdinalIgnoreCase) >= 0 || m.Author.IndexOf(mapFilter, StringComparison.OrdinalIgnoreCase) >= 0) .Where(m => mapFilter == null || m.Title.IndexOf(mapFilter, StringComparison.OrdinalIgnoreCase) >= 0 || m.Author.IndexOf(mapFilter, StringComparison.OrdinalIgnoreCase) >= 0)
.OrderBy(m => m.PlayerCount) .OrderBy(m => m.PlayerCount)