real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Shrink experience bar, add tooltip to rank icon, rework middle panel shading

Browse Source 
This was SVN commit r11984.
This commit is contained in:
WhiteTreePaladin 2012-06-18 22:33:40 +00:00
parent a34232d71e
commit 033120e8d8
5 changed files with 273 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
binaries/data/mods/public/art/textures/ui/session/panel_shader.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

6
binaries/data/mods/public/gui/session/selection_details.js
View File

@ -31,7 +31,11 @@ function displaySingle(entState, template)
}
// Rank
if (entState.identity && entState.identity.rank && entState.identity.classes)
{
getGUIObjectByName("rankIcon").sprite = getRankIconSprite(entState);
getGUIObjectByName("rankIcon").tooltip = entState.identity.rank;
}
// Hitpoints
if (entState.hitpoints)
@ -69,7 +73,7 @@ function displaySingle(entState, template)
experienceSize.rtop = 100 - (100 * Math.max(0, Math.min(1, 1.0 * +entState.promotion.curr / +entState.promotion.req)));
experienceBar.size = experienceSize;
var experience = "[font=\"serif-bold-13\"]Experience [/font]" + Math.floor(entState.promotion.curr);
var experience = "[font=\"serif-bold-13\"]Experience: [/font]" + Math.floor(entState.promotion.curr);
if (entState.promotion.curr < entState.promotion.req)
experience += "/" + entState.promotion.req;
getGUIObjectByName("experience").tooltip = experience;

16
binaries/data/mods/public/gui/session/session.xml
View File

@ -617,7 +617,7 @@
<object size="50%-112 0 50%+112 100%" name="detailsAreaSingle">
<!-- Stats Bars -->
<object size= "2 0 100%-2 98" type="image" sprite="topPanelShader" tooltip_style="sessionToolTip">
<object size= "2 0 100%-2 98" type="image" tooltip_style="sessionToolTip">
<!-- Health bar -->
<object size="88 8 100% 32" name="healthSection">
@ -655,27 +655,29 @@
</object>
</object>
<object size="0 60 100% 94" type="image" sprite="topPanelShader">
<!-- Attack and Armor -->
<object size="90 60 126 96" name="attackAndArmorStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip="Attack and Armor" tooltip_style="sessionToolTip"/>
<object size="90 0 126 36" name="attackAndArmorStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip="Attack and Armor" tooltip_style="sessionToolTip"/>
<!-- Resource carrying icon/counter -->
<object size="100%-72 60 100%-26 96" type="text" name="resourceCarryingText" style="StatsTextRight"/>
<object size="100%-32 60 100%+4 96" type="image" name="resourceCarryingIcon"/>
<object size="100%-72 0 100%-26 36" type="text" name="resourceCarryingText" style="StatsTextRight"/>
<object size="100%-32 0 100%+4 36" type="image" name="resourceCarryingIcon"/>
</object>
<!-- Big unit icon -->
<object size="-6 -6 90 90" type="image" name="iconBorder" sprite="iconBorder" tooltip_style="sessionToolTip">
<object size="-8 -8 88 88" type="image" name="iconBorder" sprite="iconBorder" tooltip_style="sessionToolTip">
<object size="1 1 100%-1 100%-1" type="image" name="icon" ghost="true"/>
<!-- Experience bar -->
<object size="2 2 9 100%-2" type="image" name="experience" tooltip="Experience" tooltip_style="sessionToolTip">
<object size="2 2 5 100%-2" type="image" name="experience" tooltip="Experience" tooltip_style="sessionToolTip">
<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
<object type="image" sprite="experienceBackground" ghost="true"/>
<object type="image" sprite="experienceForeground" ghost="true" name="experienceBar"/>
<object type="image" sprite="statsBarShaderVertical" ghost="true"/>
</object>
<object z="20" size="4 4 20 20" name="rankIcon" type="image" sprite="" ghost="true"/>
<object z="20" size="4 4 20 20" name="rankIcon" type="image" tooltip="Rank" tooltip_style="sessionToolTip"/>
</object>
</object>
<!-- Names -->

12
binaries/data/mods/public/gui/session/sprites.xml
View File

@ -493,21 +493,25 @@
</sprite>
<sprite name="topPanelShader">
<image backcolor="0 0 0 72" size="0 5 100% 100%-5"/>
<image texture="session/panel_shader.png"
size="0 0 100% 100%"
/>
<image texture="session/panel_shader_edge.png"
real_texture_placement="0 0 256 5"
size="0 100%-5 100% 100%"
size="0 100% 100% 100%+5"
/>
</sprite>
<sprite name="bottomPanelShader">
<image texture="session/panel_shader_edge.png"
real_texture_placement="0 0 256 5"
size="0 0 100% 5"
size="0 -5 100% 0"
/>
<image backcolor="0 0 0 50" size="0 5 100% 100%"/>
<image texture="session/panel_shader.png"
size="0 0 100% 100%"
/>
</sprite>
<!-- <sprite name="playerColorShader">

20
binaries/data/mods/public/gui/session/utility_functions.js
View File

@ -47,7 +47,12 @@ function getPlayerData(playerAssignments)
var name = playerState.name;
var civ = playerState.civ;
var color = {"r": playerState.colour.r*255, "g": playerState.colour.g*255, "b": playerState.colour.b*255, "a": playerState.colour.a*255};
var color = {
"r": playerState.colour.r*255,
"g": playerState.colour.g*255,
"b": playerState.colour.b*255,
"a": playerState.colour.a*255
};
var player = {
"name": name,
@ -351,24 +356,13 @@ function getEntityRankedName(entState)
}
function getRankIconSprite(entState)
{
if (entState.identity && entState.identity.rank && entState.identity.classes)
{
if ("Elite" == entState.identity.rank)
{
return "stretched:session/icons/rank3.png";
}
else if ("Advanced" == entState.identity.rank)
{
return "stretched:session/icons/rank2.png";
}
else if (entState.identity.classes &&
entState.identity.classes.length &&
-1 != entState.identity.classes.indexOf("CitizenSoldier"))
{
else if (entState.identity.classes && entState.identity.classes.length && -1 != entState.identity.classes.indexOf("CitizenSoldier"))
return "stretched:session/icons/rank1.png";
}
}
return "";
}