Changes made for this pull request (#65)

* Updating Common splash

* Keeping the screen title colortype the same

This change is made to keep this colortype and ScreenSelectMusic's colortype the
same. I want to make sure the color visibility remains one color and not
having two different colors.

Changing colortype in ScreenSelectProfile overlay

This change also have the same reason as the commit above.

Cleaning ScreenNetSelectMusic song sort to look like offline

This commit focuses on cleaning up comments and removing quads in song
sort because it's not needed anymore. I'm not in the mood of having it
look like purple recolor of Prim's spawnhack, so I decide to change it.

Cleaning up song sort to look like offline

This also have the same reason as the previous explanation.

Comment removed and cleaned up

This commit is made so people don't have to see this mess when they open
up this file.

Themes/Til Death/BGAnimations/ScreenNetRoom overlay/currentsort.lua

@@ -33,30 +33,6 @@ local sortTable = {
 	SortOrder_Recent 				= 'Recently Played'
 };
 
--- t[#t+1] = Def.Quad{
-	-- Name="CurrentSort";
-	-- InitCommand=cmd(xy,frameX,frameY;halign,1;zoomto,frameWidth,frameHeight;diffuse,getMainColor(1););
--- };
-
--- t[#t+1] = LoadFont("Common Normal") .. {
-	-- InitCommand=cmd(xy,frameX-frameWidth+5,frameY;halign,0;zoom,0.45;maxwidth,(frameWidth-40)/0.45);
-	-- BeginCommand=cmd(queuecommand,"Set");
-	-- SetCommand=function(self)
-		-- local sort = GAMESTATE:GetSortOrder()
-		-- local song = GAMESTATE:GetCurrentSong()
-		-- if sort == nil then
-			-- self:settext("Sort: ")
-		-- elseif sort == "SortOrder_Group" and song ~= nil then
-			-- self:settext(song:GetGroupName())
-		-- else
-			-- self:settext("Sort: "..sortTable[sort])
-		-- end
-
-	-- end;
-	-- SortOrderChangedMessageCommand=cmd(queuecommand,"Set");
-	-- CurrentSongChangedMessageCommand=cmd(queuecommand,"Set");
--- };
-
 t[#t+1] = LoadFont("Common Normal") .. {
 	InitCommand=cmd(xy,frameX-5,frameY;halign,1;zoom,0.3;maxwidth,40/0.45);
 	BeginCommand=cmd(queuecommand,"Set");
@@ -71,21 +47,4 @@ t[#t+1] = LoadFont("Common Normal") .. {
 	CurrentSongChangedMessageCommand=cmd(queuecommand,"Set");
 };
 
---t[#t+1] = StandardDecorationFromFileOptional("BPMDisplay","BPMDisplay");
---t[#t+1] = StandardDecorationFromFileOptional("BPMLabel","BPMLabel");
-
---just a simple mouse rollover test.
---[[ 
-local function Update(self)
-	t.InitCommand=cmd(SetUpdateFunction,Update);
-	if isOver(self:GetChild("CurrentSort")) then
-    	self:GetChild("CurrentSort"):diffusealpha(0.5)
-    else
-    	self:GetChild("CurrentSort"):diffusealpha(1)
-    end;
-end; 
-
-t.InitCommand=cmd(SetUpdateFunction,Update);
---]]
-
-return t
+return t

Themes/Til Death/BGAnimations/ScreenNetRoom overlay/default.lua

@@ -33,7 +33,7 @@ t[#t+1] = LoadActor("../_frame");
 t[#t+1] = LoadActor("../_PlayerInfo")
 t[#t+1] = LoadActor("currentsort");
 t[#t+1] = LoadFont("Common Large")..{
-	InitCommand=cmd(xy,5,32;halign,0;valign,1;zoom,0.55;diffuse,getMainColor('highlight');settext,"Lobby";);
+	InitCommand=cmd(xy,5,32;halign,0;valign,1;zoom,0.55;diffuse,getMainColor('positive');settext,"Lobby";);
 }
 t[#t+1] = LoadActor("../_cursor");
 t[#t+1] = LoadActor("../_mouseselect")

Themes/Til Death/BGAnimations/ScreenNetSelectBase overlay/default.lua

@@ -41,7 +41,6 @@ t[#t+1] = LoadFont("Common Large")..{InitCommand=cmd(xy,5,32;halign,0;valign,1;z
 t[#t+1] = LoadActor("../_cursor")
 t[#t+1] = LoadActor("../_mouseselect")
 t[#t+1] = LoadActor("../_halppls")
---t[#t+1] = LoadActor("wifesearchbar")
 t[#t+1] = LoadActor("../_userlist")
 
 return t

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

@@ -1,12 +1,6 @@
 local t = Def.ActorFrame{}
 
 t[#t+1] = LoadActor("../_chatbox")
--- adding this function for average nps. This is to check the relative difficulty of song's nps. -Misterkister
---t[#t+1] = LoadActor("yolo")
--- adding other stuff
---t[#t+1] = LoadActor("kappa")
---t[#t+1] = LoadActor("msd stuff")
---t[#t+1] = LoadActor("matra")
 t[#t+1] = LoadActor("../ScreenSelectMusic decorations/profile")
 t[#t+1] = LoadActor("../ScreenSelectMusic decorations/msd")
 t[#t+1] = LoadActor("../ScreenSelectMusic decorations/songsearch")
@@ -82,23 +76,6 @@ g[#g+1] = LoadFont("Common Normal") .. {
 g[#g+1] = LoadActor("wifeonline")
 g[#g+1] = LoadActor("onlinebpm")
 g[#g+1] = LoadActor("radaronline")
--- t[#t+1] = LoadFont("Common Normal") .. {
-	-- Name="songLength";
-	-- InitCommand=cmd(xy,5+(capWideScale(get43size(384),384)),60+capWideScale(get43size(120),120)-capWideScale(get43size(10),10);visible,true;halign,1;zoom,capWideScale(get43size(0.45),0.45);maxwidth,capWideScale(get43size(360),360)/capWideScale(get43size(0.45),0.45));
-	-- BeginCommand=cmd(queuecommand,"Set");
-	-- SetCommand=function(self)
-		-- local song = GAMESTATE:GetCurrentSong()
-		-- local seconds = 0
-		-- if song ~= nil then
-			-- seconds = song:GetStepsSeconds() --song:MusicLengthSeconds()
-			-- self:settext(SecondsToMMSS(seconds))
-			-- --self:diffuse(getSongLengthColor(seconds))--Function no longer in color_config
-		-- else
-			-- self:settext("")
-		-- end
-	-- end;
-	-- CurrentSongChangedMessageCommand=cmd(queuecommand,"Set");
--- };
 
 g[#g+1] = Def.ActorFrame {
 	InitCommand=cmd(xy,capWideScale(get43size(384),384)+26,70,halign,0;valign,0;zoom,math.min(1,SCREEN_WIDTH/854));
@@ -115,11 +92,9 @@ g[#g+1] = Def.ActorFrame {
 	CurrentSongChangedMessageCommand=function(self)
 		local song = GAMESTATE:GetCurrentSong(); 
 		if song then
--- 			self:setaux(0);
 			self:finishtweening();
 			self:playcommand("TweenOn");
 		elseif not song and self:GetZoomX() == 1 then
--- 			self:setaux(1);
 			self:finishtweening();
 			self:playcommand("TweenOff");
 		end;

Themes/Til Death/BGAnimations/ScreenSelectProfile overlay.lua

@@ -7,10 +7,6 @@ function GetLocalProfiles()
 		local profileID = PROFILEMAN:GetLocalProfileIDFromIndex(p)
 		local profile=PROFILEMAN:GetLocalProfileFromIndex(p);
 		local ProfileCard = Def.ActorFrame {
---[[ 			Def.Quad {
-				InitCommand=cmd(zoomto,200,1;y,40/2);
-				OnCommand=cmd(diffuse,Color('Outline'););
-			}; --]]
 			LoadFont("Common Large") .. {
 				Text=profile:GetDisplayName();
 				InitCommand=cmd(xy,34/2,-10;zoom,0.4;ztest,true,maxwidth,(200-34-4)/0.4);
@@ -44,11 +40,6 @@ end;
 
 function LoadCard(cColor)
 	local t = Def.ActorFrame {
-		--LoadActor( THEME:GetPathG("ScreenSelectProfile","CardBackground") ) .. {
-		--	InitCommand=cmd(diffuse,cColor);
-		--};
-		--LoadActor( THEME:GetPathG("ScreenSelectProfile","CardFrame") );
-
 		Def.Quad {
 			InitCommand=cmd(zoomto,200+4,230+4);
 			OnCommand=cmd(diffuse,color("1,1,1,1"));
@@ -65,20 +56,9 @@ function LoadPlayerStuff(Player)
 
 	local pn = (Player == PLAYER_1) and 1;
 
---[[ 	local t = LoadActor(THEME:GetPathB('', '_frame 3x3'), 'metal', 200, 230) .. {
-		Name = 'BigFrame';
-	}; --]]
 	t[#t+1] = Def.ActorFrame {
 		Name = 'JoinFrame';
 		LoadCard(Color('Purple'));
---[[ 		Def.Quad {
-			InitCommand=cmd(zoomto,200+4,230+4);
-			OnCommand=cmd(shadowlength,1;diffuse,color("0,0,0,0.5"));
-		};
-		Def.Quad {
-			InitCommand=cmd(zoomto,200,230);
-			OnCommand=cmd(diffuse,Color('Orange');diffusealpha,0.5);
-		}; --]]
 		LoadFont("Common Normal") .. {
 			Text="Press &START; to join.";
 			InitCommand=cmd(shadowlength,1);
@@ -102,15 +82,11 @@ function LoadPlayerStuff(Player)
 	t[#t+1] = Def.ActorScroller{
 		Name = 'Scroller';
 		NumItemsToDraw=6;
--- 		InitCommand=cmd(y,-230/2+20;);
 		OnCommand=cmd(y,1;SetFastCatchup,true;SetMask,200,58;SetSecondsPerItem,0.15);
 		TransformFunction=function(self, offset, itemIndex, numItems)
 			local focus = scale(math.abs(offset),0,2,1,0);
 			self:visible(false);
 			self:y(math.floor( offset*40 ));
--- 			self:zoomy( focus );
--- 			self:z(-math.abs(offset));
--- 			self:zoom(focus);
 		end;
 		children = GetLocalProfiles();
 	};
@@ -120,7 +96,6 @@ function LoadPlayerStuff(Player)
 	};
 	t[#t+1] = LoadFont("Common Normal") .. {
 		Name = 'SelectedProfileText';
-		--InitCommand=cmd(y,160;shadowlength,1;diffuse,PlayerColor(Player));
 		InitCommand=cmd(y,160;shadowlength,1;);
 	};
 
@@ -239,7 +214,6 @@ t[#t+1] = Def.ActorFrame{
 
 	UpdateInternal2Command=function(self)
 		UpdateInternal3(self, PLAYER_1);
-		-- UpdateInternal3(self, PLAYER_2);
 	end;
 
 	children = {
@@ -255,18 +229,6 @@ t[#t+1] = Def.ActorFrame{
 			end;
 			children = LoadPlayerStuff(PLAYER_1);
 		};
-		-- Def.ActorFrame {
-			-- Name = 'P2Frame';
-			-- InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y);
-			-- OnCommand=cmd(zoom,0;bounceend,0.35;zoom,1);
-			-- OffCommand=cmd(bouncebegin,0.35;zoom,0);
-			-- PlayerJoinedMessageCommand=function(self,param)
-				-- if param.Player == PLAYER_2 then
-					-- (cmd(zoom,1.15;bounceend,0.175;zoom,1.0;))(self);
-				-- end;
-			-- end;
-			-- children = LoadPlayerStuff(PLAYER_2);
-		-- };
 		-- sounds
 		LoadActor( THEME:GetPathS("Common","start") )..{
 			StartButtonMessageCommand=cmd(play);
@@ -281,7 +243,7 @@ t[#t+1] = Def.ActorFrame{
 };
 t[#t+1] = LoadActor("_frame");
 t[#t+1] = LoadFont("Common Large")..{
-	InitCommand=cmd(xy,5,32;halign,0;valign,1;zoom,0.55;diffuse,getMainColor('highlight');settext,"Select Profile:";);
+	InitCommand=cmd(xy,5,32;halign,0;valign,1;zoom,0.55;diffuse,getMainColor('positive');settext,"Select Profile:";);
 }
 
 return t;