diff --git a/Projects/Android/jni/OpenJK/codeJK2/game/g_main.cpp b/Projects/Android/jni/OpenJK/codeJK2/game/g_main.cpp index 84998ec..49fb162 100644 --- a/Projects/Android/jni/OpenJK/codeJK2/game/g_main.cpp +++ b/Projects/Android/jni/OpenJK/codeJK2/game/g_main.cpp @@ -601,6 +601,8 @@ void G_InitCvars( void ) { gi.cvar( "newTotalSecrets", "0", CVAR_ROM ); gi.cvar_set("newTotalSecrets", "0");//used to carry over the count from SP_target_secret to ClientBegin g_iscensored = gi.cvar( "ui_iscensored", "0", CVAR_ARCHIVE|CVAR_ROM|CVAR_INIT|CVAR_CHEAT|CVAR_NORESTART ); + + gi.cvar( "g_JKXRHelpEnabled", "1", CVAR_ARCHIVE ); // Help menu item } /* diff --git a/assets/openjo_sp_pico.cfg b/assets/openjo_sp_pico.cfg index 35c24a2..50e78ea 100644 --- a/assets/openjo_sp_pico.cfg +++ b/assets/openjo_sp_pico.cfg @@ -114,6 +114,7 @@ seta com_maxfps "125" seta d_slowmodeath "4" seta expanded_menu_enabled "0" seta g_TeamBeefDirectorsCut "1" +seta g_JKXRHelpEnabled "1" seta g_dismemberment "3" seta g_dismemberprobabilities "100" seta g_saberAnimSpeed "1.300000" diff --git a/assets/openjo_sp_quest.cfg b/assets/openjo_sp_quest.cfg index 0123654..e3c55e6 100644 --- a/assets/openjo_sp_quest.cfg +++ b/assets/openjo_sp_quest.cfg @@ -114,6 +114,7 @@ seta com_maxfps "125" seta d_slowmodeath "4" seta expanded_menu_enabled "0" seta g_TeamBeefDirectorsCut "1" +seta g_JKXRHelpEnabled "1" seta g_dismemberment "3" seta g_dismemberprobabilities "100" seta g_saberAnimSpeed "1.300000" diff --git a/z_vr_assets_base/gfx/menus/background_dim.tga b/z_vr_assets_base/gfx/menus/background_dim.tga new file mode 100644 index 0000000..02be90c Binary files /dev/null and b/z_vr_assets_base/gfx/menus/background_dim.tga differ diff --git a/z_vr_assets_base/gfx/menus/control_scheme.jpg b/z_vr_assets_base/gfx/menus/control_scheme.jpg new file mode 100644 index 0000000..fdfd086 Binary files /dev/null and b/z_vr_assets_base/gfx/menus/control_scheme.jpg differ diff --git a/z_vr_assets_base/shaders/tutorialvideos.shader b/z_vr_assets_base/shaders/tutorialvideos.shader new file mode 100644 index 0000000..13f89f2 --- /dev/null +++ b/z_vr_assets_base/shaders/tutorialvideos.shader @@ -0,0 +1,71 @@ +gfx/menus/tutorial_video_1 +{ + nopicmip + { + videoMap menu/video/tutorial_video_1 + rgbGen vertex + } +} + +gfx/menus/tutorial_video_2 +{ + nopicmip + { + videoMap menu/video/tutorial_video_2 + rgbGen vertex + } +} + +gfx/menus/tutorial_video_3 +{ + nopicmip + { + videoMap menu/video/tutorial_video_3 + rgbGen vertex + } +} + +gfx/menus/tutorial_video_4 +{ + nopicmip + { + videoMap menu/video/tutorial_video_4 + rgbGen vertex + } +} + +gfx/menus/tutorial_video_5 +{ + nopicmip + { + videoMap menu/video/tutorial_video_5 + rgbGen vertex + } +} + +gfx/menus/tutorial_video_6 +{ + nopicmip + { + videoMap menu/video/tutorial_video_6 + rgbGen vertex + } +} + +gfx/menus/tutorial_video_7 +{ + nopicmip + { + videoMap menu/video/tutorial_video_7 + rgbGen vertex + } +} + +gfx/menus/tutorial_video_8 +{ + nopicmip + { + videoMap menu/video/tutorial_video_8 + rgbGen vertex + } +} diff --git a/z_vr_assets_base/ui/help_popup.menu b/z_vr_assets_base/ui/help_popup.menu new file mode 100644 index 0000000..b371bf7 --- /dev/null +++ b/z_vr_assets_base/ui/help_popup.menu @@ -0,0 +1,153 @@ +{ + menuDef + { + name helpPopupMenu + visible 0 + fullScreen 1 + rect 0 0 640 480 + focusColor 1 1 1 1 + style WINDOW_STYLE_FILLED + outOfBoundsClick + popup + onESC + { + play sound/interface/button1.wav + close helpPopupMenu + } + + itemDef + { + group none + name none + rect 0 0 640 480 + style WINDOW_STYLE_SHADER + type ITEM_TYPE_BUTTON + background gfx/menus/background_dim + forecolor 1 1 1 1 + visible 1 + action + { + play sound/interface/button1 + close helpPopupMenu + } + } + + itemDef + { + group none + name none + rect 20 15 600 450 + style WINDOW_STYLE_SHADER + background gfx/menus/control_scheme + forecolor 1 1 1 1 + visible 1 + cvarTest show_help_item + showCvar { 1 } + } + + itemDef + { + group none + name none + rect 160 120 320 240 + style WINDOW_STYLE_SHADER + background gfx/menus/tutorial_video_1 + forecolor 1 1 1 1 + visible 1 + cvarTest show_help_item + showCvar { 2 } + } + + itemDef + { + group none + name none + rect 160 120 320 240 + style WINDOW_STYLE_SHADER + background gfx/menus/tutorial_video_2 + forecolor 1 1 1 1 + visible 1 + cvarTest show_help_item + showCvar { 3 } + } + + itemDef + { + group none + name none + rect 160 120 320 240 + style WINDOW_STYLE_SHADER + background gfx/menus/tutorial_video_3 + forecolor 1 1 1 1 + visible 1 + cvarTest show_help_item + showCvar { 4 } + } + + itemDef + { + group none + name none + rect 160 120 320 240 + style WINDOW_STYLE_SHADER + background gfx/menus/tutorial_video_4 + forecolor 1 1 1 1 + visible 1 + cvarTest show_help_item + showCvar { 5 } + } + + itemDef + { + group none + name none + rect 160 120 320 240 + style WINDOW_STYLE_SHADER + background gfx/menus/tutorial_video_5 + forecolor 1 1 1 1 + visible 1 + cvarTest show_help_item + showCvar { 6 } + } + + itemDef + { + group none + name none + rect 160 120 320 240 + style WINDOW_STYLE_SHADER + background gfx/menus/tutorial_video_6 + forecolor 1 1 1 1 + visible 1 + cvarTest show_help_item + showCvar { 7 } + } + + itemDef + { + group none + name none + rect 160 120 320 240 + style WINDOW_STYLE_SHADER + background gfx/menus/tutorial_video_7 + forecolor 1 1 1 1 + visible 1 + cvarTest show_help_item + showCvar { 8 } + } + + itemDef + { + group none + name none + rect 160 120 320 240 + style WINDOW_STYLE_SHADER + background gfx/menus/tutorial_video_8 + forecolor 1 1 1 1 + visible 1 + cvarTest show_help_item + showCvar { 9 } + } + + } +} diff --git a/z_vr_assets_jko/menu/video/tutorial_video_1.roq b/z_vr_assets_jko/menu/video/tutorial_video_1.roq new file mode 100644 index 0000000..4807d67 Binary files /dev/null and b/z_vr_assets_jko/menu/video/tutorial_video_1.roq differ diff --git a/z_vr_assets_jko/menu/video/tutorial_video_2.roq b/z_vr_assets_jko/menu/video/tutorial_video_2.roq new file mode 100644 index 0000000..c9cf61f Binary files /dev/null and b/z_vr_assets_jko/menu/video/tutorial_video_2.roq differ diff --git a/z_vr_assets_jko/menu/video/tutorial_video_3.roq b/z_vr_assets_jko/menu/video/tutorial_video_3.roq new file mode 100644 index 0000000..edccef4 Binary files /dev/null and b/z_vr_assets_jko/menu/video/tutorial_video_3.roq differ diff --git a/z_vr_assets_jko/menu/video/tutorial_video_4.roq b/z_vr_assets_jko/menu/video/tutorial_video_4.roq new file mode 100644 index 0000000..a4f83ed Binary files /dev/null and b/z_vr_assets_jko/menu/video/tutorial_video_4.roq differ diff --git a/z_vr_assets_jko/menu/video/tutorial_video_5.roq b/z_vr_assets_jko/menu/video/tutorial_video_5.roq new file mode 100644 index 0000000..c8377ec Binary files /dev/null and b/z_vr_assets_jko/menu/video/tutorial_video_5.roq differ diff --git a/z_vr_assets_jko/menu/video/tutorial_video_6.roq b/z_vr_assets_jko/menu/video/tutorial_video_6.roq new file mode 100644 index 0000000..e271179 Binary files /dev/null and b/z_vr_assets_jko/menu/video/tutorial_video_6.roq differ diff --git a/z_vr_assets_jko/menu/video/tutorial_video_7.roq b/z_vr_assets_jko/menu/video/tutorial_video_7.roq new file mode 100644 index 0000000..de04a89 Binary files /dev/null and b/z_vr_assets_jko/menu/video/tutorial_video_7.roq differ diff --git a/z_vr_assets_jko/menu/video/tutorial_video_8.roq b/z_vr_assets_jko/menu/video/tutorial_video_8.roq new file mode 100644 index 0000000..b660880 Binary files /dev/null and b/z_vr_assets_jko/menu/video/tutorial_video_8.roq differ diff --git a/z_vr_assets_jko/strip/menus_vr.sp b/z_vr_assets_jko/strip/menus_vr.sp index d38ef8d..f19d194 100644 --- a/z_vr_assets_jko/strip/menus_vr.sp +++ b/z_vr_assets_jko/strip/menus_vr.sp @@ -3,7 +3,7 @@ CONFIG W:\bin\striped.cfg ID 100 REFERENCE MENUS_VR DESCRIPTION "VR Menu Localizations" -COUNT 144 +COUNT 155 INDEX 0 { REFERENCE COMMON_CONTROLS_ITEM @@ -724,3 +724,58 @@ INDEX 143 REFERENCE USABLE_OBJECT_HINT_DESC TEXT_LANGUAGE1 "Show icon when looking at objects that can be used." } +INDEX 144 +{ + REFERENCE HELP_BUTTON_ITEM + TEXT_LANGUAGE1 "JKXR Help" +} +INDEX 145 +{ + REFERENCE HELP_BUTTON_DESC + TEXT_LANGUAGE1 "Short tutorials explaining various game mechanics." +} +INDEX 146 +{ + REFERENCE TUTORIAL_VIDEO_1 + TEXT_LANGUAGE1 "How to quick save / load" +} +INDEX 147 +{ + REFERENCE TUTORIAL_VIDEO_2 + TEXT_LANGUAGE1 "How to use weapon scopes" +} +INDEX 148 +{ + REFERENCE TUTORIAL_VIDEO_3 + TEXT_LANGUAGE1 "How to use inventory items" +} +INDEX 149 +{ + REFERENCE TUTORIAL_VIDEO_4 + TEXT_LANGUAGE1 "How to throw the saber" +} +INDEX 150 +{ + REFERENCE TUTORIAL_VIDEO_5 + TEXT_LANGUAGE1 "How to activate useable things" +} +INDEX 151 +{ + REFERENCE TUTORIAL_VIDEO_6 + TEXT_LANGUAGE1 "How to use force gesture" +} +INDEX 152 +{ + REFERENCE TUTORIAL_VIDEO_7 + TEXT_LANGUAGE1 "How to use the weapons / force wheel" +} +INDEX 153 +{ + REFERENCE TUTORIAL_VIDEO_8 + TEXT_LANGUAGE1 "Introduction to lightsaber duels" +} +INDEX 154 +{ + REFERENCE CONTROL_SCHEME_HELP + TEXT_LANGUAGE1 "Default control scheme" +} diff --git a/z_vr_assets_jko/ui/controls.menu b/z_vr_assets_jko/ui/controls.menu index e7a16b9..d4c71ee 100644 --- a/z_vr_assets_jko/ui/controls.menu +++ b/z_vr_assets_jko/ui/controls.menu @@ -25,11 +25,13 @@ hide forcecontrols hide invcontrols hide comfortcontrols + hide helpcontrols setitemcolor commoncontrolbutton forecolor 1 1 1 1 setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1 setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1 setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1 setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor helpcontrolbutton forecolor 0.64 0.65 1 1 } onClose @@ -696,11 +698,13 @@ hide forcecontrols hide invcontrols hide comfortcontrols + hide helpcontrols setitemcolor commoncontrolbutton forecolor 1 1 1 1 setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1 setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1 setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1 setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor helpcontrolbutton forecolor 0.64 0.65 1 1 } } @@ -752,11 +756,13 @@ hide forcecontrols hide invcontrols hide comfortcontrols + hide helpcontrols setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1 setitemcolor weaponscontrolbutton forecolor 1 1 1 1 setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1 setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1 setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor helpcontrolbutton forecolor 0.64 0.65 1 1 } } @@ -808,11 +814,13 @@ show forcecontrols hide invcontrols hide comfortcontrols + hide helpcontrols setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1 setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1 setitemcolor forcecontrolbutton forecolor 1 1 1 1 setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1 setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor helpcontrolbutton forecolor 0.64 0.65 1 1 } } @@ -864,11 +872,13 @@ hide forcecontrols show invcontrols hide comfortcontrols + hide helpcontrols setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1 setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1 setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1 setitemcolor inventorycontrolbutton forecolor 1 1 1 1 setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor helpcontrolbutton forecolor 0.64 0.65 1 1 } } @@ -920,11 +930,72 @@ hide forcecontrols hide invcontrols show comfortcontrols + hide helpcontrols setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1 setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1 setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1 setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1 setitemcolor comfortcontrolbutton forecolor 1 1 1 1 + setitemcolor helpcontrolbutton forecolor 0.64 0.65 1 1 + } + } + + // help button + itemDef + { + name helpbutton_glow + group mods + style WINDOW_STYLE_SHADER + rect 120 323 170 30 + background "gfx/menus/menu_blendbox2" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + } + itemDef + { + name helpbutton + group none + text @MENUS_VR_HELP_BUTTON_ITEM + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 120 323 170 30 + font 3 + textscale 0.9 + textalignx 170 + textaligny 5 + textalign ITEM_ALIGN_RIGHT + textstyle 3 + forecolor 0.65 0.65 1 1 + visible 1 + descText @MENUS_VR_HELP_BUTTON_DESC + cvarTest g_JKXRHelpEnabled + showCvar { 1 } + + mouseEnter + { + show helpbutton_glow + } + mouseExit + { + hide helpbutton_glow + } + action + { + play sound/interface/button1 + show setup_background + hide commoncontrols + hide weaponcontrols + hide forcecontrols + hide invcontrols + hide comfortcontrols + show helpcontrols + setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor helpcontrolbutton forecolor 1 1 1 1 } } @@ -933,7 +1004,7 @@ name setup_background group none style WINDOW_STYLE_SHADER - rect 300 171 300 250 + rect 300 166 306 250 background "gfx/menus/menu_box1" // Frame forecolor 1 1 1 1 visible 0 @@ -2092,5 +2163,291 @@ } } + + + //---------------------------------------------------------------------------------------------- + // + // HELP MENU + // + //---------------------------------------------------------------------------------------------- + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_CONTROL_SCHEME_HELP + rect 305 191 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight2 + } + mouseexit + { + hide highlight2 + } + action + { + play sound/interface/button1 + setcvar show_help_item 1 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_1 + rect 305 211 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight3 + } + mouseexit + { + hide highlight3 + } + action + { + play sound/interface/button1 + setcvar show_help_item 2 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_2 + rect 305 231 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight4 + } + mouseexit + { + hide highlight4 + } + action + { + play sound/interface/button1 + setcvar show_help_item 3 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_3 + rect 305 251 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight5 + } + mouseexit + { + hide highlight5 + } + action + { + play sound/interface/button1 + setcvar show_help_item 4 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_4 + rect 305 271 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight6 + } + mouseexit + { + hide highlight6 + } + action + { + play sound/interface/button1 + setcvar show_help_item 5 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_5 + rect 305 291 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight7 + } + mouseexit + { + hide highlight7 + } + action + { + play sound/interface/button1 + setcvar show_help_item 6 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_6 + rect 305 311 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight8 + } + mouseexit + { + hide highlight8 + } + action + { + play sound/interface/button1 + setcvar show_help_item 7 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_7 + rect 305 331 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight9 + } + mouseexit + { + hide highlight9 + } + action + { + play sound/interface/button1 + setcvar show_help_item 8 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_8 + rect 305 351 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight10 + } + mouseexit + { + hide highlight10 + } + action + { + play sound/interface/button1 + setcvar show_help_item 9 + open helpPopupMenu + } + } + } } diff --git a/z_vr_assets_jko/ui/ingamecontrols.menu b/z_vr_assets_jko/ui/ingamecontrols.menu index 8be1dba..11138a8 100644 --- a/z_vr_assets_jko/ui/ingamecontrols.menu +++ b/z_vr_assets_jko/ui/ingamecontrols.menu @@ -25,11 +25,13 @@ hide forcecontrols hide invcontrols hide comfortcontrols + hide helpcontrols setitemcolor commoncontrolbutton forecolor 1 1 1 1 setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1 setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1 setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1 setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor helpcontrolbutton forecolor 0.64 0.65 1 1 } onClose @@ -695,11 +697,13 @@ hide forcecontrols hide invcontrols hide comfortcontrols + hide helpcontrols setitemcolor commoncontrolbutton forecolor 1 1 1 1 setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1 setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1 setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1 setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor helpcontrolbutton forecolor 0.64 0.65 1 1 } } @@ -751,11 +755,13 @@ hide forcecontrols hide invcontrols hide comfortcontrols + hide helpcontrols setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1 setitemcolor weaponscontrolbutton forecolor 1 1 1 1 setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1 setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1 setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor helpcontrolbutton forecolor 0.64 0.65 1 1 } } @@ -807,11 +813,13 @@ show forcecontrols hide invcontrols hide comfortcontrols + hide helpcontrols setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1 setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1 setitemcolor forcecontrolbutton forecolor 1 1 1 1 setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1 setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor helpcontrolbutton forecolor 0.64 0.65 1 1 } } @@ -863,11 +871,13 @@ hide forcecontrols show invcontrols hide comfortcontrols + hide helpcontrols setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1 setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1 setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1 setitemcolor inventorycontrolbutton forecolor 1 1 1 1 setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor helpcontrolbutton forecolor 0.64 0.65 1 1 } } @@ -919,11 +929,72 @@ hide forcecontrols hide invcontrols show comfortcontrols + hide helpcontrols setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1 setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1 setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1 setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1 setitemcolor comfortcontrolbutton forecolor 1 1 1 1 + setitemcolor helpcontrolbutton forecolor 0.64 0.65 1 1 + } + } + + // help button + itemDef + { + name helpbutton_glow + group mods + style WINDOW_STYLE_SHADER + rect 120 323 170 30 + background "gfx/menus/menu_blendbox2" // Frame around button + forecolor 1 1 1 1 + visible 0 + decoration + } + itemDef + { + name helpbutton + group none + text @MENUS_VR_HELP_BUTTON_ITEM + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 120 323 170 30 + font 3 + textscale 0.9 + textalignx 170 + textaligny 5 + textalign ITEM_ALIGN_RIGHT + textstyle 3 + forecolor 0.65 0.65 1 1 + visible 1 + descText @MENUS_VR_HELP_BUTTON_DESC + cvarTest g_JKXRHelpEnabled + showCvar { 1 } + + mouseEnter + { + show helpbutton_glow + } + mouseExit + { + hide helpbutton_glow + } + action + { + play sound/interface/button1 + show setup_background + hide commoncontrols + hide weaponcontrols + hide forcecontrols + hide invcontrols + hide comfortcontrols + show helpcontrols + setitemcolor commoncontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor weaponscontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor forcecontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor inventorycontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor comfortcontrolbutton forecolor 0.64 0.65 1 1 + setitemcolor helpcontrolbutton forecolor 1 1 1 1 } } @@ -2091,5 +2162,291 @@ } } + + + //---------------------------------------------------------------------------------------------- + // + // HELP MENU + // + //---------------------------------------------------------------------------------------------- + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_CONTROL_SCHEME_HELP + rect 305 191 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight2 + } + mouseexit + { + hide highlight2 + } + action + { + play sound/interface/button1 + setcvar show_help_item 1 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_1 + rect 305 211 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight3 + } + mouseexit + { + hide highlight3 + } + action + { + play sound/interface/button1 + setcvar show_help_item 2 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_2 + rect 305 231 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight4 + } + mouseexit + { + hide highlight4 + } + action + { + play sound/interface/button1 + setcvar show_help_item 3 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_3 + rect 305 251 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight5 + } + mouseexit + { + hide highlight5 + } + action + { + play sound/interface/button1 + setcvar show_help_item 4 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_4 + rect 305 271 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight6 + } + mouseexit + { + hide highlight6 + } + action + { + play sound/interface/button1 + setcvar show_help_item 5 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_5 + rect 305 291 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight7 + } + mouseexit + { + hide highlight7 + } + action + { + play sound/interface/button1 + setcvar show_help_item 6 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_6 + rect 305 311 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight8 + } + mouseexit + { + hide highlight8 + } + action + { + play sound/interface/button1 + setcvar show_help_item 7 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_7 + rect 305 331 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight9 + } + mouseexit + { + hide highlight9 + } + action + { + play sound/interface/button1 + setcvar show_help_item 8 + open helpPopupMenu + } + } + + itemDef + { + name none + group helpcontrols + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + text @MENUS_VR_TUTORIAL_VIDEO_8 + rect 305 351 300 20 + textalign ITEM_ALIGN_CENTER + textalignx 150 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + mouseenter + { + show highlight10 + } + mouseexit + { + hide highlight10 + } + action + { + play sound/interface/button1 + setcvar show_help_item 9 + open helpPopupMenu + } + } + } } diff --git a/z_vr_assets_jko/ui/menus.txt b/z_vr_assets_jko/ui/menus.txt index cedf9b9..8d71a29 100644 --- a/z_vr_assets_jko/ui/menus.txt +++ b/z_vr_assets_jko/ui/menus.txt @@ -36,4 +36,5 @@ loadMenu { "ui/cheatsforcepowers.menu" } loadMenu { "ui/cheatsinventory.menu" } + loadMenu { "ui/help_popup.menu" } }