From 1e4f1aae0f3c29b4909f247fc2925633db7dd931 Mon Sep 17 00:00:00 2001 From: Petr Bartos Date: Thu, 23 Nov 2023 20:30:17 +0100 Subject: [PATCH] Add always run option to menu; move saber motion ignite to weapons menu --- z_vr_assets_jka/strings/english/menus_vr.str | 12 ++++++ z_vr_assets_jka/strings/french/menus_vr.str | 16 ++++++++ z_vr_assets_jka/strings/german/menus_vr.str | 16 ++++++++ z_vr_assets_jka/strings/spanish/menus_vr.str | 16 ++++++++ z_vr_assets_jka/ui/controls.menu | 38 ++++++++++++++++-- z_vr_assets_jka/ui/ingamecontrols.menu | 37 +++++++++++++++-- z_vr_assets_jko/strip/menus_vr.sp | 22 +++++++++- z_vr_assets_jko/ui/controls.menu | 38 ++++++++++++++++-- z_vr_assets_jko/ui/ingamecontrols.menu | 42 +++++++++++++++++--- 9 files changed, 222 insertions(+), 15 deletions(-) diff --git a/z_vr_assets_jka/strings/english/menus_vr.str b/z_vr_assets_jka/strings/english/menus_vr.str index 60c6fc0..1dce83d 100644 --- a/z_vr_assets_jka/strings/english/menus_vr.str +++ b/z_vr_assets_jka/strings/english/menus_vr.str @@ -565,4 +565,16 @@ LANG_ENGLISH "MULTIPLAYER MAP SELECTION" REFERENCE MP_MAP_START_DESC LANG_ENGLISH "Start multiplayer map." +REFERENCE MOTION_IGNITE_SABER_ITEM +LANG_ENGLISH "Motion Ignite Saber:" + +REFERENCE MOTION_IGNITE_SABER_DESC +LANG_ENGLISH "Turn disabled saber back on when motion triggered." + +REFERENCE ALWAYS_RUN_ITEM +LANG_ENGLISH "Always Run:" + +REFERENCE ALWAYS_RUN_DESC +LANG_ENGLISH "Always use maximum movement speed." + ENDMARKER diff --git a/z_vr_assets_jka/strings/french/menus_vr.str b/z_vr_assets_jka/strings/french/menus_vr.str index cc561d5..f759503 100644 --- a/z_vr_assets_jka/strings/french/menus_vr.str +++ b/z_vr_assets_jka/strings/french/menus_vr.str @@ -749,4 +749,20 @@ REFERENCE MP_MAP_START_DESC LANG_ENGLISH "Start multiplayer map." LANG_FRENCH "#same" +REFERENCE MOTION_IGNITE_SABER_ITEM +LANG_ENGLISH "Motion Ignite Saber:" +LANG_FRENCH "#same" + +REFERENCE MOTION_IGNITE_SABER_DESC +LANG_ENGLISH "Turn disabled saber back on when motion triggered." +LANG_FRENCH "#same" + +REFERENCE ALWAYS_RUN_ITEM +LANG_ENGLISH "Always Run:" +LANG_FRENCH "#same" + +REFERENCE ALWAYS_RUN_DESC +LANG_ENGLISH "Always use maximum movement speed." +LANG_FRENCH "#same" + ENDMARKER diff --git a/z_vr_assets_jka/strings/german/menus_vr.str b/z_vr_assets_jka/strings/german/menus_vr.str index 973d866..cbef8ed 100644 --- a/z_vr_assets_jka/strings/german/menus_vr.str +++ b/z_vr_assets_jka/strings/german/menus_vr.str @@ -749,4 +749,20 @@ REFERENCE MP_MAP_START_DESC LANG_ENGLISH "Start multiplayer map." LANG_GERMAN "#same" +REFERENCE MOTION_IGNITE_SABER_ITEM +LANG_ENGLISH "Motion Ignite Saber:" +LANG_GERMAN "#same" + +REFERENCE MOTION_IGNITE_SABER_DESC +LANG_ENGLISH "Turn disabled saber back on when motion triggered." +LANG_GERMAN "#same" + +REFERENCE ALWAYS_RUN_ITEM +LANG_ENGLISH "Always Run:" +LANG_GERMAN "#same" + +REFERENCE ALWAYS_RUN_DESC +LANG_ENGLISH "Always use maximum movement speed." +LANG_GERMAN "#same" + ENDMARKER diff --git a/z_vr_assets_jka/strings/spanish/menus_vr.str b/z_vr_assets_jka/strings/spanish/menus_vr.str index bbc8d7b..04c4bb5 100644 --- a/z_vr_assets_jka/strings/spanish/menus_vr.str +++ b/z_vr_assets_jka/strings/spanish/menus_vr.str @@ -749,4 +749,20 @@ REFERENCE MP_MAP_START_DESC LANG_ENGLISH "Start multiplayer map." LANG_SPANISH "#same" +REFERENCE MOTION_IGNITE_SABER_ITEM +LANG_ENGLISH "Motion Ignite Saber:" +LANG_SPANISH "#same" + +REFERENCE MOTION_IGNITE_SABER_DESC +LANG_ENGLISH "Turn disabled saber back on when motion triggered." +LANG_SPANISH "#same" + +REFERENCE ALWAYS_RUN_ITEM +LANG_ENGLISH "Always Run:" +LANG_SPANISH "#same" + +REFERENCE ALWAYS_RUN_DESC +LANG_ENGLISH "Always use maximum movement speed." +LANG_SPANISH "#same" + ENDMARKER diff --git a/z_vr_assets_jka/ui/controls.menu b/z_vr_assets_jka/ui/controls.menu index be82363..8748306 100644 --- a/z_vr_assets_jka/ui/controls.menu +++ b/z_vr_assets_jka/ui/controls.menu @@ -1030,8 +1030,8 @@ name none group commoncontrols type ITEM_TYPE_YESNO - text "Motion Ignite Saber:" - cvar "vr_motion_enable_saber" + text @MENUS_VR_ALWAYS_RUN_ITEM + cvar "vr_always_run" rect 260 380 340 14 textalign ITEM_ALIGN_RIGHT textalignx 174 @@ -1040,7 +1040,7 @@ textscale 1 forecolor 1 1 1 0.0 visible 0 - descText "Turn disabled saber back on when motion triggered" + descText @MENUS_VR_ALWAYS_RUN_DESC action { play sound/interface/button1 @@ -1298,6 +1298,38 @@ } } + itemDef + { + name none + group weaponcontrols + type ITEM_TYPE_YESNO + text @MENUS_VR_MOTION_IGNITE_SABER_ITEM + cvar "vr_motion_enable_saber" + rect 260 340 340 14 + textalign ITEM_ALIGN_RIGHT + textalignx 174 + textaligny 0 + font 4 + textscale 1 + forecolor .615 .615 .956 0.0 + visible 0 + descText @MENUS_VR_MOTION_IGNITE_SABER_DESC + action + { + play sound/interface/button1 + } + + mouseenter + { + show button_glow + setitemrect button_glow 260 340 340 20 + } + mouseexit + { + hide button_glow + } + } + //---------------------------------------------------------------------------------------------- // // FORCE MENU diff --git a/z_vr_assets_jka/ui/ingamecontrols.menu b/z_vr_assets_jka/ui/ingamecontrols.menu index 948506f..e43269d 100644 --- a/z_vr_assets_jka/ui/ingamecontrols.menu +++ b/z_vr_assets_jka/ui/ingamecontrols.menu @@ -1213,8 +1213,8 @@ name none group commoncontrols type ITEM_TYPE_YESNO - text "Motion Ignite Saber:" - cvar "vr_motion_enable_saber" + text @MENUS_VR_ALWAYS_RUN_ITEM + cvar "vr_always_run" rect 260 380 340 14 textalign ITEM_ALIGN_RIGHT textalignx 174 @@ -1223,7 +1223,7 @@ textscale 1 forecolor .615 .615 .956 0.0 visible 0 - descText "Turn disabled saber back on when motion triggered" + descText @MENUS_VR_ALWAYS_RUN_DESC action { play sound/interface/button1 @@ -1473,6 +1473,37 @@ } } + itemDef + { + name none + group weaponcontrols + type ITEM_TYPE_YESNO + text @MENUS_VR_MOTION_IGNITE_SABER_ITEM + cvar "vr_motion_enable_saber" + rect 260 340 340 14 + textalign ITEM_ALIGN_RIGHT + textalignx 174 + textaligny 0 + font 4 + textscale 1 + forecolor .615 .615 .956 1.0 + visible 0 + descText @MENUS_VR_MOTION_IGNITE_SABER_DESC + action + { + play sound/interface/button1 + } + + mouseenter + { + show highlight8 + } + mouseexit + { + hide highlight8 + } + } + //---------------------------------------------------------------------------------------------- // // FORCE MENU diff --git a/z_vr_assets_jko/strip/menus_vr.sp b/z_vr_assets_jko/strip/menus_vr.sp index 8ff9d9f..d544e5d 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 169 +COUNT 173 INDEX 0 { REFERENCE COMMON_CONTROLS_ITEM @@ -849,3 +849,23 @@ INDEX 168 REFERENCE SABER_THROW TEXT_LANGUAGE1 "Saber throw" } +INDEX 169 +{ + REFERENCE MOTION_IGNITE_SABER_ITEM + TEXT_LANGUAGE1 "Motion Ignite Saber:" +} +INDEX 170 +{ + REFERENCE MOTION_IGNITE_SABER_DESC + TEXT_LANGUAGE1 "Turn disabled saber back on when motion triggered." +} +INDEX 171 +{ + REFERENCE ALWAYS_RUN_ITEM + TEXT_LANGUAGE1 "Always Run:" +} +INDEX 172 +{ + REFERENCE ALWAYS_RUN_DESC + TEXT_LANGUAGE1 "Always use maximum movement speed." +} diff --git a/z_vr_assets_jko/ui/controls.menu b/z_vr_assets_jko/ui/controls.menu index 2b3db9f..749e7a2 100644 --- a/z_vr_assets_jko/ui/controls.menu +++ b/z_vr_assets_jko/ui/controls.menu @@ -1520,8 +1520,8 @@ name none group commoncontrols type ITEM_TYPE_YESNO - text "Motion Ignite Saber:" - cvar "vr_motion_enable_saber" + text @MENUS_VR_ALWAYS_RUN_ITEM + cvar "vr_always_run" rect 305 371 300 20 textalign ITEM_ALIGN_RIGHT textalignx 151 @@ -1531,7 +1531,7 @@ forecolor 1 1 1 1 visible 0 // appearance_slot 3 - descText "Turn disabled saber back on when motion triggered" + descText @MENUS_VR_ALWAYS_RUN_DESC action { play sound/interface/button1 @@ -1804,6 +1804,38 @@ } + itemDef + { + name none + group weaponcontrols + type ITEM_TYPE_YESNO + text @MENUS_VR_MOTION_IGNITE_SABER_ITEM + cvar "vr_motion_enable_saber" + rect 305 331 300 20 + textalign ITEM_ALIGN_RIGHT + textalignx 151 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + // appearance_slot 3 + descText @MENUS_VR_MOTION_IGNITE_SABER_DESC + action + { + play sound/interface/button1 + } + + mouseenter + { + show highlight9 + } + mouseexit + { + hide highlight9 + } + } + //---------------------------------------------------------------------------------------------- diff --git a/z_vr_assets_jko/ui/ingamecontrols.menu b/z_vr_assets_jko/ui/ingamecontrols.menu index 2cd1790..71a52f1 100644 --- a/z_vr_assets_jko/ui/ingamecontrols.menu +++ b/z_vr_assets_jko/ui/ingamecontrols.menu @@ -1519,8 +1519,8 @@ name none group commoncontrols type ITEM_TYPE_YESNO - text "Motion Ignite Saber:" - cvar "vr_motion_enable_saber" + text @MENUS_VR_ALWAYS_RUN_ITEM + cvar "vr_always_run" rect 305 371 300 20 textalign ITEM_ALIGN_RIGHT textalignx 151 @@ -1530,7 +1530,7 @@ forecolor 1 1 1 1 visible 0 // appearance_slot 3 - descText "Turn disabled saber back on when motion triggered" + descText @MENUS_VR_ALWAYS_RUN_DESC action { play sound/interface/button1 @@ -1538,11 +1538,11 @@ mouseenter { - show highlight10 + show highlight11 } mouseexit { - hide highlight10 + hide highlight11 } } @@ -1803,6 +1803,38 @@ } + itemDef + { + name none + group weaponcontrols + type ITEM_TYPE_YESNO + text @MENUS_VR_MOTION_IGNITE_SABER_ITEM + cvar "vr_motion_enable_saber" + rect 305 331 300 20 + textalign ITEM_ALIGN_RIGHT + textalignx 151 + textaligny -2 + font 2 + textscale 0.8 + forecolor 1 1 1 1 + visible 0 + // appearance_slot 3 + descText @MENUS_VR_MOTION_IGNITE_SABER_DESC + action + { + play sound/interface/button1 + } + + mouseenter + { + show highlight9 + } + mouseexit + { + hide highlight9 + } + } + //----------------------------------------------------------------------------------------------