noe/chroma_solstice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump chec~~

Browse source
This commit is contained in:
0x81c 2015-03-16 07:39:54 -04:00
parent 0009355d04
commit 1c1ec291a7
153 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
room.lua
View file

@ -62,7 +62,7 @@ function Room:initialize(t)
-- 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
if active then self.collideables[color]["n: " .. x .. ", " .. y] = Ass:new(x, y, color, "nature/", "palm_scaled_reduced") end
self.collideables[color]["n: " .. x .. ", " .. y]:getOccupiedCells()
-- local x, y = 7, 7
@ -168,9 +168,18 @@ function Room:movePlayer(key)
x = pos.x + dir.x, y = pos.y + dir.y
} -- this is for reference for each color as we change the targetCells table
local initialTargetEntities = {}
for _, color in pairs(self:getActiveColors()) do
initialTargetEntities[color] = self:getCellInMatrix(self.collidableMatrices[color], initialTargetCell)
if initialTargetEntities[color] then initialTargetEntities[color]:bump() print(bump) end
end
if not self:isInBounds(initialTargetCell) then
-- let's us move out of bounds to Change Rooms without pulling a bloc_
move = true
elseif self:getCellInMatrix(self.collidableMatrices["red"], initialTargetCell) and self:getCellInMatrix(self.collidableMatrices["red"], initialTargetCell):canPassOver() then
elseif initialTargetEntities["red"] and initialTargetEntities["red"]:canPassOver() then
--we should put this in the else statement actually
move = true
else
local targetCells