theme changes (incomplete)

Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua

@@ -10,7 +10,7 @@ t[#t+1] = Def.ActorFrame {
 	Def.ActorFrame {
 		InitCommand=cmd(hide_if,hideFancyElements;);
 		LoadActor("_checkerboard") .. {
-			InitCommand=cmd(rotationy,0;rotationz,0;rotationx,-90/4*3;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256);
+			InitCommand=cmd(rotationy,0;rotationz,0;rotationx,-90/4*3.5;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256);
 			OnCommand=cmd(texcoordvelocity,0,0.5;diffuse,color("#ffd400");diffusealpha,0.5;fadetop,1);
 		};
 	};
@@ -22,11 +22,7 @@ t[#t+1] = Def.ActorFrame {
 	}; --]]
 
 	Def.Quad {
-		InitCommand=cmd(vertalign,top;scaletoclipped,SCREEN_WIDTH+1,80;y,-SCREEN_CENTER_Y+20;fadebottom,0.75);
+		InitCommand=cmd(vertalign,bottom;scaletoclipped,SCREEN_WIDTH+1,96;y,SCREEN_CENTER_Y-32;fadetop,0.75);
-		OnCommand=cmd(diffuse,color("#FFCB05"));
-	};
-	Def.Quad {
-		InitCommand=cmd(vertalign,bottom;scaletoclipped,SCREEN_WIDTH+1,80;y,SCREEN_CENTER_Y-20;fadetop,0.75);
 		OnCommand=cmd(diffuse,color("#FFCB05"));
 	};
 --[[ 	LoadActor("_pattern") .. {
@@ -39,9 +35,6 @@ t[#t+1] = Def.ActorFrame {
 		effectcolor2,Color("White");effectcolor1,Color("Black");fadebottom,0.25;fadetop,0.25;croptop,48/480;cropbottom,48/480;blend,Blend.Add;
 		diffusealpha,0.155);
 	}; --]]		
-	LoadActor("_bg top") .. {
-		InitCommand=cmd(scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT);
-	};
 };
 
 return t;

Themes/default/Graphics/LifeMeterBattery lives/default.lua

@@ -2,15 +2,55 @@ local player = Var "Player"
 local blinkTime = 1.2
 local barWidth = 256;
 local barHeight = 32;
+local c
 
-local t = Def.ActorFrame{
+local function CreateLives(numLives)
-	Def.Quad{
+	local t = {};
-		InitCommand=cmd(diffuse,color("#666666");zoomto,barWidth,barHeight);
+	for i=1,numLives do
+		t[#t+1] = Def.Quad {
+			Name=i;
+			OnCommand=cmd(zoom,1024);
+		};
+	end
+	return t
+end
+
+local t = Def.ActorFrame {
+	Def.ActorFrame {
+		Name="LifeContainer";
 	};
-	Def.Quad{
+	InitCommand=function(self)
-		InitCommand=cmd(diffuse,color("#000000");zoomto,barWidth,barHeight;fadetop,1);
+		c = self:GetChildren();
-	};
+	end;
-	LoadActor("_lives")..{
+
+	BeginCommand=function(self,param)
+		MESSAGEMAN:Broadcast("SystemMessage",{ Message = "TEST", NoAnimate = true});
+		local c = self:GetChildren();
+		local screen = SCREENMAN:GetTopScreen();
+		local lifemeter = screen:GetLifeMeter(player);
+		MESSAGEMAN:Broadcast("SystemMessage",{ Message = "TEST2", NoAnimate = true});
+		local TotalLives = lifemeter:GetTotalLives();	
+		local CurLives = lifemeter:GetLivesLeft();
+		MESSAGEMAN:Broadcast("SystemMessage",{ Message = "ASSIGN CONTAINERS", NoAnimate = true});
+		c.LifeContainer[#c.LifeContainer+1] = CreateLives(TotalLives);
+		MESSAGEMAN:Broadcast("SystemMessage",{ Message = "LIVES = " .. TotalLives .. " | CUR = " .. CurLives .. " | ACTORS: " .. self:GetNumChildren(), NoAnimate = true});
+	end;
+	LifeChangedMessageCommand=function(self,param)
+		if param.Player == player then
+			return
+		end
+	end;
+	StartCommand=function(self,param)
+		if param.Player == player then
+			return
+		end
+	end;
+	FinishCommand=function(self,param)
+		if param.Player == player then
+			return 
+		end
+	end;
+	--[[ LoadActor("_lives")..{
 		InitCommand=cmd(pause;horizalign,left;x,-(barWidth/2));
 		BeginCommand=function(self,param)
 			local screen = SCREENMAN:GetTopScreen();
@@ -40,7 +80,7 @@ local t = Def.ActorFrame{
 			end			
 		end;
 		FinishCommand=cmd(playcommand,"Start");
-	};
+	}; ]]
 	
 };
 

Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua

@@ -3,20 +3,25 @@ local colors = {
 	Easy		= color("#00ff00"),
 	Normal		= color("#feee00"),
 	Hard		= color("#feee00"),
-	Rave		= color("#c44dff"),
+	Rave		= color("#db93ff"),
 	Nonstop		= color("#00ffff"),
 	Oni			= color("#d70b8c"),
-	Endless		= color("748392"),
+	Endless		= color("#b4c3d2"),
 };
 local t = Def.ActorFrame {};
 -- Background!
 t[#t+1] = Def.ActorFrame {
 -- 	GainFocusCommand=cmd(visible,true);
 -- 	LoseFocusCommand=cmd(visible,false);
+	LoadActor(THEME:GetPathG("ScreenSelectPlayMode","BackgroundFrame")) .. {
+		InitCommand=cmd(diffuse,Color("Black");diffusealpha,0.7);
+		GainFocusCommand=cmd(visible,true);
+		LoseFocusCommand=cmd(visible,false);
+	};
  	LoadActor("_HighlightFrame") .. {
 		InitCommand=cmd(diffuse,ModeIconColors[gc:GetName()];diffusealpha,0);
-		GainFocusCommand=cmd(stoptweening;linear,0.125;diffusealpha,1);
+		GainFocusCommand=cmd(finishtweening;diffusealpha,1;glow,Color.Alpha(Color.White,1);linear,0.25;glow,Color.Invisible);
-		LoseFocusCommand=cmd(stoptweening;linear,0.125;diffusealpha,0);
+		LoseFocusCommand=cmd(finishtweening;diffusealpha,0;glow,Color.Invisible);
 		OffFocusedCommand=cmd(finishtweening;glow,Color("White");decelerate,1;glow,Color("Invisible"));
 	};
 };
@@ -60,6 +65,6 @@ t[#t+1] = Def.ActorFrame {
 		LoseFocusCommand=cmd(stoptweening;x,320;accelerate,0.25;diffusealpha,0;x,320+16;diffusealpha,0);
 	};
 };
--- t.GainFocusCommand=cmd(visible,true);
+t.GainFocusCommand=cmd(finishtweening;visible,true;zoom,1.1;bounceend,0.25;zoom,1);
--- t.LoseFocusCommand=cmd(visible,false);
+t.LoseFocusCommand=cmd(finishtweening;visible,false;zoom,1);
 return t

Themes/default/Graphics/ScreenWithMenuElements Footer.lua

@@ -0,0 +1,7 @@
+local t = Def.ActorFrame {};
+
+t[#t+1] = Def.Quad {
+	InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH+1,32;diffuse,Color.Black);
+};
+
+return t;

Themes/default/Graphics/ScreenWithMenuElements header/default.lua

@@ -3,9 +3,9 @@ local t = Def.ActorFrame {};
 t[#t+1] = Def.Quad {
 	InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH+1,48;diffuse,Color.Black);
 }
-t[#t+1] = LoadActor("Header") .. {
+--[[ t[#t+1] = LoadActor("Header") .. {
 	InitCommand=cmd(vertalign,top;zoomtowidth,SCREEN_WIDTH+1;diffuse,color("#ffd400"));
-};
+}; ]]
 --[[ t[#t+1] = LoadActor("_texture stripe") .. {
 	InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH+64,44;customtexturerect,0,0,SCREEN_WIDTH+64/8,44/32);
 	OnCommand=cmd(fadebottom,0.8;texcoordvelocity,1,0;skewx,-0.0025;diffuse,Color("Black");diffusealpha,0.235);

Themes/default/Scripts/02 Colors.lua

@@ -1,7 +1,7 @@
 ModeIconColors = {
 	Normal		= color("#FFEE00"), -- yellow
-	Rave		= color("#4400CC"), -- purple
+	Rave		= color("#db93ff"), -- violet
-	Nonstop		= color("#00CCFF"), -- cyan
+	Nonstop		= color("#5ca9ff"), -- blue
-	Oni			= color("#CC00FF"), -- redder purple
+	Oni			= color("#00f1e2"), -- cyan
-	Endless		= color("#444488"), -- steel
+	Endless		= color("#b4c3d2"), -- steel
 }

Themes/default/metrics.ini

@@ -574,7 +574,7 @@ HeaderOffCommand=
 ShowFooter=true
 FooterX=SCREEN_CENTER_X
 FooterY=SCREEN_BOTTOM
-FooterOnCommand=draworder,5;vertalign,bottom;zoomtowidth,SCREEN_WIDTH+1;diffuse,color("#ffd400");
+FooterOnCommand=draworder,5;vertalign,bottom;zoomtowidth,SCREEN_WIDTH+1;
 FooterOffCommand=
 
 ShowHelp=true
@@ -817,7 +817,7 @@ ScrollerY=SCREEN_CENTER_Y-60
 ScrollerOnCommand=SetFastCatchup,true;
 ScrollerOffCommand=decelerate,0.8;y,SCREEN_CENTER_Y;sleep,1.5;linear,0.1;zoomy,0
 #
-ShowBackgroundFrame=true
+ShowBackgroundFrame=false
 BackgroundFrameX=SCREEN_CENTER_X
 BackgroundFrameY=SCREEN_CENTER_Y-60
 BackgroundFrameOnCommand=diffuse,Color("Black");diffusealpha,0.7
@@ -1408,7 +1408,7 @@ SongMeterDisplayOffCommand=
 ShowSongTitle=not GAMESTATE:IsDemonstration();
 SongTitleX=SCREEN_CENTER_X
 SongTitleY=SCREEN_TOP+54
-SongTitleOnCommand=draworder,55;strokecolor,Color.Outline;shadowlength,1;basezoom,0.675;zoomy,0;sleep,1;smooth,0.5;zoom,1;
+SongTitleOnCommand=draworder,55;strokecolor,Color.Outline;shadowlength,1;basezoom,0.55;zoomy,0;sleep,1;smooth,0.5;zoom,1;
 SongTitleOffCommand=
 #
 SongMeterDisplayP1X=Center1Player() and SCREEN_CENTER_X or SCREEN_LEFT+16