/ld26 : revision 7

To get this branch, use:

bzr branch
http://9ix.org/bzr/ld26

« back to all changes in this revision

Viewing changes to items.lua

Committer: Josh C
Date: 2013-04-27 17:14:03 UTC
Revision ID: josh@9ix.org-20130427171403-e713dceefjs4k2cn

show version

files added:
data/player1.png

files removed:
data/bridge-bg.png

data/bridge-fg.png

data/bridge-player.png

data/castle-bg.png

data/castle-player.png

data/castle.svg

data/cave-bg.png

data/cave-player.png

data/cave.svg

data/fish.png

data/fish.svg

data/flower.png

data/flower.svg

data/flower32.png

data/forest1-player.png

data/foresthut-bg.png

data/foresthut-fg.png

data/foresthut.svg

data/gate-bg.png

data/gate-player.png

data/gate.svg

data/lake-bg.png

data/lake-player.png

data/lakeroad.svg

data/player-null.png

data/sheep-bg.png

data/sheep-player.png

data/sheep.svg

data/shore-bg.png

data/shore-fg.png

data/shore-player.png

data/village-bg.png

data/village-player.png

displacer.lua

inventory.lua

items.lua

levels.lua

svg_levels.lua

svg_levels.py

transition.lua

files renamed:
data/bridge.svg => data/forest2.svg

files modified:
Info.plist

data/forest1-fg.png

data/forest1.svg

data/lake.svg

data/shore.svg

data/village.svg

main.lua

player.lua

Show diffs side-by-side

added added

removed removed

items.lua

Flower = Tile:extend{

image = 'data/flower32.png',

name = 'flower',

invTile = Tile:new{image = 'data/flower.png'},

onNew = function(self)

--print(self.x, self.y, self.width, self.height)

end,

onCollide = function(self, other, xOl, yOl)

if other == the.player then

the.inventory:add(self)

the.app.view:remove(self)

end

}

Fish = Sprite:extend{

name = 'fish',

invTile = Tile:new{image = 'data/fish.png'},