real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

New session tooltip colors and some code cleanup.

Browse Source 
This was SVN commit r10197.
This commit is contained in:
WhiteTreePaladin 2011-09-07 01:43:56 +00:00
parent 56ce7f7809
commit 85f60c4d28
7 changed files with 201 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
binaries/data/mods/public/gui/common/common_sprites.xml
View File

@ -40,27 +40,36 @@
</sprite>
<sprite name="BackgroundRed">
<image backcolor="80 0 0 255"
<image backcolor="darkred"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="BackgroundRedBorderGold">
<image backcolor="80 0 0 255"
<sprite name="BackgroundSelectArea">
<image backcolor="darkred"
bordercolor="gold"
size="0 0 100% 100%"
border="true"
/>
</sprite>
<sprite name="BackgroundTranslucentBorderDarkTan">
<image backcolor="30 20 10 255"
<sprite name="BackgroundListBox">
<image backcolor="darkbrown"
size="0 0 100% 100%"
border="true"
bordercolor="60 60 40"
/>
</sprite>
<sprite name="BackgroundSessionTooltip">
<image
backcolor="darkbrown"
size="0 0 100% 100%"
border="true"
bordercolor="gold"
/>
</sprite>
<sprite name="BackgroundIndentFillDark">
<!-- Starting with top left corner continuing in a clockwise manner -->
<!-- Top border -->

6
binaries/data/mods/public/gui/common/common_styles.xml
View File

@ -248,8 +248,8 @@
buffer_zone="10"
dropdown_size="200"
sprite_list="BackgroundTranslucentBorderDarkTan"
sprite_selectarea="BackgroundRedBorderGold"
sprite_list="BackgroundListBox"
sprite_selectarea="BackgroundSelectArea"
textcolor_selected="white"
scrollbar="true"
@ -262,7 +262,7 @@
scrollbar="true"
scrollbar_style="wheatScrollBar"
sprite="BackgroundIndentFillDark"
sprite_selectarea="BackgroundRedBorderGold"
sprite_selectarea="BackgroundSelectArea"
sprite_over="BackgroundIndentFillDark"
textcolor="white"
textcolor_selected="white"

11
binaries/data/mods/public/gui/common/functions_utility_music.js
View File

@ -173,18 +173,17 @@ function playMainMenuMusic()
playMusic(MAIN_MENU, 0.0, true);
}
function playButtonSound()
{
var buttonSound = new Sound(BUTTON_SOUND);
buttonSound.play();
}
function stopMainMenuMusic()
{
if (global.main_menu_music)
global.main_menu_music.fade(-1, 0.0, 5.0);
}
function playButtonSound()
{
var buttonSound = new Sound(BUTTON_SOUND);
buttonSound.play();
}
function playDefeatMusic()
{

15
binaries/data/mods/public/gui/common/setup.xml
View File

@ -156,6 +156,11 @@
textcolor="0 0 0"
/>
<!-- these are used -->
<tooltip name="sessionToolTip"
anchor="top"
buffer_zone="4"
@ -163,7 +168,7 @@
font="serif-14"
maxwidth="300"
offset="16 32"
sprite="bkDarkTransparentBorderGold"
sprite="BackgroundSessionTooltip"
textcolor="255 255 255"
/>
@ -174,7 +179,7 @@
font="serif-14"
maxwidth="400"
offset="-4 -4"
sprite="bkDarkTransparentBorderGold"
sprite="BackgroundSessionTooltip"
textcolor="255 255 255"
/>
@ -185,7 +190,7 @@
font="serif-bold-14"
maxwidth="300"
offset="16 32"
sprite="bkDarkTransparentBorderGold"
sprite="BackgroundSessionTooltip"
textcolor="255 255 255"
/>
@ -196,7 +201,7 @@
font="serif-bold-14"
maxwidth="400"
offset="-4 -4"
sprite="bkDarkTransparentBorderGold"
sprite="BackgroundSessionTooltip"
textcolor="255 255 255"
/>
@ -220,6 +225,8 @@
<color name="mustard">191 191 2</color>
<color name="brown">159 98 24</color>
<color name="orange">255 165 0</color>
<color name="darkred">80 0 0</color>
<color name="darkbrown">30 20 10</color>
<color name="transparent">0 0 0 0</color>

9
binaries/data/mods/public/gui/common/sprite1.xml
View File

@ -14,15 +14,6 @@
/>
</sprite>
<sprite name="bkDarkTransparentBorderGold">
<image
backcolor="darkgray"
size="0 0 100% 100%"
border="true"
bordercolor="gray"
/>
</sprite>
<sprite name="bkWhiteBorderBlack">
<image backcolor="white"
size="0 0 100% 100%"

8
binaries/data/mods/public/gui/session/session.js
View File

@ -23,6 +23,10 @@ var g_EntityStates = {}; // {id:entState}
// Whether the player has lost/won and reached the end of their game
var g_GameEnded = false;
// Colors to flash when pop limit reached
const DEFAULT_POPULATION_COLOR = "white";
const POPULATION_ALERT_COLOR = "orange";
function GetEntityState(entId)
{
if (!(entId in g_EntityStates))
@ -182,9 +186,9 @@ function onTick()
// When training is blocked, flash population (alternates colour every 500msec)
if (g_IsTrainingQueueBlocked && (Date.now() % 1000) < 500)
getGUIObjectByName("resourcePop").textcolor = "255 165 0";
getGUIObjectByName("resourcePop").textcolor = POPULATION_ALERT_COLOR;
else
getGUIObjectByName("resourcePop").textcolor = "white";
getGUIObjectByName("resourcePop").textcolor = DEFAULT_POPULATION_COLOR;
// Clear renamed entities list
Engine.GuiInterfaceCall("ClearRenamedEntities", {});

31
binaries/data/mods/public/gui/session/session.xml
View File

@ -382,27 +382,7 @@
<action on="Press">chatMenuButton();</action>
</object>
<!-- Pause Button -->
<!-- <object type="button"
name="pauseButton"
style="StoneButtonFancy"
size="0 64 100% 92"
tooltip_style="sessionToolTip"
>
<object name="pauseButtonText" type="text" style="CenteredButtonText" ghost="true">Pause</object>
<action on="Press">togglePause();</action>
</object>-->
<!-- Exit button -->
<!-- <object type="button"
name="menuExitButton"
style="StoneButtonFancy"
size="0 96 100% 124"
tooltip_style="sessionToolTip"
>
Exit
<action on="Press">exitMenuButton();</action>
</object>-->
<object type="button"
name="menuExitButton"
style="StoneButtonFancy"
@ -413,17 +393,6 @@
<action on="Press">exitMenuButton();</action>
</object>
<!-- Resume button -->
<!-- <object type="button"
name="menuCloseButton"
style="StoneButtonFancy"
size="0 128 100% 156"
tooltip_style="sessionToolTip"
>
Close
<action on="Press">closeMenu();;</action>
</object>-->
<!-- Pause / Resume Button -->
<object type="button"
name="pauseButton"