Theme changes

This commit is contained in:
Jonathan Payne
2012-12-27 18:25:08 -08:00
parent bd0e2074ad
commit 133a903907
32 changed files with 8220 additions and 25 deletions
+1
View File
@@ -0,0 +1 @@
_open sans Bold 24px
+1 -1
View File
@@ -1 +1 @@
frutiger 24px
_open sans book 24px
@@ -0,0 +1 @@
_open sans semibold 24px
Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

@@ -0,0 +1,352 @@
[common]
Baseline=27
Top=10
LineSpacing=33
DrawExtraPixelsLeft=2
DrawExtraPixelsRight=0
AdvanceExtraPixels=0
[main]
Line 0= !"#$%&'()*+,-.
Line 1=/0123456789:;<=
Line 2=>?@ABCDEFGHIJKL
Line 3=MNOPQRSTUVWXYZ[
Line 4=\]^_`abcdefghij
Line 5=klmnopqrstuvwxy
Line 6=z{|}~€‚ƒ„…†‡ˆ‰Š
Line 7=‹ŒŽ‘’“”•–—˜™š›œ
Line 8=žŸ ¡¢£¤¥¦§¨©ª«¬
Line 9=­®¯°±²³´µ¶·¸¹º»
Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ
Line 11=ËÌÍÎÏÐÑÒÓÔÕÖרÙ
Line 12=ÚÛÜÝÞßàáâãäåæçè
Line 13=éêëìíîïðñòóôõö÷
Line 14=øùúûüýþÿ
0=6
1=7
2=11
3=16
4=14
5=22
6=18
7=6
8=8
9=8
10=13
11=14
12=7
13=8
14=7
15=10
16=14
17=14
18=14
19=14
20=14
21=14
22=14
23=14
24=14
25=14
26=7
27=7
28=14
29=14
30=14
31=11
32=22
33=17
34=16
35=15
36=18
37=13
38=13
39=17
40=18
41=8
42=8
43=16
44=14
45=23
46=20
47=19
48=15
49=19
50=16
51=13
52=14
53=18
54=16
55=23
56=16
57=15
58=14
59=8
60=10
61=8
62=13
63=10
64=15
65=14
66=15
67=12
68=15
69=14
70=9
71=14
72=16
73=7
74=7
75=15
76=7
77=24
78=16
79=15
80=15
81=15
82=11
83=12
84=10
85=16
86=14
87=21
88=14
89=14
90=12
91=9
92=13
93=9
94=14
95=14
96=7
97=14
98=12
99=21
100=12
101=13
102=15
103=31
104=13
105=9
106=23
107=14
108=5
109=5
110=11
111=11
112=9
113=12
114=24
115=15
116=18
117=12
118=9
119=23
120=12
121=15
122=6
123=7
124=14
125=14
126=14
127=14
128=13
129=12
130=15
131=20
132=9
133=15
134=14
135=8
136=20
137=12
138=10
139=14
140=9
141=9
142=15
143=16
144=16
145=7
146=5
147=9
148=9
149=15
150=21
151=21
152=21
153=11
154=17
155=17
156=17
157=17
158=17
159=17
160=23
161=15
162=13
163=13
164=13
165=13
166=8
167=8
168=8
169=8
170=18
171=20
172=19
173=19
174=19
175=19
176=19
177=14
178=19
179=18
180=18
181=18
182=18
183=15
184=15
185=17
186=14
187=14
188=14
189=14
190=14
191=14
192=22
193=12
194=14
195=14
196=14
197=14
198=7
199=7
200=7
201=7
202=15
203=16
204=15
205=15
206=15
207=15
208=15
209=14
210=15
211=16
212=16
213=16
214=16
215=14
216=15
217=14
[alt]
Line 0= Ą˘Ł¤ĽŚ§¨Š
Line 1=ŞŤŹ­ŽŻ°ą˛ł
Line 2=´ľśˇ¸šşťź˝
Line 3=žżŔÁÂĂÄĹĆÇ
Line 4=ČÉĘËĚÍÎĎĐŃ
Line 5=ŇÓÔŐÖ×ŘŮÚŰ
Line 6=ÜÝŢßŕáâăäĺ
Line 7=ćçčéęëěíîď
Line 8=đńňóôőö÷řů
Line 9=úűüýţ˙
0=6
1=17
2=15
3=14
4=14
5=14
6=13
7=12
8=15
9=13
10=13
11=14
12=14
13=8
14=14
15=14
16=10
17=14
18=5
19=8
20=15
21=7
22=12
23=15
24=5
25=12
26=12
27=10
28=12
29=14
30=12
31=12
32=16
33=17
34=17
35=17
36=17
37=14
38=15
39=15
40=15
41=13
42=13
43=13
44=13
45=8
46=8
47=18
48=18
49=20
50=20
51=19
52=19
53=19
54=19
55=14
56=16
57=18
58=18
59=18
60=18
61=15
62=14
63=17
64=11
65=14
66=14
67=14
68=14
69=7
70=12
71=12
72=12
73=14
74=14
75=14
76=14
77=7
78=7
79=15
80=16
81=16
82=16
83=15
84=15
85=15
86=15
87=14
88=11
89=16
90=16
91=16
92=16
93=14
94=10
95=7
Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

@@ -0,0 +1,352 @@
[common]
Baseline=27
Top=10
LineSpacing=33
DrawExtraPixelsLeft=2
DrawExtraPixelsRight=2
AdvanceExtraPixels=0
[main]
Line 0= !"#$%&'()*+,-.
Line 1=/0123456789:;<=
Line 2=>?@ABCDEFGHIJKL
Line 3=MNOPQRSTUVWXYZ[
Line 4=\]^_`abcdefghij
Line 5=klmnopqrstuvwxy
Line 6=z{|}~€‚ƒ„…†‡ˆ‰Š
Line 7=‹ŒŽ‘’“”•–—˜™š›œ
Line 8=žŸ ¡¢£¤¥¦§¨©ª«¬
Line 9=­®¯°±²³´µ¶·¸¹º»
Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ
Line 11=ËÌÍÎÏÐÑÒÓÔÕÖרÙ
Line 12=ÚÛÜÝÞßàáâãäåæçè
Line 13=éêëìíîïðñòóôõö÷
Line 14=øùúûüýþÿ
0=6
1=6
2=10
3=16
4=14
5=20
6=18
7=5
8=7
9=7
10=13
11=14
12=6
13=8
14=6
15=9
16=14
17=14
18=14
19=14
20=14
21=14
22=14
23=14
24=14
25=14
26=6
27=6
28=14
29=14
30=14
31=10
32=22
33=15
34=16
35=15
36=17
37=13
38=12
39=17
40=18
41=7
42=6
43=15
44=12
45=22
46=18
47=19
48=14
49=19
50=15
51=13
52=13
53=17
54=14
55=22
56=14
57=13
58=14
59=8
60=9
61=8
62=13
63=11
64=14
65=13
66=15
67=11
68=15
69=13
70=8
71=13
72=15
73=6
74=6
75=13
76=6
77=22
78=15
79=14
80=15
81=15
82=10
83=11
84=8
85=15
86=12
87=19
88=13
89=12
90=11
91=9
92=13
93=9
94=14
95=14
96=6
97=14
98=10
99=19
100=12
101=12
102=14
103=29
104=13
105=7
106=22
107=14
108=4
109=4
110=8
111=8
112=9
113=12
114=24
115=14
116=19
117=11
118=7
119=23
120=11
121=13
122=6
123=6
124=14
125=14
126=14
127=14
128=13
129=12
130=14
131=20
132=8
133=12
134=14
135=8
136=20
137=12
138=10
139=14
140=8
141=8
142=14
143=15
144=16
145=6
146=5
147=8
148=9
149=12
150=19
151=19
152=19
153=10
154=15
155=15
156=15
157=15
158=15
159=15
160=21
161=15
162=13
163=13
164=13
165=13
166=7
167=7
168=7
169=7
170=17
171=18
172=19
173=19
174=19
175=19
176=19
177=14
178=19
179=17
180=17
181=17
182=17
183=13
184=15
185=15
186=13
187=13
188=13
189=13
190=13
191=13
192=21
193=11
194=13
195=13
196=13
197=13
198=6
199=6
200=6
201=6
202=14
203=15
204=14
205=14
206=14
207=14
208=14
209=14
210=14
211=15
212=15
213=15
214=15
215=12
216=15
217=12
[alt]
Line 0= Ą˘Ł¤ĽŚ§¨Š
Line 1=ŞŤŹ­ŽŻ°ą˛ł
Line 2=´ľśˇ¸šşťź˝
Line 3=žżŔÁÂĂÄĹĆÇ
Line 4=ČÉĘËĚÍÎĎĐŃ
Line 5=ŇÓÔŐÖ×ŘŮÚŰ
Line 6=ÜÝŢßŕáâăäĺ
Line 7=ćçčéęëěíîď
Line 8=đńňóôőö÷řů
Line 9=úűüýţ˙
0=6
1=15
2=14
3=13
4=14
5=12
6=13
7=12
8=14
9=13
10=13
11=13
12=14
13=8
14=14
15=14
16=10
17=13
18=5
19=6
20=14
21=6
22=11
23=14
24=5
25=11
26=11
27=8
28=11
29=14
30=11
31=11
32=15
33=15
34=15
35=15
36=15
37=12
38=15
39=15
40=15
41=13
42=13
43=13
44=13
45=7
46=7
47=17
48=17
49=18
50=18
51=19
52=19
53=19
54=19
55=14
56=15
57=17
58=17
59=17
60=17
61=13
62=13
63=15
64=10
65=13
66=13
67=13
68=13
69=6
70=11
71=11
72=11
73=13
74=13
75=13
76=13
77=6
78=6
79=15
80=15
81=15
82=15
83=14
84=14
85=14
86=14
87=14
88=10
89=15
90=15
91=15
92=15
93=12
94=8
95=6
Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

@@ -0,0 +1,352 @@
[common]
Baseline=27
Top=10
LineSpacing=33
DrawExtraPixelsLeft=2
DrawExtraPixelsRight=0
AdvanceExtraPixels=0
[main]
Line 0= !"#$%&'()*+,-.
Line 1=/0123456789:;<=
Line 2=>?@ABCDEFGHIJKL
Line 3=MNOPQRSTUVWXYZ[
Line 4=\]^_`abcdefghij
Line 5=klmnopqrstuvwxy
Line 6=z{|}~€‚ƒ„…†‡ˆ‰Š
Line 7=‹ŒŽ‘’“”•–—˜™š›œ
Line 8=žŸ ¡¢£¤¥¦§¨©ª«¬
Line 9=­®¯°±²³´µ¶·¸¹º»
Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ
Line 11=ËÌÍÎÏÐÑÒÓÔÕÖרÙ
Line 12=ÚÛÜÝÞßàáâãäåæçè
Line 13=éêëìíîïðñòóôõö÷
Line 14=øùúûüýþÿ
0=6
1=7
2=10
3=16
4=14
5=21
6=18
7=6
8=8
9=8
10=13
11=14
12=6
13=8
14=7
15=9
16=14
17=14
18=14
19=14
20=14
21=14
22=14
23=14
24=14
25=14
26=7
27=7
28=14
29=14
30=14
31=11
32=22
33=16
34=16
35=15
36=18
37=13
38=13
39=17
40=18
41=7
42=7
43=15
44=13
45=22
46=19
47=19
48=15
49=19
50=15
51=13
52=14
53=18
54=15
55=23
56=15
57=14
58=14
59=8
60=9
61=8
62=13
63=10
64=14
65=14
66=15
67=12
68=15
69=14
70=9
71=13
72=15
73=7
74=7
75=14
76=7
77=23
78=15
79=15
80=15
81=15
82=10
83=12
84=9
85=15
86=13
87=20
88=13
89=13
90=11
91=9
92=13
93=9
94=14
95=14
96=6
97=14
98=11
99=20
100=12
101=12
102=14
103=30
104=13
105=8
106=23
107=14
108=5
109=5
110=10
111=10
112=9
113=12
114=24
115=14
116=18
117=12
118=8
119=23
120=11
121=14
122=6
123=7
124=14
125=14
126=14
127=14
128=13
129=12
130=14
131=20
132=9
133=13
134=14
135=8
136=20
137=12
138=10
139=14
140=9
141=9
142=14
143=15
144=16
145=7
146=5
147=9
148=9
149=13
150=20
151=20
152=20
153=11
154=16
155=16
156=16
157=16
158=16
159=16
160=22
161=15
162=13
163=13
164=13
165=13
166=7
167=7
168=7
169=7
170=18
171=19
172=19
173=19
174=19
175=19
176=19
177=14
178=19
179=18
180=18
181=18
182=18
183=14
184=15
185=16
186=14
187=14
188=14
189=14
190=14
191=14
192=21
193=12
194=14
195=14
196=14
197=14
198=7
199=7
200=7
201=7
202=15
203=15
204=15
205=15
206=15
207=15
208=15
209=14
210=15
211=15
212=15
213=15
214=15
215=13
216=15
217=13
[alt]
Line 0= Ą˘Ł¤ĽŚ§¨Š
Line 1=ŞŤŹ­ŽŻ°ą˛ł
Line 2=´ľśˇ¸šşťź˝
Line 3=žżŔÁÂĂÄĹĆÇ
Line 4=ČÉĘËĚÍÎĎĐŃ
Line 5=ŇÓÔŐÖ×ŘŮÚŰ
Line 6=ÜÝŢßŕáâăäĺ
Line 7=ćçčéęëěíîď
Line 8=đńňóôőö÷řů
Line 9=úűüýţ˙
0=6
1=16
2=14
3=13
4=14
5=13
6=13
7=12
8=14
9=13
10=13
11=14
12=14
13=8
14=14
15=14
16=10
17=14
18=5
19=7
20=14
21=7
22=12
23=14
24=5
25=12
26=12
27=9
28=11
29=14
30=11
31=11
32=15
33=16
34=16
35=16
36=16
37=13
38=15
39=15
40=15
41=13
42=13
43=13
44=13
45=7
46=7
47=18
48=18
49=19
50=19
51=19
52=19
53=19
54=19
55=14
56=15
57=18
58=18
59=18
60=18
61=14
62=14
63=16
64=10
65=14
66=14
67=14
68=14
69=7
70=12
71=12
72=12
73=14
74=14
75=14
76=14
77=7
78=7
79=15
80=15
81=15
82=15
83=15
84=15
85=15
86=15
87=14
88=10
89=15
90=15
91=15
92=15
93=13
94=9
95=7
File diff suppressed because it is too large Load Diff
@@ -0,0 +1,100 @@
local vStats = STATSMAN:GetCurStageStats();
local function CreateStats( pnPlayer )
-- Actor Templates
local aLabel = LoadFont("Common Normal") .. { InitCommand=cmd(zoom,0.5;shadowlength,1;horizalign,left); };
local aText = LoadFont("Common Normal") .. { InitCommand=cmd(zoom,0.5;shadowlength,1;horizalign,left); };
-- DA STATS, JIM!!
local pnStageStats = vStats:GetPlayerStageStats( pnPlayer );
-- Organized Stats.
local tStats = {
W1 = pnStageStats:GetTapNoteScores('TapNoteScore_W1');
W2 = pnStageStats:GetTapNoteScores('TapNoteScore_W2');
W3 = pnStageStats:GetTapNoteScores('TapNoteScore_W3');
W4 = pnStageStats:GetTapNoteScores('TapNoteScore_W4');
W5 = pnStageStats:GetTapNoteScores('TapNoteScore_W5');
Miss = pnStageStats:GetTapNoteScores('TapNoteScore_Miss');
HitMine = pnStageStats:GetTapNoteScores('TapNoteScore_HitMine');
AvoidMine = pnStageStats:GetTapNoteScores('TapNoteScore_AvoidMine');
Held = pnStageStats:GetHoldNoteScores('HoldNoteScore_Held');
LetGo = pnStageStats:GetHoldNoteScores('HoldNoteScore_LetGo');
};
local itg_values= {W1= 5,
W2= 4,
W3= 2,
W4= 0,
W5= -6,
Miss= -12,
HitMine= 0, -- Kyz hates mines. Should be -6
AvoidMine= 0,
Held= 5,
LetGo= 0}
local migs_values= {W1= 3,
W2= 2,
W3= 1,
W4= 0,
W5= -4,
Miss= -8,
HitMine= 0,
AvoidMine= 0,
Held= 6,
LetGo= 0}
local itg_keys_for_max= {W1= 5, W2= 5, W3= 5, W4= 5, W5= 5, Miss= 5, Held= 5, LetGo= 5}
local migs_keys_for_max= {W1= 3, W2= 3, W3= 3, W4= 3, W3= 3, Miss= 3, Held= 6, LetGo= 6}
local tValues= { ITG= 0, ITG_MAX= 0, MIGS= 0, MIGS_MAX= 0}
for k, v in pairs(itg_keys_for_max) do
if tStats[k] then
tValues.ITG_MAX= tValues.ITG_MAX + (tStats[k] * v)
end
end
for k, v in pairs(migs_keys_for_max) do
if tStats[k] then
tValues.MIGS_MAX= tValues.MIGS_MAX + (tStats[k] * v)
end
end
for k, v in pairs(tStats) do
if itg_values[k] then
tValues.ITG= tValues.ITG + (v * itg_values[k])
end
if migs_values[k] then
tValues.MIGS= tValues.MIGS + (v * migs_values[k])
end
end
local t = Def.ActorFrame {};
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(y,-34);
LoadActor(THEME:GetPathG("ScreenTitleMenu","PreferenceFrame")) .. {
InitCommand=cmd(zoom,0.875;diffuse,PlayerColor( pnPlayer ));
};
aLabel .. { Text=THEME:GetString("ScreenEvaluation","ITG DP:"); InitCommand=cmd(x,-64) };
aText .. { Text=string.format("%04i",tValues["ITG"]); InitCommand=cmd(x,-8;y,5;vertalign,bottom;zoom,0.6); };
aText .. { Text="/"; InitCommand=cmd(x,28;y,5;vertalign,bottom;zoom,0.5;diffusealpha,0.5); };
aText .. { Text=string.format("%04i",tValues["ITG_MAX"]); InitCommand=cmd(x,32;y,5;vertalign,bottom;zoom,0.5); };
};
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(y,-6);
LoadActor(THEME:GetPathG("ScreenTitleMenu","PreferenceFrame")) .. {
InitCommand=cmd(zoom,0.875;diffuse,PlayerColor( pnPlayer ));
};
aLabel .. { Text=THEME:GetString("ScreenEvaluation","MIGS DP:"); InitCommand=cmd(x,-64) };
aText .. { Text=string.format("%04i",tValues["MIGS"]); InitCommand=cmd(x,-8;y,5;vertalign,bottom;zoom,0.6); };
aText .. { Text="/"; InitCommand=cmd(x,28;y,5;vertalign,bottom;zoom,0.5;diffusealpha,0.5); };
aText .. { Text=string.format("%04i",tValues["MIGS_MAX"]); InitCommand=cmd(x,32;y,5;vertalign,bottom;zoom,0.5); };
};
return t
end;
local t = Def.ActorFrame {};
GAMESTATE:IsPlayerEnabled(PLAYER_1)
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(hide_if,not GAMESTATE:IsPlayerEnabled(PLAYER_1);x,WideScale(math.floor(SCREEN_CENTER_X*0.3)-8,math.floor(SCREEN_CENTER_X*0.5)-8);y,SCREEN_CENTER_Y-34);
CreateStats( PLAYER_1 );
};
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(hide_if,not GAMESTATE:IsPlayerEnabled(PLAYER_2);x,WideScale(math.floor(SCREEN_CENTER_X*1.7)+8,math.floor(SCREEN_CENTER_X*1.5)+8);y,SCREEN_CENTER_Y-34);
CreateStats( PLAYER_2 );
};
return t
@@ -0,0 +1,267 @@
local maxSegments = 150
local function CreateSegments(Player)
local t = Def.ActorFrame { };
local bars = Def.ActorFrame{ Name="CoverBars" };
local bpmFrame = Def.ActorFrame{ Name="BPMFrame"; };
local stopFrame = Def.ActorFrame{ Name="StopFrame"; };
local delayFrame = Def.ActorFrame{ Name="DelayFrame"; };
local warpFrame = Def.ActorFrame{ Name="WarpFrame"; };
local fakeFrame = Def.ActorFrame{ Name="FakeFrame"; };
local scrollFrame = Def.ActorFrame{ Name="ScrollFrame"; };
local speedFrame = Def.ActorFrame{ Name="SpeedFrame"; };
local fFrameWidth = 380;
local fFrameHeight = 8;
-- XXX: doesn't work in course mode -aj
if not GAMESTATE:IsSideJoined( Player ) then
return t
elseif not GAMESTATE:IsCourseMode() then
-- Straight rip off NCRX
local song = GAMESTATE:GetCurrentSong();
local steps = GAMESTATE:GetCurrentSteps( Player );
if steps then
local timingData = steps:GetTimingData();
-- use the StepsSeconds, which will almost always be more proper
-- than a file with ITG2r21 compatibility.
if song then
local songLen = song:MusicLengthSeconds();
local firstBeatSecs = song:GetFirstSecond();
local lastBeatSecs = song:GetLastSecond();
local bpms = timingData:GetBPMsAndTimes();
local stops = timingData:GetStops();
local delays = timingData:GetDelays();
local warps = timingData:GetWarps();
local fakes = timingData:GetFakes();
local scrolls = timingData:GetScrolls();
local speeds = timingData:GetSpeeds();
-- we don't want too many segments to be shown.
local sumSegments = #bpms + #stops + #delays + #warps + #fakes + #scrolls + #speeds
if sumSegments > maxSegments then
return Def.ActorFrame{}
end
local function CreateLine(beat, secs, firstShadow, firstDiffuse, secondShadow, firstEffect, secondEffect)
local beatTime = timingData:GetElapsedTimeFromBeat(beat);
if beatTime < 0 then beatTime = 0; end;
return Def.ActorFrame {
Def.Quad {
InitCommand=function(self)
self:shadowlength(0);
self:shadowcolor(color(firstShadow));
-- set width
self:zoomto(math.max((secs/songLen)*fFrameWidth, 1), fFrameHeight);
-- find location
self:x((scale(beatTime,firstBeatSecs,lastBeatSecs,-fFrameWidth/2,fFrameWidth/2)));
end;
OnCommand=function(self)
self:diffuse(color(firstDiffuse));
end;
};
--[[ there's a cool effect that can't happen because we don't fade out like we did before
Def.Quad {
InitCommand=function(self)
--self:diffuse(HSVA(192,1,0.8,0.8));
self:shadowlength(0);
self:shadowcolor(color(secondShadow));
-- set width
self:zoomto(math.max((secs/songLen)*fFrameWidth, 1),fFrameHeight);
-- find location
self:x((scale(beatTime,firstBeatSecs,lastBeatSecs,-fFrameWidth/2,fFrameWidth/2)));
end;
OnCommand=function(self)
self:diffusealpha(1);
self:diffuseshift();
self:effectcolor1(color(firstEffect));
self:effectcolor2(color(secondEffect));
self:effectclock('beat');
self:effectperiod(1/8);
--
self:diffusealpha(0);
self:sleep(beatTime+1);
self:diffusealpha(1);
self:linear(4);
self:diffusealpha(0);
end;
};]]
};
end;
for i=2,#bpms do
local data = split("=",bpms[i]);
bpmFrame[#bpmFrame+1] = CreateLine(data[1], 0,
"#00808077", "#00808077", "#00808077", "#FF634777", "#FF000077");
end;
for i=1,#delays do
local data = split("=",delays[i]);
delayFrame[#delayFrame+1] = CreateLine(data[1], data[2],
"#FFFF0077", "#FFFF0077", "#FFFF0077", "#00FF0077", "#FF000077");
end;
for i=1,#stops do
local data = split("=",stops[i]);
stopFrame[#stopFrame+1] = CreateLine(data[1], data[2],
"#FFFFFF77", "#FFFFFF77", "#FFFFFF77", "#FFA50077", "#FF000077");
end;
for i=1,#scrolls do
local data = split("=",scrolls[i]);
scrollFrame[#scrollFrame+1] = CreateLine(data[1], 0,
"#4169E177", "#4169E177", "#4169E177", "#0000FF77", "#FF000077");
end;
for i=1,#speeds do
local data = split("=",speeds[i]);
-- TODO: Turn beats into seconds for this calculation?
speedFrame[#speedFrame+1] = CreateLine(data[1], 0,
"#ADFF2F77", "#ADFF2F77", "#ADFF2F77", "#7CFC0077", "#FF000077");
end;
for i=1,#warps do
local data = split("=",warps[i]);
warpFrame[#warpFrame+1] = CreateLine(data[1], 0,
"#CC00CC77", "#CC00CC77", "#CC00CC77", "#FF33CC77", "#FF000077");
end;
for i=1,#fakes do
local data = split("=",fakes[i]);
fakeFrame[#fakeFrame+1] = CreateLine(data[1], 0,
"#BC8F8F77", "#BC8F8F77", "#BC8F8F77", "#F4A46077", "#FF000077");
end;
end;
bars[#bars+1] = bpmFrame;
bars[#bars+1] = scrollFrame;
bars[#bars+1] = speedFrame;
bars[#bars+1] = stopFrame;
bars[#bars+1] = delayFrame;
bars[#bars+1] = warpFrame;
bars[#bars+1] = fakeFrame;
t[#t+1] = bars;
--addition here: increase performance a ton by only rendering once
t[#t+1] = Def.ActorFrameTexture{Name="Target"}
t[#t+1] = Def.Sprite{Name="Actual"}
local FirstPass=true;
local function Draw(self)
kids=self:GetChildren();
if FirstPass then
kids.Target:setsize(fFrameWidth,fFrameHeight);
kids.Target:EnableAlphaBuffer(true);
kids.Target:Create();
kids.Target:GetTexture():BeginRenderingTo();
for k,v in pairs(kids) do
if k~="Target" and k~="Actual" then
v:Draw();
end
end
kids.Target:GetTexture():FinishRenderingTo();
kids.Actual:SetTexture(kids.Target:GetTexture());
FirstPass=false;
end
kids.Actual:Draw();
end
t.InitCommand=function(self) self:SetDrawFunction(Draw); end
end
end
return t
end
local t = LoadFallbackB()
t[#t+1] = StandardDecorationFromFileOptional("ScoreFrame","ScoreFrame");
local function songMeterScale(val) return scale(val,0,1,-380/2,380/2) end
for pn in ivalues(PlayerNumber) do
local MetricsName = "SongMeterDisplay" .. PlayerNumberToString(pn);
local songMeterDisplay = Def.ActorFrame{
InitCommand=function(self)
self:player(pn);
self:name(MetricsName);
ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen");
end;
Def.Quad {
InitCommand=cmd(zoomto,420,20);
OnCommand=cmd(fadeleft,0.35;faderight,0.35;diffuse,Color.Black;diffusealpha,0.5);
};
LoadActor( THEME:GetPathG( 'SongMeterDisplay', 'frame ' .. PlayerNumberToString(pn) ) ) .. {
InitCommand=function(self)
self:name('Frame');
ActorUtil.LoadAllCommandsAndSetXY(self,MetricsName);
end;
};
Def.Quad {
InitCommand=cmd(zoomto,2,8);
OnCommand=cmd(x,songMeterScale(0.25);diffuse,PlayerColor(pn);diffusealpha,0.5);
};
Def.Quad {
InitCommand=cmd(zoomto,2,8);
OnCommand=cmd(x,songMeterScale(0.5);diffuse,PlayerColor(pn);diffusealpha,0.5);
};
Def.Quad {
InitCommand=cmd(zoomto,2,8);
OnCommand=cmd(x,songMeterScale(0.75);diffuse,PlayerColor(pn);diffusealpha,0.5);
};
Def.SongMeterDisplay {
StreamWidth=THEME:GetMetric( MetricsName, 'StreamWidth' );
Stream=LoadActor( THEME:GetPathG( 'SongMeterDisplay', 'stream ' .. PlayerNumberToString(pn) ) )..{
InitCommand=cmd(diffuse,PlayerColor(pn);diffusealpha,0.5;blend,Blend.Add;);
};
Tip=LoadActor( THEME:GetPathG( 'SongMeterDisplay', 'tip ' .. PlayerNumberToString(pn) ) ) .. { InitCommand=cmd(visible,false); };
};
};
if ThemePrefs.Get("TimingDisplay") == true then
songMeterDisplay[#songMeterDisplay+1] = CreateSegments(pn);
end
t[#t+1] = songMeterDisplay
end;
for pn in ivalues(PlayerNumber) do
local MetricsName = "ToastyDisplay" .. PlayerNumberToString(pn);
t[#t+1] = LoadActor( THEME:GetPathG("Player", 'toasty'), pn ) .. {
InitCommand=function(self)
self:player(pn);
self:name(MetricsName);
ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen");
end;
};
end;
t[#t+1] = StandardDecorationFromFileOptional("BPMDisplay","BPMDisplay");
t[#t+1] = StandardDecorationFromFileOptional("StageDisplay","StageDisplay");
t[#t+1] = StandardDecorationFromFileOptional("SongTitle","SongTitle");
t[#t+1] = Def.ActorFrame {
Def.ActorFrame {
Name="LifeTest";
Owner=PLAYER_1;
InitCommand=cmd(x,Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX");y,SCREEN_TOP+80);
LifeChangedMessageCommand=function(self,params)
local c = self:GetChildren();
if params.Player == PLAYER_1 then
local fLife = params.LifeMeter:GetLife();
c.LifeText:settextf("%03i", fLife * 100);
end
end;
HealthStateChangedMessageCommand=function(self, params)
local c = self.GetChildren();
if params.PlayerNumber == PLAYER_1 then
c.LifeText:settext( ToEnumShortString(params.HealthState) );
end
end;
--
LoadFont("Common Normal") .. {
Name="LifeText";
InitCommand=cmd(shadowlength,1);
HotCommand=cmd(stopeffect;diffuse,Color.White;diffuseshift;effectcolor2,Color.White;effectcolor1,Color.Orange);
AliveCommand=cmd(stopeffect;diffuse,Color.White;);
DangerCommand=cmd(stopeffect;diffuse,Color.White;diffuseshift;effectcolor2,Color.Red;effectcolor2,BoostColor(Color.Red,0.5));
DeadCommand=cmd(stopeffect;diffuse,Color.Black);
};
};
};
return t
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 684 B

@@ -9,9 +9,9 @@ t[#t+1] = Def.ActorFrame {
};
Def.ActorFrame {
InitCommand=cmd(hide_if,hideFancyElements;);
LoadActor("_pattern") .. {
InitCommand=cmd(rotationy,-12.25;rotationz,-30;rotationx,-20;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256);
OnCommand=cmd(texcoordvelocity,0.125,0.5;diffuse,color("#ffd400");diffusealpha,0.045;bob;effectmagnitude,0,0,35;effectperiod,4;);
LoadActor("_checkerboard") .. {
InitCommand=cmd(rotationy,0;rotationz,0;rotationx,-90/4*3;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256);
OnCommand=cmd(texcoordvelocity,0,0.5;diffuse,color("#ffd400");diffusealpha,0.5;fadetop,1);
};
};
LoadActor("_particleLoader") .. {
@@ -33,11 +33,12 @@ t[#t+1] = Def.ActorFrame {
InitCommand=cmd(z,32;x,4;y,4;;rotationy,-12.25;rotationz,-30;rotationx,-20;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256);
OnCommand=cmd(texcoordvelocity,0.125,0.5;diffuse,Color("Black");diffusealpha,0.5);
}; --]]
--[[ LoadActor("_grid") .. {
--[[ LoadActor("_grid") .. {
InitCommand=cmd(customtexturerect,0,0,(SCREEN_WIDTH+1)/4,SCREEN_HEIGHT/4;SetTextureFiltering,true);
OnCommand=cmd(zoomto,SCREEN_WIDTH+1,SCREEN_HEIGHT;diffuse,Color("Orange");diffuseshift;effecttiming,(1/8)*2,0,(7/8)*2,0;effectclock,'beatnooffset';
effectcolor2,Color("Orange");effectcolor1,Color.Alpha(Color("Orange"),0.45);fadebottom,0.25;fadetop,0.25;croptop,48/480;cropbottom,48/480);
}; --]]
OnCommand=cmd(zoomto,SCREEN_WIDTH+1,SCREEN_HEIGHT;diffuse,Color("Black");diffuseshift;effecttiming,(1/8)*2,0,(7/8)*2,0;effectclock,'beatnooffset';
effectcolor2,Color("White");effectcolor1,Color("Black");fadebottom,0.25;fadetop,0.25;croptop,48/480;cropbottom,48/480;blend,Blend.Add;
diffusealpha,0.155);
}; --]]
LoadActor("_bg top") .. {
InitCommand=cmd(scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT);
};
Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 755 B

After

Width:  |  Height:  |  Size: 3.4 KiB

@@ -1,5 +1,8 @@
local t = Def.ActorFrame {};
t[#t+1] = Def.Quad {
InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH+1,48;diffuse,Color.Black);
}
t[#t+1] = LoadActor("Header") .. {
InitCommand=cmd(vertalign,top;zoomtowidth,SCREEN_WIDTH+1;diffuse,color("#ffd400"));
};
@@ -7,11 +10,11 @@ t[#t+1] = LoadActor("Header") .. {
InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH+64,44;customtexturerect,0,0,SCREEN_WIDTH+64/8,44/32);
OnCommand=cmd(fadebottom,0.8;texcoordvelocity,1,0;skewx,-0.0025;diffuse,Color("Black");diffusealpha,0.235);
}; --]]
t[#t+1] = LoadFont("Common Normal") .. {
t[#t+1] = LoadFont("Common Bold") .. {
Name="HeaderText";
Text=Screen.String("HeaderText");
InitCommand=cmd(x,-SCREEN_CENTER_X+24;y,24;zoom,1;horizalign,left;shadowlength,0;maxwidth,200);
OnCommand=cmd(skewx,-0.125;strokecolor,Color("Outline");diffusebottomedge,color("0.875,0.875,0.875"));
OnCommand=cmd(strokecolor,Color.Invisible;diffusebottomedge,color("0.75,0.75,0.75"));
UpdateScreenHeaderMessageCommand=function(self,param)
self:settext(param.Header);
end;
+3 -3
View File
@@ -8,7 +8,7 @@ local Prefs =
{
AutoSetStyle =
{
Default = true,
Default = false,
Choices = { OptionNameString('Off'), OptionNameString('On') },
Values = { false, true }
},
@@ -20,7 +20,7 @@ local Prefs =
},
GameplayShowScore =
{
Default = false,
Default = true,
Choices = { OptionNameString('Off'), OptionNameString('On') },
Values = { false, true }
},
@@ -68,7 +68,7 @@ local Prefs =
},
TimingDisplay =
{
Default = true,
Default = false,
Choices = { OptionNameString('Off'), OptionNameString('On') },
Values = { false, true }
},
+12 -12
View File
@@ -345,18 +345,18 @@ RollBodyIncrementsCombo=ThemePrefs.Get("ComboOnRolls")
[RollingNumbersJudgment]
[ScoreDisplayNormal]
TextOnCommand=shadowlength,1;diffusebottomedge,BoostColor(Color('White'),0.75)
TextOnCommand=shadowlength,1;
[ScoreDisplayOni]
TextX=
TextY=
TextOnCommand=shadowlength,1;diffusebottomedge,BoostColor(Color('White'),0.75)
TextOnCommand=shadowlength,1;
TextOffCommand=
[ScoreDisplayOni Numbers]
TextX=
TextY=
TextOnCommand=shadowlength,1;diffusebottomedge,BoostColor(Color('White'),0.75)
TextOnCommand=shadowlength,1;
TextOffCommand=
[ScoreDisplayLifeTime]
@@ -369,8 +369,8 @@ DeltaSecondsOnCommand=y,80;spin;
DeltaSecondsGainLifeCommand=zoom,0.5;
[ScoreDisplayPercentage Percent]
PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);diffusetopedge,BoostColor(PlayerColor(PLAYER_1),1.5)
PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5)
PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone(PlayerColor(PLAYER_1))
PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone(PlayerColor(PLAYER_2))
[ScoreDisplayRave]
MeterP1OnCommand=draworder,-1;texcoordvelocity,1,0
@@ -951,7 +951,7 @@ BannerFrameOffCommand=bouncebegin,0.15;zoomx,0;
ShowBPMDisplay=true
BPMDisplayX=SCREEN_CENTER_X-160-90+2
BPMDisplayY=SCREEN_TOP+160+(36/2)+8
BPMDisplayOnCommand=finishtweening;maxwidth,128;horizalign,left;strokecolor,Color("Outline");addx,320;zoomx,0;decelerate,0.35;addx,-320;zoomx,1
BPMDisplayOnCommand=finishtweening;maxwidth,128;horizalign,left;strokecolor,Color.Outline;addx,320;zoomx,0;decelerate,0.35;addx,-320;zoomx,1
BPMDisplayOffCommand=bouncebegin,0.15;zoomx,0;
#
ShowBPMLabel=true
@@ -1407,8 +1407,8 @@ SongMeterDisplayOffCommand=
#
ShowSongTitle=not GAMESTATE:IsDemonstration();
SongTitleX=SCREEN_CENTER_X
SongTitleY=SCREEN_TOP+50
SongTitleOnCommand=draworder,55;shadowlength,1;basezoom,0.5;zoomy,0;sleep,1.5+0.5;smooth,0.5;zoom,1;y,SCREEN_TOP+50
SongTitleY=SCREEN_TOP+54
SongTitleOnCommand=draworder,55;strokecolor,Color.Outline;shadowlength,1;basezoom,0.675;zoomy,0;sleep,1;smooth,0.5;zoom,1;
SongTitleOffCommand=
#
SongMeterDisplayP1X=Center1Player() and SCREEN_CENTER_X or SCREEN_LEFT+16
@@ -1502,12 +1502,12 @@ DeltaSecondsP2OffCommand=
ScoreP1X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX")
# ScoreP1X=(PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX")
ScoreP1Y=SCREEN_BOTTOM-48
ScoreP1OnCommand=draworder,101;visible,not GAMESTATE:GetCurrentCourse():GetCourseType() == "CourseType_Survival" and ThemePrefs.Get("GameplayShowScore");diffuse,PlayerColor(PLAYER_1);sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-48
ScoreP1OnCommand=draworder,101;visible,not GAMESTATE:GetCurrentCourse():GetCourseType() == "CourseType_Survival" and ThemePrefs.Get("GameplayShowScore");diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone(PlayerColor(PLAYER_1));sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-48
ScoreP1OffCommand=
ScoreP2X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP2OnePlayerOneSideX")
# ScoreP2X=(PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP2OnePlayerOneSideX")
ScoreP2Y=SCREEN_BOTTOM-48
ScoreP2OnCommand=draworder,101;visible,not GAMESTATE:GetCurrentCourse():GetCourseType() == "CourseType_Survival" and ThemePrefs.Get("GameplayShowScore");diffuse,PlayerColor(PLAYER_2);sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-48
ScoreP2OnCommand=draworder,101;visible,not GAMESTATE:GetCurrentCourse():GetCourseType() == "CourseType_Survival" and ThemePrefs.Get("GameplayShowScore");diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone(PlayerColor(PLAYER_2));sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-48
ScoreP2OffCommand=
#
StepsDescriptionP1X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX")
@@ -1729,11 +1729,11 @@ ScoreLabelOffCommand=
#
ScoreNumberP1X=SCREEN_CENTER_X-160
ScoreNumberP1Y=SCREEN_TOP+320
ScoreNumberP1OnCommand=diffuse,PlayerColor(PLAYER_1);diffusetopedge,BoostColor(PlayerColor(PLAYER_1),1.5);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );shadowlength,1;zoom,0.775
ScoreNumberP1OnCommand=diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );shadowlength,1;zoom,0.775
ScoreNumberP1OffCommand=
ScoreNumberP2X=SCREEN_CENTER_X+160
ScoreNumberP2Y=SCREEN_TOP+320
ScoreNumberP2OnCommand=diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );shadowlength,1;zoom,0.775
ScoreNumberP2OnCommand=diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );shadowlength,1;zoom,0.775
ScoreNumberP2OffCommand=
#
PercentFrameP1X=SCREEN_CENTER_X-160
File diff suppressed because it is too large Load Diff
Binary file not shown.