Index: binaries/data/mods/public/gui/summary/layout.js =================================================================== --- binaries/data/mods/public/gui/summary/layout.js +++ binaries/data/mods/public/gui/summary/layout.js @@ -4,15 +4,15 @@ "headings": [ { "identifier": "playername", "caption": translate("Player name"), "yStart": 26, "width": 200 }, { "identifier": "totalScore", "caption": translate("Total score"), "yStart": 16, "width": 100 }, - { "identifier": "economyScore", "caption": translate("Economy score"), "yStart": 16, "width": 100 }, { "identifier": "militaryScore", "caption": translate("Military score"), "yStart": 16, "width": 100 }, + { "identifier": "economyScore", "caption": translate("Economy score"), "yStart": 16, "width": 100 }, { "identifier": "explorationScore", "caption": translate("Exploration score"), "yStart": 16, "width": 100 } ], "titleHeadings": [], "counters": [ { "width": 100, "fn": calculateScoreTotal, "verticalOffset": 12 }, - { "width": 100, "fn": calculateEconomyScore, "verticalOffset": 12 }, { "width": 100, "fn": calculateMilitaryScore, "verticalOffset": 12 }, + { "width": 100, "fn": calculateEconomyScore, "verticalOffset": 12 }, { "width": 100, "fn": calculateExplorationScore, "verticalOffset": 12 } ], "teamCounterFn": calculateScoreTeam @@ -22,13 +22,13 @@ "headings": [ { "identifier": "playername", "caption": translate("Player name"), "yStart": 26, "width": 200 }, { "identifier": "total", "caption": translate("Total"), "yStart": 34, "width": 105 }, - { "identifier": "House", "caption": translate("Houses"), "yStart": 34, "width": 85 }, - { "identifier": "Economic", "caption": translate("Economic"), "yStart": 34, "width": 85 }, - { "identifier": "Outpost", "caption": translate("Outposts"), "yStart": 34, "width": 85 }, { "identifier": "Military", "caption": translate("Military"), "yStart": 34, "width": 85 }, { "identifier": "Fortress", "caption": translate("Fortresses"), "yStart": 34, "width": 85 }, { "identifier": "CivCentre", "caption": translate("Civ centers"), "yStart": 34, "width": 85 }, - { "identifier": "Wonder", "caption": translate("Wonders"), "yStart": 34, "width": 85 } + { "identifier": "Wonder", "caption": translate("Wonders"), "yStart": 34, "width": 85 }, + { "identifier": "Economic", "caption": translate("Economic"), "yStart": 34, "width": 85 }, + { "identifier": "House", "caption": translate("Houses"), "yStart": 34, "width": 85 }, + { "identifier": "Outpost", "caption": translate("Outposts"), "yStart": 34, "width": 85 } ], "titleHeadings": [ { @@ -61,13 +61,13 @@ { "identifier": "playername", "caption": translate("Player name"), "yStart": 26, "width": 200 }, { "identifier": "total", "caption": translate("Total"), "yStart": 34, "width": 105 }, { "identifier": "Infantry", "caption": translate("Infantry"), "yStart": 34, "width": 85 }, - { "identifier": "Worker", "caption": translate("Worker"), "yStart": 34, "width": 85 }, { "identifier": "Cavalry", "caption": translate("Cavalry"), "yStart": 34, "width": 85 }, - { "identifier": "Champion", "caption": translate("Champion"), "yStart": 34, "width": 85 }, - { "identifier": "Hero", "caption": translate("Heroes"), "yStart": 34, "width": 85 }, { "identifier": "Siege", "caption": translate("Siege"), "yStart": 34, "width": 85 }, { "identifier": "Ship", "caption": translate("Navy"), "yStart": 34, "width": 85 }, - { "identifier": "Trader", "caption": translate("Traders"), "yStart": 34, "width": 85 } + { "identifier": "Champion", "caption": translate("Champion"), "yStart": 34, "width": 85 }, + { "identifier": "Hero", "caption": translate("Heroes"), "yStart": 34, "width": 85 }, + { "identifier": "Trader", "caption": translate("Traders"), "yStart": 34, "width": 85 }, + { "identifier": "Worker", "caption": translate("Worker"), "yStart": 34, "width": 85 } ], "titleHeadings": [ { @@ -86,10 +86,10 @@ { "width": 105, "fn": calculateUnitsWithCaptured, "verticalOffset": 3 }, { "width": 85, "fn": calculateUnits, "verticalOffset": 3 }, { "width": 85, "fn": calculateUnits, "verticalOffset": 3 }, + { "width": 85, "fn": calculateUnitsWithCaptured, "verticalOffset": 3 }, { "width": 85, "fn": calculateUnits, "verticalOffset": 3 }, { "width": 85, "fn": calculateUnits, "verticalOffset": 3 }, { "width": 85, "fn": calculateUnits, "verticalOffset": 3 }, - { "width": 85, "fn": calculateUnitsWithCaptured, "verticalOffset": 3 }, { "width": 85, "fn": calculateUnits, "verticalOffset": 3 }, { "width": 85, "fn": calculateUnits, "verticalOffset": 3 } ], @@ -100,12 +100,6 @@ "headings": [ { "identifier": "playername", "caption": translate("Player name"), "yStart": 26, "width": 200 }, { "identifier": "total", "caption": translate("Total"), "yStart": 34, "width": 110 }, - ...g_ResourceData.GetResources().map(res => ({ - "identifier": res.code, - "caption": resourceNameFirstWord(res.code), - "yStart": 34, - "width": 100 - })), { "identifier": "tributes", "caption": translate("Tributes"), @@ -119,7 +113,13 @@ }, { "identifier": "treasuresCollected", "caption": translate("Treasures collected"), "yStart": 16, "width": 85 }, { "identifier": "loot", "caption": translate("Loot"), "yStart": 16, "width": 85 }, - { "identifier": "livestock", "caption": translate("Livestock bred"), "yStart": 16, "width": 85 } + { "identifier": "livestock", "caption": translate("Livestock bred"), "yStart": 16, "width": 85 }, + ...g_ResourceData.GetResources().map(res => ({ + "identifier": res.code, + "caption": resourceNameFirstWord(res.code), + "yStart": 34, + "width": 100 + })) ], "titleHeadings": [ { @@ -129,20 +129,20 @@ "used": getColoredTypeTranslation("used") }), "yStart": 16, - "width": 100 * g_ResourceData.GetCodes().length + 110 + "width": 320 * g_ResourceData.GetCodes().length + 110 }, ], "counters": [ { "width": 110, "fn": calculateTotalResources, "verticalOffset": 12 }, + { "width": 121, "fn": calculateTributeSent, "verticalOffset": 12 }, + { "width": 85, "fn": calculateTreasureCollected, "verticalOffset": 12 }, + { "width": 85, "fn": calculateLootCollected, "verticalOffset": 12 }, + { "width": 85, "fn": calculateLivestockTrained, "verticalOffset": 12 }, ...g_ResourceData.GetCodes().map(code => ({ "fn": calculateResources, "verticalOffset": 12, "width": 100 - })), - { "width": 121, "fn": calculateTributeSent, "verticalOffset": 12 }, - { "width": 85, "fn": calculateTreasureCollected, "verticalOffset": 12 }, - { "width": 85, "fn": calculateLootCollected, "verticalOffset": 12 }, - { "width": 85, "fn": calculateLivestockTrained, "verticalOffset": 12 } + })) ], "teamCounterFn": calculateResourcesTeam }, @@ -150,8 +150,8 @@ "caption": translate("Market"), "headings": [ { "identifier": "playername", "caption": translate("Player name"), "yStart": 26, "width": 200 }, - { "identifier": "tradeIncome", "caption": translate("Trade income"), "yStart": 16, "width": 100 }, { "identifier": "barterEfficency", "caption": translate("Barter efficiency"), "yStart": 16, "width": 100 }, + { "identifier": "tradeIncome", "caption": translate("Trade income"), "yStart": 16, "width": 100 }, ...g_ResourceData.GetResources().map(res => { return { "identifier": res.code, @@ -168,8 +168,8 @@ ], "titleHeadings": [], "counters": [ - { "width": 100, "fn": calculateTradeIncome, "verticalOffset": 12 }, { "width": 100, "fn": calculateBarterEfficiency, "verticalOffset": 12 }, + { "width": 100, "fn": calculateTradeIncome, "verticalOffset": 12 }, ...g_ResourceData.GetCodes().map(code => ({ "width": 100, "fn": calculateResourceExchanged, @@ -185,7 +185,6 @@ { "identifier": "killDeath", "caption": translate("Kill / Death ratio"), "yStart": 16, "width": 100 }, { "identifier": "mapControlPeak", "caption": translate("Map control (peak)"), "yStart": 16, "width": 100 }, { "identifier": "mapControl", "caption": translate("Map control (finish)"), "yStart": 16, "width": 100 }, - { "identifier": "mapExploration", "caption": translate("Map exploration"), "yStart": 16, "width": 100 }, { "identifier": "vegetarianRatio", "caption": translate("Vegetarian ratio"), "yStart": 16, "width": 100 }, { "identifier": "feminization", "caption": translate("Feminization"), "yStart": 16, "width": 100 }, { @@ -198,17 +197,18 @@ }), "yStart": 16, "width": 139 - } + }, + { "identifier": "mapExploration", "caption": translate("Map exploration"), "yStart": 16, "width": 100 } ], "titleHeadings": [], "counters": [ { "width": 100, "fn": calculateKillDeathRatio, "verticalOffset": 12 }, { "width": 100, "fn": calculateMapPeakControl, "verticalOffset": 12 }, { "width": 100, "fn": calculateMapFinalControl, "verticalOffset": 12 }, - { "width": 100, "fn": calculateMapExploration, "verticalOffset": 12 }, { "width": 100, "fn": calculateVegetarianRatio, "verticalOffset": 12 }, { "width": 100, "fn": calculateFeminization, "verticalOffset": 12 }, - { "width": 139, "fn": calculateBribes, "verticalOffset": 12 } + { "width": 139, "fn": calculateBribes, "verticalOffset": 12 }, + { "width": 100, "fn": calculateMapExploration, "verticalOffset": 12 } ], "teamCounterFn": calculateMiscellaneousTeam }