/ld26

To get this branch, use:

bzr branch
/bzr/ld26

« back to all changes in this revision

Viewing changes to troll.lua

Committer: Josh C
Date: 2013-04-28 01:24:54 UTC
Revision ID: josh@9ix.org-20130428012454-b7kpooluezexnvde

fade out

files removed:
boat.lua

data/boat.png

data/bridge-bg.png

data/bridge-fg.png

data/bridge-player.png

data/castle-bg.png

data/castle-player.png

data/castle.svg

data/cat.png

data/cat48.png

data/cat48.svg

data/cave-bg.png

data/cave-player.png

data/cave.svg

data/fairy.png

data/fairy.svg

data/fish.png

data/fish.svg

data/flag.png

data/flag.svg

data/flower.png

data/flower.svg

data/flower32.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/realfairy.png

data/realfairy.svg

data/sheep-bg.png

data/sheep-player.png

data/sheep.svg

data/troll.png

data/village-bg.png

data/village-player.png

fairyactivator.lua

gatetrigger.lua

inventory.lua

items.lua

levels.lua

realfairy.lua

troll.lua

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

files modified:
Info.plist

build.sh

data/forest1-fg.png

data/forest1.svg

data/lake.svg

data/shore-bg.png

data/shore.svg

data/village.svg

displacer.lua

main.lua

player.lua

svg_levels.lua

svg_levels.py

Show diffs side-by-side

added added

removed removed

1

Troll = Tile:extend {

2

image = 'data/troll.png',

3

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

4

if the.inventory.items['fish'] then

5

self.y = self.y - self.height

6

the.inventory:remove('fish')

7

else

8

self:displace(other)

9

end

10

end

11

}

'\\ No newline at end of file'

Newer
Older