From f4f457cd0a713279441f35adc3b9ae228e468a3f Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Sat, 20 Aug 2011 19:24:20 -0700 Subject: [PATCH] go to game over instead of eval summary; add select menu sounds. --- Themes/_fallback/Scripts/02 Branches.lua | 2 ++ .../ScreenSelectMusic decorations/default.lua | 10 ++++++++++ Themes/default/metrics.ini | 8 ++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Themes/_fallback/Scripts/02 Branches.lua b/Themes/_fallback/Scripts/02 Branches.lua index 1a68631282..2015a8432f 100644 --- a/Themes/_fallback/Scripts/02 Branches.lua +++ b/Themes/_fallback/Scripts/02 Branches.lua @@ -185,6 +185,8 @@ Branch = { AfterEvaluation = function() if GAMESTATE:GetSmallestNumStagesLeftForAnyHumanPlayer() >= 1 then return "ScreenProfileSave" + elseif STATSMAN:GetCurStageStats():AllFailed() then + return "ScreenProfileSaveSummary" else return "ScreenEvaluationSummary" end diff --git a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index 252c227fec..027532ff8d 100644 --- a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -242,4 +242,14 @@ t[#t+1] = StandardDecorationFromFileOptional("SongOptions","SongOptionsText") .. ShowEnteringOptionsCommand=THEME:GetMetric(Var "LoadingScreen","SongOptionsEnterCommand"); HidePressStartForOptionsCommand=THEME:GetMetric(Var "LoadingScreen","SongOptionsHideCommand"); }; +-- Sounds +t[#t+1] = Def.ActorFrame { + LoadActor(THEME:GetPathS("_switch","up")) .. { + SelectMenuOpenedMessageCommand=cmd(stop;play); + }; + LoadActor(THEME:GetPathS("_switch","down")) .. { + SelectMenuClosedMessageCommand=cmd(stop;play); + }; +}; + return t \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 8c65acb9d5..3dbdf889ad 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -841,14 +841,14 @@ SelectMenuAvailable=true # ModeMenuAvailable=(getenv(sMode) == Normal) # HelpDisplay has things added here to make sure it disappears for another # actor, which we defined in this screens decorations. -HelpSelectMenuOpenedMessageCommand=stoptweening;decelerate,0.125;diffusealpha,0; -HelpSelectMenuClosedMessageCommand=stoptweening;accelerate,0.0725;diffusealpha,1; +HelpSelectMenuOpenedMessageCommand=basezoom,0.75;finishtweening;zoom,1;bouncebegin,0.25;diffusealpha,0;zoom,0.75 +HelpSelectMenuClosedMessageCommand=basezoom,0.75;finishtweening;zoom,1.25;bounceend,0.125;diffusealpha,1;zoom,1 # Clone everything from HelpDisplay: we're lazy ShowAlternateHelpDisplay=true # AlternateHelpDisplaySelectMenuOpenedMessageCommand=stoptweening;y,SCREEN_BOTTOM-16;accelerate,0.0725/2;y,SCREEN_BOTTOM-16-16;diffusealpha,1;decelerate,0.0725/2;y,SCREEN_BOTTOM-16-32; # AlternateHelpDisplaySelectMenuClosedMessageCommand=stoptweening;y,SCREEN_BOTTOM-16;smooth,0.125;y,SCREEN_BOTTOM-16;diffusealpha,0; -AlternateHelpDisplaySelectMenuOpenedMessageCommand=stoptweening;accelerate,0.0725;diffusealpha,1; -AlternateHelpDisplaySelectMenuClosedMessageCommand=stoptweening;decelerate,0.125;diffusealpha,0; +AlternateHelpDisplaySelectMenuOpenedMessageCommand=basezoom,0.75;finishtweening;zoom,1;bouncebegin,0.125;diffusealpha,1;zoom,1 +AlternateHelpDisplaySelectMenuClosedMessageCommand=basezoom,0.75;finishtweening;zoom,1;bounceend,0.25;diffusealpha,0;zoom,0.75 # MusicWheelX=SCREEN_CENTER_X+160 MusicWheelY=SCREEN_CENTER_Y