mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace resource names with icons in tooltips. Based on patch by zoot. Fixes #1675.

Browse Source 
This was SVN commit r12845.
This commit is contained in:
leper
2012-11-11 15:35:01 +00:00
parent beff7a187d
commit 93b0048576
8 changed files with 59 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/art/textures/ui/session/icons/resources/food_small.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/textures/ui/session/icons/resources/metal_small.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/textures/ui/session/icons/resources/population_small.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/textures/ui/session/icons/resources/stone_small.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/textures/ui/session/icons/resources/wood_small.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/gui/page_session.xml
+3 -2
View File
@@ -5,10 +5,11 @@
<include>common/sprite1.xml</include>
<include>common/icon_sprites.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>common/common_sprites.xml</include>
<include>common/common_styles.xml</include>
<include>session/sprites.xml</include>
<include>session/setup.xml</include>
<include>session/styles.xml</include>
<include>session/session.xml</include>
<include>common/global.xml</include>
binaries/data/mods/public/gui/session/setup.xml
+25
View File
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<setup>
<!-- Icons -->
<icon name="iconFood"
sprite="stretched:session/icons/resources/food_small.png"
size="16 16"
/>
<icon name="iconMetal"
sprite="stretched:session/icons/resources/metal_small.png"
size="16 16"
/>
<icon name="iconPopulation"
sprite="stretched:session/icons/resources/population_small.png"
size="16 16"
/>
<icon name="iconStone"
sprite="stretched:session/icons/resources/stone_small.png"
size="16 16"
/>
<icon name="iconWood"
sprite="stretched:session/icons/resources/wood_small.png"
size="16 16"
/>
</setup>
binaries/data/mods/public/gui/session/utility_functions.js
+16 -16
View File
@@ -4,11 +4,11 @@ const FAUNA = "fauna";
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\"]"
};
//-------------------------------- -------------------------------- --------------------------------
@@ -264,11 +264,11 @@ function getCostComponentDisplayName(costComponentName)
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;
}
@@ -320,7 +320,7 @@ function getWallPieceTooltip(wallTypes)
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
@@ -350,13 +350,13 @@ function getEntityCostTooltip(template)
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
{
@@ -384,9 +384,9 @@ function getNeededResourcesTooltip(resources)
{
var formatted = [];
for (var resource in resources)
formatted.push(resources[resource] + " [font=\"serif-12\"]" + getCostComponentDisplayName(resource) + "[/font]");
formatted.push("[font=\"serif-12\"]" + getCostComponentDisplayName(resource) + "[/font] " + resources[resource]);
return "\n\n[font=\"serif-bold-13\"][color=\"red\"]Insufficient resources:[/color][/font]\n" + formatted.join(", ");
return "\n\n[font=\"serif-bold-13\"][color=\"red\"]Insufficient resources:[/color][/font]\n" + formatted.join(" ");
}
function getEntitySpeed(template)