From 42a79f4b135668fe8d789a6af0226dc32684e0d2 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 11 Nov 2022 19:49:01 +0000 Subject: [PATCH] Menu updates from MuadDib --- .../Android/jni/OpenJK/code/ui/ui_main.cpp | 27 +- z_vr_assets/strip/menus_vr.sp | 28 +- z_vr_assets/ui/datapadcheats.menu | 62 +- z_vr_assets/ui/ingameload.menu | 846 +++++++++++++++++ z_vr_assets/ui/ingamesave.menu | 835 +++++++++++++++++ z_vr_assets/ui/ingamesetup.menu | 3 +- z_vr_assets/ui/loadgame.menu | 857 ++++++++++++++++++ z_vr_assets/ui/setup.menu | 3 +- 8 files changed, 2620 insertions(+), 41 deletions(-) create mode 100644 z_vr_assets/ui/ingameload.menu create mode 100644 z_vr_assets/ui/ingamesave.menu create mode 100644 z_vr_assets/ui/loadgame.menu diff --git a/Projects/Android/jni/OpenJK/code/ui/ui_main.cpp b/Projects/Android/jni/OpenJK/code/ui/ui_main.cpp index 34b79bd..1f3ddea 100644 --- a/Projects/Android/jni/OpenJK/code/ui/ui_main.cpp +++ b/Projects/Android/jni/OpenJK/code/ui/ui_main.cpp @@ -960,27 +960,14 @@ static qboolean UI_RunMenuScript ( const char **args ) } else if (Q_stricmp(name, "savegame") == 0) { - char fileName[MAX_SAVELOADNAME]; - char description[64]; // Create a new save game -// if ( !s_savedata[s_savegame.currentLine].currentSaveFileName) // No line was chosen - { - CreateNextSaveName(fileName); // Get a name to save to - } -// else // Overwrite a current save game? Ask first. - { -// s_savegame.yes.generic.flags = QMF_HIGHLIGHT_IF_FOCUS; -// s_savegame.no.generic.flags = QMF_HIGHLIGHT_IF_FOCUS; - -// strcpy(fileName,s_savedata[s_savegame.currentLine].currentSaveFileName); -// s_savegame.awaitingSave = qtrue; -// s_savegame.deletegame.generic.flags = QMF_GRAYED; // Turn off delete button -// break; - } + char fileName[MAX_SAVELOADNAME]; + CreateNextSaveName(fileName); // Save description line - ui.Cvar_VariableStringBuffer("ui_gameDesc",description,sizeof(description)); - ui.SG_StoreSaveGameComment(description); + const char *serverInfo = sv.configstrings[CS_SERVERINFO]; + const char *mapName = Info_ValueForKey( serverInfo, "mapname" ); + ui.SG_StoreSaveGameComment(mapName); ui.Cmd_ExecuteText( EXEC_APPEND, va("save %s\n", fileName)); s_savegame.saveFileCnt = -1; //force a refresh the next time around @@ -6560,7 +6547,9 @@ void ReadSaveDirectory (void) struct tm *localTime; localTime = localtime( &result ); - strcpy(s_savedata[s_savegame.saveFileCnt].currentSaveFileDateTimeString,asctime( localTime ) ); + char timeStr[20] = {0}; + strftime( timeStr, sizeof( timeStr ), "%y/%m/%d %H:%M", localTime ); + strcpy(s_savedata[s_savegame.saveFileCnt].currentSaveFileDateTimeString, timeStr ); s_savegame.saveFileCnt++; if (s_savegame.saveFileCnt == MAX_SAVELOADFILES) { diff --git a/z_vr_assets/strip/menus_vr.sp b/z_vr_assets/strip/menus_vr.sp index ff0f64e..5d6d160 100644 --- a/z_vr_assets/strip/menus_vr.sp +++ b/z_vr_assets/strip/menus_vr.sp @@ -3,7 +3,7 @@ CONFIG W:\bin\striped.cfg ID 100 REFERENCE MENUS_VR DESCRIPTION "VR Menu Localizations" -COUNT 102 +COUNT 106 INDEX 0 { REFERENCE COMMON_CONTROLS_ITEM @@ -495,22 +495,42 @@ INDEX 97 TEXT_LANGUAGE1 "CHEATS" } INDEX 98 +{ + REFERENCE CHEATS_SABER_MARK_COOL_DOWN_TITLE + TEXT_LANGUAGE1 "Lightsaber Burn Marks Cool Down:" +} +INDEX 99 +{ + REFERENCE CHEATS_SABER_MARK_COOL_DOWN_DESC + TEXT_LANGUAGE1 "Set how long it takes for burn marks to cool down." +} +INDEX 100 { REFERENCE WEAPON_CROSSHAIR_ITEM TEXT_LANGUAGE1 "Weapon Crosshair:" } -INDEX 99 +INDEX 101 { REFERENCE WEAPON_CROSSHAIR_DESC TEXT_LANGUAGE1 "Select style of weapon crosshair or disable it." } -INDEX 100 +INDEX 102 { REFERENCE FORCE_CROSSHAIR_ITEM TEXT_LANGUAGE1 "Force Power Crosshair:" } -INDEX 101 +INDEX 103 { REFERENCE FORCE_CROSSHAIR_DESC TEXT_LANGUAGE1 "Select style of force power crosshair or disable it." } +INDEX 104 +{ + REFERENCE OVERWRITE_GAME_ITEM + TEXT_LANGUAGE1 "OVERWRITE GAME" +} +INDEX 105 +{ + REFERENCE OVERWRITE_GAME_DESC + TEXT_LANGUAGE1 "Overwrite chosen game." +} diff --git a/z_vr_assets/ui/datapadcheats.menu b/z_vr_assets/ui/datapadcheats.menu index cda1dc0..eb5e25c 100644 --- a/z_vr_assets/ui/datapadcheats.menu +++ b/z_vr_assets/ui/datapadcheats.menu @@ -107,7 +107,7 @@ group none style WINDOW_STYLE_EMPTY type ITEM_TYPE_BUTTON - rect 100 80 200 20 + rect 100 60 200 20 text @MENUS_VR_CHEATS_GIVE_HEALTH_ITEM descText @MENUS_VR_CHEATS_GIVE_HEALTH_DESC font 2 @@ -131,7 +131,7 @@ group none style WINDOW_STYLE_EMPTY type ITEM_TYPE_BUTTON - rect 100 105 200 20 + rect 100 85 200 20 text @MENUS_VR_CHEATS_GIVE_ARMOR_ITEM descText @MENUS_VR_CHEATS_GIVE_ARMOR_DESC font 2 @@ -155,7 +155,7 @@ group none style WINDOW_STYLE_EMPTY type ITEM_TYPE_BUTTON - rect 100 130 200 20 + rect 100 110 200 20 text @MENUS_VR_CHEATS_GIVE_AMMO_ITEM descText @MENUS_VR_CHEATS_GIVE_AMMO_DESC font 2 @@ -179,7 +179,7 @@ group none style WINDOW_STYLE_EMPTY type ITEM_TYPE_BUTTON - rect 100 155 200 20 + rect 100 135 200 20 text @MENUS_VR_CHEATS_GIVE_BATTERIES_ITEM descText @MENUS_VR_CHEATS_GIVE_BATTERIES_DESC font 2 @@ -203,7 +203,7 @@ group none style WINDOW_STYLE_EMPTY type ITEM_TYPE_BUTTON - rect 340 80 200 20 + rect 340 60 200 20 text @MENUS_VR_CHEATS_GIVE_SABER_ITEM descText @MENUS_VR_CHEATS_GIVE_SABER_DESC font 2 @@ -227,7 +227,7 @@ group none style WINDOW_STYLE_EMPTY type ITEM_TYPE_BUTTON - rect 340 105 200 20 + rect 340 85 200 20 text @MENUS_VR_CHEATS_GIVE_WEAPONS_ITEM descText @MENUS_VR_CHEATS_GIVE_WEAPONS_DESC font 2 @@ -251,7 +251,7 @@ group none style WINDOW_STYLE_EMPTY type ITEM_TYPE_BUTTON - rect 340 130 200 20 + rect 340 110 200 20 text @MENUS_VR_CHEATS_GIVE_ITEMS_ITEM descText @MENUS_VR_CHEATS_GIVE_ITEMS_DESC font 2 @@ -275,7 +275,7 @@ group none style WINDOW_STYLE_EMPTY type ITEM_TYPE_BUTTON - rect 340 155 200 20 + rect 340 135 200 20 text @MENUS_VR_CHEATS_GIVE_POWERS_ITEM descText @MENUS_VR_CHEATS_GIVE_POWERS_DESC font 2 @@ -298,7 +298,7 @@ name none group none style WINDOW_STYLE_EMPTY - rect 220 210 200 20 + rect 220 170 200 20 text @MENUS_VR_CHEATS_SABER_COLOR_TITLE font 2 textscale 1 @@ -316,7 +316,7 @@ group none style WINDOW_STYLE_EMPTY type ITEM_TYPE_BUTTON - rect 190 235 50 20 + rect 190 190 50 20 text @MENUS_VR_CHEATS_SABER_COLOR_BLUE_ITEM descText @MENUS_VR_CHEATS_SABER_COLOR_BLUE_DESC font 2 @@ -340,7 +340,7 @@ group none style WINDOW_STYLE_EMPTY type ITEM_TYPE_BUTTON - rect 240 235 48 20 + rect 240 190 48 20 text @MENUS_VR_CHEATS_SABER_COLOR_GREEN_ITEM descText @MENUS_VR_CHEATS_SABER_COLOR_GREEN_DESC font 2 @@ -364,7 +364,7 @@ group none style WINDOW_STYLE_EMPTY type ITEM_TYPE_BUTTON - rect 288 235 50 20 + rect 288 190 50 20 text @MENUS_VR_CHEATS_SABER_COLOR_RED_ITEM descText @MENUS_VR_CHEATS_SABER_COLOR_RED_DESC font 2 @@ -388,7 +388,7 @@ group none style WINDOW_STYLE_EMPTY type ITEM_TYPE_BUTTON - rect 340 235 50 20 + rect 340 190 50 20 text @MENUS_VR_CHEATS_SABER_COLOR_ORANGE_ITEM descText @MENUS_VR_CHEATS_SABER_COLOR_ORANGE_DESC font 2 @@ -412,7 +412,7 @@ group none style WINDOW_STYLE_EMPTY type ITEM_TYPE_BUTTON - rect 400 235 50 20 + rect 400 190 50 20 text @MENUS_VR_CHEATS_SABER_COLOR_PURPLE_ITEM descText @MENUS_VR_CHEATS_SABER_COLOR_PURPLE_DESC font 2 @@ -430,6 +430,40 @@ } } + itemDef + { + name none + group none + style WINDOW_STYLE_EMPTY + rect 220 225 200 20 + text @MENUS_VR_CHEATS_SABER_MARK_COOL_DOWN_TITLE + font 2 + textscale 1 + textalignx 100 + textalign ITEM_ALIGN_CENTER + forecolor .509 .609 .847 1 + appearance_slot 1 + visible 1 + decoration + } + + itemDef + { + name none + group none + type ITEM_TYPE_SLIDER + text " " + cvarfloat "cg_saberBurnMarkCoolDownTime" 0.1 0.0 1.0 + rect 220 250 200 20 + textalign ITEM_ALIGN_CENTER + textalignx 20 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 1 + descText @MENUS_VR_CHEATS_SABER_MARK_COOL_DOWN_DESC + } + //---------------------------------------------------------------------------------------------- // // LOWER MENU BUTTONS diff --git a/z_vr_assets/ui/ingameload.menu b/z_vr_assets/ui/ingameload.menu new file mode 100644 index 0000000..4d54f1b --- /dev/null +++ b/z_vr_assets/ui/ingameload.menu @@ -0,0 +1,846 @@ +// INGAME MAIN MENU +{ + menuDef + { + name "ingameloadMenu" + fullScreen 1 // MENU_TRUE + rect 0 0 640 480 // Size and position of the menu + visible 1 // Visible on open + focusColor 1 1 1 1 // Focus color for text and items + appearanceIncrement 10 // In miliseconds + descX 375 + descY 425 + descScale .8 + descColor .235 .882 .847 1 // Focus color for text and items + descAlignment ITEM_ALIGN_CENTER + disablecolor .5 .5 .5 1 + + onOpen + { + uiScript ReadSaveDirectory + } + + onESC + { + uiScript closeingame // Close menu + } + + //---------------------------------------------------------------------------------------------- + // + // MENU BACKGROUND + // + //---------------------------------------------------------------------------------------------- + itemDef + { + name frame_pic + group none + style WINDOW_STYLE_SHADER + rect 0 0 640 480 + background "gfx/menus/menu1" // Frame + forecolor 1 1 1 1 + visible 1 + decoration + } + + // The saber glow on the left + itemDef + { + name saberglow + group none + style WINDOW_STYLE_SHADER + rect 30 0 90 480 + background "gfx/menus/menu3" // Frame + forecolor 0.8 0.8 0.8 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + + // The starwars logo on the top + itemDef + { + name starwars + group none + style WINDOW_STYLE_SHADER + rect 143 12 470 93 + background "gfx/menus/menu4" // Frame + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + // The saber halo on the left + itemDef + { + name saberhalo + group none + style WINDOW_STYLE_SHADER + rect -425 -185 1000 1000 + background "gfx/menus/menu2" // Frame + forecolor 0.5 0.5 0.5 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef + { + name logomodel + group none + type ITEM_TYPE_MODEL + rect -123 48 400 400 + model_angle 90 + model_rotation 3.5 + asset_model "models/map_objects/bespin/jk2logo.md3" +// model_fovx 37 +// model_fovy 34 +// model_origin 100 100 100 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + // The saber halo on the left + itemDef + { + name saberhalo2 + group none + style WINDOW_STYLE_SHADER + rect -225 15 600 600 + background "gfx/menus/menu2b" // Frame + forecolor 0.25 0.25 0.25 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + // Expanded menu shaders + // Sun red + itemDef + { + name sun + group none + rect -40 145 300 300 + style WINDOW_STYLE_SHADER + background "gfx/menus/menu2r" + forecolor 0.7 0.7 0.7 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + // Sun halo + itemDef + { + name sun_halo + group none + rect -95 100 400 400 + style WINDOW_STYLE_SHADER + background "gfx/menus/menu2br" + forecolor 0.3 0.3 0.3 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + // Long sunflare + itemDef + { + name sunflares + group none + rect -235 -60 700 700 + style WINDOW_STYLE_SHADER + background "gfx/menus/menu2br" + forecolor 0.3 0.3 0.3 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + + // Expanded Menu Starwars Logo + itemDef + { + name star_wars + group none + rect 272 10 365 95 + style WINDOW_STYLE_SHADER + background "gfx/menus/expanded_menu_logo" + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + + //---------------------------------------------------------------------------------------------- + // + // TOP MENU BUTTONS + // + //---------------------------------------------------------------------------------------------- + + + // Big button "SAVE" + itemDef + { + name savegamebutton_glow + group mods + style WINDOW_STYLE_SHADER + rect 115 115 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef + { + name savegamebutton + group toprow + text @MENUS1_SAVE + descText @MENUS1_SAVE_CURRENT_GAME + style WINDOW_STYLE_EMPTY + type ITEM_TYPE_BUTTON + rect 115 115 130 24 + textaligny 0 + font 3 + textscale 0.9 + textalign ITEM_ALIGN_CENTER + textstyle 3 + textalignx 65 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + hideCvar { 1 } + + mouseEnter + { + show savegamebutton_glow + } + mouseExit + { + hide savegamebutton_glow + } + action + { + play "sound/interface/button1.wav" ; + close all ; + open ingamesaveMenu + } + } + + + // Big button "LOAD" + itemDef + { + name loadgamebutton_glow + group mods + style WINDOW_STYLE_SHADER + rect 245 115 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef + { + name loadgamebutton + group toprow + text @MENUS1_LOAD + descText @MENUS1_LOAD_A_SAVED_GAME + rect 245 115 130 24 + style WINDOW_STYLE_EMPTY + type ITEM_TYPE_BUTTON + textstyle 3 + font 3 + textscale 0.9 + textaligny 0 + textalign ITEM_ALIGN_CENTER + textalignx 65 + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + + mouseEnter + { + show loadgamebutton_glow + } + mouseExit + { + hide loadgamebutton_glow + } + } + + + // Big button "CONTROLS" + itemDef + { + name controlsbutton_glow + group mods + style WINDOW_STYLE_SHADER + rect 375 115 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef { + name controlsbutton + group toprow + text @MENUS0_CONTROLS2 + descText @MENUS0_CONFIGURE_GAME_CONTROLS + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 375 115 130 24 + font 3 + textscale 0.9 + textaligny 0 + textalign ITEM_ALIGN_CENTER + textstyle 3 + textalignx 65 + backcolor 0 0 0 0 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + hideCvar { 1 } + + mouseEnter + { + show controlsbutton_glow + } + mouseExit + { + hide controlsbutton_glow + } + action + { + play "sound/interface/button1.wav" ; + close all ; + open ingameControlsMenu ; + } + } + + // Big button "SETUP" + itemDef + { + name setupbutton_glow + group mods + style WINDOW_STYLE_SHADER + rect 505 115 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef { + name setupbutton + group toprow + text @MENUS0_SETUP + descText @MENUS0_CONFIGURE_GAME_SETTINGS + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 505 115 130 24 + font 3 + textscale 0.9 + textaligny 0 + textalign ITEM_ALIGN_CENTER + textstyle 3 + textalignx 65 + backcolor 0 0 0 0 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + hideCvar { 1 } + + mouseEnter + { + show setupbutton_glow + } + mouseExit + { + hide setupbutton_glow + } + action + { + play "sound/interface/button1.wav" ; + close all ; + open ingameSetupMenu ; + } + } + + itemDef + { + name header_line + group toprow + style WINDOW_STYLE_SHADER + rect 125 136 500 4 + background "gfx/menus/menu_line" // Frame + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + //---------------------------------------------------------------------------------------------- + // + // OTHER MAIN MENU BUTTONS + // + //---------------------------------------------------------------------------------------------- + // EXIT button in lower left corner + itemDef + { + name exitgamebutton_glow + group mods + style WINDOW_STYLE_SHADER + rect 115 444 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef + { + name exitgamebutton + group othermain + text @MENUS0_EXIT + descText @MENUS1_JEDI_KNIGHT_II + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 115 444 130 24 + font 3 + textscale 1 + textalign ITEM_ALIGN_CENTER + textstyle 3 + textalignx 65 + textaligny -1 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + hideCvar { 1 } + + mouseEnter + { + show exitgamebutton_glow + } + mouseExit + { + hide exitgamebutton_glow + } + action + { + play "sound/interface/button1.wav" ; + close all ; + open ingamequitMenu + } + } + + // RESUME button in the lower right corner + itemDef + { + name resumebutton_glow + group mods + style WINDOW_STYLE_SHADER + rect 495 444 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef + { + name resume + group none + style WINDOW_STYLE_EMPTY + type ITEM_TYPE_BUTTON + rect 495 444 130 24 + text @MENUS1_RESUME + descText @MENUS1_RESUME_CURRENT_GAME + font 3 + textscale 1 + textalign ITEM_ALIGN_CENTER + textstyle 3 + textalignx 65 + textaligny -1 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + hideCvar { 1 } + mouseEnter + { + show resumebutton_glow + } + mouseExit + { + hide resumebutton_glow + } + action + { + play "sound/interface/button1.wav" ; + uiScript closeingame // Close menu + } + } + + // Expanded Menu Back Button + itemDef + { + name back_menu_button_hover + group highlights + rect 585 445 50 15 + style WINDOW_STYLE_SHADER + textalign ITEM_ALIGN_RIGHT + background "gfx/menus/expanded_menu_buttonback" + forecolor 1 1 1 1 + visible 0 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + + itemDef + { + name back_menu_button + group none + rect 585 445 50 15 + text @MENUS0_BACK + descText @MENUS0_BACKUP_ONE_MENU + style WINDOW_STYLE_EMPTY + type ITEM_TYPE_BUTTON + textalign ITEM_ALIGN_RIGHT + textalignx 49 + textaligny 0 + textscale 0.53 + textstyle 3 + font 3 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + showCvar { 1 } + + action + { + play "sound/interface/button1.wav" + + hide highlights + + close all + open ingameMainMenu + } + + mouseEnter + { + show back_menu_button_hover + } + mouseExit + { + hide back_menu_button_hover + } + } + + //---------------------------------------------------------------------------------------------- + // + // LOAD GAME MENU specific stuff + // + //---------------------------------------------------------------------------------------------- + // Load Game title + itemDef + { + name loadgame_title + group none + style WINDOW_STYLE_SHADER + background "gfx/menus/menu_blendbox" + text @MENUS1_LOAD_GAME + rect 150 145 450 16 + font 3 + textscale 0.7 + textalign ITEM_ALIGN_CENTER + textalignx 225 + textaligny -2 + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + itemDef + { + name loadgame_title + group none + style WINDOW_STYLE_SHADER + background "gfx/menus/expanded_menu_box" + text @MENUS1_LOAD_GAME + rect 140 145 486 16 + font 3 + textscale 0.7 + textalign ITEM_ALIGN_CENTER + textalignx 241 + textaligny -1 + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + + itemDef + { + name loadgame_background + group none + style WINDOW_STYLE_SHADER + rect 140 166 486 245 + background "gfx/menus/expanded_menu_box" // Frame + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + + itemDef + { + name loadgamelist + group loadscreen + rect 145 170 285 230 + type ITEM_TYPE_LISTBOX + style WINDOW_STYLE_FILLED + elementwidth 120 + elementheight 16 + font 2 + textaligny 2 + textscale 0.7 + border 1 + bordersize 1 + bordercolor .5 .5 .5 .5 + forecolor 0.65 0.65 1 1 + backcolor 0 0 .5 .25 + outlinecolor .5 .5 .5 .5 + elementtype LISTBOX_TEXT + feeder FEEDER_SAVEGAMES + notselectable + visible 1 + columns 2 0 35 155 160 25 102 + mouseEnter + { + setitemcolor loadgamelist bordercolor .265 .824 .886 1 + } + mouseExit + { + setitemcolor loadgamelist bordercolor .5 .5 .5 .5 + } + doubleclick + { + play sound/interface/button1.wav + uiScript loadgame + } + } + + itemDef + { + name loadgamepic + group loadscreen + style WINDOW_STYLE_EMPTY + ownerdraw 236 //UI_ALLMAPS_SELECTION + font 2 + textscale .8 + forecolor 1 1 1 1 + rect 435 170 180 135 + border 1 + bordercolor .265 .824 .886 .25 + visible 1 + } + + // loadgame button + itemDef + { + name loadgameaction_glow + group glow + style WINDOW_STYLE_SHADER + rect 440 330 175 25 + background "gfx/menus/menu_blendbox2" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + } + + itemDef + { + name loadgameaction + group actionbutton + text @MENUS1_LOAD_GAME + descText @MENUS1_LOAD_CHOSEN_GAME + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 440 330 175 25 + font 3 + textscale 0.8 + textalignx 175 + textaligny 1 + textalign ITEM_ALIGN_RIGHT + textstyle 3 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest ui_SelectionOK + enableCvar { "1" } + + mouseEnter + { + show loadgameaction_glow + } + mouseExit + { + hide loadgameaction_glow + } + action + { + play sound/interface/button1.wav ; + hide glow ; + uiScript loadgame + } + } + + // deletegame button + itemDef + { + name deletegameaction_glow + group glow + style WINDOW_STYLE_SHADER + rect 440 355 175 25 + background "gfx/menus/menu_blendbox2" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + } + + itemDef + { + name deletegamebutton + group actionbutton + text @MENUS1_DELETE_GAME + descText @MENUS1_DELETE_CHOSEN_GAME + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 440 355 175 25 + font 3 + textscale 0.8 + textalignx 175 + textaligny 1 + textalign ITEM_ALIGN_RIGHT + textstyle 3 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest ui_SelectionOK + enableCvar { "1" } + + mouseEnter + { + show deletegameaction_glow + } + mouseExit + { + hide deletegameaction_glow + } + action + { + play sound/interface/button1.wav ; + hide glow ; + uiScript deletegame + } + } + + // resumegame button + itemDef + { + name resumegameaction_glow + group glow + style WINDOW_STYLE_SHADER + rect 440 380 175 25 + background "gfx/menus/menu_blendbox2" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + } + + itemDef + { + name resumeautobutton + group actionbutton + text @MENUS2_RESUME_MISSION + descText @MENUS2_RESUME_LAST_MISSION_ENTERED + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 440 380 175 25 + font 3 + textscale 0.8 + textalignx 175 + textaligny 1 + textalign ITEM_ALIGN_RIGHT + textstyle 3 + forecolor 0.65 0.65 1 1 + visible 1 // This button isn't used when not in game. + cvarTest ui_ResumeOK + enableCvar { "1" } + + mouseEnter + { + show resumegameaction_glow + } + mouseExit + { + hide resumegameaction_glow + } + action + { + play "sound/interface/button1.wav" ; + hide glow ; + uiScript loadAuto + } + } + + + } +} + + + + + + + + + + + + + + + + + + + diff --git a/z_vr_assets/ui/ingamesave.menu b/z_vr_assets/ui/ingamesave.menu new file mode 100644 index 0000000..1bcf4b8 --- /dev/null +++ b/z_vr_assets/ui/ingamesave.menu @@ -0,0 +1,835 @@ +// INGAME MAIN MENU +{ + menuDef + { + name "ingamesaveMenu" + fullScreen 1 // MENU_TRUE + rect 0 0 640 480 // Size and position of the menu + visible 1 // Visible on open + focusColor 1 1 1 1 // Focus color for text and items + appearanceIncrement 10 // In miliseconds + descX 375 + descY 425 + descScale .8 + descColor .235 .882 .847 1 // Focus color for text and items + descAlignment ITEM_ALIGN_CENTER + disablecolor .5 .5 .5 1 + + onOpen + { + uiScript ReadSaveDirectory + } + + onESC + { + uiScript closeingame // Close menu + } + + //---------------------------------------------------------------------------------------------- + // + // MENU BACKGROUND + // + //---------------------------------------------------------------------------------------------- + itemDef + { + name frame_pic + group none + style WINDOW_STYLE_SHADER + rect 0 0 640 480 + background "gfx/menus/menu1" // Frame + forecolor 1 1 1 1 + visible 1 + decoration + } + + // The saber glow on the left + itemDef + { + name saberglow + group none + style WINDOW_STYLE_SHADER + rect 30 0 90 480 + background "gfx/menus/menu3" // Frame + forecolor 0.8 0.8 0.8 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + + // The starwars logo on the top + itemDef + { + name starwars + group none + style WINDOW_STYLE_SHADER + rect 143 12 470 93 + background "gfx/menus/menu4" // Frame + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + // The saber halo on the left + itemDef + { + name saberhalo + group none + style WINDOW_STYLE_SHADER + rect -425 -185 1000 1000 + background "gfx/menus/menu2" // Frame + forecolor 0.5 0.5 0.5 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef + { + name logomodel + group none + type ITEM_TYPE_MODEL + rect -123 48 400 400 + model_angle 90 + model_rotation 3.5 + asset_model "models/map_objects/bespin/jk2logo.md3" +// model_fovx 37 +// model_fovy 34 +// model_origin 100 100 100 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + // The saber halo on the left + itemDef + { + name saberhalo2 + group none + style WINDOW_STYLE_SHADER + rect -225 15 600 600 + background "gfx/menus/menu2b" // Frame + forecolor 0.25 0.25 0.25 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + // Expanded menu shaders + // Sun red + itemDef + { + name sun + group none + rect -40 145 300 300 + style WINDOW_STYLE_SHADER + background "gfx/menus/menu2r" + forecolor 0.7 0.7 0.7 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + // Sun halo + itemDef + { + name sun_halo + group none + rect -95 100 400 400 + style WINDOW_STYLE_SHADER + background "gfx/menus/menu2br" + forecolor 0.3 0.3 0.3 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + // Long sunflare + itemDef + { + name sunflares + group none + rect -235 -60 700 700 + style WINDOW_STYLE_SHADER + background "gfx/menus/menu2br" + forecolor 0.3 0.3 0.3 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + + // Expanded Menu Starwars Logo + itemDef + { + name star_wars + group none + rect 272 10 365 95 + style WINDOW_STYLE_SHADER + background "gfx/menus/expanded_menu_logo" + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + + //---------------------------------------------------------------------------------------------- + // + // TOP MENU BUTTONS + // + //---------------------------------------------------------------------------------------------- + + + // Big button "SAVE" + itemDef + { + name savegamebutton_glow + group none + style WINDOW_STYLE_SHADER + rect 115 115 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef + { + name savegamebutton + group toprow + text @MENUS1_SAVE + descText @MENUS1_SAVE_CURRENT_GAME + style WINDOW_STYLE_EMPTY + type ITEM_TYPE_BUTTON + rect 115 115 130 24 + textaligny 0 + font 3 + textscale 0.9 + textalign ITEM_ALIGN_CENTER + textstyle 3 + textalignx 65 + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + + mouseEnter + { + show savegamebutton_glow + } + mouseExit + { + hide savegamebutton_glow + } + } + + + // Big button "LOAD" + itemDef + { + name loadgamebutton_glow + group none + style WINDOW_STYLE_SHADER + rect 245 115 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef + { + name loadgamebutton + group toprow + text @MENUS1_LOAD + descText @MENUS1_LOAD_A_SAVED_GAME + rect 245 115 130 24 + style WINDOW_STYLE_EMPTY + type ITEM_TYPE_BUTTON + textstyle 3 + font 3 + textscale 0.9 + textaligny 0 + textalign ITEM_ALIGN_CENTER + textalignx 65 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + hideCvar { 1 } + + mouseEnter + { + show loadgamebutton_glow + } + mouseExit + { + hide loadgamebutton_glow + } + action + { + play "sound/interface/button1.wav" ; + close all ; + open ingameloadMenu + } + } + + + // Big button "CONTROLS" + itemDef + { + name controlsbutton_glow + group none + style WINDOW_STYLE_SHADER + rect 375 115 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef { + name controlsbutton + group toprow + text @MENUS0_CONTROLS2 + descText @MENUS0_CONFIGURE_GAME_CONTROLS + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 375 115 130 24 + font 3 + textscale 0.9 + textaligny 0 + textalign ITEM_ALIGN_CENTER + textstyle 3 + textalignx 65 + backcolor 0 0 0 0 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + hideCvar { 1 } + + mouseEnter + { + show controlsbutton_glow + } + mouseExit + { + hide controlsbutton_glow + } + action + { + play "sound/interface/button1.wav" ; + close all ; + open ingameControlsMenu ; + } + } + + // Big button "SETUP" + itemDef + { + name setupbutton_glow + group none + style WINDOW_STYLE_SHADER + rect 505 115 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef { + name setupbutton + group toprow + text @MENUS0_SETUP + descText @MENUS0_CONFIGURE_GAME_SETTINGS + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 505 115 130 24 + font 3 + textscale 0.9 + textaligny 0 + textalign ITEM_ALIGN_CENTER + textstyle 3 + textalignx 65 + backcolor 0 0 0 0 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + hideCvar { 1 } + + mouseEnter + { + show setupbutton_glow + } + mouseExit + { + hide setupbutton_glow + } + action + { + play "sound/interface/button1.wav" ; + close all ; + open ingameSetupMenu ; + } + } + + itemDef + { + name header_line + group toprow + style WINDOW_STYLE_SHADER + rect 125 136 500 4 + background "gfx/menus/menu_line" // Frame + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + //---------------------------------------------------------------------------------------------- + // + // OTHER MAIN MENU BUTTONS + // + //---------------------------------------------------------------------------------------------- + // EXIT button in lower left corner + itemDef + { + name exitgamebutton_glow + group none + style WINDOW_STYLE_SHADER + rect 115 444 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef + { + name exitgamebutton + group othermain + text @MENUS0_EXIT + descText @MENUS1_JEDI_KNIGHT_II + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 115 444 130 24 + font 3 + textscale 1 + textalign ITEM_ALIGN_CENTER + textstyle 3 + textalignx 65 + textaligny -1 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + hideCvar { 1 } + + mouseEnter + { + show exitgamebutton_glow + } + mouseExit + { + hide exitgamebutton_glow + } + action + { + play "sound/interface/button1.wav" ; + close all ; + open ingamequitMenu + } + } + + // RESUME button in the lower right corner + itemDef + { + name resumebutton_glow + group none + style WINDOW_STYLE_SHADER + rect 495 444 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef + { + name resume + group none + style WINDOW_STYLE_EMPTY + type ITEM_TYPE_BUTTON + rect 495 444 130 24 + text @MENUS1_RESUME + descText @MENUS1_RESUME_CURRENT_GAME + font 3 + textscale 1 + textalign ITEM_ALIGN_CENTER + textstyle 3 + textalignx 65 + textaligny -1 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + hideCvar { 1 } + mouseEnter + { + show resumebutton_glow + } + mouseExit + { + hide resumebutton_glow + } + action + { + play "sound/interface/button1.wav" ; + uiScript closeingame // Close menu + } + } + + // Expanded Menu Back Button + itemDef + { + name back_menu_button_hover + group highlights + rect 585 445 50 15 + style WINDOW_STYLE_SHADER + textalign ITEM_ALIGN_RIGHT + background "gfx/menus/expanded_menu_buttonback" + forecolor 1 1 1 1 + visible 0 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + + itemDef + { + name back_menu_button + group none + rect 585 445 50 15 + text @MENUS0_BACK + descText @MENUS0_BACKUP_ONE_MENU + style WINDOW_STYLE_EMPTY + type ITEM_TYPE_BUTTON + textalign ITEM_ALIGN_RIGHT + textalignx 49 + textaligny 0 + textscale 0.53 + textstyle 3 + font 3 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + showCvar { 1 } + + action + { + play "sound/interface/button1.wav" + + hide highlights + + close all + open ingameMainMenu + } + + mouseEnter + { + show back_menu_button_hover + } + mouseExit + { + hide back_menu_button_hover + } + } + + //---------------------------------------------------------------------------------------------- + // + // SAVE GAME FIELDS + // + //---------------------------------------------------------------------------------------------- + // Save Game title + itemDef + { + name savegame_title + group none + style WINDOW_STYLE_SHADER + background "gfx/menus/menu_blendbox" + text @MENUS1_SAVE_GAME + rect 150 145 450 16 + font 3 + textscale 0.7 + textalign ITEM_ALIGN_CENTER + textalignx 225 + textaligny -2 + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + itemDef + { + name savegame_title + group none + style WINDOW_STYLE_SHADER + background "gfx/menus/expanded_menu_box" + text @MENUS1_SAVE_GAME + rect 140 145 486 16 + font 3 + textscale 0.7 + textalign ITEM_ALIGN_CENTER + textalignx 241 + textaligny -1 + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + + itemDef + { + name savegame_background + group none + style WINDOW_STYLE_SHADER + rect 140 166 486 245 + background "gfx/menus/expanded_menu_box" // Frame + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + + itemDef + { + name savegamelist + group loadscreen + rect 145 170 285 230 + type ITEM_TYPE_LISTBOX + style WINDOW_STYLE_FILLED + elementwidth 120 + elementheight 16 + font 2 + textaligny 2 + textscale 0.7 + border 1 + bordersize 1 + bordercolor .5 .5 .5 .5 + forecolor 0.65 0.65 1 1 + backcolor 0 0 .5 .25 + outlinecolor .5 .5 .5 .5 + elementtype LISTBOX_TEXT + feeder FEEDER_SAVEGAMES + notselectable + visible 1 + columns 2 0 35 155 160 25 102 + mouseEnter + { + setitemcolor savegamelist bordercolor .265 .824 .886 1 + } + mouseExit + { + setitemcolor savegamelist bordercolor .5 .5 .5 .5 + } + } + + itemDef + { + name savegamepic + group loadscreen + style WINDOW_STYLE_EMPTY + ownerdraw 236 //UI_ALLMAPS_SELECTION + font 2 + textscale .8 + forecolor 1 1 1 1 + rect 435 170 180 135 + border 1 + bordercolor .265 .824 .886 .25 + visible 1 + decoration + } + + // savegame button + itemDef + { + name savegameaction_glow + group glow + style WINDOW_STYLE_SHADER + rect 440 330 175 25 + background "gfx/menus/menu_blendbox2" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + } + + itemDef + { + name savegamebutton + group toprow + text @MENUS1_SAVE_GAME + descText @MENUS1_SAVE_GAME + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 440 330 175 25 + font 3 + textscale 0.8 + textalignx 175 + textaligny 1 + textalign ITEM_ALIGN_RIGHT + textstyle 3 + forecolor 0.65 0.65 1 1 + visible 1 + mouseEnter + { + show savegameaction_glow + } + mouseExit + { + hide savegameaction_glow + } + action + { + play sound/interface/button1.wav ; + uiScript savegame + } + } + + // overwritegame button + itemDef + { + name owerwritegameaction_glow + group glow + style WINDOW_STYLE_SHADER + rect 440 355 175 25 + background "gfx/menus/menu_blendbox2" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + } + + itemDef + { + name overwritegamebutton + group toprow + text @MENUS_VR_OVERWRITE_GAME_ITEM + descText @MENUS_VR_OVERWRITE_GAME_DESC + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 440 355 175 25 + font 3 + textscale 0.8 + textalignx 175 + textaligny 1 + textalign ITEM_ALIGN_RIGHT + textstyle 3 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest "ui_SelectionOK" + enableCvar { "1" } + mouseEnter + { + show owerwritegameaction_glow + } + mouseExit + { + hide owerwritegameaction_glow + } + action + { + play sound/interface/button1.wav ; + hide glow ; + uiScript deletegame + uiScript savegame + } + } + + // deletegame button + itemDef + { + name deletegameaction_glow + group glow + style WINDOW_STYLE_SHADER + rect 440 380 175 25 + background "gfx/menus/menu_blendbox2" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + } + + itemDef + { + name deletegamebutton + group toprow + text @MENUS1_DELETE_GAME + descText @MENUS1_DELETE_CHOSEN_GAME + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 440 380 175 25 + font 3 + textscale 0.8 + textalignx 175 + textaligny 1 + textalign ITEM_ALIGN_RIGHT + textstyle 3 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest "ui_SelectionOK" + enableCvar { "1" } + mouseEnter + { + show deletegameaction_glow + } + mouseExit + { + hide deletegameaction_glow + } + action + { + play sound/interface/button1.wav ; + hide glow ; + uiScript deletegame + } + } + } +} + + + + + + + + + + + + + + + + + + + diff --git a/z_vr_assets/ui/ingamesetup.menu b/z_vr_assets/ui/ingamesetup.menu index 2d2bb8c..02518bb 100644 --- a/z_vr_assets/ui/ingamesetup.menu +++ b/z_vr_assets/ui/ingamesetup.menu @@ -1466,7 +1466,7 @@ name vidrestart_background group vidrestart style WINDOW_STYLE_SHADER - rect 300 171 300 250 + rect 304 168 300 247 background "gfx/menus/menu_boxred" // Frame forecolor 1 1 1 0.5 visible 0 @@ -1666,7 +1666,6 @@ action { play "sound/interface/button1.wav" ; - uiScript update "r_gamma" ; setcvar ui_r_modified 1 show applyChanges } diff --git a/z_vr_assets/ui/loadgame.menu b/z_vr_assets/ui/loadgame.menu new file mode 100644 index 0000000..09e2f94 --- /dev/null +++ b/z_vr_assets/ui/loadgame.menu @@ -0,0 +1,857 @@ +// LOADGAME MENU +{ + menuDef + { + name "loadgameMenu" + visible 0 + fullScreen 1 // MENU_TRUE + rect 0 0 640 480 // Size and position of the menu + focusColor 1 1 1 1 // Focus color for text and items + appearanceIncrement 75 // In miliseconds + descX 375 + descY 425 + descScale .8 + descColor .235 .882 .847 1 // Focus color for text and items + descAlignment ITEM_ALIGN_CENTER + disablecolor .5 .5 .5 1 + + onESC + { + play sound/interface/button1.wav + close all + open mainMenu + } + onOpen + { + uiScript ReadSaveDirectory ; + } + + //---------------------------------------------------------------------------------------------- + // + // MENU BACKGROUND + // + //---------------------------------------------------------------------------------------------- + itemDef + { + name frame_pic + group none + style WINDOW_STYLE_SHADER + rect 0 0 640 480 + background "gfx/menus/menu1" // Frame + forecolor 1 1 1 1 + visible 1 + decoration + } + + // The saber glow on the left + itemDef + { + name saberglow + group none + style WINDOW_STYLE_SHADER + rect 30 0 90 480 + background "gfx/menus/menu3" // Frame + forecolor 0.8 0.8 0.8 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + + // The starwars logo on the top + itemDef + { + name starwars + group none + style WINDOW_STYLE_SHADER + rect 143 12 470 93 + background "gfx/menus/menu4" // Frame + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + // The saber halo on the left + itemDef + { + name saberhalo + group none + style WINDOW_STYLE_SHADER + rect -425 -185 1000 1000 + background "gfx/menus/menu2" // Frame + forecolor 0.5 0.5 0.5 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef + { + name logomodel + group none + type ITEM_TYPE_MODEL + rect -123 48 400 400 + model_angle 90 + model_rotation 3.5 + asset_model "models/map_objects/bespin/jk2logo.md3" +// model_fovx 37 +// model_fovy 34 +// model_origin 100 100 100 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + // The saber halo on the left + itemDef + { + name saberhalo2 + group none + style WINDOW_STYLE_SHADER + rect -225 15 600 600 + background "gfx/menus/menu2b" // Frame + forecolor 0.25 0.25 0.25 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + // Expanded menu shaders + // Sun red + itemDef + { + name sun + group none + rect -40 145 300 300 + style WINDOW_STYLE_SHADER + background "gfx/menus/menu2r" + forecolor 0.7 0.7 0.7 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + // Sun halo + itemDef + { + name sun_halo + group none + rect -95 100 400 400 + style WINDOW_STYLE_SHADER + background "gfx/menus/menu2br" + forecolor 0.3 0.3 0.3 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + // Long sunflare + itemDef + { + name sunflares + group none + rect -235 -60 700 700 + style WINDOW_STYLE_SHADER + background "gfx/menus/menu2br" + forecolor 0.3 0.3 0.3 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + + // Expanded Menu Background Video + itemDef + { + name background_video + group none + rect 0 -100 640 680 + style WINDOW_STYLE_SHADER + background "gfx/menus/expanded_menu_video_1" + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_video + showCvar { 1 } + } + + // Expanded Menu Starwars Logo + itemDef + { + name star_wars + group none + rect 272 10 365 95 + style WINDOW_STYLE_SHADER + background "gfx/menus/expanded_menu_logo" + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + + //---------------------------------------------------------------------------------------------- + // + // TOP MAIN MENU BUTTONS + // + //---------------------------------------------------------------------------------------------- + + // Big button "NEW" + itemDef + { + name newgamebutton_glow + group glow + style WINDOW_STYLE_SHADER + rect 115 115 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + // appearance_slot 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef + { + name newgamebutton + group toprow + style WINDOW_STYLE_EMPTY + type ITEM_TYPE_BUTTON + rect 115 115 130 24 + text @MENUS1_NEW + descText @MENUS1_START_A_NEW_GAME + font 3 + textscale 0.9 + textaligny 0 + textalign ITEM_ALIGN_CENTER + textstyle 3 + textalignx 65 + forecolor 0.64 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + hideCvar { 1 } + + mouseEnter + { + show newgamebutton_glow + } + mouseExit + { + hide newgamebutton_glow + } + action + { + play "sound/interface/button1.wav" ; + close all ; + open newgameMenu + } + } + + // Big button "LOAD" + itemDef + { + name loadgamebutton_glow + group glow + style WINDOW_STYLE_SHADER + rect 245 115 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + // appearance_slot 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef + { + name loadgamebutton + group toprow + text @MENUS1_LOAD + descText @MENUS1_LOAD_A_SAVED_GAME + style WINDOW_STYLE_EMPTY + type ITEM_TYPE_BUTTON + rect 245 115 130 24 + textaligny 0 + font 3 + textscale 0.9 + textalign ITEM_ALIGN_CENTER + textstyle 3 + textalignx 65 + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + + mouseEnter + { + show loadgamebutton_glow + } + mouseExit + { + hide loadgamebutton_glow + } + } + + // Big button "CONTROLS" + itemDef + { + name controlsbutton_glow + group glow + style WINDOW_STYLE_SHADER + rect 375 115 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + // appearance_slot 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef { + name controlsbutton + group toprow + text @MENUS0_CONTROLS2 + descText @MENUS0_CONFIGURE_GAME_CONTROLS + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 375 115 130 24 + font 3 + textscale 0.9 + textaligny 0 + textalign ITEM_ALIGN_CENTER + textstyle 3 + textalignx 65 + backcolor 0 0 0 0 + forecolor 0.64 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + hideCvar { 1 } + + mouseEnter + { + show controlsbutton_glow + } + mouseExit + { + hide controlsbutton_glow + } + action + { + play "sound/interface/button1.wav" ; + close all ; + open controlsMenu ; + } + } + + // Big button "SETUP" + itemDef + { + name setupbutton_glow + group glow + style WINDOW_STYLE_SHADER + rect 505 115 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + // appearance_slot 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef { + name setupbutton + group toprow + text @MENUS0_SETUP + descText @MENUS0_CONFIGURE_GAME_SETTINGS + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 505 115 130 24 + font 3 + textscale 0.9 + textaligny 0 + textalign ITEM_ALIGN_CENTER + textstyle 3 + textalignx 65 + backcolor 0 0 0 0 + forecolor 0.64 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + hideCvar { 1 } + + mouseEnter + { + show setupbutton_glow + } + mouseExit + { + hide setupbutton_glow + } + action + { + play "sound/interface/button1.wav" ; + close all ; + open setupMenu ; + } + } + + itemDef + { + name header_line + group toprow + style WINDOW_STYLE_SHADER + rect 125 136 500 4 + background "gfx/menus/menu_line" // Frame + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + + //---------------------------------------------------------------------------------------------- + // + // OTHER MAIN MENU BUTTONS + // + //---------------------------------------------------------------------------------------------- + // Credits hidden button + itemDef + { + name creditsbutton + group othermain +// text @CREDITS + descText @MENUS0_SHOW_GAME_CREDITS + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 51 284 52 60 + font 2 + textscale 1 + textaligny 0 + textalign ITEM_ALIGN_CENTER + textalignx 46 + backcolor 0 0 0 0 + forecolor 0.65 0.65 1 1 + visible 0 + + mouseEnter + { + setitemcolor saberhalo2 forecolor 0.7 0.7 0.7 1 + } + mouseExit + { + setitemcolor saberhalo2 forecolor 0.25 0.25 0.25 1 + } + action + { + play "sound/interface/button1.wav" ; + close all ; + open creditsMenu + } + } + + // EXIT button in lower left corner + // Big button "SETUP" + itemDef + { + name exitgamebutton_glow + group glow + style WINDOW_STYLE_SHADER + rect 115 444 130 24 + background "gfx/menus/menu_buttonback" // Frame around button + forecolor 1 1 1 1 + visible 0 + // appearance_slot 1 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + + itemDef + { + name exitgamebutton + group othermain + text @MENUS0_EXIT + descText @MENUS1_JEDI_KNIGHT_II + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 115 444 130 24 + font 3 + textscale 1 + textalign ITEM_ALIGN_CENTER + textstyle 3 + textalignx 65 + textaligny -1 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + hideCvar { 1 } + + mouseEnter + { + show exitgamebutton_glow + } + mouseExit + { + hide exitgamebutton_glow + } + action + { + play "sound/weapons/saber/saberoff.mp3" ; + close all ; + open quitMenu + } + } + + // Expanded Menu Back Button + itemDef + { + name back_menu_button_hover + group highlights + rect 585 445 50 15 + style WINDOW_STYLE_SHADER + textalign ITEM_ALIGN_RIGHT + background "gfx/menus/expanded_menu_buttonback" + forecolor 1 1 1 1 + visible 0 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + + itemDef + { + name back_menu_button + group none + rect 585 445 50 15 + text @MENUS0_BACK + descText @MENUS0_BACKUP_ONE_MENU + style WINDOW_STYLE_EMPTY + type ITEM_TYPE_BUTTON + textalign ITEM_ALIGN_RIGHT + textalignx 49 + textaligny 0 + textscale 0.53 + textstyle 3 + font 3 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest expanded_menu_enabled + showCvar { 1 } + + action + { + play "sound/interface/button1.wav" + + hide highlights + + close all + open mainbackMenu + } + + mouseEnter + { + show back_menu_button_hover + } + mouseExit + { + hide back_menu_button_hover + } + } + + //---------------------------------------------------------------------------------------------- + // + // LOAD GAME MENU specific stuff + // + //---------------------------------------------------------------------------------------------- + // Load Game title + itemDef + { + name loadgame_title + group none + style WINDOW_STYLE_SHADER + background "gfx/menus/menu_blendbox" + text @MENUS1_LOAD_GAME + rect 150 145 450 16 + font 3 + textscale 0.7 + textalign ITEM_ALIGN_CENTER + textalignx 225 + textaligny -2 + forecolor 1 1 1 1 + visible 1 + // appearance_slot 2 + decoration + cvarTest expanded_menu_enabled + hideCvar { 1 } + } + itemDef + { + name loadgame_title + group none + style WINDOW_STYLE_SHADER + background "gfx/menus/expanded_menu_box" + text @MENUS1_LOAD_GAME + rect 140 145 486 16 + font 3 + textscale 0.7 + textalign ITEM_ALIGN_CENTER + textalignx 241 + textaligny -1 + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + + itemDef + { + name loadgame_background + group none + style WINDOW_STYLE_SHADER + rect 140 166 486 245 + background "gfx/menus/expanded_menu_box" // Frame + forecolor 1 1 1 1 + visible 1 + decoration + cvarTest expanded_menu_enabled + showCvar { 1 } + } + + itemDef + { + name loadgamelist + group loadscreen + rect 145 170 285 230 + type ITEM_TYPE_LISTBOX + style WINDOW_STYLE_FILLED + elementwidth 120 + elementheight 16 + font 2 + textaligny 2 + textscale 0.7 + border 1 + bordersize 1 + bordercolor .5 .5 .5 .5 + forecolor 0.65 0.65 1 1 + backcolor 0 0 .5 .25 + outlinecolor .5 .5 .5 .5 + elementtype LISTBOX_TEXT + feeder FEEDER_SAVEGAMES + notselectable + visible 1 + columns 2 0 35 155 160 25 102 + mouseEnter + { + setitemcolor loadgamelist bordercolor .265 .824 .886 1 + } + mouseExit + { + setitemcolor loadgamelist bordercolor .5 .5 .5 .5 + } + doubleclick + { + play sound/interface/button1.wav + uiScript loadgame + } + } + + itemDef + { + name loadgamepic + group loadscreen + style WINDOW_STYLE_EMPTY + ownerdraw 236 //UI_ALLMAPS_SELECTION + font 2 + textscale .8 + forecolor 1 1 1 1 + rect 435 170 180 135 + border 1 + bordercolor .265 .824 .886 .25 + visible 1 + } + + // loadgame button + itemDef + { + name loadgameaction_glow + group glow + style WINDOW_STYLE_SHADER + rect 440 330 175 25 + background "gfx/menus/menu_blendbox2" // Frame around button + forecolor 1 1 1 1 + visible 0 + // appearance_slot 1 + decoration + } + + itemDef + { + name loadgameaction + group actionbutton + text @MENUS1_LOAD_GAME + descText @MENUS1_LOAD_CHOSEN_GAME + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 440 330 175 25 + font 3 + textscale 0.8 + textalignx 175 + textaligny 1 + textalign ITEM_ALIGN_RIGHT + textstyle 3 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest ui_SelectionOK + enableCvar { "1" } + + mouseEnter + { + show loadgameaction_glow + } + mouseExit + { + hide loadgameaction_glow + } + action + { + play sound/interface/button1.wav ; + hide glow ; + uiScript loadgame + } + } + + // deletegame button + itemDef + { + name deletegameaction_glow + group glow + style WINDOW_STYLE_SHADER + rect 440 355 175 25 + background "gfx/menus/menu_blendbox2" // Frame around button + forecolor 1 1 1 1 + visible 0 + // appearance_slot 1 + decoration + } + + itemDef + { + name deletegamebutton + group actionbutton + text @MENUS1_DELETE_GAME + descText @MENUS1_DELETE_CHOSEN_GAME + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 440 355 175 25 + font 3 + textscale 0.8 + textalignx 175 + textaligny 1 + textalign ITEM_ALIGN_RIGHT + textstyle 3 + forecolor 0.65 0.65 1 1 + visible 1 + cvarTest ui_SelectionOK + enableCvar { "1" } + + mouseEnter + { + show deletegameaction_glow + } + mouseExit + { + hide deletegameaction_glow + } + action + { + play sound/interface/button1.wav ; + hide glow ; + uiScript deletegame + } + } + + + // resumegame button + itemDef + { + name resumegameaction_glow + group glow + style WINDOW_STYLE_SHADER + rect 440 380 175 25 + background "gfx/menus/menu_blendbox2" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + } + + itemDef + { + name resumeautobutton + group actionbutton + text @MENUS2_RESUME_MISSION + descText @MENUS2_RESUME_LAST_MISSION_ENTERED + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 440 380 175 25 + font 3 + textscale 0.8 + textalignx 175 + textaligny 1 + textalign ITEM_ALIGN_RIGHT + textstyle 3 + forecolor 0.65 0.65 1 1 + visible 1 // This button isn't used when not in game. + cvarTest ui_ResumeOK + enableCvar { "1" } + + mouseEnter + { + show resumegameaction_glow + } + mouseExit + { + hide resumegameaction_glow + } + action + { + play "sound/interface/button1.wav" ; + hide glow ; + uiScript loadAuto + } + } + + } +} + + + + + + + + + + + + + + + + + + + + + diff --git a/z_vr_assets/ui/setup.menu b/z_vr_assets/ui/setup.menu index 253b8fc..5532ba5 100644 --- a/z_vr_assets/ui/setup.menu +++ b/z_vr_assets/ui/setup.menu @@ -1558,7 +1558,7 @@ name vidrestart_background group vidrestart style WINDOW_STYLE_SHADER - rect 300 171 300 250 + rect 304 168 300 247 background "gfx/menus/menu_boxred" // Frame forecolor 1 1 1 0.5 visible 0 @@ -1759,7 +1759,6 @@ action { play "sound/interface/button1.wav" ; - uiScript update "r_gamma" ; setcvar ui_r_modified 1 show applyChanges }