Merge branch 'master' of github.com:stepmania/stepmania

This commit is contained in:
freem
2014-09-18 01:49:30 -05:00
26 changed files with 496 additions and 800 deletions
+7
View File
@@ -1619,6 +1619,7 @@ Enter a name for the profile.=Enter a name for the profile.
NewProfileDefaultName=New
[ScreenOptionsCustomizeProfile]
HeaderText=Edit Profile
weight=Weight (lbs)
voomax=VO2Max
birth_year=Birth Year
@@ -1985,6 +1986,12 @@ Guitar_Five=5 Frets
Karaoke=Karaoke
Lights_Cabinet=Lights
[StyleType]
StyleType_OnePlayerOneSide=1 Player
StyleType_TwoPlayersTwoSides=2 Players - Versus
StyleType_OnePlayerTwoSides=1 Player
StyleType_TwoPlayersSharedSides=2 Players - Cooperative
[TapNoteScore]
AvoidMine=Avoid Mine
HitMine=Hit Mine
@@ -29,12 +29,12 @@ t[#t+1] = Def.ActorFrame {
OnCommand=cmd(addy,-96);
-- Underline
Def.Quad {
InitCommand=cmd(y,16;zoomto,256,1);
OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;shadowcolor,BoostColor(color("#ffd40077"),0.25);linear,0.25;zoomtowidth,256;fadeleft,0.25;faderight,0.25);
InitCommand=cmd(y,24;zoomto,256,2);
OnCommand=cmd(diffuse,color("#ffd400");shadowcolor,BoostColor(color("#ffd40077"),0.25);linear,0.25;zoomtowidth,256;fadeleft,0.25;faderight,0.25);
};
LoadFont("Common Bold") .. {
LoadFont("Common Large") .. {
Text=Screen.String("Caution");
OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25));
OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");strokecolor,ColorDarkTone(color("#ffd400")));
};
LoadFont("Common Normal") .. {
Text=Screen.String("CautionText");
@@ -50,7 +50,7 @@ for i, pn in ipairs(GAMESTATE:GetEnabledPlayers()) do
) .. {
OnCommand=cmd(diffuse,PlayerDarkColor(pn)),
FitCommand=function(self, param)
self:playcommand("SetSize",{ Width=param:GetWidth()+cursor_width_padding, tween=cmd(decelerate,0.125)})
self:playcommand("SetSize",{ Width=param:GetWidth()+cursor_width_padding, tween=cmd(stoptweening;decelerate,0.15)})
end,
},
LoadActor( THEME:GetPathG("_frame", "1D"),
@@ -59,7 +59,7 @@ for i, pn in ipairs(GAMESTATE:GetEnabledPlayers()) do
) .. {
OnCommand=cmd(diffuse,PlayerColor(pn)),
FitCommand=function(self, param)
self:playcommand("SetSize",{ Width=param:GetWidth()+cursor_width_padding, tween=cmd(decelerate,0.125)})
self:playcommand("SetSize",{ Width=param:GetWidth()+cursor_width_padding, tween=cmd(stoptweening;decelerate,0.15)})
end,
}
},
@@ -9,7 +9,7 @@ local cursor_spacing_value = 30
local number_entry= new_numpad_entry{
Name= "number_entry",
InitCommand= cmd(diffusealpha, 0; xy, _screen.cx*1.5, _screen.cy),
InitCommand= cmd(diffusealpha, 0; xy, _screen.cx, _screen.cy * 1.5),
value = LoadFont("Common Large") .. {
InitCommand=cmd(xy,0,-62),
OnCommand=cmd(zoom,0.75;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone(PlayerColor(PLAYER_1)));
@@ -102,9 +102,9 @@ local menu_items= {
local menu_cursor
local menu_pos= 1
local menu_start= 72
local menu_x= 32
local value_x= 300
local menu_start= SCREEN_TOP + 80
local menu_x= SCREEN_CENTER_X * 0.25
local value_x= ( SCREEN_CENTER_X * 0.25 ) + 256
local fader
local cursor_on_menu= true
local menu_item_actors= {}
@@ -112,7 +112,7 @@ local menu_values= {}
local function fade_actor_to(actor, alf)
actor:stoptweening()
actor:linear(.2)
actor:smooth(.15)
actor:diffusealpha(alf)
end
@@ -135,7 +135,7 @@ local function input(event)
menu_values[menu_pos]:settext(item_value_to_text(item, value))
Profile[item.set](profile, value)
elseif item.item_type == "number" then
fade_actor_to(fader, .8)
--fade_actor_to(fader, .8)
fade_actor_to(number_entry.container, 1)
number_entry.value= Profile[item.get](profile)
number_entry.value_actor:playcommand("Set", {number_entry.value})
@@ -164,7 +164,7 @@ local function input(event)
local item= menu_items[menu_pos]
Profile[item.set](profile, number_entry.value)
menu_values[menu_pos]:settext(item_value_to_text(item, number_entry.value))
fade_actor_to(fader, 0)
--fade_actor_to(fader, 0)
fade_actor_to(number_entry.container, 0)
cursor_on_menu= true
end
@@ -201,7 +201,7 @@ local args= {
) .. {
OnCommand=cmd(diffuse,PlayerDarkColor(PLAYER_1)),
FitCommand=function(self, param)
self:playcommand("SetSize",{ Width=param:GetWidth()+cursor_width_padding, tween=cmd(decelerate,0.125)})
self:playcommand("SetSize",{ Width=param:GetWidth()+cursor_width_padding, tween=cmd(stoptweening;decelerate,0.15)})
end,
},
LoadActor( THEME:GetPathG("_frame", "1D"),
@@ -210,7 +210,7 @@ local args= {
) .. {
OnCommand=cmd(diffuse,PlayerColor(PLAYER_1)),
FitCommand=function(self, param)
self:playcommand("SetSize",{ Width=param:GetWidth()+cursor_width_padding, tween=cmd(decelerate,0.125)})
self:playcommand("SetSize",{ Width=param:GetWidth()+cursor_width_padding, tween=cmd(stoptweening;decelerate,0.15)})
end,
}
},
@@ -243,15 +243,14 @@ for i, item in ipairs(menu_items) do
end
end
args[#args+1]= Def.Quad{
local _height = (#menu_items) * 24
args[#args+1]= LoadActor(THEME:GetPathB("_frame", "3x3"),"rounded black",474,_height) .. {
Name= "fader", InitCommand= function(self)
fader= self
self:setsize(270, #menu_items * 24)
self:horizalign(left)
self:vertalign(top)
self:xy(menu_x-10, menu_start-12)
self:draworder(-20)
self:xy(menu_x + 474/2, menu_start + _height/2 - 12)
self:diffuse(Color.Black)
self:diffusealpha(0)
self:diffusealpha(0.75)
end
}
@@ -2,9 +2,10 @@ local t = Def.ActorFrame{};
-- todo: add event mode indicators and such
if GAMESTATE:IsEventMode() then
t[#t+1] = LoadFont("Common normal")..{
t[#t+1] = LoadFont("Common Large")..{
Text=Screen.String("EventMode");
InitCommand=cmd(CenterX;y,SCREEN_BOTTOM-72;zoom,0.75;diffuse,HSV(56,0.8,1);shadowlength,1);
InitCommand=cmd(CenterX;y,SCREEN_BOTTOM-72;zoom,0.675;diffuse,Color.Yellow;strokecolor,ColorDarkTone(Color.Yellow);shadowlength,1);
OnCommand=cmd(glowshift;textglowmode,'TextGlowMode_Inner';effectperiod,2);
};
end;
@@ -13,7 +13,7 @@ t[#t+1] = Def.ActorFrame {
};
LoadFont("Common Normal") .. {
InitCommand=cmd(zoom,0.75;shadowlength,1;glowshift;strokecolor,Color("Outline");diffuse,Color("Orange");diffusetopedge,Color("Yellow");textglowmode,'TextGlowMode_Inner');
Text="TESTING";
Text="...";
OnCommand=cmd(playcommand,"Refresh");
CoinInsertedMessageCommand=cmd(playcommand,"Refresh");
CoinModeChangedMessageCommand=cmd(playcommand,"Refresh");
+1
View File
@@ -0,0 +1 @@
_open sans semibold 48px
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

-352
View File
@@ -1,352 +0,0 @@
[common]
Baseline=14
Top=0
LineSpacing=17
DrawExtraPixelsLeft=3
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=8
1=5
2=6
3=12
4=13
5=11
6=12
7=4
8=7
9=7
10=7
11=9
12=4
13=9
14=4
15=6
16=12
17=7
18=12
19=13
20=12
21=12
22=12
23=13
24=12
25=12
26=4
27=4
28=9
29=9
30=9
31=12
32=19
33=12
34=12
35=12
36=12
37=12
38=12
39=12
40=12
41=5
42=9
43=12
44=9
45=21
46=12
47=12
48=12
49=13
50=12
51=12
52=12
53=12
54=12
55=21
56=12
57=13
58=12
59=7
60=6
61=7
62=7
63=9
64=5
65=12
66=12
67=12
68=12
69=12
70=9
71=12
72=12
73=5
74=5
75=12
76=5
77=21
78=12
79=12
80=12
81=12
82=9
83=12
84=9
85=12
86=12
87=21
88=12
89=12
90=12
91=9
92=5
93=9
94=8
95=11
96=5
97=7
98=6
99=20
100=10
101=10
102=7
103=16
104=12
105=5
106=17
107=12
108=5
109=5
110=6
111=6
112=10
113=8
114=16
115=8
116=10
117=12
118=5
119=17
120=10
121=13
122=8
123=5
124=12
125=12
126=10
127=13
128=5
129=12
130=10
131=12
132=5
133=7
134=10
135=10
136=8
137=10
138=6
139=10
140=4
141=5
142=5
143=9
144=12
145=5
146=10
147=3
148=5
149=7
150=10
151=10
152=12
153=12
154=12
155=12
156=12
157=13
158=13
159=13
160=17
161=12
162=12
163=12
164=12
165=13
166=5
167=5
168=5
169=5
170=15
171=13
172=12
173=12
174=12
175=13
176=13
177=8
178=12
179=12
180=12
181=12
182=13
183=13
184=12
185=12
186=12
187=12
188=12
189=13
190=13
191=13
192=17
193=12
194=12
195=12
196=12
197=13
198=5
199=5
200=7
201=7
202=9
203=13
204=12
205=12
206=12
207=13
208=13
209=9
210=12
211=12
212=12
213=12
214=13
215=12
216=12
217=13
[alt]
Line 0= Ą˘Ł¤ĽŚ§¨Š
Line 1=ŞŤŹ­ŽŻ°ą˛ł
Line 2=´ľśˇ¸šşťź˝
Line 3=žżŔÁÂĂÄĹĆÇ
Line 4=ČÉĘËĚÍÎĎĐŃ
Line 5=ŇÓÔŐÖ×ŘŮÚŰ
Line 6=ÜÝŢßŕáâăäĺ
Line 7=ćçčéęëěíîď
Line 8=đńňóôőö÷řů
Line 9=úűüýţ˙
0=8
1=13
2=10
3=11
4=10
5=11
6=13
7=12
8=10
9=12
10=13
11=12
12=12
13=10
14=12
15=12
16=6
17=11
18=10
19=4
20=5
21=4
22=10
23=10
24=10
25=12
26=10
27=8
28=10
29=10
30=10
31=10
32=14
33=12
34=12
35=13
36=13
37=11
38=14
39=12
40=14
41=12
42=13
43=13
44=13
45=5
46=5
47=14
48=14
49=14
50=14
51=12
52=12
53=16
54=13
55=8
56=14
57=14
58=12
59=14
60=13
61=13
62=12
63=12
64=7
65=12
66=12
67=11
68=13
69=4
70=10
71=12
72=10
73=12
74=11
75=13
76=11
77=5
78=7
79=13
80=11
81=11
82=11
83=12
84=12
85=11
86=13
87=9
88=7
89=11
90=12
91=11
92=13
93=12
94=6
95=10
Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

@@ -1,381 +0,0 @@
[common]
Baseline=43
Top=11
LineSpacing=52
DrawExtraPixelsLeft=4
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=11
1=14
2=21
3=22
4=22
5=33
6=26
7=11
8=14
9=14
10=17
11=25
12=11
13=16
14=11
15=15
16=22
17=22
18=22
19=22
20=22
21=22
22=22
23=22
24=22
25=22
26=11
27=11
28=25
29=25
30=25
31=21
32=34
33=24
34=24
35=23
36=24
37=21
38=20
39=23
40=24
41=11
42=21
43=24
44=19
45=33
46=25
47=23
48=23
49=23
50=24
51=23
52=19
53=23
54=23
55=33
56=23
57=23
58=20
59=14
60=15
61=14
62=25
63=21
64=11
65=21
66=22
67=20
68=22
69=20
70=13
71=22
72=22
73=11
74=11
75=22
76=11
77=33
78=22
79=21
80=22
81=22
82=16
83=19
84=13
85=22
86=20
87=32
88=21
89=20
90=19
91=14
92=12
93=14
94=25
95=22
96=11
97=22
98=21
99=42
100=22
101=22
102=11
103=47
104=23
105=10
106=32
107=20
108=11
109=11
110=21
111=21
112=21
113=21
114=42
115=11
116=42
117=19
118=10
119=31
120=19
121=23
122=11
123=14
124=22
125=22
126=22
127=22
128=12
129=22
130=11
131=34
132=14
133=19
134=25
135=16
136=34
137=11
138=17
139=25
140=14
141=14
142=11
143=22
144=26
145=11
146=11
147=14
148=14
149=19
150=33
151=33
152=33
153=21
154=24
155=24
156=24
157=24
158=24
159=24
160=33
161=23
162=21
163=21
164=21
165=21
166=11
167=11
168=11
169=11
170=24
171=25
172=23
173=23
174=23
175=23
176=23
177=25
178=23
179=23
180=23
181=23
182=23
183=23
184=23
185=23
186=21
187=21
188=21
189=21
190=21
191=21
192=31
193=20
194=20
195=20
196=20
197=20
198=11
199=11
200=11
201=11
202=21
203=22
204=21
205=21
206=21
207=21
208=21
209=25
210=21
211=22
212=22
213=22
214=22
215=20
216=22
217=20
[alt]
Line 0= Ą˘Ł¤ĽŚ§¨Š
Line 1=ŞŤŹ­ŽŻ°ą˛ł
Line 2=´ľśˇ¸šşťź˝
Line 3=žżŔÁÂĂÄĹĆÇ
Line 4=ČÉĘËĚÍÎĎĐŃ
Line 5=ŇÓÔŐÖ×ŘŮÚŰ
Line 6=ÜÝŢßŕáâăäĺ
Line 7=ćçčéęëěíîď
Line 8=đńňóôőö÷řů
Line 9=úűüýţ˙
0=11
1=9
2=11
3=19
4=22
5=7
6=8
7=22
8=11
9=23
10=8
11=7
12=7
13=16
14=20
15=7
16=17
17=7
18=11
19=12
20=11
21=7
22=7
23=11
24=11
25=19
26=7
27=9
28=7
29=11
30=19
31=7
32=8
33=24
34=24
35=9
36=24
37=6
38=7
39=23
40=7
41=21
42=7
43=21
44=7
45=11
46=11
47=8
48=8
49=9
50=9
51=23
52=23
53=8
54=23
55=25
56=8
57=8
58=23
59=8
60=23
61=23
62=7
63=23
64=7
65=21
66=21
67=7
68=21
69=3
70=7
71=20
72=7
73=20
74=7
75=20
76=7
77=11
78=11
79=10
80=8
81=7
82=7
83=21
84=21
85=7
86=21
87=25
88=7
89=7
90=22
91=7
92=22
93=20
94=6
95=11
[polish]
Baseline=43
Top=11
LineSpacing=52
DrawExtraPixelsLeft=2
DrawExtraPixelsRight=4
AdvanceExtraPixels=0
line 0=ĄĆĘŁŃŚŹŻ
line 1=ąćęłńśźż
0=23
1=23
2=23
3=23
4=23
5=23
6=23
7=23
8=23
9=23
10=23
11=16
12=23
13=23
14=23
15=23
Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 171 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

@@ -0,0 +1,352 @@
[common]
Baseline=54
Top=20
LineSpacing=65
DrawExtraPixelsLeft=4
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=12
1=13
2=21
3=31
4=27
5=41
6=36
7=12
8=15
9=15
10=26
11=27
12=13
13=15
14=13
15=19
16=27
17=27
18=27
19=27
20=27
21=27
22=27
23=27
24=27
25=27
26=13
27=13
28=27
29=27
30=27
31=22
32=43
33=32
34=32
35=30
36=35
37=27
38=26
39=35
40=36
41=15
42=14
43=31
44=26
45=44
46=38
47=38
48=30
49=38
50=31
51=26
52=27
53=36
54=30
55=45
56=30
57=28
58=28
59=16
60=19
61=16
62=26
63=21
64=28
65=28
66=30
67=24
68=30
69=28
70=17
71=27
72=30
73=13
74=13
75=27
76=13
77=46
78=30
79=29
80=30
81=30
82=21
83=23
84=19
85=30
86=26
87=39
88=26
89=26
90=23
91=19
92=26
93=18
94=27
95=28
96=13
97=28
98=22
99=39
100=24
101=25
102=29
103=60
104=26
105=16
106=46
107=28
108=9
109=9
110=19
111=19
112=18
113=24
114=48
115=29
116=37
117=23
118=16
119=46
120=23
121=28
122=12
123=13
124=27
125=27
126=27
127=27
128=26
129=24
130=28
131=40
132=18
133=27
134=27
135=15
136=40
137=24
138=21
139=27
140=17
141=17
142=28
143=31
144=31
145=13
146=10
147=17
148=18
149=27
150=40
151=40
152=40
153=22
154=32
155=32
156=32
157=32
158=32
159=32
160=44
161=30
162=27
163=27
164=27
165=27
166=15
167=15
168=15
169=15
170=35
171=38
172=38
173=38
174=38
175=38
176=38
177=27
178=38
179=36
180=36
181=36
182=36
183=28
184=30
185=32
186=28
187=28
188=28
189=28
190=28
191=28
192=43
193=24
194=28
195=28
196=28
197=28
198=13
199=13
200=13
201=13
202=29
203=30
204=29
205=29
206=29
207=29
208=29
209=27
210=29
211=30
212=30
213=30
214=30
215=26
216=30
217=26
[alt]
Line 0= Ą˘Ł¤ĽŚ§¨Š
Line 1=ŞŤŹ­ŽŻ°ą˛ł
Line 2=´ľśˇ¸šşťź˝
Line 3=žżŔÁÂĂÄĹĆÇ
Line 4=ČÉĘËĚÍÎĎĐŃ
Line 5=ŇÓÔŐÖ×ŘŮÚŰ
Line 6=ÜÝŢßŕáâăäĺ
Line 7=ćçčéęëěíîď
Line 8=đńňóôőö÷řů
Line 9=úűüýţ˙
0=12
1=32
2=29
3=26
4=27
5=26
6=26
7=24
8=28
9=26
10=26
11=27
12=28
13=15
14=28
15=28
16=21
17=28
18=10
19=14
20=28
21=13
22=23
23=29
24=10
25=23
26=23
27=19
28=23
29=28
30=23
31=23
32=31
33=32
34=32
35=32
36=32
37=26
38=30
39=30
40=30
41=27
42=27
43=27
44=27
45=15
46=15
47=35
48=35
49=38
50=38
51=38
52=38
53=38
54=38
55=27
56=31
57=36
58=36
59=36
60=36
61=28
62=27
63=32
64=21
65=28
66=28
67=28
68=28
69=13
70=24
71=24
72=24
73=28
74=28
75=28
76=28
77=13
78=13
79=30
80=30
81=30
82=30
83=29
84=29
85=29
86=29
87=27
88=21
89=30
90=30
91=30
92=30
93=26
94=19
95=13
@@ -1,5 +1,4 @@
local curScreen = Var "LoadingScreen";
local curStage = GAMESTATE:GetCurrentStage();
local curStageIndex = GAMESTATE:GetCurrentStageIndex() + 1;
local playMode = GAMESTATE:GetPlayMode();
@@ -14,6 +13,7 @@ local t = Def.ActorFrame {
CurrentTraiP1ChangedMessageCommand=cmd(playcommand,"Set");
CurrentTraiP2ChangedMessageCommand=cmd(playcommand,"Set");
SetCommand=function(self)
local curStage = GAMESTATE:GetCurrentStage();
if GAMESTATE:IsCourseMode() then
local stats = STATSMAN:GetCurStageStats()
if not stats then
@@ -1,11 +1,16 @@
local gc = Var("GameCommand");
local string_name = gc:GetText()
local string_expl = THEME:GetString(Var "LoadingScreen", gc:GetName().."Explanation")
local icon_color = ModeIconColors[gc:GetName()];
local t = Def.ActorFrame {};
t[#t+1] = Def.ActorFrame {
GainFocusCommand=cmd(stoptweening;bob;effectmagnitude,0,6,0;decelerate,0.05;zoom,1);
LoseFocusCommand=cmd(stoptweening;stopeffect;decelerate,0.1;zoom,0.6);
LoadActor("_background base")..{
InitCommand=cmd(diffuse,ModeIconColors[gc:GetName()]);
InitCommand=cmd(diffuse,icon_color);
};
LoadActor("_background effect");
LoadActor("_gloss");
@@ -13,25 +18,18 @@ t[#t+1] = Def.ActorFrame {
LoadActor("_cutout");
-- todo: generate a better font for these.
LoadFont("_helveticaneuelt std extblk cn 42px")..{
InitCommand=cmd(y,-12;zoom,1.1;diffuse,color("#000000");uppercase,true;settext,gc:GetText(););
GainFocusCommand=cmd(diffuse,Color.Black;stopeffect);
LoseFocusCommand=cmd(diffuse,Color.Black;stopeffect);
LoadFont("Common Large")..{
Text=string.upper(string_name);
InitCommand=cmd(y,-12;maxwidth,232);
OnCommand=cmd(diffuse,Color.Black;shadowlength,1;shadowcolor,color("#ffffff77");skewx,-0.125);
};
LoadFont("_helveticaneuelt std extblk cn 42px")..{
InitCommand=cmd(y,27.5;zoom,0.45;maxwidth,320*1.6;uppercase,true;settext,THEME:GetString(Var "LoadingScreen", gc:GetName().."Explanation"));
GainFocusCommand=cmd(diffuse,Color.White;stopeffect);
LoseFocusCommand=cmd(diffuse,Color.White;stopeffect);
LoadFont("Common Normal")..{
Text=string.upper(string_expl);
InitCommand=cmd(y,27.5;maxwidth,232);
};
LoadActor("_background base") .. {
DisabledCommand=cmd(diffuse,color("0,0,0,0.5"));
EnabledCommand=cmd(diffuse,color("1,1,1,0"));
};
--[[
LoadActor(THEME:GetPathG("_SelectIcon",gc:GetName() )) .. {
DisabledCommand=cmd(diffuse,color("0.5,0.5,0.5,1"));
EnabledCommand=cmd(diffuse,color("1,1,1,1"));
};
--]]
};
return t
@@ -8,23 +8,28 @@ local colors = {
Oni = color("#d70b8c"),
Endless = color("#b4c3d2"),
};
local icon_color = ModeIconColors[gc:GetName()];
local string_name = gc:GetText();
local string_expl = THEME:GetString(Var "LoadingScreen", gc:GetName() .. "Explanation");
local t = Def.ActorFrame {};
-- Background!
t[#t+1] = Def.ActorFrame {
-- GainFocusCommand=cmd(visible,true);
-- LoseFocusCommand=cmd(visible,false);
LoadActor(THEME:GetPathG("ScreenSelectPlayMode","BackgroundFrame")) .. {
InitCommand=cmd(diffuse,Color("Black");diffusealpha,0.45);
GainFocusCommand=cmd(visible,true);
LoseFocusCommand=cmd(visible,false);
};
LoadActor("_HighlightFrame") .. {
InitCommand=cmd(diffuse,ModeIconColors[gc:GetName()];diffusealpha,0);
GainFocusCommand=cmd(finishtweening;diffuse,ColorLightTone(ModeIconColors[gc:GetName()]);linear,1;diffuse,ModeIconColors[gc:GetName()]);
InitCommand=cmd(diffuse,icon_color;diffusealpha,0);
GainFocusCommand=cmd(finishtweening;diffuse,ColorLightTone(icon_color);linear,1;diffuse,icon_color);
LoseFocusCommand=cmd(finishtweening;diffusealpha,0);
OffFocusedCommand=cmd(finishtweening;glow,Color("White");decelerate,1;glow,Color("Invisible"));
};
};
-- Emblem Frame
t[#t+1] = Def.ActorFrame {
FOV=90;
@@ -34,30 +39,36 @@ t[#t+1] = Def.ActorFrame {
InitCommand=cmd(diffusealpha,0;zoom,0.75);
GainFocusCommand=cmd(finishtweening;stopeffect;diffusealpha,1;zoom,1;glow,Color("White");decelerate,0.5;glow,Color("Invisible");pulse;effecttiming,0.75,0.125,0.125,0.75;effectmagnitude,0.95,1,1;);
LoseFocusCommand=cmd(finishtweening;stopeffect;smooth,0.4;diffusealpha,0;zoom,0.75;glow,Color("Invisible"));
OffFocusedCommand=cmd(finishtweening;stopeffect;glow,ModeIconColors[gc:GetName()];decelerate,0.5;rotationy,360;glow,Color("Invisible"));
OffFocusedCommand=cmd(finishtweening;stopeffect;glow,icon_color;decelerate,0.5;rotationy,360;glow,Color("Invisible"));
};
};
-- Text Frame
t[#t+1] = Def.ActorFrame {
InitCommand=cmd(x,-192/2;y,-10);
Def.Quad {
InitCommand=cmd(horizalign,left;y,20;zoomto,320,2;diffuse,ModeIconColors[gc:GetName()];diffusealpha,0;fadeleft,0.35;faderight,0.35);
GainFocusCommand=cmd(stoptweening;linear,0.5;diffusealpha,1);
LoseFocusCommand=cmd(stoptweening;linear,0.1;diffusealpha,0);
};
LoadFont("_helveticaneuelt std extblk cn 42px") .. {
Text=gc:GetText();
InitCommand=cmd(horizalign,left;diffuse,ModeIconColors[gc:GetName()];shadowcolor,ColorDarkTone(ModeIconColors[gc:GetName()]);shadowlength,2;diffusealpha,0;skewx,-0.125);
GainFocusCommand=cmd(finishtweening;x,-16;diffuse,ColorLightTone(ModeIconColors[gc:GetName()]);decelerate,0.45;diffusealpha,1;x,0;diffuse,ModeIconColors[gc:GetName()]);
LoadFont("Common Large") .. {
Text=string_name;
InitCommand=cmd(y,-2;horizalign,left;diffuse,icon_color;strokecolor,ColorDarkTone(icon_color);shadowlength,2;diffusealpha,0;skewx,-0.125);
OnCommand=cmd(glowshift;textglowmode,'TextGlowMode_Inner';
effectcolor1,color("1,1,1,0.5");effectcolor2,color("1,1,1,0")
);
GainFocusCommand=cmd(finishtweening;x,-16;diffuse,ColorLightTone(icon_color);decelerate,0.45;diffusealpha,1;x,0;diffuse,icon_color);
LoseFocusCommand=cmd(finishtweening;x,0;accelerate,0.4;diffusealpha,0;x,32;diffusealpha,0);
};
LoadFont("_helveticaneuelt std extblk cn 42px") .. {
Text=THEME:GetString(Var "LoadingScreen", gc:GetName() .. "Explanation");
InitCommand=cmd(horizalign,right;x,320;y,30;shadowlength,1;diffusealpha,0;skewx,-0.125;zoom,0.5);
LoadFont("Common Normal") .. {
Text=string_expl;
InitCommand=cmd(horizalign,right;x,320;y,30;shadowlength,1;diffusealpha,0;skewx,-0.125;zoom,0.75);
GainFocusCommand=cmd(finishtweening;x,320+16;decelerate,0.45;diffusealpha,1;x,320);
LoseFocusCommand=cmd(finishtweening;x,320;accelerate,0.4;diffusealpha,0;x,320-32;diffusealpha,0);
};
Def.Quad {
InitCommand=cmd(horizalign,left;y,20;zoomto,320,2;diffuse,icon_color;diffusealpha,0;fadeleft,0.35;faderight,0.35);
GainFocusCommand=cmd(stoptweening;linear,0.5;diffusealpha,1);
LoseFocusCommand=cmd(stoptweening;linear,0.1;diffusealpha,0);
};
};
t.GainFocusCommand=cmd(finishtweening;visible,true;zoom,1.1;decelerate,0.25;zoom,1);
t.LoseFocusCommand=cmd(finishtweening;visible,false;zoom,1);
return t
@@ -1,11 +1,36 @@
local gc = Var("GameCommand");
local string_name = gc:GetText();
local string_expl = THEME:GetString("StyleType", gc:GetStyle():GetStyleType());
local icon_color = color("#FFCB05");
local icon_color2 = color("#F0BA00");
local t = Def.ActorFrame {};
t[#t+1] = Def.ActorFrame {
GainFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconGainFocusCommand");
LoseFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconLoseFocusCommand");
LoadActor(THEME:GetPathG("_SelectIcon",gc:GetName() )) .. {
DisabledCommand=cmd(diffuse,color("0.5,0.5,0.5,1"));
EnabledCommand=cmd(diffuse,color("1,1,1,1"));
GainFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconGainFocusCommand");
LoseFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconLoseFocusCommand");
LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_background base"))..{
InitCommand=cmd(diffuse,icon_color;diffusebottomedge,icon_color2);
};
LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_background effect"));
LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_gloss"));
LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_stroke"));
LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_cutout"));
LoadFont("Common Large")..{
Text=string.upper(string_name);
InitCommand=cmd(y,-12;maxwidth,232);
OnCommand=cmd(diffuse,Color.Black;shadowlength,1;shadowcolor,color("#ffffff77");skewx,-0.125);
};
LoadFont("Common Normal")..{
Text=string.upper(string_expl);
InitCommand=cmd(y,27.5;maxwidth,232);
};
LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_background base"))..{
DisabledCommand=cmd(diffuse,color("0,0,0,0.5"));
EnabledCommand=cmd(diffuse,color("1,1,1,0"));
};
};
return t
@@ -1,5 +1,4 @@
local curScreen = Var "LoadingScreen";
local curStage = GAMESTATE:GetCurrentStage();
local curStageIndex = GAMESTATE:GetCurrentStageIndex();
local t = Def.ActorFrame {};
@@ -15,7 +14,9 @@ t[#t+1] = Def.ActorFrame {
end
self:playcommand("Set")
end;
CurrentSongChangedMessageCommand= cmd(playcommand,"Set"),
SetCommand=function(self)
local curStage = GAMESTATE:GetCurrentStage();
if GAMESTATE:GetCurrentCourse() then
self:settext( curStageIndex+1 .. " / " .. GAMESTATE:GetCurrentCourse():GetEstimatedNumStages() );
elseif GAMESTATE:IsEventMode() then
@@ -37,7 +37,8 @@ t[#t+1] = LoadFont("Common Bold") .. {
t[#t+1] = Def.Quad {
Name="Underline";
InitCommand=cmd(x,-SCREEN_CENTER_X+24-4;y,36;horizalign,left);
OnCommand=cmd(diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25);linear,0.25;zoomtowidth,192;fadeleft,8/192;faderight,0.5);
OnCommand=cmd(diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25);linear,0.25;zoomtowidth,192;fadeleft,8/192;faderight,0.5;
visible,string.len( Screen.String("HeaderText") ) > 0 );
};
t[#t+1] = LoadFont("Common Bold") .. {
+36 -3
View File
@@ -258,9 +258,9 @@ MusicWheelSortOnCommand=fov,90;
MusicWheelSortOffCommand=fov,90;
MusicWheelItemSortOnCommand=zoomy,0;bounceend,0.05;zoomy,1
MusicWheelItemSortOffCommand=linear,0.05;zoomy,0
HighlightOnCommand=diffuseshift;effecttiming,(1/8),0,(7/8),0;effectcolor2,Color("White");effectcolor1,color("1,1,1,0.5");effectclock,'beatnooffset'
HighlightSortOnCommand=stoptweening;decelerate,0.05;glow,Color("Stealth");zoom,1
HighlightSortOffCommand=stoptweening;accelerate,0.05;glow,Color("Orange");zoom,1.05
HighlightOnCommand=diffuseramp;effectcolor2,Color.White;effectcolor1,color("1,1,1,0.5");effectclock,'beatnooffset'
HighlightSortOnCommand=stoptweening;decelerate,0.05;glow,Color.Stealth;zoom,1
HighlightSortOffCommand=stoptweening;accelerate,0.05;glow,Color.Yellow;zoom,1.05
WheelItemOnDelayOffset=0.04
WheelItemOffDelayOffset=0.04
@@ -561,6 +561,35 @@ Fallback="TextBanner"
[Screen]
[ScreenDebugOverlay]
BackgroundColor=color("0,0,0,0.75")
LineOnColor=Color.White
LineOffColor=color("0.75,0.75,0.75,1")
LineStartY=SCREEN_TOP+50
LineSpacing=19
LineButtonX=SCREEN_CENTER_X-50
LineFunctionX=SCREEN_CENTER_X-30
ButtonTextOnCommand=NoStroke;zoom,0.8;shadowlength,1
ButtonTextToggledCommand=linear,0.025;textglowmode,'TextGlowMode_Inner';glow,color("1,0,0,1");sleep,0.125;decelerate,0.2;glow,color("1,0,0,0");
FunctionTextOnCommand=NoStroke;zoom,0.8;skewx,-0.125;shadowlength,1
PageStartX=SCREEN_CENTER_X-100
PageSpacingX=120
PageTextOnCommand=NoStroke;zoom,0.75;strokecolor,Color.Outline;
PageTextGainFocusCommand=diffuse,color("1,1,1,1");skewx,-0.125;
PageTextLoseFocusCommand=diffuse,color("0.6,0.6,0.6,1")
DebugMenuHeaderX=SCREEN_LEFT+80
DebugMenuHeaderY=SCREEN_TOP+18
DebugMenuHeaderOnCommand=diffusebottomedge,color("0.675,0.675,0.675,1");strokecolor,Color.Outline
DebugMenuHeaderOffCommand=
HeaderTextX=SCREEN_LEFT+80
HeaderTextY=SCREEN_TOP+18
HeaderTextOnCommand=textglowmode,'TextGlowMode_Inner';glowshift;effectperiod,4;skewx,-0.125;diffusebottomedge,color("0.75,0.75,0.75,1");strokecolor,Color.Outline
HeaderTextOffCommand=
#
[ScreenSystemLayer]
ShowClock=true
@@ -1388,6 +1417,10 @@ LineFancyUIBG="lua,ThemePrefRow('FancyUIBG')"
[ScreenOptionsEditProfile]
[ScreenOptionsCustomizeProfile]
ShowHeader=true
ShowFooter=true
[ScreenReloadSongs]
[ScreenPlayerOptions]