Summary screen cleanup.
Rename panelsData and teamMiscHelperData to g_Foo. Use let instead of var everywhere except for globals. Quote object keys, add some spaces. This was SVN commit r17455.
This commit is contained in:
parent
5ccee7ade1
commit
88d6f35126
@ -1,16 +1,16 @@
|
||||
// FUNCTIONS FOR CALCULATING SCORES
|
||||
var teamMiscHelperData = [];
|
||||
var g_TeamMiscHelperData = [];
|
||||
|
||||
function resetDataHelpers()
|
||||
{
|
||||
teamMiscHelperData = [];
|
||||
g_TeamMiscHelperData = [];
|
||||
}
|
||||
|
||||
function updateCountersPlayer(playerState, counters, idGUI)
|
||||
{
|
||||
for (let w in counters)
|
||||
{
|
||||
var fn = counters[w].fn;
|
||||
let fn = counters[w].fn;
|
||||
Engine.GetGUIObjectByName(idGUI + "[" + w + "]").caption = fn && fn(playerState, w);
|
||||
}
|
||||
}
|
||||
@ -51,7 +51,7 @@ function calculateScoreTeam(counters)
|
||||
|
||||
for (let w in counters)
|
||||
{
|
||||
var total = 0;
|
||||
let total = 0;
|
||||
for (let p = 0; p < g_Teams[t]; ++p)
|
||||
total += (+Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + p + "][" + w + "]").caption);
|
||||
|
||||
@ -62,7 +62,7 @@ function calculateScoreTeam(counters)
|
||||
|
||||
function calculateBuildings(playerState, position)
|
||||
{
|
||||
var type = g_BuildingsTypes[position];
|
||||
let type = g_BuildingsTypes[position];
|
||||
return g_TrainedColor + playerState.statistics.buildingsConstructed[type] + '[/color] / ' +
|
||||
g_LostColor + playerState.statistics.buildingsLost[type] + '[/color] / ' +
|
||||
g_KilledColor + playerState.statistics.enemyBuildingsDestroyed[type] + '[/color]';
|
||||
@ -77,25 +77,27 @@ function calculateColorsTeam(counters)
|
||||
|
||||
for (let w in counters)
|
||||
{
|
||||
var total = {
|
||||
c : 0,
|
||||
l : 0,
|
||||
d : 0
|
||||
let total = {
|
||||
"c": 0,
|
||||
"l": 0,
|
||||
"d": 0
|
||||
};
|
||||
|
||||
for (let p = 0; p < g_Teams[t]; ++p)
|
||||
{
|
||||
var caption = Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + p + "][" + w + "]").caption;
|
||||
let caption = Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + p + "][" + w + "]").caption;
|
||||
// clean [Color=""], [/Color] and white space for make the sum more easy
|
||||
caption = caption.replace(/\[([\w\' \\\"\/\=]*)\]|\s/g, "");
|
||||
|
||||
var splitCaption = caption.split("/");
|
||||
let splitCaption = caption.split("/");
|
||||
|
||||
total.c += (+splitCaption[0]);
|
||||
total.l += (+splitCaption[1]);
|
||||
total.d += (+splitCaption[2]);
|
||||
}
|
||||
var teamTotal = g_Trained_Color + total.c + '[/color] / ' +
|
||||
g_Lost_Color + total.l + '[/color] / ' + g_Killed_Color + total.d + '[/color]';
|
||||
|
||||
let teamTotal = g_Trained_Color + total.c + '[/color] / ' +
|
||||
g_Lost_Color + total.l + '[/color] / ' + g_Killed_Color + total.d + '[/color]';
|
||||
|
||||
Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + w + "]").caption = teamTotal;
|
||||
}
|
||||
@ -104,7 +106,7 @@ function calculateColorsTeam(counters)
|
||||
|
||||
function calculateUnits(playerState, position)
|
||||
{
|
||||
var type = g_UnitsTypes[position];
|
||||
let type = g_UnitsTypes[position];
|
||||
return g_TrainedColor + playerState.statistics.unitsTrained[type] + '[/color] / ' +
|
||||
g_LostColor + playerState.statistics.unitsLost[type] + '[/color] / ' +
|
||||
g_KilledColor + playerState.statistics.enemyUnitsKilled[type] + '[/color]';
|
||||
@ -112,15 +114,15 @@ function calculateUnits(playerState, position)
|
||||
|
||||
function calculateResources(playerState, position)
|
||||
{
|
||||
var type = g_ResourcesTypes[position];
|
||||
let type = g_ResourcesTypes[position];
|
||||
return g_IncomeColor + playerState.statistics.resourcesGathered[type] + '[/color] / ' +
|
||||
g_OutcomeColor + (playerState.statistics.resourcesUsed[type] - playerState.statistics.resourcesSold[type]) + '[/color]';
|
||||
}
|
||||
|
||||
function calculateTotalResources(playerState, position)
|
||||
{
|
||||
var totalGathered = 0;
|
||||
var totalUsed = 0;
|
||||
let totalGathered = 0;
|
||||
let totalUsed = 0;
|
||||
|
||||
for each (let type in g_ResourcesTypes)
|
||||
{
|
||||
@ -156,15 +158,16 @@ function calculateResourcesTeam(counters)
|
||||
|
||||
for (let w in counters)
|
||||
{
|
||||
var teamTotal = "undefined";
|
||||
let teamTotal = "undefined";
|
||||
|
||||
var total = {
|
||||
let total = {
|
||||
i : 0,
|
||||
o : 0
|
||||
};
|
||||
|
||||
for (let p = 0; p < g_Teams[t]; ++p)
|
||||
{
|
||||
var caption = Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + p + "][" + w + "]").caption;
|
||||
let caption = Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + p + "][" + w + "]").caption;
|
||||
// clean [Color=""], [/Color] and white space for make the sum more easy
|
||||
caption = caption.replace(/\[([\w\' \\\"\/\=]*)\]|\s/g, "");
|
||||
|
||||
@ -172,7 +175,7 @@ function calculateResourcesTeam(counters)
|
||||
total.i += (+caption);
|
||||
else
|
||||
{
|
||||
var splitCaption = caption.split("/");
|
||||
let splitCaption = caption.split("/");
|
||||
|
||||
total.i += (+splitCaption[0]);
|
||||
total.o += (+splitCaption[1]);
|
||||
@ -191,17 +194,17 @@ function calculateResourcesTeam(counters)
|
||||
|
||||
function calculateResourceExchanged(playerState, position)
|
||||
{
|
||||
var type = g_ResourcesTypes[position];
|
||||
let type = g_ResourcesTypes[position];
|
||||
return g_IncomeColor + '+' + playerState.statistics.resourcesBought[type] + '[/color] ' +
|
||||
g_OutcomeColor + '-' + playerState.statistics.resourcesSold[type] + '[/color]';
|
||||
}
|
||||
|
||||
function calculateBatteryEfficiency(playerState, position)
|
||||
{
|
||||
var totalBought = 0;
|
||||
let totalBought = 0;
|
||||
for each (let boughtAmount in playerState.statistics.resourcesBought)
|
||||
totalBought += boughtAmount;
|
||||
var totalSold = 0;
|
||||
let totalSold = 0;
|
||||
for each (let soldAmount in playerState.statistics.resourcesSold)
|
||||
totalSold += soldAmount;
|
||||
|
||||
@ -222,15 +225,16 @@ function calculateMarketTeam(counters)
|
||||
|
||||
for (let w in counters)
|
||||
{
|
||||
var teamTotal = "undefined";
|
||||
let teamTotal = "undefined";
|
||||
|
||||
var total = {
|
||||
i : 0,
|
||||
o : 0
|
||||
let total = {
|
||||
"i": 0,
|
||||
"o": 0
|
||||
};
|
||||
|
||||
for (let p = 0; p < g_Teams[t]; ++p)
|
||||
{
|
||||
var caption = Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + p + "][" + w + "]").caption;
|
||||
let caption = Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + p + "][" + w + "]").caption;
|
||||
// clean [Color=""], [/Color], white space, + and % for make the sum more easy
|
||||
caption = caption.replace(/\[([\w\' \\\"\/\=]*)\]|\s|\+|\%/g, "");
|
||||
|
||||
@ -238,7 +242,7 @@ function calculateMarketTeam(counters)
|
||||
total.i += (+caption);
|
||||
else
|
||||
{
|
||||
var splitCaption = caption.split("-");
|
||||
let splitCaption = caption.split("-");
|
||||
total.i += (+splitCaption[0]);
|
||||
total.o += (+splitCaption[1]);
|
||||
}
|
||||
@ -256,15 +260,16 @@ function calculateMarketTeam(counters)
|
||||
|
||||
function calculateVegetarianRatio(playerState, position)
|
||||
{
|
||||
if (!teamMiscHelperData[playerState.team])
|
||||
teamMiscHelperData[playerState.team] = [];
|
||||
if (!teamMiscHelperData[playerState.team][position])
|
||||
teamMiscHelperData[playerState.team][position] = { "food": 0, "vegetarianFood": 0 };
|
||||
if (!g_TeamMiscHelperData[playerState.team])
|
||||
g_TeamMiscHelperData[playerState.team] = [];
|
||||
|
||||
if (!g_TeamMiscHelperData[playerState.team][position])
|
||||
g_TeamMiscHelperData[playerState.team][position] = { "food": 0, "vegetarianFood": 0 };
|
||||
|
||||
if (playerState.statistics.resourcesGathered.vegetarianFood && playerState.statistics.resourcesGathered.food)
|
||||
{
|
||||
teamMiscHelperData[playerState.team][position].food += playerState.statistics.resourcesGathered.food;
|
||||
teamMiscHelperData[playerState.team][position].vegetarianFood += playerState.statistics.resourcesGathered.vegetarianFood;
|
||||
g_TeamMiscHelperData[playerState.team][position].food += playerState.statistics.resourcesGathered.food;
|
||||
g_TeamMiscHelperData[playerState.team][position].vegetarianFood += playerState.statistics.resourcesGathered.vegetarianFood;
|
||||
return Math.floor((playerState.statistics.resourcesGathered.vegetarianFood / playerState.statistics.resourcesGathered.food) * 100) + "%";
|
||||
}
|
||||
else
|
||||
@ -273,15 +278,16 @@ function calculateVegetarianRatio(playerState, position)
|
||||
|
||||
function calculateFeminization(playerState, position)
|
||||
{
|
||||
if (!teamMiscHelperData[playerState.team])
|
||||
teamMiscHelperData[playerState.team] = [];
|
||||
if (!teamMiscHelperData[playerState.team][position])
|
||||
teamMiscHelperData[playerState.team][position] = { "Female": 0, "Worker": 0 };
|
||||
if (!g_TeamMiscHelperData[playerState.team])
|
||||
g_TeamMiscHelperData[playerState.team] = [];
|
||||
|
||||
if (!g_TeamMiscHelperData[playerState.team][position])
|
||||
g_TeamMiscHelperData[playerState.team][position] = { "Female": 0, "Worker": 0 };
|
||||
|
||||
if (playerState.statistics.unitsTrained.Worker && playerState.statistics.unitsTrained.Female)
|
||||
{
|
||||
teamMiscHelperData[playerState.team][position].Female = playerState.statistics.unitsTrained.Female;
|
||||
teamMiscHelperData[playerState.team][position].Worker = playerState.statistics.unitsTrained.Worker;
|
||||
g_TeamMiscHelperData[playerState.team][position].Female = playerState.statistics.unitsTrained.Female;
|
||||
g_TeamMiscHelperData[playerState.team][position].Worker = playerState.statistics.unitsTrained.Worker;
|
||||
return Math.floor((playerState.statistics.unitsTrained.Female / playerState.statistics.unitsTrained.Worker) * 100) + "%";
|
||||
}
|
||||
else
|
||||
@ -290,16 +296,18 @@ function calculateFeminization(playerState, position)
|
||||
|
||||
function calculateKillDeathRatio(playerState, position)
|
||||
{
|
||||
if (!teamMiscHelperData[playerState.team])
|
||||
teamMiscHelperData[playerState.team] = [];
|
||||
if (!teamMiscHelperData[playerState.team][position])
|
||||
teamMiscHelperData[playerState.team][position] = { "enemyUnitsKilled": 0, "unitsLost": 0 };
|
||||
if (!g_TeamMiscHelperData[playerState.team])
|
||||
g_TeamMiscHelperData[playerState.team] = [];
|
||||
|
||||
teamMiscHelperData[playerState.team][position].enemyUnitsKilled = playerState.statistics.enemyUnitsKilled.total;
|
||||
teamMiscHelperData[playerState.team][position].unitsLost = playerState.statistics.unitsLost.total;
|
||||
if (!g_TeamMiscHelperData[playerState.team][position])
|
||||
g_TeamMiscHelperData[playerState.team][position] = { "enemyUnitsKilled": 0, "unitsLost": 0 };
|
||||
|
||||
g_TeamMiscHelperData[playerState.team][position].enemyUnitsKilled = playerState.statistics.enemyUnitsKilled.total;
|
||||
g_TeamMiscHelperData[playerState.team][position].unitsLost = playerState.statistics.unitsLost.total;
|
||||
|
||||
if (!playerState.statistics.enemyUnitsKilled.total)
|
||||
return g_DefaultDecimal
|
||||
|
||||
if (!playerState.statistics.unitsLost.total) // and enemyUnitsKilled.total > 0
|
||||
return g_InfiniteSymbol; // infinity symbol
|
||||
|
||||
@ -308,28 +316,31 @@ function calculateKillDeathRatio(playerState, position)
|
||||
|
||||
function calculateMapExploration(playerState, position)
|
||||
{
|
||||
if (!teamMiscHelperData[playerState.team])
|
||||
teamMiscHelperData[playerState.team] = [];
|
||||
if (!g_TeamMiscHelperData[playerState.team])
|
||||
g_TeamMiscHelperData[playerState.team] = [];
|
||||
|
||||
g_TeamMiscHelperData[playerState.team][position] = playerState.statistics.teamPercentMapExplored;
|
||||
|
||||
teamMiscHelperData[playerState.team][position] = playerState.statistics.teamPercentMapExplored;
|
||||
return playerState.statistics.percentMapExplored + "%";
|
||||
}
|
||||
|
||||
function calculateMapFinalControl(playerState, position)
|
||||
{
|
||||
if (!teamMiscHelperData[playerState.team])
|
||||
teamMiscHelperData[playerState.team] = [];
|
||||
if (!g_TeamMiscHelperData[playerState.team])
|
||||
g_TeamMiscHelperData[playerState.team] = [];
|
||||
|
||||
g_TeamMiscHelperData[playerState.team][position] = playerState.statistics.teamPercentMapControlled;
|
||||
|
||||
teamMiscHelperData[playerState.team][position] = playerState.statistics.teamPercentMapControlled;
|
||||
return playerState.statistics.percentMapControlled + "%";
|
||||
}
|
||||
|
||||
function calculateMapPeakControl(playerState, position)
|
||||
{
|
||||
if (!teamMiscHelperData[playerState.team])
|
||||
teamMiscHelperData[playerState.team] = [];
|
||||
if (!g_TeamMiscHelperData[playerState.team])
|
||||
g_TeamMiscHelperData[playerState.team] = [];
|
||||
|
||||
g_TeamMiscHelperData[playerState.team][position] = playerState.statistics.teamPeakPercentMapControlled;
|
||||
|
||||
teamMiscHelperData[playerState.team][position] = playerState.statistics.teamPeakPercentMapControlled;
|
||||
return playerState.statistics.peakPercentMapControlled + "%";
|
||||
}
|
||||
|
||||
@ -342,23 +353,23 @@ function calculateMiscellaneous(counters)
|
||||
|
||||
for (let w in counters)
|
||||
{
|
||||
var teamTotal = "undefined";
|
||||
let teamTotal = "undefined";
|
||||
|
||||
if (w == 0)
|
||||
teamTotal = (teamMiscHelperData[t][w].food == 0 ? "0" : Math.floor((teamMiscHelperData[t][w].vegetarianFood / teamMiscHelperData[t][w].food) * 100)) + "%";
|
||||
teamTotal = (g_TeamMiscHelperData[t][w].food == 0 ? "0" : Math.floor((g_TeamMiscHelperData[t][w].vegetarianFood / g_TeamMiscHelperData[t][w].food) * 100)) + "%";
|
||||
else if (w == 1)
|
||||
teamTotal = (teamMiscHelperData[t][w].Worker == 0 ? "0" : Math.floor((teamMiscHelperData[t][w].Female / teamMiscHelperData[t][w].Worker) * 100)) + "%";
|
||||
teamTotal = (g_TeamMiscHelperData[t][w].Worker == 0 ? "0" : Math.floor((g_TeamMiscHelperData[t][w].Female / g_TeamMiscHelperData[t][w].Worker) * 100)) + "%";
|
||||
else if (w == 2)
|
||||
{
|
||||
if (!teamMiscHelperData[t][w].enemyUnitsKilled)
|
||||
if (!g_TeamMiscHelperData[t][w].enemyUnitsKilled)
|
||||
teamTotal = g_DefaultDecimal;
|
||||
else if (!teamMiscHelperData[t][w].unitsLost) // and enemyUnitsKilled.total > 0
|
||||
else if (!g_TeamMiscHelperData[t][w].unitsLost) // and enemyUnitsKilled.total > 0
|
||||
teamTotal = g_InfiniteSymbol; // infinity symbol
|
||||
else
|
||||
teamTotal = Math.round((teamMiscHelperData[t][w].enemyUnitsKilled / teamMiscHelperData[t][w].unitsLost)*100)/100;
|
||||
teamTotal = Math.round((g_TeamMiscHelperData[t][w].enemyUnitsKilled / g_TeamMiscHelperData[t][w].unitsLost)*100)/100;
|
||||
}
|
||||
else if (w >= 3)
|
||||
teamTotal = teamMiscHelperData[t][w] + "%";
|
||||
teamTotal = g_TeamMiscHelperData[t][w] + "%";
|
||||
|
||||
Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + w + "]").caption = teamTotal;
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
var panelsData = [
|
||||
var g_ScorePanelsData = [
|
||||
{ // Scores panel
|
||||
"headings": [ // headings on score panel
|
||||
{ "caption": translate("Player name"), "yStart": 26, "width": 200 },
|
||||
@ -145,7 +145,7 @@ var panelsData = [
|
||||
|
||||
function resetGeneralPanel()
|
||||
{
|
||||
for (var h = 0; h < g_MaxHeadingTitle; ++h)
|
||||
for (let h = 0; h < g_MaxHeadingTitle; ++h)
|
||||
{
|
||||
Engine.GetGUIObjectByName("titleHeading["+ h +"]").hidden = true;
|
||||
Engine.GetGUIObjectByName("Heading[" + h + "]").hidden = true;
|
||||
@ -163,14 +163,14 @@ function resetGeneralPanel()
|
||||
|
||||
function updateGeneralPanelHeadings(headings)
|
||||
{
|
||||
var left = 50;
|
||||
let left = 50;
|
||||
for (let h in headings)
|
||||
{
|
||||
var headerGUIName = "playerNameHeading";
|
||||
let headerGUIName = "playerNameHeading";
|
||||
if (h > 0)
|
||||
headerGUIName = "Heading[" + (h - 1) + "]";
|
||||
|
||||
var headerGUI = Engine.GetGUIObjectByName(headerGUIName);
|
||||
let headerGUI = Engine.GetGUIObjectByName(headerGUIName);
|
||||
headerGUI.caption = headings[h].caption;
|
||||
headerGUI.size = left + " " + headings[h].yStart + " " + (left + headings[h].width) + " 100%";
|
||||
headerGUI.hidden = false;
|
||||
@ -182,7 +182,7 @@ function updateGeneralPanelHeadings(headings)
|
||||
|
||||
function updateGeneralPanelTitles(titleHeadings)
|
||||
{
|
||||
var left = 250;
|
||||
let left = 250;
|
||||
for (let th in titleHeadings)
|
||||
{
|
||||
if (th >= g_MaxHeadingTitle)
|
||||
@ -191,7 +191,7 @@ function updateGeneralPanelTitles(titleHeadings)
|
||||
if (titleHeadings[th].xOffset)
|
||||
left += titleHeadings[th].xOffset;
|
||||
|
||||
var headerGUI = Engine.GetGUIObjectByName("titleHeading["+ th +"]");
|
||||
let headerGUI = Engine.GetGUIObjectByName("titleHeading["+ th +"]");
|
||||
headerGUI.caption = titleHeadings[th].caption;
|
||||
headerGUI.size = left + " " + titleHeadings[th].yStart + " " + (left + titleHeadings[th].width) + " 100%";
|
||||
headerGUI.hidden = false;
|
||||
@ -203,12 +203,14 @@ function updateGeneralPanelTitles(titleHeadings)
|
||||
|
||||
function updateGeneralPanelCounter(counters)
|
||||
{
|
||||
var rowPlayerObjectWidth = 0;
|
||||
var left = 0;
|
||||
let rowPlayerObjectWidth = 0;
|
||||
let left = 0;
|
||||
|
||||
for (let p = 0; p < g_MaxPlayers; ++p)
|
||||
{
|
||||
left = 240;
|
||||
var counterObject;
|
||||
let counterObject;
|
||||
|
||||
for (let w in counters)
|
||||
{
|
||||
counterObject = Engine.GetGUIObjectByName("valueData[" + p + "][" + w + "]");
|
||||
@ -216,10 +218,11 @@ function updateGeneralPanelCounter(counters)
|
||||
counterObject.hidden = false;
|
||||
left += counters[w].width;
|
||||
}
|
||||
|
||||
if (rowPlayerObjectWidth == 0)
|
||||
rowPlayerObjectWidth = left;
|
||||
|
||||
var counterTotalObject;
|
||||
let counterTotalObject;
|
||||
for (let t = 0; t < g_MaxTeams; ++t)
|
||||
{
|
||||
left = 240;
|
||||
@ -231,7 +234,7 @@ function updateGeneralPanelCounter(counters)
|
||||
|
||||
if (g_Teams[t])
|
||||
{
|
||||
var yStart = 30 + g_Teams[t] * (g_PlayerBoxYSize + g_PlayerBoxGap) + 2;
|
||||
let yStart = 30 + g_Teams[t] * (g_PlayerBoxYSize + g_PlayerBoxGap) + 2;
|
||||
counterTotalObject = Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + w + "]");
|
||||
counterTotalObject.size = (left + 20) + " " + yStart + " " + (left + counters[w].width) + " 100%";
|
||||
counterTotalObject.hidden = false;
|
||||
@ -252,15 +255,15 @@ function updateGeneralPanelTeams()
|
||||
if (!g_Teams)
|
||||
return;
|
||||
|
||||
var yStart = g_TeamsBoxYStart + g_WithoutTeam * (g_PlayerBoxYSize + g_PlayerBoxGap);
|
||||
let yStart = g_TeamsBoxYStart + g_WithoutTeam * (g_PlayerBoxYSize + g_PlayerBoxGap);
|
||||
for (let i = 0; i < g_Teams.length; ++i)
|
||||
{
|
||||
if (!g_Teams[i])
|
||||
continue;
|
||||
|
||||
var teamBox = Engine.GetGUIObjectByName("teamBoxt["+i+"]");
|
||||
let teamBox = Engine.GetGUIObjectByName("teamBoxt["+i+"]");
|
||||
teamBox.hidden = false;
|
||||
var teamBoxSize = teamBox.size;
|
||||
let teamBoxSize = teamBox.size;
|
||||
teamBoxSize.top = yStart;
|
||||
teamBox.size = teamBoxSize;
|
||||
|
||||
@ -268,8 +271,8 @@ function updateGeneralPanelTeams()
|
||||
|
||||
Engine.GetGUIObjectByName("teamNameHeadingt["+i+"]").caption = "Team "+(i+1);
|
||||
|
||||
var teamHeading = Engine.GetGUIObjectByName("teamHeadingt["+i+"]");
|
||||
var yStartTotal = 30 + g_Teams[i] * (g_PlayerBoxYSize + g_PlayerBoxGap) + 2;
|
||||
let teamHeading = Engine.GetGUIObjectByName("teamHeadingt["+i+"]");
|
||||
let yStartTotal = 30 + g_Teams[i] * (g_PlayerBoxYSize + g_PlayerBoxGap) + 2;
|
||||
teamHeading.size = "50 "+yStartTotal+" 100% "+(yStartTotal+20);
|
||||
teamHeading.caption = translate("Team total");
|
||||
}
|
||||
@ -282,15 +285,15 @@ function updateObjectPlayerPosition()
|
||||
{
|
||||
for (let h = 0; h < g_MaxPlayers; ++h)
|
||||
{
|
||||
var playerBox = Engine.GetGUIObjectByName("playerBox[" + h + "]");
|
||||
var boxSize = playerBox.size;
|
||||
let playerBox = Engine.GetGUIObjectByName("playerBox[" + h + "]");
|
||||
let boxSize = playerBox.size;
|
||||
boxSize.top += h * (g_PlayerBoxYSize + g_PlayerBoxGap);
|
||||
boxSize.bottom = boxSize.top + g_PlayerBoxYSize;
|
||||
playerBox.size = boxSize;
|
||||
|
||||
for (let i = 0; i < g_MaxTeams; ++i)
|
||||
{
|
||||
var playerBoxt = Engine.GetGUIObjectByName("playerBoxt[" + i + "][" + h + "]");
|
||||
let playerBoxt = Engine.GetGUIObjectByName("playerBoxt[" + i + "][" + h + "]");
|
||||
boxSize = playerBoxt.size;
|
||||
boxSize.top += h * (g_PlayerBoxYSize + g_PlayerBoxGap);
|
||||
boxSize.bottom = boxSize.top + g_PlayerBoxYSize;
|
||||
|
||||
@ -42,12 +42,12 @@ var g_GameData;
|
||||
*/
|
||||
function selectPanel(panelNumber)
|
||||
{
|
||||
var panelNames = [ 'scorePanel', 'buildingsPanel', 'unitsPanel', 'resourcesPanel', 'marketPanel', 'miscPanel' ];
|
||||
let panelNames = [ 'scorePanel', 'buildingsPanel', 'unitsPanel', 'resourcesPanel', 'marketPanel', 'miscPanel' ];
|
||||
|
||||
function adjustTabDividers(tabSize)
|
||||
{
|
||||
var leftSpacer = Engine.GetGUIObjectByName("tabDividerLeft");
|
||||
var rightSpacer = Engine.GetGUIObjectByName("tabDividerRight");
|
||||
let leftSpacer = Engine.GetGUIObjectByName("tabDividerLeft");
|
||||
let rightSpacer = Engine.GetGUIObjectByName("tabDividerRight");
|
||||
leftSpacer.size = "20 " + leftSpacer.size.top + " " + (tabSize.left + 2) + " " + leftSpacer.size.bottom;
|
||||
rightSpacer.size = (tabSize.right - 2) + " " + rightSpacer.size.top + " 100%-20 " + rightSpacer.size.bottom;
|
||||
}
|
||||
@ -60,7 +60,7 @@ function selectPanel(panelNumber)
|
||||
Engine.GetGUIObjectByName(panelNames[panelNumber] + 'Button').sprite = "ForegroundTab";
|
||||
adjustTabDividers(Engine.GetGUIObjectByName(panelNames[panelNumber] + 'Button').size);
|
||||
|
||||
updatePanelData(panelsData[panelNumber]);
|
||||
updatePanelData(g_ScorePanelsData[panelNumber]);
|
||||
}
|
||||
|
||||
function updatePanelData(panelInfo)
|
||||
@ -69,25 +69,25 @@ function updatePanelData(panelInfo)
|
||||
resetDataHelpers();
|
||||
updateGeneralPanelHeadings(panelInfo.headings);
|
||||
updateGeneralPanelTitles(panelInfo.titleHeadings);
|
||||
var rowPlayerObjectWidth = updateGeneralPanelCounter(panelInfo.counters);
|
||||
let rowPlayerObjectWidth = updateGeneralPanelCounter(panelInfo.counters);
|
||||
updateGeneralPanelTeams();
|
||||
|
||||
var playerBoxesCounts = [ ];
|
||||
let playerBoxesCounts = [ ];
|
||||
for (let i = 0; i < g_PlayerCount; ++i)
|
||||
{
|
||||
var playerState = g_GameData.playerStates[i+1];
|
||||
let playerState = g_GameData.playerStates[i+1];
|
||||
|
||||
if (!playerBoxesCounts[playerState.team+1])
|
||||
playerBoxesCounts[playerState.team+1] = 1;
|
||||
else
|
||||
playerBoxesCounts[playerState.team+1] += 1;
|
||||
|
||||
var positionObject = playerBoxesCounts[playerState.team+1] - 1;
|
||||
var rowPlayer = "playerBox[" + positionObject + "]";
|
||||
var playerNameColumn = "playerName[" + positionObject + "]";
|
||||
var playerColorBoxColumn = "playerColorBox[" + positionObject + "]";
|
||||
var playerCivicBoxColumn = "civIcon[" + positionObject + "]";
|
||||
var playerCounterValue = "valueData[" + positionObject + "]";
|
||||
let positionObject = playerBoxesCounts[playerState.team+1] - 1;
|
||||
let rowPlayer = "playerBox[" + positionObject + "]";
|
||||
let playerNameColumn = "playerName[" + positionObject + "]";
|
||||
let playerColorBoxColumn = "playerColorBox[" + positionObject + "]";
|
||||
let playerCivicBoxColumn = "civIcon[" + positionObject + "]";
|
||||
let playerCounterValue = "valueData[" + positionObject + "]";
|
||||
if (playerState.team != -1)
|
||||
{
|
||||
rowPlayer = "playerBoxt[" + playerState.team + "][" + positionObject + "]";
|
||||
@ -97,24 +97,24 @@ function updatePanelData(panelInfo)
|
||||
playerCounterValue = "valueDataTeam[" + playerState.team + "][" + positionObject + "]";
|
||||
}
|
||||
|
||||
var colorString = "color: "
|
||||
let colorString = "color: "
|
||||
+ Math.floor(playerState.color.r * 255) + " "
|
||||
+ Math.floor(playerState.color.g * 255) + " "
|
||||
+ Math.floor(playerState.color.b * 255);
|
||||
|
||||
var rowPlayerObject = Engine.GetGUIObjectByName(rowPlayer);
|
||||
let rowPlayerObject = Engine.GetGUIObjectByName(rowPlayer);
|
||||
rowPlayerObject.hidden = false;
|
||||
rowPlayerObject.sprite = colorString + g_PlayerBoxAlpha;
|
||||
var boxSize = rowPlayerObject.size;
|
||||
let boxSize = rowPlayerObject.size;
|
||||
boxSize.right = rowPlayerObjectWidth;
|
||||
rowPlayerObject.size = boxSize;
|
||||
|
||||
var playerColorBox = Engine.GetGUIObjectByName(playerColorBoxColumn);
|
||||
let playerColorBox = Engine.GetGUIObjectByName(playerColorBoxColumn);
|
||||
playerColorBox.sprite = colorString + g_PlayerColorBoxAlpha;
|
||||
|
||||
Engine.GetGUIObjectByName(playerNameColumn).caption = g_GameData.players[i+1].name;
|
||||
|
||||
var civIcon = Engine.GetGUIObjectByName(playerCivicBoxColumn);
|
||||
let civIcon = Engine.GetGUIObjectByName(playerCivicBoxColumn);
|
||||
civIcon.sprite = "stretched:"+g_CivData[playerState.civ].Emblem;
|
||||
civIcon.tooltip = g_CivData[playerState.civ].Name;
|
||||
|
||||
@ -122,7 +122,7 @@ function updatePanelData(panelInfo)
|
||||
updateCountersPlayer(playerState, panelInfo.counters, playerCounterValue);
|
||||
}
|
||||
// Update team counters
|
||||
var teamCounterFn = panelInfo.teamCounterFn;
|
||||
let teamCounterFn = panelInfo.teamCounterFn;
|
||||
if (g_Teams && teamCounterFn)
|
||||
teamCounterFn(panelInfo.counters);
|
||||
}
|
||||
@ -132,8 +132,8 @@ function init(data)
|
||||
updateObjectPlayerPosition();
|
||||
g_GameData = data;
|
||||
|
||||
var mapSize = data.mapSettings.Size ? g_Settings.MapSizes.find(size => size.Tiles == data.mapSettings.Size) : undefined;
|
||||
var mapType = g_Settings.MapTypes.find(mapType => mapType.Name == data.mapSettings.mapType);
|
||||
let mapSize = data.mapSettings.Size ? g_Settings.MapSizes.find(size => size.Tiles == data.mapSettings.Size) : undefined;
|
||||
let mapType = g_Settings.MapTypes.find(mapType => mapType.Name == data.mapSettings.mapType);
|
||||
Engine.GetGUIObjectByName("timeElapsed").caption = sprintf(translate("Game time elapsed: %(time)s"), { "time": timeToString(data.timeElapsed) });
|
||||
Engine.GetGUIObjectByName("summaryText").caption = data.gameResult;
|
||||
Engine.GetGUIObjectByName("mapName").caption = sprintf(translate("%(mapName)s - %(mapType)s"), { "mapName": translate(data.mapSettings.Name), "mapType": mapSize ? mapSize.LongName : (mapType ? mapType.Title : "") });
|
||||
|
||||
Loading…
Reference in New Issue
Block a user