added firefly -moving platform ripoff, and skull -unstable-tile ripoff

SVN-Revision: 2949

diff --git a/data/images/creatures/yeti/iceyeti.xcf b/data/images/creatures/yeti/iceyeti.xcf
index ce6b3c8..c7e80fd 100644 (file)
Binary files a/data/images/creatures/yeti/iceyeti.xcf and b/data/images/creatures/yeti/iceyeti.xcf differ

diff --git a/data/images/objects/skulls/skull.png b/data/images/objects/skulls/skull.png
new file mode 100644 (file)
index 0000000..c00a997
Binary files /dev/null and b/data/images/objects/skulls/skull.png differ

diff --git a/data/images/sprites.strf b/data/images/sprites.strf
index 7ab4709..9122dfc 100644 (file)
--- a/data/images/sprites.strf
+++ b/data/images/sprites.strf
@@ -1498,6 +1498,15 @@
          (y-offset 0)
          (images "tiles/blocks/block4.png")
        )
+       (action
+         (name "firefly")
+         (x-offset 0)
+         (y-offset 0)
+         (images "tiles/firefly/firefly1.png"
+                "tiles/firefly/firefly2.png"
+                 "tiles/firefly/firefly3.png"
+                 "tiles/firefly/firefly2.png")
+       )
   )
   ; Door
   (sprite (name "door")
@@ -1635,7 +1644,10 @@
     (action
       (images "objects/unstable_tile/unstable_tile.png"))
   )
-  
+   (sprite (name "skull_tile")
+    (action
+      (images "objects/skulls/skull.png"))
+  ) 
   (sprite (name "rainsplash")
     (action
       (fps 20)

diff --git a/data/images/tiles/castle/castle_wall.xcf b/data/images/tiles/castle/castle_wall.xcf
new file mode 100644 (file)
index 0000000..b91cd18
Binary files /dev/null and b/data/images/tiles/castle/castle_wall.xcf differ

diff --git a/data/images/tiles/firefly/firefly.xcf b/data/images/tiles/firefly/firefly.xcf
new file mode 100644 (file)
index 0000000..9b1ab4f
Binary files /dev/null and b/data/images/tiles/firefly/firefly.xcf differ

diff --git a/data/images/tiles/firefly/firefly1.png b/data/images/tiles/firefly/firefly1.png
new file mode 100644 (file)
index 0000000..39b9495
Binary files /dev/null and b/data/images/tiles/firefly/firefly1.png differ

diff --git a/data/images/tiles/firefly/firefly2.png b/data/images/tiles/firefly/firefly2.png
new file mode 100644 (file)
index 0000000..778e8fc
Binary files /dev/null and b/data/images/tiles/firefly/firefly2.png differ

diff --git a/data/images/tiles/firefly/firefly3.png b/data/images/tiles/firefly/firefly3.png
new file mode 100644 (file)
index 0000000..7e0be56
Binary files /dev/null and b/data/images/tiles/firefly/firefly3.png differ

diff --git a/data/levels/world2/castledoor.stl b/data/levels/world2/castledoor.stl
index 8fae71a..f803111 100644 (file)
--- a/data/levels/world2/castledoor.stl
+++ b/data/levels/world2/castledoor.stl
@@ -71,28 +71,28 @@
       (width  100)
       (height 50)
       (tiles
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1406 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1394 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 1389 1403 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 1419 0 0 0 0 0 0 0 0 0 0 0 1511 1512 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 1420 0 0 0 0 0 0 0 0 0 0 0 1513 1514 0 0 1374 1377 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1374 1377 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1515 1516 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1408 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1388 0 0 0 0 0 0 0 0 1408 1412 1412 1412 1412 1412 1388 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1378 1392 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1408 1412 1412 1412 1412 1412 1412 1412 1412 1412 1388 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        1408 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1413 1407 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1367 1384 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1412 1412 1412 1412 1412 1412 1412 1388 0 0 0 0 0 0 0 0 0 0 0 0 0 1408 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1415 1379 1371 1383 1379 1384 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1519 0 0 0 1519 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1393 1394 1406 1394 1405 1373 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1397 1410 1393 1409 1410 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 1517 1511 1512 0 0 0 0 1511 1512 1517 0 0 1517 1511 1512 0 0 0 0 1511 1512 1517 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1406 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1409 1394 1373 0 0 1357 1357 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 1357 1357 1389 1403 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 1357 1357 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 1357 1357 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 1419 0 0 0 0 0 0 0 0 0 0 0 1511 1512 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 1357 1357 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 1420 0 0 0 0 0 0 0 0 0 0 0 1513 1514 0 0 1374 1377 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1374 1377 0 0 1357 1357 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1515 1516 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1357 1357 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1408 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1388 0 0 0 0 0 0 0 0 1408 1412 1412 1412 1412 1412 1388 0 0 1357 1357 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1378 1392 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1357 1357 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1408 1412 1412 1412 1412 1412 1412 1412 1412 1412 1388 0 0 0 0 0 0 0 1357 1357 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        1408 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1413 1407 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1357 1357 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1357 1357 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1367 1384 0 0 0 0 1357 1357 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1412 1412 1412 1412 1412 1412 1412 1388 0 0 0 0 0 0 0 0 0 0 0 0 0 1408 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1415 1379 1371 1383 1379 1384 0 0 0 1357 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1519 0 0 0 1519 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1393 1394 1406 1394 1405 1373 0 0 0 1357 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1397 1410 1393 1409 1410 0 0 0 1357 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 1517 1511 1512 0 0 0 0 1511 1512 1517 0 0 1517 1511 1512 0 0 0 0 1511 1512 1517 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1357 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 1518 1513 1514 0 0 0 0 1513 1514 1518 0 0 1518 1513 1514 0 0 0 0 1513 1514 1518 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 1515 1516 0 0 0 0 1515 1516 0 0 0 0 1515 1516 0 0 0 0 1515 1516 0 0 0 0 0 0 0 1519 0 0 0 1519 0 0 0 1519 0 0 0 0 0 0 0 0 0 1408 1412 1412 1388 0 0 0 0 0 0 0 1389 1403 1510 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 1510 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        0 0 0 0 0 0 0 0 0 0 0 0 1370 1392 0 0 0 0 0 0 0 0 0 0 1370 1401 1401 1384 0 0 0 0 0 0 0 0 0 0 0 1400 1390 1403 0 0 0 0 0 0 131 131 0 0 0 0 0 1370 1401 1401 1371 1373 1510 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
-        1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1413 1414 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1413 1409 1409 1414 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1413 1409 1414 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1413 1409 1409 1409 1399 1510 1374 1377 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 1515 1516 0 0 0 0 1515 1516 0 0 0 0 1515 1516 0 0 0 0 1515 1516 0 0 0 0 0 0 0 1519 0 0 0 1519 0 0 0 1519 0 0 0 0 0 0 0 0 0 1408 1412 1412 1388 0 0 0 0 0 0 0 1389 1403 131 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1404 1373 131 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        0 0 0 0 0 0 0 0 0 0 0 0 1370 1392 0 0 0 0 0 0 0 0 0 0 1370 1401 1401 1384 0 0 0 0 0 0 0 0 0 0 0 1400 1390 1403 0 0 0 0 0 0 131 131 0 0 0 0 0 1370 1401 1401 1371 1373 131 1404 1373 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
+        1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1413 1414 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1413 1409 1409 1414 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1413 1409 1414 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1412 1413 1409 1409 1409 1399 131 1374 1377 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
         0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 
@@ -189,6 +189,16 @@
          (spawnpoint "main")
        )
        (spawnpoint (name "main") (x 64) (y 0))
+       (skull_tile (x 1888) (y 416))
+       (skull_tile (x 1920) (y 544))
+(path (name "path1") (circular #t) (speed 100) (x 20) (y 5) (x 30) (y -200) (x 1300) (y -100) (x 500) (y 100))
+   (path (name "path2") (circular #t) (speed 20) (x 400) (y 0) (x 1600) (y 400) (x 100) (y 100) (x 100) (y 0))
+   (platform (use_path "path1") (x 200) (y 850) (type "firefly"))
+   (platform (use_path "path1") (x 264) (y 850) (type "firefly")) 
+   (platform (use_path "path2") (x 296) (y 550) (type "firefly"))
+   (platform (use_path "path1") (x 360) (y 850) (type "firefly"))
+   (platform (use_path "path2") (x 424) (y 450) (type "firefly"))
+   (platform (use_path "path1") (x 488) (y 850) (type "firefly"))
    )
   (sector
     (name  "test")
@@ -287,7 +297,7 @@
        )
        (spawnpoint (name "main") (x 96) (y 0))
       (infoblock (x 96) (y 320)
-        (message (_"!images/objects/voicemail/voicemail.png
+        (message (_ "!images/objects/voicemail/voicemail.png
 #Hey Tux,
 #Some friends have 
 #left you voicemail 

diff --git a/src/object/skull_tile.cpp b/src/object/skull_tile.cpp
new file mode 100644 (file)
index 0000000..4afb207
--- /dev/null
+++ b/src/object/skull_tile.cpp
@@ -0,0 +1,99 @@
+//  $Id: unstable_tile.cpp 2642 2005-06-26 13:38:53Z matzebraun $
+// 
+//  SuperTux
+//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+//  02111-1307, USA.
+
+#include <config.h>
+
+#include "skull_tile.hpp"
+#include "lisp/lisp.hpp"
+#include "object_factory.hpp"
+#include "player.hpp"
+#include "sector.hpp"
+#include "resources.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "sprite/sprite.hpp"
+
+static const float CRACKTIME = 0.3;
+static const float FALLTIME = 0.8;
+
+SkullTile::SkullTile(const lisp::Lisp& lisp)
+  : hit(false), falling(false)
+{
+  lisp.get("x", bbox.p1.x);
+  lisp.get("y", bbox.p1.y);
+  bbox.set_size(32, 32);
+  sprite = sprite_manager->create("skull_tile");
+  flags |= FLAG_SOLID;
+}
+
+SkullTile::~SkullTile()
+{
+  delete sprite;
+}
+
+HitResponse
+SkullTile::collision(GameObject& other, const CollisionHit& hitdata)
+{
+  if(hitdata.normal.y < 0.8)
+    return FORCE_MOVE;
+
+  Player* player = dynamic_cast<Player*> (&other);
+  if(player)
+    hit = true;
+
+  return FORCE_MOVE;
+}
+
+void
+SkullTile::draw(DrawingContext& context)
+{
+  Vector pos = get_pos();
+  // shacking
+  if(timer.get_timegone() > CRACKTIME) {
+    pos.x += (rand() % 6) - 3;
+  } 
+
+  sprite->draw(context, pos, LAYER_TILES);
+}
+
+void
+SkullTile::update(float elapsed_time)
+{
+  if(falling) {
+    movement = physic.get_movement(elapsed_time);
+    if(!Sector::current()->inside(bbox)) {
+      remove_me();
+      return;
+    }
+  } else if(hit) {
+    if(timer.check()) {
+      falling = true;
+      physic.enable_gravity(true);      
+      flags &= ~FLAG_SOLID;
+      timer.stop();
+    } else if(!timer.started()) {
+      timer.start(FALLTIME);
+    }
+  } else {
+    timer.stop();
+  }
+  hit = false;
+}
+
+IMPLEMENT_FACTORY(SkullTile, "skull_tile");

diff --git a/src/object/skull_tile.hpp b/src/object/skull_tile.hpp
new file mode 100644 (file)
index 0000000..fc7af6d
--- /dev/null
+++ b/src/object/skull_tile.hpp
@@ -0,0 +1,51 @@
+//  $Id: unstable_tile.hpp 2642 2005-06-26 13:38:53Z matzebraun $
+// 
+//  SuperTux
+//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+//  02111-1307, USA.
+#ifndef __SKULL_TILE_H__
+#define __SKULL_TILE_H__
+
+#include "moving_object.hpp"
+#include "lisp/lisp.hpp"
+#include "physic.hpp"
+#include "timer.hpp"
+
+class Sprite;
+class Player;
+
+/** A tile that starts falling down if tux stands to long on it */
+class SkullTile : public MovingObject
+{
+public:
+  SkullTile(const lisp::Lisp& lisp);
+  ~SkullTile();
+
+  HitResponse collision(GameObject& other, const CollisionHit& hit);
+  void update(float elapsed_time);
+  void draw(DrawingContext& context);
+
+private:
+  Physic physic;
+  Sprite* sprite;
+  Timer timer;
+  bool hit;
+  bool falling;
+};
+
+#endif
+