Skip to content

Commit da65787

Browse files
Revert "More lua."
This reverts commit 2330c87.
1 parent fbf979e commit da65787

File tree

5 files changed

+13
-50
lines changed

5 files changed

+13
-50
lines changed

BGAnimations/flash/default.lua

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
1-
local flashColor = color(Var "Color1")
2-
return Def.Quad {
3-
InitCommand=function(self)
4-
self:x(SCREEN_CENTER_X);
5-
self:y(SCREEN_CENTER_Y);
6-
self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
7-
self:diffuse(flashColor);
8-
end;
9-
GainFocusCommand=function(self)
10-
self:finishtweening();
11-
self:diffusealpha(1);
12-
self:accelerate(0.6);
13-
self:diffusealpha(0);
14-
end;
1+
local flashColor = color(Var "Color1")
2+
return Def.Quad {
3+
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;diffuse,flashColor;);
4+
GainFocusCommand=cmd(finishtweening;diffusealpha,1;accelerate,0.6;diffusealpha,0);
155
};

BGAnimations/white flash/default.lua

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
return Def.Quad {
2-
InitCommand=function(self)
3-
self:x(SCREEN_CENTER_X);
4-
self:y(SCREEN_CENTER_Y);
5-
self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
6-
end;
7-
GainFocusCommand=function(self)
8-
self:finishtweening();
9-
self:diffusealpha(1);
10-
self:accelerate(0.6);
11-
self:diffusealpha(0);
12-
end;
2+
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2);
3+
GainFocusCommand=cmd(finishtweening;diffusealpha,1;accelerate,0.6;diffusealpha,0);
134
};
Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
return Def.Quad {
2-
InitCommand=function(self)
3-
self:x(SCREEN_CENTER_X);
4-
self:y(SCREEN_CENTER_Y);
5-
self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
6-
end;
7-
GainFocusCommand=function(self)
8-
self:finishtweening();
9-
self:diffusealpha(0);
10-
self:accelerate(0.6);
11-
self:diffusealpha(1);
12-
end;
1+
return Def.Quad {
2+
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2);
3+
GainFocusCommand=cmd(finishtweening;diffusealpha,0;accelerate,0.6;diffusealpha,1);
134
};

BGAnimations/yellow flash/default.lua

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
return Def.Quad {
2-
InitCommand=function(self)
3-
self:x(SCREEN_CENTER_X);
4-
self:y(SCREEN_CENTER_Y);
5-
self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
6-
end;
7-
GainFocusCommand=function(self)
8-
self:finishtweening();
9-
self:diffuse(color("#FFFFA0"));
10-
self:accelerate(0.6);
11-
self:diffusealpha(0);
12-
end;
2+
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2);
3+
GainFocusCommand=cmd(finishtweening;diffuse,color("#FFFFA0");accelerate,0.6;diffusealpha,0);
134
};

Docs/steps.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ local MetaData = {
4242
startTime = { path, rate, offset, commands }
4343
Any ommitted arguments will default to nil, except for rate, which would use 1.0
4444
]]
45-
0 = {"path/to/bga", 1.0, 0.000, 0, function(self) self:rainbow(); end; },
46-
0 = {"path/to/bga2", 1.0, 0.000, 0, function(self) self:thump(); end; }
45+
0 = {"path/to/bga", 1.0, 0.000, 0, cmd(rainbow) },
46+
0 = {"path/to/bga2", 1.0, 0.000, 0, cmd(thump) }
4747
},
4848
},
4949
--[[

0 commit comments

Comments
 (0)