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

wowgit add -A!

Browse source
This commit is contained in:
0x81c 2015-03-15 16:25:00 -04:00
parent 1156564fa2
commit 747a7b7b58
3 changed files with 44 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

36
room.lua
View file

@ -33,15 +33,15 @@ function Room:initialize(t)
-- self.activeColors[color] = true
-- end
for i=1, 30 do
local x, y = randomPosition()
local door = Door:new(x, y, self.colorsPlayerHas)
table.insert(self.doors, door)
-- for i=1, 30 do
-- local x, y = randomPosition()
-- local door = Door:new(x, y, self.colorsPlayerHas)
-- table.insert(self.doors, door)
for color, active in pairs(self.activeColors) do
self.collideables[color]["w: " .. x .. ", " .. y] = door
end
end
-- for color, active in pairs(self.activeColors) do
-- self.collideables[color]["w: " .. x .. ", " .. y] = door
-- end
-- end
for i=0, 5 do
local x, y = randomPosition()
@ -50,25 +50,25 @@ function Room:initialize(t)
end
end
for i = 0, 5 do
local x, y = randomPosition()
print(x, y)
local c = randomColor()
table.insert(self.switches[c], Switch:new(x, y, c))
end
-- for i = 0, 5 do
-- local x, y = randomPosition()
-- print(x, y)
-- local c = randomColor()
-- table.insert(self.switches[c], Switch:new(x, y, c))
-- 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, "house/processed/", "toilet") end
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, "food/processed/", "beer_mug") end
-- local x, y = 7, 7
-- if active then self.collideables[color]["n: " .. x .. ", " .. y] = Ass:new(x, y, color, "food/processed/", "beer_mug") end
self.collideables[color]["fpp"] = Artifact:new(6, 6, color)
-- self.collideables[color]["fpp"] = Artifact:new(6, 6, color)
end