X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=data%2Fimages%2Fsupertux.strf;h=9e6a1eb89d22b765773a213eb298452106eab1d2;hb=b64efcbbd6824c3d8519cba89296ab8541c7fbe9;hp=e8762c6a2e957556f43b2b23e6f5ba6fddb64b6e;hpb=6b8d50423f008c5ec27c3a0d0c649647a046d757;p=supertux.git

diff --git a/data/images/supertux.strf b/data/images/supertux.strf
index e8762c6a2..9e6a1eb89 100644
--- a/data/images/supertux.strf
+++ b/data/images/supertux.strf
@@ -84,12 +84,14 @@
          (name "grab-right")
          (x-offset 5)
          (y-offset 14)
+         (z-order 2)
          (images "shared/smalltux/arms-grab-0.png"))
 
        (action
          (name "grab-left")
          (x-offset 5)
          (y-offset 14)
+         (z-order 2)
          (mirror-action "grab-right")))
 
 ;; Small Tux Body
@@ -190,8 +192,8 @@
        (action
          (name "walk-left")
          (fps 15.0)
-         (x-offset 5)
-         (y-offset 14)
+         (x-offset 27)
+         (y-offset 32)
          (mirror-action "walk-right"))
 
        (action
@@ -204,7 +206,7 @@
        (action
          (name "stand-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "stand-right"))
 
@@ -218,7 +220,7 @@
        (action
          (name "jump-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 30)
          (mirror-action "jump-right"))
 
@@ -230,7 +232,7 @@
 
        (action
          (name "duck-left")
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 62)
          (mirror-action "duck-right"))
 
@@ -243,7 +245,7 @@
        (action
          (name "skid-left")
          (fps 15.0)
-         (x-offset 6)
+         (x-offset 27)
          (y-offset 31)
          (mirror-action "skid-right"))
 
@@ -255,7 +257,7 @@
 
        (action
          (name "kick-left")
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "kick-right"))
 
@@ -267,7 +269,7 @@
 
        (action
          (name "buttjump-left")
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "buttjump-right"))
 
@@ -276,12 +278,14 @@
          (name "grab-right")
          (x-offset 5)
          (y-offset 32)
+         (z-order 2)
          (images "shared/bigtux/arms-grab-0.png"))
 
        (action
          (name "grab-left")
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
+         (z-order 2)
          (mirror-action "grab-right"))
 
        (action
@@ -293,7 +297,7 @@
 
        (action
          (name "duck+grab-left")
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 62)
          (z-order 2)
          (mirror-action "duck+grab-right")))
@@ -311,7 +315,7 @@
        (action
          (name "walk-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "walk-right"))
 
@@ -325,7 +329,7 @@
        (action
          (name "stand-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "stand-right"))
 
@@ -339,7 +343,7 @@
        (action
          (name "jump-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 30)
          (mirror-action "jump-right"))
 
@@ -353,7 +357,7 @@
        (action
          (name "duck-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 62)
          (mirror-action "duck-right"))
 
@@ -366,7 +370,7 @@
        (action
          (name "skid-left")
          (fps 15.0)
-         (x-offset 6)
+         (x-offset 27)
          (y-offset 31)
          (mirror-action "skid-right"))
 
@@ -379,7 +383,7 @@
        (action
          (name "kick-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "kick-right"))
 
@@ -391,7 +395,7 @@
 
        (action
          (name "buttjump-left")
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "buttjump-right"))
 
@@ -407,7 +411,7 @@
        (action
          (name "idle-left")
          (fps 1.0)
-         (x-offset 6)
+         (x-offset 27)
          (y-offset 31)
          (mirror-action "idle-right")))
 
@@ -424,7 +428,7 @@
        (action
          (name "walk-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "walk-right"))
 
@@ -438,7 +442,7 @@
        (action
          (name "stand-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "stand-right"))
 
@@ -452,7 +456,7 @@
        (action
          (name "jump-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 30)
          (mirror-action "jump-right"))
 
@@ -466,7 +470,7 @@
        (action
          (name "duck-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 62)
          (mirror-action "duck-right"))
 
@@ -479,7 +483,7 @@
        (action
          (name "skid-left")
          (fps 15.0)
-         (x-offset 6)
+         (x-offset 27)
          (y-offset 31)
          (mirror-action "skid-right"))
 
@@ -492,7 +496,7 @@
        (action
          (name "kick-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "kick-right"))
 
@@ -505,7 +509,7 @@
        (action
          (name "buttjump-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "buttjump-right")))
 
@@ -527,7 +531,7 @@
        (action
          (name "walk-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "walk-right"))
 
@@ -541,7 +545,7 @@
        (action
          (name "stand-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "stand-right"))
 
@@ -555,7 +559,7 @@
        (action
          (name "jump-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 30)
          (mirror-action "jump-right"))
 
@@ -569,7 +573,7 @@
        (action
          (name "duck-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 62)
          (mirror-action "duck-right"))
 
@@ -581,7 +585,7 @@
 
        (action
          (name "skid-left")
-         (x-offset 6)
+         (x-offset 27)
          (y-offset 31)
          (mirror-action "skid-right"))
 
@@ -593,7 +597,7 @@
 
        (action
          (name "kick-left")
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "kick-right"))
 
@@ -605,7 +609,7 @@
 
        (action
          (name "buttjump-left")
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "buttjump-right")))
 
@@ -625,7 +629,7 @@
        (action
          (name "walk-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "walk-right"))
 
@@ -639,7 +643,7 @@
        (action
          (name "stand-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "stand-right"))
 
@@ -653,7 +657,7 @@
        (action
          (name "jump-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 30)
          (mirror-action "jump-right"))
 
@@ -662,12 +666,12 @@
          (fps 15.0)
          (x-offset 5)
          (y-offset 62)
-         (images "shared/bigtux/head-fire-stand-0.png"))
+         (images "shared/bigtux/head-fire-duck-0.png"))
 
        (action
          (name "duck-left")
          (fps 15.0)
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 62)
          (mirror-action "duck-right"))
 
@@ -675,11 +679,11 @@
          (name "skid-right")
          (x-offset 6)
          (y-offset 31)
-         (images "shared/bigtux/head-skid-0.png"))
+         (images "shared/bigtux/head-fire-skid-0.png"))
 
        (action
          (name "skid-left")
-         (x-offset 6)
+         (x-offset 27)
          (y-offset 31)
          (mirror-action "skid-right"))
 
@@ -691,7 +695,7 @@
 
        (action
          (name "kick-left")
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "kick-right"))
 
@@ -703,7 +707,7 @@
 
        (action
          (name "buttjump-left")
-         (x-offset 5)
+         (x-offset 27)
          (y-offset 32)
          (mirror-action "buttjump-right"))
 
@@ -718,7 +722,7 @@
        (action
          (name "idle-left")
          (fps 1.0)
-         (x-offset 6)
+         (x-offset 27)
          (y-offset 31)
          (mirror-action "idle-right")))
 
@@ -777,138 +781,176 @@
 ;                  "shared/tux-grow-right-7.png")))
 
 
- ;; Laptop
- (sprite (name "mriceblock-left")
-       (action
+;; Bad Guys follow
+ (sprite (name "spike")
+    (action
+      (name "north")
+      (images "tilesets/spike_up.png")
+    )
+    (action
+      (name "south")
+      (images "tilesets/spike_down.png")
+    )
+    (action
+      (name "west")
+      (images "tilesets/spike_left.png")
+    )
+    (action
+      (name "east")
+      (images "tilesets/spike_right.png")
+    )
+ )
+
+ ;; MrIceBlock
+ (sprite (name "mriceblock")
+    (action
+         (name "left")
          (x-offset 2)
          (y-offset 3)
          (images "shared/mriceblock-left-0.png"
                  "shared/mriceblock-left-1.png"
                  "shared/mriceblock-left-2.png"
-                 "shared/mriceblock-left-1.png")))
+                 "shared/mriceblock-left-1.png"))
 
- (sprite (name "mriceblock-right")
-       (action
+    (action (name "right")
          (x-offset 2)
          (y-offset 3)
-         (images "shared/mriceblock-right-0.png"
-                 "shared/mriceblock-right-1.png"
-                 "shared/mriceblock-right-2.png"
-                 "shared/mriceblock-right-1.png")))
+         (mirror-action "left"))
 
- (sprite (name "mriceblock-falling-right")
-       (action
+    (action (name "falling-left")
          (x-offset 2)
          (y-offset 3)
-         (images "shared/mriceblock-flat-right.png")))
+         (images "shared/mriceblock-flat-left.png"))
 
- (sprite (name "mriceblock-falling-left")
-       (action
+    (action (name "falling-right")
          (x-offset 2)
          (y-offset 3)
-         (images "shared/mriceblock-flat-left.png")))
+         (mirror-action "falling-left"))
  
- (sprite (name "mriceblock-flat-left")
-       (action
+    (action (name "flat-left")
          (x-offset 2)
          (y-offset 3)
-         (images "shared/mriceblock-flat-left.png")))
+         (images "shared/mriceblock-flat-left.png"))
 
- (sprite (name "mriceblock-flat-right")
-       (action
+    (action (name "flat-right")
          (x-offset 2)
          (y-offset 3)
-         (images "shared/mriceblock-flat-right.png")))
-
-; (sprite (name "mriceblock-falling-left")
-;         (images "shared/mriceblock-falling-left.png")))
+         (mirror-action "falling-left")))
 
-; (sprite (name "mriceblock-falling-right")
-;         (images "shared/mriceblock-falling-right.png")))
+ (sprite (name "snowball")
+       (action
+         (name "left")
+         (x-offset 2)
+         (y-offset 4)
+         (images "shared/snowball-left-0.png"
+                 "shared/snowball-left-1.png"
+                 "shared/snowball-left-2.png"
+                 "shared/snowball-left-1.png"))
 
- (sprite (name "snowball-squished-left")
        (action
+         (name "right")
+         (x-offset 2)
+         (y-offset 4)
+         (mirror-action "left"))
+       (action
+         (name "squished-left")
          (x-offset 1)
          (y-offset -19)
-         (images "shared/snowball-squished-left.png")))
+         (images "shared/snowball-squished-left.png"))
 
- (sprite (name "snowball-squished-right")
        (action
+         (name "squished-right")
          (x-offset 1)
          (y-offset -19)
-         (images "shared/snowball-squished-right.png")))
+         (mirror-action "squished-left")))
 
- (sprite (name "jumpy-left-up")
+     (sprite (name "jumpy")
        (action
+         (name "left-up")
          (x-offset 7)
          (y-offset 8)
-         (images "shared/jumpy-left-up-0.png")))
- (sprite (name "jumpy-left-down")
+         (images "shared/jumpy-left-up-0.png"))
        (action
+         (name "right-up")
          (x-offset 7)
          (y-offset 8)
-         (images "shared/jumpy-left-down-0.png")))
- (sprite (name "jumpy-left-middle")
+         (mirror-action "left-up"))
        (action
+         (name "left-down")
          (x-offset 7)
          (y-offset 8)
-         (images "shared/jumpy-left-middle-0.png")))
- (sprite (name "jumpy-left-iced")
+         (images "shared/jumpy-left-down-0.png"))
        (action
+         (name "right-down")
          (x-offset 7)
          (y-offset 8)
-         (images "shared/jumpy-iced-left-up-0.png")))
+         (mirror-action "left-down"))
+       (action
+         (name "left-middle")
+         (x-offset 7)
+         (y-offset 8)
+         (images "shared/jumpy-left-middle-0.png"))
+       (action
+         (name "right-middle")
+         (x-offset 7)
+         (y-offset 8)
+         (mirror-action "left-middle"))
+       (action
+         (name "left-iced")
+         (x-offset 7)
+         (y-offset 8)
+         (images "shared/jumpy-iced-left-up-0.png"))
+       (action
+         (name "right-iced")
+         (x-offset 7)
+         (y-offset 8)
+         (mirror-action "left-iced")))
 
- (sprite (name "mrbomb-left")
+     (sprite (name "mrbomb")
        (action
+         (name "left")
          (fps 10.0)
          (x-offset 3)
          (y-offset 12)
          (images "shared/mrbomb-left-0.png"
                  "shared/mrbomb-left-1.png"
                  "shared/mrbomb-left-2.png"
-                 "shared/mrbomb-left-3.png")))
+                 "shared/mrbomb-left-3.png"))
 
- (sprite (name "mrbomb-right")
        (action
+         (name "right")
          (fps 10.0)
          (x-offset 7)
          (y-offset 12)
-         (images "shared/mrbomb-right-0.png"
-                 "shared/mrbomb-right-1.png"
-                 "shared/mrbomb-right-2.png"
-                 "shared/mrbomb-right-3.png")))
- (sprite (name "mrbomb-iced-left")
+         (mirror-action "left"))
        (action
+         (name "iced-left")
          (x-offset 3)
          (y-offset 12)
-         (images "shared/mrbomb-iced-left-0.png")))
+         (images "shared/mrbomb-iced-left-0.png"))
 
- (sprite (name "mrbomb-iced-right")
        (action
+         (name "iced-right")
          (x-offset 7)
          (y-offset 12)
-         (images "shared/mrbomb-iced-right-0.png")))
- 
+         (mirror-action "iced-left")))
 
- (sprite (name "mrbomb-ticking-left")
+     (sprite (name "bomb")
        (action
+         (name "ticking-left")
          (fps 15.0)
          (x-offset 3)
          (y-offset 8)
          (images "shared/mrbombx-left-0.png"
-                 "shared/mrbombx-left-1.png")))
-
- (sprite (name "mrbomb-ticking-right")
+                 "shared/mrbombx-left-1.png"))
        (action
+         (name "ticking-right")
          (fps 15.0)
-         (x-offset 255)
+         (x-offset 10)
          (y-offset 8)
-         (images "shared/mrbombx-right-0.png"
-                 "shared/mrbombx-right-1.png")))
-
- (sprite (name "mrbomb-explosion")
+         (mirror-action "ticking-left"))
        (action
+         (name "explosion")
          (fps 15.0)
          (x-offset 32)
          (y-offset 32)
@@ -917,61 +959,65 @@
 
  (sprite (name "stalactite")
        (action
+         (name "normal")
          (x-offset 0)
          (y-offset 0)
-         (images "shared/stalactite.png")))
-
- (sprite (name "stalactite-broken")
+         (images "shared/stalactite.png"))
        (action
+         (name "broken")
          (x-offset 0)
          (y-offset 16)
          (images "shared/stalactite-broken.png")))
 
  (sprite (name "flame")
        (action
+         (name "normal")
          (images "shared/flame-0.png"
                  "shared/flame-1.png")))
 
  (sprite (name "fish")
        (action
+         (name "normal")
          (x-offset 2)
          (y-offset 3)
          (images "shared/fish-left-0.png"
-                 "shared/fish-left-1.png")))
+                 "shared/fish-left-1.png"))
 
- (sprite (name "fish-down")
        (action
+         (name "down")
          (x-offset 2)
          (y-offset 11)
-         (images "shared/fish-down-0.png")))
+         (images "shared/fish-down-0.png"))
 
- (sprite (name "fish-iced")
        (action
+         (name "iced")
          (x-offset 2)
          (y-offset 3)
-         (images "shared/fish-iced-left-0.png")))
+         (images "shared/fish-iced-left-0.png"))
 
- (sprite (name "fish-iced-down")
        (action
+         (name "iced-down")
          (x-offset 2)
          (y-offset 11)
          (images "shared/fish-iced-down-0.png")))
 
  (sprite (name "flamefish")
        (action
+         (name "normal")
          (x-offset 2)
          (y-offset 3)
          (images "shared/flamefish-left-0.png"
-                 "shared/flamefish-left-1.png")))
+                 "shared/flamefish-left-1.png"))
 
- (sprite (name "flamefish-down")
        (action
+         (name "down")
          (x-offset 2)
          (y-offset 11)
          (images "shared/flamefish-down-0.png")))
 
- (sprite (name "bouncingsnowball-left")
+ (sprite (name "bouncingsnowball")
        (action
+         (name "left")
          (x-offset 1)
          (y-offset 0)
          (images "shared/bouncingsnowball-left-0.png"
@@ -979,81 +1025,145 @@
                  "shared/bouncingsnowball-left-2.png"
                  "shared/bouncingsnowball-left-3.png"
                  "shared/bouncingsnowball-left-4.png"
-                 "shared/bouncingsnowball-left-5.png")))
+                 "shared/bouncingsnowball-left-5.png"))
 
- (sprite (name "bouncingsnowball-right")
        (action
+         (name "right")
          (x-offset 1)
          (y-offset 0)
-         (images "shared/bouncingsnowball-right-0.png"
-                 "shared/bouncingsnowball-right-1.png"
-                 "shared/bouncingsnowball-right-2.png"
-                 "shared/bouncingsnowball-right-3.png"
-                 "shared/bouncingsnowball-right-4.png"
-                 "shared/bouncingsnowball-right-5.png")))
+         (mirror-action "left"))
 
- (sprite (name "bouncingsnowball-squished")
        (action
+         (name "squished")
          (x-offset 1)
          (y-offset -19)
          (images "shared/snowball-squished-left.png")))
 
  (sprite (name "flyingsnowball")
        (action
+         (name "left")
          (x-offset 4)
          (y-offset 3)
          (images "shared/flyingsnowball-left-0.png"
-                 "shared/flyingsnowball-left-1.png")))
+                 "shared/flyingsnowball-left-1.png"))
+       (action
+         (name "right")
+         (x-offset 4)
+         (y-offset 3)
+         (mirror-action "left"))
 
- (sprite (name "flyingsnowball-squished")
        (action
+         (name "squished-left")
          (x-offset 4)
          (y-offset -12)
-         (images "shared/flyingsnowball-squished-left.png")))
+         (images "shared/flyingsnowball-squished-left.png"))
+       (action
+         (name "squished-right")
+         (x-offset 4)
+         (y-offset -12)
+         (mirror-action "squished-left")))
 
- (sprite (name "spiky-left")
+ (sprite (name "spiky")
        (action
+         (name "left")
          (x-offset 6)
-         (y-offset 255)
+         (y-offset 10)
          (images "shared/spiky-left-0.png"
                  "shared/spiky-left-1.png"
-                 "shared/spiky-left-2.png")))
- (sprite (name "spiky-right")
+                 "shared/spiky-left-2.png"))
        (action
+         (name "right")
          (x-offset 6)
-         (y-offset 255)
-         (images "shared/spiky-right-0.png"
-                 "shared/spiky-right-1.png"
-                 "shared/spiky-right-2.png")))
- (sprite (name "spiky-iced-left")
+         (y-offset 10)
+         (mirror-action "left"))
        (action
+         (name "iced-left")
          (x-offset 6)
-         (y-offset 255)
-         (images "shared/spiky-iced-left-0.png")))
- (sprite (name "spiky-iced-right")
+         (y-offset 10)
+         (images "shared/spiky-iced-left-0.png"))
        (action
+         (name "iced-right")
          (x-offset 6)
-         (y-offset 255)
-         (images "shared/spiky-iced-right-0.png")))
+         (y-offset 10)
+         (mirror-action "iced-left")))
 
- (sprite (name "snowball-left")
+  ; Wingling
+  (sprite (name "wingling")
        (action
-         (x-offset 2)
-         (y-offset 4)
-         (images "shared/snowball-left-0.png"
-                 "shared/snowball-left-1.png"
-                 "shared/snowball-left-2.png"
-                 "shared/snowball-left-1.png")))
+         (name "left")
+          (x-offset 0)
+          (y-offset 0)
+          (images "shared/wingling-1.png")))
 
- (sprite (name "snowball-right")
+  ; Walkingtree
+  (sprite (name "walkingtree")
        (action
-         (x-offset 2)
-         (y-offset 4)
-         (images "shared/snowball-right-0.png"
-                 "shared/snowball-right-1.png"
-                 "shared/snowball-right-2.png"
-                 "shared/snowball-right-1.png")))
+         (name "left")
+          (x-offset 0)
+          (y-offset 0)
+          (images "shared/walkingtree-left-1.png"))
+       (action
+          (name "left-small")
+          (x-offset 0)
+          (y-offset 0)
+          (images "shared/walkingtree-left-small-1.png")))
+         
+  ; Dispenser
+  (sprite (name "dispenser")
+       (action
+         (name "working")
+          (x-offset 0)
+          (y-offset 0)
+          (images "shared/dispenser-working.png"))
+       (action
+          (name "broken")
+          (x-offset 0)
+          (y-offset 0)
+          (images "shared/dispenser-broken.png")))          
+   
+   ; Dummyguy
+   (sprite (name "dummyguy")
+       (action
+         (name "left")
+         (x-offset 0)
+         (y-offset 0)
+         (images "shared/dummyguy-walk-1.png"
+                 "shared/dummyguy-walk-2.png"))
 
+       (action
+         (name "right")
+         (x-offset 0)
+         (y-offset 0)
+         (mirror-action "left"))
+         
+       (action
+         (name "stand")
+         (x-offset 0)
+         (y-offset 0)
+         (images "shared/dummyguy-stand.png"))
+         
+       (action
+         (name "throw")
+         (x-offset 0)
+         (y-offset 0)
+         (images "shared/dummyguy-throw.png"))
+
+       (action
+         (name "jump")
+         (x-offset 0)
+         (y-offset 0)
+         (images "shared/dummyguy-jump.png"))
+         
+       (action
+         (name "dead")
+         (x-offset 0)
+         (y-offset 0)
+         (images "shared/dummyguy-dead.png")))
+
+
+         
+;; Game elements follow
+          
  (sprite (name "egg")
        (action
          (images "shared/egg.png")))
@@ -1088,7 +1198,7 @@
        (action
          (x-offset 12)
          (x-offset 12)
-         (fps 255)
+         (fps 20)
          (images "shared/firebullet-1.png"
                  "shared/firebullet-2.png"
                  "shared/firebullet-3.png"
@@ -1097,8 +1207,11 @@
        (action
          (x-offset 12)
          (x-offset 12)
-         (fps 255)
+         (fps 20)
          (images "shared/icebullet-1.png")))
+
+;; Game Objects follow
+
   ; Trampoline
   (sprite (name "trampoline")
        (action
@@ -1118,55 +1231,101 @@
                  "shared/flying_platform-2.png"
                  "shared/flying_platform-3.png"
                  "shared/flying_platform-4.png")))
-
-  ; Wingling
-  (sprite (name "wingling-left")
-       (action
-          (x-offset 0)
-          (y-offset 0)
-          (images "shared/wingling-1.png")))
-
-  ; Walkingtree
-  (sprite (name "walkingtree-left")
-       (action
-          (x-offset 0)
-          (y-offset 0)
-          (images "shared/walkingtree-left-1.png")))
-  (sprite (name "walkingtree-left-small")
-       (action
-          (x-offset 0)
-          (y-offset 0)
-          (images "shared/walkingtree-left-small-1.png")))
-
   ; Door
   (sprite (name "door")
        (action
+          (name "default")
           (x-offset 0)
           (y-offset 64)
-          (images "shared/door-1.png")
-  ))
-;   (sprite (name "openingdoor")
-;        (action
-;           (x-offset 0)
-;           (y-offset 64)
-;           (images "shared/door-1.png"
-; 	   "shared/door-2.png"
-; 	   "shared/door-3.png"
-; 	   "shared/door-4.png"
-; 	   "shared/door-5.png"
-; 	   "shared/door-6.png"
-; 	   "shared/door-7.png"
-; 	   "shared/door-8.png"
-; 	   "shared/door-8.png"
-; 	   "shared/door-7.png"
-; 	   "shared/door-6.png"
-; 	   "shared/door-5.png"
-; 	   "shared/door-4.png"
-; 	   "shared/door-3.png"
-; 	   "shared/door-2.png"
-; 	   "shared/door-1.png")
-;   ))
-  
+          (images "shared/door-1.png"))
+       (action
+          (name "open")
+          (x-offset 0)
+          (y-offset 64)
+          (images "shared/door-1.png"
+                  "shared/door-2.png"
+                  "shared/door-3.png"
+                  "shared/door-4.png"
+                  "shared/door-5.png"
+                  "shared/door-6.png"
+                  "shared/door-7.png"
+                  "shared/door-8.png"
+                  "shared/door-7.png"
+                  "shared/door-6.png"
+                  "shared/door-5.png"
+                  "shared/door-4.png"
+                  "shared/door-3.png"
+                  "shared/door-2.png"
+                  "shared/door-1.png"))
+  )
+
+  ; coin
+  (sprite (name "coin")
+      (action 
+          (name "default")
+          (images "tilesets/coin-1.png"
+                  "tilesets/coin-2.png"
+                  "tilesets/coin-3.png"
+                  "tilesets/coin-4.png"
+                  "tilesets/coin-5.png"
+                  "tilesets/coin-6.png"
+                  "tilesets/coin-7.png"
+                  "tilesets/coin-8.png"))
+      (action
+          (name "still")
+          (images "tilesets/coin-1.png"))
+  )
+
+  (sprite (name "bonusblock")
+      (action
+         (fps 15)
+         (name "default")
+         (images "tilesets/bonus2-1.png"
+                 "tilesets/bonus2-2.png"
+                 "tilesets/bonus2-3.png"
+                 "tilesets/bonus2-4.png"
+                 "tilesets/bonus2-5.png"
+                 "tilesets/bonus2-3.png"
+                 "tilesets/bonus2-2.png"
+                 "tilesets/bonus2-1.png"
+                 "tilesets/bonus2-1.png"
+                 "tilesets/bonus2-1.png"
+                 ))
+      (action
+         (name "empty")
+         (images "tilesets/bonus2-d.png"))
+  )
+
+  (sprite (name "brick")
+      (action 
+        (name "empty")
+        (images "tilesets/bonus2-d.png"))
+      (action 
+        (name "default")
+        (images "tilesets/brick0.png"))
+  )
+
+  (sprite (name "icedbrick")
+      (action 
+        (name "empty")
+        (images "tilesets/bonus2-d.png"))
+      (action 
+        (name "default")
+        (images "tilesets/brick1.png"))
+  )
+
+  (sprite (name "rock")
+      (action
+        (name "default")
+        (images "tilesets/block11.png"))
+  )
+
+  (sprite (name "invisibleblock")
+      (action
+        (name "empty")
+        (images "tilesets/bonus2-d.png"))
+  )                                        
+
   ; Stomp
   (sprite (name "stomp")
        (action