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()
{

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

@ -24,7 +24,7 @@
sprite_bar_vertical_over="bkWhiteBorderBlack"
sprite_bar_vertical_pressed="bkWhiteBorderBlack"
/>
<!--
==========================================
- SETUP - ICONS
@ -41,22 +41,22 @@
sprite="iconProduct"
size="16 16"
/>
<icon name="iconBullet"
sprite="iconBullet"
size="8 8"
size="8 8"
/>
<icon name="iconInfinity"
sprite="iconInfinity"
size="16 16"
size="16 16"
/>
<icon name="iconInfo"
sprite="iconInfo"
size="16 16"
/>
<!--
==========================================
- SETUP - ICONS - RESOURCE
@ -66,45 +66,45 @@
<icon name="iconResourceFood"
sprite="snIconSheetResource"
cell_id="0"
size="30 30"
size="30 30"
/>
<icon name="iconResourceWood"
sprite="snIconSheetResource"
cell_id="1"
size="30 30"
size="30 30"
/>
<icon name="iconResourceStone"
sprite="snIconSheetResource"
cell_id="2"
size="30 30"
size="30 30"
/>
<icon name="iconResourceOre"
sprite="snIconSheetResource"
cell_id="3"
size="30 30"
size="30 30"
/>
<icon name="iconResourcePopulation"
sprite="snIconSheetResource"
cell_id="4"
size="30 30"
size="30 30"
/>
<!--
==========================================
- SETUP - ICONS - STATISTICS
==========================================
-->
-->
<icon name="iconGarrisonCapacity"
sprite="snIconSheetGarrison"
cell_id="0"
size="30 30"
size="30 30"
/>
<!--
==========================================
- SETUP - TOOLTIPS
@ -116,13 +116,13 @@
delay="0"
hide_object="true"
/>
<tooltip name="pgSessionSetupToolTip"
use_object="pgSessionSetupToolTip"
delay="0"
hide_object="true"
/>
/>
<tooltip name="pgFloatingToolTip"
anchor="top"
buffer_zone="4"
@ -144,7 +144,7 @@
sprite="bkWhiteBorderBlack"
textcolor="0 0 0"
/>
<tooltip name="snToolTipBottom"
anchor="bottom"
buffer_zone="4"
@ -156,6 +156,11 @@
textcolor="0 0 0"
/>
<!-- these are used -->
<tooltip name="sessionToolTip"
anchor="top"
buffer_zone="4"
@ -163,10 +168,10 @@
font="serif-14"
maxwidth="300"
offset="16 32"
sprite="bkDarkTransparentBorderGold"
sprite="BackgroundSessionTooltip"
textcolor="255 255 255"
/>
<tooltip name="sessionToolTipBottom"
anchor="bottom"
buffer_zone="4"
@ -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,10 +201,10 @@
font="serif-bold-14"
maxwidth="400"
offset="-4 -4"
sprite="bkDarkTransparentBorderGold"
sprite="BackgroundSessionTooltip"
textcolor="255 255 255"
/>
<!--
==========================================
- SETUP - COLORS
@ -209,23 +214,25 @@
<color name="black">0 0 0</color>
<color name="white">255 255 255</color>
<color name="red">255 0 0</color>
<color name="blue">0 0 255</color>
<color name="blue">0 0 255</color>
<color name="yellow">255 255 0</color>
<color name="gold">237 227 167</color>
<color name="lightgray">243 242 240</color>
<color name="gray">143 142 140</color>
<color name="darkgray">43 42 40</color>
<color name="green">0 200 0</color>
<color name="mustard">191 191 2</color>
<color name="gray">143 142 140</color>
<color name="darkgray">43 42 40</color>
<color name="green">0 200 0</color>
<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>
<!--
NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED
NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED
NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED
NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED
-->
<scrollbar name="sb"
@ -273,12 +280,12 @@ NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET
sprite_button_bottom_pressed="sprite2_pressed"
sprite_button_top_pressed="sprite2_pressed"
/>
<!--
NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED
NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED
NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED
NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED
-->
@ -288,88 +295,88 @@ NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET CONVERTED NOT YET
==========================================
-->
<icon name="icon_statistic_garrison"
sprite="ui_icon_sheet_statistic"
cell_id="12"
size="20 20"
<icon name="icon_statistic_garrison"
sprite="ui_icon_sheet_statistic"
cell_id="12"
size="20 20"
/>
<icon name="icon_statistic_rank1"
sprite="ui_icon_sheet_statistic"
cell_id="9"
size="20 20"
sprite="ui_icon_sheet_statistic"
cell_id="9"
size="20 20"
/>
<icon name="icon_statistic_rank2"
sprite="ui_icon_sheet_statistic"
cell_id="10"
size="20 20"
cell_id="10"
size="20 20"
/>
<icon name="icon_statistic_rank3"
sprite="ui_icon_sheet_statistic"
cell_id="11"
size="20 20"
cell_id="11"
size="20 20"
/>
<icon name="icon_statistic_hp"
sprite="ui_icon_sheet_statistic"
cell_id="13"
size="20 20"
cell_id="13"
size="20 20"
/>
<icon name="icon_statistic_accuracy"
sprite="ui_icon_sheet_statistic"
cell_id="0"
size="20 20"
size="20 20"
/>
<icon name="icon_statistic_armour"
sprite="ui_icon_sheet_statistic"
cell_id="2"
size="20 20"
size="20 20"
/>
<icon name="icon_statistic_attack"
sprite="ui_icon_sheet_statistic"
cell_id="1"
size="20 20"
size="20 20"
/>
<icon name="icon_statistic_crush"
sprite="ui_icon_sheet_statistic"
cell_id="8"
size="20 20"
cell_id="8"
size="20 20"
/>
<icon name="icon_statistic_hack"
sprite="ui_icon_sheet_statistic"
cell_id="6"
size="20 20"
size="20 20"
/>
<icon name="icon_statistic_los"
sprite="ui_icon_sheet_statistic"
cell_id="3"
size="20 20"
size="20 20"
/>
<icon name="icon_statistic_pierce"
sprite="ui_icon_sheet_statistic"
cell_id="7"
size="20 20"
sprite="ui_icon_sheet_statistic"
cell_id="7"
size="20 20"
/>
<icon name="icon_statistic_range"
sprite="ui_icon_sheet_statistic"
cell_id="5"
size="20 20"
size="20 20"
/>
<icon name="icon_statistic_speed"
sprite="ui_icon_sheet_statistic"
cell_id="4"
size="20 20"
size="20 20"
/>
</setup>

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

@ -13,15 +13,6 @@
size="0 0 100% 100%"
/>
</sprite>
<sprite name="bkDarkTransparentBorderGold">
<image
backcolor="darkgray"
size="0 0 100% 100%"
border="true"
bordercolor="gray"
/>
</sprite>
<sprite name="bkWhiteBorderBlack">
<image backcolor="white"
@ -38,14 +29,14 @@
bordercolor="black"
/>
</sprite>
<sprite name="bkDarkGrayBorderBlack">
<image backcolor="darkgray"
size="0 0 100% 100%"
border="true"
bordercolor="black"
/>
</sprite>
</sprite>
<sprite name="bkBlueBorderBlack">
<image backcolor="blue"
@ -57,16 +48,16 @@
<sprite name="bkBorderBlack">
<image backcolor="black"
size="-1 -1 100%+1 0"
size="-1 -1 100%+1 0"
/>
<image backcolor="black"
size="-1 100% 100%+1 100%+1"
size="-1 100% 100%+1 100%+1"
/>
<image backcolor="black"
size="-1 0 0 100%"
size="-1 0 0 100%"
/>
<image backcolor="black"
size="100% 0 100%+1 100%"
size="100% 0 100%+1 100%"
/>
</sprite>
@ -81,64 +72,64 @@
<sprite name="bkFillGray">
<image backcolor="gray"/>
</sprite>
<sprite name="bkFillDarkBlue">
<image backcolor="63 127 210 255"/>
</sprite>
<!--
==========================================
GENERIC - PROGRESS BARS
==========================================
-->
-->
<sprite name="bkGreenBar">
<image backcolor="green"
size="0 0 100% 100%"
/>
size="0 0 100% 100%"
/>
<image backcolor="100 100 100"
size="0 1 1 100%-1"
/>
<image backcolor="100 100 100"
size="0 0 100%-1 1"
size="0 0 100%-1 1"
/>
<image backcolor="64 64 64"
size="100%-1 0 100% 100%"
/>
<image backcolor="64 64 64"
size="0 100%-1 100%-1 100%"
size="0 100%-1 100%-1 100%"
/>
<image backcolor="128 128 128"
size="100%-2 1 100%-1 100%-1"
size="100%-2 1 100%-1 100%-1"
/>
<image backcolor="128 128 128"
size="1 100%-2 100%-1 100%-1"
size="1 100%-2 100%-1 100%-1"
/>
</sprite>
</sprite>
<sprite name="bkBlueBar">
<image backcolor="blue"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
<image backcolor="100 100 100"
size="0 1 1 100%-1"
/>
<image backcolor="100 100 100"
size="0 0 100%-1 1"
size="0 0 100%-1 1"
/>
<image backcolor="64 64 64"
size="100%-1 0 100% 100%"
/>
<image backcolor="64 64 64"
size="0 100%-1 100%-1 100%"
size="0 100%-1 100%-1 100%"
/>
<image backcolor="128 128 128"
size="100%-2 1 100%-1 100%-1"
size="100%-2 1 100%-1 100%-1"
/>
<image backcolor="128 128 128"
size="1 100%-2 100%-1 100%-1"
size="1 100%-2 100%-1 100%-1"
/>
</sprite>
</sprite>
<!--
==========================================
@ -148,7 +139,7 @@
<sprite name="textureGranite">
<image texture="global/tile/granite.dds"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
@ -163,7 +154,7 @@
<sprite name="textureSand">
<image texture="global/tile/sandstone.dds"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
@ -190,19 +181,19 @@
size="0 0 100% 100%"
/>
</sprite>
<sprite name="iconInfo">
<image texture="global/icon/info_black.dds"
size="0 3 100% 100%+3"
/>
</sprite>
<sprite name="iconInfoOver">
<image texture="global/icon/info_white.dds"
size="0 3 100% 100%+3"
/>
</sprite>
<!--
==========================================
@ -214,81 +205,81 @@
<!-- Starting with top left corner continuing in a clockwise manner -->
<image texture="global/border/corner_bronze.dds"
real_texture_placement="0 0 15 15"
size="0%-10 0%-10 0 0"
size="0%-10 0%-10 0 0"
/>
<image texture="global/border/top_marble.dds"
texture_size="0 0 128 32"
size="0 0%-10 100% 22"
size="0 0%-10 100% 22"
/>
<image texture="global/border/corner_bronze.dds"
real_texture_placement="0 0 15 15"
size="100% 0%-10 100%+10 0"
size="100% 0%-10 100%+10 0"
/>
<image texture="global/border/right_marble.dds"
texture_size="0 0 32 128"
size="100%-22 0 100%+10 100%"
size="100%-22 0 100%+10 100%"
/>
<image texture="global/border/corner_bronze.dds"
real_texture_placement="0 0 15 15"
size="100% 100% 100%+10 100%+10"
size="100% 100% 100%+10 100%+10"
/>
<image texture="global/border/bottom_marble.dds"
texture_size="0 0 128 32"
size="0 100%-22 100% 100%+10"
size="0 100%-22 100% 100%+10"
/>
<image texture="global/border/corner_bronze.dds"
real_texture_placement="0 0 15 15"
size="0%-10 100% 0 100%+10"
size="0%-10 100% 0 100%+10"
/>
<image texture="global/border/left_marble.dds"
texture_size="0 0 32 128"
size="0%-10 0 0%+22 100%"
size="0%-10 0 0%+22 100%"
/>
<!-- middle -->
<image texture="global/tile/sandstone.dds"
texture_size="0 0 128 128"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatWindowSand">
<!-- middle -->
<image texture="global/tile/sandstone.dds"
texture_size="0 0 128 128"
size="0%-10 0%-10 100%+10 100%+10"
size="0%-10 0%-10 100%+10 100%+10"
/>
<!-- Starting with top left corner continuing in a clockwise manner -->
<image texture="global/border/corner_bronze.dds"
real_texture_placement="0 0 15 15"
size="0%-25 0%-25 0%-10 0%-10"
size="0%-25 0%-25 0%-10 0%-10"
/>
<image texture="global/border/top_marble.dds"
texture_size="0 0 128 32"
size="0%-10 0%-25 100%+10 0%+7"
size="0%-10 0%-25 100%+10 0%+7"
/>
<image texture="global/border/corner_bronze.dds"
real_texture_placement="0 0 15 15"
size="100%+10 0%-25 100%+25 0%-10"
size="100%+10 0%-25 100%+25 0%-10"
/>
<image texture="global/border/right_marble.dds"
texture_size="0 0 32 128"
size="100%-7 0%-10 100%+25 100%+10"
size="100%-7 0%-10 100%+25 100%+10"
/>
<image texture="global/border/corner_bronze.dds"
real_texture_placement="0 0 15 15"
size="100%+10 100%+10 100%+25 100%+25"
size="100%+10 100%+10 100%+25 100%+25"
/>
<image texture="global/border/bottom_marble.dds"
texture_size="0 0 128 32"
size="0%-10 100%-7 100%+10 100%+25"
size="0%-10 100%-7 100%+10 100%+25"
/>
<image texture="global/border/corner_bronze.dds"
real_texture_placement="0 0 15 15"
size="0%-25 100%+10 0%-10 100%+25"
size="0%-25 100%+10 0%-10 100%+25"
/>
<image texture="global/border/left_marble.dds"
texture_size="0 0 32 128"
size="0%-25 0%-10 0%+7 100%+10"
size="0%-25 0%-10 0%+7 100%+10"
/>
</sprite>
@ -296,163 +287,163 @@
<!-- middle -->
<image texture="global/tile/granite.dds"
texture_size="0 0 128 128"
size="0%-10 0%-10 100%+10 100%+10"
size="0%-10 0%-10 100%+10 100%+10"
/>
<!-- Starting with top left corner continuing in a clockwise manner -->
<image texture="global/border/corner_bronze.dds"
real_texture_placement="0 0 15 15"
size="0%-25 0%-25 0%-10 0%-10"
size="0%-25 0%-25 0%-10 0%-10"
/>
<image texture="global/border/top_marble.dds"
texture_size="0 0 128 32"
size="0%-10 0%-25 100%+10 0%+7"
size="0%-10 0%-25 100%+10 0%+7"
/>
<image texture="global/border/corner_bronze.dds"
real_texture_placement="0 0 15 15"
size="100%+10 0%-25 100%+25 0%-10"
size="100%+10 0%-25 100%+25 0%-10"
/>
<image texture="global/border/right_marble.dds"
texture_size="0 0 32 128"
size="100%-6 0%-10 100%+26 100%+10"
size="100%-6 0%-10 100%+26 100%+10"
/>
<image texture="global/border/corner_bronze.dds"
real_texture_placement="0 0 15 15"
size="100%+10 100%+10 100%+25 100%+25"
size="100%+10 100%+10 100%+25 100%+25"
/>
<image texture="global/border/bottom_marble.dds"
texture_size="0 0 128 32"
size="0%-10 100%-7 100%+10 100%+25"
size="0%-10 100%-7 100%+10 100%+25"
/>
<image texture="global/border/corner_bronze.dds"
real_texture_placement="0 0 15 15"
size="0%-25 100%+10 0%-10 100%+25"
size="0%-25 100%+10 0%-10 100%+25"
/>
<image texture="global/border/left_marble.dds"
texture_size="0 0 32 128"
size="0%-25 0%-10 0%+7 100%+10"
size="0%-25 0%-10 0%+7 100%+10"
/>
</sprite>
<sprite name="wheatWindowTitle">
<image texture="global/titlebar/left_gold_fern.dds"
real_texture_placement="0 0 64 32"
size="0%+0 0% 64 0%+32"
size="0%+0 0% 64 0%+32"
/>
<image texture="global/titlebar/middle_gold_fern.dds"
real_texture_placement="0 0 64 32"
size="64 0% 100%-64 0%+32"
size="64 0% 100%-64 0%+32"
/>
<image texture="global/titlebar/right_gold_fern.dds"
real_texture_placement="0 0 64 32"
size="100%-64 0% 100%+0 0%+32"
size="100%-64 0% 100%+0 0%+32"
/>
</sprite>
<sprite name="wheatCheckBoxOpen">
<image texture="global/button/checkbox_open_gray.dds"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatCheckBoxTick">
<image texture="global/button/checkbox_tick_gray.dds"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatCheckBoxCross">
<image texture="global/button/checkbox_cross_gray.dds"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatCheckBoxCrossOver">
<image texture="global/button/checkbox_cross_over_gray.dds"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatArrowLeft">
<image texture="global/button/arrowbox_lt.dds"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatArrowLeftOver">
<image texture="global/button/arrowbox_lt_over.dds"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatArrowRight">
<image texture="global/button/arrowbox_rt.dds"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatArrowRightOver">
<image texture="global/button/arrowbox_rt_over.dds"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatArrowUp">
<image texture="global/button/arrowbox_up.dds"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatArrowUpOver">
<image texture="global/button/arrowbox_up_over.dds"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatArrowDn">
<image texture="global/button/arrowbox_dn.dds"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatArrowDnOver">
<image texture="global/button/arrowbox_dn_over.dds"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatScrollSpriteBar">
<image texture="global/border/scrollbar.dds"
real_texture_placement="0 0 16 128"
size="0 0 100% 100%"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatButton">
<image texture="global/button/button_wood.png"
real_texture_placement="0 0 160 31"
size="0 0 100% 100%"
real_texture_placement="0 0 160 31"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatButtonOver">
<image texture="global/button/button_wood.png"
real_texture_placement="0 32 160 64"
size="0 0 100% 100%"
real_texture_placement="0 32 160 64"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatButtonDisabled">
<effect grayscale="" />
<image texture="global/button/button_wood.png"
real_texture_placement="0 0 160 31"
size="0 0 100% 100%"
real_texture_placement="0 0 160 31"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="wheatButtonGlow">
<effect add_color="60 42 42 0" />
<image texture="global/button/button_wood.png"
real_texture_placement="0 0 160 31"
size="0 0 100% 100%"
real_texture_placement="0 0 160 31"
size="0 0 100% 100%"
/>
</sprite>
@ -460,19 +451,19 @@
<!-- Starting with top left corner continuing in a clockwise manner -->
<!-- Top border -->
<image backcolor="109 122 146"
size="0 0 100%-1 1"
size="0 0 100%-1 1"
/>
<!-- Right border -->
<image backcolor="220 223 228"
size="100%-1 0 100% 100%"
size="100%-1 0 100% 100%"
/>
<!-- Bottom border -->
<image backcolor="220 223 228"
size="0 100%-1 100% 100%"
size="0 100%-1 100% 100%"
/>
<!-- Left border -->
<image backcolor="109 122 146"
size="0 0 1 100%-1"
size="0 0 1 100%-1"
/>
<!-- middle -->
</sprite>
@ -481,19 +472,19 @@
<!-- Starting with top left corner continuing in a clockwise manner -->
<!-- Top border -->
<image backcolor="109 122 146"
size="0 0 100%-1 1"
size="0 0 100%-1 1"
/>
<!-- Right border -->
<image backcolor="220 223 228"
size="100%-1 0 100% 100%"
size="100%-1 0 100% 100%"
/>
<!-- Bottom border -->
<image backcolor="220 223 228"
size="0 100%-1 100% 100%"
size="0 100%-1 100% 100%"
/>
<!-- Left border -->
<image backcolor="109 122 146"
size="0 0 1 100%-1"
size="0 0 1 100%-1"
/>
<!-- middle -->
<image backcolor="0 0 0 85"
@ -505,19 +496,19 @@
<!-- Starting with top left corner continuing in a clockwise manner -->
<!-- Top border -->
<image backcolor="109 122 146"
size="0 0 100%-1 1"
size="0 0 100%-1 1"
/>
<!-- Right border -->
<image backcolor="220 223 228"
size="100%-1 0 100% 100%"
size="100%-1 0 100% 100%"
/>
<!-- Bottom border -->
<image backcolor="220 223 228"
size="0 100%-1 100% 100%"
size="0 100%-1 100% 100%"
/>
<!-- Left border -->
<image backcolor="109 122 146"
size="0 0 1 100%-1"
size="0 0 1 100%-1"
/>
<!-- middle -->
<image backcolor="100 100 100 85"
@ -527,16 +518,16 @@
<sprite name="wheatIndentFillVeryLight">
<image backcolor="109 122 146"
size="0 0 100%-1 1"
size="0 0 100%-1 1"
/>
<image backcolor="220 223 228"
size="100%-1 0 100% 100%"
size="100%-1 0 100% 100%"
/>
<image backcolor="220 223 228"
size="0 100%-1 100% 100%"
size="0 100%-1 100% 100%"
/>
<image backcolor="109 122 146"
size="0 0 1 100%-1"
size="0 0 1 100%-1"
/>
<image backcolor="255 255 255 160"
size="1 1 100%-1 100%-1"
@ -551,15 +542,15 @@
<sprite name="watermarkProduct">
<image texture="global/watermark/product.dds"
real_texture_placement="0 0 200 98"
size="0 0 100% 100%"
real_texture_placement="0 0 200 98"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="watermarkCompany">
<image texture="global/watermark/company.dds"
real_texture_placement="0 0 207 28"
size="0 0 100% 100%"
real_texture_placement="0 0 207 28"
size="0 0 100% 100%"
/>
</sprite>

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"