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

Renames Shroud lobby option to Explored map.

Browse Source
This commit is contained in:
deniz1a
2015-07-26 15:09:43 +03:00
parent 7efbf0633e
commit 2ca949dbd2
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
View File

@@ -440,8 +440,8 @@ namespace OpenRA.Mods.Common.Server
bool.TryParse(s, out server.LobbyInfo.GlobalSettings.Shroud); bool.TryParse(s, out server.LobbyInfo.GlobalSettings.Shroud);
server.SyncLobbyGlobalSettings(); server.SyncLobbyGlobalSettings();
server.SendMessage("{0} {1} Shroud." server.SendMessage("{0} {1} Explored map."
.F(client.Name, server.LobbyInfo.GlobalSettings.Shroud ? "enabled" : "disabled")); .F(client.Name, server.LobbyInfo.GlobalSettings.Shroud ? "disabled" : "enabled"));
return true; return true;
} }

2
OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.Server
server.SendOrderTo(conn, "Message", "Allow Cheats: {0}".F(server.LobbyInfo.GlobalSettings.AllowCheats)); server.SendOrderTo(conn, "Message", "Allow Cheats: {0}".F(server.LobbyInfo.GlobalSettings.AllowCheats));
if (server.LobbyInfo.GlobalSettings.Shroud != defaults.Shroud) if (server.LobbyInfo.GlobalSettings.Shroud != defaults.Shroud)
server.SendOrderTo(conn, "Message", "Shroud: {0}".F(server.LobbyInfo.GlobalSettings.Shroud)); server.SendOrderTo(conn, "Message", "Explored map: {0}".F(!server.LobbyInfo.GlobalSettings.Shroud));
if (server.LobbyInfo.GlobalSettings.Fog != defaults.Fog) if (server.LobbyInfo.GlobalSettings.Fog != defaults.Fog)
server.SendOrderTo(conn, "Message", "Fog of war: {0}".F(server.LobbyInfo.GlobalSettings.Fog)); server.SendOrderTo(conn, "Message", "Fog of war: {0}".F(server.LobbyInfo.GlobalSettings.Fog));

10
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -497,12 +497,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}; };
} }
var enableShroud = optionsBin.GetOrNull<CheckboxWidget>("SHROUD_CHECKBOX"); var exploredMap = optionsBin.GetOrNull<CheckboxWidget>("EXPLORED_MAP_CHECKBOX");
if (enableShroud != null) if (exploredMap != null)
{ {
enableShroud.IsChecked = () => orderManager.LobbyInfo.GlobalSettings.Shroud; exploredMap.IsChecked = () => !orderManager.LobbyInfo.GlobalSettings.Shroud;
enableShroud.IsDisabled = () => Map.Status != MapStatus.Available || Map.Map.Options.Shroud.HasValue || configurationDisabled(); exploredMap.IsDisabled = () => Map.Status != MapStatus.Available || Map.Map.Options.Shroud.HasValue || configurationDisabled();
enableShroud.OnClick = () => orderManager.IssueOrder(Order.Command( exploredMap.OnClick = () => orderManager.IssueOrder(Order.Command(
"shroud {0}".F(!orderManager.LobbyInfo.GlobalSettings.Shroud))); "shroud {0}".F(!orderManager.LobbyInfo.GlobalSettings.Shroud)));
} }

4
mods/cnc/chrome/lobby-dialogs.yaml
View File

@@ -110,11 +110,11 @@ Background@LOBBY_OPTIONS_BIN:
Width: PARENT_RIGHT-60 Width: PARENT_RIGHT-60
Height: PARENT_BOTTOM-75 Height: PARENT_BOTTOM-75
Children: Children:
Checkbox@SHROUD_CHECKBOX: Checkbox@EXPLORED_MAP_CHECKBOX:
Width: 230 Width: 230
Height: 20 Height: 20
Font: Regular Font: Regular
Text: Shroud Text: Explored map
Checkbox@FOG_CHECKBOX: Checkbox@FOG_CHECKBOX:
Y: 35 Y: 35
Width: 230 Width: 230

4
mods/d2k/chrome/lobby-dialogs.yaml
View File

@@ -109,10 +109,10 @@ Background@LOBBY_OPTIONS_BIN:
Width: PARENT_RIGHT-60 Width: PARENT_RIGHT-60
Height: PARENT_BOTTOM-75 Height: PARENT_BOTTOM-75
Children: Children:
Checkbox@SHROUD_CHECKBOX: Checkbox@EXPLORED_MAP_CHECKBOX:
Width: 140 Width: 140
Height: 20 Height: 20
Text: Shroud Text: Explored map
Checkbox@FOG_CHECKBOX: Checkbox@FOG_CHECKBOX:
Y: 35 Y: 35
Width: 140 Width: 140

4
mods/ra/chrome/lobby-dialogs.yaml
View File

@@ -109,10 +109,10 @@ Background@LOBBY_OPTIONS_BIN:
Width: PARENT_RIGHT-60 Width: PARENT_RIGHT-60
Height: PARENT_BOTTOM-75 Height: PARENT_BOTTOM-75
Children: Children:
Checkbox@SHROUD_CHECKBOX: Checkbox@EXPLORED_MAP_CHECKBOX:
Width: 140 Width: 140
Height: 20 Height: 20
Text: Shroud Text: Explored map
Checkbox@FOG_CHECKBOX: Checkbox@FOG_CHECKBOX:
Y: 35 Y: 35
Width: 140 Width: 140