From 3a49e3c7874e8462cb5432004b9390a2815c07d5 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sat, 20 Aug 2011 01:16:41 -0500
Subject: [PATCH] more codedetector stuff

---
 Themes/_fallback/Scripts/03 Gameplay.lua | 63 ++++++++++++++++--------
 Themes/_fallback/metrics.ini             |  6 +--
 2 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/Themes/_fallback/Scripts/03 Gameplay.lua b/Themes/_fallback/Scripts/03 Gameplay.lua
index 505f96bc7c..e2367bc862 100644
--- a/Themes/_fallback/Scripts/03 Gameplay.lua	
+++ b/Themes/_fallback/Scripts/03 Gameplay.lua	
@@ -277,12 +277,20 @@ function ComboUnderField()
 	return GetUserPrefB("UserPrefComboUnderField")
 end
 
+function TwoPartSelection()
+	return GAMESTATE:GetCurrentGame():GetName() == "pump" and true or false
+end
+
+function TwoPartConfirmsOnly()
+	return GAMESTATE:GetCurrentGame():GetName() == "pump" and true or false
+end
+
 local CodeDetectorCodes = {
 	-- steps
 	PrevSteps1 = {
-		default = "Up,Up",
+		default = "",
 		dance = "Up,Up",
-		pump = "UpLeft",
+		pump = "+UpLeft",
 	},
 	PrevSteps2 = {
 		default = "MenuUp,MenuUp",
@@ -290,9 +298,9 @@ local CodeDetectorCodes = {
 		pump = "",
 	},
 	NextSteps1 = {
-		default = "Down,Down",
+		default = "",
 		dance = "Down,Down",
-		pump = "UpRight",
+		pump = "+UpRight",
 	},
 	NextSteps2 = {
 		default = "MenuDown,MenuDown",
@@ -336,7 +344,8 @@ local CodeDetectorCodes = {
 	},
 	-- modemenu
 	ModeMenu1 = {
-		default = "Up,Down,Up,Down",
+		default = "",
+		dance = "Up,Down,Up,Down",
 	},
 	ModeMenu2 = {
 		default = "MenuUp,MenuDown,MenuUp,MenuDown",
@@ -350,33 +359,41 @@ local CodeDetectorCodes = {
 	},
 	-- modifiers section
 	CancelAll = {
-		default = "Left,Right,Left,Right,Left,Right,Left,Right",
+		default = "",
+		dance = "Left,Right,Left,Right,Left,Right,Left,Right",
 	},
 	--- specific modifiers
 	Mirror = {
-		default = "Up,Left,Right,Left,Right",
+		default = "",
+		dance = "Up,Left,Right,Left,Right",
 		pump = "DownRight,DownLeft,UpRight,UpLeft,DownRight,DownLeft,UpRight,UpLeft,Center",
 	},
 	Left = {
-		default = "Up,Down,Right,Left",
+		default = "",
+		dance = "Up,Down,Right,Left",
 	},
 	Right = {
-		default = "Up,Down,Left,Right",
+		default = "",
+		dance = "Up,Down,Left,Right",
 	},
 	Shuffle = {
-		default = "Down,Up,Down,Up",
+		default = "",
+		dance = "Down,Up,Down,Up",
 		pump = "UpLeft,UpRight,UpLeft,UpRight,DownLeft,DownRight,DownLeft,DownRight,Center", -- random
 	},
 	SuperShuffle = {
-		default = "Down,Up,Left,Right",
+		default = "",
+		dance = "Down,Up,Left,Right",
 		pump = "UpLeft,UpRight,DownLeft,DownRight,UpLeft,UpRight,DownLeft,DownRight,Center"
 	},
 	Reverse = {
-		default = "Down,Left,Right,Left,Right",
+		default = "",
+		dance = "Down,Left,Right,Left,Right",
 		pump = "UpLeft,DownLeft,UpRight,DownRight,UpLeft,DownLeft,UpRight,DownRight,DownRight", -- drop
 	},
 	HoldNotes = {
-		default = "Right,Left,Down,Up",
+		default = "",
+		dance = "Right,Left,Down,Up",
 	},
 	Mines = {
 		default = "",
@@ -397,33 +414,39 @@ local CodeDetectorCodes = {
 		default = "",
 	},
 	NextScrollSpeed = {
-		default = "Up,Left,Down,Left,Up",
+		default = "",
+		dance = "Up,Left,Down,Left,Up",
 		pump = "UpLeft,UpRight,UpLeft,UpRight,Center",
 	},
 	PreviousScrollSpeed = {
-		default = "Down,Right,Up,Right,Down",
+		default = "",
+		dance = "Down,Right,Up,Right,Down",
 		pump = "UpRight,UpLeft,UpRight,UpLeft,Center",
 	},
 	NextAccel = {
-		default = "Left,Right,Down,Up",
+		default = "",
+		dance = "Left,Right,Down,Up",
 	},
 	NextEffect = {
-		default = "Left,Down,Right",
+		default = "",
+		dance = "Left,Down,Right",
 	},
 	NextAppearance = {
-		default = "Left,Up,Right",
+		default = "",
+		dance = "Left,Up,Right",
 	},
 	NextTurn = {
 		default = "",
 	},
 	-- cancel all in player options
 	CancelAllPlayerOptions = {
-		default = "Left,Right,Left,Right,Left,Right",
+		default = "",
+		dance = "Left,Right,Left,Right,Left,Right",
 	},
 };
 
 function GetCodeForGame(codeName)
-	local gameName = GAMESTATE:GetCurrentGame():GetName()
+	local gameName = string.lower(GAMESTATE:GetCurrentGame():GetName())
 	local inputCode = CodeDetectorCodes[codeName]
 	return inputCode[gameName] or inputCode["default"]
 end
\ No newline at end of file
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index dd1120fead..4277f72717 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1913,9 +1913,9 @@ ChangeGroupsWithGameButtons=false
 PreviousGroupButton="MenuUp"
 NextGroupButton="MenuDown"
 #
-TwoPartSelection=false
-TwoPartConfirmsOnly=false
-TwoPartTimerSeconds=15
+TwoPartSelection=TwoPartSelection()
+TwoPartConfirmsOnly=TwoPartConfirmsOnly()
+TwoPartTimerSeconds=-1
 #
 SampleMusicDelay=0.25
 SampleMusicDelayInit=0