Skip to content

Commit

Permalink
I forgot to add a check for if there's even any characters installed.…
Browse files Browse the repository at this point in the history
… Woopsie
  • Loading branch information
Inorizushi committed Nov 28, 2021
1 parent f48e9dc commit ff8367c
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 391 deletions.
33 changes: 17 additions & 16 deletions BGAnimations/ScreenGameplay underlay/default.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,26 @@ for _, pn in ipairs(GAMESTATE:GetEnabledPlayers()) do
end
if show_cutins and st ~= 'StepsType_Dance_Double' and ThemePrefs.Get("FlashyCombo") == true and song:HasBGChanges() == false then
--use ipairs here because i think it expects P1 is loaded before P2

t[#t+1] = Def.ActorFrame{
loadfile(THEME:GetPathB("ScreenGameplay","underlay/Cutin.lua"))(pn)..{
OnCommand=function(s) s:setsize(450,SCREEN_HEIGHT) end,
InitCommand=function(self)
self:CenterY()
if style == "StyleType_TwoPlayersTwoSides" or GAMESTATE:GetPlayMode() == 'PlayMode_Rave' then
self:x(SCREEN_CENTER_X);
else
if PREFSMAN:GetPreference("Center1Player") then
self:x(pn==PLAYER_1 and _screen.cx-600 or _screen.cx+600)
if #Characters.GetAllCharacterNames() ~= 0 then
t[#t+1] = Def.ActorFrame{
loadfile(THEME:GetPathB("ScreenGameplay","underlay/Cutin.lua"))(pn)..{
OnCommand=function(s) s:setsize(450,SCREEN_HEIGHT) end,
InitCommand=function(self)
self:CenterY()
if style == "StyleType_TwoPlayersTwoSides" or GAMESTATE:GetPlayMode() == 'PlayMode_Rave' then
self:x(SCREEN_CENTER_X);
else
self:x(x_table[pn][1]);
end
if PREFSMAN:GetPreference("Center1Player") then
self:x(pn==PLAYER_1 and _screen.cx-600 or _screen.cx+600)
else
self:x(x_table[pn][1]);
end
end;
end;
end;
};
};
};
end;
end
end;

local style=GAMESTATE:GetCurrentStyle(pn)
local alf=getenv("ScreenFilter"..ToEnumShortString(pn)) or 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ table.insert(fixedNS,"EXIT")

local fixedChar = Characters.GetAllCharacterNames()
table.insert(fixedChar, 1, "OFF")
if #fixedChar ~= 0 then
if #fixedChar > 0 then
table.insert(fixedChar, 2, "RANDOM")
end
table.insert(fixedChar, "EXIT")
Expand Down
150 changes: 0 additions & 150 deletions Graphics/_NoteField board/GuideLine.lua

This file was deleted.

Loading

0 comments on commit ff8367c

Please sign in to comment.