Revert "Themekit handled."

This reverts commit 9982e3369e.

Themes/themekit/BGAnimations/ScreenSelectMusic decorations.lua

@@ -10,9 +10,7 @@ local function CreateStepDisplay(pn)
 	end
 
 	local t = Def.StepsDisplay {
-		InitCommand=function(self)
+		InitCommand=cmd(Load,"StepsDisplay",GAMESTATE:GetPlayerState(pn););
-			self:Load("StepsDisplay", GAMESTATE:GetPlayerState(pn));
-		end;
 	};
 
 	if pn == PLAYER_1 then
@@ -29,24 +27,17 @@ end
 for pn in ivalues(PlayerNumber) do
 	local MetricsName = "StepsDisplay" .. PlayerNumberToString(pn);
 	t[#t+1] = CreateStepDisplay(pn) .. {
-		InitCommand=function(self)
+		InitCommand=function(self) self:player(pn); self:name(MetricsName); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end;
-			self:player(pn);
-			self:name(MetricsName);
-			ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen");
-		end;
 		PlayerJoinedMessageCommand=function(self, params)
 			if params.Player == pn then
 				self:visible(true);
-				self:zoom(0);
+				(cmd(zoom,0;bounceend,0.3;zoom,1))(self);
-				self:bounceend(0.3);
-				self:zoom(1);
 			end;
 		end;
 		PlayerUnjoinedMessageCommand=function(self, params)
 			if params.Player == pn then
 				self:visible(true);
-				self:bouncebegin(0.3);
+				(cmd(bouncebegin,0.3;zoom,0))(self);
-				self:zoom(0);
 			end;
 		end;
 	};

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

@@ -1,75 +1,61 @@
 local t = Def.ActorFrame {};
 --
-t[#t+1] = Def.ActorFrame {
+--[[ local tGridSizeMajor = { 32, 32 };
-	InitCommand=function(self)
+local tGridSizeMinor = { 16, 16 };
-		self:x(SCREEN_CENTER_X);
+local function CreateDebugGrid()
-		self:y(SCREEN_CENTER_Y);
+	local t = Def.ActorFrame {};
+	local numX = math.ceil(SCREEN_WIDTH/tGridSizeMajor[1])
+	local numY = math.ceil(SCREEN_HEIGHT/tGridSizeMajor[2])
+	local offset = ( math.ceil(SCREEN_WIDTH/tGridSizeMajor[1]) - SCREEN_WIDTH ) + SCREEN_WIDTH;
+	for a=1,numY do
+		for b=1,numX do 
+			t[#t+1] = Def.Quad {
+				InitCommand=cmd(x,b*tGridSizeMajor[1]-(tGridSizeMajor[1]/2);y,a*tGridSizeMajor[2]-(tGridSizeMajor[2]/2));
+				OnCommand=cmd(zoomto,tGridSizeMajor[1]-2,tGridSizeMajor[2]-2;diffuse,color("1,1,1,0.25"));
+			};
+		end;
 	end;
+	return t
+end --]]
+
+--
+t[#t+1] = Def.ActorFrame {
+	InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
 	LoadActor("VOL1-29-NTSC") .. {
-		InitCommand=function(self)
+		InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT);
-			self:scaletoclipped(SCREEN_WIDTH, SCREEN_HEIGHT);
+		OnCommand=cmd(diffusealpha,0.75);
-		end;
-		OnCommand=function(self)
-			self:diffusealpha(0.75);
-		end;
 	};
 };
 --
 local bShow = 0;
 t[#t+1] = Def.ActorFrame {
-	InitCommand=function(self)
+	InitCommand=cmd(visible,false);
-		self:visible(false);
-	end;
 	ToggleConsoleDisplayMessageCommand=function(self)
 		bShow = 1 - bShow;
 		self:visible( bShow == 1 );
 	end;
 	-- Grid
 	LoadActor("_32") .. {
-		InitCommand=function(self)
+		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/32,SCREEN_HEIGHT/32);
-			self:x(SCREEN_CENTER_X);
+		OnCommand=cmd(diffuse,color("0,0,0,0.5"));
-			self:y(SCREEN_CENTER_Y);
-			self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT);
-			self:customtexturerect(0, 0, SCREEN_WIDTH / 32, SCREEN_HEIGHT / 32);
-		end;
-		OnCommand=function(self)
-			self:diffuse(color("0,0,0,0.5"));
-		end;
 	};
 	LoadActor("_16") .. {
-		InitCommand=function(self)
+		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/16,SCREEN_HEIGHT/16);
-			self:x(SCREEN_CENTER_X);
+		OnCommand=cmd(diffuse,color("1,1,1,0.125"));
-			self:y(SCREEN_CENTER_Y);
-			self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT);
-			self:customtexturerect(0, 0, SCREEN_WIDTH / 16, SCREEN_HEIGHT / 16);
-		end;
-		OnCommand=function(self)
-			self:diffuse(color("1,1,1,0.125"));
-		end;
 	};
+--[[ 	LoadActor("_8") .. {
+		InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/8,SCREEN_HEIGHT/8);
+		OnCommand=cmd(diffuse,color("#00BFE833"));
+	}; --]]
 	-- Left
 	Def.Quad {
-		InitCommand=function(self)
+		InitCommand=cmd(horizalign,left;x,SCREEN_LEFT;y,SCREEN_CENTER_Y;zoomto,16,SCREEN_HEIGHT);
-			self:horizalign(left);
+		OnCommand=cmd(diffuse,color("0,0,0,0.5"));
-			self:x(SCREEN_LEFT);
-			self:y(SCREEN_CENTER_Y)
-			self:zoomto(16, SCREEN_HEIGHT);
-		end;
-		OnCommand=function(self)
-			self:diffuse(color("0,0,0,0.5"));
-		end;
 	};
 	-- Right
 	Def.Quad {
-		InitCommand=function(self)
+		InitCommand=cmd(horizalign,right;x,SCREEN_RIGHT;y,SCREEN_CENTER_Y;zoomto,16,SCREEN_HEIGHT);
-			self:horizalign(right);
+		OnCommand=cmd(diffuse,color("0,0,0,0.5"));
-			self:x(SCREEN_RIGHT);
-			self:y(SCREEN_CENTER_Y)
-			self:zoomto(16, SCREEN_HEIGHT);
-		end;
-		OnCommand=function(self)
-			self:diffuse(color("0,0,0,0.5"));
-		end;
 	};
 };
 --

Themes/themekit/BGAnimations/ScreenWithMenuElements decorations.lua

@@ -6,9 +6,7 @@ local t = Def.ActorFrame {};
 t[#t+1] = StandardDecorationFromFileOptional("Header","Header");
 -- Text displayed at the top of the screen
 t[#t+1] = StandardDecorationFromFileOptional("TextHeader","TextHeader") .. {
-	BeginCommand=function(self)
+	BeginCommand=cmd(playcommand,"Set");
-		self:playcommand("Set");
-	end;
 	SetCommand=function(self)
 		local sText = '_';
 		if SCREENMAN:GetTopScreen() then

Themes/themekit/BGAnimations/ScreenWithMenuElements underlay/default.lua

@@ -1,27 +1,14 @@
 local t = Def.ActorFrame {
-	InitCommand=function(self)
+	InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
-		self:x(SCREEN_CENTER_X);
-		self:y(SCREEN_CENTER_Y);
-	end;
 };
 --
 t[#t+1] = LoadActor("grid") .. {
-	InitCommand=function(self)
+	InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/16,SCREEN_HEIGHT/16);
-		self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT);
+	OnCommand=cmd(diffuse,color("0,0,0,0.125"));
-		self:customtexturerect(0, 0, SCREEN_WIDTH / 16, SCREEN_HEIGHT / 16);
-	end;
-	OnCommand=function(self)
-		self:diffuse(color("0,0,0,0.125"));
-	end;
 };
 t[#t+1] = LoadActor("grid") .. {
-	InitCommand=function(self)
+	InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/32,SCREEN_HEIGHT/32);
-		self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT);
+	OnCommand=cmd(diffuse,color("0,0,0,0.25"));
-		self:customtexturerect(0, 0, SCREEN_WIDTH / 32, SCREEN_HEIGHT / 32);
-	end;
-	OnCommand=function(self)
-		self:diffuse(color("0,0,0,0.25"));
-	end;
 };
 --
 return t

Themes/themekit/Scripts/02 TextBanner.lua

@@ -7,24 +7,13 @@ function TextBannerAfterSet(self,param)
 	local Subtitle=self:GetChild("Subtitle"); 
 	local Artist=self:GetChild("Artist"); 
 	if Subtitle:GetText() == "" then 
-		Title:maxwidth(mainMaxWidth);
+		(cmd(maxwidth,mainMaxWidth;y,-8;zoom,1;))(Title);
-		Title:y(-8);
+		(cmd(visible,false))(Subtitle);
-		Title:zoom(1);
+		(cmd(zoom,0.66;maxwidth,artistMaxWidth;y,8))(Artist);
-		Subtitle:visible(false);
-		Artist:zoom(0.66);
-		Artist:maxwidth(artistMaxWidth);
-		Artist:y(8);
 	else
 		-- subtitle below
-		Title:maxwidth(mainMaxWidth * 1.25);
+		(cmd(maxwidth,mainMaxWidth*1.25;y,-11;zoom,0.75;))(Title);
-		Title:y(-11);
+		(cmd(visible,true;zoom,0.6;y,0;maxwidth,subMaxWidth))(Subtitle); 
-		Title:zoom(0.75);
+		(cmd(zoom,0.6;maxwidth,artistMaxWidth;y,10))(Artist); 
-		Subtitle:visible(true);
-		Subtitle:zoom(0.6);
-		Subtitle:y(0);
-		Subtitle:maxwidth(subMaxWidth);
-		Artist:zoom(0.6);
-		Artist:maxwidth(artistMaxWidth);
-		Artist:y(10);
 	end
 end