From c78950aaeb62828dbd353e2d033b50691c568d48 Mon Sep 17 00:00:00 2001
From: Kyzentun Keeslala <kyzentun@gmail.com>
Date: Sun, 14 Jun 2015 08:55:42 -0600
Subject: [PATCH] Changed timing and life difficulty text to position value
 after label.  Changed all AllowRepeatingInput metrics in _fallback to true.

---
 Docs/Changelog_language.txt                    |  4 ++++
 Themes/_fallback/Languages/en.ini              |  2 ++
 Themes/_fallback/Scripts/02 Branches.lua       |  8 +++-----
 Themes/_fallback/metrics.ini                   |  4 ++--
 .../ScreenTitleMenu LifeDifficulty.lua         | 18 +++++++++++-------
 .../ScreenTitleMenu TimingDifficulty.lua       | 14 +++++++-------
 6 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/Docs/Changelog_language.txt b/Docs/Changelog_language.txt
index c10b9942ba..a6eddeda8d 100644
--- a/Docs/Changelog_language.txt
+++ b/Docs/Changelog_language.txt
@@ -16,6 +16,10 @@ Example:
 This means that three strings were added to the "ScreenDebugOverlay" section,
 "Mute actions", "Mute actions on", and "Mute actions off".
 
+2015/06/14
+----------
+* [ScreenTitleMenu] Hardest Timing
+
 2015/06/06
 ----------
 * [ScreenInitialScreenIsInvalid] InvalidScreenExplanation
diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index 3bd711c735..9f68ba1320 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -2032,6 +2032,8 @@ Play Online=Network Play
 Edit/Share=Edit/Share
 Exit=Exit
 Game Start=Game Start
+# The "Hardest Timing" text is displayed when the Timing Difficulty is at the hardest setting.
+Hardest Timing=Justice
 Jukebox=Jukebox
 Report Bug=Report A Bug!
 Chat on IRC=Chat on IRC!
diff --git a/Themes/_fallback/Scripts/02 Branches.lua b/Themes/_fallback/Scripts/02 Branches.lua
index e15372fd8c..7690019e22 100644
--- a/Themes/_fallback/Scripts/02 Branches.lua	
+++ b/Themes/_fallback/Scripts/02 Branches.lua	
@@ -160,14 +160,12 @@ Branch = {
 	end,
 	PlayerOptions = function()
 		local pm = GAMESTATE:GetPlayMode()
-		local restricted = { "PlayMode_Oni", "PlayMode_Rave",
+		local restricted = { PlayMode_Oni= true, PlayMode_Rave= true,
 			--"PlayMode_Battle" -- ??
 		}
 		local optionsScreen = "ScreenPlayerOptions"
-		for i=1,#restricted do
-			if restricted[i] == pm then
-				optionsScreen = "ScreenPlayerOptionsRestricted"
-			end
+		if restricted[pm] then
+			optionsScreen = "ScreenPlayerOptionsRestricted"
 		end
 		if SCREENMAN:GetTopScreen():GetGoToOptions() then
 			return optionsScreen
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 1ad1d97401..7082cf83fc 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1686,7 +1686,7 @@ Fallback="ScreenWithMenuElements"
 #
 DoSwitchAnyways=false
 WrapCursor=false
-AllowRepeatingInput=false
+AllowRepeatingInput=true
 PreSwitchPageSeconds=0
 PostSwitchPageSeconds=0
 ScrollerSecondsPerItem=0
@@ -2340,7 +2340,7 @@ MoreExitSelectedP2Command=
 MoreExitUnselectedP1Command=
 MoreExitUnselectedP2Command=
 #
-AllowRepeatingChangeValueInput=false
+AllowRepeatingChangeValueInput=true
 WrapValueInRow=true
 
 [ScreenOptionsMaster]
diff --git a/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua b/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua
index c426ee610c..6e83094523 100644
--- a/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua	
+++ b/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua	
@@ -1,17 +1,21 @@
+local label_text= false
+
 return Def.ActorFrame {
 	LoadFont("Common Normal") .. {
 		Text=GetLifeDifficulty();
 		AltText="";
 		InitCommand=cmd(horizalign,left;zoom,0.675);
-		OnCommand=cmd(shadowlength,1);
-		BeginCommand=function(self)
-			self:settextf( Screen.String("LifeDifficulty"), "" );
-		end
+		OnCommand= function(self)
+			label_text= self
+			self:shadowlength(1):settextf(Screen.String("LifeDifficulty"), "");
+		end,
 	};
 	LoadFont("Common Normal") .. {
 		Text=GetLifeDifficulty();
 		AltText="";
-		InitCommand=cmd(x,136;zoom,0.675;halign,0);
-		OnCommand=cmd(shadowlength,1;skewx,-0.125);
+		InitCommand=cmd(zoom,0.675;halign,0);
+		OnCommand= function(self)
+			self:shadowlength(1):skewx(-0.125):x(label_text:GetZoomedWidth()+8)
+		end,
 	};
-};
\ No newline at end of file
+};
diff --git a/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua b/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua
index c419c97a14..8dca88d4d1 100644
--- a/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua	
+++ b/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua	
@@ -3,23 +3,23 @@ return Def.ActorFrame {
 		Text=GetTimingDifficulty();
 		AltText="";
 		InitCommand=cmd(horizalign,left;zoom,0.675);
-		OnCommand=cmd(shadowlength,1);
-		BeginCommand=function(self)
-			self:settextf( Screen.String("TimingDifficulty"), "" );
-		end
+		OnCommand= function(self)
+			label_text= self
+			self:shadowlength(1):settextf(Screen.String("TimingDifficulty"), "");
+		end,
 	};
 	LoadFont("Common Normal") .. {
 		Text=GetTimingDifficulty();
 		AltText="";
 		InitCommand=cmd(x,136;zoom,0.675;halign,0);
 		OnCommand=function(self)
-			(cmd(shadowlength,1;skewx,-0.125))(self);
+			self:shadowlength(1):skewx(-0.125):x(label_text:GetZoomedWidth()+8)
 			if GetTimingDifficulty() == 9 then
-				self:settext("Justice");
+				self:settext(Screen.String("Hardest Timing"));
 				(cmd(zoom,0.5;diffuse,ColorLightTone( Color("Orange")) ))(self);
 			else
 				self:settext( GetTimingDifficulty() );
 			end
 		end;
 	};
-};
\ No newline at end of file
+};