From 683e72c52e979c977581ba35e1c9e9a853da8334 Mon Sep 17 00:00:00 2001 From: FajsiEx Date: Sat, 31 Jul 2021 16:48:14 +0200 Subject: [PATCH] > move grades to common/grades folder --- scripts/challengeresult.lua | 2 +- scripts/gameplay newest.lua | 2 +- scripts/gameplay2.lua | 2 +- scripts/multiplayerscreen.lua | 20 +++++++++--------- scripts/result.lua | 20 +++++++++--------- scripts/songselect/chalwheel.lua | 20 +++++++++--------- scripts/songselect/songwheel prelocal.lua | 20 +++++++++--------- .../songselect/songwheel.old.but.newer.lua | 20 +++++++++--------- scripts/songselect/songwheel3.lua | 20 +++++++++--------- .../songselect/songwheel_before_rewrite.lua | 20 +++++++++--------- textures/{score => common/grades}/A+.png | Bin textures/{score => common/grades}/A.png | Bin textures/{score => common/grades}/AA+.png | Bin textures/{score => common/grades}/AA.png | Bin textures/{score => common/grades}/AAA+.png | Bin textures/{score => common/grades}/AAA.png | Bin textures/{score => common/grades}/B.png | Bin textures/{score => common/grades}/C.png | Bin textures/{score => common/grades}/D.png | Bin textures/{score => common/grades}/S.png | Bin 20 files changed, 73 insertions(+), 73 deletions(-) rename textures/{score => common/grades}/A+.png (100%) rename textures/{score => common/grades}/A.png (100%) rename textures/{score => common/grades}/AA+.png (100%) rename textures/{score => common/grades}/AA.png (100%) rename textures/{score => common/grades}/AAA+.png (100%) rename textures/{score => common/grades}/AAA.png (100%) rename textures/{score => common/grades}/B.png (100%) rename textures/{score => common/grades}/C.png (100%) rename textures/{score => common/grades}/D.png (100%) rename textures/{score => common/grades}/S.png (100%) diff --git a/scripts/challengeresult.lua b/scripts/challengeresult.lua index 8353a38..baf4aff 100644 --- a/scripts/challengeresult.lua +++ b/scripts/challengeresult.lua @@ -189,7 +189,7 @@ result_set = function() end 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 local gradew, gradeh = gfx.ImageSize(chart.gradeImg) chart.gradeAR = gradew / gradeh diff --git a/scripts/gameplay newest.lua b/scripts/gameplay newest.lua index d1a2877..ab2a7cb 100644 --- a/scripts/gameplay newest.lua +++ b/scripts/gameplay newest.lua @@ -1337,7 +1337,7 @@ function draw_users(detaTime) local rank = 0 for i, u in ipairs(users) do 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 user_text = '('..u.name..')'; diff --git a/scripts/gameplay2.lua b/scripts/gameplay2.lua index d1a2877..ab2a7cb 100644 --- a/scripts/gameplay2.lua +++ b/scripts/gameplay2.lua @@ -1337,7 +1337,7 @@ function draw_users(detaTime) local rank = 0 for i, u in ipairs(users) do 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 user_text = '('..u.name..')'; diff --git a/scripts/multiplayerscreen.lua b/scripts/multiplayerscreen.lua index 5e48b93..ad6b066 100644 --- a/scripts/multiplayerscreen.lua +++ b/scripts/multiplayerscreen.lua @@ -34,16 +34,16 @@ local did_exit = false; local diffColors = {{0,0,255}, {0,255,0}, {255,0,0}, {255, 0, 255}} local grades = { - {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("score/D.png", 0)}, - {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("score/C.png", 0)}, - {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("score/B.png", 0)}, - {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("score/A.png", 0)}, - {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("score/A+.png", 0)}, - {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("score/AA.png", 0)}, - {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("score/AA+.png", 0)}, - {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("score/AAA.png", 0)}, - {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("score/AAA+.png", 0)}, - {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("score/S.png", 0)} + {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("common/grades/D.png", 0)}, + {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("common/grades/C.png", 0)}, + {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("common/grades/B.png", 0)}, + {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("common/grades/A.png", 0)}, + {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("common/grades/A+.png", 0)}, + {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("common/grades/AA.png", 0)}, + {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("common/grades/AA+.png", 0)}, + {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("common/grades/AAA.png", 0)}, + {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("common/grades/AAA+.png", 0)}, + {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("common/grades/S.png", 0)} } local badges = { diff --git a/scripts/result.lua b/scripts/result.lua index 948c793..df6d2fc 100644 --- a/scripts/result.lua +++ b/scripts/result.lua @@ -22,16 +22,16 @@ local danBadgeImage = gfx.CreateSkinImage("dan/inf.png", 0); local volforceBadgeImage = gfx.CreateSkinImage("volforce/10.png", 0); local gradeImages = { - S = gfx.CreateSkinImage("score/S.png", 0), - AAA_P = gfx.CreateSkinImage("score/AAA+.png", 0), - AAA = gfx.CreateSkinImage("score/AAA.png", 0), - AA_P = gfx.CreateSkinImage("score/AA+.png", 0), - AA = gfx.CreateSkinImage("score/AA.png", 0), - A_P = gfx.CreateSkinImage("score/A+.png", 0), - A = gfx.CreateSkinImage("score/A.png", 0), - B = gfx.CreateSkinImage("score/B.png", 0), - C = gfx.CreateSkinImage("score/C.png", 0), - D = gfx.CreateSkinImage("score/D.png", 0), + S = gfx.CreateSkinImage("common/grades/S.png", 0), + AAA_P = gfx.CreateSkinImage("common/grades/AAA+.png", 0), + AAA = gfx.CreateSkinImage("common/grades/AAA.png", 0), + AA_P = gfx.CreateSkinImage("common/grades/AA+.png", 0), + AA = gfx.CreateSkinImage("common/grades/AA.png", 0), + A_P = gfx.CreateSkinImage("common/grades/A+.png", 0), + A = gfx.CreateSkinImage("common/grades/A.png", 0), + B = gfx.CreateSkinImage("common/grades/B.png", 0), + C = gfx.CreateSkinImage("common/grades/C.png", 0), + D = gfx.CreateSkinImage("common/grades/D.png", 0), } local gaugeTypeBadgeImages = { diff --git a/scripts/songselect/chalwheel.lua b/scripts/songselect/chalwheel.lua index f8b4a86..92353bf 100644 --- a/scripts/songselect/chalwheel.lua +++ b/scripts/songselect/chalwheel.lua @@ -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)} } local grades = { - {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("score/D.png", 0)}, - {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("score/C.png", 0)}, - {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("score/B.png", 0)}, - {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("score/A.png", 0)}, - {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("score/A+.png", 0)}, - {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("score/AA.png", 0)}, - {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("score/AA+.png", 0)}, - {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("score/AAA.png", 0)}, - {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("score/AAA+.png", 0)}, - {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("score/S.png", 0)} + {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("common/grades/D.png", 0)}, + {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("common/grades/C.png", 0)}, + {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("common/grades/B.png", 0)}, + {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("common/grades/A.png", 0)}, + {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("common/grades/A+.png", 0)}, + {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("common/grades/AA.png", 0)}, + {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("common/grades/AA+.png", 0)}, + {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("common/grades/AAA.png", 0)}, + {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("common/grades/AAA+.png", 0)}, + {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("common/grades/S.png", 0)} } local badges = { diff --git a/scripts/songselect/songwheel prelocal.lua b/scripts/songselect/songwheel prelocal.lua index 73ddd14..22f91d4 100644 --- a/scripts/songselect/songwheel prelocal.lua +++ b/scripts/songselect/songwheel prelocal.lua @@ -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)} } local grades = { - {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("score/D.png", 0)}, - {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("score/C.png", 0)}, - {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("score/B.png", 0)}, - {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("score/A.png", 0)}, - {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("score/A+.png", 0)}, - {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("score/AA.png", 0)}, - {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("score/AA+.png", 0)}, - {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("score/AAA.png", 0)}, - {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("score/AAA+.png", 0)}, - {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("score/S.png", 0)} + {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("common/grades/D.png", 0)}, + {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("common/grades/C.png", 0)}, + {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("common/grades/B.png", 0)}, + {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("common/grades/A.png", 0)}, + {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("common/grades/A+.png", 0)}, + {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("common/grades/AA.png", 0)}, + {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("common/grades/AA+.png", 0)}, + {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("common/grades/AAA.png", 0)}, + {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("common/grades/AAA+.png", 0)}, + {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("common/grades/S.png", 0)} } local badges = { diff --git a/scripts/songselect/songwheel.old.but.newer.lua b/scripts/songselect/songwheel.old.but.newer.lua index 73ddd14..22f91d4 100644 --- a/scripts/songselect/songwheel.old.but.newer.lua +++ b/scripts/songselect/songwheel.old.but.newer.lua @@ -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)} } local grades = { - {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("score/D.png", 0)}, - {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("score/C.png", 0)}, - {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("score/B.png", 0)}, - {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("score/A.png", 0)}, - {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("score/A+.png", 0)}, - {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("score/AA.png", 0)}, - {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("score/AA+.png", 0)}, - {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("score/AAA.png", 0)}, - {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("score/AAA+.png", 0)}, - {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("score/S.png", 0)} + {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("common/grades/D.png", 0)}, + {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("common/grades/C.png", 0)}, + {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("common/grades/B.png", 0)}, + {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("common/grades/A.png", 0)}, + {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("common/grades/A+.png", 0)}, + {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("common/grades/AA.png", 0)}, + {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("common/grades/AA+.png", 0)}, + {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("common/grades/AAA.png", 0)}, + {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("common/grades/AAA+.png", 0)}, + {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("common/grades/S.png", 0)} } local badges = { diff --git a/scripts/songselect/songwheel3.lua b/scripts/songselect/songwheel3.lua index ace30cb..f6beb3f 100644 --- a/scripts/songselect/songwheel3.lua +++ b/scripts/songselect/songwheel3.lua @@ -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)} } local grades = { - {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("score/D.png", 0)}, - {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("score/C.png", 0)}, - {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("score/B.png", 0)}, - {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("score/A.png", 0)}, - {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("score/A+.png", 0)}, - {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("score/AA.png", 0)}, - {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("score/AA+.png", 0)}, - {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("score/AAA.png", 0)}, - {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("score/AAA+.png", 0)}, - {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("score/S.png", 0)} + {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("common/grades/D.png", 0)}, + {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("common/grades/C.png", 0)}, + {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("common/grades/B.png", 0)}, + {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("common/grades/A.png", 0)}, + {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("common/grades/A+.png", 0)}, + {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("common/grades/AA.png", 0)}, + {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("common/grades/AA+.png", 0)}, + {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("common/grades/AAA.png", 0)}, + {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("common/grades/AAA+.png", 0)}, + {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("common/grades/S.png", 0)} } local badges = { diff --git a/scripts/songselect/songwheel_before_rewrite.lua b/scripts/songselect/songwheel_before_rewrite.lua index cab520b..584639f 100644 --- a/scripts/songselect/songwheel_before_rewrite.lua +++ b/scripts/songselect/songwheel_before_rewrite.lua @@ -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)} } local grades = { - {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("score/D.png", 0)}, - {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("score/C.png", 0)}, - {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("score/B.png", 0)}, - {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("score/A.png", 0)}, - {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("score/A+.png", 0)}, - {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("score/AA.png", 0)}, - {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("score/AA+.png", 0)}, - {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("score/AAA.png", 0)}, - {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("score/AAA+.png", 0)}, - {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("score/S.png", 0)} + {["max"] = 6999999, ["image"] = gfx.CreateSkinImage("common/grades/D.png", 0)}, + {["max"] = 7999999, ["image"] = gfx.CreateSkinImage("common/grades/C.png", 0)}, + {["max"] = 8699999, ["image"] = gfx.CreateSkinImage("common/grades/B.png", 0)}, + {["max"] = 8999999, ["image"] = gfx.CreateSkinImage("common/grades/A.png", 0)}, + {["max"] = 9299999, ["image"] = gfx.CreateSkinImage("common/grades/A+.png", 0)}, + {["max"] = 9499999, ["image"] = gfx.CreateSkinImage("common/grades/AA.png", 0)}, + {["max"] = 9699999, ["image"] = gfx.CreateSkinImage("common/grades/AA+.png", 0)}, + {["max"] = 9799999, ["image"] = gfx.CreateSkinImage("common/grades/AAA.png", 0)}, + {["max"] = 9899999, ["image"] = gfx.CreateSkinImage("common/grades/AAA+.png", 0)}, + {["max"] = 99999999, ["image"] = gfx.CreateSkinImage("common/grades/S.png", 0)} } local badges = { diff --git a/textures/score/A+.png b/textures/common/grades/A+.png similarity index 100% rename from textures/score/A+.png rename to textures/common/grades/A+.png diff --git a/textures/score/A.png b/textures/common/grades/A.png similarity index 100% rename from textures/score/A.png rename to textures/common/grades/A.png diff --git a/textures/score/AA+.png b/textures/common/grades/AA+.png similarity index 100% rename from textures/score/AA+.png rename to textures/common/grades/AA+.png diff --git a/textures/score/AA.png b/textures/common/grades/AA.png similarity index 100% rename from textures/score/AA.png rename to textures/common/grades/AA.png diff --git a/textures/score/AAA+.png b/textures/common/grades/AAA+.png similarity index 100% rename from textures/score/AAA+.png rename to textures/common/grades/AAA+.png diff --git a/textures/score/AAA.png b/textures/common/grades/AAA.png similarity index 100% rename from textures/score/AAA.png rename to textures/common/grades/AAA.png diff --git a/textures/score/B.png b/textures/common/grades/B.png similarity index 100% rename from textures/score/B.png rename to textures/common/grades/B.png diff --git a/textures/score/C.png b/textures/common/grades/C.png similarity index 100% rename from textures/score/C.png rename to textures/common/grades/C.png diff --git a/textures/score/D.png b/textures/common/grades/D.png similarity index 100% rename from textures/score/D.png rename to textures/common/grades/D.png diff --git a/textures/score/S.png b/textures/common/grades/S.png similarity index 100% rename from textures/score/S.png rename to textures/common/grades/S.png