Add ability to have two players.

Author: dulsi

EntityManager.lua

@@ -27,7 +27,7 @@ end
 
 function EntityManager:addEntity(entity, type)
 	if type == EntityTypes.PLAYER then
-		self.player = entity
+		table.insert(self.player, entity)
 	elseif type == EntityTypes.ENEMY then
 		table.insert(self.enemies, entity)
 	elseif type == EntityTypes.WALL then
@@ -75,63 +75,69 @@ function EntityManager:unfreezeEnemies()
 end
 
 function EntityManager:freezeGame()
-    self.gameFrozen = true
-    self.player:freezeIfAlive()
+	self.gameFrozen = true
+	for _, e in pairs(self.player) do
+		e:freezeIfAlive()
+	end
 end
 
 function EntityManager:unfreezeGame()
-    self.gameFrozen = false
-    self.player:unfreeze()
+	self.gameFrozen = false
+	for _, e in pairs(self.player) do
+		e:unfreeze()
+	end
 end
 
 function EntityManager:update(dt)
 
-	if self.player then
-		self.player:update(dt)
+	for _, e in pairs(self.player) do
+		e:update(dt)
 	end
 
-    if not self.gameFrozen then
-
-        if self.player.state == "alive" then
-
-            for i,v in ipairs(self.walls) do
-                if v:collide(self.player) then
-                    self.player:resetPosition()
-                end
-            end
-
-            for i,v in ipairs(self.enemies) do
-                if v:collide(self.player) and self.player.state == "alive" then
-                    self.player:die()
-                end
-            end
-
-            for i,v in ipairs(self.flowers) do
-                if v:collide(self.player) then
-                    v:onCollide()
-                end
-            end
-
-            for _, t in pairs(self.turnstiles) do
-                local row, col = getTileForPosition(self.player.x, self.player.y)
-                t:update(
-                    row,
-                    col,
-                    self.player.orientation
-                )
-            end
-
-            for i,v in ipairs(self.gameObjects) do
-                if v.type == "skull" and v:collide(self.player) then
-                    v:destroy()
-                    self.player:die()
-                elseif v.type == "plant" and v:collide(self.player) then
-                    Event.dispatch("plantEaten", v)
-                    v:destroy()
-                end
-            end
+	if not self.gameFrozen then
+
+	for _, e in pairs(self.player) do
+		if e.state == "alive" then
+
+			for i,v in ipairs(self.walls) do
+				if v:collide(e) then
+					e:resetPosition()
+				end
+			end
+
+			for i,v in ipairs(self.enemies) do
+				if v:collide(e) and e.state == "alive" then
+					e:die()
+				end
+			end
+
+			for i,v in ipairs(self.flowers) do
+				if v:collide(e) then
+					v:onCollide()
+				end
+			end
+
+			for _, t in pairs(self.turnstiles) do
+				local row, col = getTileForPosition(e.x, e.y)
+				t:update(
+					row,
+					col,
+					e.orientation
+				)
+			end
+
+			for i,v in ipairs(self.gameObjects) do
+				if v.type == "skull" and v:collide(e) then
+					v:destroy()
+					e:die()
+				elseif v.type == "plant" and v:collide(e) then
+					Event.dispatch("plantEaten", v)
+					v:destroy()
+				end
+			end
+		end
 
-        end
+	end
 
         --- Update door positions based on turnstiles & their respective orientation
 
@@ -160,11 +166,13 @@ function EntityManager:update(dt)
             end
         end
 
-        for i,v in ipairs(self.letters) do
-            if v:collide(self.player) then
-                v:onCollide()
-            end
-        end
+	for i,v in ipairs(self.letters) do
+		for _, e in pairs(self.player) do
+			if v:collide(e) then
+				v:onCollide()
+			end
+		end
+	end
 
         self:updateTable(self.gameObjects, dt)
     end
@@ -181,7 +189,7 @@ function EntityManager:draw()
 	self:drawTable(self.flowers)
 	self:drawTable(self.letters)
 	self:drawTable(self.enemies)
-	self.player:draw()
+	self:drawTable(self.player)
 end
 
 

entities/Enemy.lua

@@ -184,7 +184,7 @@ function Enemy:update(dt)
             self.hitbox.y2 = self.y + 14
 
             local ownRow, ownCol = getTileForPosition(self.x, self.y)
-            local playerRow, playerCol = getTileForPosition(self.entityManager.player.x, self.entityManager.player.y)
+            local playerRow, playerCol = getTileForPosition(self.entityManager.player[1].x, self.entityManager.player[1].y)
 
             local row, col = self:getNextStep(ownRow, ownCol, playerRow, playerCol, self.entityManager.tilemap)
             self:moveTo(row, col)
@@ -236,4 +236,4 @@ function Enemy:unfreeze()
 end
 
 
-return Enemy
+return Enemy

entities/Player.lua

@@ -1,8 +1,20 @@
 Player = Class{__includes = Entity}
 
-function Player:init()
+function Player:init(n)
     Entity.init(self, VIRTUAL_WIDTH / 2 - 8, 184)
 
+    self.number = n
+    if (n == 1) then
+	self.left = "left"
+	self.right = "right"
+	self.up = "up"
+	self.down = "down"
+    else
+	self.left = "a"
+	self.right = "d"
+	self.up = "w"
+	self.down = "s"
+    end
     self.hitbox = {}
 
     self.hitbox.x1 = self.x + 4
@@ -56,16 +68,16 @@ function Player:update(dt)
         self.lastX = self.x
         self.lastY = self.y
 
-        if love.keyboard.isDown("left") then
+        if love.keyboard.isDown(self.left) then
             self.orientation = Orientation.LEFT
             self:move(-PLAYER_SPEED * dt, 0)
-        elseif love.keyboard.isDown("right") then
+        elseif love.keyboard.isDown(self.right) then
             self.orientation = Orientation.RIGHT
             self:move(PLAYER_SPEED * dt, 0)
-        elseif love.keyboard.isDown("up") then
+        elseif love.keyboard.isDown(self.up) then
             self.orientation = Orientation.UP
             self:move(0, -PLAYER_SPEED * dt)
-        elseif love.keyboard.isDown("down") then
+        elseif love.keyboard.isDown(self.down) then
             self.orientation = Orientation.DOWN
             self:move(0, PLAYER_SPEED * dt, 0)
         end

states/LevelStartState.lua

@@ -52,6 +52,7 @@ function LevelStartState:enter(params)
     self.level = params.level or 1
     self.lives = params.lives or 3
     self.score = params.score or 0
+    self.players = params.players or 1
 
     -- RNG stuff
 
@@ -73,7 +74,8 @@ function LevelStartState:enter(params)
             {
                 level = self.level,
                 score = self.score,
-                lives = self.lives ,
+                lives = self.lives,
+                players = self.players,
                 extraLetter = self.extraLetter,
                 specialLetter = self.specialLetter,
                 commonLetter = self.commonLetter,
@@ -87,4 +89,4 @@ function LevelStartState:enter(params)
 end
 
 function LevelStartState:exit()
-end
+end

states/PlayState.lua

@@ -23,6 +23,7 @@ function PlayState:update(dt)
                 level = self.level + 1,
                 score = self.score,
                 lives = self.lives,
+                players = self.players,
                 extraLettersLit = self.extraLettersLit,
                 specialLettersLit = self.specialLettersLit
             }
@@ -153,6 +154,7 @@ function PlayState:enter(params)
     self.level = params.level
     self.score = params.score
     self.lives = params.lives
+    self.players = params.players
     local extraLetter = params.extraLetter
     local specialLetter = params.specialLetter
     local commonLetter = params.commonLetter
@@ -173,7 +175,10 @@ function PlayState:enter(params)
     self.plantTexture = love.graphics.newImage(data.fruitFile)
 
     self.entityManager = EntityManager()
-    self.entityManager:addEntity(Player(), EntityTypes.PLAYER)
+    self.entityManager:addEntity(Player(1), EntityTypes.PLAYER)
+	if params.players == 2 then
+		self.entityManager:addEntity(Player(2), EntityTypes.PLAYER)
+	end
 
     local available_tiles = {}
 
@@ -338,7 +343,9 @@ function PlayState:enter(params)
             enemy:destroy()
         end
 
-        self.entityManager.player:destroy()
+	for _, e in pairs(self.entityManager.player) do
+		e:destroy()
+	end
 
         self.lives = self.lives - 1
 
@@ -361,7 +368,9 @@ function PlayState:enter(params)
             if not changed then gStateMachine:change('title') end
         end
 
-        self.entityManager:addEntity(Player(), EntityTypes.PLAYER)
+	for i, e in pairs(self.entityManager.player) do
+		self.entityManager.player[i] = Player(i)
+	end
 
         self.trappedEnemies = {}
 
@@ -472,4 +481,4 @@ function PlayState:freeze(seconds)
         self:startClockTick()
     end)
 
-end
+end

states/TitleState.lua

@@ -14,6 +14,19 @@ function TitleState:update(dt)
                 level = 1,
                 score = 0,
                 lives = 3,
+                players = 1,
+                extraLettersLit = {},
+                specialLettersLit = {}
+            })
+    end
+
+    if love.keyboard.keyPressed['2'] then
+        gStateMachine:change('levelstart',
+            {
+                level = 1,
+                score = 0,
+                lives = 3,
+                players = 2,
                 extraLettersLit = {},
                 specialLettersLit = {}
             })
@@ -58,4 +71,4 @@ function TitleState:enter()
 end
 
 function TitleState:exit()
-end
+end