diff --git a/config-definitions.json b/config-definitions.json index 4e67594..2641223 100644 --- a/config-definitions.json +++ b/config-definitions.json @@ -37,6 +37,11 @@ "type": "text", "default": "nothing" }, + "beta_idol": { + "label": "Toggle between Old and New Idol Mode", + "type": "bool", + "default": false + }, "words": { "type": "selection", diff --git a/scripts/components/diff_rectangle.lua b/scripts/components/diff_rectangle.lua index d1e249d..0a36b24 100644 --- a/scripts/components/diff_rectangle.lua +++ b/scripts/components/diff_rectangle.lua @@ -7,7 +7,8 @@ local difficultyLabelImages = { gfx.CreateSkinImage("diff/5 infinite.png", 0), gfx.CreateSkinImage("diff/6 gravity.png", 0), gfx.CreateSkinImage("diff/7 heavenly.png", 0), - gfx.CreateSkinImage("diff/8 vivid.png", 0) + gfx.CreateSkinImage("diff/8 vivid.png", 0), + gfx.CreateSkinImage("diff/9 exceed.png", 0) } local difficultyLabelTexts = { @@ -18,7 +19,8 @@ local difficultyLabelTexts = { "INF", "GRV", "HVN", - "VVD" + "VVD", + "XCD" } function render(deltatime, x, y, scale, diff, level) diff --git a/scripts/multiplayerscreen.lua b/scripts/multiplayerscreen.lua index b246e3d..5649351 100644 --- a/scripts/multiplayerscreen.lua +++ b/scripts/multiplayerscreen.lua @@ -176,8 +176,6 @@ songjacket = function() -- self explanatory -- done hovered = function() missing_song = false mpScreen.SelectSong() - gfx.BeginPath() - gfx.Text("hi",100,100) end end diff --git a/scripts/result.lua b/scripts/result.lua index 9e77479..85a6cfa 100644 --- a/scripts/result.lua +++ b/scripts/result.lua @@ -6,7 +6,12 @@ local Numbers = require('components.numbers') local DiffRectangle = require('components.diff_rectangle'); local lang = require("language.call") -local creww = game.GetSkinSetting("single_idol") +local crew = game.GetSkinSetting("single_idol") +local betacrew = game.GetSkinSetting("beta_idol") +local bad = "/bad" +local okay = "/okay" +local veryokay = "/good" +local idle = "/idle" local VolforceWindow = require('components.volforceWindow') @@ -73,6 +78,19 @@ local gradeImages = { D = gfx.CreateSkinImage("common/grades/D.png", 0) } +local grades = { + D = 6900000, + C = 7900000, + B = 8600000, + A = 8900000, + A_P = 9200000, + AA = 9400000, + AA_P = 9600000, + AAA = 9700000, + AAA_P = 9800000, + S = 9900000 + } + local gaugeTypeBadgeImages = { gfx.CreateSkinImage("result/gauge_type_badges/effective.png", 0), gfx.CreateSkinImage("result/gauge_type_badges/excessive.png", 0), @@ -138,9 +156,6 @@ local clearBadgeImages = { }, } --- ANIMS -local idolAnimation = gfx.LoadSkinAnimation('crew/anim/'..creww, 1 / 30, 0, true); - local transitionEnterScale = 0; local idolAnimTransitionScale = 0; @@ -269,6 +284,11 @@ function drawTimingBar(y, value, max, type) gfx.ClosePath(); end +gettyping = function (animtype) + idolAnimation = gfx.LoadSkinAnimation('crew/anim/'..crew..animtype, 1 / 30, 0, true); +end + + local drawIdol = function(deltaTime) local idolAnimTickRes = gfx.TickAnimation(idolAnimation, deltaTime); if idolAnimTickRes == 1 then @@ -801,10 +821,22 @@ result_set = function() end earlyLateBarsStats.criticals = result.perfects -- Criticals are for all objects - if result.score ~= 9900000 then - local crash = nil; - crash(); + if betacrew == true then + if result.score > grades.S then + animtype = veryokay + elseif result.score > grades.AAA then + animtype = okay + elseif result.score > grades.A_P then + animtype = bad + elseif result.score < grades.A_P then + animtype = bad end + else + animtype = idle + end + + gettyping(animtype) + end drawResultScreen = function (x, y, w, h, deltaTime) @@ -826,6 +858,7 @@ drawResultScreen = function (x, y, w, h, deltaTime) drawRightPanel() drawRightBarAni(deltaTime) + drawbgrade() drawmod() drawRightPanelContent() diff --git a/scripts/songselect/songwheel.lua b/scripts/songselect/songwheel.lua index d45620c..e6b8e6c 100644 --- a/scripts/songselect/songwheel.lua +++ b/scripts/songselect/songwheel.lua @@ -50,6 +50,7 @@ local difficultyLabelImages = { gfx.CreateSkinImage("song_select/plate/difficulty_labels/gravity.png", 1), gfx.CreateSkinImage("song_select/plate/difficulty_labels/heavenly.png", 1), gfx.CreateSkinImage("song_select/plate/difficulty_labels/vivid.png", 1), + gfx.CreateSkinImage("song_select/plate/difficulty_labels/exceed.png", 1) } local badgeImages = { @@ -103,6 +104,7 @@ local difficultyLabelUnderImages = { gfx.CreateSkinImage("songtransition/difficulty_labels/grv.png", 0), gfx.CreateSkinImage("songtransition/difficulty_labels/hvn.png", 0), gfx.CreateSkinImage("songtransition/difficulty_labels/vvd.png", 0), + gfx.CreateSkinImage("songtransition/difficulty_labels/xcd.png", 0) } game.LoadSkinSample('song_wheel/cursor_change.wav') diff --git a/scripts/titlescreen/modeselect.lua b/scripts/titlescreen/modeselect.lua index 2036c5c..5def0ce 100644 --- a/scripts/titlescreen/modeselect.lua +++ b/scripts/titlescreen/modeselect.lua @@ -15,6 +15,7 @@ local BAR_ALPHA = 191 local HEADER_HEIGHT = 100 local crew = game.GetSkinSetting("single_idol") +local type = "/idle" local resources = { images = { @@ -26,7 +27,7 @@ local resources = { selectedButtonOverImage = gfx.CreateSkinImage("titlescreen/selected_button_over.png", 0) }, anims = { - idolAnimation = gfx.LoadSkinAnimation("crew/anim/" .. crew, 1 / 30, 0, true) + idolAnimation = gfx.LoadSkinAnimation("crew/anim/"..crew..type, 1 / 30, 0, true), }, audiosamples = { bgm = "titlescreen/bgm.wav", @@ -306,7 +307,7 @@ local function draw_titlescreen(deltaTime) gfx.BeginPath() Background.draw(deltaTime) - local idolAnimTickRes = gfx.TickAnimation(resources.anims.idolAnimation, deltaTime) + idolAnimTickRes = gfx.TickAnimation(resources.anims.idolAnimation, deltaTime) if idolAnimTickRes == 1 then gfx.GlobalAlpha(idolAnimTransitionScale) diff --git a/textures/song_select/level/exceed no hexagon.png b/textures/song_select/level/exceed no hexagon.png new file mode 100644 index 0000000..4145aba Binary files /dev/null and b/textures/song_select/level/exceed no hexagon.png differ diff --git a/textures/song_select/level/exceed.png b/textures/song_select/level/exceed.png new file mode 100644 index 0000000..605396f Binary files /dev/null and b/textures/song_select/level/exceed.png differ diff --git a/textures/song_select/plate/difficulty_labels/exceed.png b/textures/song_select/plate/difficulty_labels/exceed.png new file mode 100644 index 0000000..7c2e9f8 Binary files /dev/null and b/textures/song_select/plate/difficulty_labels/exceed.png differ diff --git a/textures/songtransition/difficulty_labels/xcd.png b/textures/songtransition/difficulty_labels/xcd.png new file mode 100644 index 0000000..4145aba Binary files /dev/null and b/textures/songtransition/difficulty_labels/xcd.png differ diff --git a/textures/volforce/1.png b/textures/volforce/1.png index 83872fe..eb0de8a 100644 Binary files a/textures/volforce/1.png and b/textures/volforce/1.png differ diff --git a/textures/volforce/10.png b/textures/volforce/10.png index c9b6162..415d98e 100644 Binary files a/textures/volforce/10.png and b/textures/volforce/10.png differ diff --git a/textures/volforce/2.png b/textures/volforce/2.png index 65d5979..b0edd7a 100644 Binary files a/textures/volforce/2.png and b/textures/volforce/2.png differ diff --git a/textures/volforce/3.png b/textures/volforce/3.png index c6166d0..d42efd6 100644 Binary files a/textures/volforce/3.png and b/textures/volforce/3.png differ diff --git a/textures/volforce/4.png b/textures/volforce/4.png index 71c58e4..fae190c 100644 Binary files a/textures/volforce/4.png and b/textures/volforce/4.png differ diff --git a/textures/volforce/5.png b/textures/volforce/5.png index f9e8e37..753c0c2 100644 Binary files a/textures/volforce/5.png and b/textures/volforce/5.png differ diff --git a/textures/volforce/6.png b/textures/volforce/6.png index e189cd2..280c40d 100644 Binary files a/textures/volforce/6.png and b/textures/volforce/6.png differ diff --git a/textures/volforce/7.png b/textures/volforce/7.png index 06eb8e2..bd66ec7 100644 Binary files a/textures/volforce/7.png and b/textures/volforce/7.png differ diff --git a/textures/volforce/8.png b/textures/volforce/8.png index df50298..83c906b 100644 Binary files a/textures/volforce/8.png and b/textures/volforce/8.png differ diff --git a/textures/volforce/9.png b/textures/volforce/9.png index bf3f5dc..15fb364 100644 Binary files a/textures/volforce/9.png and b/textures/volforce/9.png differ