diff --git guis/mainmenu_objectives.gui guis/mainmenu_objectives.gui index e02f7c3..13c1a47 100644 --- guis/mainmenu_objectives.gui +++ guis/mainmenu_objectives.gui @@ -11,7 +11,7 @@ windowDef ObjectivesMenu { rect 0,0,640,640 visible 0 - + windowDef ObjectivesMenuParchment { rect ("gui::ingame" ? 0 : 50), -75, 640, 640 @@ -43,7 +43,7 @@ windowDef ObjectivesMenu set "cmd" "log 'Issuing objective_open_request call.'"; set "cmd" "objective_open_request"; - set "notime" 1; + set "notime" "1"; } } @@ -88,45 +88,50 @@ windowDef ObjectivesMenu windowDef DifficultySelection { + #define DIFFICULTY_NAV_COLOR 0.6,0.6,0.6,0.7 + #define SDIFFICULTY_NAV_COLOR "0.6,0.6,0.6,0.7" + #define SDIFFICULTY_NAV_HOVER "1,1,1,0.9" + #define SDIFFICULTY_NAV_SELECTED "1,1,1,1" + + #define DIFFICULTY_NAV_RECT_0 12,80,123,62 + #define DIFFICULTY_NAV_RECT_1 12,208,123,62 + #define DIFFICULTY_NAV_RECT_2 12,336,123,62 + + #define DIFFICULTY_NAV_TEXTSCALE 0.36 + #define DIFFICULTY_NAV_TEXTALIGN 0 + #define SDIFFICULTY_NAV_FONT "fonts/carleton" + rect 0,0,640,640 visible "gui::DifficultyIsVisible" notime 1 - onTime 0 - { - // set the default color for all values, will be corrected below - set "Difficulty0::forecolor" "0.6,0.6,0.6,0.7"; - set "Difficulty1::forecolor" "0.6,0.6,0.6,0.7"; - set "Difficulty2::forecolor" "0.6,0.6,0.6,0.7"; - } - windowDef Difficulty0 { - rect 12,80,123,62 - forecolor 0.6,0.6,0.6,.7 + rect DIFFICULTY_NAV_RECT_0 + forecolor DIFFICULTY_NAV_COLOR text "gui::diff0Name" - textscale 0.36 - textalign 0 - font "fonts/carleton" - notime 1 + textscale DIFFICULTY_NAV_TEXTSCALE + textalign DIFFICULTY_NAV_TEXTALIGN + font SDIFFICULTY_NAV_FONT onTime 0 { - if ("gui::diffSelect" == 0) - { - set "forecolor" "1,1,1,1"; + if ("gui::diffSelect" == 0) { + set "forecolor" SDIFFICULTY_NAV_SELECTED; + } else { + set "forecolor" SDIFFICULTY_NAV_COLOR; } + set "notime" "1"; } onAction { - set "Difficulty1::forecolor" "0.6,0.6,0.6,0.7"; - set "Difficulty2::forecolor" "0.6,0.6,0.6,0.7"; - set "forecolor" "1,1,1,1"; - set "gui::diffSelect" "0"; + set "Difficulty1::forecolor" SDIFFICULTY_NAV_COLOR; + set "Difficulty2::forecolor" SDIFFICULTY_NAV_COLOR; + set "forecolor" SDIFFICULTY_NAV_SELECTED; + set "gui::diffSelect" "0"; set "cmd" "log 'Selected difficulty level 0.'"; - set "cmd" "play sound/meta/menu/mnu_select; diffSelect"; } @@ -134,7 +139,7 @@ windowDef ObjectivesMenu { if ("gui::diffSelect" != 0) { - transition "forecolor" "0.6,0.6,0.6,.7" "1,1,1,.9" "50" ; + transition "forecolor" SDIFFICULTY_NAV_COLOR SDIFFICULTY_NAV_HOVER "50"; set "cmd" "play sound/meta/menu/mnu_hover;"; } } @@ -143,38 +148,46 @@ windowDef ObjectivesMenu { if ("gui::diffSelect" != 0) { - transition "forecolor" "1,1,1,.9" "0.6,0.6,0.6,0.7" "50" ; + transition "forecolor" SDIFFICULTY_NAV_HOVER SDIFFICULTY_NAV_COLOR "50" ; } } } windowDef Difficulty1 { - rect 12,208,123,62 - forecolor 1,1,1,.7 + rect DIFFICULTY_NAV_RECT_1 + forecolor DIFFICULTY_NAV_COLOR text "gui::diff1Name" - textscale 0.36 - textalign 0 - font "fonts/carleton" - notime 1 + textscale DIFFICULTY_NAV_TEXTSCALE + textalign DIFFICULTY_NAV_TEXTALIGN + font SDIFFICULTY_NAV_FONT + + onTime 0 + { + if ("gui::diffSelect" == 1) { + set "forecolor" SDIFFICULTY_NAV_SELECTED; + } else { + set "forecolor" SDIFFICULTY_NAV_COLOR; + } + set "notime" "1"; + } onAction { - set "Difficulty0::forecolor" "0.6,0.6,0.6,0.7"; - set "Difficulty2::forecolor" "0.6,0.6,0.6,0.7"; - set "forecolor" "1,1,1,1"; - set "gui::diffSelect" "1"; + set "Difficulty0::forecolor" SDIFFICULTY_NAV_COLOR; + set "Difficulty2::forecolor" SDIFFICULTY_NAV_COLOR; + set "forecolor" SDIFFICULTY_NAV_SELECTED; + set "gui::diffSelect" "1"; set "cmd" "log 'Selected difficulty level 1.'"; - - set "cmd" "play sound/meta/menu/mnu_select; diffSelect"; + set "cmd" "play sound/meta/menu/mnu_select; diffSelect"; } onMouseEnter { if ("gui::diffSelect" != 1) { - transition "forecolor" "0.6,0.6,0.6,.7" "1,1,1,.9" "50" ; + transition "forecolor" SDIFFICULTY_NAV_COLOR SDIFFICULTY_NAV_HOVER "50"; set "cmd" "play sound/meta/menu/mnu_hover;"; } } @@ -183,46 +196,46 @@ windowDef ObjectivesMenu { if ("gui::diffSelect" != 1) { - transition "forecolor" "1,1,1,.9" "0.6,0.6,0.6,.7" "50" ; + transition "forecolor" SDIFFICULTY_NAV_HOVER SDIFFICULTY_NAV_COLOR "50" ; } } } windowDef Difficulty2 { - rect 12,336,123,62 - forecolor 1,1,1,.7 + rect DIFFICULTY_NAV_RECT_2 + forecolor DIFFICULTY_NAV_COLOR text "gui::diff2Name" - textscale 0.36 - textalign 0 - font "fonts/carleton" - notime 1 + textscale DIFFICULTY_NAV_TEXTSCALE + textalign DIFFICULTY_NAV_TEXTALIGN + font SDIFFICULTY_NAV_FONT onTime 0 { - if ("gui::diffSelect" == 2) - { - set "forecolor" "1,1,1,1"; + if ("gui::diffSelect" == 2) { + set "forecolor" SDIFFICULTY_NAV_SELECTED; + } else { + set "forecolor" SDIFFICULTY_NAV_COLOR; } + set "notime" "1"; } - + onAction { - set "Difficulty0::forecolor" "0.6,0.6,0.6,.7"; - set "Difficulty1::forecolor" "0.6,0.6,0.6,.7"; - set "forecolor" "1,1,1,1"; - set "gui::diffSelect" "2"; + set "Difficulty0::forecolor" SDIFFICULTY_NAV_COLOR; + set "Difficulty1::forecolor" SDIFFICULTY_NAV_COLOR; + set "forecolor" SDIFFICULTY_NAV_SELECTED; + set "gui::diffSelect" "2"; set "cmd" "log 'Selected difficulty level 2.'"; - - set "cmd" "play sound/meta/menu/mnu_select; diffSelect"; + set "cmd" "play sound/meta/menu/mnu_select; diffSelect"; } onMouseEnter { if ("gui::diffSelect" != 2) { - transition "forecolor" "0.6,0.6,0.6,.7" "1,1,1,.9" "50" ; + transition "forecolor" SDIFFICULTY_NAV_COLOR SDIFFICULTY_NAV_HOVER "50"; set "cmd" "play sound/meta/menu/mnu_hover;"; } } @@ -231,7 +244,7 @@ windowDef ObjectivesMenu { if ("gui::diffSelect" != 2) { - transition "forecolor" "1,1,1,.9" "0.6,0.6,0.6,.7" "50" ; + transition "forecolor" SDIFFICULTY_NAV_HOVER SDIFFICULTY_NAV_COLOR "50" ; } } } @@ -294,7 +307,7 @@ windowDef ObjectivesMenu onTime 400 { set "cmd" "close"; - set "notime" 1; + set "notime" "1"; } } @@ -357,7 +370,7 @@ windowDef ObjectivesMenu onAction { set "cmd" "play sound/meta/menu/mnu_select;"; - + // Switch to the main menu set "gui::targetmode" MM_STATE_MAINMENU; resetTime "MainMenuModeSelect" 0; @@ -409,7 +422,7 @@ windowDef ObjectivesMenu { set "gui::targetmode" MM_STATE_FORWARD; resetTime "MainMenuModeSelect" 0; - + set "cmd" "play sound/meta/menu/mnu_select;"; set "cmd" "log 'Starting mission.'"; } @@ -458,7 +471,7 @@ windowDef ObjectivesMenu } } - + /*************************************************************************** * * The "Briefing/Back" Button (only visible in start menu) @@ -498,7 +511,7 @@ windowDef ObjectivesMenu onAction { set "cmd" "play sound/meta/menu/mnu_select"; - + // Switch to briefing set "gui::targetmode" MM_STATE_BACKWARD; resetTime "MainMenuModeSelect" 0;