abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Update unit experience display

Browse Source 
This was SVN commit r11978.
This commit is contained in:
WhiteTreePaladin 2012-06-17 00:28:05 +00:00
parent b269dabe3b
commit 972f28c6a7
5 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
binaries/data/mods/public/art/textures/ui/session/bar_lighting.png → binaries/data/mods/public/art/textures/ui/session/bar_lighting_horizontal.png
View File

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

Binary file not shown.

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

@ -66,7 +66,7 @@ function displaySingle(entState, template)
{
var experienceBar = getGUIObjectByName("experienceBar");
var experienceSize = experienceBar.size;
experienceSize.rright = 100 * Math.max(0, Math.min(1, 1.0 * +entState.promotion.curr / +entState.promotion.req));
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);

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

@ -626,7 +626,7 @@
<object size="0 16 100% 24" name="health" type="image">
<object type="image" sprite="healthBackground" ghost="true"/>
<object type="image" sprite="healthForeground" ghost="true" name="healthBar"/>
<object type="image" sprite="statsBarShader" ghost="true"/>
<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
</object>
</object>
@ -637,7 +637,7 @@
<object size="0 16 100% 24" name="stamina" type="image">
<object type="image" sprite="staminaBackground" ghost="true"/>
<object type="image" sprite="staminaForeground" ghost="true" name="staminaBar"/>
<object type="image" sprite="statsBarShader" ghost="true"/>
<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
</object>
</object>
@ -648,7 +648,7 @@
<object size="0 16 100% 24" name="resources" type="image">
<object type="image" sprite="resourceBackground" ghost="true"/>
<object type="image" sprite="resourceForeground" ghost="true" name="resourceBar"/>
<object type="image" sprite="statsBarShader" ghost="true"/>
<object type="image" sprite="statsBarShaderHorizontal" ghost="true"/>
</object>
</object>
@ -663,14 +663,15 @@
<!-- Big unit icon -->
<object size="-6 -6 90 90" type="image" name="iconBorder" sprite="iconBorder" tooltip_style="sessionToolTip">
<object size="1 1 100%-1 100%-1" type="image" name="icon" ghost="true"/>
<object size="100%-20 4 100%-4 20" name="rankIcon" type="image" sprite="" ghost="true"/>
<!-- Experience bar -->
<object size="1 100%-7 100%-1 100%-1" type="image" name="experience" tooltip="Experience" tooltip_style="sessionToolTip">
<object size="1 1 9 100%-1" type="image" name="experience" tooltip="Experience" tooltip_style="sessionToolTip">
<object type="image" sprite="experienceBackground" ghost="true"/>
<object type="image" sprite="experienceForeground" ghost="true" name="experienceBar"/>
<object type="image" sprite="statsBarShader" ghost="true"/>
<object type="image" sprite="statsBarShaderVertical" ghost="true"/>
</object>
<object z="20" size="4 4 20 20" name="rankIcon" type="image" sprite="" ghost="true"/>
</object>
<!-- Names -->
@ -692,7 +693,6 @@
<object size="0 45 100% 100%">
<object size="50%-64 -24 50%+64 112" name="playerCivIcon" ghost="true" type="image"/>
<object size="0 0 100% 100%" name="playerColorBackground" ghost="true" type="image" sprite="playerColorBackground"/>
<object size="0 0 100% 100%" type="image" ghost="true" sprite="playerColorShader"/>
<!-- Why is this being automatically ghosted? In the mean time, set ghost to false -->
<object ghost="false" size="0 0 100% 100%-5" name="player" type="text" style="SecondaryTextCentered" tooltip_style="sessionToolTip"/>

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

@ -510,12 +510,12 @@
<image backcolor="0 0 0 50" size="0 5 100% 100%"/>
</sprite>
<sprite name="playerColorShader">
<image texture="session/panel_shader_edge.png"
real_texture_placement="0 0 256 5"
<!-- <sprite name="playerColorShader">
<image texture="session/panel_shader.png"
real_texture_placement="0 0 256 32"
size="0 0 100% 100%"
/>
</sprite>
</sprite>-->
<sprite name="glassSquareMap">
<image backcolor="255 255 255 56" size="0 0 100% 1"/>
@ -559,13 +559,8 @@
<image backcolor="gold" size="0 1 1 100%-1"/>
</sprite>
<sprite name="statsBarShader">
<image texture="session/bar_lighting.png"
real_texture_placement="0 0 150 7"
size="0 0 100% 100%"
/>
<!-- <image backcolor="0 0 0 192" size="0 0 100% 1"/>
<!-- <sprite name="statsBarShader">
<image backcolor="0 0 0 192" size="0 0 100% 1"/>
<image backcolor="0 0 0 192" size="100%-1 1 100% 100%-1"/>
<image backcolor="0 0 0 192" size="0 100%-1 100% 100%"/>
<image backcolor="0 0 0 192" size="0 1 1 100%-1"/>
@ -578,10 +573,24 @@
<image backcolor="0 0 0 64" size="0 2 100% 3"/>
<image backcolor="0 0 0 64" size="100%-3 3 100%-2 100%-3"/>
<image backcolor="0 0 0 64" size="0 100%-3 100% 100%-2"/>
<image backcolor="0 0 0 64" size="2 3 3 100%-3"/>-->
<image backcolor="0 0 0 64" size="2 3 3 100%-3"/>
</sprite>-->
<sprite name="statsBarShaderHorizontal">
<image texture="session/bar_lighting_horizontal.png"
real_texture_placement="0 0 150 7"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="detailsShader">
<sprite name="statsBarShaderVertical">
<image texture="session/bar_lighting_vertical.png"
real_texture_placement="0 0 7 150"
size="0 0 100% 100%"
/>
</sprite>
<!-- <sprite name="detailsShader">
<image backcolor="0 0 0 100" size="4 4 100%-4 100%-4"/>
<image backcolor="0 0 0 192" size="0 0 100% 1"/>
@ -598,7 +607,7 @@
<image backcolor="0 0 0 64" size="100%-3 3 100%-2 100%-3"/>
<image backcolor="0 0 0 64" size="0 100%-3 100% 100%-2"/>
<image backcolor="0 0 0 64" size="2 3 3 100%-3"/>
</sprite>
</sprite>-->
<!-- ================================ ================================ -->
<!-- Colored Stats Bars -->