Index: gui/page_session.xml
===================================================================
--- gui/page_session.xml (revision 12664)
+++ gui/page_session.xml (working copy)
@@ -9,6 +9,7 @@
common/common_styles.xml
session/sprites.xml
+ session/setup.xml
session/styles.xml
session/session.xml
common/global.xml
Index: gui/session/utility_functions.js
===================================================================
--- gui/session/utility_functions.js (revision 12664)
+++ gui/session/utility_functions.js (working copy)
@@ -4,11 +4,11 @@
const SPECIAL = "special";
const COST_DISPLAY_NAMES = {
- "food": "Food",
- "wood": "Wood",
- "stone": "Stone",
- "metal": "Metal",
- "population": "Population"
+ "food": "[icon=\"iconFood\"]",
+ "wood": "[icon=\"iconWood\"]",
+ "stone": "[icon=\"iconStone\"]",
+ "metal": "[icon=\"iconMetal\"]",
+ "population": "[icon=\"iconPopulation\"]"
};
//-------------------------------- -------------------------------- --------------------------------
@@ -261,11 +261,11 @@
function getEntityCostComponentsTooltipString(template)
{
var costs = [];
- if (template.cost.food) costs.push(template.cost.food + " [font=\"serif-12\"]" + getCostComponentDisplayName("food") + "[/font]");
- if (template.cost.wood) costs.push(template.cost.wood + " [font=\"serif-12\"]" + getCostComponentDisplayName("wood") + "[/font]");
- if (template.cost.metal) costs.push(template.cost.metal + " [font=\"serif-12\"]" + getCostComponentDisplayName("metal") + "[/font]");
- if (template.cost.stone) costs.push(template.cost.stone + " [font=\"serif-12\"]" + getCostComponentDisplayName("stone") + "[/font]");
- if (template.cost.population) costs.push(template.cost.population + " [font=\"serif-12\"]" + getCostComponentDisplayName("population") + "[/font]");
+ if (template.cost.food) costs.push("[font=\"serif-12\"]" + getCostComponentDisplayName("food") + "[/font]" + template.cost.food);
+ if (template.cost.wood) costs.push("[font=\"serif-12\"]" + getCostComponentDisplayName("wood") + "[/font]" + template.cost.wood);
+ if (template.cost.metal) costs.push("[font=\"serif-12\"]" + getCostComponentDisplayName("metal") + "[/font]" + template.cost.metal);
+ if (template.cost.stone) costs.push("[font=\"serif-12\"]" + getCostComponentDisplayName("stone") + "[/font]" + template.cost.stone);
+ if (template.cost.population) costs.push("[font=\"serif-12\"]" + getCostComponentDisplayName("population") + "[/font]" + template.cost.population);
return costs;
}
@@ -317,7 +317,7 @@
var resourceMin = Math.min.apply(Math, resourceCount[resource]);
var resourceMax = Math.max.apply(Math, resourceCount[resource]);
- out.push(resourceMin + " to " + resourceMax + " [font=\"serif-12\"]" + getCostComponentDisplayName(resource) + "[/font]");
+ out.push(getCostComponentDisplayName(resource) + resourceMin + " to " + getCostComponentDisplayName(resource) + resourceMax);
}
}
else
@@ -347,13 +347,13 @@
var towerCosts = getEntityCostComponentsTooltipString(templateTower);
cost += "\n";
- cost += " Walls: " + wallCosts.join("; ") + "\n";
- cost += " Towers: " + towerCosts.join(", ");
+ cost += " Walls: " + wallCosts.join(" ") + "\n";
+ cost += " Towers: " + towerCosts.join(" ");
}
else if (template.cost)
{
var costs = getEntityCostComponentsTooltipString(template);
- cost += costs.join(", ");
+ cost += costs.join(" ");
}
else
{
Index: gui/session/setup.xml
===================================================================
--- gui/session/setup.xml (revision 0)
+++ gui/session/setup.xml (revision 0)
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+