Merge pull request #1 from eliw00d/1.1.0

2.0.0

Author: Paavo Bennett

data/scar/winconditions/class.scar

@@ -1,47 +1,66 @@
-function Class(superClass, constructor)
-	local class = {};
-	
-	if superClass then
-		for k,v in pairs(superClass) 
-		do
-			class[k] = v;
-		end
-		
-		class._superClass = superClass;
-	end
-	
-	class.__index = class;
-	
-	local metatable = {};
+function Class()
+    local class = {}    
+    class.__index = class
+
+    function class:extends(super)
+        self.__super = super
+        for k,v in pairs(super) do
+            if (k ~= '__index' 
+			and k ~= 'constructor'
+			and k ~= 'new') then
+                self[k] = v
+            end
+        end
+
+        return super
+    end
+    
+    function class:new(...)
+        local instance = {}
+        setmetatable(instance, self)
+        
+        if (self.constructor) then
+            self.constructor(instance, ...)
+        end
+        
+        return instance
+    end
+
+    function class:clone()
+        local clone = {}
+
+        for k,v in pairs(self) do
+            clone[k] = v
+        end
+
+        return clone
+    end
+
+    function class:isA(other)
+        local metatable = getmetatable(self)
+
+        while (metatable) do
+            if (metatable == other) then
+                return true
+            end
+            metatable = metatable.__super
+        end
+
+        return false
+    end
+    
+    local metatable = {}
+    setmetatable(class, metatable)
 
-	function metatable:__call(...)
-		local instance = {};
-		setmetatable(instance, class);
-				
-		if class._constructor then
-			class._constructor(instance, ...);
+	function metatable:__call(instance, ...)		
+		if (class.constructor) then
+			class.constructor(instance, ...)
 		end
-		
-		return instance;
 	end
-	
-	class._constructor = constructor;
-	
-	function class:isA(otherClass)
-        local mt = getmetatable(self);
-		
-        while mt
-		do
-            if mt == otherClass then
-				return true;
-			end
-            mt = mt._superClass;
-        end
-		
-        return false;
+    
+    function metatable:__tostring()
+        return self.name
     end
-	
-	setmetatable(class, metatable);
-	
-	return class;
-end
+
+    return class
+end

data/scar/winconditions/classes/color.scar

@@ -1,56 +1,36 @@
-import("WinConditions/Class.scar")
+Color = Class()
 
---[[ The Color class contains the red, green, blue, and alpha values needed to create Colors.
---
--- Constructor: Color([r], [g], [b], [a])
---]]
-Color = Class(nil, function(self, red, green, blue, alpha)
-	self._red = red or 0;
-	self._green = green or 0;
-	self._blue = blue or 0;
-	self._alpha = alpha or 255;
-end)
+function Color:constructor(red, green, blue, alpha)
+	self._red = red or 0
+	self._green = green or 0
+	self._blue = blue or 0
+	self._alpha = alpha or 255
+end
 
 -- Primary Colors
-Color.Red = Color(255, 0, 0);
-Color.Green = Color(0, 255, 0);
-Color.Blue = Color(0, 0, 255);
+Color.Red = Color:new(255, 0, 0)
+Color.Green = Color:new(0, 255, 0)
+Color.Blue = Color:new(0, 0, 255)
 
 -- Other Colors
-Color.Black = Color(0, 0, 0);
-Color.White = Color(255, 255, 255);
+Color.Black = Color:new(0, 0, 0)
+Color.White = Color:new(255, 255, 255)
 
 -- Custom Colors
 -- TODO: Add your own colors here.
-		
---[[ Gets the Red value of this Color.
---
--- @return		Red value
---]]
+
 function Color:getRed()
-	return self._red;
+	return self._red
 end
 
---[[ Gets the Green value in this Color.
---
--- @return		Green value
---]]
 function Color:getGreen()
-	return self._green;
+	return self._green
 end
 
---[[ Gets the Blue value in this Color.
---
--- @return		Blue value
---]]
 function Color:getBlue()
-	return self._blue;
+	return self._blue
 end
 
---[[ Gets the Alpha value in this Color.
---
--- @return		Alpha value
---]]
 function Color:getAlpha()
-	return self._alpha;
-end
+	return self._alpha
+end