WOWOWOWOWOWOWO WI DID IT WOWOWWWWWW WOW
This commit is contained in:
0x81c
parent
286871ca21
commit
c668dc513b
7 changed files with 294 additions and 58 deletions
279
room.lua
279
room.lua
|
|
@ -11,26 +11,29 @@ require "assorted"
|
|||
function Room:initialize(t)
|
||||
self.exits = t.exits
|
||||
self.name = t.name
|
||||
self.player = {}
|
||||
self.player = Player:new(t.player.x, t.player.y, t.player.activeColors)
|
||||
self.collideables = {
|
||||
red = {},
|
||||
green = {},
|
||||
blue = {}
|
||||
}
|
||||
self.collidableMatrices = {} --{red = {{...}{...}{...}}, ...}
|
||||
|
||||
self.activeColors = {
|
||||
red = false, green = false, blue = false
|
||||
red = true, green = true, blue = true
|
||||
}
|
||||
|
||||
for color, coords in pairs(t.player) do
|
||||
self.player[color] = Player:new(coords.x, coords.y, color)
|
||||
self.activeColors[color] = true
|
||||
end
|
||||
|
||||
for i=0, 5 do
|
||||
-- for color, coords in pairs(t.player) do
|
||||
-- self.player[color] = Player:new(coords.x, coords.y, color)
|
||||
-- self.activeColors[color] = true
|
||||
-- end
|
||||
|
||||
for i=0, 2 do
|
||||
local c = randomColor()
|
||||
local x, y = math.random(1, gridWidth), math.random(1, gridHeight)
|
||||
self.collideables[c]["b: " .. x .. ", " .. y] = Box:new(x, y, c)
|
||||
self.collideables[c]["b: " .. x .. ", " .. y]:getOccupiedCells()
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -41,35 +44,34 @@ function Room:initialize(t)
|
|||
end
|
||||
end
|
||||
|
||||
-- for color, active in pairs(self.activeColors) do
|
||||
-- local x, y = 6, 3
|
||||
-- if active then self.collideables[color]["n: " .. x .. ", " .. y] = Ass:new(x, y, color, "animals/processed/", "me_rach") end
|
||||
for color, active in pairs(self.activeColors) do
|
||||
local x, y = 6, 3
|
||||
-- if active then self.collideables[color]["n: " .. x .. ", " .. y] = Ass:new(x, y, color, "animals/processed/", "me_rach") end
|
||||
|
||||
-- local x, y = 1, 1
|
||||
-- if active then self.collideables[color]["n: " .. x .. ", " .. y] = Ass:new(x, y, color, "tech/processed/", "mac_smaller") end
|
||||
local x, y = 1, 1
|
||||
if active then self.collideables[color]["n: " .. x .. ", " .. y] = Ass:new(x, y, color, "tech/processed/", "mac_smaller") end
|
||||
self.collideables[color]["n: " .. x .. ", " .. y]:getOccupiedCells()
|
||||
|
||||
-- local x, y = 7, 7
|
||||
-- if active then self.collideables[color]["n: " .. x .. ", " .. y] = Ass:new(x, y, color, "tech/processed/", "cd") end
|
||||
local x, y = 7, 7
|
||||
if active then self.collideables[color]["n: " .. x .. ", " .. y] = Ass:new(x, y, color, "tech/processed/", "cd") end
|
||||
|
||||
-- end
|
||||
end
|
||||
|
||||
-- self.collideables["green"]["fpp"] = Artifact:new(6, 6, "green")
|
||||
|
||||
for color, entities in pairs(self.collideables) do
|
||||
self.collidableMatrices[color] = self:createEntityMatrix(entities)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
function Room:update(dt)
|
||||
for color, player in pairs(self.player) do
|
||||
player:update(dt)
|
||||
end
|
||||
self.player:update(dt)
|
||||
end
|
||||
|
||||
function Room:draw()
|
||||
for color, player in pairs(self.player) do
|
||||
if self.activeColors[color] then
|
||||
player:draw()
|
||||
end
|
||||
end
|
||||
self.player:draw()
|
||||
|
||||
for color, entityArray in pairs(self.collideables) do
|
||||
for _, entity in pairs(entityArray) do
|
||||
entity:draw()
|
||||
|
|
@ -77,20 +79,210 @@ function Room:draw()
|
|||
end
|
||||
end
|
||||
|
||||
function Room:movePlayer(key)
|
||||
function Room:createCollideablesMatrix(collideables)
|
||||
for color, entities in pairs(self.collideables) do
|
||||
self.collidableMatrices[color] = self:createEntityMatrix(entities)
|
||||
end
|
||||
end
|
||||
function Room:createEntityMatrix(entities)
|
||||
local matrix = {}
|
||||
|
||||
--lets populate it w/ empty stuff first
|
||||
for i = 1, gridWidth do
|
||||
local row = {}
|
||||
for i = 1, gridHeight do
|
||||
table.insert(row, false)
|
||||
end
|
||||
table.insert(matrix, row)
|
||||
end
|
||||
|
||||
--assumes that entities table is set up li_e {index = ent1, anotherIndex = ent2, ...}
|
||||
for _, entity in pairs(entities) do
|
||||
for _, occupiedCells in pairs(entity:getOccupiedCells()) do
|
||||
--we store a table reference so we can call a method on it during a chec_
|
||||
matrix[occupiedCells.y][occupiedCells.x] = entity
|
||||
end
|
||||
end
|
||||
-- printMatrix(matrix)
|
||||
return matrix
|
||||
end
|
||||
|
||||
function Room:switchPlayerColor(color)
|
||||
print(color)
|
||||
for c, active in pairs(self.activeColors) do
|
||||
if color == "white" then
|
||||
self:setActiveColor(c, true)
|
||||
elseif c == color then
|
||||
self:setActiveColor(c, true)
|
||||
else
|
||||
self:setActiveColor(c, false)
|
||||
function Room:getCellInMatrix(matrix, cell)
|
||||
return matrix[cell.y][cell.x]
|
||||
end
|
||||
|
||||
function Room:movePlayer(key)
|
||||
local activeColors = self.player:getActiveColors()
|
||||
local pos = self.player:getGridPos()
|
||||
local x, y = pos.x, pos.y
|
||||
local dir = {x = 0, y = 0}
|
||||
local axis
|
||||
|
||||
if key == "up" then
|
||||
dir.y, axis = -1, "y"
|
||||
elseif key == "down" then
|
||||
dir.y, axis = 1, "y"
|
||||
elseif key == "left" then
|
||||
dir.x, axis = -1, "x"
|
||||
elseif key == "right" then
|
||||
dir.x, axis = 1, "x"
|
||||
end
|
||||
|
||||
local move
|
||||
local entitiesToPush = {
|
||||
red = {},
|
||||
green = {},
|
||||
blue = {}
|
||||
}
|
||||
local entitiesToPull = {
|
||||
red = {},
|
||||
green = {},
|
||||
blue = {}
|
||||
}
|
||||
|
||||
-- PUSHHHHHHHHHHHHHHHHHHHHHH---------------------
|
||||
|
||||
local initialTargetCell = {
|
||||
x = pos.x + dir.x, y = pos.y + dir.y
|
||||
} -- this is for reference for each color as we change the targetCells table
|
||||
|
||||
local move = true
|
||||
local targetCells
|
||||
|
||||
--so the way this worx is....
|
||||
for _, color in pairs(activeColors) do
|
||||
--for each color...
|
||||
targetCells = {initialTargetCell} -- ...we start with our attempted movement...
|
||||
local doneSearching
|
||||
while not doneSearching do
|
||||
nextTargetCells = {} -- ...then we create this array to save our next group of cells
|
||||
local emptyCells = {}
|
||||
for _, cell in pairs(targetCells) do
|
||||
if self:isInBounds(cell) then
|
||||
local entity = self:getCellInMatrix(self.collidableMatrices[color], cell)
|
||||
if entity then
|
||||
--something is here!!
|
||||
if not entitiesToPush[color][entity] then --if the entity hasnt been found already
|
||||
if entity:canMove() then
|
||||
local projectedCells = entity:getOccupiedCells(dir) -- we project the movement here
|
||||
entitiesToPush[color][entity] = entity
|
||||
for _, projectedCell in ipairs(projectedCells) do
|
||||
table.insert(nextTargetCells, projectedCell)
|
||||
end
|
||||
else
|
||||
move = false
|
||||
doneSearching = true
|
||||
end
|
||||
end
|
||||
else
|
||||
--there's nothin there!!
|
||||
table.insert(emptyCells, cell)
|
||||
end
|
||||
else
|
||||
--we are out of bounds now
|
||||
move = false
|
||||
doneSearching = true
|
||||
end
|
||||
end
|
||||
|
||||
--if every projected cell is empty then we can do the move
|
||||
if #emptyCells == #targetCells then
|
||||
move = true
|
||||
doneSearching = true
|
||||
end
|
||||
|
||||
targetCells = nextTargetCells
|
||||
end
|
||||
--let's get out of this loop b/c if we can't move one color we can't move at all
|
||||
if move == false then break end
|
||||
end
|
||||
|
||||
|
||||
---PULL CHEC
|
||||
|
||||
local initialTargetCell = {x = pos.x - dir.x, y = pos.y - dir.y}
|
||||
|
||||
local targetCells
|
||||
|
||||
local pull = {}
|
||||
--so the way this worx is....
|
||||
for _, color in pairs(activeColors) do
|
||||
--for each color...
|
||||
targetCells = {initialTargetCell} -- ...we start with our attempted movement...
|
||||
local doneSearching
|
||||
while not doneSearching do
|
||||
nextTargetCells = {} -- ...then we create this array to save our next group of cells
|
||||
local emptyCells = {}
|
||||
for _, cell in pairs(targetCells) do
|
||||
if self:isInBounds(cell) then
|
||||
local entity = self:getCellInMatrix(self.collidableMatrices[color], cell)
|
||||
if entity then
|
||||
--something is here!!
|
||||
if not entitiesToPull[color][entity] then --if the entity hasnt been found already
|
||||
if entity:canMove() then
|
||||
local projectedCells = entity:getOccupiedCells(dir) -- we project the movement here
|
||||
entitiesToPull[color][entity] = entity
|
||||
for _, projectedCell in ipairs(projectedCells) do
|
||||
table.insert(nextTargetCells, projectedCell)
|
||||
end
|
||||
else
|
||||
pull[color] = false
|
||||
doneSearching = true
|
||||
end
|
||||
end
|
||||
else
|
||||
--there's nothin there!!
|
||||
table.insert(emptyCells, cell)
|
||||
end
|
||||
else
|
||||
pull[color] = true
|
||||
--we are out of bounds now
|
||||
doneSearching = true
|
||||
end
|
||||
end
|
||||
|
||||
--if every projected cell is empty then we can do the move
|
||||
if #emptyCells == #targetCells then
|
||||
pull[color] = true
|
||||
doneSearching = true
|
||||
end
|
||||
|
||||
targetCells = nextTargetCells
|
||||
end
|
||||
--let's get out of this loop b/c if we can't move one color we can't move at all
|
||||
if move == false then break end
|
||||
end
|
||||
|
||||
|
||||
|
||||
if move then
|
||||
for color, entities in pairs(entitiesToPush) do
|
||||
for _, entity in pairs(entities) do
|
||||
entity:move(axis, dir[axis])
|
||||
end
|
||||
end
|
||||
for color, entities in pairs(entitiesToPull) do
|
||||
if pull[color] then
|
||||
for _, entity in pairs(entities) do
|
||||
entity:move(axis, dir[axis])
|
||||
end
|
||||
end
|
||||
end
|
||||
self.player:move(axis, dir[axis])
|
||||
self:tick()
|
||||
end
|
||||
end
|
||||
|
||||
function Room:attemptPush(dirVector)
|
||||
-- should return array of things to push or nil/falsey value
|
||||
end
|
||||
|
||||
|
||||
function Room:switchPlayerColor(color)
|
||||
if color == "white" then
|
||||
self.player:setActiveColors({"red", "green", "blue"})
|
||||
else
|
||||
self.player:setActiveColors({color})
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -98,27 +290,24 @@ function Room:setActiveColor(color, bool)
|
|||
self.activeColors[color] = bool
|
||||
end
|
||||
|
||||
function Room:getAdjacentEntities(entities, pos, axis, direction)
|
||||
|
||||
end
|
||||
|
||||
function Room:checkAndPull(entities, pos, axis, direction)
|
||||
|
||||
end
|
||||
|
||||
function Room:tryPlayerMove(entities, pos, axis, direction)
|
||||
|
||||
end
|
||||
|
||||
function Room:tick()
|
||||
for color, entityArray in pairs(self.collideables) do
|
||||
for _, entity in pairs(entityArray) do
|
||||
entity:tick()
|
||||
end
|
||||
end
|
||||
self:createCollideablesMatrix()
|
||||
self:nextRoomCheck()
|
||||
end
|
||||
|
||||
function Room:isInBounds(cell)
|
||||
if cell.x > 0 and cell.x <= gridWidth and
|
||||
cell.y > 0 and cell.y <= gridHeight then
|
||||
return true
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
function Room:nextRoomCheck()
|
||||
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue