X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=data%2Fimages%2Fsprites.strf;h=1ada49e3bf225cb3228d3530130ac8a3d85ff1a3;hb=6ae2d154b976957d8e209bb991672b0c12c503c7;hp=50bea266ce0e90d2796593e3015345953f6c6fea;hpb=494094f3657ff198da148e1185a628fe0ec26b6c;p=supertux.git

diff --git a/data/images/sprites.strf b/data/images/sprites.strf
index 50bea266c..1ada49e3b 100644
--- a/data/images/sprites.strf
+++ b/data/images/sprites.strf
@@ -782,25 +782,7 @@
 
 
 ;; Bad Guys follow
- (sprite (name "spike")
-    (action
-      (name "north")
-      (images "creatures/spike/up.png")
-    )
-    (action
-      (name "south")
-      (images "creatures/spike/down.png")
-    )
-    (action
-      (name "west")
-      (images "creatures/spike/left.png")
-    )
-    (action
-      (name "east")
-      (images "creatures/spike/right.png")
-    )
- )
-
+ 
  ;; MrIceBlock
  (sprite (name "mriceblock")
     (action
@@ -836,216 +818,77 @@
          (x-offset 2)
          (y-offset 3)
          (mirror-action "falling-left")))
-
- (sprite (name "snowball")
-       (action
+ ;; SnowSnail
+ (sprite (name "snowsnail")
+    (action
          (name "left")
          (x-offset 2)
-         (y-offset 4)
-         (images "creatures/snowball/left-0.png"
-                 "creatures/snowball/left-1.png"
-                 "creatures/snowball/left-2.png"
-                 "creatures/snowball/left-1.png"))
+         (y-offset 3)
+         (images "creatures/snowsnail/snowsnail1.png"
+	         "creatures/snowsnail/snowsnail2.png"
+                 "creatures/snowsnail/snowsnail3.png"
+))
 
-       (action
-         (name "right")
+    (action (name "right")
          (x-offset 2)
-         (y-offset 4)
-         (mirror-action "left"))
-       (action
-         (name "squished-left")
-         (x-offset 1)
-         (y-offset -19)
-         (images "creatures/snowball/squished-left.png"))
-
-       (action
-         (name "squished-right")
-         (x-offset 1)
-         (y-offset -19)
-         (mirror-action "squished-left")))
-
-     (sprite (name "jumpy")
-       (action
-         (name "left-up")
-         (x-offset 7)
-         (y-offset 8)
-         (images "creatures/jumpy/left-up.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 "creatures/jumpy/left-down.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 "creatures/jumpy/left-middle.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 "creatures/jumpy/iced-left-up.png"))
-       (action
-         (name "right-iced")
-         (x-offset 7)
-         (y-offset 8)
-         (mirror-action "left-iced")))
-
-     (sprite (name "mrbomb")
-       (action
-         (name "left")
-         (fps 10.0)
-         (x-offset 3)
-         (y-offset 12)
-         (images "creatures/mr_bomb/left-0.png"
-                 "creatures/mr_bomb/left-1.png"
-                 "creatures/mr_bomb/left-2.png"
-                 "creatures/mr_bomb/left-3.png"))
-
-       (action
-         (name "right")
-         (fps 10.0)
-         (x-offset 7)
-         (y-offset 12)
+         (y-offset 3)
          (mirror-action "left"))
-       (action
-         (name "iced-left")
-         (x-offset 3)
-         (y-offset 12)
-         (images "creatures/mr_bomb/iced-left.png"))
-
-       (action
-         (name "iced-right")
-         (x-offset 7)
-         (y-offset 12)
-         (mirror-action "iced-left")))
-
-     (sprite (name "bomb")
-       (action
-         (name "ticking-left")
-         (fps 15.0)
-         (x-offset 3)
-         (y-offset 8)
-         (images "creatures/mr_bomb/exploding-left-0.png"
-                 "creatures/mr_bomb/exploding-left-1.png"))
-       (action
-         (name "ticking-right")
-         (fps 15.0)
-         (x-offset 10)
-         (y-offset 8)
-         (mirror-action "ticking-left"))
-       (action
-         (name "explosion")
-         (fps 15.0)
-         (x-offset 32)
-         (y-offset 32)
-         (images "creatures/mr_bomb/explosion-0.png"
-                 "creatures/mr_bomb/explosion-1.png")))
-
- (sprite (name "stalactite")
-       (action
-         (name "normal")
-         (x-offset 0)
-         (y-offset 0)
-         (images "creatures/stalactite/falling.png"))
-       (action
-         (name "squished")
-         (x-offset 0)
-         (y-offset 16)
-         (images "creatures/stalactite/broken.png")))
-
- (sprite (name "flame")
-       (action
-         (name "normal")
-         (images "creatures/flame/flame-0.png"
-                 "creatures/flame/flame-1.png")))
 
- (sprite (name "fish")
-       (action
-         (name "normal")
+    (action (name "falling-left")
          (x-offset 2)
          (y-offset 3)
-         (images "creatures/fish/left-0.png"
-                 "creatures/fish/left-1.png"))
+         (images "creatures/snowsnail/snowsnail_flip1.png"
+"creatures/snowsnail/snowsnail_flip2.png"
+"creatures/snowsnail/snowsnail_flip3.png"
+"creatures/snowsnail/snowsnail_flip4.png"
+"creatures/snowsnail/snowsnail_flip5.png"
+"creatures/snowsnail/snowsnail_flip6.png"
+"creatures/snowsnail/snowsnail_flip7.png"
+))
 
-       (action
-         (name "down")
-         (x-offset 2)
-         (y-offset 11)
-         (images "creatures/fish/down.png"))
-
-       (action
-         (name "iced")
+    (action (name "falling-right")
          (x-offset 2)
          (y-offset 3)
-         (images "creatures/fish/iced-left.png"))
-
-       (action
-         (name "iced-down")
-         (x-offset 2)
-         (y-offset 11)
-         (images "creatures/fish/iced-down.png")))
+         (mirror-action "falling-left"))
 
- (sprite (name "flamefish")
-       (action
-         (name "normal")
+    (action (name "flat-left")
          (x-offset 2)
          (y-offset 3)
-         (images "creatures/flame_fish/left-0.png"
-                 "creatures/flame_fish/left-1.png"))
+	 (images "creatures/snowsnail/snowsnail_flip1.png"
+"creatures/snowsnail/snowsnail_flip2.png"
+"creatures/snowsnail/snowsnail_flip3.png"
+"creatures/snowsnail/snowsnail_flip4.png"
+"creatures/snowsnail/snowsnail_flip5.png"
+"creatures/snowsnail/snowsnail_flip6.png"
+"creatures/snowsnail/snowsnail_flip7.png"
+))
 
-       (action
-         (name "down")
+    (action (name "flat-right")
          (x-offset 2)
-         (y-offset 11)
-         (images "creatures/flame_fish/down.png")))
-
- (sprite (name "bouncingsnowball")
-       (action
-         (name "left")
-         (x-offset 1)
-         (y-offset 0)
-         (images "creatures/bouncing_snowball/left-0.png"
-                 "creatures/bouncing_snowball/left-1.png"
-                 "creatures/bouncing_snowball/left-2.png"
-                 "creatures/bouncing_snowball/left-3.png"
-                 "creatures/bouncing_snowball/left-4.png"
-                 "creatures/bouncing_snowball/left-5.png"))
+         (y-offset 3)
+         (mirror-action "falling-left")))
 
+ (sprite (name "stalactite")
        (action
-         (name "right")
-         (x-offset 1)
+         (name "normal")
+         (x-offset 0)
          (y-offset 0)
-         (mirror-action "left"))
-
+         (images "creatures/stalactite/falling.png"))
        (action
          (name "squished")
-         (x-offset 1)
-         (y-offset -19)
-         (images "creatures/snowball/squished-left.png")))
+         (x-offset 0)
+         (y-offset 16)
+         (images "creatures/stalactite/broken.png")))
 
- (sprite (name "flyingsnowball")
+(sprite (name "spidermite")
        (action
          (name "left")
          (x-offset 4)
          (y-offset 3)
-         (images "creatures/flying_snowball/left-0.png"
-                 "creatures/flying_snowball/left-1.png"))
+         (images "creatures/spidermite/spidermite.png"
+"creatures/spidermite/spidermite0.png"
+                 "creatures/spidermite/spidermite1.png"
+"creatures/spidermite/spidermite0.png"))
        (action
          (name "right")
          (x-offset 4)
@@ -1056,13 +899,14 @@
          (name "squished-left")
          (x-offset 4)
          (y-offset -12)
-         (images "creatures/flying_snowball/squished-left.png"))
+         (images "creatures/spidermite/spidermite-squish.png"))
        (action
          (name "squished-right")
          (x-offset 4)
          (y-offset -12)
          (mirror-action "squished-left")))
 
+
  (sprite (name "spiky")
        (action
          (name "left")
@@ -1087,35 +931,6 @@
          (y-offset 10)
          (mirror-action "iced-left")))
         
-  ; Dispenser
-  (sprite (name "dispenser")
-       (action
-          (name "dropper")
-          (x-offset 0)
-          (y-offset 0)
-          (images "creatures/dispenser/dropper.png"))
-       (action
-          (name "working-left")
-          (x-offset 0)
-          (y-offset 0)
-          (images "creatures/dispenser/working.png"))
-       (action
-          (name "broken-left")
-          (x-offset 0)
-          (y-offset 0)
-          (images "creatures/dispenser/broken.png"))
-       (action
-          (name "working-right")
-          (x-offset 0)
-          (y-offset 0)
-          (mirror-action "working-left"))
-       (action
-          (name "broken-right")
-          (x-offset 0)
-          (y-offset 0)
-          (mirror-action "broken-left")))
-
-   
    ; MrRocket
    (sprite (name "mrrocket")
        (action
@@ -1173,9 +988,8 @@
          (x-offset 0)
          (y-offset 32)
          (mirror-action "explosion-left")))
-   
-   ; Dummyguy
-   (sprite (name "dummyguy")
+; Nolok
+   (sprite (name "nolok")
        (action
          (name "left")
 	 (fps 6)
@@ -1220,9 +1034,12 @@
          (name "dead")
          (x-offset 0)
          (y-offset 0)
-         (images "creatures/dummyguy/dead.png")))
+         (images "creatures/nolok/throw-0.png")))
+
 
 
+
+   
   ; MrTree  
   (sprite (name "mrtree")
       (action
@@ -1316,24 +1133,6 @@
          (y-offset -19)
          (mirror-action "squished-left")))
 
-; Kugelblitz
- (sprite (name "kugelblitz")
-       (action
-         (name "falling")
-         (x-offset 0)
-         (y-offset )
-         (images "creatures/kugelblitz/falling-0.png"
-                 "creatures/kugelblitz/falling-1.png"
-                 "creatures/kugelblitz/falling-2.png"))
-       (action
-         (name "flying")
-         (x-offset 0)
-         (y-offset 0)
-         (images "creatures/kugelblitz/flying-0.png"
-                 "creatures/kugelblitz/flying-1.png"
-                 "creatures/kugelblitz/flying-2.png"))
- )
-         
 ;; Game elements follow
           
  (sprite (name "egg")
@@ -1429,6 +1228,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")
@@ -1566,7 +1374,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)
@@ -1590,17 +1401,17 @@
     (action
       (name "small")
       (y-offset 10) 
-      (images "tiles/worldmap/smalltux.png")
+      (images "worldmap/common/smalltux.png")
     )
     (action
       (name "large")
       (y-offset 10) 
-      (images "tiles/worldmap/tux.png")
+      (images "worldmap/common/tux.png")
     )
     (action
       (name "fire")
       (y-offset 10) 
-      (images "tiles/worldmap/firetux.png")
+      (images "worldmap/common/firetux.png")
     )
   )
 
@@ -1622,46 +1433,96 @@
                   "objects/hatch/hatch-5.png"))
   )
 
-  (sprite (name "yeti")
+  (sprite
+    (name "lightmap_light")
     (action
-      (name "right")
-      (images "creatures/yeti/yeti_b.png")
+      (name "default")
+      (images "effects/light_red.png")
     )
+  )
+  
+  (sprite
+    (name "eat-me")
     (action
-      (name "left")
-      (mirror-action "right")
+      (name "default")
+      (images "tiles/doodads/platter.png")
     )
   )
+  (sprite
+    (name "key-brass")
+    (action
+      (name "default")
+      (images "objects/keys/key_brass.png")
+    )
+   (action
+      (name "display")
+      (images "objects/keys/display_brass.png")
+    )
+   (action
+      (name "outline")
+      (images "objects/keys/outline_brass.png")
+    )
 
+  )
   (sprite
-    (name "red-potion")
+    (name "key-iron")
     (action
       (name "default")
-      (images "powerups/potions/red-potion.png")
+      (images "objects/keys/key_iron.png")
+    )
+   (action
+      (name "display")
+      (images "objects/keys/display_iron.png")
+    )
+    (action
+      (name "outline")
+      (images "objects/keys/outline_iron.png")
     )
   )
-
   (sprite
-    (name "blue-potion")
+    (name "key-bronze")
     (action
       (name "default")
-      (images "powerups/potions/blue-potion.png")
+      (images "objects/keys/key_bronze.png")
+    )
+   (action
+      (name "display")
+      (images "objects/keys/display_bronze.png")
+    )
+    (action
+      (name "outline")
+      (images "objects/keys/outline_bronze.png")
     )
   )
-  
   (sprite
-    (name "eat-me")
+    (name "key-silver")
     (action
       (name "default")
-      (images "tiles/doodads/platter.png")
+      (images "objects/keys/key_silver.png")
+    )
+   (action
+      (name "display")
+      (images "objects/keys/display_silver.png")
+    )
+    (action
+      (name "outline")
+      (images "objects/keys/outline_silver.png")
     )
   )
-    (sprite
-    (name "gold-key")
+  (sprite
+    (name "key-gold")
     (action
       (name "default")
       (images "objects/keys/key_gold.png")
     )
+    (action
+      (name "display")
+      (images "objects/keys/display_gold.png")
+    )
+    (action
+      (name "outline")
+      (images "objects/keys/outline_gold.png")
+    )
   )
 )