more codedetector stuff

This commit is contained in:
AJ Kelly
2011-08-20 01:16:41 -05:00
parent 0591332361
commit 3a49e3c787
2 changed files with 46 additions and 23 deletions
+43 -20
View File
@@ -277,12 +277,20 @@ function ComboUnderField()
return GetUserPrefB("UserPrefComboUnderField") return GetUserPrefB("UserPrefComboUnderField")
end 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 = { local CodeDetectorCodes = {
-- steps -- steps
PrevSteps1 = { PrevSteps1 = {
default = "Up,Up", default = "",
dance = "Up,Up", dance = "Up,Up",
pump = "UpLeft", pump = "+UpLeft",
}, },
PrevSteps2 = { PrevSteps2 = {
default = "MenuUp,MenuUp", default = "MenuUp,MenuUp",
@@ -290,9 +298,9 @@ local CodeDetectorCodes = {
pump = "", pump = "",
}, },
NextSteps1 = { NextSteps1 = {
default = "Down,Down", default = "",
dance = "Down,Down", dance = "Down,Down",
pump = "UpRight", pump = "+UpRight",
}, },
NextSteps2 = { NextSteps2 = {
default = "MenuDown,MenuDown", default = "MenuDown,MenuDown",
@@ -336,7 +344,8 @@ local CodeDetectorCodes = {
}, },
-- modemenu -- modemenu
ModeMenu1 = { ModeMenu1 = {
default = "Up,Down,Up,Down", default = "",
dance = "Up,Down,Up,Down",
}, },
ModeMenu2 = { ModeMenu2 = {
default = "MenuUp,MenuDown,MenuUp,MenuDown", default = "MenuUp,MenuDown,MenuUp,MenuDown",
@@ -350,33 +359,41 @@ local CodeDetectorCodes = {
}, },
-- modifiers section -- modifiers section
CancelAll = { CancelAll = {
default = "Left,Right,Left,Right,Left,Right,Left,Right", default = "",
dance = "Left,Right,Left,Right,Left,Right,Left,Right",
}, },
--- specific modifiers --- specific modifiers
Mirror = { Mirror = {
default = "Up,Left,Right,Left,Right", default = "",
dance = "Up,Left,Right,Left,Right",
pump = "DownRight,DownLeft,UpRight,UpLeft,DownRight,DownLeft,UpRight,UpLeft,Center", pump = "DownRight,DownLeft,UpRight,UpLeft,DownRight,DownLeft,UpRight,UpLeft,Center",
}, },
Left = { Left = {
default = "Up,Down,Right,Left", default = "",
dance = "Up,Down,Right,Left",
}, },
Right = { Right = {
default = "Up,Down,Left,Right", default = "",
dance = "Up,Down,Left,Right",
}, },
Shuffle = { Shuffle = {
default = "Down,Up,Down,Up", default = "",
dance = "Down,Up,Down,Up",
pump = "UpLeft,UpRight,UpLeft,UpRight,DownLeft,DownRight,DownLeft,DownRight,Center", -- random pump = "UpLeft,UpRight,UpLeft,UpRight,DownLeft,DownRight,DownLeft,DownRight,Center", -- random
}, },
SuperShuffle = { SuperShuffle = {
default = "Down,Up,Left,Right", default = "",
dance = "Down,Up,Left,Right",
pump = "UpLeft,UpRight,DownLeft,DownRight,UpLeft,UpRight,DownLeft,DownRight,Center" pump = "UpLeft,UpRight,DownLeft,DownRight,UpLeft,UpRight,DownLeft,DownRight,Center"
}, },
Reverse = { 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 pump = "UpLeft,DownLeft,UpRight,DownRight,UpLeft,DownLeft,UpRight,DownRight,DownRight", -- drop
}, },
HoldNotes = { HoldNotes = {
default = "Right,Left,Down,Up", default = "",
dance = "Right,Left,Down,Up",
}, },
Mines = { Mines = {
default = "", default = "",
@@ -397,33 +414,39 @@ local CodeDetectorCodes = {
default = "", default = "",
}, },
NextScrollSpeed = { NextScrollSpeed = {
default = "Up,Left,Down,Left,Up", default = "",
dance = "Up,Left,Down,Left,Up",
pump = "UpLeft,UpRight,UpLeft,UpRight,Center", pump = "UpLeft,UpRight,UpLeft,UpRight,Center",
}, },
PreviousScrollSpeed = { PreviousScrollSpeed = {
default = "Down,Right,Up,Right,Down", default = "",
dance = "Down,Right,Up,Right,Down",
pump = "UpRight,UpLeft,UpRight,UpLeft,Center", pump = "UpRight,UpLeft,UpRight,UpLeft,Center",
}, },
NextAccel = { NextAccel = {
default = "Left,Right,Down,Up", default = "",
dance = "Left,Right,Down,Up",
}, },
NextEffect = { NextEffect = {
default = "Left,Down,Right", default = "",
dance = "Left,Down,Right",
}, },
NextAppearance = { NextAppearance = {
default = "Left,Up,Right", default = "",
dance = "Left,Up,Right",
}, },
NextTurn = { NextTurn = {
default = "", default = "",
}, },
-- cancel all in player options -- cancel all in player options
CancelAllPlayerOptions = { CancelAllPlayerOptions = {
default = "Left,Right,Left,Right,Left,Right", default = "",
dance = "Left,Right,Left,Right,Left,Right",
}, },
}; };
function GetCodeForGame(codeName) function GetCodeForGame(codeName)
local gameName = GAMESTATE:GetCurrentGame():GetName() local gameName = string.lower(GAMESTATE:GetCurrentGame():GetName())
local inputCode = CodeDetectorCodes[codeName] local inputCode = CodeDetectorCodes[codeName]
return inputCode[gameName] or inputCode["default"] return inputCode[gameName] or inputCode["default"]
end end
+3 -3
View File
@@ -1913,9 +1913,9 @@ ChangeGroupsWithGameButtons=false
PreviousGroupButton="MenuUp" PreviousGroupButton="MenuUp"
NextGroupButton="MenuDown" NextGroupButton="MenuDown"
# #
TwoPartSelection=false TwoPartSelection=TwoPartSelection()
TwoPartConfirmsOnly=false TwoPartConfirmsOnly=TwoPartConfirmsOnly()
TwoPartTimerSeconds=15 TwoPartTimerSeconds=-1
# #
SampleMusicDelay=0.25 SampleMusicDelay=0.25
SampleMusicDelayInit=0 SampleMusicDelayInit=0