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

> move grades to common/grades folder

This commit is contained in:
FajsiEx 2021-07-31 16:48:14 +02:00
parent 5a0f0079e1
commit 683e72c52e
20 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/challengeresult.lua
View File

@ -189,7 +189,7 @@ result_set = function()
end end
chart.gradeAR = 1 chart.gradeAR = 1
chart.gradeImg = gfx.CreateSkinImage(string.format("score/%s.png", chart.grade), 0) chart.gradeImg = gfx.CreateSkinImage(string.format("common/grades/%s.png", chart.grade), 0)
if chart.gradeImg ~= nil then if chart.gradeImg ~= nil then
local gradew, gradeh = gfx.ImageSize(chart.gradeImg) local gradew, gradeh = gfx.ImageSize(chart.gradeImg)
chart.gradeAR = gradew / gradeh chart.gradeAR = gradew / gradeh

2
scripts/gameplay newest.lua
View File

@ -1337,7 +1337,7 @@ function draw_users(detaTime)
local rank = 0 local rank = 0
for i, u in ipairs(users) do for i, u in ipairs(users) do
gfx.FillColor(255, 255, 255) gfx.FillColor(255, 255, 255)
local score_big = string.format("%04d",math.floor(u.score/1000)); local score_big = string.format("%04d",math.floor(u.common/grades/1000));
local score_small = string.format("%03d",u.score%1000); local score_small = string.format("%03d",u.score%1000);
local user_text = '('..u.name..')'; local user_text = '('..u.name..')';

2
scripts/gameplay2.lua
View File

@ -1337,7 +1337,7 @@ function draw_users(detaTime)
local rank = 0 local rank = 0
for i, u in ipairs(users) do for i, u in ipairs(users) do
gfx.FillColor(255, 255, 255) gfx.FillColor(255, 255, 255)
local score_big = string.format("%04d",math.floor(u.score/1000)); local score_big = string.format("%04d",math.floor(u.common/grades/1000));
local score_small = string.format("%03d",u.score%1000); local score_small = string.format("%03d",u.score%1000);
local user_text = '('..u.name..')'; local user_text = '('..u.name..')';

20
scripts/multiplayerscreen.lua
View File

@ -34,16 +34,16 @@ local did_exit = false;
local diffColors = {{0,0,255}, {0,255,0}, {255,0,0}, {255, 0, 255}} local diffColors = {{0,0,255}, {0,255,0}, {255,0,0}, {255, 0, 255}}
local grades = { local grades = {
{["max"] = 6999999, ["image"] = gfx.CreateSkinImage("score/D.png", 0)}, {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("common/grades/D.png", 0)},
{["max"] = 7999999, ["image"] = gfx.CreateSkinImage("score/C.png", 0)}, {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("common/grades/C.png", 0)},
{["max"] = 8699999, ["image"] = gfx.CreateSkinImage("score/B.png", 0)}, {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("common/grades/B.png", 0)},
{["max"] = 8999999, ["image"] = gfx.CreateSkinImage("score/A.png", 0)}, {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("common/grades/A.png", 0)},
{["max"] = 9299999, ["image"] = gfx.CreateSkinImage("score/A+.png", 0)}, {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("common/grades/A+.png", 0)},
{["max"] = 9499999, ["image"] = gfx.CreateSkinImage("score/AA.png", 0)}, {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("common/grades/AA.png", 0)},
{["max"] = 9699999, ["image"] = gfx.CreateSkinImage("score/AA+.png", 0)}, {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("common/grades/AA+.png", 0)},
{["max"] = 9799999, ["image"] = gfx.CreateSkinImage("score/AAA.png", 0)}, {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("common/grades/AAA.png", 0)},
{["max"] = 9899999, ["image"] = gfx.CreateSkinImage("score/AAA+.png", 0)}, {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("common/grades/AAA+.png", 0)},
{["max"] = 99999999, ["image"] = gfx.CreateSkinImage("score/S.png", 0)} {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("common/grades/S.png", 0)}
} }
local badges = { local badges = {

20
scripts/result.lua
View File

@ -22,16 +22,16 @@ local danBadgeImage = gfx.CreateSkinImage("dan/inf.png", 0);
local volforceBadgeImage = gfx.CreateSkinImage("volforce/10.png", 0); local volforceBadgeImage = gfx.CreateSkinImage("volforce/10.png", 0);
local gradeImages = { local gradeImages = {
S = gfx.CreateSkinImage("score/S.png", 0), S = gfx.CreateSkinImage("common/grades/S.png", 0),
AAA_P = gfx.CreateSkinImage("score/AAA+.png", 0), AAA_P = gfx.CreateSkinImage("common/grades/AAA+.png", 0),
AAA = gfx.CreateSkinImage("score/AAA.png", 0), AAA = gfx.CreateSkinImage("common/grades/AAA.png", 0),
AA_P = gfx.CreateSkinImage("score/AA+.png", 0), AA_P = gfx.CreateSkinImage("common/grades/AA+.png", 0),
AA = gfx.CreateSkinImage("score/AA.png", 0), AA = gfx.CreateSkinImage("common/grades/AA.png", 0),
A_P = gfx.CreateSkinImage("score/A+.png", 0), A_P = gfx.CreateSkinImage("common/grades/A+.png", 0),
A = gfx.CreateSkinImage("score/A.png", 0), A = gfx.CreateSkinImage("common/grades/A.png", 0),
B = gfx.CreateSkinImage("score/B.png", 0), B = gfx.CreateSkinImage("common/grades/B.png", 0),
C = gfx.CreateSkinImage("score/C.png", 0), C = gfx.CreateSkinImage("common/grades/C.png", 0),
D = gfx.CreateSkinImage("score/D.png", 0), D = gfx.CreateSkinImage("common/grades/D.png", 0),
} }
local gaugeTypeBadgeImages = { local gaugeTypeBadgeImages = {

20
scripts/songselect/chalwheel.lua
View File

@ -33,16 +33,16 @@ local legendTable = {
{["labelSingleLine"] = gfx.CreateLabel("PLAY",16, 0), ["labelMultiLine"] = gfx.CreateLabel("PLAY",16, 0), ["image"] = gfx.CreateSkinImage("legend/start.png", 0)} {["labelSingleLine"] = gfx.CreateLabel("PLAY",16, 0), ["labelMultiLine"] = gfx.CreateLabel("PLAY",16, 0), ["image"] = gfx.CreateSkinImage("legend/start.png", 0)}
} }
local grades = { local grades = {
{["max"] = 6999999, ["image"] = gfx.CreateSkinImage("score/D.png", 0)}, {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("common/grades/D.png", 0)},
{["max"] = 7999999, ["image"] = gfx.CreateSkinImage("score/C.png", 0)}, {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("common/grades/C.png", 0)},
{["max"] = 8699999, ["image"] = gfx.CreateSkinImage("score/B.png", 0)}, {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("common/grades/B.png", 0)},
{["max"] = 8999999, ["image"] = gfx.CreateSkinImage("score/A.png", 0)}, {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("common/grades/A.png", 0)},
{["max"] = 9299999, ["image"] = gfx.CreateSkinImage("score/A+.png", 0)}, {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("common/grades/A+.png", 0)},
{["max"] = 9499999, ["image"] = gfx.CreateSkinImage("score/AA.png", 0)}, {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("common/grades/AA.png", 0)},
{["max"] = 9699999, ["image"] = gfx.CreateSkinImage("score/AA+.png", 0)}, {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("common/grades/AA+.png", 0)},
{["max"] = 9799999, ["image"] = gfx.CreateSkinImage("score/AAA.png", 0)}, {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("common/grades/AAA.png", 0)},
{["max"] = 9899999, ["image"] = gfx.CreateSkinImage("score/AAA+.png", 0)}, {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("common/grades/AAA+.png", 0)},
{["max"] = 99999999, ["image"] = gfx.CreateSkinImage("score/S.png", 0)} {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("common/grades/S.png", 0)}
} }
local badges = { local badges = {

20
scripts/songselect/songwheel prelocal.lua
View File

@ -31,16 +31,16 @@ local legendTable = {
{["labelSingleLine"] = gfx.CreateLabel("PLAY",16, 0), ["labelMultiLine"] = gfx.CreateLabel("PLAY",16, 0), ["image"] = gfx.CreateSkinImage("legend/start.png", 0)} {["labelSingleLine"] = gfx.CreateLabel("PLAY",16, 0), ["labelMultiLine"] = gfx.CreateLabel("PLAY",16, 0), ["image"] = gfx.CreateSkinImage("legend/start.png", 0)}
} }
local grades = { local grades = {
{["max"] = 6999999, ["image"] = gfx.CreateSkinImage("score/D.png", 0)}, {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("common/grades/D.png", 0)},
{["max"] = 7999999, ["image"] = gfx.CreateSkinImage("score/C.png", 0)}, {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("common/grades/C.png", 0)},
{["max"] = 8699999, ["image"] = gfx.CreateSkinImage("score/B.png", 0)}, {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("common/grades/B.png", 0)},
{["max"] = 8999999, ["image"] = gfx.CreateSkinImage("score/A.png", 0)}, {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("common/grades/A.png", 0)},
{["max"] = 9299999, ["image"] = gfx.CreateSkinImage("score/A+.png", 0)}, {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("common/grades/A+.png", 0)},
{["max"] = 9499999, ["image"] = gfx.CreateSkinImage("score/AA.png", 0)}, {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("common/grades/AA.png", 0)},
{["max"] = 9699999, ["image"] = gfx.CreateSkinImage("score/AA+.png", 0)}, {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("common/grades/AA+.png", 0)},
{["max"] = 9799999, ["image"] = gfx.CreateSkinImage("score/AAA.png", 0)}, {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("common/grades/AAA.png", 0)},
{["max"] = 9899999, ["image"] = gfx.CreateSkinImage("score/AAA+.png", 0)}, {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("common/grades/AAA+.png", 0)},
{["max"] = 99999999, ["image"] = gfx.CreateSkinImage("score/S.png", 0)} {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("common/grades/S.png", 0)}
} }
local badges = { local badges = {

20
scripts/songselect/songwheel.old.but.newer.lua
View File

@ -31,16 +31,16 @@ local legendTable = {
{["labelSingleLine"] = gfx.CreateLabel("PLAY",16, 0), ["labelMultiLine"] = gfx.CreateLabel("PLAY",16, 0), ["image"] = gfx.CreateSkinImage("legend/start.png", 0)} {["labelSingleLine"] = gfx.CreateLabel("PLAY",16, 0), ["labelMultiLine"] = gfx.CreateLabel("PLAY",16, 0), ["image"] = gfx.CreateSkinImage("legend/start.png", 0)}
} }
local grades = { local grades = {
{["max"] = 6999999, ["image"] = gfx.CreateSkinImage("score/D.png", 0)}, {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("common/grades/D.png", 0)},
{["max"] = 7999999, ["image"] = gfx.CreateSkinImage("score/C.png", 0)}, {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("common/grades/C.png", 0)},
{["max"] = 8699999, ["image"] = gfx.CreateSkinImage("score/B.png", 0)}, {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("common/grades/B.png", 0)},
{["max"] = 8999999, ["image"] = gfx.CreateSkinImage("score/A.png", 0)}, {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("common/grades/A.png", 0)},
{["max"] = 9299999, ["image"] = gfx.CreateSkinImage("score/A+.png", 0)}, {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("common/grades/A+.png", 0)},
{["max"] = 9499999, ["image"] = gfx.CreateSkinImage("score/AA.png", 0)}, {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("common/grades/AA.png", 0)},
{["max"] = 9699999, ["image"] = gfx.CreateSkinImage("score/AA+.png", 0)}, {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("common/grades/AA+.png", 0)},
{["max"] = 9799999, ["image"] = gfx.CreateSkinImage("score/AAA.png", 0)}, {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("common/grades/AAA.png", 0)},
{["max"] = 9899999, ["image"] = gfx.CreateSkinImage("score/AAA+.png", 0)}, {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("common/grades/AAA+.png", 0)},
{["max"] = 99999999, ["image"] = gfx.CreateSkinImage("score/S.png", 0)} {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("common/grades/S.png", 0)}
} }
local badges = { local badges = {

20
scripts/songselect/songwheel3.lua
View File

@ -31,16 +31,16 @@ local legendTable = {
{["labelSingleLine"] = gfx.CreateLabel("PLAY",16, 0), ["labelMultiLine"] = gfx.CreateLabel("PLAY",16, 0), ["image"] = gfx.CreateSkinImage("legend/start.png", 0)} {["labelSingleLine"] = gfx.CreateLabel("PLAY",16, 0), ["labelMultiLine"] = gfx.CreateLabel("PLAY",16, 0), ["image"] = gfx.CreateSkinImage("legend/start.png", 0)}
} }
local grades = { local grades = {
{["max"] = 6999999, ["image"] = gfx.CreateSkinImage("score/D.png", 0)}, {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("common/grades/D.png", 0)},
{["max"] = 7999999, ["image"] = gfx.CreateSkinImage("score/C.png", 0)}, {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("common/grades/C.png", 0)},
{["max"] = 8699999, ["image"] = gfx.CreateSkinImage("score/B.png", 0)}, {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("common/grades/B.png", 0)},
{["max"] = 8999999, ["image"] = gfx.CreateSkinImage("score/A.png", 0)}, {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("common/grades/A.png", 0)},
{["max"] = 9299999, ["image"] = gfx.CreateSkinImage("score/A+.png", 0)}, {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("common/grades/A+.png", 0)},
{["max"] = 9499999, ["image"] = gfx.CreateSkinImage("score/AA.png", 0)}, {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("common/grades/AA.png", 0)},
{["max"] = 9699999, ["image"] = gfx.CreateSkinImage("score/AA+.png", 0)}, {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("common/grades/AA+.png", 0)},
{["max"] = 9799999, ["image"] = gfx.CreateSkinImage("score/AAA.png", 0)}, {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("common/grades/AAA.png", 0)},
{["max"] = 9899999, ["image"] = gfx.CreateSkinImage("score/AAA+.png", 0)}, {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("common/grades/AAA+.png", 0)},
{["max"] = 99999999, ["image"] = gfx.CreateSkinImage("score/S.png", 0)} {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("common/grades/S.png", 0)}
} }
local badges = { local badges = {

20
scripts/songselect/songwheel_before_rewrite.lua
View File

@ -33,16 +33,16 @@ local legendTable = {
{["labelSingleLine"] = gfx.CreateLabel("PLAY",16, 0), ["labelMultiLine"] = gfx.CreateLabel("PLAY",16, 0), ["image"] = gfx.CreateSkinImage("legend/start.png", 0)} {["labelSingleLine"] = gfx.CreateLabel("PLAY",16, 0), ["labelMultiLine"] = gfx.CreateLabel("PLAY",16, 0), ["image"] = gfx.CreateSkinImage("legend/start.png", 0)}
} }
local grades = { local grades = {
{["max"] = 6999999, ["image"] = gfx.CreateSkinImage("score/D.png", 0)}, {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("common/grades/D.png", 0)},
{["max"] = 7999999, ["image"] = gfx.CreateSkinImage("score/C.png", 0)}, {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("common/grades/C.png", 0)},
{["max"] = 8699999, ["image"] = gfx.CreateSkinImage("score/B.png", 0)}, {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("common/grades/B.png", 0)},
{["max"] = 8999999, ["image"] = gfx.CreateSkinImage("score/A.png", 0)}, {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("common/grades/A.png", 0)},
{["max"] = 9299999, ["image"] = gfx.CreateSkinImage("score/A+.png", 0)}, {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("common/grades/A+.png", 0)},
{["max"] = 9499999, ["image"] = gfx.CreateSkinImage("score/AA.png", 0)}, {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("common/grades/AA.png", 0)},
{["max"] = 9699999, ["image"] = gfx.CreateSkinImage("score/AA+.png", 0)}, {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("common/grades/AA+.png", 0)},
{["max"] = 9799999, ["image"] = gfx.CreateSkinImage("score/AAA.png", 0)}, {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("common/grades/AAA.png", 0)},
{["max"] = 9899999, ["image"] = gfx.CreateSkinImage("score/AAA+.png", 0)}, {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("common/grades/AAA+.png", 0)},
{["max"] = 99999999, ["image"] = gfx.CreateSkinImage("score/S.png", 0)} {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("common/grades/S.png", 0)}
} }
local badges = { local badges = {

0
textures/score/A+.png → textures/common/grades/A+.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

0
textures/score/A.png → textures/common/grades/A.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

0
textures/score/AA+.png → textures/common/grades/AA+.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

0
textures/score/AA.png → textures/common/grades/AA.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

0
textures/score/AAA+.png → textures/common/grades/AAA+.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

0
textures/score/AAA.png → textures/common/grades/AAA.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

0
textures/score/B.png → textures/common/grades/B.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
textures/score/C.png → textures/common/grades/C.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

0
textures/score/D.png → textures/common/grades/D.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

0
textures/score/S.png → textures/common/grades/S.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB