From 1e65dc956b314b5c15394d79167c5cadd1195a53 Mon Sep 17 00:00:00 2001 From: Vecais Dumais Laacis Date: Wed, 12 Sep 2007 14:56:38 +0000 Subject: [PATCH] uses GAMESTATE:SetJukeboxUsesModifiers to randomize modifiers for every song (not only 1st one) --- stepmania/Themes/default/Languages/en.ini | 2 ++ .../Themes/default/Scripts/OptionsMenu.lua | 35 +++++++++++++++++++ stepmania/Themes/default/metrics.ini | 3 +- 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index 17115837e7..ceb35094e7 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -345,6 +345,7 @@ No Memory Card=No USB memory card was found. NoteSkins=NoteSkins NumBackgrounds=Choose the maximum number of random backgrounds to be loaded simultaneously. OnlyDedicatedMenuButtons=The default setting allows the dance pad's panels to navigate the menus. Changing this to &oq;dedicated only&cq; will restrict menu navigation to only the Menu* set of buttons. Be sure to map the Menu* set of buttons before setting this to &oq;dedicated&cq;! +OptionsRandomJukebox= OsMountPlayer1= OsMountPlayer2= Other Options=Change autogen and loading options. @@ -797,6 +798,7 @@ Network Options=Network Options No USB memory cards found=No USB memory cards found NoteSkins=NoteSkins NumBackgrounds=Random Backgrounds +OptionsRandomJukebox=Modifiers OnlyDedicatedMenuButtons=Menu Buttons OsMountPlayer1=OS Mount Player1 OsMountPlayer2=OS Mount Player2 diff --git a/stepmania/Themes/default/Scripts/OptionsMenu.lua b/stepmania/Themes/default/Scripts/OptionsMenu.lua index 5fa9018594..38148d318e 100644 --- a/stepmania/Themes/default/Scripts/OptionsMenu.lua +++ b/stepmania/Themes/default/Scripts/OptionsMenu.lua @@ -60,6 +60,41 @@ OptionRowTable = end } +function OptionsRandomJukebox() + local function AllChoices() + Trace('all choices'); + local ret = { } + ret[1] = 'Off'; + ret[2] = 'Random'; + return ret + end + + local t = + { + -- Name is used to retrieve the header and explanation text. + Name = "OptionsRandomJukebox"; + LayoutType = "ShowAllInRow"; + SelectType = "SelectOne"; + OneChoiceForAllPlayers = true; + ExportOnChange = false; + Choices = AllChoices(); + LoadSelections = function(self, list, pn) + list[1] = true + end; + SaveSelections = function(self, list, pn) + local val; + if list[1] then + val = false; + else + val = true; + end + GAMESTATE:SetJukeboxUsesModifiers(val); + end; + }; + setmetatable( t, t ); + return t; +end + -- (c) 2005 Glenn Maynard -- All rights reserved. -- diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 325b6eec5b..41a2d1b3bf 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1664,7 +1664,8 @@ LineNames="1,2,3,4" Line1="list,Styles" Line2="list,Groups" Line3="list,Difficulties" -Line4="list,RandomModifiers" +Line4="lua,OptionsRandomJukebox()" +Line4Old="list,RandomModifiers" [ScreenSystemLayer] Fallback="Screen"