This commit is contained in:
0x81c 2015-03-11 21:08:15 -04:00
parent b4905845e6
commit d5a60336f5
3 changed files with 28 additions and 13 deletions

View file

@ -11,7 +11,6 @@ function love.load()
loadSprites() loadSprites()
inputTimer = Timer.new() inputTimer = Timer.new()
player = Player:new(2, 1, "green") player = Player:new(2, 1, "green")
end end

View file

@ -1,23 +1,17 @@
require "entity" require "entity"
Player = class("Player") Player = class("Player", Entity)
function Player:initialize(x, y, color) function Player:initialize(x, y, color)
local entityTable = { Entity.initialize(self, {
x = x, x = x,
y = y, y = y,
sizeX = 1, sizeX = 3,
sizeY = 1, sizeY = 3,
color = color, color = color,
collision = "none" --player can't push other player collision = "none" --player can't push other player
} })
Entity.initialize(self, entityTable)
--need to probably get rid of middleclass
--and roll yr own for default method inheritance
self.getDrawPos = Entity.getDrawPos
self.getGridPos = Entity.getGridPos
self.sprite = playerSprite self.sprite = playerSprite
end end

View file

@ -1,6 +1,14 @@
Room = class("Room") Room = class("Room")
require "player"
function Room:initialize() function Room:initialize(t)
self.exits = t.exits
self.name = t.name
self.player = {}
for color, coords in ipairs(t.playerColors) do
self.player[color] = Player:new(coords.x, coords.y, color)
end
end end
@ -11,3 +19,17 @@ end
function Room:update() function Room:update()
end end
function Room:tick()
self:nextRoomCheck()
end
function Room:nextRoomCheck()
end
function nextRoom()
-- currentRoom = Room:new{
-- }
end