remove most internal evaluation screen actors (except combo/lifegraphs)

move bn to lua with bg and use base sprites to hopefully fix bg leaks

Themes/Til Death/BGAnimations/ScreenEvaluation decorations/default.lua

@@ -536,12 +536,8 @@ end
 
 if GAMESTATE:IsPlayerEnabled(PLAYER_1) then
 	t[#t + 1] = scoreBoard(PLAYER_1, 0)
-	if ShowStandardDecoration("GraphDisplay") then
-		t[#t + 1] = StandardDecorationFromTable("GraphDisplay" .. ToEnumShortString(PLAYER_1), GraphDisplay(PLAYER_1))
-	end
-	if ShowStandardDecoration("ComboGraph") then
-		t[#t + 1] = StandardDecorationFromTable("ComboGraph" .. ToEnumShortString(PLAYER_1), ComboGraph(PLAYER_1))
-	end
+	t[#t + 1] = StandardDecorationFromTable("GraphDisplay" .. ToEnumShortString(PLAYER_1), GraphDisplay(PLAYER_1))
+	t[#t + 1] = StandardDecorationFromTable("ComboGraph" .. ToEnumShortString(PLAYER_1), ComboGraph(PLAYER_1))
 end
 
 t[#t + 1] = LoadActor("../offsetplot")

Themes/Til Death/BGAnimations/ScreenEvaluation underlay.lua

@@ -4,13 +4,35 @@ local t = Def.ActorFrame {}
 
 if enabled then
 	t[#t + 1] =
-		LoadSongBackground() ..
-		{
-			BeginCommand = function(self)
-				self:scaletocover(0, 0, SCREEN_WIDTH, SCREEN_BOTTOM)
-				self:diffusealpha(brightness)
+		Def.Sprite {
+			OnCommand = function(self)
+				if GAMESTATE:GetCurrentSong() and GAMESTATE:GetCurrentSong():GetBackgroundPath() then
+					self:finishtweening()
+					self:visible(true)
+					self:LoadBackground(GAMESTATE:GetCurrentSong():GetBackgroundPath())
+					self:scaletocover(0, 0, SCREEN_WIDTH, SCREEN_BOTTOM)
+					self:sleep(0.5)
+					self:decelerate(2)
+					self:diffusealpha(brightness)
+				else
+					self:visible(false)
+				end
 			end
 		}
 end
 
+t[#t + 1] =
+	Def.Sprite {
+	Name = "Banner",
+	OnCommand = function(self)
+		self:x(SCREEN_CENTER_X):y(38):valign(0)
+		self:scaletoclipped(capWideScale(get43size(336), 336), capWideScale(get43size(105), 105))
+		local bnpath = GAMESTATE:GetCurrentSong():GetBannerPath()
+		if not bnpath then
+			bnpath = THEME:GetPathG("Common", "fallback banner")
+		end
+		self:LoadBackground(bnpath)
+	end
+}
+
 return t

Themes/Til Death/BGAnimations/ScreenNetEvaluation decorations.lua

@@ -553,12 +553,8 @@ end
 
 if GAMESTATE:IsPlayerEnabled(PLAYER_1) then
 	t[#t + 1] = scoreBoard(PLAYER_1, 0)
-	if ShowStandardDecoration("GraphDisplay") then
-		t[#t + 1] = StandardDecorationFromTable("GraphDisplay" .. ToEnumShortString(PLAYER_1), GraphDisplay(PLAYER_1))
-	end
-	if ShowStandardDecoration("ComboGraph") then
-		t[#t + 1] = StandardDecorationFromTable("ComboGraph" .. ToEnumShortString(PLAYER_1), ComboGraph(PLAYER_1))
-	end
+	t[#t + 1] = StandardDecorationFromTable("GraphDisplay" .. ToEnumShortString(PLAYER_1), GraphDisplay(PLAYER_1))
+	t[#t + 1] = StandardDecorationFromTable("ComboGraph" .. ToEnumShortString(PLAYER_1), ComboGraph(PLAYER_1))
 end
 
 t[#t + 1] = LoadActor("offsetplot")

Themes/_fallback/metrics.ini

@@ -3258,124 +3258,16 @@ Fallback="ScreenWithMenuElements"
 NextScreen=Branch.AfterEvaluation()
 PrevScreen=Branch.AfterEvaluation()
 TimerSeconds=20
-LightsMode="LightsMode_MenuStartOnly"
-#
-Summary=false
-CheckpointsWithJudgments=EvalUsesCheckpointsWithJudgments()
-#
-PlayerOptionsSeparator=","
-PlayerOptionsHideFailType=false
-MaxComboNumDigits=4
-#
-ShowBannerArea=true
-RollingNumbersClass="RollingNumbersJudgment"
-RollingNumbersMaxComboClass="RollingNumbersMaxCombo"
-#
-ShowSharedJudgmentLineLabels=false
-ShowJudgmentLineW1=false
-ShowJudgmentLineW2=false
-ShowJudgmentLineW3=false
-ShowJudgmentLineW4=false
-ShowJudgmentLineW5=false
-ShowJudgmentLineHeld=false
-ShowJudgmentLineMiss=false
-ShowJudgmentLineMaxCombo=false
-ShowPeakComboAward=false
-ShowTimingDifficulty=false
-ShowStageDisplay=false
-ShowStageFrame=false
-ShowGraphDisplay=false
-ShowComboGraph=false
-ShowStepsDisplay=false
-ShowGradeArea=false
-ShowPointsArea=false
-ShowDetailArea=false
-ShowBonusArea=false
-ShowSurvivedArea=false
-ShowWinArea=false
-ShowScoreArea=false
-ShowTimeArea=false
-ShowItsARecord=false
-ShowStageAward=false
-#
 FailedSoundTime=0
 PassedSoundTime=0
 CheerDelaySeconds=2.5
-#
-BannerWidth=256
-BannerHeight=80
-#
-LargeBannerX=
-LargeBannerY=
-LargeBannerOnCommand=visible,false
-LargeBannerOffCommand=
-LargeBannerFrameX=
-LargeBannerFrameY=
-LargeBannerFrameOnCommand=visible,false
-LargeBannerFrameOffCommand=
-#
-PlayerOptionsP1X=
-PlayerOptionsP1Y=
-PlayerOptionsP1OnCommand=visible,false
-PlayerOptionsP1OffCommand=
-PlayerOptionsP2X=
-PlayerOptionsP2Y=
-PlayerOptionsP2OnCommand=visible,false
-PlayerOptionsP2OffCommand=
-#
-SongOptionsX=
-SongOptionsY=
-SongOptionsOnCommand=visible,false
-SongOptionsOffCommand=
-#
-DisqualifiedP1X=
-DisqualifiedP1Y=
-DisqualifiedP1OnCommand=visible,false
-DisqualifiedP1OffCommand=
-DisqualifiedP2X=
-DisqualifiedP2Y=
-DisqualifiedP2OnCommand=visible,false
-DisqualifiedP2OffCommand=
-#
-SmallBanner1X=SCREEN_CENTER_X
-SmallBanner1Y=SCREEN_TOP-128
-SmallBanner1OnCommand=visible,false
-SmallBanner1OffCommand=
-SmallBanner2X=SCREEN_CENTER_X
-SmallBanner2Y=SCREEN_TOP-128
-SmallBanner2OnCommand=visible,false
-SmallBanner2OffCommand=
-SmallBanner3X=SCREEN_CENTER_X
-SmallBanner3Y=SCREEN_TOP-128
-SmallBanner3OnCommand=visible,false
-SmallBanner3OffCommand=
-SmallBanner4X=SCREEN_CENTER_X
-SmallBanner4Y=SCREEN_TOP-128
-SmallBanner4OnCommand=visible,false
-SmallBanner4OffCommand=
-SmallBanner5X=SCREEN_CENTER_X
-SmallBanner5Y=SCREEN_TOP-128
-SmallBanner5OnCommand=visible,false
-SmallBanner5OffCommand=
-SmallBanner6X=SCREEN_CENTER_X
-SmallBanner6Y=SCREEN_TOP-128
-SmallBanner6OnCommand=visible,false
-SmallBanner6OffCommand=
-#
-DetailLineFormat="%3d/%3d"
-#
 
 [ScreenEvaluationNormal]
 Fallback="ScreenEvaluation"
 #
 NextScreen=Branch.AfterEvaluation()
 PrevScreen=Branch.AfterEvaluation()
 
-[ScreenEvaluationSummary]
-Fallback="ScreenEvaluation"
-NextScreen=Branch.AfterSummary()
-Summary=true
-
 [ScreenNetProfileSave]
 Class="ScreenProfileSave"
 Fallback="ScreenProfileSave"
@@ -3980,6 +3872,11 @@ ModIconMetricsGroup="ModIconSelectMusic"
 [GraphDisplay]
 BodyWidth=140
 BodyHeight=38
+
+[ComboGraph]
+BodyWidth=140
+BodyHeight=11
+
 # Arcade #################################
 [ScreenLogo]
 Fallback="ScreenAttract"