X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=data%2Fimages%2Fsupertux.strf;h=8ca06fa384e9d2f779be16e1f72ed1bf471fd36d;hb=8cecc7815e5ab5fe2b646dbe6aaa8e95cf08e71f;hp=85c185e7d78e5aa63f4aa9780c369a03ba3b9d17;hpb=55a19b5e43db960fc04773eb7f22edd86eac0e6c;p=supertux.git

diff --git a/data/images/supertux.strf b/data/images/supertux.strf
index 85c185e7d..8ca06fa38 100644
--- a/data/images/supertux.strf
+++ b/data/images/supertux.strf
@@ -964,7 +964,7 @@
          (y-offset 0)
          (images "shared/stalactite.png"))
        (action
-         (name "broken")
+         (name "squished")
          (x-offset 0)
          (y-offset 16)
          (images "shared/stalactite-broken.png")))
@@ -1086,81 +1086,210 @@
          (x-offset 6)
          (y-offset 10)
          (mirror-action "iced-left")))
-
-  ; Wingling
-  (sprite (name "wingling")
+        
+  ; Dispenser
+  (sprite (name "dispenser")
        (action
-         (name "left")
+          (name "dropper")
           (x-offset 0)
           (y-offset 0)
-          (images "shared/wingling-1.png")))
-
-  ; Walkingtree
-  (sprite (name "walkingtree")
+          (images "shared/dispenser-dropper.png"))
        (action
-         (name "left")
+          (name "working-left")
           (x-offset 0)
           (y-offset 0)
-          (images "shared/walkingtree-left-1.png"))
+          (images "shared/dispenser-working.png"))
        (action
-          (name "left-small")
+          (name "broken-left")
           (x-offset 0)
           (y-offset 0)
-          (images "shared/walkingtree-left-small-1.png")))
-         
-  ; Dispenser
-  (sprite (name "dispenser")
+          (images "shared/dispenser-broken.png"))
        (action
-         (name "working")
+          (name "working-right")
           (x-offset 0)
           (y-offset 0)
-          (images "shared/dispenser-working.png"))
+          (mirror-action "working-left"))
        (action
-          (name "broken")
+          (name "broken-right")
           (x-offset 0)
           (y-offset 0)
-          (images "shared/dispenser-broken.png")))          
+          (mirror-action "broken-left")))
+
+   
+   ; MrRocket
+   (sprite (name "mrrocket")
+       (action
+         (name "left")
+         (fps 15.0)
+         (x-offset 3)
+         (y-offset 12)
+         (images "shared/mrrocket-0.png"
+	 	 "shared/mrrocket-1.png"
+		 "shared/mrrocket-2.png"
+		 "shared/mrrocket-1.png"))
+
+       (action
+         (name "right")
+         (fps 10.0)
+         (x-offset 7)
+         (y-offset 12)
+         (mirror-action "left"))
+       
+       (action
+         (name "squished-left")
+         (x-offset 7)
+         (y-offset 0)
+         (images "shared/mrrocket-squished.png"))
+
+       (action
+         (name "squished-right")
+         (x-offset 7)
+         (y-offset 0)
+         (mirror-action "squished-left"))
+       
+       (action
+         (name "collision-left")
+         (x-offset 3)
+         (y-offset 12)
+         (images "shared/mrrocket-collision.png"))
+
+       (action
+         (name "collision-right")
+         (x-offset 3)
+         (y-offset 12)
+         (mirror-action "squished-left")))
+   
+   (sprite (name "rocketexplosion")     
+       (action
+         (name "explosion-left")
+         (fps 15.0)
+         (x-offset 0)
+         (y-offset 32)
+         (images "shared/mrrocket-explosion.png"
+                 "shared/mrrocket-explosion-1.png"))
+       (action
+         (name "explosion-right")
+         (fps 15.0)
+         (x-offset 0)
+         (y-offset 32)
+         (mirror-action "explosion-left")))
    
    ; Dummyguy
    (sprite (name "dummyguy")
        (action
          (name "left")
+	 (fps 6)
          (x-offset 0)
-         (y-offset 32)
-         (images "shared/dummyguy-walk-1.png"
-                 "shared/dummyguy-walk-2.png"))
+         (y-offset 40)
+         (images "shared/nolok/nolok_walk0.png"
+		 "shared/nolok/nolok_walk1.png"
+                 "shared/nolok/nolok_walk2.png"
+		 "shared/nolok/nolok_walk3.png"
+		 "shared/nolok/nolok_walk4.png"))
 
        (action
          (name "right")
+	 (fps 6)
          (x-offset 0)
-         (y-offset 32)
+         (y-offset 40)
          (mirror-action "left"))
          
        (action
          (name "stand")
          (x-offset 0)
-         (y-offset 32)
-         (images "shared/dummyguy-stand.png"))
+         (y-offset 40)
+         (images "shared/nolok/nolok_walk0.png"))
          
        (action
          (name "throw")
+	 (fps 6)
          (x-offset 0)
-         (y-offset 32)
-         (images "shared/dummyguy-throw.png"))
+         (y-offset 40)
+         (images "shared/nolok/nolok_throw0.png"
+		 "shared/nolok/nolok_throw1.png"))
 
        (action
          (name "jump")
          (x-offset 0)
-         (y-offset 32)
-         (images "shared/dummyguy-jump.png"))
+         (y-offset 40)
+         (images "shared/nolok/nolok_jump0.png"
+		 "shared/nolok/nolok_jump1.png"
+		 "shared/nolok/nolok_jump2.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
           
@@ -1234,14 +1363,14 @@
   ; Door
   (sprite (name "door")
        (action
-          (name "default")
+          (name "normal")
           (x-offset 0)
-          (y-offset 64)
+          (y-offset 0)
           (images "shared/door-1.png"))
        (action
           (name "open")
           (x-offset 0)
-          (y-offset 64)
+          (y-offset 0)
           (images "shared/door-1.png"
                   "shared/door-2.png"
                   "shared/door-3.png"
@@ -1262,7 +1391,7 @@
   ; coin
   (sprite (name "coin")
       (action 
-          (name "default")
+          (name "normal")
           (images "tilesets/coin-1.png"
                   "tilesets/coin-2.png"
                   "tilesets/coin-3.png"
@@ -1279,7 +1408,7 @@
   (sprite (name "bonusblock")
       (action
          (fps 15)
-         (name "default")
+         (name "normal")
          (images "tilesets/bonus2-1.png"
                  "tilesets/bonus2-2.png"
                  "tilesets/bonus2-3.png"
@@ -1301,7 +1430,7 @@
         (name "empty")
         (images "tilesets/bonus2-d.png"))
       (action 
-        (name "default")
+        (name "normal")
         (images "tilesets/brick0.png"))
   )
 
@@ -1310,16 +1439,22 @@
         (name "empty")
         (images "tilesets/bonus2-d.png"))
       (action 
-        (name "default")
+        (name "normal")
         (images "tilesets/brick1.png"))
   )
 
+  (sprite (name "rock")
+      (action
+        (name "normal")
+        (images "tilesets/block11.png"))
+  )
+
   (sprite (name "invisibleblock")
       (action
         (name "empty")
         (images "tilesets/bonus2-d.png"))
-  )
-                 
+  )                                        
+
   ; Stomp
   (sprite (name "stomp")
        (action
@@ -1327,6 +1462,69 @@
           (y-offset 0)
           (images "shared/stomp.png")
   ))
-)
 
-;; EOF ;;
+  (sprite (name "bell")
+       (action
+          (name "normal")
+          (x-offset 0)
+          (y-offset 0)
+          (images "shared/bell/bell-m.png")
+       )
+       (action
+         (name "ringing")
+         (images "shared/bell/bell-l.png"
+           "shared/bell/bell-m.png"
+           "shared/bell/bell-r.png"
+           "shared/bell/bell-m.png"
+         )
+       )
+  )
+  
+  (sprite (name "unstable_tile")
+    (action
+      (images "shared/unstable_tile.png"))
+  )
+
+  (sprite (name "worldmaptux")
+    (action
+      (name "small")
+      (y-offset 10) 
+      (images "worldmap/smalltux.png")
+    )
+    (action
+      (name "large")
+      (y-offset 10) 
+      (images "worldmap/tux.png")
+    )
+    (action
+      (name "fire")
+      (y-offset 10) 
+      (images "worldmap/firetux.png")
+    )
+  )
+
+  (sprite (name "hatch")
+       (action
+          (name "normal")
+          (x-offset 0)
+          (y-offset 0)
+          (images "shared/hatch-1.png"))
+       (action
+          (name "open")
+          (x-offset 0)
+          (y-offset 0)
+          (images "shared/hatch-1.png"
+                  "shared/hatch-2.png"
+                  "shared/hatch-3.png"
+                  "shared/hatch-4.png"
+                  "shared/hatch-5.png"
+                  "shared/hatch-6.png"))
+  )
+
+  (sprite (name "yeti")
+    (action
+      (name "normal")
+      (images "shared/yeti/yeti_b.png")
+    )
+  )
+)