more changes
|
@ -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",
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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')
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
After Width: | Height: | Size: 1.8 KiB |
After Width: | Height: | Size: 4.7 KiB |
After Width: | Height: | Size: 4.3 KiB |
After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 29 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 96 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 85 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 120 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 134 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 128 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 26 KiB |