X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=data%2Fimages%2Fsupertux.strf;h=b23f0b8c5fce43a3a49bb35a4313f264643491cd;hb=62617f126971fcdc9c87a7047b6b6b3cda984c85;hp=f689b054028488c46900d17f9ec90cb6bb87878d;hpb=f1c7a49dd18ff59d0d32bd118044402ff35f66f5;p=supertux.git

diff --git a/data/images/supertux.strf b/data/images/supertux.strf
index f689b0540..b23f0b8c5 100644
--- a/data/images/supertux.strf
+++ b/data/images/supertux.strf
@@ -1086,68 +1086,127 @@
          (x-offset 6)
          (y-offset 10)
          (mirror-action "iced-left")))
-
-  ; Wingling
-  (sprite (name "wingling")
+        
+  ; Dispenser
+  (sprite (name "dispenser")
        (action
-         (name "left")
-          (x-offset 0)
-          (y-offset 0)
-          (images "shared/wingling-1.png")))
-
-  ; Walkingtree
-  (sprite (name "walkingtree")
-       (action
-         (name "left")
+         (name "working")
           (x-offset 0)
           (y-offset 0)
-          (images "shared/walkingtree-left-1.png"))
+          (images "shared/dispenser-working.png"))
        (action
-          (name "left-small")
+          (name "broken")
           (x-offset 0)
           (y-offset 0)
-          (images "shared/walkingtree-left-small-1.png")))
-          
+          (images "shared/dispenser-broken.png")))          
+   
    ; Dummyguy
    (sprite (name "dummyguy")
        (action
          (name "left")
          (x-offset 0)
-         (y-offset 32)
+         (y-offset 0)
          (images "shared/dummyguy-walk-1.png"
                  "shared/dummyguy-walk-2.png"))
 
        (action
          (name "right")
          (x-offset 0)
-         (y-offset 32)
+         (y-offset 0)
          (mirror-action "left"))
          
        (action
          (name "stand")
          (x-offset 0)
-         (y-offset 32)
+         (y-offset 0)
          (images "shared/dummyguy-stand.png"))
          
        (action
          (name "throw")
          (x-offset 0)
-         (y-offset 32)
+         (y-offset 0)
          (images "shared/dummyguy-throw.png"))
 
        (action
          (name "jump")
          (x-offset 0)
-         (y-offset 32)
+         (y-offset 0)
          (images "shared/dummyguy-jump.png"))
          
        (action
          (name "dead")
          (x-offset 0)
-         (y-offset 32)
+         (y-offset 0)
          (images "shared/dummyguy-dead.png")))
 
 
+  ; MrTree  
+  (sprite (name "mrtree")
+      (action
+        (y-offset -3)
+        (fps 5)
+        (name "left")
+        (images "shared/mrtree-walk-left-0.png"
+                "shared/mrtree-walk-left-1.png"
+                "shared/mrtree-walk-left-2.png")
+      )
+      (action
+        (y-offset -3)
+        (fps 5)
+        (name "right")
+        (mirror-action "left")
+      )
+      (action
+        (y-offset -3)
+        (name "small-left")
+        (images "shared/mrtree-small-left-0.png"
+                "shared/mrtree-small-left-1.png"
+                "shared/mrtree-small-left-2.png")
+      )
+      (action
+        (y-offset -3)
+        (name "small-right")
+        (mirror-action "small-left")
+      )
+      (action
+        (y-offset -6)
+        (name "squished-left")
+        (images "shared/mrtree-squished-left.png")
+      )
+      (action
+        (y-offset -6)
+        (name "squished-right")
+        (mirror-action "squished-left")
+      )
+  )
+
+ ; PoisonIvy
+ (sprite (name "poisonivy")
+       (action
+         (name "left")
+         (x-offset 2)
+         (y-offset 4)
+         (images "shared/poisonivy-left-0.png"
+                 "shared/poisonivy-left-1.png"
+                 "shared/poisonivy-left-2.png"))
+
+       (action
+         (name "right")
+         (x-offset 2)
+         (y-offset 4)
+         (mirror-action "left"))
+       (action
+         (name "squished-left")
+         (x-offset 1)
+         (y-offset -19)
+         (images "shared/poisonivy-squished-left.png"))
+
+       (action
+         (name "squished-right")
+         (x-offset 1)
+         (y-offset -19)
+         (mirror-action "squished-left")))
+
          
 ;; Game elements follow
           
@@ -1301,12 +1360,18 @@
         (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