From b38142bc8fe3566acf12b0d2b667afc289b50d25 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Tue, 29 Jun 2010 16:32:08 -0500 Subject: [PATCH] add a Remove row in player options (including most removal options except mines) --- Themes/_fallback/Languages/en.ini | 2 ++ Themes/_fallback/metrics.ini | 36 ++++++++++++++++-------- Themes/default/Scripts/03 ThemePrefs.lua | 22 +++++++-------- Themes/default/metrics.ini | 2 ++ 4 files changed, 39 insertions(+), 23 deletions(-) diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index e35594a5c7..20f77dd70a 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -398,6 +398,7 @@ RandomModifiers= Rate=Rate RefreshRate=Controls how many times per second the screen will refresh. Only has an effect when Display Mode is set to &oq;Full Screen&cq;. Reload Songs=Reload all songs and courses. +Remove=Remove arrows to make the song easier. Rename= Reset To Defaults=Reset all options to default values. SaveScores=SaveScores @@ -643,6 +644,7 @@ NoHands=No Hands NoHolds=No Holds NoJumps=No Jumps NoMines=No Mines +NoRolls=No Rolls NoQuads=No Quads NoRecover=No Recover NoStretch=No Stretch diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 2711830c11..3f8ee47489 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -2016,16 +2016,25 @@ Turn,5="mod,supershuffle;name,SuperShuffle" # Turn,5="mod,shuffle;name,Shuffle" # Turn,6="mod,supershuffle;name,SuperShuffle" -Insert="8;selectmultiple" -InsertDefault="mod,no little,no wide,no big,no quick,no skippy,no echo,no stomp" -Insert,1="mod,little;name,Little" -Insert,2="mod,wide;name,Wide" -Insert,3="mod,big;name,Big" -Insert,4="mod,quick;name,Quick" -Insert,5="mod,bmrize;name,BMRize" -Insert,6="mod,skippy;name,Skippy" -Insert,7="mod,echo;name,Echo" -Insert,8="mod,stomp;name,Stomp" +Insert="7;selectmultiple" +InsertDefault="mod,no wide,no big,no quick,no skippy,no echo,no stomp" +Insert,1="mod,wide;name,Wide" +Insert,2="mod,big;name,Big" +Insert,3="mod,quick;name,Quick" +Insert,4="mod,bmrize;name,BMRize" +Insert,5="mod,skippy;name,Skippy" +Insert,6="mod,echo;name,Echo" +Insert,7="mod,stomp;name,Stomp" + +Remove="7;selectmultiple" +RemoveDefault="mod,no little,no nojumps,no nohands,no noquads,no nostretch,no noholds,no norolls" +Remove,1="mod,little;name,Little" +Remove,2="mod,nojumps;name,NoJumps" +Remove,3="mod,nohands;name,NoHands" +Remove,4="mod,noquads;name,NoQuads" +Remove,5="mod,nostretch;name,NoStretch" +Remove,6="mod,noholds;name,NoHolds" +Remove,7="mod,norolls;name,NoRolls" # Insert="8" # InsertDefault="mod,no little,no wide,no big,no quick,no skippy,no echo,no stomp" @@ -2055,7 +2064,7 @@ Scroll,5="mod,centered;name,Centered" # Scroll,5="mod,cross;name,Cross" Holds="3;selectmultiple" -HoldsDefault="mod,no noholds,no planted,no twister,no holdstorolls" +HoldsDefault="mod,no planted,no twister,no holdstorolls" Holds,1="mod,planted;name,Planted" Holds,2="mod,twister;name,Twister" Holds,3="mod,holdrolls;name,HoldsToRolls" @@ -2089,6 +2098,7 @@ AttacksDefault="mod,no randomattacks,no songattacks" Attacks,1="name,Off" Attacks,2="mod,randomattacks;name,RandomAttacks" Attacks,3="mod,songattacks;name,SongAttacks" + PlayerAutoPlay="2" PlayerAutoPlayDefault="mod,no playerautoplay" PlayerAutoPlay,1="name,Off" @@ -2113,6 +2123,7 @@ Persp,2="mod,overhead;name,Overhead" Persp,3="mod,space;name,Space" Persp,4="mod,hallway;name,Hallway" Persp,5="mod,distant;name,Distant" + ScoreDisplay="3" ScoreDisplayDefault="mod,addscore" ScoreDisplay,1="mod,addscore;name,Add" @@ -2568,7 +2579,7 @@ PlayMusic=false # TimerSeconds=30 # -LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17" +LineNames="1,2,3,4,5,6,R,7,8,9,10,11,12,13,14,15,16,17" Line1="lua,SpeedMods()" # Line1="list,Speed" Line2="list,Accel" @@ -2576,6 +2587,7 @@ Line3="list,Effect" Line4="list,Appearance" Line5="list,Turn" Line6="list,Insert" +LineR="list,Remove" Line7="list,Scroll" Line8="list,NoteSkins" Line9="list,Holds" diff --git a/Themes/default/Scripts/03 ThemePrefs.lua b/Themes/default/Scripts/03 ThemePrefs.lua index 351479271b..ffa765cba1 100644 --- a/Themes/default/Scripts/03 ThemePrefs.lua +++ b/Themes/default/Scripts/03 ThemePrefs.lua @@ -9,16 +9,16 @@ function InitUserPrefs() end; if GetUserPrefB("UserPrefShowLotsaOptions") == nil then SetUserPref("UserPrefShowLotsaOptions", true); - end; + end; if GetUserPrefB("UserPrefAutoSetStyle") == nil then SetUserPref("UserPrefAutoSetStyle", true); - end; + end; if GetUserPrefB("UserPrefLongFail") == nil then SetUserPref("UserPrefLongFail", false); - end; + end; if GetUserPrefB("UserPrefNotePosition") == nil then SetUserPref("UserPrefNotePosition", true); - end; + end; --[[ if GetUserPref("ProTimingP1") == nil then SetUserPref("ProTimingP1", false); end; @@ -102,7 +102,7 @@ function UserPrefGameplayShowScore() end; WritePrefToFile("UserPrefGameplayShowScore",val); MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } ); - THEME:ReloadMetrics(); + THEME:ReloadMetrics(); end; }; setmetatable( t, t ); @@ -138,7 +138,7 @@ function UserPrefGameplayShowStepsDisplay() end; WritePrefToFile("UserPrefGameplayShowStepsDisplay",val); MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } ); - THEME:ReloadMetrics(); + THEME:ReloadMetrics(); end; }; setmetatable( t, t ); @@ -174,7 +174,7 @@ function UserPrefShowLotsaOptions() end; WritePrefToFile("UserPrefShowLotsaOptions",val); MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } ); - THEME:ReloadMetrics(); + THEME:ReloadMetrics(); end; }; setmetatable( t, t ); @@ -183,7 +183,7 @@ end function GetDefaultOptionLines() local LineSets = { - "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17", -- All + "1,2,3,4,5,6,R,7,8,9,10,11,12,13,14,15,16,17", -- All "1,2,7,8,13,14,16,17", -- DDR Essentials ( no turns, fx ) }; local function IsExtra() @@ -233,7 +233,7 @@ function UserPrefAutoSetStyle() end; WritePrefToFile("UserPrefAutoSetStyle",val); MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } ); - THEME:ReloadMetrics(); + THEME:ReloadMetrics(); end; }; setmetatable( t, t ); @@ -270,7 +270,7 @@ function UserPrefNotePosition() end; WritePrefToFile("UserPrefNotePosition",val); MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } ); - THEME:ReloadMetrics(); + THEME:ReloadMetrics(); end; }; setmetatable( t, t ); @@ -306,7 +306,7 @@ function UserPrefLongFail() end; WritePrefToFile("UserPrefLongFail",val); MESSAGEMAN:Broadcast("PrferenceSet", { Message == "Set Preference" } ); - THEME:ReloadMetrics(); + THEME:ReloadMetrics(); end; }; setmetatable( t, t ); diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 61ba0e8281..173ce02b7c 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -639,6 +639,7 @@ TimerOffCommand= # TimerOffCommand=accelerate,0.4;rotationx,90; StageDisplayNumberOffset=1 + [ScreenWithMenuElementsBlank] ShowHeader=false ShowFooter=false @@ -1171,6 +1172,7 @@ Line3="list,Effect" Line4="list,Appearance" Line5="list,Turn" Line6="list,Insert" +LineR="list,Remove" Line7="list,Scroll" Line8="list,NoteSkins" Line9="list,Holds"