Skip to content

Commit

Permalink
draft rework mp scoreboard
Browse files Browse the repository at this point in the history
  • Loading branch information
@MinaciousGrace
MinaciousGrace committed Dec 1, 2018
1 parent 7fb3f21 commit 6691415
Show file tree
Hide file tree
Showing 2 changed files with 254 additions and 1 deletion.
253 changes: 253 additions & 0 deletions Themes/Til Death/BGAnimations/MPscoreboard.lua
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@


local lines = 6 -- number of scores to display
local framex = SCREEN_WIDTH - capWideScale(get43size(230), 230)
local framey = 60
local frameWidth = capWideScale(get43size(220), 220)
local spacing = 34

--Input event for mouse clicks
local function input(event)
local scoreBoard = SCREENMAN:GetTopScreen():GetChildren().scoreBoard
if event.DeviceInput.button == "DeviceButton_left mouse button" and scoreBoard then
if event.type == "InputEventType_Release" then
for i = 1, #multiscores do
if isOver(scoreBoard:GetChild(i):GetChild("mouseOver")) then
SCREENMAN:GetTopScreen():SelectPlayer(i)
scoreBoard:GetChild(i):GetChild("grade"):visible(
not scoreBoard:GetChild(i):GetChild("grade"):GetVisible()
)
scoreBoard:GetChild(i):GetChild("clear"):visible(
not scoreBoard:GetChild(i):GetChild("clear"):GetVisible()
)
scoreBoard:GetChild(i):GetChild("wife"):visible(
not scoreBoard:GetChild(i):GetChild("wife"):GetVisible()
)
scoreBoard:GetChild(i):GetChild("combo"):visible(
not scoreBoard:GetChild(i):GetChild("combo"):GetVisible()
)
scoreBoard:GetChild(i):GetChild("judge"):visible(
not scoreBoard:GetChild(i):GetChild("judge"):GetVisible()
)
scoreBoard:GetChild(i):GetChild("date"):visible(
not scoreBoard:GetChild(i):GetChild("date"):GetVisible()
)
scoreBoard:GetChild(i):GetChild("option"):visible(
not scoreBoard:GetChild(i):GetChild("option"):GetVisible()
)
end
end
end
end
return false
end

local function Update(self)
for i = 1, lines do
if isOver(self:GetChild(i):GetChild("mouseOver")) then
self:GetChild(i):GetChild("mouseOver"):diffusealpha(0.2)
else
self:GetChild(i):GetChild("mouseOver"):diffusealpha(0)
self:GetChild(i):GetChild("grade"):visible(true)
self:GetChild(i):GetChild("wife"):visible(true)
self:GetChild(i):GetChild("combo"):visible(true)
self:GetChild(i):GetChild("judge"):visible(true)
self:GetChild(i):GetChild("clear"):visible(true)
self:GetChild(i):GetChild("date"):visible(false)
self:GetChild(i):GetChild("option"):visible(false)
end
end
end


local t =
Def.ActorFrame {
Name = "scoreBoard",
InitCommand = function(self)
self:SetUpdateFunction(Update)
end,
BeginCommand = function(self)
SCREENMAN:GetTopScreen():AddInputCallback(input)
multiscores = NSMAN:GetEvalScores()
for i=1, math.min(#multiscores) do
self:GetChild(i):queuecommand("UpdateNetScore")
end
end,
NewMultiScoreMessageCommand = function(self)
multiscores = NSMAN:GetEvalScores()
for i=1, math.min(#multiscores) do
self:GetChild(i):queuecommand("UpdateNetScore")
end
end
}

local function scoreitem(pn, i)
local t =
Def.ActorFrame {
Name = tostring(i),
InitCommand = function(self)
self:visible(false)
end,
UpdateNetScoreCommand = function(self)
self:visible(i <= #multiscores)
end,
--The main quad
Def.Quad {
InitCommand = function(self)
self:xy(framex, framey + (i * spacing) - 4):zoomto(frameWidth, 30):halign(0):valign(0):diffuse(
color("#333333")
):diffusealpha(1):diffuserightedge(color("#33333333"))
end
},
--Highlight quad for the current score
Def.Quad {
InitCommand = function(self)
self:xy(framex, framey + (i * spacing) - 4):zoomto(frameWidth, 30):halign(0):valign(0):diffuse(
color("#ffffff")
):diffusealpha(0.3):diffuserightedge(color("#33333300"))
end,
UpdateNetScoreCommand = function(self)
self:visible(SCREENMAN:GetTopScreen():GetCurrentPlayer() == i)
end,
UpdateNetEvalStatsMessageCommand = function(self)
self:visible(SCREENMAN:GetTopScreen():GetCurrentPlayer() == i)
end
},
--Quad that will act as the bounding box for mouse rollover/click stuff.
Def.Quad {
Name = "mouseOver",
UpdateNetScoreCommand = function(self)
self:xy(framex, framey + (i * spacing) - 4):zoomto(frameWidth*2, 30):halign(0):valign(0):diffuse(
getMainColor("highlight")
):diffusealpha(0)
end
},
--ClearType lamps
Def.Quad {
UpdateNetScoreCommand = function(self)
self:xy(framex, framey + (i * spacing) - 4):zoomto(8, 30):halign(0):valign(0):diffuse(
getClearTypeFromScore(pn, hs, 2)
)
end
},
--rank
LoadFont("Common normal") ..
{
InitCommand = function(self)
self:xy(framex - 8, framey + 12 + (i * spacing)):zoom(0.35)
end,
UpdateNetScoreCommand = function(self)
self:settext(i)
if SCREENMAN:GetTopScreen():GetCurrentPlayer() == i then
self:diffuse(color("#ffcccc"))
else
self:diffuse(color("#FFFFFF"))
end
end,
UpdateNetEvalStatsMessageCommand = function(self)
self:playcommand("UpdateNetScore")
end
},
LoadFont("Common normal") ..
{
Name = "wife",
InitCommand = function(self)
self:xy(framex + 10, framey + 11 + (i * spacing)):zoom(0.35):halign(0):maxwidth((frameWidth - 15) / 0.3)
end,
UpdateNetScoreCommand = function(self)
self:settextf("%05.2f%% (%s)", notShit.floor(multiscores[i].highscore:GetWifeScore() * 10000) / 100, "Wife")
end
},
LoadFont("Common normal") ..
{
Name = "user",
InitCommand = function(self)
self:xy(framex + 10, framey + 1 + (i * spacing)):zoom(0.35):halign(0):maxwidth((frameWidth - 15) / 0.3)
end,
UpdateNetScoreCommand = function(self)
self:settextf(multiscores[i].user)
if Grade:Reverse()[GetGradeFromPercent(multiscores[i].highscore:GetWifeScore())] < 2 then -- this seeems right -mina
self:rainbowscroll(true)
end
end
},
LoadFont("Common normal") ..
{
Name = "option",
InitCommand = function(self)
self:xy(framex + 10, framey + 11 + (i * spacing)):zoom(0.35):halign(0):maxwidth((frameWidth - 15) / 0.35)
end,
UpdateNetScoreCommand = function(self)
self:settext(multiscores[i].highscore:GetModifiers())
self:visible(false)
end
},
LoadFont("Common normal") ..
{
Name = "grade",
InitCommand = function(self)
self:xy(framex + 130 + capWideScale(get43size(0), 50), framey + 2 + (i * spacing)):zoom(0.35):halign(0.5):maxwidth(
(frameWidth - 15) / 0.35
)
end,
UpdateNetScoreCommand = function(self)
self:settext(getGradeStrings(multiscores[i].highscore:GetWifeGrade()))
self:diffuse(getGradeColor(multiscores[i].highscore:GetWifeGrade()))
end
},
LoadFont("Common normal") ..
{
Name = "clear",
InitCommand = function(self)
self:xy(framex + 130 + capWideScale(get43size(0), 50), framey + 12 + (i * spacing)):zoom(0.35):halign(0.5):maxwidth(
(frameWidth - 15) / 0.35
)
end,
UpdateNetScoreCommand = function(self)
self:settext(getClearTypeFromScore(pn, multiscores[i].highscore, 0))
self:diffuse(getClearTypeFromScore(pn, multiscores[i].highscore, 2))
end
},
LoadFont("Common normal") ..
{
Name = "combo",
InitCommand = function(self)
self:xy(framex + 130 + capWideScale(get43size(0), 50), framey + 22 + (i * spacing)):zoom(0.35):halign(0.5):maxwidth(
(frameWidth - 15) / 0.35
)
end,
UpdateNetScoreCommand = function(self)
self:settextf("%sx", multiscores[i].highscore:GetMaxCombo())
end
},
LoadFont("Common normal") ..
{
Name = "judge",
InitCommand = function(self)
self:xy(framex + 10, framey + 20 + (i * spacing)):zoom(0.35):halign(0):maxwidth((frameWidth - 15) / 0.35)
end,
UpdateNetScoreCommand = function(self)
self:settext(multiscores[i].highscore:GetJudgmentString())
end
},
LoadFont("Common normal") ..
{
Name = "date",
InitCommand = function(self)
self:xy(framex + 10, framey + 20 + (i * spacing)):zoom(0.35):halign(0)
end,
UpdateNetScoreCommand = function(self)
self:settext(multiscores[i].highscore:GetDate())
self:visible(false)
end
}
}
return t
end

for i=1,lines do
t[#t + 1] = scoreitem(1, i)
end


return t
2 changes: 1 addition & 1 deletion Themes/Til Death/BGAnimations/ScreenNetEvaluation decorations.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local customWindows = timingWindowConfig:get_data().customWindows
local scoreType = themeConfig:get_data().global.DefaultScoreType

if GAMESTATE:GetNumPlayersEnabled() == 1 and themeConfig:get_data().eval.ScoreBoardEnabled then
t[#t + 1] = LoadActor("ScreenEvaluation decorations/scoreboard")
t[#t + 1] = LoadActor("MPscoreboard")
end

t[#t + 1] =
Expand Down

0 comments on commit 6691415

Please sign in to comment.