From da657870d49a3dd36f8d4e6aa31ad0d3bef02bb9 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Thu, 18 Jul 2013 17:41:10 -0400
Subject: [PATCH] Revert "More lua."

This reverts commit 2330c875010b36b53cea00b8f60ba5fbfe11f2b4.
---
 BGAnimations/flash/default.lua               | 18 ++++--------------
 BGAnimations/white flash/default.lua         | 13 ++-----------
 BGAnimations/white reverse flash/default.lua | 15 +++------------
 BGAnimations/yellow flash/default.lua        | 13 ++-----------
 Docs/steps.lua                               |  4 ++--
 5 files changed, 13 insertions(+), 50 deletions(-)

diff --git a/BGAnimations/flash/default.lua b/BGAnimations/flash/default.lua
index b249f5e512..57d615d067 100644
--- a/BGAnimations/flash/default.lua
+++ b/BGAnimations/flash/default.lua
@@ -1,15 +1,5 @@
-local flashColor = color(Var "Color1")
-return Def.Quad {
-	InitCommand=function(self)
-		self:x(SCREEN_CENTER_X);
-		self:y(SCREEN_CENTER_Y);
-		self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
-		self:diffuse(flashColor);
-	end;
-	GainFocusCommand=function(self)
-		self:finishtweening();
-		self:diffusealpha(1);
-		self:accelerate(0.6);
-		self:diffusealpha(0);
-	end;
+local flashColor = color(Var "Color1")
+return Def.Quad {
+	InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;diffuse,flashColor;);
+	GainFocusCommand=cmd(finishtweening;diffusealpha,1;accelerate,0.6;diffusealpha,0);
 };
\ No newline at end of file
diff --git a/BGAnimations/white flash/default.lua b/BGAnimations/white flash/default.lua
index 1ceaef6c96..6b4bb74a03 100644
--- a/BGAnimations/white flash/default.lua	
+++ b/BGAnimations/white flash/default.lua	
@@ -1,13 +1,4 @@
 return Def.Quad {    
-    InitCommand=function(self)
-		self:x(SCREEN_CENTER_X);
-		self:y(SCREEN_CENTER_Y);
-		self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
-	end;
-    GainFocusCommand=function(self)
-		self:finishtweening();
-		self:diffusealpha(1);
-		self:accelerate(0.6);
-		self:diffusealpha(0);
-	end;
+    InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2);
+    GainFocusCommand=cmd(finishtweening;diffusealpha,1;accelerate,0.6;diffusealpha,0);
 };
\ No newline at end of file
diff --git a/BGAnimations/white reverse flash/default.lua b/BGAnimations/white reverse flash/default.lua
index 60965986c8..b3f97a46a2 100644
--- a/BGAnimations/white reverse flash/default.lua	
+++ b/BGAnimations/white reverse flash/default.lua	
@@ -1,13 +1,4 @@
-return Def.Quad {    
-    InitCommand=function(self)
-		self:x(SCREEN_CENTER_X);
-		self:y(SCREEN_CENTER_Y);
-		self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
-	end;
-    GainFocusCommand=function(self)
-		self:finishtweening();
-		self:diffusealpha(0);
-		self:accelerate(0.6);
-		self:diffusealpha(1);
-	end;
+return Def.Quad {    
+    InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2);
+    GainFocusCommand=cmd(finishtweening;diffusealpha,0;accelerate,0.6;diffusealpha,1);
 };
\ No newline at end of file
diff --git a/BGAnimations/yellow flash/default.lua b/BGAnimations/yellow flash/default.lua
index 4f8cffce67..0681c212ce 100644
--- a/BGAnimations/yellow flash/default.lua	
+++ b/BGAnimations/yellow flash/default.lua	
@@ -1,13 +1,4 @@
 return Def.Quad {
-    InitCommand=function(self)
-		self:x(SCREEN_CENTER_X);
-		self:y(SCREEN_CENTER_Y);
-		self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
-	end;
-    GainFocusCommand=function(self)
-		self:finishtweening();
-		self:diffuse(color("#FFFFA0"));
-		self:accelerate(0.6);
-		self:diffusealpha(0);
-	end;
+    InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2);
+    GainFocusCommand=cmd(finishtweening;diffuse,color("#FFFFA0");accelerate,0.6;diffusealpha,0);
 };
\ No newline at end of file
diff --git a/Docs/steps.lua b/Docs/steps.lua
index 987ce1eef7..4f8d015e9c 100644
--- a/Docs/steps.lua
+++ b/Docs/steps.lua
@@ -42,8 +42,8 @@ local MetaData = {
 				startTime = { path, rate, offset, commands }
 				Any ommitted arguments will default to nil, except for rate, which would use 1.0
 			]]
-			0 = {"path/to/bga", 1.0, 0.000, 0, function(self) self:rainbow(); end; },
-			0 = {"path/to/bga2", 1.0, 0.000, 0, function(self) self:thump(); end; }
+			0 = {"path/to/bga", 1.0, 0.000, 0, cmd(rainbow) },
+			0 = {"path/to/bga2", 1.0, 0.000, 0, cmd(thump) }
 		},
 	},
 	--[[