1
1
forked from 0ad/0ad

Various fixes from Malte, including a General's Tent main menu.

This was SVN commit r1082.
This commit is contained in:
Acumen 2004-08-29 19:33:22 +00:00
parent 1036f4cb5b
commit e76c245227
2 changed files with 79 additions and 66 deletions

View File

@ -21,9 +21,9 @@
function selected()
{
if( selection.length > 0 )
return( selection[0] );
return( null );
if( selection.length > 0 )
return( selection[0] );
return( null );
}
function updateOrbital()
@ -95,17 +95,16 @@
<object type="empty" name="pregame_gui" size="0 0 100% 100%" z="1" hidden="false">
<object type="button" name="Start_Game_Button" sprite="sprite1" sprite-over="sprite1-over" sprite-pressed="sprite1-pressed" size="100%-150 2 100%-30 23" z="100" textcolor="0 0 0" hidden="false">
Start Game
<!-- TEST -->
<object type="button" name="pregame-mainmenu-background-image" sprite="pregame-mainmenu-background" size="0 0 100% 100%" z="100" hidden="false" />
<object type="button" name="pregame-mainmenu-sp-button" sprite-over="pregame-mainmenu-spbt" size="53% 24% 67% 42%" z="101" hidden="false">
<action on="Press"><![CDATA[
GUIObjectUnhide("session_gui");
GUIObjectHide("Start_Game_Button");
GUIObjectUnhide("End_Game_Button");
startGame();
GUIObjectUnhide("session_gui");
GUIObjectHide("pregame_gui")
GUIObjectUnhide("End_Game_Button")
]]></action>
</object>
</object>
<object type="button" name="End_Game_Button" sprite="sprite1" sprite-over="sprite1-over" sprite-pressed="sprite1-pressed" size="100%-150 32 100%-30 53" z="100" textcolor="0 0 0" hidden="true">
@ -200,24 +199,6 @@
<object type="text" name="resource_population_text" size="100%-118 -3 1 1" font="prospero16" textcolor="255 255 255" z="100" hidden="false"> 100/150</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>
<!--
==========================================
- PHASE BANNER -
@ -360,6 +341,24 @@
==========================================
-->
<!--
==========================================
- 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>
<!--
==========================================
- ORBITAL BALL ARENA OBJECTS -

View File

@ -23,6 +23,20 @@
<image texture="wfg_logo_128.tga" texture-size="0 0 128 128" size="0 0 128 128" />
</sprite>
<!--
==========================================
PREGAME GUI
==========================================
-->
<sprite name="pregame-mainmenu-background">
<image texture="ui_pregame_mainmenu_background.png" texture-size="0 0 100% 133%+4" size="0 0 100% 100%" />
</sprite>
<sprite name="pregame-mainmenu-spbt">
<image texture="ui_pregame_mainmenu_spbt_over.png" texture-size="0 0 256 256" size="0 0 152 143" />
</sprite>
<!--
==========================================
BOTTOM PANEL IN SESSION UI
@ -151,32 +165,32 @@
==========================================
-->
<!-- The Dude -->
<!-- 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" />
<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" />
<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" />
<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" />
<image texture="ui_portrait_unit_dude_32_over.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!-- The Dudette -->
<!-- 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" />
<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" />
<image texture="ui_portrait_unit_dudette_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<sprite name="portrait_unit_dudette_lrg_over">
<image texture="ui_portrait_unit_dudette_64_over.png" texture-size="0 0 64 64" size="0 0 64 64" />
<image texture="ui_portrait_unit_dudette_64_over.png" texture-size="0 0 64 64" size="0 0 64 64" />
</sprite>
<sprite name="portrait_unit_dudette_sml_over">
<image texture="ui_portrait_unit_dudette_32_over.png" texture-size="0 0 32 32" size="0 0 32 32" />
<image texture="ui_portrait_unit_dudette_32_over.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!--
@ -185,20 +199,20 @@
==========================================
-->
<!-- Hellenic Civic Centre -->
<!-- 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" />
<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" />
<image texture="ui_portrait_structure_helecc_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!-- Hellenic House -->
<!-- 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" />
<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" />
<image texture="ui_portrait_structure_heleho_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!--
@ -207,28 +221,28 @@
==========================================
-->
<!-- Axe Tech -->
<!-- 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" />
<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" />
<image texture="ui_portrait_tech_axe_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!-- Tree Tech -->
<!-- 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" />
<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" />
<image texture="ui_portrait_tech_tree_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!-- Wood Tech -->
<!-- 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" />
<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" />
<image texture="ui_portrait_tech_wood_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!--
@ -237,12 +251,12 @@
==========================================
-->
<!-- Deciduous Tree -->
<!-- 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" />
<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" />
<image texture="ui_portrait_flora_deciduotree_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!--
@ -251,20 +265,20 @@
==========================================
-->
<!-- Build Action -->
<!-- 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" />
<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" />
<image texture="ui_portrait_action_build_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!-- Chop Action -->
<!-- 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" />
<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" />
<image texture="ui_portrait_action_chop_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!--
@ -273,12 +287,12 @@
==========================================
-->
<!-- Placeholder for Missing Portrait -->
<!-- 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" />
<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" />
<image texture="ui_portrait_unknown_32.png" texture-size="0 0 32 32" size="0 0 32 32" />
</sprite>
<!--