mostly art stuffgit add -A

This commit is contained in:
0x81c 2015-03-15 13:54:47 -04:00
parent ffa35aec89
commit 687939b269
39 changed files with 27 additions and 7 deletions

View file

@ -59,11 +59,11 @@ 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, "house/processed/", "toilet") 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
if active then self.collideables[color]["n: " .. x .. ", " .. y] = Ass:new(x, y, color, "food/processed/", "beer_mug") end
end
@ -348,10 +348,11 @@ function Room:switchCheck()
--switch is on
switch:activate()
table.insert(onSwitches, switch) --doesn't rly matter what we put here as long as it's true-y
else
switch:deactivate()
end
end
if #onSwitches == #switchArray then doorsToUnlock[color] = true else doorsToUnlock[color] = false end
print(color, doorsToUnlock[color])
end
return doorsToUnlock