diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 33a48dcacd..ef8365b326 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -5,9 +5,13 @@ from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt. ________________________________________________________________________________ ================================================================================ -StepMania 5.0 Preview 3 | 20110??? +StepMania 5.0 Preview 3 | 201108?? -------------------------------------------------------------------------------- +2011/08/13 +---------- +* [Theme-side] Added Fancy UI Background preference to Theme Options. [AJ] + 2011/08/07 ---------- * [LifeMeterBattery] Added LostLife param to LifeChanged message. [AJ] diff --git a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua index c2a57262bf..e94a5e66f4 100644 --- a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua +++ b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua @@ -1,3 +1,5 @@ +local hideFancyElements = (GetUserPrefB("UserPrefFancyUIBG") == false) + local t = Def.ActorFrame {}; t[#t+1] = Def.ActorFrame { @@ -9,12 +11,12 @@ t[#t+1] = Def.ActorFrame { }; Def.ActorFrame { LoadActor("_pattern") .. { - InitCommand=cmd(rotationy,-12.25;rotationz,-30;rotationx,-20;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256); + InitCommand=cmd(hide_if,hideFancyElements;rotationy,-12.25;rotationz,-30;rotationx,-20;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256); OnCommand=cmd(texcoordvelocity,0.125,0.5;diffuse,color("#ffd400");diffusealpha,0.045;bob;effectmagnitude,0,0,35;effectperiod,4); }; }; LoadActor("_particleLoader") .. { - InitCommand=cmd(x,-SCREEN_CENTER_X;y,-SCREEN_CENTER_Y); + InitCommand=cmd(x,-SCREEN_CENTER_X;y,-SCREEN_CENTER_Y;hide_if,hideFancyElements;); }; --[[ LoadActor("_particles") .. { InitCommand=cmd(x,-SCREEN_CENTER_X;y,-SCREEN_CENTER_Y); diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini index 9254cadf41..1f6d10d092 100644 --- a/Themes/default/Languages/en.ini +++ b/Themes/default/Languages/en.ini @@ -98,9 +98,10 @@ UserPrefShowLotsaOptions=Options Density UserPrefLongFail=Fail Length UserPrefFlashyCombo=Flashy Combo UserPrefGameplayFooter=Gameplay Footer +UserPrefFancyUIBG=Fancy UI Background [OptionExplanations] -UserPrefAutoSetStyle=Allow the game to list all one player and two player modes at once instead of one style only. This might require a restart of StepMania\n( or alternatively hit F2! ) +UserPrefAutoSetStyle=Allow the game to list all one player and two player modes at once instead of one style only. This might require a restart of StepMania (or press Shift+F2). UserPrefNotePosition=Determines where the arrow receptors are placed in gameplay. UserPrefComboOnRolls=Choose if rolls should increment the combo or not. UserPrefComboUnderField=Determine if the combo should display under the notes or not. @@ -108,9 +109,10 @@ UserPrefComboUnderField=Determine if the combo should display under the notes or UserPrefGameplayShowScore=Show or Hide the score display in gameplay. UserPrefGameplayShowStepsDisplay=Show or Hide the step information display in gameplay. UserPrefShowLotsaOptions=Choose how many lines/rows of options to choose from. &oq;Few&cq; keeps the list to a minimum. &oq;Many&cq; adds various show-off mods. -UserPrefLongFail=Choose between the original sm-ssc fail (Long) or the new, shorter fail (Short). +UserPrefLongFail=Choose between the original "Long" sm-ssc fail or the "Short" fail adopted later. UserPrefFlashyCombo=Determine if combo flashes should be shown or not. UserPrefGameplayFooter=If on, displays a footer that blocks visibility of incoming arrows for a certain region ( DDR's score frame ). +UserPrefFancyUIBG=Toggles the fancy background. "Off" is recommended for older computers. Changes will take effect at the title screen. ScoringType=Defines which scoring method to use. If Special is selected, you can select a Special Scoring Mode in Theme Options. diff --git a/Themes/default/Scripts/03 ThemePrefs.lua b/Themes/default/Scripts/03 ThemePrefs.lua index 91790899af..243b7762c4 100644 --- a/Themes/default/Scripts/03 ThemePrefs.lua +++ b/Themes/default/Scripts/03 ThemePrefs.lua @@ -51,6 +51,9 @@ function InitUserPrefs() if GetUserPrefB("UserPrefComboUnderField") == nil then SetUserPref("UserPrefComboUnderField", true); end; + if GetUserPrefB("UserPrefFancyUIBG") == nil then + SetUserPref("UserPrefFancyUIBG", true); + end; --[[ if GetUserPref("ProTimingP1") == nil then SetUserPref("ProTimingP1", false); end; @@ -476,4 +479,42 @@ function UserPrefComboUnderField() setmetatable( t, t ); return t; end + +function UserPrefFancyUIBG() + local t = { + Name = "UserPrefFancyUIBG"; + LayoutType = "ShowAllInRow"; + SelectType = "SelectOne"; + OneChoiceForAllPlayers = true; + ExportOnChange = false; + Choices = { + THEME:GetString('OptionNames','On'), + THEME:GetString('OptionNames','Off') + }; + LoadSelections = function(self, list, pn) + if ReadPrefFromFile("UserPrefFancyUIBG") ~= nil then + if GetUserPrefB("UserPrefFancyUIBG") then + list[1] = true; + else + list[2] = true; + end; + else + WritePrefToFile("UserPrefFancyUIBG",true); + list[1] = true; + end; + end; + SaveSelections = function(self, list, pn) + local val; + if list[1] then val = true; + else val = false; + end; + WritePrefToFile("UserPrefFancyUIBG",val); + MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } ); + THEME:ReloadMetrics(); + end; + }; + setmetatable( t, t ); + return t; +end + --[[ end option rows ]] diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 5d6ff164ea..8644a193c7 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -1252,7 +1252,7 @@ LineRollCombo="lua,UserPrefComboOnRolls()" Fallback="ScreenOptionsServiceChild" NextScreen="ScreenOptionsExtended" PrevScreen="ScreenOptionsExtended" -LineNames="gNotePos,gAuto,gScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter" +LineNames="gNotePos,gAuto,gScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter,FancyUIBG" LinegNotePos="lua,UserPrefNotePosition()" LinegScore="lua,UserPrefGameplayShowScore()" LinegSDisp="lua,UserPrefGameplayShowStepsDisplay()" @@ -1262,6 +1262,7 @@ LinegLongFail="lua,UserPrefLongFail()" LinegComboUnderField="lua,UserPrefComboUnderField()" LineFlashyCombo="lua,UserPrefFlashyCombo()" LineGameplayFooter="lua,UserPrefGameplayFooter()" +LineFancyUIBG="lua,UserPrefFancyUIBG()" [ScreenSelectGame]