From 2df82fa8aa6622bd21c6df230e903ee69cfe856e Mon Sep 17 00:00:00 2001 From: JerryALT Date: Fri, 5 Apr 2024 09:28:14 +0300 Subject: [PATCH] [Mod FF]: Changed achievements menus for console ui. --- iw3sp_mod_ff_src/raw/ui/achievements.menu | 67 ++++-- .../raw/ui/achievements_ingame.menu | 220 ++++++++++++------ 2 files changed, 202 insertions(+), 85 deletions(-) diff --git a/iw3sp_mod_ff_src/raw/ui/achievements.menu b/iw3sp_mod_ff_src/raw/ui/achievements.menu index e499dfb..4b7aefc 100644 --- a/iw3sp_mod_ff_src/raw/ui/achievements.menu +++ b/iw3sp_mod_ff_src/raw/ui/achievements.menu @@ -16,8 +16,8 @@ #define CHOICE_SIZE_X 258 #define CHOICE_SIZE_Y 22 -// #undef BACK_OPEN -// #define BACK_OPEN open stats; +#undef BACK_OPEN +#define BACK_OPEN open stats; #define ACHIEVEMENT_PREVIEW( achievementMaterial, visArg ) \ itemDef \ @@ -159,7 +159,7 @@ #define ACHIEVEMENTS_RESET\ itemDef {\ text "@IW3SP_MOD_LOC_MENU_RESET_ACHIEVEMENTS"\ - type 1\ + type ITEM_TYPE_BUTTON\ style WINDOW_STYLE_FILLED\ textstyle ITEM_TEXTSTYLE_SHADOWED\ rect 50 -26 200 20 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ @@ -203,10 +203,25 @@ rect -16 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM \ visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 0 ) \ background "ui_arrow_left" \ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ mouseEnter { play "mouse_over"; }\ action {\ MOVE_PAGE(dvarValue, menuName)\ }\ + } \ + itemDef { \ + style WINDOW_STYLE_SHADER \ + rect -8 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 1 && dvarBool(gpad_style) == 0 ) \ + background "button_xbox_15"\ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ + } \ + itemDef { \ + style WINDOW_STYLE_SHADER \ + rect -8 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 1 && dvarBool(gpad_style) == 1 ) \ + background "button_sony_15"\ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ } #define ACHIEVEMENT_DBUTTON_PAGE_LEFT(achievementPage) \ @@ -215,6 +230,7 @@ rect -16 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 0 ) \ background "ui_arrow_left"\ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ forecolor 0.2 0.2 0.2 1 \ } @@ -226,10 +242,25 @@ rect 16 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 0 ) \ background "ui_arrow_right" \ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ mouseEnter { play "mouse_over"; } \ action { \ MOVE_PAGE(dvarValue, menuName)\ } \ + }\ + itemDef { \ + style WINDOW_STYLE_SHADER \ + rect 8 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 1 && dvarBool(gpad_style) == 0 ) \ + background "button_xbox_16"\ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ + } \ + itemDef { \ + style WINDOW_STYLE_SHADER \ + rect 8 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 1 && dvarBool(gpad_style) == 1 ) \ + background "button_sony_16"\ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ } #define ACHIEVEMENT_DBUTTON_PAGE_RIGHT(achievementPage) \ @@ -238,6 +269,7 @@ rect 16 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 0 ) \ background "ui_arrow_right"\ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ forecolor 0.2 0.2 0.2 1 \ } @@ -252,6 +284,7 @@ textaligny 16.5 \ textAlign ITEM_ALIGN_CENTER \ textfont UI_FONT_NORMAL \ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ forecolor 1 1 1 1 \ decoration \ } @@ -297,7 +330,7 @@ itemDef { \ name "achievement_progress_bar" \ style WINDOW_STYLE_SHADER \ - rect -317 327.5 255 15 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP\ + rect -317 327.5 0 15 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP\ background "progress_bar_fill"\ visible when( dvarBool(console_menu_style) == 1 ) \ forecolor 0 .8 0 1 \ @@ -349,10 +382,10 @@ style WINDOW_STYLE_FILLED border 0 soundloop "music_mainmenu_mp" - onOpen { focusfirst; } - onEsc { close achievements; } - onClose { /*open stats*/ open main; setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0;} - execkeyint 157 { MOVE_PAGE(1, "achievements_page_1") } + onOpen { focusfirst; } + onEsc { close achievements; } + onClose { open stats; /*open main;*/ setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0; } + execkeyint 157 { MOVE_PAGE(1, "achievements_page_1") } #include "ui/blurredbg.inc" #include "ui_mp/navcontrols.inc" @@ -396,11 +429,11 @@ style WINDOW_STYLE_FILLED border 0 soundloop "music_mainmenu_mp" - onOpen { focusfirst; } - onEsc { close achievements_page_1; } - onClose { /*open stats*/ open main; setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0;} - execkeyint 156 { MOVE_PAGE(0, "achievements") } - execkeyint 157 { MOVE_PAGE(2, "achievements_page_2") } + onOpen { focusfirst; } + onEsc { close achievements_page_1; } + onClose { open stats; /*open main;*/ setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0; } + execkeyint 156 { MOVE_PAGE(0, "achievements") } + execkeyint 157 { MOVE_PAGE(2, "achievements_page_2") } #include "ui/blurredbg.inc" #include "ui_mp/navcontrols.inc" @@ -441,10 +474,10 @@ style WINDOW_STYLE_FILLED border 0 soundloop "music_mainmenu_mp" - onOpen { focusfirst; } - onEsc { close achievements_page_2; } - onClose { /*open stats*/ open main; setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0;} - execkeyint 156 { MOVE_PAGE(1, "achievements_page_1") } + onOpen { focusfirst; } + onEsc { close achievements_page_2; } + onClose { open stats; /*open main;*/ setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0; } + execkeyint 156 { MOVE_PAGE(1, "achievements_page_1") } #include "ui/blurredbg.inc" #include "ui_mp/navcontrols.inc" diff --git a/iw3sp_mod_ff_src/raw/ui/achievements_ingame.menu b/iw3sp_mod_ff_src/raw/ui/achievements_ingame.menu index c39036e..bd072ab 100644 --- a/iw3sp_mod_ff_src/raw/ui/achievements_ingame.menu +++ b/iw3sp_mod_ff_src/raw/ui/achievements_ingame.menu @@ -16,19 +16,6 @@ #define CHOICE_SIZE_X 258 #define CHOICE_SIZE_Y 22 -//---- orient ---- -#define GAMEINFO_WIDTH 250 -#define GAMEINFO_WIDTH2 255 -#define GAMEINFO_HEIGHT 258 -#define GAMEINFO_HEIGHT2 0 -#ifdef PC - #define GAMEINFO_ORIGIN 4 -190 - #define PC_OFFSET_Y 40 -#else - #define GAMEINFO_ORIGIN 4 -170 - #define PC_OFFSET_Y 0 -#endif - #define ACHIEVEMENT_PREVIEW( achievementMaterial, visArg ) \ itemDef \ { \ @@ -196,28 +183,48 @@ /*unlocked*/ACHIEVEMENT_PREVIEW("trophy_" + dvarInt(ui_achievement_select_idx), when( localVarInt( ui_highlight ) == itemIndex && localVarString( ui_choicegroup ) == CHOICE_GROUP && dvarInt(ui_achievement_status) == 1))\ /*locked*/ACHIEVEMENT_PREVIEW("trophy_locked", when( localVarInt( ui_highlight ) == itemIndex && localVarString( ui_choicegroup ) == CHOICE_GROUP && dvarInt(ui_achievement_status) == 0)) +#define MOVE_PAGE(dvarValue, menuName) \ + close self; \ + setdvar ui_achievement_page dvarValue; \ + play "mouse_click"; \ + open menuName; + #define ACHIEVEMENT_BUTTON_PAGE_LEFT(achievementPage, dvarValue, menuName) \ itemDef { \ name page_left \ type ITEM_TYPE_BUTTON \ style WINDOW_STYLE_SHADER \ - rect -16 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible when( dvarInt (ui_achievement_page) == achievementPage) \ - background "ui_arrow_left"\ - mouseEnter { play "mouse_over"; } \ - action { \ - close self; \ - setdvar ui_achievement_page dvarValue; \ - play "mouse_click"; \ - open menuName; \ - } \ + rect -16 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM \ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 0 ) \ + background "ui_arrow_left" \ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ + mouseEnter { play "mouse_over"; }\ + action {\ + MOVE_PAGE(dvarValue, menuName)\ + }\ + } \ + itemDef { \ + style WINDOW_STYLE_SHADER \ + rect -8 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 1 && dvarBool(gpad_style) == 0 ) \ + background "button_xbox_15"\ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ + } \ + itemDef { \ + style WINDOW_STYLE_SHADER \ + rect -8 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 1 && dvarBool(gpad_style) == 1 ) \ + background "button_sony_15"\ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ } + #define ACHIEVEMENT_DBUTTON_PAGE_LEFT(achievementPage) \ itemDef { \ style WINDOW_STYLE_SHADER \ rect -16 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible when( dvarInt (ui_achievement_page) == achievementPage) \ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 0 ) \ background "ui_arrow_left"\ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ forecolor 0.2 0.2 0.2 1 \ } @@ -227,22 +234,36 @@ type ITEM_TYPE_BUTTON \ style WINDOW_STYLE_SHADER \ rect 16 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible when( dvarInt (ui_achievement_page) == achievementPage) \ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 0 ) \ background "ui_arrow_right" \ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ mouseEnter { play "mouse_over"; } \ action { \ - close self;\ - setdvar ui_achievement_page dvarValue; \ - play "mouse_click"; \ - open menuName; \ + MOVE_PAGE(dvarValue, menuName)\ } \ + }\ + itemDef { \ + style WINDOW_STYLE_SHADER \ + rect 8 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 1 && dvarBool(gpad_style) == 0 ) \ + background "button_xbox_16"\ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ + } \ + itemDef { \ + style WINDOW_STYLE_SHADER \ + rect 8 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 1 && dvarBool(gpad_style) == 1 ) \ + background "button_sony_16"\ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ } + #define ACHIEVEMENT_DBUTTON_PAGE_RIGHT(achievementPage) \ itemDef { \ style WINDOW_STYLE_SHADER \ rect 16 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible when( dvarInt (ui_achievement_page) == achievementPage) \ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 0 ) \ background "ui_arrow_right"\ + exp rect Y( -26 - dvarInt(console_menu_style) * 16) \ forecolor 0.2 0.2 0.2 1 \ } @@ -250,7 +271,7 @@ itemDef { \ type ITEM_TYPE_TEXT \ rect 0 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible when( dvarInt (ui_achievement_page) == achievementPage) \ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 0 ) \ text achievementPageText \ textscale 0.45 \ textstyle ITEM_TEXTSTYLE_SHADOWED \ @@ -265,23 +286,22 @@ itemDef { \ style WINDOW_STYLE_SHADER \ rect -250 -60 500 20 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible 1 \ background "progress_bar_bg"\ forecolor 0.2 0.2 0.2 0.5 \ + visible when( dvarBool(console_menu_style) == 0 ) \ } \ itemDef { \ name "achievement_progress_bar" \ style WINDOW_STYLE_SHADER \ rect -247 -57 0 15 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible 1 \ background "progress_bar_fill"\ forecolor 0 .8 0 1 \ + visible when( dvarBool(console_menu_style) == 0 ) \ } \ itemDef { \ name "achievement_total_count_info" \ type ITEM_TYPE_TEXT \ rect 0 -60 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible 1 \ text "" \ textscale 0.3 \ textstyle ITEM_TEXTSTYLE_SHADOWED \ @@ -289,13 +309,64 @@ textAlign ITEM_ALIGN_CENTER \ textfont UI_FONT_NORMAL \ forecolor 1 1 1 1 \ + visible when( dvarBool(console_menu_style) == 0 ) \ + decoration \ + } \ + itemDef { \ + style WINDOW_STYLE_SHADER \ + rect -320 325 260 20 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP\ + background "progress_bar_bg"\ + forecolor 0.2 0.2 0.2 0.5 \ + visible when( dvarBool(console_menu_style) == 1 ) \ + decoration \ + } \ + itemDef { \ + name "achievement_progress_bar" \ + style WINDOW_STYLE_SHADER \ + rect -317 327.5 0 15 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP\ + background "progress_bar_fill"\ + visible when( dvarBool(console_menu_style) == 1 ) \ + forecolor 0 .8 0 1 \ + } \ + itemDef { \ + name "achievement_total_count_info" \ + type ITEM_TYPE_TEXT \ + rect -315 324 255 20 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP\ + text "" \ + textscale 0.3 \ + textstyle ITEM_TEXTSTYLE_SHADOWED \ + textalignx 0 \ + textaligny 17 \ + textAlign ITEM_ALIGN_CENTER \ + textfont UI_FONT_NORMAL \ + forecolor 1 1 1 1 \ + visible when( dvarBool(console_menu_style) == 1 ) \ decoration \ } #undef BACK_OPEN #define BACK_OPEN open "pausedmenu"; setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0; +#define ACT_ORIGIN CHOICE_ORIGIN( 1 ) + +#define ACT_HEIGHT 344 +#define ACT_BG_COLOR 0.95 0.95 0.97 0.1 +#define ACT_BG_COLOR2 0 0 0.02 0.45 //1 1 1 0.1 + +#define ACT_BG( ptitle, act_group ) ACT_BG_RAW( -4, -26, ptitle, act_group ) + +#define ACT_BG_RAW( base_x, base_y, ptitle, act_group ) \ + PREPROC_SHADER_DRAW_ALIGNED( ACT_ORIGIN (CHOICE_SIZE_X+10) ACT_HEIGHT CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, (base_x-4) base_y, "gradient_fadein", ACT_BG_COLOR, 0, 0, 0 0 0 0 group act_group )\ + PREPROC_SHADER_DRAW_ALIGNED( ACT_ORIGIN 8 32 CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, (base_x+CHOICE_SIZE_X+6) base_y, "button_highlight_end", ACT_BG_COLOR, 0, 0, 0 0 0 0 group act_group ) \ + PREPROC_SHADER_DRAW_ALIGNED( ACT_ORIGIN 8 (ACT_HEIGHT-32) CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, (base_x+CHOICE_SIZE_X+6) (base_y+32), "white", ACT_BG_COLOR, 0, 0, 0 0 0 0 group act_group ) \ + PREPROC_SHADER_DRAW_ALIGNED( ACT_ORIGIN (CHOICE_SIZE_X+10) (ACT_HEIGHT-8) CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, (base_x-9) (base_y+4), "gradient_fadein", ACT_BG_COLOR2, 0, 0, 0 0 0 0 group act_group )\ + PREPROC_SHADER_DRAW_ALIGNED( ACT_ORIGIN 8 32 CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, (base_x+CHOICE_SIZE_X+1) (base_y+4), "button_highlight_end", ACT_BG_COLOR2, 0, 0, 0 0 0 0 group act_group ) \ + PREPROC_SHADER_DRAW_ALIGNED( ACT_ORIGIN 8 (ACT_HEIGHT-40) CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, (base_x+CHOICE_SIZE_X+1) (base_y+36), "white", ACT_BG_COLOR2, 0, 0, 0 0 0 0 group act_group ) \ + PREPROC_TEXT_DRAW_ALIGNED_EXP( ACT_ORIGIN CHOICE_SIZE_X 20 CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, -26 (base_y+4), ptitle, TEXTSIZE_DEFAULT, 0, 0, ITEM_ALIGN_MIDDLE_RIGHT, COLOR_TITLE group act_group ) + { + #undef CHOICE_Y_START + #define CHOICE_Y_START 60 menuDef { name achievements_ingame @@ -304,15 +375,19 @@ focuscolor COLOR_FOCUSED blurWorld 4.8 soundloop "" - onOpen {} - onEsc { open "pausedmenu"; close achievements_ingame; setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0; } - onClose {} + onOpen { focusfirst; } + onEsc { open "pausedmenu"; close achievements_ingame; setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0; } + onClose {} + execkeyint 157 { MOVE_PAGE(1, "achievements_page_1_ingame") } + #include "ui_mp/navcontrols.inc" CHOICE_MENU_TITLE( "@IW3SP_MOD_LOC_MENU_ACHIEVEMENTS_TITLE" ) ACHIEVEMENT_BACKGROUND + ACT_BG( "1/3", achievement_page_1) + ACHIEVEMENT_BUTTON(1 , "@ACHIEVEMENT_NAME_0", "@ACHIEVEMENT_DETAIL_0", 0, 0) ACHIEVEMENT_BUTTON(2, "@ACHIEVEMENT_NAME_1", "@ACHIEVEMENT_DETAIL_1", 1, 0) ACHIEVEMENT_BUTTON(3, "@ACHIEVEMENT_NAME_2", "@ACHIEVEMENT_DETAIL_2", 2, 0) @@ -326,8 +401,8 @@ ACHIEVEMENT_BUTTON(11, "@ACHIEVEMENT_NAME_10", "@ACHIEVEMENT_DETAIL_10", 10, 0) ACHIEVEMENT_BUTTON(12, "@ACHIEVEMENT_NAME_11", "@ACHIEVEMENT_DETAIL_11", 11, 0) ACHIEVEMENT_BUTTON(13, "@ACHIEVEMENT_NAME_12", "@ACHIEVEMENT_DETAIL_12", 12, 0) - ACHIEVEMENT_BUTTON(14, "@ACHIEVEMENT_NAME_13", "@ACHIEVEMENT_DETAIL_13", 13, 0) - ACHIEVEMENT_BUTTON(15, "@ACHIEVEMENT_NAME_14", "@ACHIEVEMENT_DETAIL_14", 14, 0) + //ACHIEVEMENT_BUTTON(14, "@ACHIEVEMENT_NAME_13", "@ACHIEVEMENT_DETAIL_13", 13, 0) + //ACHIEVEMENT_BUTTON(15, "@ACHIEVEMENT_NAME_14", "@ACHIEVEMENT_DETAIL_14", 14, 0) ACHIEVEMENT_PROGRESSBAR ACHIEVEMENT_BACKGROUND_DATE_UNLOCKED_TITLE @@ -345,30 +420,33 @@ focuscolor COLOR_FOCUSED blurWorld 4.8 soundloop "" - onOpen {} - onEsc { open "pausedmenu"; close achievements_page_1_ingame; setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0;} - onClose {} + onOpen {} + onEsc { open "pausedmenu"; close achievements_page_1_ingame; setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0; } + onClose {} + execkeyint 156 { MOVE_PAGE(0, "achievements_ingame") } + execkeyint 157 { MOVE_PAGE(2, "achievements_page_2_ingame") } + #include "ui_mp/navcontrols.inc" CHOICE_MENU_TITLE( "@IW3SP_MOD_LOC_MENU_ACHIEVEMENTS_TITLE" ) ACHIEVEMENT_BACKGROUND - ACHIEVEMENT_BUTTON(1, "@ACHIEVEMENT_NAME_15", "@ACHIEVEMENT_DETAIL_15", 15, 1 ) - ACHIEVEMENT_BUTTON(2, "@ACHIEVEMENT_NAME_16", "@ACHIEVEMENT_DETAIL_16", 16, 1 ) - ACHIEVEMENT_BUTTON(3, "@ACHIEVEMENT_NAME_17", "@ACHIEVEMENT_DETAIL_17", 17, 1 ) - ACHIEVEMENT_BUTTON(4, "@ACHIEVEMENT_NAME_18", "@ACHIEVEMENT_DETAIL_18", 18, 1 ) - ACHIEVEMENT_BUTTON(5, "@ACHIEVEMENT_NAME_19", "@ACHIEVEMENT_DETAIL_19", 19, 1 ) - ACHIEVEMENT_BUTTON(6, "@ACHIEVEMENT_NAME_20", "@ACHIEVEMENT_DETAIL_20", 20, 1 ) - ACHIEVEMENT_BUTTON(7, "@ACHIEVEMENT_NAME_21", "@ACHIEVEMENT_DETAIL_21", 21, 1 ) - ACHIEVEMENT_BUTTON(8, "@ACHIEVEMENT_NAME_22", "@ACHIEVEMENT_DETAIL_22", 22, 1 ) - ACHIEVEMENT_BUTTON(9, "@ACHIEVEMENT_NAME_23", "@ACHIEVEMENT_DETAIL_23", 23, 1 ) - ACHIEVEMENT_BUTTON(10, "@ACHIEVEMENT_NAME_24", "@ACHIEVEMENT_DETAIL_24", 24, 1 ) - ACHIEVEMENT_BUTTON(11, "@ACHIEVEMENT_NAME_25", "@ACHIEVEMENT_DETAIL_25", 25, 1 ) - ACHIEVEMENT_BUTTON(12, "@ACHIEVEMENT_NAME_26", "@ACHIEVEMENT_DETAIL_26", 26, 1 ) - ACHIEVEMENT_BUTTON(13, "@ACHIEVEMENT_NAME_27", "@ACHIEVEMENT_DETAIL_27", 27, 1 ) - ACHIEVEMENT_BUTTON(14, "@ACHIEVEMENT_NAME_28", "@ACHIEVEMENT_DETAIL_28", 28, 1 ) - ACHIEVEMENT_BUTTON(15, "@ACHIEVEMENT_NAME_29", "@ACHIEVEMENT_DETAIL_29", 29, 1 ) + ACT_BG( "2/3", achievement_page_3) + + ACHIEVEMENT_BUTTON(1, "@ACHIEVEMENT_NAME_13", "@ACHIEVEMENT_DETAIL_13", 13, 1) + ACHIEVEMENT_BUTTON(2, "@ACHIEVEMENT_NAME_14", "@ACHIEVEMENT_DETAIL_14", 14, 1) + ACHIEVEMENT_BUTTON(3, "@ACHIEVEMENT_NAME_15", "@ACHIEVEMENT_DETAIL_15", 15, 1 ) + ACHIEVEMENT_BUTTON(4, "@ACHIEVEMENT_NAME_16", "@ACHIEVEMENT_DETAIL_16", 16, 1 ) + ACHIEVEMENT_BUTTON(5, "@ACHIEVEMENT_NAME_17", "@ACHIEVEMENT_DETAIL_17", 17, 1 ) + ACHIEVEMENT_BUTTON(6, "@ACHIEVEMENT_NAME_18", "@ACHIEVEMENT_DETAIL_18", 18, 1 ) + ACHIEVEMENT_BUTTON(7, "@ACHIEVEMENT_NAME_19", "@ACHIEVEMENT_DETAIL_19", 19, 1 ) + ACHIEVEMENT_BUTTON(8, "@ACHIEVEMENT_NAME_20", "@ACHIEVEMENT_DETAIL_20", 20, 1 ) + ACHIEVEMENT_BUTTON(9, "@ACHIEVEMENT_NAME_21", "@ACHIEVEMENT_DETAIL_21", 21, 1 ) + ACHIEVEMENT_BUTTON(10, "@ACHIEVEMENT_NAME_22", "@ACHIEVEMENT_DETAIL_22", 22, 1 ) + ACHIEVEMENT_BUTTON(11, "@ACHIEVEMENT_NAME_23", "@ACHIEVEMENT_DETAIL_23", 23, 1 ) + ACHIEVEMENT_BUTTON(12, "@ACHIEVEMENT_NAME_24", "@ACHIEVEMENT_DETAIL_24", 24, 1 ) + ACHIEVEMENT_BUTTON(13, "@ACHIEVEMENT_NAME_25", "@ACHIEVEMENT_DETAIL_25", 25, 1 ) ACHIEVEMENT_PROGRESSBAR ACHIEVEMENT_BACKGROUND_DATE_UNLOCKED_TITLE @@ -386,23 +464,29 @@ focuscolor COLOR_FOCUSED blurWorld 4.8 soundloop "" - onOpen {} - onEsc { open "pausedmenu"; close achievements_page_2_ingame; setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0;} - onClose {} + onOpen {} + onEsc { open "pausedmenu"; close achievements_page_2_ingame; setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0; } + onClose {} + execkeyint 156 { MOVE_PAGE(1, "achievements_page_1_ingame") } + #include "ui_mp/navcontrols.inc" CHOICE_MENU_TITLE( "@IW3SP_MOD_LOC_MENU_ACHIEVEMENTS_TITLE" ) ACHIEVEMENT_BACKGROUND - ACHIEVEMENT_BUTTON(1, "@ACHIEVEMENT_NAME_30", "@ACHIEVEMENT_DETAIL_30", 30, 2) - ACHIEVEMENT_BUTTON(2, "@ACHIEVEMENT_NAME_31", "@ACHIEVEMENT_DETAIL_31", 31, 2) - ACHIEVEMENT_BUTTON(3, "@ACHIEVEMENT_NAME_32", "@ACHIEVEMENT_DETAIL_32", 32, 2) - ACHIEVEMENT_BUTTON(4, "@ACHIEVEMENT_NAME_33", "@ACHIEVEMENT_DETAIL_33", 33, 2) - ACHIEVEMENT_BUTTON(5, "@ACHIEVEMENT_NAME_34", "@ACHIEVEMENT_DETAIL_34", 34, 2) //error, wtf?! - ACHIEVEMENT_BUTTON(6, "@ACHIEVEMENT_NAME_35", "@ACHIEVEMENT_DETAIL_35", 35, 2) - ACHIEVEMENT_BUTTON(7, "@ACHIEVEMENT_NAME_36", "@ACHIEVEMENT_DETAIL_36", 36, 2) - ACHIEVEMENT_BUTTON(8, "@ACHIEVEMENT_NAME_37", "@ACHIEVEMENT_DETAIL_37", 37, 2) + ACT_BG( "3/3", achievement_page_3) + + ACHIEVEMENT_BUTTON(1, "@ACHIEVEMENT_NAME_26", "@ACHIEVEMENT_DETAIL_26", 26, 2) + ACHIEVEMENT_BUTTON(2, "@ACHIEVEMENT_NAME_27", "@ACHIEVEMENT_DETAIL_27", 27, 2) + ACHIEVEMENT_BUTTON(3, "@ACHIEVEMENT_NAME_30", "@ACHIEVEMENT_DETAIL_30", 30, 2) + ACHIEVEMENT_BUTTON(4, "@ACHIEVEMENT_NAME_31", "@ACHIEVEMENT_DETAIL_31", 31, 2) + ACHIEVEMENT_BUTTON(5, "@ACHIEVEMENT_NAME_32", "@ACHIEVEMENT_DETAIL_32", 32, 2) + ACHIEVEMENT_BUTTON(6, "@ACHIEVEMENT_NAME_33", "@ACHIEVEMENT_DETAIL_33", 33, 2) + ACHIEVEMENT_BUTTON(7, "@ACHIEVEMENT_NAME_34", "@ACHIEVEMENT_DETAIL_34", 34, 2) + ACHIEVEMENT_BUTTON(8, "@ACHIEVEMENT_NAME_35", "@ACHIEVEMENT_DETAIL_35", 35, 2) + ACHIEVEMENT_BUTTON(9, "@ACHIEVEMENT_NAME_36", "@ACHIEVEMENT_DETAIL_36", 36, 2) + ACHIEVEMENT_BUTTON(10, "@ACHIEVEMENT_NAME_37", "@ACHIEVEMENT_DETAIL_37", 37, 2) ACHIEVEMENT_PROGRESSBAR ACHIEVEMENT_BACKGROUND_DATE_UNLOCKED_TITLE