Revert "DONE! All lua is future-proofed."

This reverts commit afd0dac0c1.
This commit is contained in:
Jason Felds
2013-07-18 18:02:01 -04:00
parent ea45a6947c
commit fb5db73c45
44 changed files with 1556 additions and 2939 deletions
@@ -2,157 +2,85 @@ return Def.ActorFrame {
CurrentSongChangedMessageCommand=function(self)
local song = GAMESTATE:GetCurrentSong();
if song then
-- self:setaux(0);
self:finishtweening();
self:playcommand("TweenOn");
elseif not song and self:GetZoomX() == 1 then
-- self:setaux(1);
self:finishtweening();
self:playcommand("TweenOff");
end;
end;
Def.Quad {
InitCommand=function(self)
self:y(-14);
self:zoomto(164, 2);
self:fadeleft(8 / 164);
self:faderight(8 / 164);
end;
OnCommand=function(self)
self:diffuse(Color("Black"));
self:diffusealpha(0);
self:linear(0.35);
self:diffusealpha(0.5);
end;
InitCommand=cmd(y,-14;zoomto,164,2;fadeleft,8/164;faderight,8/164);
OnCommand=cmd(diffuse,Color("Black");diffusealpha,0;linear,0.35;diffusealpha,0.5);
};
Def.Quad {
InitCommand=function(self)
self:y(24 * 5 - 10);
self:zoomto(164, 2);
self:fadeleft(8 / 164);
self:faderight(8 / 164);
end;
OnCommand=function(self)
self:diffuse(Color("Black"));
self:diffusealpha(0);
self:linear(0.35);
self:diffusealpha(0.5);
end;
InitCommand=cmd(y,24*(5)-10;zoomto,164,2;fadeleft,8/164;faderight,8/164);
OnCommand=cmd(diffuse,Color("Black");diffusealpha,0;linear,0.35;diffusealpha,0.5);
};
Def.StepsDisplayList {
Name="StepsDisplayListRow";
CursorP1 = Def.ActorFrame {
InitCommand=function(self)
self:x(-128 + 16);
self:player(PLAYER_1);
end;
InitCommand=cmd(x,-128+16;player,PLAYER_1);
PlayerJoinedMessageCommand=function(self, params)
if params.Player == PLAYER_1 then
self:visible(true);
self:zoom(0);
self:bounceend(1);
self:zoom(1);
(cmd(zoom,0;bounceend,1;zoom,1))(self);
end;
end;
PlayerUnjoinedMessageCommand=function(self, params)
if params.Player == PLAYER_1 then
self:visible(true);
self:bouncebegin(1);
self:zoom(0);
(cmd(bouncebegin,1;zoom,0))(self);
end;
end;
LoadActor(THEME:GetPathG("_StepsDisplayListRow","Cursor")) .. {
InitCommand=function(self)
self:diffuse(PlayerColor(PLAYER_1));
self:x(8);
self:zoom(0.75);
end;
InitCommand=cmd(diffuse,PlayerColor(PLAYER_1);x,8;zoom,0.75);
};
LoadActor(THEME:GetPathG("_StepsDisplayListRow","arrow")) .. {
InitCommand=function(self)
self:x(20);
self:diffuse(PlayerColor(PLAYER_1));
end;
OnCommand=function(self)
self:thump(1);
self:effectmagnitude(1, 1.25, 1);
self:effectclock('beat');
end;
InitCommand=cmd(x,20;diffuse,PlayerColor(PLAYER_1));
OnCommand=cmd(thump,1;effectmagnitude,1,1.25,1;effectclock,'beat';);
};
LoadFont("Common Normal") .. {
Text="P1";
InitCommand=function(self)
self:x(2);
self:diffuse(PlayerColor(PLAYER_1));
self:shadowlength(1);
end;
OnCommand=function(self)
self:zoom(0.75);
end;
InitCommand=cmd(x,2;diffuse,PlayerColor(PLAYER_1);shadowlength,1);
OnCommand=cmd(zoom,0.75);
};
};
CursorP2 = Def.ActorFrame {
InitCommand=function(self)
self:x(128 - 16);
self:player(PLAYER_2);
end;
InitCommand=cmd(x,128-16;player,PLAYER_2);
PlayerJoinedMessageCommand=function(self, params)
if params.Player == PLAYER_2 then
self:visible(true);
self:zoom(0);
self:bounceend(1);
self:zoom(1);
(cmd(zoom,0;bounceend,1;zoom,1))(self);
end;
end;
PlayerUnjoinedMessageCommand=function(self, params)
if params.Player == PLAYER_2 then
self:visible(true);
self:bouncebegin(1);
self:zoom(0);
(cmd(bouncebegin,1;zoom,0))(self);
end;
end;
LoadActor(THEME:GetPathG("_StepsDisplayListRow","Cursor")) .. {
InitCommand=function(self)
self:diffuse(PlayerColor(PLAYER_2));
self:x(-8);
self:zoom(0.75);
self:zoomx(-0.75);
end;
InitCommand=cmd(diffuse,PlayerColor(PLAYER_2);x,-8;zoom,0.75;zoomx,-0.75;);
};
LoadActor(THEME:GetPathG("_StepsDisplayListRow","arrow")) .. {
InitCommand=function(self)
self:x(-20);
self:diffuse(PlayerColor(PLAYER_2));
self:zoomx(-1);
end;
OnCommand=function(self)
self:thump(1);
self:effectmagnitude(1, 1.25, 1);
self:effectclock('beat');
end;
InitCommand=cmd(x,-20;diffuse,PlayerColor(PLAYER_2);zoomx,-1);
OnCommand=cmd(thump,1;effectmagnitude,1,1.25,1;effectclock,'beat';);
};
LoadFont("Common Normal") .. {
Text="P2";
InitCommand=function(self)
self:x(-2);
self:diffuse(PlayerColor(PLAYER_2));
self:shadowlength(1);
end;
OnCommand=function(self)
self:zoom(0.75);
end;
InitCommand=cmd(x,-2;diffuse,PlayerColor(PLAYER_2);shadowlength,1);
OnCommand=cmd(zoom,0.75);
};
};
CursorP1Frame = Def.Actor{
ChangeCommand=function(self)
self:stoptweening();
self:decelerate(0.05);
end;
ChangeCommand=cmd(stoptweening;decelerate,0.05);
};
CursorP2Frame = Def.Actor{
ChangeCommand=function(self)
self:stoptweening();
self:decelerate(0.05);
end;
ChangeCommand=cmd(stoptweening;decelerate,0.05);
};
};
};