From fc682c406f7121d41e7df2a7cb47f6850092239c Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 6 Feb 2006 07:43:07 +0000 Subject: [PATCH] ScreenGameplaySyncMachine cleanup --- .../default/Graphics/ScreenGameplaySyncMachine footer.redir | 1 + stepmania/Themes/default/Languages/en.ini | 6 +++++- .../Themes/default/Other/ScreenGameplaySyncMachine music.sm | 2 +- stepmania/Themes/default/Scripts/Branches.lua | 1 - 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 stepmania/Themes/default/Graphics/ScreenGameplaySyncMachine footer.redir diff --git a/stepmania/Themes/default/Graphics/ScreenGameplaySyncMachine footer.redir b/stepmania/Themes/default/Graphics/ScreenGameplaySyncMachine footer.redir new file mode 100644 index 0000000000..a8c38e48f6 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenGameplaySyncMachine footer.redir @@ -0,0 +1 @@ +_shared footer diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index e14607edc2..cad8e20813 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -409,6 +409,7 @@ Arcade Style=Arcade Style Ask=Ask Auto=Auto Autogen To Fill Width=Autogen To Fill Width +AutosyncMachine=AutosyncMachine Average=Average Average Feet=Average Feet Backwards=Backwards @@ -838,7 +839,7 @@ Oni=Oni Rave=Rave Regular=Regular -[Player] +[AdjustSync] Autosync Machine=Autosync Machine Autosync Song=Autosync Song Autosync: Correction NOT applied. Deviation too high.=Autosync: Correction NOT applied. Deviation too high. @@ -1039,6 +1040,9 @@ HelpText=Press &DOWN; on the pad to join GiveUpAbortedText=Don't give up! GiveUpText=Continue holding START to give up +[ScreenGameplaySyncMachine] +HelpText=Step to the beat until the arrows are in sync with the music::Press BACK when done + [ScreenGameplayOptions] HelpText=&UP; &DOWN; to change line &LEFT; &RIGHT; to select between options::START to accept changes BACK to discard changes diff --git a/stepmania/Themes/default/Other/ScreenGameplaySyncMachine music.sm b/stepmania/Themes/default/Other/ScreenGameplaySyncMachine music.sm index 2f84982fb9..e1c0726b60 100644 --- a/stepmania/Themes/default/Other/ScreenGameplaySyncMachine music.sm +++ b/stepmania/Themes/default/Other/ScreenGameplaySyncMachine music.sm @@ -11,7 +11,7 @@ #LYRICSPATH:; #CDTITLE:; #MUSIC:ScreenGameplaySyncMachine music.ogg; -#OFFSET:-0.020; +#OFFSET:-0.030; #SAMPLESTART:0.000; #SAMPLELENGTH:12.000; #SELECTABLE:YES; diff --git a/stepmania/Themes/default/Scripts/Branches.lua b/stepmania/Themes/default/Scripts/Branches.lua index e9380efa77..e89075246f 100644 --- a/stepmania/Themes/default/Scripts/Branches.lua +++ b/stepmania/Themes/default/Scripts/Branches.lua @@ -136,7 +136,6 @@ function GetGameplayNextScreen() Trace( "GetGameplayNextScreen: " ) local Passed = not AllFailed() Trace( " Passed = "..tostring(Passed) ) - Trace( " IsSyncDataChanged = "..tostring(GAMESTATE:IsSyncDataChanged()) ) Trace( " IsCourseMode = "..tostring(GAMESTATE:IsCourseMode()) ) Trace( " IsExtraStage = "..tostring(IsExtraStage()) ) Trace( " IsExtraStage2 = "..tostring(IsExtraStage2()) )