Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Made multiple unit selection health bar vertical again

Browse Source 
Increased unit selection icons to 16
Added total unit count

This was SVN commit r8292.
This commit is contained in:
WhiteTreePaladin 2010-10-06 04:19:25 +00:00
parent ff8477c339
commit ca223eeb5b
5 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binaries/data/mods/public/gui/session_new/selection_details.js
View File

@ -153,7 +153,7 @@ function displayMultiple(selection, template)
var unitHealthBar = getGUIObjectByName("healthBarMultiple");
var healthSize = unitHealthBar.size;
healthSize.rright = 100*Math.max(0, Math.min(1, averageHealth / maxHealth));
healthSize.rtop = 100-100*Math.max(0, Math.min(1, averageHealth / maxHealth));
unitHealthBar.size = healthSize;
var hitpoints = "[font=\"serif-bold-13\"]Hitpoints [/font]" + averageHealth + "/" + maxHealth;
@ -161,6 +161,8 @@ function displayMultiple(selection, template)
}
}
getGUIObjectByName("numberOfUnits").caption = selection.length;
// Unhide Details Area
getGUIObjectByName("detailsAreaMultiple").hidden = false;
getGUIObjectByName("detailsAreaSingle").hidden = true;

21
binaries/data/mods/public/gui/session_new/session.xml
View File

@ -157,7 +157,7 @@
<!-- ================================ ================================ -->
<!-- Notification Area -->
<!-- ================================ ================================ -->
<object name="notificationPanel" type="image" size="50%-300 30 50%+300 90" ghost="true">
<object name="notificationPanel" type="image" size="50%-300 100%-280 50%+300 100%-220" ghost="true">
<object name="notificationText" size="0 0 100% 100%" type="text" style="notificationPanel" ghost="true"/>
</object>
@ -429,7 +429,7 @@
</object>
<object name="unitGarrisonPanel"
size="12 12 100% 100%"
size="20 10 100% 100%"
>
<!--<object size="-6 -6 50 50" type="image" sprite="snIconSheetTab" tooltip_style="snToolTip" cell_id="1" tooltip="Garrison"/>-->
@ -504,14 +504,14 @@
<object size="0 142 100% 162" name="specific" type="text" style="largeCenteredOutlinedText" tooltip_style="snToolTip"/>
</object>
<!-- Unit details for Multiplle Units -->
<!-- Unit details for Multiple Units -->
<object size="50%-112 0 50%+112 100%" name="detailsAreaMultiple">
<object name="unitSelectionPanel"
size="35 10 100%-20 100%"
size="20 10 100%-20 100%"
>
<object size="0 0 100% 100%">
<repeat count="12">
<repeat count="16">
<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" z="100">
<object name="unitSelectionIcon[n]" type="image" ghost="true" size="1 1 37 37"/>
<object name="unitSelectionCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
@ -522,17 +522,22 @@
</object>
</object>
<!-- Total -->
<object size="100%-42 12 100%-8 46" type="image" sprite="maceIcon">
<object size="0 0 100%-2 100%-2" type="text" style="largeCenteredOutlinedText" name="numberOfUnits"/>
</object>
<!-- Stats Bars -->
<object size= "55 100%-70 100%-55 100%-40" type="image" tooltip_style="snToolTip">
<object size= "100%-38 52 100%-18 100%-40" type="image" tooltip_style="snToolTip">
<!-- Health bar -->
<object size="0 0 100% 12" type="image" name="healthMultiple" tooltip="Hitpoints" tooltip_style="snToolTip">
<object size="0 0 12 100%" type="image" name="healthMultiple" tooltip="Hitpoints" tooltip_style="snToolTip">
<object type="image" sprite="healthBackground" ghost="true"/>
<object type="image" sprite="healthForeground" ghost="true" name="healthBarMultiple"/>
<object type="image" sprite="statsBarShader" ghost="true"/>
</object>
<!-- Stamina bar -->
<object size="0 14 100% 26" type="image" name="staminaMultiple" tooltip="Stamina" tooltip_style="snToolTip">
<object size="14 0 26 100%" type="image" name="staminaMultiple" tooltip="Stamina" tooltip_style="snToolTip">
<object type="image" sprite="staminaBackground" ghost="true"/>
<object type="image" sprite="staminaForeground" ghost="true" name="staminaBarMultiple"/>
<object type="image" sprite="statsBarShader" ghost="true"/>

9
binaries/data/mods/public/gui/session_new/sprites.xml
View File

@ -12,12 +12,19 @@
/>
</sprite>
<sprite name="celtIcon">->
<sprite name="celtIcon">
<image
texture="session/portraits/emblems/emblem_celts.png"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="maceIcon">
<image
texture="session/portraits/emblems/emblem_macedon.png"
size="0 0 100% 100%"
/>
</sprite>
<!-- ================================ ================================ -->
<!-- Unit Command Icons -->

2
binaries/data/mods/public/gui/session_new/styles.xml
View File

@ -154,7 +154,7 @@
font="serif-bold-stroke-14"
textcolor="white"
text_align="center"
text_valign="top"
text_valign="bottom"
/>
<style name="netStatus"

4
binaries/data/mods/public/gui/session_new/unit_commands.js
View File

@ -117,8 +117,8 @@ function setupUnitPanel(guiName, usedPanels, unitEntState, items, callback)
if (guiName == "Selection")
{
if (numberOfItems > 12)
numberOfItems = 12;
if (numberOfItems > 16)
numberOfItems = 16;
}
if (guiName == "Formation" || guiName == "Garrison")
{