=== modified file 'data/shore.svg'
--- data/shore.svg 2013-04-29 00:35:28 +0000
+++ data/shore.svg 2013-04-29 00:42:39 +0000
@@ -27,9 +27,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="3.6531713"
- inkscape:cx="120.42261"
- inkscape:cy="456.46852"
+ inkscape:zoom="0.91329283"
+ inkscape:cx="390.23912"
+ inkscape:cy="247.97709"
inkscape:document-units="px"
inkscape:current-layer="layer6"
showgrid="false"
@@ -234,5 +234,53 @@
x="-14.781677"
y="122.05061"
inkscape:label="maybedisplace" />
+
+
+
+
+
+
=== modified file 'fairyactivator.lua'
--- fairyactivator.lua 2013-04-29 00:35:28 +0000
+++ fairyactivator.lua 2013-04-29 00:42:39 +0000
@@ -12,8 +12,16 @@
the.player.canMove = false
v.tween:start(f, 'x', fairytarget.x, 5)
- v.tween:start(f, 'y', fairytarget.y, 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
=== modified file 'svg_levels.lua'
--- svg_levels.lua 2013-04-29 00:35:28 +0000
+++ svg_levels.lua 2013-04-29 00:42:39 +0000
@@ -134,6 +134,36 @@
},
+MaybeDisplacer:new{
+ x = -21.898781, y = 483.936460,
+ width = 329.576660, height = 15.329147
+},
+
+
+MaybeDisplacer:new{
+ x = -20.803843, y = 502.550420,
+ width = 8.759513, height = 111.683780
+},
+
+
+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,