Skip to content

Commit

Permalink
Fix ettmulti selectmusic clicking
Browse files Browse the repository at this point in the history
  • Loading branch information
@nico-abram
nico-abram committed Nov 25, 2018
1 parent 7eb9a8e commit cdd6f5c
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 130 deletions.
169 changes: 40 additions & 129 deletions Themes/Til Death/BGAnimations/ScreenNetSelectMusic decorations/default.lua
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
local t = Def.ActorFrame {}
if NSMAN:IsETTP() then
t[#t + 1] =
Def.ActorFrame {
LeftClickMessageCommand = function()
SCREENMAN:SystemMessage("asdasdasd")
MESSAGEMAN:Broadcast("MouseLeftClick")
end
}
t[#t + 1] = LoadActor("../ScreenSelectMusic decorations/default")
return t
end
Expand Down Expand Up @@ -96,171 +103,75 @@ g[#g + 1] = LoadActor("radaronline")

g[#g + 1] =
Def.ActorFrame {
Name = "StepsDisplay",
InitCommand = function(self)
self:xy(capWideScale(get43size(384), 384) + 26, 70, halign, 0):valign(0):zoom(math.min(1, SCREEN_WIDTH / 854))
self:xy(stepsdisplayx, 70):valign(0)
end,
OffCommand = function(self)
self:bouncebegin(0.2):xy(capWideScale(get43size(384), 384) + 26 - 500, 70) -- visible(false()
self:visible(false)
end,
OnCommand = function(self)
self:bouncebegin(0.2):xy(capWideScale(get43size(384), 384) + 26, 70)
self:visible(true)
end,
TabChangedMessageCommand = function(self)
self:finishtweening()
if getTabIndex() == 0 then
if getTabIndex() < 3 and GAMESTATE:GetCurrentSong() then
self:playcommand("On")
else
self:playcommand("Off")
end
end,
CurrentSongChangedMessageCommand = function(self)
local song = GAMESTATE:GetCurrentSong()
if song then
self:finishtweening()
self:playcommand("TweenOn")
elseif not song and self:GetZoomX() == 1 then
self:finishtweening()
self:playcommand("TweenOff")
if song and getTabIndex() < 3 then
self:playcommand("On")
elseif not song then
self:playcommand("Off")
end
end,
PlayingSampleMusicMessageCommand = function(self)
local leaderboardEnabled =
playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).leaderboardEnabled and DLMAN:IsLoggedIn()
if leaderboardEnabled then
local chartkey = GAMESTATE:GetCurrentSteps(PLAYER_1):GetChartKey()
DLMAN:RequestChartLeaderBoardFromOnline(
chartkey,
function(leaderboard)
end
)
end
end,
ChartPreviewOnMessageCommand = function(self)
self:addx(capWideScale(12, 0)):addy(capWideScale(18, 0))
end,
ChartPreviewOffMessageCommand = function(self)
self:addx(capWideScale(-12, 0)):addy(capWideScale(-18, 0))
end,
Def.StepsDisplayList {
Name = "StepsDisplayListRow",
CursorP1 = Def.ActorFrame {
InitCommand = function(self)
self:x(55):player(PLAYER_1)
end,
PlayerJoinedMessageCommand = function(self, params)
if params.Player == PLAYER_1 then
self:visible(true)
self:zoom(0):bounceend(1):zoom(1)
end
end,
PlayerUnjoinedMessageCommand = function(self, params)
if params.Player == PLAYER_1 then
self:visible(true)
self:bouncebegin(1):zoom(0)
end
end,
Def.Quad {
InitCommand = function(self)
self:zoomto(6, 22):halign(1):valign(0.5)
end,
BeginCommand = function(self)
self:queuecommand("Set")
end,
SetCommand = function(self)
if GAMESTATE:GetNumPlayersEnabled() >= 2 then
self:zoomy(11)
self:valign(1)
else
self:zoomy(22)
self:valign(0.5)
end
end,
PlayerJoinedMessageCommand = function(self)
self:playcommand("Set")
end,
PlayerUnjoinedMessageCommand = function(self)
self:playcommand("Set")
end
},
LoadFont("Common Normal") ..
{
InitCommand = function(self)
self:x(-1):halign(1):valign(0.5):zoom(0.3):diffuse(color("#000000"))
end,
BeginCommand = function(self)
self:queuecommand("Set")
end,
SetCommand = function(self)
self:settext("1")
if GAMESTATE:GetNumPlayersEnabled() >= 2 then
self:y(-6)
else
self:y(0)
end
end,
PlayerJoinedMessageCommand = function(self)
self:playcommand("Set")
end,
PlayerUnjoinedMessageCommand = function(self)
self:playcommand("Set")
end
}
},
CursorP2 = Def.ActorFrame {
InitCommand = function(self)
self:x(55):player(PLAYER_2)
end,
PlayerJoinedMessageCommand = function(self, params)
if params.Player == PLAYER_2 then
self:visible(true)
self:zoom(0):bounceend(1):zoom(1)
end
end,
PlayerUnjoinedMessageCommand = function(self, params)
if params.Player == PLAYER_2 then
self:visible(true)
self:bouncebegin(1):zoom(0)
end
self:player(PLAYER_1)
end,
Def.Quad {
InitCommand = function(self)
self:zoomto(6, 22):halign(1):valign(0.5)
self:x(54):zoomto(6, 20):halign(1):valign(0.5)
end,
BeginCommand = function(self)
self:queuecommand("Set")
end,
SetCommand = function(self)
if GAMESTATE:GetNumPlayersEnabled() >= 2 then
self:zoomy(11)
self:valign(0)
else
self:zoomy(22)
self:valign(0.5)
end
end,
PlayerJoinedMessageCommand = function(self)
self:playcommand("Set")
end,
PlayerUnjoinedMessageCommand = function(self)
self:playcommand("Set")
self:zoomy(20)
end
},
LoadFont("Common Normal") ..
{
InitCommand = function(self)
self:x(-1):halign(1):valign(0.5):zoom(0.3):diffuse(color("#000000"))
end,
BeginCommand = function(self)
self:queuecommand("Set")
end,
SetCommand = function(self)
self:settext("2")
if GAMESTATE:GetNumPlayersEnabled() >= 2 then
self:y(6)
else
self:y(0)
end
end,
PlayerJoinedMessageCommand = function(self)
self:playcommand("Set")
end,
PlayerUnjoinedMessageCommand = function(self)
self:playcommand("Set")
end
}
}
},
CursorP2 = Def.ActorFrame {},
CursorP1Frame = Def.Actor {
ChangeCommand = function(self)
self:stoptweening():decelerate(0.05)
end
},
CursorP2Frame = Def.Actor {
ChangeCommand = function(self)
self:stoptweening():decelerate(0.05)
end
}
CursorP2Frame = Def.Actor {}
}
}
t[#t + 1] = g
Expand Down
2 changes: 1 addition & 1 deletion src/ScreenNetSelectMusic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ ScreenNetSelectMusic::Init()
NSMAN->OnMusicSelect();

m_bInitialSelect = false;
m_bAllowInput = false;
m_bAllowInput = NSMAN->IsETTP();

SAMPLE_MUSIC_FALLBACK_FADE_IN_SECONDS.Load(
m_sName, "SampleMusicFallbackFadeInSeconds");
Expand Down

0 comments on commit cdd6f5c

Please sign in to comment.