hersi
/
ExperimentalGear
1
0
Fork 0
Code Issues 14 Pull Requests Projects 1 Releases 6 Activity

Merge branch 'master' of https://github.com/FajsiEx/exceed

This commit is contained in:
FajsiEx 2021-11-23 21:17:27 +01:00
parent 04a4a9c587 2b710798e5
commit 43ba7ef62e
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/songselect/chalwheel.lua
View File

@ -171,8 +171,7 @@ local check_or_create_cache = function(challenge)
["difficulty"] = 0 ["difficulty"] = 0
} }
} }
end else -- if not challenge.missing_chart then
local charts = {} local charts = {}
for _, chart in ipairs(challenge.charts) do for _, chart in ipairs(challenge.charts) do
table.insert(charts, { table.insert(charts, {
@ -184,6 +183,7 @@ local check_or_create_cache = function(challenge)
end end
challengeCache[challenge.id]["charts"] = charts challengeCache[challenge.id]["charts"] = charts
end end
end
if (not challengeCache[challenge.id]["percent"] or not challengeCache[challenge.id]["total_score"] if (not challengeCache[challenge.id]["percent"] or not challengeCache[challenge.id]["total_score"]
or challengeCache[challenge.id]["total_score"] ~= challenge.bestScore) then or challengeCache[challenge.id]["total_score"] ~= challenge.bestScore) then
@ -196,15 +196,15 @@ local check_or_create_cache = function(challenge)
challengeCache[challenge.id]["pass_state"] = passStates[passState] challengeCache[challenge.id]["pass_state"] = passStates[passState]
end end
if not challengeCache[challenge.id]["jackets"] then local lastChart = challenge.charts[#challenge.charts]
local jackets = {} if not challengeCache[challenge.id]["jacket"] then
for i, chart in ipairs(challenge.charts) do if challenge.missing_chart then
jackets[i] = gfx.LoadImageJob(chart.jacketPath, jacketFallback, 200, 200) challengeCache[challenge.id]["jacket"] = jacketFallback
else
challengeCache[challenge.id]["jacket"] = gfx.LoadImageJob(lastChart.jacketPath, jacketFallback, 200, 200)
end end
if #jackets == 0 then elseif not challenge.missing_chart and challengeCache[challenge.id]["jacket"] == jacketFallback then
jackets[1] = jacketFallback challengeCache[challenge.id]["jacket"] = gfx.LoadImageJob(lastChart.jacketPath, jacketFallback, 200, 200)
end
challengeCache[challenge.id]["jackets"] = jackets
end end
end end
@ -275,7 +275,7 @@ draw_challenge = function(challenge, x, y, w, h, selected)
end end
gfx.BeginPath() gfx.BeginPath()
gfx.ImageRect(offsetX, offsetY, size, size, challengeCache[challenge.id]["jackets"][1], 1, 0) gfx.ImageRect(offsetX, offsetY, size, size, challengeCache[challenge.id]["jacket"], 1, 0)
---------------------------------------------------------- ----------------------------------------------------------
-- draw stats section -- draw stats section