actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consolidate eval branches

Browse Source
This commit is contained in:
Glenn Maynard
2007-04-18 01:40:38 +00:00
parent 17c5f11d6c
commit 75eb39de5f
2 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/Scripts/Branches.lua
+28 -5
View File
@@ -91,7 +91,7 @@ function GetTopScreenMetric( sElement )
return THEME:GetMetric( sClass, sElement )
end
function GetEvaluationNextScreen( sNextScreen, sFailedScreen, sEndScreen )
local function GetEvaluationNextScreenInternal( sNextScreen, sFailedScreen, sEndScreen )
Trace( "GetEvaluationNextScreen: " .. sNextScreen .. ", " .. sFailedScreen .. ", " .. sEndScreen )
if GAMESTATE:IsEventMode() then
@@ -121,10 +121,33 @@ function GetEvaluationNextScreen( sNextScreen, sFailedScreen, sEndScreen )
return sEndScreen
end
function ScreenEvaluationExitBranch()
if( IsNetSMOnline() ) then return "ScreenNetRoom" end
if( IsNetConnected() ) then return "ScreenNetSelectMusic" end
return "ScreenSelectMusic"
function GetEvaluationSummaryNextScreen()
return GetEvaluationNextScreenInternal( "ScreenNameEntry", "ScreenGameOver", "ScreenNameEntry" );
end
function GetEvaluationNextScreen()
local sFailedScreen;
local sEndScreen;
local pm = GAMESTATE:GetPlayMode();
if pm == "PlayMode_Regular" or
pm == "PlayMode_Rave" then
sFailedScreen = "ScreenGameOver";
sEndScreen = "ScreenEvaluationSummary";
elseif pm == "PlayMode_Nonstop" or
pm == "PlayMode_Oni" or
pm == "PlayMode_Endless" then
sFailedScreen = "ScreenNameEntry";
sEndScreen = "ScreenNameEntry";
else
assert(false);
end
local sNextScreen;
if IsNetSMOnline() then sNextScreen = "ScreenNetRoom"
elseif( IsNetConnected() ) then sNextScreen = "ScreenNetSelectMusic"
else sNextScreen = SongSelectionScreen(); end
return GetEvaluationNextScreenInternal( sNextScreen, sFailedScreen, sEndScreen );
end
function ScreenBranchNetAfterEval()
stepmania/Themes/default/metrics.ini
+6 -6
View File
@@ -1281,7 +1281,7 @@ UserSelCommand=zoomx,1.0;zoomy,1.0;linear,0.1;zoomx,1.4;zoomy,1.4
[ScreenEvaluationStage]
Fallback="ScreenEvaluation"
NextScreen=GetEvaluationNextScreen( ScreenEvaluationExitBranch(), "ScreenGameOver", "ScreenEvaluationSummary" )
NextScreen=GetEvaluationNextScreen()
ShowGradeArea=true
ShowPointsArea=false
ShowBonusArea=true
@@ -1419,7 +1419,7 @@ TryExtraStageOffCommand=linear,0.7;diffusealpha,0
[ScreenEvaluationSummary]
Fallback="ScreenEvaluationStage"
NextScreen=GetEvaluationNextScreen( "ScreenNameEntry", "ScreenGameOver", "ScreenNameEntry" )
NextScreen=GetEvaluationSummaryNextScreen()
Summary=true
ShowTimeArea=false
@@ -1454,7 +1454,7 @@ CategoryRecordP2OffCommand=linear,0.7;diffusealpha,0
[ScreenEvaluationNonstop]
Fallback="ScreenEvaluation"
NextScreen=GetEvaluationNextScreen( "ScreenSelectCourseNonstop", "ScreenNameEntry", "ScreenNameEntry" )
NextScreen=GetEvaluationNextScreen()
ShowGradeArea=true
ShowPointsArea=false
ShowBonusArea=false
@@ -1467,7 +1467,7 @@ ShowStage=false
[ScreenEvaluationOni]
Fallback="ScreenEvaluation"
NextScreen=GetEvaluationNextScreen( "ScreenSelectCourseOni", "ScreenNameEntry", "ScreenNameEntry" )
NextScreen=GetEvaluationNextScreen()
ShowGradeArea=false
ShowPointsArea=true
ShowBonusArea=false
@@ -1508,11 +1508,11 @@ TimeNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2
[ScreenEvaluationEndless]
Fallback="ScreenEvaluationOni"
NextScreen=GetEvaluationNextScreen( "ScreenSelectCourseEndless", "ScreenNameEntry", "ScreenNameEntry" )
NextScreen=GetEvaluationNextScreen()
[ScreenEvaluationRave]
Fallback="ScreenEvaluation"
NextScreen=GetEvaluationNextScreen( "ScreenSelectMusic", "ScreenGameOver", "ScreenEvaluationSummary" )
NextScreen=GetEvaluationNextScreen()
ShowGradeArea=true
ShowPointsArea=false
ShowBonusArea=false