more theme changes from midi

Themes/_fallback/BGAnimations/ScreenConsoleOverlay overlay.lua

@@ -0,0 +1,15 @@
+local t = Def.ActorFrame {
+	Def.ActorFrame {
+		InitCommand=cmd(Center);
+	--[[ 	ToggleConsoleDisplayMessageCommand=function(self)
+			bVisible = 1 - bVisible;
+			bShow = (bVisible >= 1) and true or false;
+			self:visible(bShow);
+		end; --]]
+		Def.Quad {
+			InitCommand(zoomto,64,64;spin;);
+			ToggleConsoleDisplayMessageCommand=cmd(zoomto,345,345;visible,true);
+		};
+	};
+};
+return t

Themes/_fallback/Fonts/ScreenConsoleOverlay Credits.redir

@@ -0,0 +1 @@
+Common Normal

Themes/_fallback/Fonts/ScreenConsoleOverlay SystemMessage.redir

@@ -0,0 +1 @@
+Common Normal

Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua

@@ -1,3 +1,4 @@
+
 local stages = Def.ActorFrame {
 	BeginCommand=cmd(playcommand,"Set";);
 	CurrentSongChangedMessageCommand=cmd(finishtweening;playcommand,"Set";);
@@ -17,8 +18,8 @@ if not PREFSMAN:GetPreference("EventMode") then
 				local Stage = GAMESTATE:GetCurrentStage();
 				local StageIndex = GAMESTATE:GetCurrentStageIndex();
 				local screen = SCREENMAN:GetTopScreen();
-				local cStageOutlineColor = ColorDarkTone( StageToStrokeColor(s) );
+-- 				local cStageOutlineColor = ColorDarkTone( StageToStrokeColor(s) );
-				cStageOutlineColor[4] = 0.75;
+-- 				cStageOutlineColor[4] = 0.75;
 				if screen and screen.GetStageStats then
 					local ss = screen:GetStageStats();
 					Stage = ss:GetStage();
@@ -31,7 +32,7 @@ if not PREFSMAN:GetPreference("EventMode") then
 					self:settext( StageToLocalizedString(Stage) .. " Stage" );
 				end
 				self:diffuse( StageToColor(s) );
-				self:diffusebottomedge( ColorMidTone(StageToColor(s)) );
+-- 				self:diffusebottomedge( ColorMidTone(StageToColor(s)) );
 				self:strokecolor( cStageOutlineColor );
 			end;
 		}
@@ -39,8 +40,10 @@ if not PREFSMAN:GetPreference("EventMode") then
 else
 	stages[#stages+1] = MakeBitmapTest() .. {
 		SetCommand=function(self,params)
+			local Offset = THEME:GetMetric(Var "LoadingScreen","StageDisplayNumberOffset");
 			local Stage = GAMESTATE:GetCurrentStageIndex();
-			self:settextf( "Stage %03i", Stage);
+			local RealStage = Stage + Offset;
+			self:settextf( "Stage %03i", RealStage);
 				self:diffuse( StageToColor('Stage_1st') );
 				self:diffusebottomedge( ColorMidTone(StageToColor('Stage_1st')) );
 				self:strokecolor( Colors.Alpha( ColorDarkTone(StageToColor('Stage_1st')), 0.75) );

Themes/default/metrics.ini

@@ -103,6 +103,11 @@ NumLivesP1X=-92
 NumLivesP1Y=0
 NumLivesP2X=92
 NumLivesP2Y=0
+
+[LifeMeterBattery Percent]
+# still asking for this even though it's in fallback... -aj
+Format=
+
 [MenuTimer]
 Text1OnCommand=stopeffect;stoptweening;shadowlength,0;strokecolor,Color("Outline")
 Text1FormatFunction=function(fSeconds) \
@@ -340,6 +345,24 @@ DeltaSecondsGainLifeCommand=
 PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);diffusetopedge,BoostColor(PlayerColor(PLAYER_1),1.5)
 PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5)
 
+[ScoreDisplayRave]
+MeterP1X=
+MeterP1Y=
+MeterP1OnCommand=draworder,-1
+MeterP1OffCommand=
+MeterP2X=
+MeterP2Y=
+MeterP2OnCommand=draworder,-1;zoomx,-1
+MeterP2OffCommand=
+
+LevelP1X=
+LevelP1Y=
+LevelP1OnCommand=draworder,105;zoom,0.75;diffuse,ColorLightTone( PlayerColor(PLAYER_1) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );x,-144;skewx,-0.125;
+LevelP1OffCommand=
+LevelP2X=
+LevelP2Y=
+LevelP2OnCommand=draworder,105;draworder,105;zoom,0.75;diffuse,ColorLightTone( PlayerColor(PLAYER_2) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );x,144;skewx,-0.125;
+LevelP2OffCommand=
 [SongManager]
 SongGroupColor1=BoostColor(Color("Orange"),1.2)
 SongGroupColor2=BoostColor(Color("Orange"),1.25)
@@ -597,6 +620,7 @@ TimerOnCommand=draworder,6;visible,PREFSMAN:GetPreference("MenuTimer");
 TimerOffCommand=
 # TimerOffCommand=accelerate,0.4;rotationx,90;
 
+StageDisplayNumberOffset=1
 [ScreenWithMenuElementsBlank]
 ShowHeader=false
 ShowFooter=false
@@ -861,15 +885,20 @@ IconChoiceHardY=SCREEN_CENTER_Y-48
 IconChoiceHardOnCommand=zoom,0;bounceend,0.35;zoom,0.8
 IconChoiceHardOffCommand=linear,0.1175;zoomx,0
 #
-IconChoiceExtendedX=SCREEN_CENTER_X-80
+IconChoiceExtendedX=SCREEN_CENTER_X-160
 IconChoiceExtendedY=SCREEN_CENTER_Y+48
 IconChoiceExtendedOnCommand=zoom,0;bounceend,0.35;zoom,0.8
 IconChoiceExtendedOffCommand=linear,0.1175;zoomx,0
 #
-IconChoiceOniX=SCREEN_CENTER_X+80
+IconChoiceOniX=SCREEN_CENTER_X
 IconChoiceOniY=SCREEN_CENTER_Y+48
 IconChoiceOniOnCommand=zoom,0;bounceend,0.35;zoom,0.8
 IconChoiceOniOffCommand=linear,0.1175;zoomx,0
+#
+IconChoiceRaveX=SCREEN_CENTER_X+160
+IconChoiceRaveY=SCREEN_CENTER_Y+48
+IconChoiceRaveOnCommand=zoom,0;bounceend,0.35;zoom,0.8
+IconChoiceRaveOffCommand=linear,0.1175;zoomx,0
 [ScreenSelectMusic]
 UsePlayerSelectMenu=false
 # OptionsMenuAvailable=(getenv(sMode) ~= Oni)
@@ -931,7 +960,7 @@ StageDisplayY=SCREEN_TOP+160-96+4
 StageDisplayOnCommand=draworder,105;fov,90;zoom,0.75;zoomy,0;sleep,0.35;smooth,0.35;zoomy,0.75
 StageDisplayOffCommand=linear,0.25;zoomy,0;
 #
-ShowDifficultyDisplay=true
+ShowDifficultyDisplay=not GetUserPrefB("UserPrefAutoSetStyle") and not GAMESTATE:IsCourseMode()
 DifficultyDisplayX=SCREEN_CENTER_X-160+64
 DifficultyDisplayY=SCREEN_TOP+160-96+4
 DifficultyDisplayOnCommand=draworder,105;fov,90;zoom,1;zoomy,0;sleep,0.35;smooth,0.35;zoomy,1
@@ -1150,6 +1179,10 @@ LifeP2Y=SCREEN_TOP+24
 LifeP2OnCommand=finishtweening;zoomx,-1;addy,-48;sleep,1.25;bounceend,0.35;addy,48;
 #~ LifeP2OnCommand=zoomx,-1;addx,SCREEN_CENTER_X;sleep,1.25;decelerate,0.35*0.25;addx,-SCREEN_CENTER_X*1.5;accelerate,0.35*0.25;addx,SCREEN_CENTER_X*0.25;bounceend,0.35*0.25;addx,SCREEN_CENTER_X*0.25
 LifeP2OffCommand=
+CombinedLifeX=SCREEN_CENTER_X
+CombinedLifeY=SCREEN_TOP+24
+CombinedLifeOnCommand=finishtweening;diffuseleftedge,PlayerColor(PLAYER_1);diffuserightedge,PlayerColor(PLAYER_2);addy,-48;sleep,1.25;bounceend,0.35;addy,48;
+CombinedLifeOffCommand=
 #
 ToastyDisplayP1X=(GAMESTATE:GetCurrentStyle():GetStyleType() == 'StyleType_OnePlayerTwoSides' or (PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1)) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX")
 ToastyDisplayP1Y=SCREEN_CENTER_Y
@@ -1259,6 +1292,8 @@ PlayerOptionsP2OnCommand=visible,false
 Class="ScreenEvaluation"
 Fallback="ScreenWithMenuElements"
 #
+StageDisplayNumberOffset=0
+#
 NextScreen=Branches.AfterEvaluation()
 PrevScreen=Branches.AfterEvaluation()
 #