Code cleanup

Mainly unneeded semicolons
This commit is contained in:
ListenerJubatus
2018-08-14 14:19:02 -06:00
parent f4c97e5970
commit 2dcf66223d
47 changed files with 484 additions and 481 deletions
@@ -1,3 +1,5 @@
return LoadActor(THEME:GetPathG("MusicWheelItem", "ModeItem")) .. {
OnCommand=cmd(diffuse,ScreenColor(SCREENMAN:GetTopScreen():GetName()););
OnCommand=function(self)
self:diffuse(ScreenColor(SCREENMAN:GetTopScreen():GetName()));
end;
};
@@ -1,3 +1,5 @@
return LoadActor(THEME:GetPathG("MusicWheelItem", "ModeItem")) .. {
OnCommand=cmd(diffuse,ScreenColor(SCREENMAN:GetTopScreen():GetName()););
OnCommand=function(self)
self:diffuse(ScreenColor(SCREENMAN:GetTopScreen():GetName()));
end;
};
+17 -17
View File
@@ -83,7 +83,7 @@ local function CreatePaneDisplayGraph( _pnPlayer, _sLabel, _rcRadarCategory )
end;
};
LoadFont("Common Normal") .. {
InitCommand=cmd(x,14;zoom,0.5;halign,0;);
InitCommand=cmd(x,14;zoom,0.5;halign,0);
OnCommand=cmd(shadowlength,1;strokecolor,color("0.15,0.15,0.15,0.625"));
CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set");
@@ -109,44 +109,44 @@ t[#t+1] = Def.ActorFrame {
-- Left
CreatePaneDisplayItem( iPN, "Taps", 'RadarCategory_TapsAndHolds' ) .. {
InitCommand=cmd(x,-128+16+8;y,-14);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.4;linear,0.3;diffusealpha,1;zoomy,1;);
OffCommand=cmd(linear,0.1;diffusealpha,0;zoomy,0.8;);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.4;linear,0.3;diffusealpha,1;zoomy,1);
OffCommand=cmd(linear,0.1;diffusealpha,0;zoomy,0.8);
};
CreatePaneDisplayItem( iPN, "Jumps", 'RadarCategory_Jumps' ) .. {
InitCommand=cmd(x,-128+16+8;y,-14+24);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.5;linear,0.3;diffusealpha,1;zoomy,1;);
OffCommand=cmd(linear,0.15;diffusealpha,0;zoomy,0.8;);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.5;linear,0.3;diffusealpha,1;zoomy,1);
OffCommand=cmd(linear,0.15;diffusealpha,0;zoomy,0.8);
};
CreatePaneDisplayItem( iPN, "Holds", 'RadarCategory_Holds' ) .. {
InitCommand=cmd(x,-128+16+8;y,-14+24*2);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.6;linear,0.3;diffusealpha,1;zoomy,1;);
OffCommand=cmd(linear,0.2;diffusealpha,0;zoomy,0.8;);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.6;linear,0.3;diffusealpha,1;zoomy,1);
OffCommand=cmd(linear,0.2;diffusealpha,0;zoomy,0.8);
};
CreatePaneDisplayItem( iPN, "Mines", 'RadarCategory_Mines' ) .. {
InitCommand=cmd(x,-128+16+8;y,-14+24*3);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.7;linear,0.3;diffusealpha,1;zoomy,1;);
OffCommand=cmd(linear,0.25;diffusealpha,0;zoomy,0.8;);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.7;linear,0.3;diffusealpha,1;zoomy,1);
OffCommand=cmd(linear,0.25;diffusealpha,0;zoomy,0.8);
};
-- Center
CreatePaneDisplayItem( iPN, "Hands", 'RadarCategory_Hands' ) .. {
InitCommand=cmd(x,36;y,-14);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.4;linear,0.3;diffusealpha,1;zoomy,1;);
OffCommand=cmd(linear,0.1;diffusealpha,0;zoomy,0.8;);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.4;linear,0.3;diffusealpha,1;zoomy,1);
OffCommand=cmd(linear,0.1;diffusealpha,0;zoomy,0.8);
};
CreatePaneDisplayItem( iPN, "Rolls", 'RadarCategory_Rolls' ) .. {
InitCommand=cmd(x,36;y,-14+24);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.5;linear,0.3;diffusealpha,1;zoomy,1;);
OffCommand=cmd(linear,0.15;diffusealpha,0;zoomy,0.8;);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.5;linear,0.3;diffusealpha,1;zoomy,1);
OffCommand=cmd(linear,0.15;diffusealpha,0;zoomy,0.8);
};
CreatePaneDisplayItem( iPN, "Lifts", 'RadarCategory_Lifts' ) .. {
InitCommand=cmd(x,36;y,-14+24*2);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.6;linear,0.3;diffusealpha,1;zoomy,1;);
OffCommand=cmd(linear,0.2;diffusealpha,0;zoomy,0.8;);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.6;linear,0.3;diffusealpha,1;zoomy,1);
OffCommand=cmd(linear,0.2;diffusealpha,0;zoomy,0.8);
};
CreatePaneDisplayItem( iPN, "Fakes", 'RadarCategory_Fakes' ) .. {
InitCommand=cmd(x,36;y,-14+24*3);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.7;linear,0.3;diffusealpha,1;zoomy,1;);
OffCommand=cmd(linear,0.25;diffusealpha,0;zoomy,0.8;);
OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.7;linear,0.3;diffusealpha,1;zoomy,1);
OffCommand=cmd(linear,0.25;diffusealpha,0;zoomy,0.8);
};
};
return t;
@@ -88,24 +88,24 @@ local t = Def.ActorFrame {
if param.FullComboW1 then
c.Number:diffuse(color("#00aeef"));
c.Number:glowshift();
(cmd(diffuse,color("#C7E5F0");diffusebottomedge,color("#00aeef");strokecolor,color("#0E3D53");))(c.Label);
(cmd(diffuse,color("#C7E5F0");diffusebottomedge,color("#00aeef");strokecolor,color("#0E3D53")))(c.Label);
elseif param.FullComboW2 then
c.Number:diffuse(color("#F3D58D"));
c.Number:glowshift();
(cmd(diffuse,color("#FAFAFA");diffusebottomedge,color("#F3D58D");strokecolor,color("#53450E");))(c.Label);
(cmd(diffuse,color("#FAFAFA");diffusebottomedge,color("#F3D58D");strokecolor,color("#53450E")))(c.Label);
elseif param.FullComboW3 then
c.Number:diffuse(color("#94D658"));
c.Number:stopeffect();
(cmd(diffuse,color("#CFE5BC");diffusebottomedge,color("#94D658");strokecolor,color("#12530E");))(c.Label);
(cmd(diffuse,color("#CFE5BC");diffusebottomedge,color("#94D658");strokecolor,color("#12530E")))(c.Label);
elseif param.Combo then
c.Number:diffuse(color("#FBE9DD"));
-- c.Number:diffuse(PlayerColor(player));
c.Number:stopeffect();
(cmd(diffuse,color("#F5CB92");diffusebottomedge,color("#EFA97A");strokecolor,color("#602C1B");))(c.Label);
(cmd(diffuse,color("#F5CB92");diffusebottomedge,color("#EFA97A");strokecolor,color("#602C1B")))(c.Label);
else
c.Number:diffuse(color("#FBE9DD"));
c.Number:stopeffect();
(cmd(diffuse,color("#F5CB92");diffusebottomedge,color("#EFA97A");strokecolor,color("#602C1B");))(c.Label);
(cmd(diffuse,color("#F5CB92");diffusebottomedge,color("#EFA97A");strokecolor,color("#602C1B")))(c.Label);
end
-- Pulse
Pulse( c.Number, param );
@@ -85,25 +85,25 @@ t[#t+1] = Def.ActorFrame {
Name="ProtimingGraphBG";
InitCommand=cmd(visible,false;y,32;zoomto,ProtimingWidth,16);
ResetCommand=cmd(finishtweening;diffusealpha,0.8;visible,false);
OnCommand=cmd(diffuse,Color("Black");diffusetopedge,color("0.1,0.1,0.1,1");diffusealpha,0.8;shadowlength,2;);
OnCommand=cmd(diffuse,Color("Black");diffusetopedge,color("0.1,0.1,0.1,1");diffusealpha,0.8;shadowlength,2);
};
Def.Quad {
Name="ProtimingGraphWindowW3";
InitCommand=cmd(visible,false;y,32;zoomto,ProtimingWidth-4,16-4);
ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false);
OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W3"];);
OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W3"]);
};
Def.Quad {
Name="ProtimingGraphWindowW2";
InitCommand=cmd(visible,false;y,32;zoomto,scale(PREFSMAN:GetPreference("TimingWindowSecondsW2"),0,PREFSMAN:GetPreference("TimingWindowSecondsW3"),0,ProtimingWidth-4),16-4);
ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false);
OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W2"];);
OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W2"]);
};
Def.Quad {
Name="ProtimingGraphWindowW1";
InitCommand=cmd(visible,false;y,32;zoomto,scale(PREFSMAN:GetPreference("TimingWindowSecondsW1"),0,PREFSMAN:GetPreference("TimingWindowSecondsW3"),0,ProtimingWidth-4),16-4);
ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false);
OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W1"];);
OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W1"]);
};
Def.Quad {
Name="ProtimingGraphUnderlay";
@@ -113,19 +113,19 @@ t[#t+1] = Def.ActorFrame {
};
Def.Quad {
Name="ProtimingGraphFill";
InitCommand=cmd(visible,false;y,32;zoomto,0,16-4;horizalign,left;);
InitCommand=cmd(visible,false;y,32;zoomto,0,16-4;horizalign,left);
ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false);
OnCommand=cmd(diffuse,Color("Red"););
OnCommand=cmd(diffuse,Color("Red"));
};
Def.Quad {
Name="ProtimingGraphAverage";
InitCommand=cmd(visible,false;y,32;zoomto,2,7;);
InitCommand=cmd(visible,false;y,32;zoomto,2,7);
ResetCommand=cmd(finishtweening;diffusealpha,0.85;visible,false);
OnCommand=cmd(diffuse,Color("Orange");diffusealpha,0.85);
};
Def.Quad {
Name="ProtimingGraphCenter";
InitCommand=cmd(visible,false;y,32;zoomto,2,16-4;);
InitCommand=cmd(visible,false;y,32;zoomto,2,16-4);
ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false);
OnCommand=cmd(diffuse,Color("White");diffusealpha,1);
};
@@ -20,7 +20,7 @@ t[#t+1] = Def.ActorFrame {
end
};
LoadFont("Common Italic Condensed") .. {
InitCommand=cmd(y,-1;zoom,1;shadowlength,1;uppercase,true;);
InitCommand=cmd(y,-1;zoom,1;shadowlength,1;uppercase,true);
BeginCommand=function(self)
local top = SCREENMAN:GetTopScreen()
if top then
@@ -86,19 +86,19 @@ t[#t+1] = Def.ActorFrame {
Def.Quad {
Name="Background",
InitCommand=cmd(zoomto,life_meter_width,life_meter_height),
OnCommand=cmd(diffuse,color("#32373E");),
AliveCommand=cmd(stopeffect;diffuse,color("#32373E");),
OnCommand=cmd(diffuse,color("#32373E")),
AliveCommand=cmd(stopeffect;diffuse,color("#32373E")),
DangerCommand=cmd(diffuseshift;effectcolor2,ColorMidTone(Color.Red);effectcolor1,ColorDarkTone(Color.Red)),
DeadCommand=cmd(stopeffect;diffuse,color("#000000");),
DeadCommand=cmd(stopeffect;diffuse,color("#000000")),
},
Def.Quad {
Name="Fill",
InitCommand=cmd(x,-life_meter_width/2;zoomto,life_meter_width,life_meter_height;horizalign,left),
OnCommand=cmd(diffuse,PlayerColor(pn);),
OnCommand=cmd(diffuse,PlayerColor(pn)),
--
HotCommand=cmd(diffuse,color("#ff9232");diffuseshift;effectclock,'beat';effectcolor1,color("#ff9232");effectcolor2,color("#ffe263");),
HotCommand=cmd(diffuse,color("#ff9232");diffuseshift;effectclock,'beat';effectcolor1,color("#ff9232");effectcolor2,color("#ffe263")),
AliveCommand=cmd(diffuse,PlayerColor(pn);stopeffect),
DangerCommand=cmd(diffuse,Color.Red;diffuseshift;effectclock,'beat';effectcolor1,Color.Red;effectcolor2,color("#FF797C");),
DangerCommand=cmd(diffuse,Color.Red;diffuseshift;effectclock,'beat';effectcolor1,Color.Red;effectcolor2,color("#FF797C")),
DeadCommand=cmd(diffuse,Color.Red;stopeffect)
},
MakeSeperators(),
@@ -106,11 +106,11 @@ t[#t+1] = Def.ActorFrame {
Name="Tip",
InitCommand=cmd(basezoomx,life_meter_tip_width;basezoomy,life_meter_height),
--
OnCommand=cmd(diffuse,ColorLightTone(PlayerColor(pn));),
OnCommand=cmd(diffuse,ColorLightTone(PlayerColor(pn))),
--
HotCommand=cmd(diffuse,color("#FFED31");glowshift;effectclock,'beat'),
AliveCommand=cmd(diffuse,ColorLightTone(PlayerColor(pn));stopeffect),
DangerCommand=cmd(diffuse,Color.Red;diffuseshift;effectclock,'beat';effectcolor1,color("#000000");effectcolor2,Color.Red;),
DangerCommand=cmd(diffuse,Color.Red;diffuseshift;effectclock,'beat';effectcolor1,color("#000000");effectcolor2,Color.Red),
DeadCommand=cmd(diffuse,Color.Red;stopeffect)
}
}
@@ -61,10 +61,10 @@ t[#t+1] = Def.ActorFrame {
Def.Quad {
Name="Background",
InitCommand=cmd(zoomto,life_meter_width,life_meter_height),
OnCommand=cmd(diffuse,color("#32373E");),
AliveCommand=cmd(stopeffect;diffuse,color("#32373E");),
OnCommand=cmd(diffuse,color("#32373E")),
AliveCommand=cmd(stopeffect;diffuse,color("#32373E")),
DangerCommand=cmd(diffuseshift;effectcolor2,ColorMidTone(Color.Red);effectcolor1,ColorDarkTone(Color.Red)),
DeadCommand=cmd(stopeffect;diffuse,color("#000000");),
DeadCommand=cmd(stopeffect;diffuse,color("#000000")),
},
Def.Quad {
Name="Fill",
@@ -45,7 +45,7 @@ for idx=1,NumColumns do
};
Scores[#Scores+1] = LoadActor("empty") .. {
Name = idx .. "Empty";
InitCommand=cmd(x,x_pos;);
InitCommand=cmd(x,x_pos);
OnCommand=cmd(zoom,0.75);
};
@@ -28,19 +28,19 @@ local t = Def.ActorFrame {
LoadFont("Common Condensed") .. {
Text=ToEnumShortString(PlayerNumber);
Name="PlayerShortName",
InitCommand=cmd(x,-127;maxwidth,32;zoom,0.75;),
OnCommand=cmd(diffuse,ColorDarkTone(PlayerColor(PlayerNumber));)
InitCommand=cmd(x,-127;maxwidth,32;zoom,0.75),
OnCommand=cmd(diffuse,ColorDarkTone(PlayerColor(PlayerNumber)))
},
LoadFont("_overpass 36px") .. {
Text=bpm_text;
Name="BPMRangeOld",
InitCommand=cmd(x,-60;maxwidth,88/bpm_text_zoom),
OnCommand=cmd(zoom,bpm_text_zoom;diffuse,ColorDarkTone(PlayerColor(PlayerNumber));)
OnCommand=cmd(zoom,bpm_text_zoom;diffuse,ColorDarkTone(PlayerColor(PlayerNumber)))
},
LoadActor(THEME:GetPathG("_StepsDisplayListRow","arrow")) .. {
Name="Seperator",
InitCommand=cmd(x,4);
OnCommand=cmd(diffuse,ColorDarkTone(PlayerColor(PlayerNumber));)
OnCommand=cmd(diffuse,ColorDarkTone(PlayerColor(PlayerNumber)))
},
LoadFont("_overpass 36px") .. {
Text="100 - 200000";
@@ -51,8 +51,8 @@ local t = Def.ActorFrame {
local speed, mode= GetSpeedModeAndValueFromPoptions(PlayerNumber)
self:playcommand("SpeedChoiceChanged", {pn= PlayerNumber, mode= mode, speed= speed})
end,
BPMWillNotChangeCommand=cmd(stopeffect;diffuse,ColorDarkTone(PlayerColor(PlayerNumber));),
BPMWillChangeCommand=cmd(diffuseshift;effectcolor1,Color.Black;effectcolor2,ColorMidTone(PlayerColor(PlayerNumber));),
BPMWillNotChangeCommand=cmd(stopeffect;diffuse,ColorDarkTone(PlayerColor(PlayerNumber))),
BPMWillChangeCommand=cmd(diffuseshift;effectcolor1,Color.Black;effectcolor2,ColorMidTone(PlayerColor(PlayerNumber))),
SpeedChoiceChangedMessageCommand= function(self, param)
if param.pn ~= PlayerNumber then return end
local text= ""
@@ -77,7 +77,7 @@ return Def.CourseContentsList {
-- self:glow("1,1,1,0");
end
--(cmd(finishtweening;diffusealpha,0;sleep,0.125*params.Number;smooth,0.2;diffusealpha,1;))(self);
--(cmd(finishtweening;diffusealpha,0;sleep,0.125*params.Number;smooth,0.2;diffusealpha,1))(self);
end
},
@@ -49,7 +49,7 @@ return Def.ActorFrame {
};
LoadFont("_roboto condensed Bold 48px") .. {
Text="P1";
InitCommand=cmd(horizalign,center;x,8;diffuse,ColorDarkTone(PlayerColor(PLAYER_1)););
InitCommand=cmd(horizalign,center;x,8;diffuse,ColorDarkTone(PlayerColor(PLAYER_1)));
OnCommand=cmd(zoom,0.5);
};
};
@@ -72,11 +72,11 @@ return Def.ActorFrame {
end;
end;
LoadActor(THEME:GetPathG("_StepsDisplayListRow","Cursor")) .. {
InitCommand=cmd(diffuse,ColorLightTone(PlayerColor(PLAYER_2));x,-8;zoom,0.75;zoomx,-0.75;);
InitCommand=cmd(diffuse,ColorLightTone(PlayerColor(PLAYER_2));x,-8;zoom,0.75;zoomx,-0.75);
};
LoadFont("_roboto condensed Bold 48px") .. {
Text="P2";
InitCommand=cmd(horizalign,center;x,-8;diffuse,ColorDarkTone(PlayerColor(PLAYER_2)););
InitCommand=cmd(horizalign,center;x,-8;diffuse,ColorDarkTone(PlayerColor(PLAYER_2)));
OnCommand=cmd(zoom,0.5);
};
};
@@ -87,4 +87,4 @@ return Def.ActorFrame {
ChangeCommand=cmd(stoptweening;decelerate,0.05);
};
};
};
};
@@ -11,8 +11,8 @@ t[#t+1] = Def.ActorFrame {
LoseFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconLoseFocusCommand");
LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_background base"))..{
GainFocusCommand=cmd(diffuse,color("#981F41"););
LoseFocusCommand=cmd(diffuse,color("#740A27"););
GainFocusCommand=cmd(diffuse,color("#981F41"));
LoseFocusCommand=cmd(diffuse,color("#740A27"));
};
LoadFont("_overpass 36px")..{
Text=string.upper(string_name);
@@ -20,7 +20,7 @@ local t = Def.ActorFrame{
if netConnected then
t[#t+1] = LoadFont("Common Condensed") .. {
InitCommand=cmd(y,16;horizalign,left;zoom,0.5875;shadowlength,1;diffuse,color("#268129");diffusebottomedge,color("#153F17"););
InitCommand=cmd(y,16;horizalign,left;zoom,0.5875;shadowlength,1;diffuse,color("#268129");diffusebottomedge,color("#153F17"));
BeginCommand=function(self)
self:settext( string.format(Screen.String("Connected to %s"), GetServerName()) );
end;
@@ -6,8 +6,8 @@ local t = Def.ActorFrame{
LoadActor("_text");
LoadActor("_text")..{
Name="TextGlow";
InitCommand=cmd(blend,Blend.Add;diffusealpha,0.05;);
OnCommand=cmd(glowshift;effectperiod,5;effectcolor1,color("1,1,1,0.25");effectcolor2,color("1,1,1,1"););
InitCommand=cmd(blend,Blend.Add;diffusealpha,0.05);
OnCommand=cmd(glowshift;effectperiod,5;effectcolor1,color("1,1,1,0.25");effectcolor2,color("1,1,1,1"));
};
};
};
@@ -8,7 +8,7 @@ t[#t+1] = Def.ActorFrame {
t[#t+1] = Def.ActorFrame {
Def.Quad {
InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,50;);
InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,50);
OnCommand=function(self)
self:diffuse(ColorMidTone(ScreenColor(SCREENMAN:GetTopScreen():GetName())))
self:diffusetopedge(ColorDarkTone(ScreenColor(SCREENMAN:GetTopScreen():GetName()))):diffusealpha(1)
@@ -5,7 +5,7 @@ local t = Def.ActorFrame {};
t[#t+1] = Def.ActorFrame {
LoadFont("Common Italic Condensed") .. {
InitCommand=cmd(y,-1;zoom,1.2;maxwidth,130;);
InitCommand=cmd(y,-1;zoom,1.2;maxwidth,130);
BeginCommand=function(self)
local top = SCREENMAN:GetTopScreen()
if top then
@@ -62,7 +62,7 @@ t[#t+1] = Def.ActorFrame {
t[#t+1] = LoadFont("Common Header") .. {
Name="HeaderTitle",
Text=Screen.String("HeaderText"),
InitCommand=cmd(zoom,1.0;x,-SCREEN_CENTER_X+110;y,49;horizalign,left;diffuse,color("#ffffff");shadowlength,1;),
InitCommand=cmd(zoom,1.0;x,-SCREEN_CENTER_X+110;y,49;horizalign,left;diffuse,color("#ffffff");shadowlength,1),
OnCommand=cmd(diffusealpha,0;sleep,0.5;smooth,0.3;diffusealpha,0.8),
UpdateScreenHeaderMessageCommand=function(self,param)
self:settext(param.Header)
@@ -74,11 +74,11 @@ t[#t+1] = LoadFont("Common Header") .. {
-- Name="HeaderSubTitle";
-- Text=Screen.String("HeaderSubText");
-- InitCommand=cmd(zoom,0.8;x,-SCREEN_CENTER_X+110;y,70;horizalign,left;diffuse,color("#ffffff");shadowlength,1;skewx,-0.1);
-- OnCommand=cmd(diffusealpha,0;sleep,0.55;smooth,0.3;diffusealpha,0.75;);
-- OnCommand=cmd(diffusealpha,0;sleep,0.55;smooth,0.3;diffusealpha,0.75);
-- UpdateScreenHeaderMessageCommand=function(self,param)
-- self:settext(param.Header);
-- end;
-- OffCommand=cmd(smooth,0.3;diffusealpha,0;);
-- OffCommand=cmd(smooth,0.3;diffusealpha,0);
-- };
return t
+2 -2
View File
@@ -5,11 +5,11 @@ return Def.ActorFrame {
-- Base
-- todo; make getting the base's image less stupid
LoadActor(THEME:GetPathG("","ScreenSelectPlayMode Icon/_background base")) .. {
InitCommand=cmd(zoomto,70,70;diffuse,params.base_color;diffusebottomedge,ColorMidTone(params.base_color);)
InitCommand=cmd(zoomto,70,70;diffuse,params.base_color;diffusebottomedge,ColorMidTone(params.base_color))
},
-- The wanted value
LoadFont("Common Normal") .. {
InitCommand=cmd(diffuse,color("#FFFFFF");diffusealpha,0.85;),
InitCommand=cmd(diffuse,color("#FFFFFF");diffusealpha,0.85),
OnCommand=function(self)
self:settext( params.value_text )
self:zoom(string.len(params.value_text) > 3 and 0.6 or 1.5)