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

diff --git a/data/images/supertux.strf b/data/images/supertux.strf
index e7be81664..9e6a1eb89 100644
--- a/data/images/supertux.strf
+++ b/data/images/supertux.strf
@@ -679,7 +679,7 @@
          (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")
@@ -782,10 +782,28 @@
 
 
 ;; Bad Guys follow
-
- ;; Laptop
+ (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
+    (action
          (name "left")
          (x-offset 2)
          (y-offset 3)
@@ -794,27 +812,27 @@
                  "shared/mriceblock-left-2.png"
                  "shared/mriceblock-left-1.png"))
 
- (action (name "right")
+    (action (name "right")
          (x-offset 2)
          (y-offset 3)
          (mirror-action "left"))
 
- (action (name "falling-right")
+    (action (name "falling-left")
          (x-offset 2)
          (y-offset 3)
-         (images "shared/mriceblock-flat-right.png"))
+         (images "shared/mriceblock-flat-left.png"))
 
- (action (name "falling-left")
+    (action (name "falling-right")
          (x-offset 2)
          (y-offset 3)
-         (images "shared/mriceblock-flat-left.png"))
+         (mirror-action "falling-left"))
  
- (action (name "flat-left")
+    (action (name "flat-left")
          (x-offset 2)
          (y-offset 3)
          (images "shared/mriceblock-flat-left.png"))
 
- (action (name "flat-right")
+    (action (name "flat-right")
          (x-offset 2)
          (y-offset 3)
          (mirror-action "falling-left")))
@@ -853,20 +871,40 @@
          (y-offset 8)
          (images "shared/jumpy-left-up-0.png"))
        (action
+         (name "right-up")
+         (x-offset 7)
+         (y-offset 8)
+         (mirror-action "left-up"))
+       (action
          (name "left-down")
          (x-offset 7)
          (y-offset 8)
          (images "shared/jumpy-left-down-0.png"))
        (action
+         (name "right-down")
+         (x-offset 7)
+         (y-offset 8)
+         (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")))
+         (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")
        (action
@@ -1003,17 +1041,27 @@
 
  (sprite (name "flyingsnowball")
        (action
-         (name "normal")
+         (name "left")
          (x-offset 4)
          (y-offset 3)
          (images "shared/flyingsnowball-left-0.png"
                  "shared/flyingsnowball-left-1.png"))
+       (action
+         (name "right")
+         (x-offset 4)
+         (y-offset 3)
+         (mirror-action "left"))
 
        (action
-         (name "squished")
+         (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")
        (action
@@ -1059,8 +1107,63 @@
           (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")))
@@ -1106,6 +1209,9 @@
          (x-offset 12)
          (fps 20)
          (images "shared/icebullet-1.png")))
+
+;; Game Objects follow
+
   ; Trampoline
   (sprite (name "trampoline")
        (action
@@ -1128,32 +1234,98 @@
   ; 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