Skip to content

Commit

Permalink
Merge pull request #13 from Misterkister/master
Browse files Browse the repository at this point in the history 
Another pull request from this mister
  • Loading branch information
@MinaciousGrace
MinaciousGrace authored Dec 31, 2016
2 parents 04afbb7 + 225a95b commit 3c12c85
Show file tree
Hide file tree
Showing 8 changed files with 1,261 additions and 125 deletions.
Binary file modified Data/splash.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
166 changes: 158 additions & 8 deletions Themes/Til Death/BGAnimations/ScreenEvaluation decorations/default.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,37 @@ if GAMESTATE:GetNumPlayersEnabled() == 1 and themeConfig:get_data().eval.ScoreBo
end


local dummyX1P = SCREEN_CENTER_X
local dummyX = dummyX1P
local dummyY1P = SCREEN_CENTER_Y
local dummyY = dummyY1P
local songY1P = dummyY-95

if not IsUsingWideScreen() == true then
songY1P = dummyY-125
end;

if IsUsingWideScreen() == true then
songY1P = SCREEN_CENTER_Y-110
dummyX = SCREEN_CENTER_X
end;

t[#t+1] = LoadFont("Common Normal")..{
InitCommand=cmd(xy,SCREEN_CENTER_X,capWideScale(135,150);zoom,0.4;maxwidth,400/0.4),
BeginCommand=cmd(queuecommand,"Set"),
InitCommand=cmd(xy,dummyX,songY1P+30;zoom,0.4;maxwidth,400/0.4);
BeginCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
if GAMESTATE:IsCourseMode() then
self:settext(GAMESTATE:GetCurrentCourse():GetDisplayFullTitle().." // "..GAMESTATE:GetCurrentCourse():GetScripter())
else
self:settext(GAMESTATE:GetCurrentSong():GetDisplayMainTitle().." // "..GAMESTATE:GetCurrentSong():GetDisplayArtist())
end
end
}
self:settext("Song Title: "..GAMESTATE:GetCurrentSong():GetDisplayMainTitle().."\nSong Artist: "..GAMESTATE:GetCurrentSong():GetDisplayArtist())
end;
end;
};


-- Rate String
t[#t+1] = LoadFont("Common normal")..{
InitCommand=cmd(xy,SCREEN_CENTER_X,capWideScale(145,160);zoom,0.5;halign,0.5),
InitCommand=cmd(xy,capWideScale(SCREEN_CENTER_X-295,SCREEN_CENTER_X),capWideScale(45,180);zoom,0.5;halign,0.5),
BeginCommand=function(self)
if getCurRateString() == "1x" then
self:settext("")
Expand Down Expand Up @@ -73,6 +89,24 @@ local pssP1 = STATSMAN:GetCurStageStats():GetPlayerStageStats(PLAYER_1)
local frameX = 20
local frameY = 140
local frameWidth = SCREEN_CENTER_X-120
local SMOX = SCREEN_CENTER_X
local SMOY = SCREEN_CENTER_Y
local smoframeX = frameX+320
local smoframeY = frameY+50
local comboX = SMOX+250

if IsUsingWideScreen() == true then
SMOX = SCREEN_CENTER_X-30
SMOY = SCREEN_CENTER_Y-40
end;

if not IsUsingWideScreen() == true then
smoframeX = frameX+210
SMOX = SCREEN_CENTER_X-30
SMOY = SCREEN_CENTER_Y-40
comboX = SMOX+160
end;


function scoreBoard(pn,position)
local t = Def.ActorFrame{
Expand All @@ -87,6 +121,7 @@ function scoreBoard(pn,position)
local score = getScoreFromTable(getScoreList(PLAYER_1),pss:GetPersonalHighScoreIndex()+1)

t[#t+1] = Def.Quad{InitCommand=cmd(xy,frameX-5,frameY;zoomto,frameWidth+10,220;halign,0;valign,0;diffuse,color("#333333CC"))};
t[#t+1] = Def.Quad{InitCommand=cmd(xy,smoframeX,smoframeY;zoomto,frameWidth+200,110;halign,0;valign,0;diffuse,color("#333333CC"))};
t[#t+1] = Def.Quad{InitCommand=cmd(xy,frameX,frameY+30;zoomto,frameWidth,2;halign,0;diffuse,getMainColor('highlight');diffusealpha,0.5)};
t[#t+1] = Def.Quad{InitCommand=cmd(xy,frameX,frameY+55;zoomto,frameWidth,2;halign,0;diffuse,getMainColor('highlight');diffusealpha,0.5)};

Expand All @@ -109,6 +144,121 @@ function scoreBoard(pn,position)
self:diffuse(getDifficultyColor(GetCustomDifficulty(steps:GetStepsType(),steps:GetDifficulty())))
end
};

t[#t+1] = LoadFont("Common Normal")..{
InitCommand=cmd(zoom,0.5;x,SMOX;y,SMOY);
BeginCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
if IsNetSMOnline() == true then
self:settext("StepMania Online")
else
self:settext("Offline")
end
end;
};

t[#t+1] = LoadFont("Common Normal")..{
InitCommand=cmd(zoom,0.5;x,SMOX-34;y,SMOY+15);
BeginCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
if IsNetSMOnline() == true then
self:settext("Grade:")
else
self:settext("")
end
end;
};
t[#t+1] = LoadFont("Common Normal")..{
InitCommand=cmd(zoom,0.5;x,SMOX-22;y,SMOY+33);
BeginCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
if IsNetSMOnline() == true then
self:settext("Marvelous:")
else
self:settext("")
end
end;
};
t[#t+1] = LoadFont("Common Normal")..{
InitCommand=cmd(zoom,0.5;x,SMOX-31;y,SMOY+51);
BeginCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
if IsNetSMOnline() == true then
self:settext("Perfect:")
else
self:settext("")
end
end;
};
t[#t+1] = LoadFont("Common Normal")..{
InitCommand=cmd(zoom,0.5;x,SMOX-37;y,SMOY+69);
BeginCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
if IsNetSMOnline() == true then
self:settext("Great:")
else
self:settext("")
end
end;
};
t[#t+1] = LoadFont("Common Normal")..{
InitCommand=cmd(zoom,0.5;x,SMOX+157;y,SMOY+33);
BeginCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
if IsNetSMOnline() == true then
self:settext("Good:")
else
self:settext("")
end
end;
};
t[#t+1] = LoadFont("Common Normal")..{
InitCommand=cmd(zoom,0.5;x,SMOX+153;y,SMOY+51);
BeginCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
if IsNetSMOnline() == true then
self:settext("Bad:")
else
self:settext("")
end
end;
};
t[#t+1] = LoadFont("Common Normal")..{
InitCommand=cmd(zoom,0.5;x,SMOX+153;y,SMOY+69);
BeginCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
if IsNetSMOnline() == true then
self:settext("Miss:")
else
self:settext("")
end
end;
};
t[#t+1] = LoadFont("Common Normal")..{
InitCommand=cmd(zoom,0.5;x,comboX;y,SMOY+10);
BeginCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
if IsNetSMOnline() == true then
self:settext("Combo:")
else
self:settext("")
end
end;
};

if ShowStandardDecoration("StepsDisplay") then
for pn in ivalues(PlayerNumber) do
local t2 = Def.StepsDisplay {
InitCommand=cmd(Load,"StepsDisplayEvaluation",pn;SetFromGameState,pn;);
UpdateNetEvalStatsMessageCommand=function(self,param)
if GAMESTATE:IsPlayerEnabled(pn) then
self:SetFromSteps(param.Steps)
end;
end;
};
t[#t+1] = StandardDecorationFromTable( "StepsDisplay" .. ToEnumShortString(pn), t2 );
end
end

-- Wife percent
t[#t+1] = LoadFont("Common Large")..{
Expand Down Expand Up @@ -215,4 +365,4 @@ end

t[#t+1] = LoadActor("offsetplot")

return t
return t
27 changes: 0 additions & 27 deletions Themes/Til Death/BGAnimations/ScreenNetEvaluation decorations.lua
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,5 @@
local t = Def.ActorFrame{}

t[#t+1] = Def.Quad{
InitCommand=cmd(xy,SCREEN_CENTER_X-28,SCREEN_TOP+223;zoomto,60,20;halign,0;valign,0;diffuse,color("#999999CC"););
};
t[#t+1] = Def.Quad{
InitCommand=cmd(xy,SCREEN_CENTER_X-90,SCREEN_TOP+243;zoomto,100,150;halign,0;valign,0;diffuse,color("#333333CC"););
};

t[#t+1] = LoadFont("Common Normal")..{
InitCommand=cmd(xy,SCREEN_CENTER_X+5,SCREEN_TOP+213;zoom,0.50;halign,1;);
BeginCommand=cmd(queuecommand,"Set");
SetCommand=function(self)
self:settext("Online Scores")
end;
};

local tapnames = {'Marvelous','Perfect','Great','Good','Bad','Miss','Combo'}
local judges = {'TapNoteScore_W1','TapNoteScore_W2','TapNoteScore_W3','TapNoteScore_W4','TapNoteScore_W5','TapNoteScore_Miss','TapNoteScore_W2'}

for k,v in ipairs(tapnames) do

t[#t+1] = LoadFont("Common Normal")..{
InitCommand=cmd(xy,SCREEN_CENTER_X-90,SCREEN_TOP+230+k*21;zoom,0.45;halign,0;settext,v;diffuse,byJudgment(judges[k]);diffusealpha,0.5);

};
end


t[#t+1] = LoadActor("ScreenEvaluation decorations/default");

return t;
38 changes: 20 additions & 18 deletions Themes/Til Death/BGAnimations/ScreenNetSelectMusic decorations/default.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ 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] = Def.Banner{
InitCommand=cmd(x,10;y,60;halign,0;valign,0);
Expand Down Expand Up @@ -59,24 +62,23 @@ t[#t+1] = LoadFont("Common Normal") .. {
CurrentSongChangedMessageCommand=cmd(queuecommand,"Set");
};

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");
};

-- 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");
-- };

t[#t+1] = Def.ActorFrame {
InitCommand=cmd(xy,capWideScale(get43size(384),384)+26,70,halign,0;valign,0;zoom,math.min(1,SCREEN_WIDTH/854));
Expand Down
21 changes: 21 additions & 0 deletions Themes/Til Death/BGAnimations/ScreenNetSelectMusic decorations/onlinebpm.lua
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
--Merge two files "somethingelseBPMLabel" and "netplayBPMDisplay" into one file. -Misterkister

local t = Def.ActorFrame{}

t[#t+1] = LoadFont("Common Normal") .. {
Text="BPM";
InitCommand=cmd(x,SCREEN_CENTER_X-70;y,SCREEN_CENTER_Y-190;;zoom,0.50;);
};

t[#t+1] = Def.BPMDisplay{
File=THEME:GetPathF("BPMDisplay", "bpm");
Name="BPMDisplay";
InitCommand=cmd(x,SCREEN_CENTER_X-45;y,SCREEN_CENTER_Y-190;zoom,0.50;);
SetCommand=function(self) self:SetFromGameState() end;
CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
};

return t


Loading

0 comments on commit 3c12c85

Please sign in to comment.