actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Some more of default. Not yet done."

Browse Source 
This reverts commit 162b626e3e.
This commit is contained in:
Jason Felds
2013-07-18 17:57:14 -04:00
parent dc5d6a932d
commit ea45a6947c
11 changed files with 1024 additions and 1447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/default/BGAnimations/ScreenGameplay underlay/ScreenFilter.lua
+3 -21
View File
@@ -34,13 +34,7 @@ if numPlayers == 1 then
end end
t[#t+1] = Def.Quad{ t[#t+1] = Def.Quad{
Name="SinglePlayerFilter"; Name="SinglePlayerFilter";
InitCommand=function(self) InitCommand=cmd(x,pos;CenterY;zoomto,filterWidth,SCREEN_HEIGHT;diffusecolor,filterColor;diffusealpha,filterAlphas[player]);
self:x(pos);
self:CenterY();
self:zoomto(filterWidth, SCREEN_HEIGHT);
self:diffusecolor(filterColor);
self:diffusealpha(filterAlphas[player]);
end;
}; };
else else
-- two players... a bit more complex. -- two players... a bit more complex.
@@ -51,13 +45,7 @@ else
local metricName = "PlayerP".. pNum .."TwoPlayersSharedSidesX" local metricName = "PlayerP".. pNum .."TwoPlayersSharedSidesX"
t[#t+1] = Def.Quad{ t[#t+1] = Def.Quad{
Name="RoutineFilter"; Name="RoutineFilter";
InitCommand=function(self) InitCommand=cmd(x,THEME:GetMetric("ScreenGameplay",metricName);CenterY;zoomto,filterWidth,SCREEN_HEIGHT;diffusecolor,filterColor;diffusealpha,filterAlphas[player]);
self:x(THEME:GetMetric("ScreenGameplay",metricName));
self:CenterY();
self:zoomto(filterWidth, SCREEN_HEIGHT);
self:diffusecolor(filterColor);
self:diffusealpha(filterAlphas[player]);
end;
}; };
else else
-- otherwise we need two separate ones. to the pairsmobile! -- otherwise we need two separate ones. to the pairsmobile!
@@ -68,13 +56,7 @@ else
local pos = THEME:GetMetric("ScreenGameplay",metricName) local pos = THEME:GetMetric("ScreenGameplay",metricName)
t[#t+1] = Def.Quad{ t[#t+1] = Def.Quad{
Name="Player"..pNum.."Filter"; Name="Player"..pNum.."Filter";
InitCommand=function(self) InitCommand=cmd(x,pos;CenterY;zoomto,filterWidth,SCREEN_HEIGHT;diffusecolor,filterColor;diffusealpha,filterAlphas[player]);
self:x(pos);
self:CenterY();
self:zoomto(filterWidth, SCREEN_HEIGHT);
self:diffusecolor(filterColor);
self:diffusealpha(filterAlphas[player]);
end;
}; };
end end
end end
Themes/default/BGAnimations/ScreenHowToInstallSongs overlay.lua
+3 -23
View File
@@ -3,29 +3,9 @@
local t = Def.ActorFrame{ local t = Def.ActorFrame{
LoadFont("Common Normal")..{ LoadFont("Common Normal")..{
Name="Header"; Name="Header";
InitCommand=function(self) InitCommand=cmd(x,SCREEN_LEFT+24;y,SCREEN_TOP+24;halign,0;diffuse,color("#CCCCCC");settext,Screen.String("BodyHeader");shadowlength,1;shadowcolor,HSV(40,0,0.6);diffusetopedge,color("#FFFFFF"));
self:x(SCREEN_LEFT + 24); OnCommand=cmd(queuecommand,"Anim");
self:y(SCREEN_TOP + 24); AnimCommand=cmd(cropright,1;faderight,1;addx,96;decelerate,1;addx,-96;skewx,-0.1;cropright,0;faderight,0;);
self:halign(0);
self:diffuse(color("#CCCCCC"));
self:settext(Screen.String("BodyHeader"));
self:shadowlength(1);
self:shadowcolor(HSV(40,0,0.6));
self:diffusetopedge(color("#FFFFFF"));
end;
OnCommand=function(self)
self:queuecommand("Anim");
end;
AnimCommand=function(self)
self:cropright(1);
self:faderight(1);
self:addx(96);
self:decelerate(1);
self:addx(-96);
self:skewx(-0.1);
self:cropright(0);
self:faderight(0);
end;
}; };
-- todo: add explantion paragraph here (above the scroller) -- todo: add explantion paragraph here (above the scroller)
}; };
Themes/default/BGAnimations/ScreenSelectProfile overlay.lua
+49 -56
View File
@@ -4,7 +4,10 @@ function GetLocalProfiles()
for p = 0,PROFILEMAN:GetNumLocalProfiles()-1 do for p = 0,PROFILEMAN:GetNumLocalProfiles()-1 do
local profile=PROFILEMAN:GetLocalProfileFromIndex(p); local profile=PROFILEMAN:GetLocalProfileFromIndex(p);
local item = Def.ActorFrame { local item = Def.ActorFrame {
--[[ Def.Quad {
InitCommand=cmd(zoomto,200,1;y,40/2);
OnCommand=cmd(diffuse,Color('Outline'););
}; --]]
LoadFont("Common Normal") .. { LoadFont("Common Normal") .. {
Text=profile:GetDisplayName(); Text=profile:GetDisplayName();
InitCommand=function(self) InitCommand=function(self)
@@ -51,10 +54,20 @@ function LoadPlayerStuff(Player)
local pn = (Player == PLAYER_1) and 1 or 2; local pn = (Player == PLAYER_1) and 1 or 2;
--[[ local t = LoadActor(THEME:GetPathB('', '_frame 3x3'), 'metal', 200, 230) .. {
Name = 'BigFrame';
}; --]]
local t = Def.ActorFrame { local t = Def.ActorFrame {
Name = 'JoinFrame'; Name = 'JoinFrame';
LoadCard(Color('Orange')); LoadCard(Color('Orange'));
--[[ Def.Quad {
InitCommand=cmd(zoomto,200+4,230+4);
OnCommand=cmd(shadowlength,1;diffuse,color("0,0,0,0.5"));
};
Def.Quad {
InitCommand=cmd(zoomto,200,230);
OnCommand=cmd(diffuse,Color('Orange');diffusealpha,0.5);
}; --]]
LoadFont("Common Normal") .. { LoadFont("Common Normal") .. {
Text=THEME:GetString("ScreenSelectProfile","PressStart"); Text=THEME:GetString("ScreenSelectProfile","PressStart");
InitCommand=function(self) InitCommand=function(self)
@@ -75,12 +88,13 @@ function LoadPlayerStuff(Player)
}; };
table.insert( ret, t ); table.insert( ret, t );
--[[ t = LoadActor(THEME:GetPathB('', '_frame 3x3'), 'metal', 170, 20) .. {
Name = 'SmallFrame';
}; --]]
t = Def.ActorFrame { t = Def.ActorFrame {
Name = 'SmallFrame'; Name = 'SmallFrame';
InitCommand=function(self) InitCommand=cmd(y,-2);
self:y(-2);
end;
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=function(self)
self:zoomto(200-10, 40+2); self:zoomto(200-10, 40+2);
@@ -128,16 +142,14 @@ function LoadPlayerStuff(Player)
t = Def.ActorScroller{ t = Def.ActorScroller{
Name = 'ProfileScroller'; Name = 'ProfileScroller';
NumItemsToDraw=6; NumItemsToDraw=6;
OnCommand=function(self) OnCommand=cmd(y,1;SetFastCatchup,true;SetMask,200,58;SetSecondsPerItem,0.15);
self:y(1);
self:SetFastCatchup(true);
self:SetMask(200, 58);
self:SetSecondsPerItem(0.15);
end;
TransformFunction=function(self, offset, itemIndex, numItems) TransformFunction=function(self, offset, itemIndex, numItems)
local focus = scale(math.abs(offset),0,2,1,0); local focus = scale(math.abs(offset),0,2,1,0);
self:visible(false); self:visible(false);
self:y(math.floor( offset*40 )); self:y(math.floor( offset*40 ));
-- self:zoomy( focus );
-- self:z(-math.abs(offset));
-- self:zoom(focus);
end; end;
children = GetLocalProfiles(); children = GetLocalProfiles();
}; };
@@ -145,14 +157,25 @@ function LoadPlayerStuff(Player)
t = Def.ActorFrame { t = Def.ActorFrame {
Name = "EffectFrame"; Name = "EffectFrame";
--[[ Def.Quad {
InitCommand=cmd(y,-230/2;vertalign,top;zoomto,200,8;fadebottom,1);
OnCommand=cmd(diffuse,Color("Black");diffusealpha,0.25);
};
Def.Quad {
InitCommand=cmd(y,230/2;vertalign,bottom;zoomto,200,8;fadetop,1);
OnCommand=cmd(diffuse,Color("Black");diffusealpha,0.25);
}; --]]
}; };
table.insert( ret, t ); table.insert( ret, t );
--[[ t = Def.BitmapText {
OnCommand = cmd(y,160);
Name = 'SelectedProfileText';
Font = "Common Normal";
Text = 'No profile';
}; --]]
t = LoadFont("Common Normal") .. { t = LoadFont("Common Normal") .. {
Name = 'SelectedProfileText'; Name = 'SelectedProfileText';
InitCommand=function(self) InitCommand=cmd(y,160;shadowlength,1;);
self:y(160);
self:shadowlength(1);
end;
}; };
table.insert( ret, t ); table.insert( ret, t );
@@ -276,67 +299,37 @@ local t = Def.ActorFrame {
children = { children = {
Def.ActorFrame { Def.ActorFrame {
Name = 'P1Frame'; Name = 'P1Frame';
InitCommand=function(self) InitCommand=cmd(x,SCREEN_CENTER_X-160;y,SCREEN_CENTER_Y);
self:x(SCREEN_CENTER_X - 160); OnCommand=cmd(zoom,0;bounceend,0.35;zoom,1);
self:y(SCREEN_CENTER_Y); OffCommand=cmd(bouncebegin,0.35;zoom,0);
end;
OnCommand=function(self)
self:zoom(0);
self:bounceend(0.35);
self:zoom(1);
end;
OffCommand=function(self)
self:bouncebegin(0.35);
self:zoom(0);
end;
PlayerJoinedMessageCommand=function(self,param) PlayerJoinedMessageCommand=function(self,param)
if param.Player == PLAYER_1 then if param.Player == PLAYER_1 then
self:zoom(1.15); (cmd(;zoom,1.15;bounceend,0.175;zoom,1.0;))(self);
self:bounceend(0.175);
self:zoom(1.0);
end; end;
end; end;
children = LoadPlayerStuff(PLAYER_1); children = LoadPlayerStuff(PLAYER_1);
}; };
Def.ActorFrame { Def.ActorFrame {
Name = 'P2Frame'; Name = 'P2Frame';
InitCommand=function(self) InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y);
self:x(SCREEN_CENTER_X + 160); OnCommand=cmd(zoom,0;bounceend,0.35;zoom,1);
self:y(SCREEN_CENTER_Y); OffCommand=cmd(bouncebegin,0.35;zoom,0);
end;
OnCommand=function(self)
self:zoom(0);
self:bounceend(0.35);
self:zoom(1);
end;
OffCommand=function(self)
self:bouncebegin(0.35);
self:zoom(0);
end;
PlayerJoinedMessageCommand=function(self,param) PlayerJoinedMessageCommand=function(self,param)
if param.Player == PLAYER_2 then if param.Player == PLAYER_2 then
self:zoom(1.15); (cmd(zoom,1.15;bounceend,0.175;zoom,1.0;))(self);
self:bounceend(0.175);
self:zoom(1.0);
end; end;
end; end;
children = LoadPlayerStuff(PLAYER_2); children = LoadPlayerStuff(PLAYER_2);
}; };
-- sounds -- sounds
LoadActor( THEME:GetPathS("Common","start") )..{ LoadActor( THEME:GetPathS("Common","start") )..{
StartButtonMessageCommand=function(self) StartButtonMessageCommand=cmd(play);
self:play();
end;
}; };
LoadActor( THEME:GetPathS("Common","cancel") )..{ LoadActor( THEME:GetPathS("Common","cancel") )..{
BackButtonMessageCommand=function(self) BackButtonMessageCommand=cmd(play);
self:play();
end;
}; };
LoadActor( THEME:GetPathS("Common","value") )..{ LoadActor( THEME:GetPathS("Common","value") )..{
DirectionButtonMessageCommand=function(self) DirectionButtonMessageCommand=cmd(play);
self:play();
end;
}; };
}; };
}; };
Themes/default/BGAnimations/ScreenWithMenuElements background/_particleLoader.lua
+2 -8
View File
@@ -38,10 +38,7 @@ for i=1,Params.NumParticles do
self:y(math.random(SCREEN_TOP+(self:GetHeight()/2),SCREEN_BOTTOM-(self:GetHeight()/2))); self:y(math.random(SCREEN_TOP+(self:GetHeight()/2),SCREEN_BOTTOM-(self:GetHeight()/2)));
--self:z(math.random(-64,0)); --self:z(math.random(-64,0));
end; end;
OnCommand=function(self) OnCommand=cmd(diffuse,ColorLightTone(color("#ffd400"));diffusealpha,0.8);
self:diffuse(ColorLightTone(color("#ffd400")));
self:diffusealpha(0.8);
end;
}; };
end end
@@ -72,9 +69,6 @@ local function UpdateParticles(self,DeltaTime)
end; end;
end; end;
t.InitCommand = function(self) t.InitCommand = cmd(fov,90;SetUpdateFunction,UpdateParticles);
self:fov(90);
self:SetUpdateFunction(UpdateParticles);
end;
return t; return t;
Themes/default/Graphics/LifeMeterBattery lives/default.lua
+2 -8
View File
@@ -8,11 +8,7 @@ local LifeRatio;
local t = Def.ActorFrame { local t = Def.ActorFrame {
LoadActor("_lives")..{ LoadActor("_lives")..{
InitCommand=function(self) InitCommand=cmd(pause;horizalign,left;x,-(barWidth/2));
self:pause();
self:horizalign(left);
self:x(barWidth / -2);
end;
BeginCommand=function(self,param) BeginCommand=function(self,param)
local screen = SCREENMAN:GetTopScreen(); local screen = SCREENMAN:GetTopScreen();
local glifemeter = screen:GetLifeMeter(player); local glifemeter = screen:GetLifeMeter(player);
@@ -40,9 +36,7 @@ local t = Def.ActorFrame {
self:setstate( math.max(param.LivesLeft-1,0) ); self:setstate( math.max(param.LivesLeft-1,0) );
end end
end; end;
FinishCommand=function(self) FinishCommand=cmd(playcommand,"Start");
self:playcommand("Start");
end;
}; };
}; };
Themes/default/Graphics/PaneDisplay text.lua
+32 -107
View File
@@ -35,30 +35,14 @@ local function CreatePaneDisplayItem( _pnPlayer, _sLabel, _rcRadarCategory )
Text=string.format("%04i", 0); Text=string.format("%04i", 0);
InitCommand=function(self) InitCommand=function(self)
self:x(96); self:x(96);
self:horizalign(right); InitCommand=cmd(x,96;horizalign,right);
end; OnCommand=cmd(zoom,0.5875;shadowlength,1);
OnCommand=function(self) CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
self:zoom(0.5875); CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set");
self:shadowlength(1); CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set");
end; CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set");
CurrentSongChangedMessageCommand=function(self) CurrentTrailP2ChangedMessageCommand=cmd(playcommand,"Set");
self:playcommand("Set"); CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
end;
CurrentStepsP1ChangedMessageCommand=function(self)
self:playcommand("Set");
end;
CurrentStepsP2ChangedMessageCommand=function(self)
self:playcommand("Set");
end;
CurrentTrailP1ChangedMessageCommand=function(self)
self:playcommand("Set");
end;
CurrentTrailP2ChangedMessageCommand=function(self)
self:playcommand("Set");
end;
CurrentCourseChangedMessageCommand=function(self)
self:playcommand("Set");
end;
SetCommand=function(self) SetCommand=function(self)
local song = GAMESTATE:GetCurrentSong() local song = GAMESTATE:GetCurrentSong()
local course = GAMESTATE:GetCurrentCourse() local course = GAMESTATE:GetCurrentCourse()
@@ -99,32 +83,14 @@ local function CreatePaneDisplayGraph( _pnPlayer, _sLabel, _rcRadarCategory )
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=function(self)
self:x(12); self:x(12);
self:zoomto(50, 10); InitCommand=cmd(x,12;zoomto,50,10;horizalign,left);
self:horizalign(left); OnCommand=cmd(shadowlength,0;diffuse,Color("Green");diffusebottomedge,ColorLightTone(Color("Green")));
end; CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
OnCommand=function(self) CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set");
self:shadowlength(0); CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set");
self:diffuse(Color("Green")); CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set");
self:diffusebottomedge(ColorLightTone(Color("Green"))); CurrentTrailP2ChangedMessageCommand=cmd(playcommand,"Set");
end; CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
CurrentSongChangedMessageCommand=function(self)
self:playcommand("Set");
end;
CurrentStepsP1ChangedMessageCommand=function(self)
self:playcommand("Set");
end;
CurrentStepsP2ChangedMessageCommand=function(self)
self:playcommand("Set");
end;
CurrentTrailP1ChangedMessageCommand=function(self)
self:playcommand("Set");
end;
CurrentTrailP2ChangedMessageCommand=function(self)
self:playcommand("Set");
end;
CurrentCourseChangedMessageCommand=function(self)
self:playcommand("Set");
end;
SetCommand=function(self) SetCommand=function(self)
local song = GAMESTATE:GetCurrentSong() local song = GAMESTATE:GetCurrentSong()
local course = GAMESTATE:GetCurrentCourse() local course = GAMESTATE:GetCurrentCourse()
@@ -142,31 +108,14 @@ local function CreatePaneDisplayGraph( _pnPlayer, _sLabel, _rcRadarCategory )
LoadFont("Common Normal") .. { LoadFont("Common Normal") .. {
InitCommand=function(self) InitCommand=function(self)
self:x(14); self:x(14);
self:zoom(0.5); InitCommand=cmd(x,14;zoom,0.5;halign,0;);
self:halign(0); OnCommand=cmd(shadowlength,1;strokecolor,color("0.15,0.15,0.15,0.625"));
end; CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
OnCommand=function(self) CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set");
self:shadowlength(1); CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set");
self:strokecolor(color("0.15,0.15,0.15,0.625")); CurrentTrailP1ChangedMessageCommand=cmd(playcommand,"Set");
end; CurrentTrailP2ChangedMessageCommand=cmd(playcommand,"Set");
CurrentSongChangedMessageCommand=function(self) CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
self:playcommand("Set");
end;
CurrentStepsP1ChangedMessageCommand=function(self)
self:playcommand("Set");
end;
CurrentStepsP2ChangedMessageCommand=function(self)
self:playcommand("Set");
end;
CurrentTrailP1ChangedMessageCommand=function(self)
self:playcommand("Set");
end;
CurrentTrailP2ChangedMessageCommand=function(self)
self:playcommand("Set");
end;
CurrentCourseChangedMessageCommand=function(self)
self:playcommand("Set");
end;
SetCommand=function(self) SetCommand=function(self)
local song = GAMESTATE:GetCurrentSong() local song = GAMESTATE:GetCurrentSong()
local course = GAMESTATE:GetCurrentCourse() local course = GAMESTATE:GetCurrentCourse()
@@ -184,53 +133,29 @@ end;
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
-- Left -- Left
CreatePaneDisplayItem( iPN, "Taps", 'RadarCategory_TapsAndHolds' ) .. { CreatePaneDisplayItem( iPN, "Taps", 'RadarCategory_TapsAndHolds' ) .. {
InitCommand=function(self) InitCommand=cmd(x,-128+16+8;y,-14);
self:x(-128 + 16 + 8);
self:y(-14 + 16 * 0);
end;
}; };
CreatePaneDisplayItem( iPN, "Jumps", 'RadarCategory_Jumps' ) .. { CreatePaneDisplayItem( iPN, "Jumps", 'RadarCategory_Jumps' ) .. {
InitCommand=function(self) InitCommand=cmd(x,-128+16+8;y,-14+16);
self:x(-128 + 16 + 8);
self:y(-14 + 16 * 1);
end;
}; };
CreatePaneDisplayItem( iPN, "Holds", 'RadarCategory_Holds' ) .. { CreatePaneDisplayItem( iPN, "Holds", 'RadarCategory_Holds' ) .. {
InitCommand=function(self) InitCommand=cmd(x,-128+16+8;y,-14+16*2);
self:x(-128 + 16 + 8);
self:y(-14 + 16 * 2);
end;
}; };
CreatePaneDisplayItem( iPN, "Mines", 'RadarCategory_Mines' ) .. { CreatePaneDisplayItem( iPN, "Mines", 'RadarCategory_Mines' ) .. {
InitCommand=function(self) InitCommand=cmd(x,-128+16+8;y,-14+16*3);
self:x(-128 + 16 + 8);
self:y(-14 + 16 * 3);
end;
}; };
-- Center -- Center
CreatePaneDisplayItem( iPN, "Hands", 'RadarCategory_Hands' ) .. { CreatePaneDisplayItem( iPN, "Hands", 'RadarCategory_Hands' ) .. {
InitCommand=function(self) InitCommand=cmd(x,8;y,-14);
self:x(8);
self:y(-14 + 16 * 0);
end;
}; };
CreatePaneDisplayItem( iPN, "Rolls", 'RadarCategory_Rolls' ) .. { CreatePaneDisplayItem( iPN, "Rolls", 'RadarCategory_Rolls' ) .. {
InitCommand=function(self) InitCommand=cmd(x,8;y,-14+16);
self:x(8);
self:y(-14 + 16 * 1);
end;
}; };
CreatePaneDisplayItem( iPN, "Lifts", 'RadarCategory_Lifts' ) .. { CreatePaneDisplayItem( iPN, "Lifts", 'RadarCategory_Lifts' ) .. {
InitCommand=function(self) InitCommand=cmd(x,8;y,-14+16*2);
self:x(8);
self:y(-14 + 16 * 2);
end;
}; };
CreatePaneDisplayItem( iPN, "Fakes", 'RadarCategory_Fakes' ) .. { CreatePaneDisplayItem( iPN, "Fakes", 'RadarCategory_Fakes' ) .. {
InitCommand=function(self) InitCommand=cmd(x,8;y,-14+16*3);
self:x(8);
self:y(-14 + 16 * 3);
end;
}; };
}; };
return t; return t;
Themes/default/Graphics/Player judgment/default.lua
+34 -149
View File
@@ -61,11 +61,7 @@ t[#t+1] = Def.ActorFrame {
self:visible(false); self:visible(false);
end; end;
OnCommand=THEME:GetMetric("Judgment","JudgmentOnCommand"); OnCommand=THEME:GetMetric("Judgment","JudgmentOnCommand");
ResetCommand=function(self) ResetCommand=cmd(finishtweening;stopeffect;visible,false);
self:finishtweening();
self:stopeffect();
self:visible(false);
end;
}; };
LoadFont("Combo Numbers") .. { LoadFont("Combo Numbers") .. {
Name="ProtimingDisplay"; Name="ProtimingDisplay";
@@ -74,11 +70,7 @@ t[#t+1] = Def.ActorFrame {
self:visible(false); self:visible(false);
end; end;
OnCommand=THEME:GetMetric("Protiming","ProtimingOnCommand"); OnCommand=THEME:GetMetric("Protiming","ProtimingOnCommand");
ResetCommand=function(self) ResetCommand=cmd(finishtweening;stopeffect;visible,false);
self:finishtweening();
self:stopeffect();
self:visible(false);
end;
}; };
LoadFont("Common Normal") .. { LoadFont("Common Normal") .. {
Name="ProtimingAverage"; Name="ProtimingAverage";
@@ -87,11 +79,7 @@ t[#t+1] = Def.ActorFrame {
self:visible(false); self:visible(false);
end; end;
OnCommand=THEME:GetMetric("Protiming","AverageOnCommand"); OnCommand=THEME:GetMetric("Protiming","AverageOnCommand");
ResetCommand=function(self) ResetCommand=cmd(finishtweening;stopeffect;visible,false);
self:finishtweening();
self:stopeffect();
self:visible(false);
end;
}; };
LoadFont("Common Normal") .. { LoadFont("Common Normal") .. {
Name="TextDisplay"; Name="TextDisplay";
@@ -100,11 +88,7 @@ t[#t+1] = Def.ActorFrame {
self:visible(false); self:visible(false);
end; end;
OnCommand=THEME:GetMetric("Protiming","TextOnCommand"); OnCommand=THEME:GetMetric("Protiming","TextOnCommand");
ResetCommand=function(self) ResetCommand=cmd(finishtweening;stopeffect;visible,false);
self:finishtweening();
self:stopeffect();
self:visible(false);
end;
}; };
Def.Quad { Def.Quad {
Name="ProtimingGraphBG"; Name="ProtimingGraphBG";
@@ -127,129 +111,45 @@ t[#t+1] = Def.ActorFrame {
}; };
Def.Quad { Def.Quad {
Name="ProtimingGraphWindowW3"; Name="ProtimingGraphWindowW3";
InitCommand=function(self) InitCommand=cmd(visible,false;y,32;zoomto,ProtimingWidth-4,16-4);
self:visible(false); ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false);
self:y(32); OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W3"];);
self:zoomto(ProtimingWidth - 4, 16 - 4);
end;
ResetCommand=function(self)
self:finishtweening();
self:diffusealpha(1);
self:visible(false);
end;
OnCommand=function(self)
self:diffuse(GameColor.Judgment["JudgmentLine_W3"]);
end;
}; };
Def.Quad { Def.Quad {
Name="ProtimingGraphWindowW2"; Name="ProtimingGraphWindowW2";
InitCommand=function(self) InitCommand=cmd(visible,false;y,32;zoomto,scale(PREFSMAN:GetPreference("TimingWindowSecondsW2"),0,PREFSMAN:GetPreference("TimingWindowSecondsW3"),0,ProtimingWidth-4),16-4);
self:visible(false); ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false);
self:y(32); OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W2"];);
self:zoomto(scale(
PREFSMAN:GetPreference("TimingWindowSecondsW2"),
0,
PREFSMAN:GetPreference("TimingWindowSecondsW3"),
0,
ProtimingWidth-4),16-4);
end;
ResetCommand=function(self)
self:finishtweening();
self:diffusealpha(1);
self:visible(false);
end;
OnCommand=function(self)
self:diffuse(GameColor.Judgment["JudgmentLine_W2"]);
end;
}; };
Def.Quad { Def.Quad {
Name="ProtimingGraphWindowW1"; Name="ProtimingGraphWindowW1";
InitCommand=function(self) InitCommand=cmd(visible,false;y,32;zoomto,scale(PREFSMAN:GetPreference("TimingWindowSecondsW1"),0,PREFSMAN:GetPreference("TimingWindowSecondsW3"),0,ProtimingWidth-4),16-4);
self:visible(false); ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false);
self:y(32); OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W1"];);
self:zoomto(scale(
PREFSMAN:GetPreference("TimingWindowSecondsW1"),
0,
PREFSMAN:GetPreference("TimingWindowSecondsW3"),
0,
ProtimingWidth-4),16-4);
end;
ResetCommand=function(self)
self:finishtweening();
self:diffusealpha(1);
self:visible(false);
end;
OnCommand=function(self)
self:diffuse(GameColor.Judgment["JudgmentLine_W1"]);
end;
}; };
Def.Quad { Def.Quad {
Name="ProtimingGraphUnderlay"; Name="ProtimingGraphUnderlay";
InitCommand=function(self) InitCommand=cmd(visible,false;y,32;zoomto,ProtimingWidth-4,16-4);
self:visible(false); ResetCommand=cmd(finishtweening;diffusealpha,0.25;visible,false);
self:y(32); OnCommand=cmd(diffuse,Color("Black");diffusealpha,0.25);
self:zoomto(ProtimingWidth-4,16-4);
end;
ResetCommand=function(self)
self:finishtweening();
self:diffusealpha(0.25);
self:visible(false);
end;
OnCommand=function(self)
self:diffuse(Color("Black"));
self:diffusealpha(0.25);
end;
}; };
Def.Quad { Def.Quad {
Name="ProtimingGraphFill"; Name="ProtimingGraphFill";
InitCommand=function(self) InitCommand=cmd(visible,false;y,32;zoomto,0,16-4;horizalign,left;);
self:visible(false); ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false);
self:y(32); OnCommand=cmd(diffuse,Color("Red"););
self:zoomto(0,16-4);
self:horizalign(left);
end;
ResetCommand=function(self)
self:finishtweening();
self:diffusealpha(1);
self:visible(false);
end;
OnCommand=function(self)
self:diffuse(Color("Red"));
end;
}; };
Def.Quad { Def.Quad {
Name="ProtimingGraphAverage"; Name="ProtimingGraphAverage";
InitCommand=function(self) InitCommand=cmd(visible,false;y,32;zoomto,2,7;);
self:visible(false); ResetCommand=cmd(finishtweening;diffusealpha,0.85;visible,false);
self:y(32); OnCommand=cmd(diffuse,Color("Orange");diffusealpha,0.85);
self:zoomto(2,7);
end;
ResetCommand=function(self)
self:finishtweening();
self:diffusealpha(0.85);
self:visible(false);
end;
OnCommand=function(self)
self:diffuse(Color("Orange"));
self:diffusealpha(0.85);
end;
}; };
Def.Quad { Def.Quad {
Name="ProtimingGraphCenter"; Name="ProtimingGraphCenter";
InitCommand=function(self) InitCommand=cmd(visible,false;y,32;zoomto,2,16-4;);
self:visible(false); ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false);
self:y(32); OnCommand=cmd(diffuse,Color("White");diffusealpha,1);
self:zoomto(2,16-4);
end;
ResetCommand=function(self)
self:finishtweening();
self:diffusealpha(1);
self:visible(false);
end;
OnCommand=function(self)
self:diffuse(Color("White"));
self:diffusealpha(1);
end;
}; };
InitCommand = function(self) InitCommand = function(self)
c = self:GetChildren(); c = self:GetChildren();
@@ -321,6 +221,7 @@ t[#t+1] = Def.ActorFrame {
c.ProtimingGraphFill:visible( bShowProtiming ); c.ProtimingGraphFill:visible( bShowProtiming );
c.ProtimingGraphFill:finishtweening(); c.ProtimingGraphFill:finishtweening();
c.ProtimingGraphFill:decelerate(1/60); c.ProtimingGraphFill:decelerate(1/60);
-- c.ProtimingGraphFill:zoomtowidth( clamp(fTapNoteOffset * 188,-188/2,188/2) );
c.ProtimingGraphFill:zoomtowidth( clamp( c.ProtimingGraphFill:zoomtowidth( clamp(
scale( scale(
fTapNoteOffset, fTapNoteOffset,
@@ -338,30 +239,14 @@ t[#t+1] = Def.ActorFrame {
); );
-- c.ProtimingGraphAverage:zoomtowidth( clamp(MakeAverage( tTotalJudgments ) * 1880,0,188) ); -- c.ProtimingGraphAverage:zoomtowidth( clamp(MakeAverage( tTotalJudgments ) * 1880,0,188) );
c.ProtimingGraphCenter:visible( bShowProtiming ); c.ProtimingGraphCenter:visible( bShowProtiming );
c.ProtimingGraphBG.sleep(2); (cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphBG);
c.ProtimingGraphBG.linear(0.5); (cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphUnderlay);
c.ProtimingGraphBG.diffusealpha(0); (cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphWindowW3);
c.ProtimingGraphUnderlay.sleep(2); (cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphWindowW2);
c.ProtimingGraphUnderlay.linear(0.5); (cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphWindowW1);
c.ProtimingGraphUnderlay.diffusealpha(0); (cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphFill);
c.ProtimingGraphWindowW3.sleep(2); (cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphAverage);
c.ProtimingGraphWindowW3.linear(0.5); (cmd(sleep,2;linear,0.5;diffusealpha,0))(c.ProtimingGraphCenter);
c.ProtimingGraphWindowW3.diffusealpha(0);
c.ProtimingGraphWindowW2.sleep(2);
c.ProtimingGraphWindowW2.linear(0.5);
c.ProtimingGraphWindowW2.diffusealpha(0);
c.ProtimingGraphWindowW1.sleep(2);
c.ProtimingGraphWindowW1.linear(0.5);
c.ProtimingGraphWindowW1.diffusealpha(0);
c.ProtimingGraphFill.sleep(2);
c.ProtimingGraphFill.linear(0.5);
c.ProtimingGraphFill.diffusealpha(0);
c.ProtimingGraphAverage.sleep(2);
c.ProtimingGraphAverage.linear(0.5);
c.ProtimingGraphAverage.diffusealpha(0);
c.ProtimingGraphCenter.sleep(2);
c.ProtimingGraphCenter.linear(0.5);
c.ProtimingGraphCenter.diffusealpha(0);
end; end;
}; };
Themes/default/Graphics/ScreenHowToInstallSongs Icon.lua
+42 -204
View File
@@ -7,14 +7,8 @@ local previewHeight = SCREEN_CENTER_Y;
local t = Def.ActorFrame{ local t = Def.ActorFrame{
Name="PreviewFrame"; Name="PreviewFrame";
InitCommand=function(self) InitCommand=cmd(x,SCREEN_CENTER_X*1.5;y,SCREEN_CENTER_Y*0.85);
self:x(SCREEN_CENTER_X * 1.5); OffCommand=cmd(bouncebegin,0.25;addx,SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y * 0.85);
end;
OffCommand=function(self)
self:bouncebegin(0.25);
self:addx(SCREEN_CENTER_X);
end;
}; };
local function TitleMenuItem(text,focused) local function TitleMenuItem(text,focused)
@@ -22,231 +16,92 @@ local function TitleMenuItem(text,focused)
local textColor = focused and color("#FFFFFF") or color("#888888"); local textColor = focused and color("#FFFFFF") or color("#888888");
return LoadFont("Common Normal")..{ return LoadFont("Common Normal")..{
Text=text; Text=text;
InitCommand=function(self) InitCommand=cmd(zoom,0.45;strokecolor,Color("Outline");diffuse,textColor);
self:zoom(0.45); GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
self:strokecolor(Color("Outline")); LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
self:diffuse(textColor);
end;
GainFocusCommand=function(self)
self:stoptweening();
self:decelerate(0.5);
self:diffusealpha(1);
end;
LoseFocusCommand=function(self)
self:stoptweening();
self:accelerate(0.5);
self:diffusealpha(0);
end;
}; };
end; end;
local previews = { local previews = {
WhereToFind = Def.ActorFrame{ WhereToFind = Def.ActorFrame{
LoadActor(THEME:GetPathG("_howto","find"))..{ LoadActor(THEME:GetPathG("_howto","find"))..{
InitCommand=function(self) InitCommand=cmd(zoomto,previewWidth,previewHeight);
self:zoomto(previewWidth, previewHeight); GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
end; LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
GainFocusCommand=function(self)
self:stoptweening();
self:decelerate(0.5);
self:diffusealpha(1);
end;
LoseFocusCommand=function(self)
self:stoptweening();
self:accelerate(0.5);
self:diffusealpha(0);
end;
}; };
}; };
HowToInstall = Def.ActorFrame{ HowToInstall = Def.ActorFrame{
LoadActor(THEME:GetPathG("_howto","install"))..{ LoadActor(THEME:GetPathG("_howto","install"))..{
InitCommand=function(self) InitCommand=cmd(zoomto,previewWidth,previewHeight);
self:zoomto(previewWidth, previewHeight); GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
end; LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
GainFocusCommand=function(self)
self:stoptweening();
self:decelerate(0.5);
self:diffusealpha(1);
end;
LoseFocusCommand=function(self)
self:stoptweening();
self:accelerate(0.5);
self:diffusealpha(0);
end;
}; };
}; };
AdditionalFolders = Def.ActorFrame{ AdditionalFolders = Def.ActorFrame{
Def.Quad{ Def.Quad{
InitCommand=function(self) InitCommand=cmd(zoomto,previewWidth,previewHeight);
self:zoomto(previewWidth, previewHeight); GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
end; LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
GainFocusCommand=function(self)
self:stoptweening();
self:decelerate(0.5);
self:diffusealpha(1);
end;
LoseFocusCommand=function(self)
self:stoptweening();
self:accelerate(0.5);
self:diffusealpha(0);
end;
}; };
Def.Quad{ Def.Quad{
InitCommand=function(self) InitCommand=cmd(y,-previewHeight*0.45;diffuse,color("#E0F0F0");zoomto,previewWidth,previewHeight*0.1;);
self:y(-previewHeight * 0.45); GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
self:diffuse(color("#E0F0F0")); LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
self:zoomto(previewWidth, previewHeight * 0.1);
end;
GainFocusCommand=function(self)
self:stoptweening();
self:decelerate(0.5);
self:diffusealpha(1);
end;
LoseFocusCommand=function(self)
self:stoptweening();
self:accelerate(0.5);
self:diffusealpha(0);
end;
}; };
LoadFont("Common normal")..{ LoadFont("Common normal")..{
InitCommand=function(self) InitCommand=cmd(x,-(SCREEN_CENTER_X*0.4);y,-(SCREEN_CENTER_Y*0.475);zoom,0.625;halign,0;valign,0;diffuse,color("#000000"));
self:x(SCREEN_CENTER_X * -0.4);
self:y(SCREEN_CENTER_Y * -0.475);
self:zoom(0.625);
self:halign(0);
self:valign(0);
self:diffuse(color("#000000"));
end;
BeginCommand=function(self) BeginCommand=function(self)
local text = "Preferences.ini"; local text = "Preferences.ini";
self:settext(text); self:settext(text);
end; end;
GainFocusCommand=function(self) GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
self:stoptweening(); LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
self:decelerate(0.5);
self:diffusealpha(1);
end;
LoseFocusCommand=function(self)
self:stoptweening();
self:accelerate(0.5);
self:diffusealpha(0);
end;
}; };
LoadFont("Common normal")..{ LoadFont("Common normal")..{
Text="[Options]\nAdditionalCourseFolders=\nAdditionalFolders=\nAdditionalSongFolders="; Text="[Options]\nAdditionalCourseFolders=\nAdditionalFolders=\nAdditionalSongFolders=";
InitCommand=function(self) InitCommand=cmd(x,-(SCREEN_CENTER_X*0.4);y,-(SCREEN_CENTER_Y*0.35);zoom,0.75;halign,0;valign,0;diffuse,color("#000000"));
self:x(SCREEN_CENTER_X * -0.4); GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
self:y(SCREEN_CENTER_Y * -0.35); LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
self:zoom(0.75);
self:halign(0);
self:valign(0);
self:diffuse(color("#000000"));
end;
GainFocusCommand=function(self)
self:stoptweening();
self:decelerate(0.5);
self:diffusealpha(1);
end;
LoseFocusCommand=function(self)
self:stoptweening();
self:accelerate(0.5);
self:diffusealpha(0);
end;
}; };
}; };
ReloadSongs = Def.ActorFrame{ ReloadSongs = Def.ActorFrame{
LoadActor(THEME:GetPathB("ScreenTitleMenu","background/_bg"))..{ LoadActor(THEME:GetPathB("ScreenTitleMenu","background/_bg"))..{
InitCommand=function(self) InitCommand=cmd(zoomto,previewWidth,previewHeight;halign,0.5;valign,0.5);
self:zoomto(previewWidth, previewHeight); GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
self:halign(0.5); LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
self:valign(0.5);
end;
GainFocusCommand=function(self)
self:stoptweening();
self:decelerate(0.5);
self:diffusealpha(1);
end;
LoseFocusCommand=function(self)
self:stoptweening();
self:accelerate(0.5);
self:diffusealpha(0);
end;
}; };
LoadFont("Common normal")..{ LoadFont("Common normal")..{
InitCommand=function(self) InitCommand=cmd(zoom,0.4;maxwidth,(previewWidth*1.6)-8);
self:zoom(0.4);
self:maxwidth((previewWidth * 1.6) - 8);
end;
BeginCommand=function(self) BeginCommand=function(self)
local song = SONGMAN:GetRandomSong(); local song = SONGMAN:GetRandomSong();
self:settext("Loading songs...\n"..song:GetGroupName().."\n"..song:GetDisplayFullTitle()); self:settext("Loading songs...\n"..song:GetGroupName().."\n"..song:GetDisplayFullTitle());
end; end;
GainFocusCommand=function(self) GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
self:stoptweening(); LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
self:decelerate(0.5);
self:diffusealpha(1);
end;
LoseFocusCommand=function(self)
self:stoptweening();
self:accelerate(0.5);
self:diffusealpha(0);
end;
}; };
}; };
Exit = Def.ActorFrame{ Exit = Def.ActorFrame{
LoadActor(THEME:GetPathB("ScreenTitleMenu","background/_bg"))..{ LoadActor(THEME:GetPathB("ScreenTitleMenu","background/_bg"))..{
InitCommand=function(self) InitCommand=cmd(zoomto,previewWidth,previewHeight;halign,0.5;valign,0.5);
self:zoomto(previewWidth, previewHeight); GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
self:halign(0.5); LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
self:valign(0.5);
end;
GainFocusCommand=function(self)
self:stoptweening();
self:decelerate(0.5);
self:diffusealpha(1);
end;
LoseFocusCommand=function(self)
self:stoptweening();
self:accelerate(0.5);
self:diffusealpha(0);
end;
}; };
LoadActor(THEME:GetPathG("ScreenTitleMenu","logo"))..{ LoadActor(THEME:GetPathG("ScreenTitleMenu","logo"))..{
InitCommand=function(self) InitCommand=cmd(y,-28;zoom,0.35;propagate,true);
self:y(-28); GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
self:zoom(0.35); LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
self:propagate(true);
end;
GainFocusCommand=function(self)
self:stoptweening();
self:decelerate(0.5);
self:diffusealpha(1);
end;
LoseFocusCommand=function(self)
self:stoptweening();
self:accelerate(0.5);
self:diffusealpha(0);
end;
}; };
TitleMenuItem("Game Start",true)..{ TitleMenuItem("Game Start",true)..{
InitCommand=function(self) InitCommand=cmd(y,20);
self:y(20);
end;
}; };
TitleMenuItem("Options")..{ TitleMenuItem("Options")..{
InitCommand=function(self) InitCommand=cmd(y,32);
self:y(32);
end;
}; };
TitleMenuItem("Edit/Share")..{ TitleMenuItem("Edit/Share")..{
InitCommand=function(self) InitCommand=cmd(y,44);
self:y(44);
end;
}; };
TitleMenuItem("Exit")..{ TitleMenuItem("Exit")..{
InitCommand=function(self) InitCommand=cmd(y,56);
self:y(56);
end;
}; };
}; };
}; };
@@ -258,26 +113,9 @@ t[#t+1] = LoadFont("Common normal")..{
--Text="The quick brown fox jumps over the lazy dog ".. Index .." times."; --Text="The quick brown fox jumps over the lazy dog ".. Index .." times.";
Text=Screen.String("Explanation-"..Name); Text=Screen.String("Explanation-"..Name);
-- was x,-(SCREEN_CENTER_X*0.4);y,SCREEN_CENTER_Y*0.525; -- was x,-(SCREEN_CENTER_X*0.4);y,SCREEN_CENTER_Y*0.525;
InitCommand=function(self) InitCommand=cmd(x,-(SCREEN_CENTER_X*0.8);y,SCREEN_CENTER_Y*0.8;halign,0;valign,0;zoom,0.65;wrapwidthpixels,(SCREEN_WIDTH*0.55)*1.75;NoStroke;shadowlength,1);
self:x(SCREEN_CENTER_X * -0.8); GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
self:y(SCREEN_CENTER_Y * 0.8); LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
self:halign(0);
self:valign(0);
self:zoom(0.65);
self:wrapwidthpixels((SCREEN_WIDTH * 0.55) * 1.75);
self:NoStroke();
self:shadowlength(1);
end;
GainFocusCommand=function(self)
self:stoptweening();
self:decelerate(0.5);
self:diffusealpha(1);
end;
LoseFocusCommand=function(self)
self:stoptweening();
self:accelerate(0.5);
self:diffusealpha(0);
end;
}; };
return t; return t;
Themes/default/Graphics/ScreenSelectMusic AlternateHelpDisplay.lua
+23
View File
@@ -8,3 +8,26 @@ return Def.HelpDisplay {
self:SetTipsColonSeparated( params.Text ); self:SetTipsColonSeparated( params.Text );
end; end;
}; };
--[[ local sString = THEME:GetString(Var "LoadingScreen","AlternateHelpText");
local tItems = split(sString,"&");
local t = Def.ActorScroller {
NumItemsToDraw=#tItems;
SecondsPerItem=1.25;
TransformFunction=function( self, offset, itemIndex, numItems )
self:x( offset*74 );
end;
InitCommand=cmd(SetLoop,true);
-- OnCommand=cmd(scrollwithpadding,10,0);
};
for i=1,#tItems do
t[#t+1] = Def.ActorFrame {
LoadFont("HelpDisplay", "text") .. {
Text=tostring(tItems[i]);
OnCommand=THEME:GetMetric( Var "LoadingScreen","HelpOnCommand");
};
};
end
return t; --]]
Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua
+2
View File
@@ -11,6 +11,8 @@ local colors = {
local t = Def.ActorFrame {}; local t = Def.ActorFrame {};
-- Background! -- Background!
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
-- GainFocusCommand=cmd(visible,true);
-- LoseFocusCommand=cmd(visible,false);
LoadActor(THEME:GetPathG("ScreenSelectPlayMode","BackgroundFrame")) .. { LoadActor(THEME:GetPathG("ScreenSelectPlayMode","BackgroundFrame")) .. {
InitCommand=function(self) InitCommand=function(self)
self:diffuse(Color("Black")); self:diffuse(Color("Black"));
Themes/default/Graphics/ScreenTitleMenu SystemDirection/default.lua
+22 -61
View File
@@ -53,38 +53,21 @@ local function MakeIcon( sTarget )
Def.ActorFrame { Def.ActorFrame {
-- Life goes up to 1-5 -- Life goes up to 1-5
Def.ActorFrame { Def.ActorFrame {
InitCommand=function(self) InitCommand=cmd(y,12);
self:y(12);
end;
MakeDisplayBar( 6, 5 ) .. { MakeDisplayBar( 6, 5 ) .. {
InitCommand=function(self) InitCommand=cmd(x,-16;visible,( GetLifeDifficulty() >= 1 ));
self:x(-16);
self:visible( GetLifeDifficulty() >= 1 );
end;
}; };
MakeDisplayBar( 6, 9 ) .. { MakeDisplayBar( 6, 9 ) .. {
InitCommand=function(self) InitCommand=cmd(x,-8;visible,( GetLifeDifficulty() >= 2 ));
self:x(-8);
self:visible( GetLifeDifficulty() >= 2 );
end;
}; };
MakeDisplayBar( 6, 13 ) .. { MakeDisplayBar( 6, 13 ) .. {
InitCommand=function(self) InitCommand=cmd(x,0;visible,( GetLifeDifficulty() >= 3 ));
self:x(0);
self:visible( GetLifeDifficulty() >= 3 );
end;
}; };
MakeDisplayBar( 6, 16 ) .. { MakeDisplayBar( 6, 16 ) .. {
InitCommand=function(self) InitCommand=cmd(x,8;visible,( GetLifeDifficulty() >= 4 ));
self:x(8);
self:visible( GetLifeDifficulty() >= 4 );
end;
}; };
MakeDisplayBar( 6, 20 ) .. { MakeDisplayBar( 6, 20 ) .. {
InitCommand=function(self) InitCommand=cmd(x,16;visible,( GetLifeDifficulty() >= 5 ));
self:x(16);
self:visible( GetLifeDifficulty() >= 5 );
end;
}; };
}; };
Condition=sTarget[1] == "LifeDifficulty"; Condition=sTarget[1] == "LifeDifficulty";
@@ -92,69 +75,47 @@ local function MakeIcon( sTarget )
Def.ActorFrame { Def.ActorFrame {
-- Timing goes up to 1-8 -- Timing goes up to 1-8
Def.ActorFrame { Def.ActorFrame {
InitCommand=function(self) InitCommand=cmd(y,12);
self:y(12);
end;
MakeDisplayBar( 4, 5 ) .. { MakeDisplayBar( 4, 5 ) .. {
InitCommand=function(self) InitCommand=cmd(x,-20;visible,( GetTimingDifficulty() >= 1 ));
self:x(-20);
self:visible( GetTimingDifficulty() >= 1 );
end;
}; };
MakeDisplayBar( 4, 9 ) .. { MakeDisplayBar( 4, 9 ) .. {
InitCommand=function(self) InitCommand=cmd(x,-15;visible,( GetTimingDifficulty() >= 2 ));
self:x(-215);
self:visible( GetTimingDifficulty() >= 2 );
end;
}; };
MakeDisplayBar( 4, 13 ) .. { MakeDisplayBar( 4, 13 ) .. {
InitCommand=function(self) InitCommand=cmd(x,-10;visible,( GetTimingDifficulty() >= 3 ));
self:x(-10);
self:visible( GetTimingDifficulty() >= 3 );
end;
}; };
MakeDisplayBar( 4, 16 ) .. { MakeDisplayBar( 4, 16 ) .. {
InitCommand=function(self) InitCommand=cmd(x,-5;visible,( GetTimingDifficulty() >= 4 ));
self:x(-5);
self:visible( GetTimingDifficulty() >= 4 );
end;
}; };
MakeDisplayBar( 4, 20 ) .. { MakeDisplayBar( 4, 20 ) .. {
InitCommand=function(self) InitCommand=cmd(x,5;visible,( GetTimingDifficulty() >= 5 ));
self:x(5);
self:visible( GetTimingDifficulty() >= 5 );
end;
}; };
MakeDisplayBar( 4, 20 ) .. { MakeDisplayBar( 4, 20 ) .. {
function(self) InitCommand=cmd(x,10;visible,( GetTimingDifficulty() >= 6 ));
self:x(10);
self:visible( GetTimingDifficulty() >= 6 );
end;
}; };
MakeDisplayBar( 4, 20 ) .. { MakeDisplayBar( 4, 20 ) .. {
function(self) InitCommand=cmd(x,15;visible,( GetTimingDifficulty() >= 7 ));
self:x(15);
self:visible( GetTimingDifficulty() >= 7 );
end;
}; };
MakeDisplayBar( 4, 20 ) .. { MakeDisplayBar( 4, 20 ) .. {
function(self) InitCommand=cmd(x,20;visible,( GetTimingDifficulty() >= 8 ));
self:x(20);
self:visible( GetTimingDifficulty() >= 8 );
end;
}; };
}; };
Condition=sTarget[1] == "TimingDifficulty"; Condition=sTarget[1] == "TimingDifficulty";
}; };
--
--[[ for i=1,8 do
t[#t+1] = Def.Quad {
InitCommand=cmd(vertalign,bottom;zoomto,4,10+(i*4));
};
end --]]
}; };
return t return t
end; end;
for i=1,#tInfo do for i=1,#tInfo do
t[#t+1] = MakeIcon( tInfo[i] ) .. { t[#t+1] = MakeIcon( tInfo[i] ) .. {
InitCommand=function(self) InitCommand=cmd(x,(i-1)*fSpacingX);
self:x((i - 1) * fSpacingX);
end;
}; };
end end