From d76ace8f69264981a1e7a87c03a9901de0e7c059 Mon Sep 17 00:00:00 2001
From: 0x81c <mmlxxvi@gmail.com>
Date: Mon, 16 Mar 2015 10:17:06 -0400
Subject: [PATCH] level serializes now

---
 entity.lua | 37 ++++++++++++++++++++++++++----------
 room.lua   | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 81 insertions(+), 12 deletions(-)

diff --git a/entity.lua b/entity.lua
index 120c6e0..a525f22 100644
--- a/entity.lua
+++ b/entity.lua
@@ -2,7 +2,6 @@ Entity = class("Entity")
 
 function Entity:initialize(t)
 	self.x, self.y = t.x, t.y
-	self.name = t.name
 	self.spriteSize = {w = t.sprite:getWidth(), h = t.sprite:getHeight()}
 	self.size = {w = self.spriteSize.w / 16, h = self.spriteSize.h / 16}
 	self.cellShape = t.cellShape or self:cellShapeFromBox(self.size)
@@ -11,6 +10,7 @@ function Entity:initialize(t)
 	self.sprite = t.sprite
 	self.shaAmount = t.sha or 1
 	self.onBump = t.onBump or function(self) return true end
+	self.tick = t.tick or function(self) return true end
 
 	self.drawOffset = {x = 0, y = 0}
 	if self.size.w < 1 or self.size.h < 1 then
@@ -19,13 +19,6 @@ function Entity:initialize(t)
 	end
 end
 
-Entity.static.positionsAreEqual = function(cell1, cell2)
-	if cell1.x == cell2.x and cell1.y == cell2.y then
-		return true
-	end
-	return false
-end
-
 function Entity:getCollision()
 	return self.collision
 end
@@ -95,8 +88,12 @@ function Entity:getGridSize()
 	return {x = self.size.w, y = self.size.h}
 end
 
-function Entity:tick()
+function Entity:getname()
+	return self.name
+end
 
+function Entity:tick()
+	return self.tick()
 end
 
 function Entity:draw()
@@ -119,6 +116,18 @@ function Entity:canPassOver()
 	return false
 end
 
+function Entity:getClass()
+	return self.class.name
+end
+
+function Entity:getSerializationTable()
+	local pos = self:getGridPos()
+	local table = {}
+	table.x, table.y, table.color = pos.x, pos.y, color
+	if self.name then table.name = self.name end
+
+	return table
+end
 
 function Entity:move(axis, direction)
 	self[axis] = self[axis] + direction
@@ -134,4 +143,12 @@ end
 
 function Entity:bump()
 	return self:onBump()
-end
\ No newline at end of file
+end
+
+
+Entity.static.positionsAreEqual = function(cell1, cell2)
+	if cell1.x == cell2.x and cell1.y == cell2.y then
+		return true
+	end
+	return false
+end
diff --git a/room.lua b/room.lua
index f29f038..2710a8b 100644
--- a/room.lua
+++ b/room.lua
@@ -18,6 +18,7 @@ function Room:initialize(t)
 	self.player = {}
 	self.switches = { red = {}, green = {}, blue = {} }
 	self.switchMatrices = {}
+	self.doors = {}
 	self.collideables = { red = {}, green = {}, blue = {} }
 	self.collidableMatrices = {} --{red = {{...}{...}{...}}, ...
 
@@ -25,7 +26,6 @@ function Room:initialize(t)
 		self.player[color] = Player:new(t.player.x, t.player.y, color)
 	end
 
-	self.doors = {}
 	self.activeColors = {}
 	for _, color in ipairs(t.player.activeColors) do self.activeColors[color] = true end
 
@@ -434,6 +434,22 @@ function Room:getPlayerPos(color)
 	return self.player[color]:getGridPos()
 end
 
+function Room:getPlayerObject(color)
+	return self.player[color]
+end
+
+function Room:getDoors()
+	return self.doors
+end
+
+function Room:getCollideables()
+	return self.collideables
+end
+
+function Room:getSwitches()
+	return self.switches
+end
+
 function Room:switchCheck()
 	local doorsToUnlock = {}
 	for color, switchArray in pairs(self.switches) do
@@ -472,11 +488,47 @@ function Room:nextRoomCheck()
 end
 
 function Room:save()
-	self:serialize()
+	local name = self.name
+	local level = TSerial.pack(self:serialize(), nil, true)
+	print(level)
+	--write level to file
 end
 
 function Room:serialize()
+	local level = {}
 
+	level.player = {}
+	for _, color in ipairs(self:getInactiveColors()) do
+		level.player[color] = self:getPlayerObject(color):getSerializationTable()
+	end
+
+	level.doors = {}
+	for _, door in pairs(self:getDoors()) do
+		table.insert(level.door, doors:getSerializationTable())
+	end
+
+
+	for color, collideableArray in pairs(self:getCollideables()) do
+		for _, collideable in pairs(collideableArray) do
+			if not collideable:isInstanceOf("Door") then --for now, we might change doors up some
+				local entityClass = string.lower(collideable:getClass())
+				print(entityClass)
+				if not level[entityClass] then level[entityClass] = {} end
+				if not level[entityClass][color] then level[entityClass][color] = {} end
+				table.insert(level[entityClass][color], collideable:getSerializationTable())
+			end
+		end
+	end
+
+	level.switches = {}
+	for color, switchArray in pairs(self:getSwitches()) do
+		level.switches[color] = {}
+		for _, switch in ipairs(switchArray) do
+			table.insert(level.switches[color], switch:getSerializationTable())
+		end
+	end
+
+	return level
 end
 
 function nextRoom(pos)