Add always run option to menu; move saber motion ignite to weapons menu

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

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

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

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

z_vr_assets_jka/ui/controls.menu

@@ -1030,8 +1030,8 @@
 			name				none
 			group				commoncontrols
 			type				ITEM_TYPE_YESNO
-			text				"Motion Ignite Saber:"
+			text				@MENUS_VR_ALWAYS_RUN_ITEM
-			cvar				"vr_motion_enable_saber"
+			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

z_vr_assets_jka/ui/ingamecontrols.menu

@@ -1213,8 +1213,8 @@
 			name				none
 			group				commoncontrols
 			type				ITEM_TYPE_YESNO
-			text				"Motion Ignite Saber:"
+			text				@MENUS_VR_ALWAYS_RUN_ITEM
-			cvar				"vr_motion_enable_saber"
+			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

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."
+}

z_vr_assets_jko/ui/controls.menu

@@ -1520,8 +1520,8 @@
 			name				none
 			group				commoncontrols
 			type				ITEM_TYPE_YESNO
-			text				"Motion Ignite Saber:"
+			text				@MENUS_VR_ALWAYS_RUN_ITEM
-			cvar				"vr_motion_enable_saber"
+			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
+			}
+		}
+
 
 
 		//----------------------------------------------------------------------------------------------

z_vr_assets_jko/ui/ingamecontrols.menu

@@ -1519,8 +1519,8 @@
 			name				none
 			group				commoncontrols
 			type				ITEM_TYPE_YESNO
-			text				"Motion Ignite Saber:"
+			text				@MENUS_VR_ALWAYS_RUN_ITEM
-			cvar				"vr_motion_enable_saber"
+			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
+			}
+		}
+
 
 
 		//----------------------------------------------------------------------------------------------