From 25af580e929e1e3538b769d6d4f1b6bbbf2299ca Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 10 Jun 2010 21:40:34 -0500
Subject: [PATCH] more theme changes from midi

---
 .../ScreenConsoleOverlay overlay.lua          |  15 +++++++
 .../Fonts/ScreenConsoleOverlay Credits.redir  |   1 +
 .../ScreenConsoleOverlay SystemMessage.redir  |   1 +
 ...DisplayRave stream level1 (res 256x20).png | Bin 0 -> 577 bytes
 ...DisplayRave stream level2 (res 256x20).png | Bin 0 -> 672 bytes
 ...DisplayRave stream level3 (res 256x20).png | Bin 0 -> 488 bytes
 .../ScreenWithMenuElements StageDisplay.lua   |  11 +++--
 Themes/default/metrics.ini                    |  41 ++++++++++++++++--
 8 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 Themes/_fallback/BGAnimations/ScreenConsoleOverlay overlay.lua
 create mode 100644 Themes/_fallback/Fonts/ScreenConsoleOverlay Credits.redir
 create mode 100644 Themes/_fallback/Fonts/ScreenConsoleOverlay SystemMessage.redir
 create mode 100644 Themes/default/Graphics/ScoreDisplayRave stream level1 (res 256x20).png
 create mode 100644 Themes/default/Graphics/ScoreDisplayRave stream level2 (res 256x20).png
 create mode 100644 Themes/default/Graphics/ScoreDisplayRave stream level3 (res 256x20).png

diff --git a/Themes/_fallback/BGAnimations/ScreenConsoleOverlay overlay.lua b/Themes/_fallback/BGAnimations/ScreenConsoleOverlay overlay.lua
new file mode 100644
index 0000000000..b6a62c9868
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/Themes/_fallback/Fonts/ScreenConsoleOverlay Credits.redir b/Themes/_fallback/Fonts/ScreenConsoleOverlay Credits.redir
new file mode 100644
index 0000000000..5c6053f7f1
--- /dev/null
+++ b/Themes/_fallback/Fonts/ScreenConsoleOverlay Credits.redir	
@@ -0,0 +1 @@
+Common Normal
\ No newline at end of file
diff --git a/Themes/_fallback/Fonts/ScreenConsoleOverlay SystemMessage.redir b/Themes/_fallback/Fonts/ScreenConsoleOverlay SystemMessage.redir
new file mode 100644
index 0000000000..5c6053f7f1
--- /dev/null
+++ b/Themes/_fallback/Fonts/ScreenConsoleOverlay SystemMessage.redir	
@@ -0,0 +1 @@
+Common Normal
\ No newline at end of file
diff --git a/Themes/default/Graphics/ScoreDisplayRave stream level1 (res 256x20).png b/Themes/default/Graphics/ScoreDisplayRave stream level1 (res 256x20).png
new file mode 100644
index 0000000000000000000000000000000000000000..d29741c9ec1f777257699c5de145b700dd007140
GIT binary patch
literal 577
zcmV-H0>1r;P)<h;3K|Lk000e1NJLTq008Cy000yS0{{R3uI{m$00039P)t-s|EDwm
zsWbhUG5)18_;4-zi7@@0GX0q``;0LCn=$!$F8-o2_h&5pkTCzKGyb45{hTuTfG_-%
zG5LHh{+}}bp)&e|FaD!4{-iShsx$IHDEfsj^i?YLT`Tu$Eb~Vx_iHTnW-RbCC-`$M
z_h~HoelGfdFZXOL`F1Y%Z7ud>EckCN{g*NNhA;6tC;Nvl`-m^|PAU6}F#C%z_G2vj
zjWG6QEc}iz{EsmEhA;e)F#M7*{E{*JlQH*fE&P=+_iioymNEHyF8FaR_;M}%nlbov
zE%<dU_;oJ*o-+A&F8O#a`;IXFrZf3_F863G`F$?_r8D}3FaM@9`hhR{f-n4*G4C!W
z_7##s0002=Nkl<ZcwX(#Ly`mm6adk(Z8mM&wlVj=$<#sqCL?nBkiS&Ti#LO?Q|cuJ
z;hu>l^0VTiOc3i$dbd9mPG^o=-E{qt&8h0=YgsS9I;=NHvejmo?xjBv#nE^&)wKC<
zS-~)x-m<KsP}I>dWZ5)%-nJbF$Dh|Xf*_KFqNwY-Q6(w*_w|Y6j$_+AZ<?}f7)Ody
z6qeo6G=^1{zqzJOC*zSQ4*Hia!?ar@*{Bbz{>!qyA63m|AG&^9aoqV-IP7=n&6*&}
zi{dPwh-L1AknEK@VbF|wwG=Rc2~1!D6PUmRCNO~sOke^Nn7{-kFeBza1S5cN;NZ;O
P00000NkvXXu0mjfGoBz7

literal 0
HcmV?d00001

diff --git a/Themes/default/Graphics/ScoreDisplayRave stream level2 (res 256x20).png b/Themes/default/Graphics/ScoreDisplayRave stream level2 (res 256x20).png
new file mode 100644
index 0000000000000000000000000000000000000000..dc89c20be9f6fcea7df3aa6cf13fe8cf3d144e1b
GIT binary patch
literal 672
zcmV;R0$=@!P)<h;3K|Lk000e1NJLTq008Cy000yS0{{R3uI{m$00045P)t-sX1zpW
zyGFCvB4oTpWxPeT*db@VL}<Q4X}&{hzCvriLTtZ5ZNEWoz(8=oKykr8a=|}y!9H}t
zK6b)Acf&n+!#sM#JA1@Ce8oC`#X5h+If2GFg2y<6$2Wz@HipPHh{-jH$ux_~G>ytL
zj>|HT%QBJ7F_X+NmCY}f&M%nGE}73Qo6jtr&@7(NE1=OTqS7j)(kZ3WD5ujWsnjN_
z)h4XfC9c*auht{6*CXKP4&vwyw%H)K*&w>wAG_Ngz1tnX+#SH&9Kzij#N8Uj-Wtc>
z8Oh%m%HS8w;1|x}7SG`o(c%@-;uO^56V~Js*W?n}<q_KD5ZvYv-R2M9=MM7i2J`L(
z<LC_J=?v!S3+L(!=;{jU>j~@Y3GC|#?(7Kf><94e2l4F&`S1h!@B;Mi1@-R)_U{Du
z?*sVo1N`v;{qX_&@dEzx0RHg-W4uLTyhi`>0AMMS2mk;90!c(cRCr$P&x2tEQ4j#o
zzk9ZA+qP}n_9guzDP&4`2*a?SFM)^<nL?$}8B7+N!{zY>LXlV^mB|%Km0F|K=?zAc
z*<!WX9Zr|q<MsIi!B997jp3wZDxJyZ@`YllT&dRTjb^Le>Gt}A;V7P%&gP5dYQ5R+
z_J{H0e7WB4$J6Wa{JekPpXcLsI^J*B%Xu<B?04JEdbM24XVXM{G#vDM-A=pJY}9Mj
zO1V@l<a60fI+Y~hv1lY53I_Z>ugC3jI_x&9#cVPf^g69Ztx_uFGO0u?5(@Y{E{Dxx
zGUzlag^Uo908C&46PUmRCNO~sOke^Nn7{-kFo6lof94<jLFN9tUqT810000<MNUMn
GLSTZ+yH*_l

literal 0
HcmV?d00001

diff --git a/Themes/default/Graphics/ScoreDisplayRave stream level3 (res 256x20).png b/Themes/default/Graphics/ScoreDisplayRave stream level3 (res 256x20).png
new file mode 100644
index 0000000000000000000000000000000000000000..68f70a01599e90dd466910a5d27cc78f393455f6
GIT binary patch
literal 488
zcmV<E0T=#>P)<h;3K|Lk000e1NJLTq008Cy000yS0{{R3uI{m$0002MP)t-s{kjwV
zxD)-n68_!?|Ly_(y%PWL0sXlX|M39*yAu7t5&gdr{lgId>I4105&p#w{>Bgg<^=x8
z4*tmw{>lyh&kX*|4gc!`{>}{k)(QXP1^vPh|L_6-?E?PW2>#Rx|K$Y!*a`mG2>;{-
z{@n-u;0FHT2LI>-|Lg+((F_0S1OM^>{lO6Z#1H=03I5Xy{@(`v+6ex{5B}l>|K|k$
z#}5DM0{+Vl{?!Wo!4dw@3;x^({?ZHo@BseP3jWOu`2a;<0002vNkl<ZcwX(#wE+Yn
z6adi$*4^FR&fWX(>L}zV6HN9PgpeQz48us0gfYi)x~?d){8*DjRX0b&FwKi?JC5t#
zeE%1Qp7)%l_wHL1_bA#{Rb3zQ{MELE?7Ob-PjTEdWocRGVVGx4y9U8HW*N(}JkO`;
zM-;_nS!h3LN)P>6HjY7X)wFpYhO=drWz)p*sqedPPe|Lo^88TORke+xdr^FM?`e8^
zUKsv-|K_@mW7`+gG>qd$Rg+|W$g-m7I(1-7Mbt%g2muqAzyu~RfeB1t0uz|P1ST+n
e2~1!DlQRFZAJMR7&lj2i0000<MNUMnLSTY<fBOmm

literal 0
HcmV?d00001

diff --git a/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua b/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua
index 551af1bec3..def4121879 100644
--- a/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua	
+++ b/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) );
-				cStageOutlineColor[4] = 0.75;
+-- 				local cStageOutlineColor = ColorDarkTone( StageToStrokeColor(s) );
+-- 				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) );
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index f98f212434..91c5e41dec 100644
--- a/Themes/default/metrics.ini
+++ b/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()
 #