More GUI updates.
This was SVN commit r1348.
This commit is contained in:
parent
ee6ae42c5f
commit
1448568308
@ -26,7 +26,7 @@
|
||||
GUIObjectHide("pregame_gui");
|
||||
FlipGUI(GUIType);
|
||||
// curr_music.free(); // Close main theme when starting game session.
|
||||
curr_session_music = new Sound("audio/music/germanic_peace_1.ogg");
|
||||
curr_session_music = new Sound("audio/music/germanic_peace_2.ogg");
|
||||
curr_session_music.play();
|
||||
]]></action>
|
||||
<action on="MouseEnter"><![CDATA[
|
||||
|
@ -735,8 +735,6 @@
|
||||
AddSizeCoord(this.name,
|
||||
crd_status_orb_armour_x, crd_status_orb_armour_y, crd_status_orb_armour_x+crd_status_orb_armour_width, crd_status_orb_armour_y+crd_status_orb_armour_height, left_screen, top_screen, left_screen, top_screen,
|
||||
crd_status_orb_armour_x, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_armour_y, crd_status_orb_armour_x+crd_status_orb_armour_width, -crd_status_orb_bkg_y-crd_status_orb_bkg_height+crd_status_orb_armour_y+crd_status_orb_armour_height, left_screen, bottom_screen, left_screen, bottom_screen);
|
||||
|
||||
getGUIObjectByName("session_panel_status_armour").caption = "Attack:\nArmour:\n";
|
||||
]]></action>
|
||||
</object>
|
||||
|
||||
|
@ -79,7 +79,7 @@ function initStatusOrb()
|
||||
|
||||
// Armour.
|
||||
crd_status_orb_armour_width = crd_status_orb_bkg_width;
|
||||
crd_status_orb_armour_height = (crd_status_orb_name1_y)-(crd_status_orb_xpbar_y+crd_status_orb_xpbar_height)-10;
|
||||
crd_status_orb_armour_height = (crd_status_orb_name1_y)-(crd_status_orb_xpbar_y+crd_status_orb_xpbar_height)-25;
|
||||
crd_status_orb_armour_x = crd_status_orb_name3_x;
|
||||
crd_status_orb_armour_y = crd_status_orb_xpbar_y+crd_status_orb_xpbar_height+10;
|
||||
}
|
||||
@ -167,6 +167,19 @@ function UpdateStatusOrb()
|
||||
getGUIObjectByName("session_panel_status_icon_xp_bar").hidden = true;
|
||||
}
|
||||
|
||||
// Update stats
|
||||
if (selection[0].actions.attack && selection[0].actions.attack.damage && selection[0].actions.attack.damage > 0 && selection[0].actions.attack.crush && selection[0].actions.attack.hack && selection[0].actions.attack.pierce)
|
||||
{
|
||||
getGUIObjectByName("session_panel_status_armour").caption = "" + selection[0].actions.attack.damage + " (" + Math.round(selection[0].actions.attack.hack*100) + "% " + Math.round(selection[0].actions.attack.pierce*100) + "% " + Math.round(selection[0].actions.attack.crush*100) + "%)\n";
|
||||
}
|
||||
else
|
||||
getGUIObjectByName("session_panel_status_armour").caption = "";
|
||||
|
||||
if (selection[0].traits.armour && selection[0].traits.armour.value && selection[0].traits.armour.value > 0 && selection[0].traits.armour.crush && selection[0].traits.armour.hack && selection[0].traits.armour.pierce)
|
||||
{
|
||||
getGUIObjectByName("session_panel_status_armour").caption += "" + selection[0].traits.armour.value + " (" + Math.round(selection[0].traits.armour.hack*100) + "% " + Math.round(selection[0].traits.armour.pierce*100) + "% " + Math.round(selection[0].traits.armour.crush*100) + "%)";
|
||||
}
|
||||
|
||||
// Reveal Status Orb
|
||||
getGUIObjectByName("session_status_orb").hidden = false;
|
||||
}
|
||||
|
@ -55,6 +55,14 @@
|
||||
<icon name="icon_statistic_rank2" texture="statistic_rank2" size="20 20" />
|
||||
<icon name="icon_statistic_rank3" texture="statistic_rank3" size="20 20" />
|
||||
<icon name="icon_statistic_hp" texture="statistic_hp" size="20 20" />
|
||||
<icon name="icon_statistic_accuracy" texture="statistic_accuracy" size="20 20" />
|
||||
<icon name="icon_statistic_armour" texture="statistic_armour" size="20 20" />
|
||||
<icon name="icon_statistic_attack" texture="statistic_attack" size="20 20" />
|
||||
<icon name="icon_statistic_crush" texture="statistic_crush" size="20 20" />
|
||||
<icon name="icon_statistic_hack" texture="statistic_hack" size="20 20" />
|
||||
<icon name="icon_statistic_los" texture="statistic_los" size="20 20" />
|
||||
<icon name="icon_statistic_pierce" texture="statistic_pierce" size="20 20" />
|
||||
<icon name="icon_statistic_speed" texture="statistic_speed" size="20 20" />
|
||||
|
||||
<!-- Generic Icons / malte, 15th nov -->
|
||||
<icon name="0ad_icon" texture="0ad_icon" size="16 16" />
|
||||
|
@ -306,7 +306,7 @@
|
||||
-->
|
||||
|
||||
<sprite name="statistic_hp">
|
||||
<image texture="ui_icon_statistic_hp_20.png" texture-size="0 0 32 32" size="0 0 100% 100%" />
|
||||
<image texture="ui_icon_statistic_hp_128.png" texture-size="0 0 128 128" size="0 0 100% 100%" />
|
||||
</sprite>
|
||||
|
||||
<sprite name="statistic_rank1">
|
||||
@ -325,6 +325,38 @@
|
||||
<image texture="ui_icon_statistic_garrison_20.png" texture-size="0 0 32 32" size="0 0 100% 100%" />
|
||||
</sprite>
|
||||
|
||||
<sprite name="statistic_accuracy">
|
||||
<image texture="ui_icon_statistic_accuracy_20.png" texture-size="0 0 32 32" size="0 0 100% 100%" />
|
||||
</sprite>
|
||||
|
||||
<sprite name="statistic_armour">
|
||||
<image texture="ui_icon_statistic_hack_20.png" texture-size="0 0 32 32" size="0 0 100% 100%" />
|
||||
</sprite>
|
||||
|
||||
<sprite name="statistic_attack">
|
||||
<image texture="ui_icon_statistic_attack_20.png" texture-size="0 0 32 32" size="0 0 100% 100%" />
|
||||
</sprite>
|
||||
|
||||
<sprite name="statistic_crush">
|
||||
<image texture="ui_icon_statistic_crush_20.png" texture-size="0 0 32 32" size="0 0 100% 100%" />
|
||||
</sprite>
|
||||
|
||||
<sprite name="statistic_hack">
|
||||
<image texture="ui_icon_statistic_hack_20.png" texture-size="0 0 32 32" size="0 0 100% 100%" />
|
||||
</sprite>
|
||||
|
||||
<sprite name="statistic_los">
|
||||
<image texture="ui_icon_statistic_los_20.png" texture-size="0 0 32 32" size="0 0 100% 100%" />
|
||||
</sprite>
|
||||
|
||||
<sprite name="statistic_pierce">
|
||||
<image texture="ui_icon_statistic_pierce_20.png" texture-size="0 0 32 32" size="0 0 100% 100%" />
|
||||
</sprite>
|
||||
|
||||
<sprite name="statistic_speed">
|
||||
<image texture="ui_icon_statistic_speed_20.png" texture-size="0 0 32 32" size="0 0 100% 100%" />
|
||||
</sprite>
|
||||
|
||||
<!--
|
||||
==========================================
|
||||
ENTITY SINGLE PORTRAITS
|
||||
|
Loading…
Reference in New Issue
Block a user