Fixed minor icon glitch. Recompiled. (Quick commit before I try something more drastic.)
This was SVN commit r1506.
This commit is contained in:
parent
11f3b3c575
commit
cb5759c737
BIN
binaries/data/mods/official/art/textures/ui/global/ui_gen_infinity-icon.png
(Stored with Git LFS)
Normal file
BIN
binaries/data/mods/official/art/textures/ui/global/ui_gen_infinity-icon.png
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1370,7 +1370,7 @@
|
|||||||
crd_map_orb_segleft3_x, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft3_y, crd_map_orb_segleft3_x+crd_map_orb_segleft3_width, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft3_y+crd_map_orb_segleft3_height, right_screen, bottom_screen, right_screen, bottom_screen);
|
crd_map_orb_segleft3_x, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft3_y, crd_map_orb_segleft3_x+crd_map_orb_segleft3_width, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft3_y+crd_map_orb_segleft3_height, right_screen, bottom_screen, right_screen, bottom_screen);
|
||||||
]]></action>
|
]]></action>
|
||||||
</object>
|
</object>
|
||||||
<object type="button" name="session_panel_minimap_segleft4" sprite="session_panel_minimap_segleft4" sprite-over="session_panel_minimap_segleft4-lit" z="60" hidden="false">
|
<object type="button" name="session_panel_minimap_segleft4" hotkey="menu.game" sprite="session_panel_minimap_segleft4" sprite-over="session_panel_minimap_segleft4-lit" z="60" hidden="false">
|
||||||
<action on="Load"><![CDATA[
|
<action on="Load"><![CDATA[
|
||||||
AddSizeCoord(this.name,
|
AddSizeCoord(this.name,
|
||||||
crd_map_orb_segleft4_x, crd_map_orb_segleft4_y, crd_map_orb_segleft4_x+crd_map_orb_segleft4_width, crd_map_orb_segleft4_y+crd_map_orb_segleft4_height, right_screen, top_screen, right_screen, top_screen,
|
crd_map_orb_segleft4_x, crd_map_orb_segleft4_y, crd_map_orb_segleft4_x+crd_map_orb_segleft4_width, crd_map_orb_segleft4_y+crd_map_orb_segleft4_height, right_screen, top_screen, right_screen, top_screen,
|
||||||
|
@ -726,6 +726,7 @@ function UpdateStatusOrb()
|
|||||||
// Update Supply/Garrison
|
// Update Supply/Garrison
|
||||||
GUIObject = getGUIObjectByName("session_panel_status_stat1");
|
GUIObject = getGUIObjectByName("session_panel_status_stat1");
|
||||||
GUIObject.caption = '';
|
GUIObject.caption = '';
|
||||||
|
|
||||||
if (selection[0].traits.garrison)
|
if (selection[0].traits.garrison)
|
||||||
{
|
{
|
||||||
if (selection[0].traits.garrison.curr && selection[0].traits.garrison.max)
|
if (selection[0].traits.garrison.curr && selection[0].traits.garrison.max)
|
||||||
@ -733,16 +734,16 @@ function UpdateStatusOrb()
|
|||||||
GUIObject.caption += '[icon="icon_statistic_garrison"] [color="100 100 255"]' + selection[0].traits.garrison.curr + '/' + selection[0].traits.garrison.max + '[/color] ';
|
GUIObject.caption += '[icon="icon_statistic_garrison"] [color="100 100 255"]' + selection[0].traits.garrison.curr + '/' + selection[0].traits.garrison.max + '[/color] ';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (selection[0].traits.supply)
|
if (selection[0].traits.supply)
|
||||||
{
|
{
|
||||||
if (selection[0].traits.supply.curr && selection[0].traits.supply.max && selection[0].traits.supply.type)
|
if (selection[0].traits.supply.curr && selection[0].traits.supply.max && selection[0].traits.supply.type)
|
||||||
{
|
{
|
||||||
GUIObject.caption += '[icon="icon_resource_' + selection[0].traits.supply.type + '"] [color="255 100 100"]';
|
|
||||||
// Special case for infinity.
|
// Special case for infinity.
|
||||||
if (selection[0].traits.supply.curr == "0" && selection[0].traits.supply.max == "0")
|
if (selection[0].traits.supply.curr == "0" && selection[0].traits.supply.max == "0")
|
||||||
GUIObject.caption += '8 ';
|
GUIObject.caption += '[icon="icon_resource_' + selection[0].traits.supply.type + '"] [color="100 100 255"] [icon="infinity_icon"] [/color] ';
|
||||||
else
|
else
|
||||||
GUIObject.caption += selection[0].traits.supply.curr + '/' + selection[0].traits.supply.max;
|
GUIObject.caption += '[icon="icon_resource_' + selection[0].traits.supply.type + '"] [color="100 100 255"]' + selection[0].traits.supply.curr + '/' + selection[0].traits.supply.max + '[/color] ';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -68,6 +68,7 @@
|
|||||||
<!-- Generic Icons / malte, 15th nov -->
|
<!-- Generic Icons / malte, 15th nov -->
|
||||||
<icon name="0ad_icon" texture="0ad_icon" size="16 16" />
|
<icon name="0ad_icon" texture="0ad_icon" size="16 16" />
|
||||||
<icon name="bullet_icon" texture="bullet_icon" size="8 8" />
|
<icon name="bullet_icon" texture="bullet_icon" size="8 8" />
|
||||||
|
<icon name="infinity_icon" texture="infinity_icon" size="16 16" />
|
||||||
|
|
||||||
<!-- Commented out until tooltips are implemented as documented.
|
<!-- Commented out until tooltips are implemented as documented.
|
||||||
<tooltip name="session_tooltip"
|
<tooltip name="session_tooltip"
|
||||||
|
@ -4240,6 +4240,10 @@
|
|||||||
<image texture="global/ui_gen_bullet-icon.png" size="0 0 100% 100%" texture-size="0 0 8 8" />
|
<image texture="global/ui_gen_bullet-icon.png" size="0 0 100% 100%" texture-size="0 0 8 8" />
|
||||||
</sprite>
|
</sprite>
|
||||||
|
|
||||||
|
<sprite name="0ad_icon">
|
||||||
|
<image texture="global/ui_gen_infinity-icon.png" size="0 0 100% 100%" texture-size="0 0 16 16" />
|
||||||
|
</sprite>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
==========================================
|
==========================================
|
||||||
MESSAGE BOX
|
MESSAGE BOX
|
||||||
|
Loading…
Reference in New Issue
Block a user