Skip to content

Commit

Permalink
Merge pull request #14 from Nickito12/master
Browse files Browse the repository at this point in the history 
Fix preview sample fade out, add theme userlist
  • Loading branch information
@MinaciousGrace
MinaciousGrace authored Jan 10, 2017
2 parents 545f29a + 45649ff commit ffe1856
Show file tree
Hide file tree
Showing 19 changed files with 1,452 additions and 961 deletions.
45 changes: 43 additions & 2 deletions Themes/Til Death/BGAnimations/ScreenNetRoom overlay/default.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ return false;
end

local t = Def.ActorFrame{
OnCommand=function(self) SCREENMAN:GetTopScreen():AddInputCallback(input) end;
OnCommand=function(self) SCREENMAN:GetTopScreen():AddInputCallback(input) SCREENMAN:GetTopScreen():UsersVisible(false) end;
}

t[#t+1] = Def.Actor{
Expand All @@ -39,4 +39,45 @@ t[#t+1] = LoadActor("../_cursor");
t[#t+1] = LoadActor("currenttime");
t[#t+1] = LoadActor("../_halppls");

return t

t[#t+1] = LoadFont("Common Normal") .. {
InitCommand=cmd(xy,SCREEN_WIDTH/3,SCREEN_TOP+15;zoom,0.35;diffuse,getMainColor('positive');maxwidth,SCREEN_WIDTH),
BeginCommand=cmd(queuecommand,"Set"),
SetCommand=function(self)
local str = ""
local top = SCREENMAN:GetTopScreen()
if top:GetUserQty() > 5 then
for i=1,5 do
str = str .. " " .. (top:GetUser(i))
end

else
for i=1,top:GetUserQty() do
str = str .. " " .. (top:GetUser(i))
end
end
self:settext(str)
end,
PlayerJoinedMessageCommand=cmd(queuecommand,"Set"),
PlayerUnjoinedMessageCommand=cmd(queuecommand,"Set"),
UsersUpdateMessageCommand=cmd(queuecommand,"Set"),
}
t[#t+1] = LoadFont("Common Normal") .. {
InitCommand=cmd(xy,SCREEN_WIDTH/3,SCREEN_TOP+25;zoom,0.35;diffuse,getMainColor('positive');maxwidth,SCREEN_WIDTH),
BeginCommand=cmd(queuecommand,"Set"),
SetCommand=function(self)
local str = ""
local top = SCREENMAN:GetTopScreen()
if top:GetUserQty() > 5 then
for i=6,top:GetUserQty() do
str = str .. " " .. (top:GetUser(i))
end
end
self:settext(str)
end,
PlayerJoinedMessageCommand=cmd(queuecommand,"Set"),
PlayerUnjoinedMessageCommand=cmd(queuecommand,"Set"),
UsersUpdateMessageCommand=cmd(queuecommand,"Set"),
}

return t
88 changes: 39 additions & 49 deletions Themes/Til Death/BGAnimations/ScreenNetSelectBase overlay/default.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ return false
end

local t = Def.ActorFrame{
OnCommand=function(self) SCREENMAN:GetTopScreen():AddInputCallback(input) end
OnCommand=function(self) SCREENMAN:GetTopScreen():AddInputCallback(input) SCREENMAN:GetTopScreen():UsersVisible(false) end
}

t[#t+1] = Def.Actor{
Expand All @@ -42,54 +42,44 @@ t[#t+1] = LoadActor("../_cursor")
t[#t+1] = LoadActor("../_halppls")
--t[#t+1] = LoadActor("wifesearchbar")

local skillsets = {
Overall = 0,
Speed = 0,
Stam = 0,
Jack = 0,
t[#t+1] = LoadFont("Common Normal") .. {
InitCommand=cmd(xy,SCREEN_WIDTH/3,SCREEN_TOP+15;zoom,0.35;diffuse,getMainColor('positive');maxwidth,SCREEN_WIDTH),
BeginCommand=cmd(queuecommand,"Set"),
SetCommand=function(self)
local str = ""
local top = SCREENMAN:GetTopScreen()
if top:GetUserQty() > 5 then
for i=1,5 do
str = str .. " " .. (top:GetUser(i))
end

else
for i=1,top:GetUserQty() do
str = str .. " " .. (top:GetUser(i))
end
end
self:settext(str)
end,
PlayerJoinedMessageCommand=cmd(queuecommand,"Set"),
PlayerUnjoinedMessageCommand=cmd(queuecommand,"Set"),
UsersUpdateMessageCommand=cmd(queuecommand,"Set"),
}
t[#t+1] = LoadFont("Common Normal") .. {
InitCommand=cmd(xy,SCREEN_WIDTH/3,SCREEN_TOP+25;zoom,0.35;diffuse,getMainColor('positive');maxwidth,SCREEN_WIDTH),
BeginCommand=cmd(queuecommand,"Set"),
SetCommand=function(self)
local str = ""
local top = SCREENMAN:GetTopScreen()
if top:GetUserQty() > 5 then
for i=6,top:GetUserQty() do
str = str .. " " .. (top:GetUser(i))
end
end
self:settext(str)
end,
PlayerJoinedMessageCommand=cmd(queuecommand,"Set"),
PlayerUnjoinedMessageCommand=cmd(queuecommand,"Set"),
UsersUpdateMessageCommand=cmd(queuecommand,"Set"),
}


if GAMESTATE:IsPlayerEnabled(PLAYER_1) then
profile = GetPlayerOrMachineProfile(PLAYER_1)
if profile ~= nil then
skillsets.Overall = profile:GetPlayerRating()
skillsets.Speed = profile:GetPlayerSkillsetRating(2)
skillsets.Stam = profile:GetPlayerSkillsetRating(3)
skillsets.Jack = profile:GetPlayerSkillsetRating(4)
end
end



local function littlebits(i)
local t = Def.ActorFrame{
LoadFont("Common Normal") .. {
InitCommand=cmd(xy,SCREEN_WIDTH/3,SCREEN_HEIGHT-50+i*10;halign,1;zoom,0.35;diffuse,getMainColor('positive')),
BeginCommand=cmd(queuecommand,"Set"),
SetCommand=function(self)
self:settext(ms.SkillSets[i]..":")
end,
PlayerJoinedMessageCommand=cmd(queuecommand,"Set"),
PlayerUnjoinedMessageCommand=cmd(queuecommand,"Set"),
},
LoadFont("Common Normal") .. {
InitCommand=cmd(xy,SCREEN_WIDTH/3+30,SCREEN_HEIGHT-50+i*10;halign,1;zoom,0.35;diffuse,getMainColor('positive')),
BeginCommand=cmd(queuecommand,"Set"),
SetCommand=function(self)
self:settextf("%5.2f",skillsets[ms.SkillSets[i]])
end,
PlayerJoinedMessageCommand=cmd(queuecommand,"Set"),
PlayerUnjoinedMessageCommand=cmd(queuecommand,"Set"),
}
}
return t
end


for i=1,#ms.SkillSets do
t[#t+1] = littlebits(i)
end


return t
44 changes: 33 additions & 11 deletions Themes/Til Death/BGAnimations/ScreenNetSelectMusic decorations/default.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,32 @@ t[#t+1] = LoadActor("../_chatbox")
--t[#t+1] = LoadActor("kappa")
--t[#t+1] = LoadActor("msd stuff")
--t[#t+1] = LoadActor("matra")
t[#t+1] = LoadActor("onlinebpm")
t[#t+1] = LoadActor("wifeonline")
t[#t+1] = LoadActor("radaronline")
t[#t+1] = LoadActor("profile")
t[#t+1] = LoadActor("msd")
t[#t+1] = LoadActor("songsearch")
t[#t+1] = LoadActor("tabs")
t[#t+1] = LoadActor("score")

t[#t+1] = Def.Banner{
local g = Def.ActorFrame{
TabChangedMessageCommand=function(self)
local top= SCREENMAN:GetTopScreen()
if getTabIndex() == 0 then
self:visible(true)
top:ChatboxVisible(true)
top:ChatboxInput(true)
else
self:visible(false)
top:ChatboxVisible(false)
top:ChatboxInput(false)
end
end,
}





g[#g+1] = Def.Banner{
InitCommand=cmd(x,10;y,60;halign,0;valign,0);
SetMessageCommand=function(self)
local top = SCREENMAN:GetTopScreen()
Expand Down Expand Up @@ -40,14 +61,12 @@ t[#t+1] = Def.Banner{
end;
self:scaletoclipped(capWideScale(get43size(384),384),capWideScale(get43size(120),120))
end;
CurrentSongChangedMessageCommand=cmd(queuecommand,"Set");
CurrentSongChangedMessageCommand=cmd(queuecommand,"Set"),
};

t[#t+1] = Def.Quad{
g[#g+1] = Def.Quad{
InitCommand=cmd(xy,10,60+capWideScale(get43size(120),120)-capWideScale(get43size(10),10);zoomto,capWideScale(get43size(384),384),capWideScale(get43size(20),20);halign,0;diffuse,color("#000000");diffusealpha,0.7);
}

t[#t+1] = LoadFont("Common Normal") .. {
g[#g+1] = LoadFont("Common Normal") .. {
Name="songTitle";
InitCommand=cmd(xy,15,60+capWideScale(get43size(120),120)-capWideScale(get43size(10),10);visible,true;halign,0;zoom,capWideScale(get43size(0.45),0.45);maxwidth,capWideScale(get43size(340),340)/capWideScale(get43size(0.45),0.45));
BeginCommand=cmd(queuecommand,"Set");
Expand All @@ -62,6 +81,9 @@ t[#t+1] = LoadFont("Common Normal") .. {
CurrentSongChangedMessageCommand=cmd(queuecommand,"Set");
};

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));
Expand All @@ -80,7 +102,7 @@ t[#t+1] = LoadFont("Common Normal") .. {
-- CurrentSongChangedMessageCommand=cmd(queuecommand,"Set");
-- };

t[#t+1] = Def.ActorFrame {
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));
OffCommand=cmd(bouncebegin,0.2;xy,capWideScale(get43size(384),384)+26-500,70;); -- visible(false) doesn't seem to work with sleep
OnCommand=cmd(bouncebegin,0.2;xy,capWideScale(get43size(384),384)+26,70;);
Expand Down Expand Up @@ -203,6 +225,6 @@ t[#t+1] = Def.ActorFrame {
};
};
};

t[#t+1] = g

return t
Loading

0 comments on commit ffe1856

Please sign in to comment.