Skip to content

Commit 5162cdd

Browse files
JouswayJousway
committed
added noteskin to source and fixed last stuff for 0.5 release
1 parent 37d4785 commit 5162cdd

File tree

10 files changed

+637
-34
lines changed

10 files changed

+637
-34
lines changed

‎BGAnimations/ScreenEvaluation Background.lua‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,24 @@ return Def.ActorFrame {
44
InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT);
55
OnCommand=function(self)
66
if iidxlifetable[#iidxlifetable] > 79 then
7-
self:diffuse(color("#90eff6"))
7+
self:diffuse(color("#376eac"))
88
else
9-
self:diffuse(color("#ff0000"))
9+
self:diffuse(color("#8c5044"))
1010
end
1111
end
1212
};
1313
Def.Quad {
1414
InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT);
1515
OnCommand=cmd(diffuse,color("#000000");fadetop,0.8;diffusealpha,0.8);
1616
};
17+
Def.Quad {
18+
InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;fadebottom,0.8;diffusealpha,0.8);
19+
OnCommand=function(self)
20+
if iidxlifetable[#iidxlifetable] > 79 then
21+
self:diffuse(color("#93f2f8"))
22+
else
23+
self:diffuse(color("#f7a4ab"))
24+
end
25+
end
26+
};
1727
};

‎BGAnimations/ScreenEvaluation overlay.lua‎

Lines changed: 163 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,44 +11,174 @@ local iidxgrade = {
1111
["Grade_Failed"] = "F",
1212
}
1313

14-
t[#t+1] = Def.ActorFrame {
15-
InitCommand=cmd(x,SCREEN_CENTER_X-240;y,SCREEN_CENTER_Y-200);
16-
LoadFont("Common Normal") .. {
17-
Text=tonumber(string.format("%.0f", totaliidxscore));
18-
InitCommand=cmd(x,0;y,160);
19-
OnCommand=function(self)
20-
local stageaward = STATSMAN:GetCurStageStats():GetPlayerStageStats(PLAYER_1):GetStageAward()
21-
if stageaward == "StageAward_FullComboW1" then
22-
self:settext("204620")
23-
elseif stageaward == "StageAward_FullComboW1" then
24-
self:settext(tonumber(string.format("%.0f", totaliidxscore))+3111)
14+
local st = STATSMAN:GetCurStageStats():GetPlayerStageStats(PLAYER_1)
15+
local scorename = {
16+
["GREAT2"] = st:GetTapNoteScores("TapNoteScore_W1"),
17+
["GREAT"] = st:GetTapNoteScores("TapNoteScore_W2"),
18+
["GOOD"] = st:GetTapNoteScores("TapNoteScore_W3"),
19+
["BAD"] = st:GetTapNoteScores("TapNoteScore_W4"),
20+
["POOR"] = st:GetTapNoteScores("TapNoteScore_W5")+st:GetTapNoteScores("TapNoteScore_Miss"),
21+
["TOTAL SCORE"] = totaliidxscore,
22+
["TOTAL NOTES"] = radarvalue("RadarCategory_Notes"),
23+
["MAXCOMBO"] = st:MaxCombo(),
24+
}
25+
26+
local scorehighest = {
27+
st:GetTapNoteScores("TapNoteScore_W1"),
28+
st:GetTapNoteScores("TapNoteScore_W2"),
29+
st:GetTapNoteScores("TapNoteScore_W3"),
30+
st:GetTapNoteScores("TapNoteScore_W4"),
31+
st:GetTapNoteScores("TapNoteScore_W5")+st:GetTapNoteScores("TapNoteScore_Miss"),
32+
}
33+
34+
local gethighestscore = math.max(unpack(scorehighest))
35+
36+
local function iidxline(pos1,pos2,width,text,scoremode,flash)
37+
local text2
38+
if flash then
39+
text2 = "GREAT2"
40+
else
41+
text2 = text
42+
end
43+
return Def.ActorFrame {
44+
Def.Quad {
45+
InitCommand=cmd(halign,0;y,pos1;x,-(pos2+1.25);zoomto,width+2.5,25;diffuse,color("#000000"));
46+
};
47+
Def.Quad {
48+
InitCommand=cmd(halign,0;y,pos1;x,-pos2;zoomto,width,22.5;diffuse,color("#4a575d"));
49+
};
50+
Def.Quad {
51+
InitCommand=cmd(halign,0;y,pos1;x,-pos2;zoomto,5,15;diffuse,color("0,0,0,0"));
52+
OnCommand=function(self)
53+
if scoremode then
54+
self:diffuse(color("0,0,0,1"))
55+
if scorename[text2] == gethighestscore then
56+
self:diffuseblink():effectperiod(0.1):effectcolor1(color("0,0,0,1")):effectcolor2(color("#ffd73c"))
57+
end
58+
end
59+
end;
60+
};
61+
LoadFont("Common Normal") .. {
62+
Text="0000";
63+
InitCommand=cmd(halign,1;y,pos1;x,(width-pos2-10);zoomx,1.6;diffuse,color("#05c5db");strokecolor,color("#000000");diffusealpha,0.5);
64+
OnCommand=function(self)
65+
if string.find(text, "SCORE") then
66+
self:settext("000000")
67+
end
2568
end
26-
end
69+
};
70+
Def.Quad {
71+
InitCommand=cmd(halign,1;y,pos1;x,(width-pos2);zoomto,33,22.5;diffuse,color("#4a575d"));
72+
OnCommand=function(self)
73+
if scorename[text2] > 99999 then
74+
self:zoomto(145,22.5)
75+
elseif scorename[text2] > 9999 then
76+
self:zoomto(122.5,22.5)
77+
elseif scorename[text2] > 999 then
78+
self:zoomto(100,22.5)
79+
elseif scorename[text2] > 99 then
80+
self:zoomto(77.5,22.5)
81+
elseif scorename[text2] > 9 then
82+
self:zoomto(55,22.5)
83+
else
84+
self:zoomto(32.5,22.5)
85+
end
86+
self:sleep(0.01)
87+
self:queuecommand("On")
88+
end;
89+
};
90+
LoadFont("Common Normal") .. {
91+
Text=text;
92+
InitCommand=cmd(halign,0;y,pos1;x,-(pos2-10);zoomx,0.7;zoomy,0.6);
93+
OnCommand=function(self)
94+
if scoremode then
95+
self:x(-(pos2-20))
96+
self:zoomx(1)
97+
end
98+
if flash then
99+
self:diffuseblink():effectperiod(0.1):effectcolor1(color("#f85890")):effectcolor2(color("#5888f8"))
100+
end
101+
end;
102+
};
103+
LoadFont("Common Normal") .. {
104+
InitCommand=cmd(halign,1;y,pos1;x,(width-pos2-10);zoomx,1.6;diffuse,color("#05c5db");strokecolor,color("#000000"));
105+
OnCommand=function(self)
106+
if string.find(text, "TOTAL SCORE") then
107+
local stageaward = STATSMAN:GetCurStageStats():GetPlayerStageStats(PLAYER_1):GetStageAward()
108+
if stageaward == "StageAward_FullComboW1" then
109+
self:settext("204620")
110+
elseif iidxlifetable[#iidxlifetable] == 80 and stageaward == "StageAward_FullComboW2" then
111+
self:settext(tonumber(string.format("%.0f", totaliidxscore))+11900)
112+
elseif stageaward == "StageAward_FullComboW2" then
113+
self:settext(tonumber(string.format("%.0f", totaliidxscore))+3111)
114+
elseif iidxlifetable[#iidxlifetable] == 80 then
115+
self:settext(tonumber(string.format("%.0f", totaliidxscore))+5730)
116+
else
117+
self:settext(tonumber(string.format("%.0f", totaliidxscore)))
118+
end
119+
elseif string.find(text, "TOTAL NOTES") then
120+
self:settext(radarvalue("RadarCategory_Notes"))
121+
elseif string.find(text, "MAXCOMBO") then
122+
self:settext(st:MaxCombo())
123+
elseif string.find(text, "GREAT") then
124+
if flash then
125+
self:settext(st:GetTapNoteScores("TapNoteScore_W1"))
126+
else
127+
self:settext(st:GetTapNoteScores("TapNoteScore_W2"))
128+
end
129+
elseif string.find(text, "GOOD") then
130+
self:settext(st:GetTapNoteScores("TapNoteScore_W3"))
131+
elseif string.find(text, "BAD") then
132+
self:settext(st:GetTapNoteScores("TapNoteScore_W4"))
133+
elseif string.find(text, "POOR") then
134+
self:settext(st:GetTapNoteScores("TapNoteScore_W5")+st:GetTapNoteScores("TapNoteScore_Miss"))
135+
else
136+
self:settext("0")
137+
end
138+
end
139+
};
140+
};
141+
142+
end
143+
144+
t[#t+1] = Def.ActorFrame {
145+
InitCommand=cmd(x,SCREEN_CENTER_X-240;y,SCREEN_CENTER_Y-190);
146+
Def.Quad {
147+
InitCommand=cmd(y,60;x,-5;zoomto,310,207.5;diffuse,color("0,0,0,1"));
27148
};
28149
Def.Quad {
29-
InitCommand=cmd(zoomto,280,90*1.6;diffuse,color("0,0.5,0,0.5");valign,0);
150+
InitCommand=cmd(y,60;x,-152.5;zoomto,2.5,195;diffuse,color("#ffd73c"));
30151
};
31152
Def.Quad {
32-
InitCommand=cmd(zoomto,280,20*1.6;diffuse,color("0.5,0,0,0.5");valign,1);
153+
InitCommand=cmd(zoomto,290,80*1.85;diffuse,color("0,0.5,0,0.5");valign,0);
33154
};
155+
Def.Quad {
156+
InitCommand=cmd(zoomto,290,20*1.85;diffuse,color("0.5,0,0,0.5");valign,1);
157+
};
158+
159+
iidxline(180,150,270,"STAGE SCORE");
160+
iidxline(205,150,230,"TOTAL NOTES");
161+
iidxline(230,150,230,"MAXCOMBO");
162+
163+
iidxline(265,150,210,"GREAT",true,true);
164+
iidxline(290,150,210,"GREAT",true);
165+
iidxline(315,150,210,"GOOD",true);
166+
iidxline(340,150,210,"BAD",true);
167+
iidxline(365,150,210,"POOR",true);
168+
169+
iidxline(395,170,270,"TOTAL SCORE");
34170
};
35171
local lifetable = {};
36172
for i = 1,#iidxlifetable do
37-
local iidxlinecolour = color("0,1,0,1")
38-
if iidxlifetable[i] > 79 then
39-
iidxlinecolour = color("1,0,0,1")
40-
end
41-
lifetable[i] = {{i/(#iidxlifetable/280), -iidxlifetable[i]*1.6, 0}, iidxlinecolour}
42-
--[[t[#t+1] = Def.ActorFrame {
43-
InitCommand=cmd(x,SCREEN_CENTER_X-90;y,SCREEN_CENTER_Y+80);
44-
Def.Quad {
45-
InitCommand=cmd(zoomto,1,1;diffuse,color("0,0,0,1");y,-iidxlifetable[i];x,i/(#iidxlifetable/150));
46-
};
47-
};--]]
173+
local iidxlinecolour = color("0,1,0,1")
174+
if iidxlifetable[i] > 79 then
175+
iidxlinecolour = color("1,0,0,1")
176+
end
177+
lifetable[i] = {{i/(#iidxlifetable/290), -iidxlifetable[i]*1.85, 0}, iidxlinecolour}
48178
end
49179

50180
t[#t+1] = Def.ActorFrame {
51-
InitCommand=cmd(x,SCREEN_CENTER_X-140-240;y,SCREEN_CENTER_Y+80*1.6-200);
181+
InitCommand=cmd(x,SCREEN_CENTER_X-145-240;y,SCREEN_CENTER_Y+80*1.85-190);
52182
Def.ActorMultiVertex{
53183
OnCommand=function(self)
54184
self:SetDrawState{Mode="DrawMode_LineStrip"};
@@ -60,13 +190,13 @@ t[#t+1] = Def.ActorFrame {
60190
};
61191

62192
t[#t+1] = Def.ActorFrame {
63-
InitCommand=cmd(x,SCREEN_CENTER_X-240;y,SCREEN_CENTER_Y-200);
193+
InitCommand=cmd(x,SCREEN_CENTER_X-240;y,SCREEN_CENTER_Y-190);
64194
LoadFont("Common Normal") .. {
65195
Text="DJ LEVEL";
66-
InitCommand=cmd(x,-115;y,80*1.6;zoomy,0.5;halign,0);
196+
InitCommand=cmd(x,-132.5;y,132.5;zoomx,1.25;zoomy,0.5;halign,0);
67197
};
68198
LoadFont("Common Normal") .. {
69-
InitCommand=cmd(x,107.5;y,40*1.6;halign,1;diffuse,color("#a2f1f3");strokecolor,color("#000000");zoom,4.5);
199+
InitCommand=cmd(x,132.5;y,75;halign,1;diffuse,color("#a2f1f3");strokecolor,color("#000000");zoom,4.5;zoomx,5.5);
70200
OnCommand=function(self)
71201
if iidxlifetable[#iidxlifetable] > 79 then
72202
self:settext(iidxgrade[STATSMAN:GetCurStageStats():GetPlayerStageStats(PLAYER_1):GetGrade()])
@@ -75,6 +205,10 @@ t[#t+1] = Def.ActorFrame {
75205
end
76206
end
77207
};
208+
LoadFont("Common Normal") .. {
209+
Text="PLAYER01 SCORE REPORT";
210+
InitCommand=cmd(x,-140;y,155;zoomx,0.6;zoomy,0.4;halign,0);
211+
};
78212
};
79213

80214
return t;

‎BGAnimations/ScreenGameplay overlay.lua‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,7 @@ t[#t+1] = Def.ActorFrame {
317317
Def.Quad {
318318
InitCommand=cmd(zoomto,20,20;diffuse,color("#000000");y,-10;x,-245;halign,1);
319319
OnCommand=function(self)
320-
if totaliidxscore > 999999 then
321-
self:zoomto(146,20)
322-
elseif totaliidxscore > 99999 then
320+
if totaliidxscore > 99999 then
323321
self:zoomto(125,20)
324322
elseif totaliidxscore > 9999 then
325323
self:zoomto(104,20)

‎Newskins/QUADIIDX/Hold 2x1.png‎

5.41 KB
Loading

‎Newskins/QUADIIDX/Mine 8x1.png‎

10.5 KB
Loading

‎Newskins/QUADIIDX/Roll 2x1.png‎

5.53 KB
Loading

‎Newskins/QUADIIDX/explosions.lua‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
local iidxbutton = {
2+
--iidx
3+
["scratch"] = "scratch",
4+
["Key2"] = "Key2",
5+
["Key4"] = "Key2",
6+
["Key6"] = "Key2",
7+
--popn
8+
["Left Yellow"] = "Key2",
9+
["Left Blue"] = "Key2",
10+
["Right Blue"] = "Key2",
11+
["Right Yellow"] = "Key2",
12+
}
13+
14+
local iidxwidth = {
15+
["scratch"] = 79,
16+
["Key1"] = 48,
17+
["Key2"] = 38,
18+
}
19+
20+
return function(button_list, stepstype, skin_params)
21+
local ret= {}
22+
local rots= {}
23+
for i, button in ipairs(button_list) do
24+
if iidxbutton[button] == nil then iidxbutton[button] = "Key1" end
25+
local column_frame= Def.ActorFrame{
26+
InitCommand= function(self)
27+
self:rotationz(rots[button] or 0)
28+
:draworder(newfield_draw_order.explosion)
29+
end,
30+
Def.ActorFrame{
31+
Def.Quad {InitCommand=cmd(scaletoclipped,iidxwidth[iidxbutton[button]],16)},
32+
InitCommand= function(self)
33+
self:visible(false)
34+
end,
35+
ColumnJudgmentCommand= function(self, param)
36+
local diffuse= {
37+
TapNoteScore_W1= {1, 1, 1, 1},
38+
TapNoteScore_W2= {1, 1, 1, 1},
39+
TapNoteScore_W3= {1, 1, 1, 1},
40+
}
41+
local exp_color= diffuse[param.tap_note_score or param.hold_note_score]
42+
if exp_color then
43+
self:stoptweening()
44+
:diffuse(exp_color):zoom(1):diffusealpha(0.9):visible(true)
45+
:linear(0.1):zoom(2):diffusealpha(0.3):linear(0.06):diffusealpha(0)
46+
:sleep(0):queuecommand("hide")
47+
end
48+
end,
49+
hideCommand= function(self)
50+
self:visible(false)
51+
end,
52+
},
53+
Def.Quad {
54+
InitCommand=function(self)
55+
self:scaletoclipped(iidxwidth[iidxbutton[button]],16)
56+
self:visible(false)
57+
end,
58+
HoldCommand= function(self, param)
59+
if param.start then
60+
self:finishtweening()
61+
:zoom(1):diffusealpha(1):visible(true)
62+
elseif param.finished then
63+
self:stopeffect():linear(0.06):diffusealpha(0)
64+
:sleep(0):queuecommand("hide")
65+
else
66+
self:zoom(1)
67+
end
68+
end,
69+
hideCommand= function(self)
70+
self:visible(false)
71+
end,
72+
},
73+
}
74+
ret[i]= column_frame
75+
end
76+
return ret
77+
end

0 commit comments

Comments
 (0)