award cleanup

stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua

@@ -3,8 +3,7 @@ function GraphDisplay( pn )
 		Def.GraphDisplay {
 			InitCommand=cmd(Load,"GraphDisplay";);
 			BeginCommand=function(self)
-				local screen = SCREENMAN:GetTopScreen();
-				local ss = screen:GetStageStats();
+				local ss = SCREENMAN:GetTopScreen():GetStageStats();
 				self:Set( ss, ss:GetPlayerStageStats(pn) );
 			end,
 		};
@@ -17,8 +16,7 @@ function ComboGraph( pn )
 		Def.ComboGraph {
 			InitCommand=cmd(Load,"ComboGraph";);
 			BeginCommand=function(self)
-				local screen = SCREENMAN:GetTopScreen();
-				local ss = screen:GetStageStats();
+				local ss = SCREENMAN:GetTopScreen():GetStageStats();
 				self:Set( ss, ss:GetPlayerStageStats(pn) );
 			end,
 		};
@@ -91,12 +89,22 @@ if ShowStandardDecoration("StepsDisplay") then
 	end
 end
 
+if ShowStandardDecoration("StageAward") then
+	for pn in ivalues(PlayerNumber) do
+		t[#t+1] = StandardDecorationFromFile( "StageAward" .. ToEnumShortString(pn), "StageAward"  ) .. {
+			BeginCommand=function(self)
+				local ss = SCREENMAN:GetTopScreen():GetStageStats();
+				self:playcommand( "Set", { StageAward = ss:GetPlayerStageStats(pn):GetStageAward() } );
+			end;
+		}
+	end
+end
+
 for i in ivalues(EarnedExtraStage) do
 	if i ~= "EarnedExtraStage_No" then
 		t[#t+1] = StandardDecorationFromFile( "TryExtraStage", "Try"..ToEnumShortString(i) ) .. {
 			BeginCommand=function(self)
-				local screen = SCREENMAN:GetTopScreen();
-				local ss = screen:GetStageStats();
+				local ss = SCREENMAN:GetTopScreen():GetStageStats();
 				self:visible( i == ss:GetEarnedExtraStage() );
 			end;
 		};

stepmania/Themes/default/Graphics/ScreenEvaluation StageAward.lua

@@ -0,0 +1,6 @@
+return LoadFont( "_venacti bold 15" ) .. {
+	InitCommand=cmd(strokecolor,color("#e6ffff");diffusetopedge,color("#007fa8");diffusebottomedge,color("#2fbbdc");shadowlength,0;maxwidth,140;glowshift;);
+	SetCommand=function(self,param)
+		self:settext( StageAwardToLocalizedString(param.StageAward) );
+	end
+};

stepmania/Themes/default/Languages/en.ini

@@ -1936,3 +1936,27 @@ HeaderSubText=Challenge yourself to achieve the ultimate skill!
 [ScreenSongOptions]
 HeaderText=Song Modifiers
 HeaderSubText=You picked a great song.  Now let's dance!
+
+[StageAward]
+FullComboW3=Full Combo!
+SingleDigitW3=Single Digit Greats!
+OneW3=One Great!
+FullComboW2=Full Perfect Combo!!
+SingleDigitW2=Single Digit Perfects!!
+OneW2=One Perfect!!
+FullComboW1=Full Fantastic Combo!!!
+80PercentW3=80% Greats!
+90PercentW3=90% Greats!!
+100PercentW3=100% Greats!!!
+
+[PeakComboAward]
+1000=1000 Peak Combo!
+2000=2000 Peak Combo!
+3000=3000 Peak Combo!
+4000=4000 Peak Combo!
+5000=5000 Peak Combo!!
+6000=6000 Peak Combo!!
+7000=7000 Peak Combo!!
+8000=8000 Peak Combo!!
+9000=9000 Peak Combo!!
+10000=10000 Peak Combo!!!

stepmania/Themes/default/metrics.ini

@@ -1118,7 +1118,6 @@ ShowJudgmentLineW5=true
 ShowJudgmentLineHeld=false
 ShowJudgmentLineMiss=true
 ShowJudgmentLineMaxCombo=true
-ShowPerDifficultyAward=false
 ShowPeakComboAward=false
 ShowTimingDifficulty=true
 
@@ -1503,6 +1502,15 @@ ComboGraphP2Y=SCREEN_CENTER_Y+10
 ComboGraphP2OnCommand=draworder,1
 ComboGraphP2OffCommand=
 
+StageAwardP1X=SCREEN_CENTER_X-222
+StageAwardP1Y=SCREEN_CENTER_Y-32
+StageAwardP1OnCommand=draworder,1
+StageAwardP1OffCommand=
+StageAwardP2X=SCREEN_CENTER_X+222
+StageAwardP2Y=SCREEN_CENTER_Y-32
+StageAwardP2OnCommand=draworder,1
+StageAwardP2OffCommand=
+
 ModIconRowP1X=SCREEN_CENTER_X-316
 ModIconRowP1Y=SCREEN_CENTER_Y-130
 ModIconRowP1OnCommand=draworder,1;player,"PlayerNumber_P1";addx,-200;linear,0.5;addx,200
@@ -1521,6 +1529,11 @@ ItsARecordP2Y=SCREEN_CENTER_Y+185
 ItsARecordP2OnCommand=shadowlength,0;diffusealpha,0;zoom,3;linear,0.5;diffusealpha,1;zoom,1
 ItsARecordP2OffCommand=linear,0.5;diffusealpha,1
 
+TryExtraStageX=SCREEN_CENTER_X+0
+TryExtraStageY=SCREEN_CENTER_Y-164
+TryExtraStageOnCommand=draworder,1;diffusealpha,0;linear,0.7;diffusealpha,1;glowshift
+TryExtraStageOffCommand=linear,0.7;diffusealpha,0
+
 BarActualMaxCommand=glowshift;effectperiod,0.5
 
 CheerDelaySeconds=2.5
@@ -1565,11 +1578,7 @@ ShowStageFrame=true
 ShowModIconRows=true
 ShowStepsDisplay=true
 ShowItsARecord=true
-
-TryExtraStageX=SCREEN_CENTER_X+0
-TryExtraStageY=SCREEN_CENTER_Y-166
-TryExtraStageOnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift
-TryExtraStageOffCommand=linear,0.7;diffusealpha,0
+ShowStageAward=true
 
 [ScreenEvaluationSummary]
 Fallback="ScreenEvaluationStage"