=== modified file 'Info.plist'
--- Info.plist 2013-04-29 01:54:19 +0000
+++ Info.plist 2013-04-28 18:52:51 +0000
@@ -15,7 +15,7 @@
CFBundleInfoDictionaryVersion
6.0
CFBundleName
- Sail Away
+ LD26
CFBundlePackageType
APPL
-
-
=== modified file 'data/cave.svg'
--- data/cave.svg 2013-04-28 22:23:30 +0000
+++ data/cave.svg 2013-04-28 21:39:48 +0000
@@ -148,7 +148,7 @@
inkscape:groupmode="layer"
id="layer10"
inkscape:label="objects"
- style="display:inline">
+ style="display:none">
+ inkscape:label="displace" />
=== removed file 'data/fairy.png'
Binary files data/fairy.png 2013-04-29 00:08:20 +0000 and data/fairy.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/fairy.svg'
--- data/fairy.svg 2013-04-29 00:35:28 +0000
+++ data/fairy.svg 1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-
-
-
-
=== removed file 'data/flag.png'
Binary files data/flag.png 2013-04-28 22:23:30 +0000 and data/flag.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/flag.svg'
--- data/flag.svg 2013-04-28 22:23:30 +0000
+++ data/flag.svg 1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-
-
-
-
=== modified file 'data/foresthut-bg.png'
Binary files data/foresthut-bg.png 2013-04-29 00:08:20 +0000 and data/foresthut-bg.png 2013-04-28 17:18:46 +0000 differ
=== modified file 'data/foresthut.svg'
--- data/foresthut.svg 2013-04-29 00:08:20 +0000
+++ data/foresthut.svg 2013-04-28 19:15:52 +0000
@@ -15,7 +15,7 @@
version="1.1"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="foresthut.svg"
- inkscape:export-filename="/home/josh/code/game/ld26/data/foresthut-bg.png"
+ inkscape:export-filename="/home/josh/code/game/ld26/data/foresthut-fg.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
@@ -47,7 +47,7 @@
image/svg+xml
-
+
@@ -123,12 +123,6 @@
id="rect4444"
style="fill:#72217b;fill-opacity:1;stroke:none" />
-
-
=== modified file 'data/gate-bg.png'
Binary files data/gate-bg.png 2013-04-28 23:14:19 +0000 and data/gate-bg.png 2013-04-28 19:40:13 +0000 differ
=== modified file 'data/gate.svg'
--- data/gate.svg 2013-04-28 23:14:19 +0000
+++ data/gate.svg 2013-04-28 19:40:13 +0000
@@ -27,9 +27,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.0850061"
- inkscape:cx="400.67331"
- inkscape:cy="298.61921"
+ inkscape:zoom="1.0863427"
+ inkscape:cx="400"
+ inkscape:cy="301.01001"
inkscape:document-units="px"
inkscape:current-layer="layer3"
showgrid="false"
@@ -102,6 +102,13 @@
x="521.01422"
y="608.83057" />
+
-
-
-
-
-
-
-
+ style="display:none">
+ inkscape:label="displace" />
-
- target = 'castle'
-
=== removed file 'data/realfairy.png'
Binary files data/realfairy.png 2013-04-29 00:35:28 +0000 and data/realfairy.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/realfairy.svg'
--- data/realfairy.svg 2013-04-29 00:57:59 +0000
+++ data/realfairy.svg 1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-
-
-
-
=== modified file 'data/sheep-bg.png'
Binary files data/sheep-bg.png 2013-04-29 01:28:50 +0000 and data/sheep-bg.png 2013-04-28 21:10:57 +0000 differ
=== modified file 'data/sheep.svg'
--- data/sheep.svg 2013-04-29 01:28:50 +0000
+++ data/sheep.svg 2013-04-28 21:10:57 +0000
@@ -31,13 +31,13 @@
inkscape:cx="397.2882"
inkscape:cy="301.01001"
inkscape:document-units="px"
- inkscape:current-layer="layer1"
+ inkscape:current-layer="layer8"
showgrid="false"
inkscape:showpageshadow="false"
inkscape:window-width="1089"
- inkscape:window-height="768"
+ inkscape:window-height="855"
inkscape:window-x="106"
- inkscape:window-y="25"
+ inkscape:window-y="70"
inkscape:window-maximized="0" />
@@ -47,7 +47,7 @@
image/svg+xml
-
+
@@ -79,6 +79,12 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccc" />
+
+ style="display:none">
target='cave'
-
- target = 'bridge',
-targetX = 107,
-targetY = 400
-
=== modified file 'data/shore.svg'
--- data/shore.svg 2013-04-29 01:26:02 +0000
+++ data/shore.svg 2013-04-28 18:51:02 +0000
@@ -27,16 +27,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="0.89989552"
- inkscape:cx="-24.945025"
- inkscape:cy="275.17749"
+ inkscape:zoom="0.91329283"
+ inkscape:cx="390.23912"
+ inkscape:cy="247.97709"
inkscape:document-units="px"
- inkscape:current-layer="layer6"
+ inkscape:current-layer="layer1"
showgrid="false"
- inkscape:window-width="1078"
- inkscape:window-height="616"
- inkscape:window-x="127"
- inkscape:window-y="75"
+ inkscape:window-width="1106"
+ inkscape:window-height="832"
+ inkscape:window-x="263"
+ inkscape:window-y="64"
inkscape:window-maximized="0"
inkscape:showpageshadow="false"
showguides="true"
@@ -49,7 +49,7 @@
image/svg+xml
-
+
@@ -74,7 +74,7 @@
sodipodi:cy="346.45172"
sodipodi:rx="55.558392"
sodipodi:ry="55.558392"
- d="m 663.67021,346.45172 c 0,30.68405 -24.87434,55.55839 -55.55839,55.55839 -30.68406,0 -55.5584,-24.87434 -55.5584,-55.55839 0,-30.68405 24.87434,-55.55839 55.5584,-55.55839 30.68405,0 55.55839,24.87434 55.55839,55.55839 z"
+ d="m 663.67021,346.45172 a 55.558392,55.558392 0 1 1 -111.11679,0 55.558392,55.558392 0 1 1 111.11679,0 z"
transform="translate(9.0913729,247.30121)" />
+ style="display:none">
-
-
-
-
-
-
-
-
-
=== modified file 'displacer.lua'
--- displacer.lua 2013-04-29 00:36:07 +0000
+++ displacer.lua 2013-04-27 22:53:39 +0000
@@ -9,18 +9,4 @@
self:displace(other)
end
end
-}
-
-MaybeDisplacer = Fill:extend{
- fill = {0, 128, 255},
- visible = false,
- onUpdate = function(self, dt)
- self.visible = DEBUG and the.console.visible
- end,
- onCollide = function(self, other, xOl, yOl)
- --print('col')
- if the.player.canMove then
- self:displace(other)
- end
- end
-}
+}
\ No newline at end of file
=== removed file 'fairyactivator.lua'
--- fairyactivator.lua 2013-04-29 00:42:39 +0000
+++ fairyactivator.lua 1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-FairyActivator = Sprite:extend {
- onCollide = function(self, other, xOl, yOl)
- self:displace(other)
-
- if the.inventory.items['fairy'] then
- the.inventory:remove('fairy')
-
- local v = the.app.view
- local f = RealFairy:new{x = the.player.x, y = the.player.y}
- v:add(f)
-
- the.player.canMove = false
-
- v.tween:start(f, 'x', fairytarget.x, 5)
- v.tween:start(f, 'y', fairytarget.y, 5):andThen(function()
- --( -- <-- delete this
- the.player.canMove = true
- f:die()
- --f.carryingPlayer = false
-
- --v.tween:start(f, 'x', fairytarget2.x, 5)
- --v.tween:start(f, 'y', fairytarget2.y, 5)
- end)
- -- :andThen...
- end
- end
-}
\ No newline at end of file
=== removed file 'gatetrigger.lua'
--- gatetrigger.lua 2013-04-29 01:12:25 +0000
+++ gatetrigger.lua 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-GateTrigger = Sprite:extend {
- onNew = function(self)
- --print(self.x, self.y, self.width, self.height)
- end,
- onCollide = function (self, other, xOl, yOl)
- --print('collide')
- if the.inventory.items['flag'] then
- print('have flag')
-
- gateup.visible = false
- gatedown.visible = true
-
- the.inventory:remove('flag')
- end
-
- if gateup.visible then
- self:displace(other)
- end
- end
-}
\ No newline at end of file
=== modified file 'inventory.lua'
--- inventory.lua 2013-04-29 01:12:25 +0000
+++ inventory.lua 2013-04-28 22:13:30 +0000
@@ -2,26 +2,14 @@
items = {},
had = {},
visible = true,
- nitems = 0,
add = function(self, item)
+ item.invTile.y = 10
+ item.invTile.x = 50 * #self.items
self.items[item.name] = item
- the.app.view:flash({0,255,0})
-
- item.invTile.y = 10
- item.invTile.x = 50 * self.nitems
-
- self.nitems = self.nitems + 1
end,
remove = function(self, name)
self.had[name] = self.items[name]
self.items[name] = nil
- self.nitems = self.nitems - 1
-
- local newindex = 0
- for _, item in pairs(self.items) do
- item.invTile.x = 50 * newindex
- newindex = newindex + 1
- end
end,
draw = function(self)
for _, item in pairs(self.items) do
=== modified file 'items.lua'
--- items.lua 2013-04-29 00:08:20 +0000
+++ items.lua 2013-04-28 22:00:27 +0000
@@ -25,48 +25,4 @@
the.app.view:remove(self)
end
end
-}
-
-Flag = Sprite:extend{
- name = 'flag',
- invTile = Tile:new{image = 'data/flag.png'},
- onCollide = function(self, other, xOl, yOl)
- if the.inventory.items['flower'] then
- the.inventory:add(self)
- --the.app.view:remove(self)
-
- the.inventory:remove('flower')
- end
-
- self:displace(other)
- end
-}
-
-Fairy = Sprite:extend{
- name = 'fairy',
- invTile = Tile:new{image = 'data/fairy.png'},
- onCollide = function(self, other, xOl, yOl)
- if the.inventory.items['cat'] then
- the.inventory:add(self)
-
- the.inventory:remove('cat')
- end
-
- self:displace(other)
- end
-}
-
-Cat = Tile:extend{
- image = 'data/cat.png',
- name = 'cat',
- invTile = Tile:new{image = 'data/cat48.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
- end
-}
+}
\ No newline at end of file
=== modified file 'levels.lua'
--- levels.lua 2013-04-29 00:57:59 +0000
+++ levels.lua 2013-04-28 21:39:48 +0000
@@ -20,12 +20,11 @@
objects = function() return {
Tile:new{image = 'data/shore-bg.png'},
Player:new{x = 145, y = 133,
- --minY = 133, maxY = 133,
+ minY = 133, maxY = 133,
image = 'data/shore-player.png'},
- --Tile:new{image = 'data/shore-fg.png'},
+ Tile:new{image = 'data/shore-fg.png'},
Transition:new{x = 10, y = 133, target = 'forest1',
- targetX = 735, targetY = 370},
- fairytarget
+ targetX = 735, targetY = 370}
} end
},
lake = {
@@ -59,8 +58,6 @@
Player:new{x = 90, y = 388,
minY = 388, maxY = 388,
image = 'data/bridge-player.png'},
- gateup,
- gatedown
}
end
},
=== modified file 'main.lua'
--- main.lua 2013-04-29 01:26:02 +0000
+++ main.lua 2013-04-28 22:13:30 +0000
@@ -2,7 +2,6 @@
DEBUG = true
require 'zoetrope'
---inspect = require 'inspect'
--require 'sprite'
require 'version'
@@ -14,10 +13,6 @@
require 'levels'
require 'items'
require 'troll'
-require 'gatetrigger'
-require 'fairyactivator'
-require 'realfairy'
-require 'boat'
require 'svg_levels'
@@ -29,19 +24,13 @@
end
for _, obj in ipairs(levels[self.level].objects()) do
self:add(obj)
- --if obj.gateup then print('ADDING GATEUP') end
end
for _, obj in ipairs(svg_objects[self.level]) do
if not the.inventory.items[obj.name] then
self:add(obj)
end
- if obj.name == 'flag' then
- self:add(obj)
- end
end
- --self:add(Fill:new{x=100,y=100,width=25,height=25,fill={255,255,255}})
-
self:add(the.inventory)
self:flash({0,0,0})
@@ -73,9 +62,6 @@
-- back off that dark overlay a bit
self.console.fill.fill[4] = 75
end
-
- --the.inventory:add(Flag:new())
- --the.inventory:add(Fairy:new())
end,
onUpdate = function (self, dt)
if the.keys:justPressed('escape') then
=== modified file 'player.lua'
--- player.lua 2013-04-29 00:35:28 +0000
+++ player.lua 2013-04-28 02:02:58 +0000
@@ -1,7 +1,6 @@
Player = Tile:extend {
image = 'data/player-null.png',
minY = 0, maxY = 600,
- canMove = true,
onNew = function(self)
the.player = self
@@ -19,22 +18,20 @@
ms = ms * 4
end
- if self.canMove then
- if the.keys:pressed('up') then
- self.velocity.y = -100 * ms
- elseif the.keys:pressed('down') then
- self.velocity.y = 100 * ms
- else
- self.velocity.y = 0
- end
+ if the.keys:pressed('up') then
+ self.velocity.y = -100 * ms
+ elseif the.keys:pressed('down') then
+ self.velocity.y = 100 * ms
+ else
+ self.velocity.y = 0
+ end
- if the.keys:pressed('right') then
- self.velocity.x = 100 * ms
- elseif the.keys:pressed('left') then
- self.velocity.x = -100 * ms
- else
- self.velocity.x = 0
- end
+ if the.keys:pressed('right') then
+ self.velocity.x = 100 * ms
+ elseif the.keys:pressed('left') then
+ self.velocity.x = -100 * ms
+ else
+ self.velocity.x = 0
end
end,
onUpdate = function(self, dt)
=== removed file 'realfairy.lua'
--- realfairy.lua 2013-04-29 00:35:28 +0000
+++ realfairy.lua 1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-RealFairy = Tile:extend{
- image = 'data/realfairy.png',
- carryingPlayer = true,
- onUpdate = function (self, dt)
- -- TODO: move player to self
- if self.carryingPlayer then
- the.player.x = self.x
- the.player.y = self.y
- end
- end
-}
\ No newline at end of file
=== modified file 'svg_levels.lua'
--- svg_levels.lua 2013-04-29 01:54:19 +0000
+++ svg_levels.lua 2013-04-28 22:13:30 +0000
@@ -25,6 +25,12 @@
},
cave = {
+Displacer:new{
+ x = 272.011660, y = 446.064150,
+ width = 18.367348, height = 29.737610
+},
+
+
Transition:new{
x = 74.344025, y = 435.568510,
width = 9.620992, height = 43.731777,
@@ -33,12 +39,6 @@
targetY=325
},
-
-Flag:new{
- x = 272.011660, y = 446.064150,
- width = 18.367348, height = 29.737610,
-},
-
},
bridge = {
@@ -114,64 +114,13 @@
},
},
-realfairy = {
-},
flower = {
},
-fairy = {
-},
shore = {
Displacer:new{
- x = -7.616363, y = 511.048430,
- width = 15.329147, height = 79.930550
-},
-
-
-MaybeDisplacer:new{
- x = -15.876616, y = 148.302190,
- width = 206.396010, height = 16.697821
-},
-
-
-MaybeDisplacer:new{
- x = -14.781677, y = 122.050610,
- width = 205.575000, height = 10.949390
-},
-
-
-MaybeDisplacer:new{
- x = -21.898781, y = 493.936460,
- width = 329.576660, height = 15.329147
-},
-
-
-MaybeDisplacer:new{
- x = -36.132988, y = 590.145570,
- width = 233.222020, height = 14.234208
-},
-
-
-MaybeDisplacer:new{
- x = 194.899150, y = 561.677120,
- width = 39.417805, height = 28.468416
-},
-
-
-MaybeDisplacer:new{
- x = 285.779080, y = 497.075710,
- width = 27.373476, height = 29.563354
-},
-
-
-FairyActivator:new{
x = 171.725940, y = 132.299380,
- width = 19.192898, height = 16.162441,
-},
-
-
-Boat:new{
- x = 231.032140, y = 523.354250,
+ width = 19.192898, height = 16.162441
},
},
@@ -253,6 +202,12 @@
},
gate = {
+Displacer:new{
+ x = 338.751280, y = 372.631590,
+ width = 34.059235, height = 60.754307
+},
+
+
Transition:new{
x = 1.841040, y = 348.698090,
width = 21.171955, height = 89.290421,
@@ -261,19 +216,6 @@
targetY=453
},
-
-Transition:new{
- x = 529.029240, y = 373.273160,
- width = 18.433075, height = 51.612610,
- target = 'castle'
-},
-
-
-GateTrigger:new{
- x = 338.751280, y = 372.631590,
- width = 34.059235, height = 60.754307,
-},
-
},
sheep = {
@@ -296,8 +238,8 @@
Displacer:new{
- x = 788.230350, y = 487.008270,
- width = 18.078678, height = 115.703530
+ x = 788.230350, y = 410.173890,
+ width = 18.078678, height = 192.537920
},
@@ -328,15 +270,6 @@
target='cave'
},
-
-Transition:new{
- x = 796.365720, y = 404.750270,
- width = 9.039339, height = 75.930443,
- target = 'bridge',
-targetX = 107,
-targetY = 400
-},
-
},
castle = {
@@ -354,11 +287,6 @@
targetY=388
},
-
-Cat:new{
- x = 590.784970, y = 442.320830,
-},
-
},
lake = {
@@ -455,14 +383,14 @@
Displacer:new{
- x = 494.535890, y = 253.272050,
- width = 130.711270, height = 45.472519
+ x = 528.618040, y = 253.272050,
+ width = 96.629105, height = 45.472519
},
Displacer:new{
- x = 359.108890, y = 228.641110,
- width = 134.457460, height = 68.205078
+ x = 459.461910, y = 228.641110,
+ width = 34.104382, height = 62.524715
},
@@ -511,36 +439,5 @@
targetY = 434
},
-
-Fairy:new{
- x = 395.731810, y = 304.621250,
- width = 40.709251, height = 58.697060,
-},
-
-},
-flag = {
-},
-cat48 = {
-},
-}
-
-fairytarget = Sprite:new{
- x = 42.702625, y = 537.588500,
- width = 14.234208, height = 15.329147,
- visible = false
-}
-
-gateup = Fill:new{
- x = 517.393430, y = 236.349990,
- width = 33.179535, height = 191.703980,
- fill = {108,57,22,255},
- gateup = true
-}
-
-gatedown = Fill:new{
- x = 354.836700, y = 427.650760,
- width = 164.054370, height = 19.354729,
- fill = {108,57,22,255},
- visible = false
-}
-
+},
+}
=== modified file 'svg_levels.py'
--- svg_levels.py 2013-04-29 00:57:59 +0000
+++ svg_levels.py 2013-04-28 22:13:30 +0000
@@ -11,8 +11,6 @@
ns = {'svg': 'http://www.w3.org/2000/svg',
'ink': 'http://www.inkscape.org/namespaces/inkscape'}
-other = ''
-
for svg in glob.glob('data/*.svg'):
t = etree.parse(svg)
basefile = os.path.basename(svg).split('.')[0]
@@ -30,18 +28,6 @@
},
""" % (x,y,w,h)
- sel = CSSSelector('svg|rect[ink|label="maybedisplace"]', ns)
- for e in sel(t):
- x, y = float(e.get('x')), float(e.get('y'))
- w, h = float(e.get('width')), float(e.get('height'))
-
- print """
-MaybeDisplacer:new{
- x = %f, y = %f,
- width = %f, height = %f
-},
-""" % (x,y,w,h)
-
sel = CSSSelector('svg|rect[ink|label="transition"]', ns)
for e in sel(t):
x, y = float(e.get('x')), float(e.get('y'))
@@ -70,16 +56,6 @@
},
""" % (x,y)
- sel = CSSSelector('svg|rect[ink|label="cat"]', ns)
- for e in sel(t):
- x, y = float(e.get('x')), float(e.get('y'))
-
- print """
-Cat:new{
- x = %f, y = %f,
-},
-""" % (x,y)
-
sel = CSSSelector('svg|rect[ink|label="fish"]', ns)
for e in sel(t):
x, y = float(e.get('x')), float(e.get('y'))
@@ -92,65 +68,6 @@
},
""" % (x,y,w,h)
- sel = CSSSelector('svg|rect[ink|label="flag"]', ns)
- for e in sel(t):
- x, y = float(e.get('x')), float(e.get('y'))
- w, h = float(e.get('width')), float(e.get('height'))
-
- print """
-Flag:new{
- x = %f, y = %f,
- width = %f, height = %f,
-},
-""" % (x,y,w,h)
-
- sel = CSSSelector('svg|rect[ink|label="fairy"]', ns)
- for e in sel(t):
- x, y = float(e.get('x')), float(e.get('y'))
- w, h = float(e.get('width')), float(e.get('height'))
-
- print """
-Fairy:new{
- x = %f, y = %f,
- width = %f, height = %f,
-},
-""" % (x,y,w,h)
-
- sel = CSSSelector('svg|rect[ink|label="gatetrigger"]', ns)
- for e in sel(t):
- x, y = float(e.get('x')), float(e.get('y'))
- w, h = float(e.get('width')), float(e.get('height'))
-
- print """
-GateTrigger:new{
- x = %f, y = %f,
- width = %f, height = %f,
-},
-""" % (x,y,w,h)
-
- sel = CSSSelector('svg|rect[ink|label="fairyactivator"]', ns)
- for e in sel(t):
- x, y = float(e.get('x')), float(e.get('y'))
- w, h = float(e.get('width')), float(e.get('height'))
-
- print """
-FairyActivator:new{
- x = %f, y = %f,
- width = %f, height = %f,
-},
-""" % (x,y,w,h)
-
- sel = CSSSelector('svg|rect[ink|label="boat"]', ns)
- for e in sel(t):
- x, y = float(e.get('x')), float(e.get('y'))
- #w, h = float(e.get('width')), float(e.get('height'))
-
- print """
-Boat:new{
- x = %f, y = %f,
-},
-""" % (x,y)
-
sel = CSSSelector('svg|rect[ink|label="troll"]', ns)
for e in sel(t):
x, y = float(e.get('x')), float(e.get('y'))
@@ -165,49 +82,4 @@
print '},'
- # gate...
- sel = CSSSelector('svg|rect[ink|label="gateup"]', ns)
- for e in sel(t):
- x, y = float(e.get('x')), float(e.get('y'))
- w, h = float(e.get('width')), float(e.get('height'))
-
- other = other + """
-gateup = Fill:new{
- x = %f, y = %f,
- width = %f, height = %f,
- fill = {108,57,22,255},
- gateup = true
-}
-""" % (x,y,w,h)
-
- sel = CSSSelector('svg|rect[ink|label="gatedown"]', ns)
- for e in sel(t):
- x, y = float(e.get('x')), float(e.get('y'))
- w, h = float(e.get('width')), float(e.get('height'))
-
- other = other + """
-gatedown = Fill:new{
- x = %f, y = %f,
- width = %f, height = %f,
- fill = {108,57,22,255},
- visible = false
-}
-""" % (x,y,w,h)
-
- sel = CSSSelector('svg|rect[ink|label="fairytarget"]', ns)
- for e in sel(t):
- x, y = float(e.get('x')), float(e.get('y'))
- w, h = float(e.get('width')), float(e.get('height'))
-
- other = other + """
-fairytarget = Sprite:new{
- x = %f, y = %f,
- width = %f, height = %f,
- visible = false
-}
-""" % (x,y,w,h)
-
-
print '}'
-
-print other
=== modified file 'troll.lua'
--- troll.lua 2013-04-29 01:00:59 +0000
+++ troll.lua 2013-04-28 22:13:30 +0000
@@ -2,7 +2,7 @@
image = 'data/troll.png',
onCollide = function(self, other, xOl, yOl)
if the.inventory.items['fish'] then
- self.y = self.y - self.height
+ self:die()
the.inventory:remove('fish')
else
self:displace(other)