This commit is contained in:
parent
fe90f0e2aa
commit
c706937cec
|
@ -79,6 +79,27 @@
|
||||||
"default": true
|
"default": true
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"gameplay_earlyLateFor": {
|
||||||
|
"label": "Show Early/Late display for",
|
||||||
|
"type": "selection",
|
||||||
|
"default": "NEAR (or worse)",
|
||||||
|
"values": ["CRITICAL (or worse)", "NEAR (or worse)", "OFF"]
|
||||||
|
},
|
||||||
|
|
||||||
|
"gameplay_earlyLatePosition": {
|
||||||
|
"label": "Early/Late display position",
|
||||||
|
"type": "selection",
|
||||||
|
"default": "STANDARD",
|
||||||
|
"values": ["UPPER+", "UPPER", "STANDARD", "LOWER"]
|
||||||
|
},
|
||||||
|
|
||||||
|
"gameplay_msFor": {
|
||||||
|
"label": "Show millisecond display for",
|
||||||
|
"type": "selection",
|
||||||
|
"default": "NEAR (or worse)",
|
||||||
|
"values": ["ALL", "CRITICAL (or worse)", "NEAR (or worse)", "NONE"]
|
||||||
|
},
|
||||||
|
|
||||||
"separator_f": {},
|
"separator_f": {},
|
||||||
"Debug": { "type": "label" },
|
"Debug": { "type": "label" },
|
||||||
|
|
||||||
|
|
|
@ -111,6 +111,9 @@ function render_song(song, x,y)
|
||||||
|
|
||||||
gfx.Save()
|
gfx.Save()
|
||||||
gfx.Translate(x,y)
|
gfx.Translate(x,y)
|
||||||
|
if song.jacket_url ~= nil and song.jacket == jacketFallback then
|
||||||
|
webjacket = gfx.LoadWebImageJob(song.jacket_url, jacketFallback, 250, 250)
|
||||||
|
end
|
||||||
getroom(song,x,y,downloaded)
|
getroom(song,x,y,downloaded)
|
||||||
gfx.Restore()
|
gfx.Restore()
|
||||||
|
|
||||||
|
@ -285,7 +288,7 @@ function button_pressed(button)
|
||||||
local song = songs[cursorPos + 1]
|
local song = songs[cursorPos + 1]
|
||||||
if song == nil then return end
|
if song == nil then return end
|
||||||
dlScreen.DownloadArchive(encodeURI(song.cdn_download_url), header, song.id, archive_callback)
|
dlScreen.DownloadArchive(encodeURI(song.cdn_download_url), header, song.id, archive_callback)
|
||||||
downloaded[song.id] = "Downloading..."
|
downloaded[song.id] = "Downloading"
|
||||||
elseif screenState == 1 then
|
elseif screenState == 1 then
|
||||||
if selectedLevels[levelcursor + 1] then
|
if selectedLevels[levelcursor + 1] then
|
||||||
selectedLevels[levelcursor + 1] = false
|
selectedLevels[levelcursor + 1] = false
|
||||||
|
|
|
@ -79,8 +79,6 @@ local getroom = function(song,x,y,downloaded)
|
||||||
difbar.render(deltaTime, x+260+(1*115),y+106, jw/150, diff.difficulty, diff.level);
|
difbar.render(deltaTime, x+260+(1*115),y+106, jw/150, diff.difficulty, diff.level);
|
||||||
elseif diff.difficulty == 4 then ---mxm and up
|
elseif diff.difficulty == 4 then ---mxm and up
|
||||||
difbar.render(deltaTime, x+260+(2*115),y+106, jw/150, diff.difficulty, diff.level);
|
difbar.render(deltaTime, x+260+(2*115),y+106, jw/150, diff.difficulty, diff.level);
|
||||||
elseif diff.difficulty == 4 then ---mxm and up
|
|
||||||
difbar.render(deltaTime, x+260+(2*115),y+106, jw/150, diff.difficulty+1, diff.level);
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -89,33 +87,37 @@ local getroom = function(song,x,y,downloaded)
|
||||||
gfx.ImageRect(x+650,y+69, jw, jh, n_cost,1,0);
|
gfx.ImageRect(x+650,y+69, jw, jh, n_cost,1,0);
|
||||||
|
|
||||||
|
|
||||||
local buy = 8000
|
local buy = "Not Downloaded"
|
||||||
|
|
||||||
|
local jw,jh = gfx.ImageSize(n_play_dot);
|
||||||
|
if song.status == "Playing" then
|
||||||
|
gfx.BeginPath()
|
||||||
|
gfx.TextAlign(gfx.TEXT_ALIGN_RIGHT + gfx.TEXT_ALIGN_MIDDLE)
|
||||||
|
gfx.FontSize(24)
|
||||||
|
gfx.SetImageTint(255,255,255)
|
||||||
|
gfx.Text(song.status, x+878-50, y+24)
|
||||||
|
gfx.BeginPath();
|
||||||
|
gfx.ImageRect(x+764, y+11, jw, jh, n_play_dot,1,0);
|
||||||
|
gfx.SetImageTint(0,246,2)
|
||||||
|
|
||||||
|
end
|
||||||
gfx.FontSize(30)
|
gfx.FontSize(30)
|
||||||
if not downloaded[song.id] then
|
if not downloaded[song.id] then
|
||||||
gfx.BeginPath()
|
gfx.BeginPath()
|
||||||
|
gfx.TextAlign(gfx.TEXT_ALIGN_RIGHT + gfx.TEXT_ALIGN_MIDDLE)
|
||||||
gfx.TextAlign(gfx.TEXT_ALIGN_CENTER + gfx.TEXT_ALIGN_MIDDLE)
|
gfx.Text(buy,x+850,y+92)
|
||||||
gfx.Text(buy.." AP",x+830,y+92)
|
|
||||||
elseif downloaded[song.id] then
|
elseif downloaded[song.id] then
|
||||||
buy = "0"--downloaded[song.id]
|
buy = "Downloaded"
|
||||||
gfx.BeginPath()
|
gfx.BeginPath()
|
||||||
gfx.TextAlign(gfx.TEXT_ALIGN_CENTER + gfx.TEXT_ALIGN_MIDDLE)
|
|
||||||
|
gfx.TextAlign(gfx.TEXT_ALIGN_RIGHT + gfx.TEXT_ALIGN_MIDDLE)
|
||||||
gfx.Text(buy.." AP", x+830,y+92)
|
gfx.Text(buy, x+830,y+92)
|
||||||
end
|
|
||||||
if song.status == "Playing" then
|
|
||||||
gfx.BeginPath()
|
|
||||||
gfx.TextAlign(gfx.TEXT_ALIGN_CENTER + gfx.TEXT_ALIGN_MIDDLE)
|
|
||||||
gfx.FontSize(24)
|
|
||||||
gfx.Text(song.status, x+878-50, y+24)
|
|
||||||
|
|
||||||
local jw,jh = gfx.ImageSize(n_play_dot);
|
|
||||||
gfx.BeginPath();
|
gfx.BeginPath();
|
||||||
gfx.SetImageTint(0,246,2)
|
gfx.SetImageTint(240,246,0)
|
||||||
gfx.ImageRect(x+764, y+11, jw, jh, n_play_dot,1,0);
|
gfx.ImageRect(x+764, y+11, jw, jh, n_play_dot,1,0);
|
||||||
gfx.SetImageTint(255,255,255)
|
gfx.SetImageTint(255,255,255)
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue