diff --git a/scripts/songselect/songwheel.lua b/scripts/songselect/songwheel.lua index 2121d17..fe9c085 100644 --- a/scripts/songselect/songwheel.lua +++ b/scripts/songselect/songwheel.lua @@ -2,7 +2,12 @@ local Easing = require('common.easings'); local backgroundImage = gfx.CreateSkinImage("song_select/bg.png", 1) -local dataBackgroundOverlayImage = gfx.CreateSkinImage("song_select/data_bg_overlay.png", 1) +local dataPanelImage = gfx.CreateSkinImage("song_select/data_bg_overlay.png", 1) +local dataGlowOverlayImage = gfx.CreateSkinImage("song_select/data_panel/data_glow_overlay.png", 1) +local gradeBgImage = gfx.CreateSkinImage("song_select/data_panel/grade_bg.png", 1) +local badgeBgImage = gfx.CreateSkinImage("song_select/data_panel/clear_badge_bg.png", 1) +local effectedBgImage = gfx.CreateSkinImage("song_select/data_panel/effected_bg.png", 1) +local illustratedBgImage = gfx.CreateSkinImage("song_select/data_panel/illust_bg.png", 1) local songPlateBg = gfx.CreateSkinImage("song_select/plate/bg.png", 1) local songPlateBottomBarOverlayImage = gfx.CreateSkinImage("song_select/plate/bottom_bar_overlay.png", 1) @@ -182,7 +187,7 @@ function drawBackground() local song = songwheel.songs[selectedIndex]; local diff = song.difficulties[selectedDifficulty]; local bestScore = diff.scores[1]; - if song and diff and bestScore then + if song and diff then local jacketImage = getJacketImage(song); if jacketImage ~= defaultJacketImage then gfx.BeginPath() @@ -197,7 +202,23 @@ function drawBackground() end gfx.BeginPath() - gfx.ImageRect(0, 0, desw, desh, dataBackgroundOverlayImage, transitionAfterscrollDataOverlayAlpha, 0) + end + + gfx.ImageRect(0, 0, desw, desh, dataPanelImage, 1, 0) + + if song and diff then + gfx.BeginPath() + gfx.ImageRect(0, 0, desw, desh, dataGlowOverlayImage, transitionAfterscrollDataOverlayAlpha, 0) + gfx.BeginPath() + + gfx.ImageRect(341, 754, 85, 85, gradeBgImage, transitionAfterscrollDataOverlayAlpha, 0) + gfx.BeginPath() + gfx.ImageRect(391, 687, 180*0.85, 226*0.85, badgeBgImage, transitionAfterscrollDataOverlayAlpha, 0) + gfx.BeginPath() + + gfx.ImageRect(95, 1165, 433, 30, effectedBgImage, transitionAfterscrollDataOverlayAlpha, 0) + gfx.BeginPath() + gfx.ImageRect(95, 1195, 433, 30, illustratedBgImage, transitionAfterscrollDataOverlayAlpha, 0) end end diff --git a/textures/song_select/cursor_diamond.png b/textures/song_select/cursor_diamond.png deleted file mode 100644 index e0563e4..0000000 Binary files a/textures/song_select/cursor_diamond.png and /dev/null differ diff --git a/textures/song_select/cursor_diamond_wire.png b/textures/song_select/cursor_diamond_wire.png deleted file mode 100644 index 547b6ed..0000000 Binary files a/textures/song_select/cursor_diamond_wire.png and /dev/null differ diff --git a/textures/song_select/clear area.png b/textures/song_select/data_panel/clear_badge_bg.png similarity index 100% rename from textures/song_select/clear area.png rename to textures/song_select/data_panel/clear_badge_bg.png diff --git a/textures/song_select/data_panel/data_glow_overlay.png b/textures/song_select/data_panel/data_glow_overlay.png new file mode 100644 index 0000000..ff5000c Binary files /dev/null and b/textures/song_select/data_panel/data_glow_overlay.png differ diff --git a/textures/song_select/data_panel/effected_bg.png b/textures/song_select/data_panel/effected_bg.png new file mode 100644 index 0000000..7f6e874 Binary files /dev/null and b/textures/song_select/data_panel/effected_bg.png differ diff --git a/textures/song_select/medal area.png b/textures/song_select/data_panel/grade_bg.png similarity index 100% rename from textures/song_select/medal area.png rename to textures/song_select/data_panel/grade_bg.png diff --git a/textures/song_select/data_panel/illust_bg.png b/textures/song_select/data_panel/illust_bg.png new file mode 100644 index 0000000..d6b64d0 Binary files /dev/null and b/textures/song_select/data_panel/illust_bg.png differ diff --git a/textures/song_select/other reactive UI elements.png b/textures/song_select/other reactive UI elements.png deleted file mode 100644 index 88ea8b6..0000000 Binary files a/textures/song_select/other reactive UI elements.png and /dev/null differ