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

BIN
art/food/beer_mug.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 573 B

BIN
art/food/orig/beer_mug.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 312 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 340 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 403 B

After

Width:  |  Height:  |  Size: 403 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 312 B

After

Width:  |  Height:  |  Size: 312 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 308 B

After

Width:  |  Height:  |  Size: 308 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 456 B

After

Width:  |  Height:  |  Size: 456 B

Before After
Before After

BIN
art/house/books_stack.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
art/house/bookshelf.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 155 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 KiB

BIN
art/house/orig/toilet.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 404 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 401 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 406 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 501 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 406 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 607 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 293 B

After

Width:  |  Height:  |  Size: 293 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 302 B

After

Width:  |  Height:  |  Size: 302 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 300 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 358 B

After

Width:  |  Height:  |  Size: 358 B

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 350 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 350 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 350 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 379 B

BIN
art/house/toilet.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
art/switch_pressed.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 B

View file

@ -58,7 +58,6 @@ function Door:setColors(colors)
end end
function Door:unlock() function Door:unlock()
print("wow")
self.locked = false self.locked = false
self.collision = "none" self.collision = "none"
end end

View file

@ -98,6 +98,9 @@ function Entity:move(axis, direction)
self[axis] = self[axis] + direction self[axis] = self[axis] + direction
end end
function Entity:setSprite(sprite)
self.sprite = sprite
end
function Entity:sha() function Entity:sha()
return math.random(-worldSha, worldSha) * .5 return math.random(-worldSha, worldSha) * .5

View file

@ -1,3 +1,6 @@
love.graphics.setDefaultFilter("linear", "nearest")
class = require "libs/middleclass" class = require "libs/middleclass"
Timer = require "libs/hump/timer" Timer = require "libs/hump/timer"
sfxr = require "libs/sfxrlua/sfxr" sfxr = require "libs/sfxrlua/sfxr"

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

View file

@ -2,19 +2,33 @@ require "entity"
Switch = class("Switch", Entity) Switch = class("Switch", Entity)
Switch.static.sprites = {
red = love.graphics.newImage("art/switch_r.png"),
green = love.graphics.newImage("art/switch_g.png"),
blue = love.graphics.newImage("art/switch_b.png"),
pressed = love.graphics.newImage("art/switch_pressed.png")
}
function Switch:initialize(x, y, color) function Switch:initialize(x, y, color)
Entity.initialize(self, { Entity.initialize(self, {
x = x, x = x,
y = y, y = y,
color = color, color = color,
collision = "none", --switches are floor elements that can't be pushed or bloc movement!! collision = "none", --switches are floor elements that can't be pushed or bloc movement!!
sprite = switchSprite[color] sprite = Switch.sprites[color]
}) })
self.activated = false self.activated = false
end end
function Switch:activate() function Switch:activate()
if self.activated == false then self.activated = true end if self.activated == false then
print("i am: ", self.activated) self.activated = true
end
end
function Switch:deactivate()
if self.activated == true then
self.activated = false
end
end end