Script cleanup, add aliases for SCREEN_* (_screen.w, etc, check alias.lua). [shakesoda]

Themes/_fallback/Scripts/03 ProductivityHelpers.lua

@@ -12,7 +12,7 @@ Blend = {
 	Multiply = 'BlendMode_WeightedMultiply',
 	Invert   = 'BlendMode_InvertDest',
 	NoEffect = 'BlendMode_NoEffect'
-};
+}
 
 -- Health Declarations
 -- Used primarily for lifebars.
@@ -21,37 +21,37 @@ Health = {
 	Alive  = 'HealthState_Alive',
 	Danger = 'HealthState_Danger',
 	Dead   = 'HealthState_Dead'
-};
+}
 
 --[[ Actor commands ]]
 function Actor:CenterX()
-	self:x(SCREEN_CENTER_X);
-end;
+	self:x(SCREEN_CENTER_X)
+end
 
 function Actor:CenterY()
-	self:y(SCREEN_CENTER_Y);
-end;
+	self:y(SCREEN_CENTER_Y)
+end
 
 -- xy(actorX,actorY)
 -- Sets the x and y of an actor in one command.
 function Actor:xy(actorX,actorY)
-	self:x(actorX);
-	self:y(actorY);
-end;
+	self:x(actorX)
+	self:y(actorY)
+end
 
 -- MaskSource([clearzbuffer])
 -- Sets an actor up as the source for a mask. Clears zBuffer by default.
-function Actor:MaskSource(_)
-	self:clearzbuffer(_ or true);
-	self:zwrite(true);
-	self:blend('BlendMode_NoEffect');
-end;
+function Actor:MaskSource(noclear)
+	self:clearzbuffer(noclear or true)
+	self:zwrite(true)
+	self:blend('BlendMode_NoEffect')
+end
 
 -- MaskDest()
 -- Sets an actor up to be masked by anything with MaskSource().
 function Actor:MaskDest()
-	self:ztest(true);
-end;
+	self:ztest(true)
+end
 
 -- Thump()
 -- A customized version of pulse that is more appealing for on-beat
@@ -59,13 +59,13 @@ end;
 function Actor:thump(fEffectPeriod)
 	self:pulse()
 	if fEffectPeriod ~= nil then
-		self:effecttiming(0,0,0.75*fEffectPeriod,0.25*fEffectPeriod);
+		self:effecttiming(0,0,0.75*fEffectPeriod,0.25*fEffectPeriod)
 	else
-		self:effecttiming(0,0,0.75,0.25);
+		self:effecttiming(0,0,0.75,0.25)
 	end
 	-- The default effectmagnitude will make this effect look very bad.
-	self:effectmagnitude(1,1.125,1);
-end;
+	self:effectmagnitude(1,1.125,1)
+end
 
 --[[ BitmapText commands ]]
 
@@ -73,22 +73,23 @@ end;
 -- An alias that turns off texture filtering.
 -- Named because it works best with pixel fonts.
 function BitmapText:PixelFont()
-	self:SetTextureFiltering(false);
-end;
+	self:SetTextureFiltering(false)
+end
 
 -- Stroke(color)
 -- Sets the text's stroke color.
 function BitmapText:Stroke(c)
-	self:strokecolor( c );
-end;
+	self:strokecolor( c )
+end
 
 -- NoStroke()
 -- Removes any stroke.
 function BitmapText:NoStroke()
-	self:strokecolor( color("0,0,0,0") );
-end;
+	self:strokecolor( color("0,0,0,0") )
+end
 
 -- Set Text With Format (contributed by Daisuke Master)
+-- this function is my hero - shake
 function BitmapText:settextf(...)
 	self:settext(string.format(...))
 end
@@ -96,8 +97,8 @@ end
 -- DiffuseAndStroke(diffuse,stroke)
 -- Set diffuse and stroke at the same time.
 function BitmapText:DiffuseAndStroke(diffuseC,strokeC)
-	self:diffuse(diffuseC);
-	self:strokecolor(strokeC);
+	self:diffuse(diffuseC)
+	self:strokecolor(strokeC)
 end;
 --[[ end BitmapText commands ]]
 
@@ -106,20 +107,24 @@ end;
 --[[ helper functions ]]
 function tobool(v)
 	if type(v) == "string" then
-		local cmp = string.lower(v);
+		local cmp = string.lower(v)
 		if cmp == "true" or cmp == "t" then
-			return true;
+			return true
 		elseif cmp == "false" or cmp == "f" then
-			return false;
-		end;
+			return false
+		end
 	elseif type(v) == "number" then
-		if v == 0 then return false;
-		else return true;
-		end;
-	end;
-end;
+		if v == 0 then
+			return false
+		else
+			return true
+		end
+	end
+end
 
-function pname(pn) return ToEnumShortString(pn); end;
+function pname(pn)
+	return ToEnumShortString(pn)
+end
 
 -- from http://ardoris.wordpress.com/2008/11/07/rounding-to-a-certain-number-of-decimal-places-in-lua/
 function round(what, precision)