Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Gamesetup cleanup (game/map-description), refs #3994.

Browse Source 
Add linebreaks.
Eliminate unneeded variables mapName and gameDescription.
Remove a check as g_GameAttributes.map is always defined.
Sort the two one-line statements above the helper variable declarations
to make it more more obvious that the statements don't use them.

This was SVN commit r18227.
This commit is contained in:
elexis 2016-05-24 12:56:52 +00:00
parent b2f3402c50
commit d7e7a24168
1 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
binaries/data/mods/public/gui/gamesetup/gamesetup.js
View File

@ -1396,8 +1396,6 @@ function updateGUIObjects()
"exploreMap", "disableTreasures", "lockTeams"])
hideControl(ctrl, ctrl + "Text", notScenario);
setMapDescription();
for (let i = 0; i < g_MaxPlayers; ++i)
{
Engine.GetGUIObjectByName("playerBox["+i+"]").hidden = (i >= numPlayers);
@ -1445,6 +1443,7 @@ function updateGUIObjects()
pColorPicker.selected = g_PlayerColors.findIndex(col => sameColor(col, color));
}
updateMapDescription();
resizeMoreOptionsWindow();
g_IsInGuiUpdate = false;
@ -1466,41 +1465,59 @@ function updateGUIObjects()
/**
* Sets an additional map label, map preview image and mapsettings description.
*/
function setMapDescription()
function updateMapDescription()
{
let numPlayers = g_GameAttributes.settings.PlayerData ? g_GameAttributes.settings.PlayerData.length : 0;
let mapName = g_GameAttributes.map || "";
setMapPreviewImage("mapPreview", getMapPreview(g_GameAttributes.map));
let victoryIdx = Math.max(0, g_VictoryConditions.Name.indexOf(g_GameAttributes.settings.GameType || ""));
Engine.GetGUIObjectByName("mapInfoName").caption =
g_GameAttributes.map == "random" ?
translateWithContext("map selection", "Random") :
translate(getMapDisplayName(g_GameAttributes.map));
let numPlayers = sprintf(
translatePlural(
"%(number)s player. ",
"%(number)s players. ",
g_GameAttributes.settings.PlayerData.length
),
{ "number": g_GameAttributes.settings.PlayerData.length }
);
let mapDescription =
g_GameAttributes.map == "random" ?
translate("Randomly selects a map from the list") :
g_GameAttributes.settings.Description ?
translate(g_GameAttributes.settings.Description) :
translate("Sorry, no description available.");
let victoryIdx = g_VictoryConditions.Name.indexOf(g_GameAttributes.settings.GameType);
let victoryTitle;
if (g_VictoryConditions.Name[victoryIdx] == "wonder")
victoryTitle = sprintf(
translatePluralWithContext(
"victory condition",
"Wonder (%(min)s minute)",
"Wonder (%(min)s minutes)",
g_GameAttributes.settings.WonderDuration
),
{ "min": g_GameAttributes.settings.WonderDuration }
);
if (victoryIdx == -1)
victoryTitle = translateWithContext("victory condition", "Unknown")
else
victoryTitle = g_VictoryConditions.Title[victoryIdx];
{
if (g_VictoryConditions.Name[victoryIdx] == "wonder")
victoryTitle = sprintf(
translatePluralWithContext(
"victory condition",
"Wonder (%(min)s minute)",
"Wonder (%(min)s minutes)",
g_GameAttributes.settings.WonderDuration
),
{ "min": g_GameAttributes.settings.WonderDuration }
);
else
victoryTitle = g_VictoryConditions.Title[victoryIdx];
if (victoryIdx != g_VictoryConditions.Default)
victoryTitle = "[color=\"" + g_VictoryColor + "\"]" + victoryTitle + "[/color]";
if (victoryIdx != g_VictoryConditions.Default)
victoryTitle = "[color=\"" + g_VictoryColor + "\"]" + victoryTitle + "[/color]";
}
let mapDescription = g_GameAttributes.settings.Description ? translate(g_GameAttributes.settings.Description) : translate("Sorry, no description available.");
if (mapName == "random")
mapDescription = translate("Randomly selects a map from the list");
let gameDescription = sprintf(translatePlural("%(number)s player. ", "%(number)s players. ", numPlayers), { "number": numPlayers });
gameDescription += translate("Victory Condition:") + " " + victoryTitle + ".\n\n";
gameDescription += mapDescription;
Engine.GetGUIObjectByName("mapInfoName").caption = mapName == "random" ? translateWithContext("map selection", "Random") : translate(getMapDisplayName(mapName));
Engine.GetGUIObjectByName("mapInfoDescription").caption = gameDescription;
setMapPreviewImage("mapPreview", getMapPreview(mapName));
Engine.GetGUIObjectByName("mapInfoDescription").caption =
numPlayers +
translate("Victory Condition:") + " " + victoryTitle + ".\n\n" +
mapDescription;
}
/**