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

Updated GUI scripts to include references to all the new GUI images for the next PASAP milestone in sprite1, and implemented some of it in hello and basefunctions. Mostly just throwing images on the screen, but some new stuff like it shows portraits and stat icons when clicking units now.

Browse Source 
This was SVN commit r1047.
This commit is contained in:
Acumen 2004-08-24 17:17:23 +00:00
parent e287eac695
commit aba8d1daaa
3 changed files with 308 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
binaries/data/mods/official/gui/test/basefunctions.js
View File

@ -30,6 +30,13 @@ function GUIUpdateObjectInfo() {
ObjectNameText = getGUIObjectByName("selection_name_test");
ObjectPositionText = getGUIObjectByName("selection_pos_test");
ObjectSpeedText = getGUIObjectByName("selection_speed_test");
ObjectPortrait = getGUIObjectByName("selection_portrait_test");
ObjectStatAttack = getGUIObjectByName("statistic_attack");
ObjectStatHack = getGUIObjectByName("statistic_hack");
ObjectStatPierce = getGUIObjectByName("statistic_pierce");
ObjectStatAccuracy = getGUIObjectByName("statistic_accuracy");
ObjectStatLOS = getGUIObjectByName("statistic_los");
ObjectStatSpeed = getGUIObjectByName("statistic_speed");
// Check number of selected entities
if (selection.length > 1) {
@ -44,6 +51,17 @@ function GUIUpdateObjectInfo() {
if (!selection[0]) {
// Reset portrait
ObjectPortrait.hidden = true;
// Reset statistic icons.
ObjectStatAttack.hidden = true;
ObjectStatHack.hidden = true;
ObjectStatPierce.hidden = true;
ObjectStatAccuracy.hidden = true;
ObjectStatLOS.hidden = true;
ObjectStatSpeed.hidden = true;
// Reset object name
ObjectNameText.caption = "";
ObjectNameText.hidden = true;
@ -58,6 +76,24 @@ function GUIUpdateObjectInfo() {
} else {
// Update portrait (temporary if/else statement until entity icons are implemented).
if (selection[0].name == "Prometheus Dude") ObjectPortrait.sprite="portrait_unit_dude_lrg";
else
if (selection[0].name == "Deciduous Tree 1" || selection[0].name == "Deciduous Tree 2") ObjectPortrait.sprite="portrait_flora_deciduotree_lrg";
else
if (selection[0].name == "House") ObjectPortrait.sprite="portrait_structure_heleho_lrg";
else
ObjectPortrait.sprite="portrait_unknown_lrg";
ObjectPortrait.hidden = false;
// Turn on statistic icons.
ObjectStatAttack.hidden = false;
ObjectStatHack.hidden = false;
ObjectStatPierce.hidden = false;
ObjectStatAccuracy.hidden = false;
ObjectStatLOS.hidden = false;
ObjectStatSpeed.hidden = false;
// Update object name
ObjectNameText.caption = selection[0].name;
ObjectNameText.hidden = false;
@ -69,7 +105,7 @@ function GUIUpdateObjectInfo() {
ObjectPositionText.hidden = false;
// Update speed
ObjectSpeedText.caption = "Speed: " + selection[0].speed;
ObjectSpeedText.caption = selection[0].speed;
ObjectSpeedText.hidden = false;
}

62
binaries/data/mods/official/gui/test/hello.xml
View File

@ -66,6 +66,13 @@
ball.size = new GUISize(g_ballx-r, g_bally-r, g_ballx+r, g_bally+r);
}
}
function Start()
{
var gameAttribs=new Object();
gameAttribs.mapFile="test_01.pmp";
startGame(gameAttribs);
}
]]></script>
@ -156,6 +163,50 @@
]]></action>
</object>
<!--
==========================================
- RESOURCE ICONS -
==========================================
-->
<object type="text" name="resource_food" sprite="resource_food" size="10 4 14 14" z="100" hidden="false"></object>
<object type="text" name="resource_food_text" size="26 -3 1 1" font="palatino12" textcolor="255 255 255" hidden="false">9999999</object>
<object type="text" name="resource_wood" sprite="resource_wood" size="90 4 14 14" z="100" hidden="false"></object>
<object type="text" name="resource_wood_text" size="106 -3 1 1" font="palatino12" textcolor="255 255 255" hidden="false">9999999</object>
<object type="text" name="resource_stone" sprite="resource_stone" size="170 4 14 14" z="100" hidden="false"></object>
<object type="text" name="resource_stone_text" size="186 -3 1 1" font="palatino12" textcolor="255 255 255" hidden="false">9999999</object>
<object type="text" name="resource_ore" sprite="resource_ore" size="250 4 14 14" z="100" hidden="false"></object>
<object type="text" name="resource_ore_text" size="266 -3 1 1" font="palatino12" textcolor="255 255 255" hidden="false">9999999</object>
<object type="text" name="resource_population" sprite="resource_population" size="330 4 14 14" z="100" hidden="false"></object>
<object type="text" name="resource_population_text" size="346 -3 1 1" font="palatino12" textcolor="255 255 255" hidden="false">9999999</object>
<!--
==========================================
- STATISTIC ICONS -
==========================================
-->
<object type="text" name="statistic_attack" sprite="statistic_attack" size="50%+75 100%-110 20 20" z="100" hidden="false"></object>
<object type="text" name="statistic_hack" sprite="statistic_hack" size="50%+75 100%-75 20 20" z="100" hidden="false"></object>
<object type="text" name="statistic_pierce" sprite="statistic_pierce" size="50%+75 100%-40 20 20" z="100" hidden="false"></object>
<object type="text" name="statistic_accuracy" sprite="statistic_accuracy" size="50%+175 100%-110 20 20" z="100" hidden="false"></object>
<object type="text" name="statistic_los" sprite="statistic_los" size="50%+175 100%-75 20 20" z="100" hidden="false"></object>
<object type="text" name="statistic_speed" sprite="statistic_speed" size="50%+175 100%-40 20 20" z="100" hidden="false"></object>
<!--
==========================================
- MISCELLANEOUS -
@ -183,11 +234,12 @@
getGUIGlobal().GUIUpdateObjectInfo();
]]></action>
</object>
<!-- Entity info text objects -->
<object type="text" name="selection_name_test" size="50%-240 100%-140 50%+200 100%-120" font="giovanni22bold" textcolor="255 255 255" z="60" hidden="false" />
<object type="text" name="selection_pos_test" size="50%-240 100%-115 50%+200 100%-95" textcolor="255 255 255" z="60" hidden="false" />
<object type="text" name="selection_speed_test" size="50%-240 100%-90 50%+200 100%-70" textcolor="255 255 255" z="60" hidden="false" />
<!-- / Entity info text objects -->
<!-- Entity info objects -->
<object type="text" name="selection_portrait_test" sprite="portrait_unit_dude_lrg" size="50%-250 100%-130 64 64" z="60" hidden="false" />
<object type="text" name="selection_name_test" size="50%-180 100%-140 50%+200 100%-120" font="giovanni22bold" textcolor="255 255 255" z="60" hidden="false" />
<object type="text" name="selection_pos_test" size="50%-250 100%-60 50%+200 100%-95" textcolor="255 255 255" z="60" hidden="false" />
<object type="text" name="selection_speed_test" size="50%+200 100%-43 100%-241 0" textcolor="255 255 255" z="60" hidden="false" />
<!-- / Entity info objects -->
<object type="text" name="session_panel_bg_right" sprite="session_panel_bg_right" size="100%-241 100%-161 100% 100%" z="50" hidden="false" />
<object type="text" name="session_panel_tabs_bg_left" sprite="session_panel_tabs_bg1" size="100%-235 100%-152 100%-176 100%-7" z="60" hidden="false" />

241
binaries/data/mods/official/gui/test/sprite1.xml
View File

@ -4,6 +4,12 @@
<sprites>
<!--
==========================================
TEMPORARY IMAGES
==========================================
-->
<!-- Exit Button -->
<sprite name="exit_sprite">
<image texture="exit_button_16.png" texture-size="0 0 16 16" size="0 0 100% 100%" />
@ -56,22 +62,225 @@
</sprite>
<sprite name="icon_command">
<image texture="ui_session_panel_tabs_command_bt.png" texture-size="0 0 32 32" size="0 0 32 32" />
<image texture="ui_session_panel_tabs_command_bt_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<sprite name="icon_buildcivil">
<image texture="ui_session_panel_tabs_buildcivil_bt.png" texture-size="0 0 32 32" size="0 0 32 32" />
<image texture="ui_session_panel_tabs_buildcivil_bt_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<sprite name="icon_buildmil">
<image texture="ui_session_panel_tabs_buildmil_bt.png" texture-size="0 0 32 32" size="0 0 32 32" />
<image texture="ui_session_panel_tabs_buildmil_bt_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<sprite name="icon_formations">
<image texture="ui_session_panel_tabs_formations_bt.png" texture-size="0 0 32 32" size="0 0 32 32" />
<image texture="ui_session_panel_tabs_formations_bt_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<sprite name="icon_research">
<image texture="ui_session_panel_tabs_research_bt_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!--
==========================================
RESOURCE ICONS
==========================================
-->
<sprite name="resource_food">
<image texture="ui_icon_resource_food_16.png" texture-size="0 0 16 16" size="0 0 16 16" />
</sprite>
<sprite name="resource_wood">
<image texture="ui_icon_resource_wood_16.png" texture-size="0 0 16 16" size="0 0 16 16" />
</sprite>
<sprite name="resource_stone">
<image texture="ui_icon_resource_stone_16.png" texture-size="0 0 16 16" size="0 0 16 16" />
</sprite>
<sprite name="resource_ore">
<image texture="ui_icon_resource_ore_16.png" texture-size="0 0 16 16" size="0 0 16 16" />
</sprite>
<sprite name="resource_population">
<image texture="ui_icon_resource_population_16.png" texture-size="0 0 16 16" size="0 0 16 16" />
</sprite>
<!--
==========================================
STATISTIC ICONS
==========================================
-->
<sprite name="statistic_attack">
<image texture="ui_icon_statistic_attack_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
</sprite>
<sprite name="statistic_accuracy">
<image texture="ui_icon_statistic_accuracy_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
</sprite>
<sprite name="statistic_los">
<image texture="ui_icon_statistic_los_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
</sprite>
<sprite name="statistic_pierce">
<image texture="ui_icon_statistic_pierce_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
</sprite>
<sprite name="statistic_hack">
<image texture="ui_icon_statistic_hack_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
</sprite>
<sprite name="statistic_speed">
<image texture="ui_icon_statistic_speed_20.png" texture-size="0 0 32 32" size="0 0 20 20" />
</sprite>
<!--
==========================================
UNIT PORTRAIT ICONS
==========================================
-->
<!-- The Dude -->
<sprite name="portrait_unit_dude_lrg">
<image texture="ui_portrait_unit_dude_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_unit_dude_sml">
<image texture="ui_portrait_unit_dude_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<sprite name="portrait_unit_dude_lrg_over">
<image texture="ui_portrait_unit_dude_64_over.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_unit_dude_sml_over">
<image texture="ui_portrait_unit_dude_32_over.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!-- Generic buttons -->
<!-- The Dudette -->
<sprite name="portrait_unit_dudette_lrg">
<image texture="ui_portrait_unit_dudette_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_unit_dudette_sml">
<image texture="ui_portrait_unit_dudette_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!-- The Dudette -->
<sprite name="portrait_unit_dudette_lrg">
<image texture="ui_portrait_unit_dudette_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_unit_dudette_sml">
<image texture="ui_portrait_unit_dudette_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!--
==========================================
STRUCTURE PORTRAIT ICONS
==========================================
-->
<!-- Hellenic Civic Centre -->
<sprite name="portrait_structure_helecc_lrg">
<image texture="ui_portrait_structure_helecc_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_structure_helecc_sml">
<image texture="ui_portrait_structure_helecc_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!-- Hellenic House -->
<sprite name="portrait_structure_heleho_lrg">
<image texture="ui_portrait_structure_heleho_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_structure_heleho_sml">
<image texture="ui_portrait_structure_heleho_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!--
==========================================
TECH PORTRAIT ICONS
==========================================
-->
<!-- Axe Tech -->
<sprite name="portrait_tech_axe_lrg">
<image texture="ui_portrait_tech_axe_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_tech_axe_sml">
<image texture="ui_portrait_tech_axe_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!-- Tree Tech -->
<sprite name="portrait_tech_tree_lrg">
<image texture="ui_portrait_tech_tree_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_tech_tree_sml">
<image texture="ui_portrait_tech_tree_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!-- Wood Tech -->
<sprite name="portrait_tech_wood_lrg">
<image texture="ui_portrait_tech_wood_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_tech_wood_sml">
<image texture="ui_portrait_tech_wood_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!--
==========================================
FLORA PORTRAIT ICONS
==========================================
-->
<!-- Deciduous Tree -->
<sprite name="portrait_flora_deciduotree_lrg">
<image texture="ui_portrait_flora_deciduotree_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_flora_deciduotree_sml">
<image texture="ui_portrait_flora_deciduotree_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!--
==========================================
ACTION PORTRAIT ICONS
==========================================
-->
<!-- Build Action -->
<sprite name="portrait_action_build_lrg">
<image texture="ui_portrait_action_build_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_action_build_sml">
<image texture="ui_portrait_action_build_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!-- Chop Action -->
<sprite name="portrait_action_chop_lrg">
<image texture="ui_portrait_action_chop_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_action_chop_sml">
<image texture="ui_portrait_action_chop_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!--
==========================================
MISCELLANEOUS PORTRAIT ICONS
==========================================
-->
<!-- Placeholder for Missing Portrait -->
<sprite name="portrait_unknown_lrg">
<image texture="ui_portrait_unknown_64.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_unknown_sml">
<image texture="ui_portrait_unknown_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!--
==========================================
GENERIC BUTTONS
==========================================
-->
<sprite name="sprite1">
<!-- Starting with top left corner continuing in a clockwise manner -->
<image backcolor="255 255 255" size="0 1 1 100%-1" />
@ -160,26 +369,4 @@
<image backcolor="150 105 180" size="2 0 100%-2 100%" z-level="1" />
</sprite>
<!--
==========================================
PORTRAIT ICONS
==========================================
-->
<sprite name="portrait_unit_dude">
<image texture="ui_portrait_unit_dude.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_unit_dude_sml">
<image texture="ui_portrait_unit_dude_sml.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<sprite name="portrait_unit_dude_over">
<image texture="ui_portrait_unit_dude_over.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_unit_dude_sml_over">
<image texture="ui_portrait_unit_dude_sml_over.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
</sprites>