moved some sprites to external files

SVN-Revision: 2959

diff --git a/data/images/creatures/bouncing_snowball/bouncing_snowball.sprite b/data/images/creatures/bouncing_snowball/bouncing_snowball.sprite
new file mode 100644 (file)
index 0000000..0233b55
--- /dev/null
+++ b/data/images/creatures/bouncing_snowball/bouncing_snowball.sprite
@@ -0,0 +1,24 @@
+(supertux-sprite
+ (action
+  (name "left")
+  (x-offset 1)
+  (y-offset 0)
+  (images "left-0.png"
+          "left-1.png"
+          "left-2.png"
+          "left-3.png"
+          "left-4.png"
+          "left-5.png"))
+
+ (action
+  (name "right")
+  (x-offset 1)
+  (y-offset 0)
+  (mirror-action "left"))
+ 
+ (action
+  (name "squished")
+  (x-offset 1)
+  (y-offset -19)
+  (images "../snowball/squished-left.png"))
+)

diff --git a/data/images/creatures/dispenser/dispenser.sprite b/data/images/creatures/dispenser/dispenser.sprite
new file mode 100644 (file)
index 0000000..d955a6f
--- /dev/null
+++ b/data/images/creatures/dispenser/dispenser.sprite
@@ -0,0 +1,32 @@
+(supertux-sprite
+ (action
+  (name "dropper")
+  (x-offset 0)
+  (y-offset 0)
+  (images "dropper.png"))
+ 
+ (action
+  (name "working-left")
+  (x-offset 0)
+  (y-offset 0)
+  (images "working.png"))
+ 
+ (action
+  (name "broken-left")
+  (x-offset 0)
+  (y-offset 0)
+  (images "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"))
+)
+

diff --git a/data/images/creatures/fish/fish.sprite b/data/images/creatures/fish/fish.sprite
new file mode 100644 (file)
index 0000000..4b2684a
--- /dev/null
+++ b/data/images/creatures/fish/fish.sprite
@@ -0,0 +1,27 @@
+(supertux-sprite
+ (action
+  (name "normal")
+  (x-offset 2)
+  (y-offset 3)
+  (images "left-0.png"
+          "left-1.png"))
+
+ (action
+  (name "down")
+  (x-offset 2)
+  (y-offset 11)
+  (images "down.png"))
+
+ (action
+  (name "iced")
+  (x-offset 2)
+  (y-offset 3)
+  (images "iced-left.png"))
+
+ (action
+  (name "iced-down")
+  (x-offset 2)
+  (y-offset 11)
+  (images "iced-down.png"))
+)
+

diff --git a/data/images/creatures/flame/flame.sprite b/data/images/creatures/flame/flame.sprite
new file mode 100644 (file)
index 0000000..4f6bd8a
--- /dev/null
+++ b/data/images/creatures/flame/flame.sprite
@@ -0,0 +1,7 @@
+(supertux-sprite
+ (action
+  (name "normal")
+  (images "flame-0.png"
+          "flame-1.png"))
+)
+

diff --git a/data/images/creatures/flame_fish/flame_fish.sprite b/data/images/creatures/flame_fish/flame_fish.sprite
new file mode 100644 (file)
index 0000000..fdacd29
--- /dev/null
+++ b/data/images/creatures/flame_fish/flame_fish.sprite
@@ -0,0 +1,15 @@
+(sprite
+ (action
+  (name "normal")
+  (x-offset 2)
+  (y-offset 3)
+  (images "left-0.png"
+          "left-1.png"))
+
+ (action
+  (name "down")
+  (x-offset 2)
+  (y-offset 11)
+  (images "down.png"))
+)
+

diff --git a/data/images/creatures/flying_snowball/flying_snowball.sprite b/data/images/creatures/flying_snowball/flying_snowball.sprite
new file mode 100644 (file)
index 0000000..b92efbf
--- /dev/null
+++ b/data/images/creatures/flying_snowball/flying_snowball.sprite
@@ -0,0 +1,26 @@
+(supertux-sprite
+ (action
+  (name "left")
+  (x-offset 4)
+  (y-offset 3)
+  (images "left-0.png"
+          "left-1.png"))
+ 
+ (action
+  (name "right")
+  (x-offset 4)
+  (y-offset 3)
+  (mirror-action "left"))
+
+ (action
+  (name "squished-left")
+  (x-offset 4)
+  (y-offset -12)
+  (images "squished-left.png"))
+
+ (action
+  (name "squished-right")
+  (x-offset 4)
+  (y-offset -12)
+  (mirror-action "squished-left"))
+)

diff --git a/data/images/creatures/jumpy/jumpy.sprite b/data/images/creatures/jumpy/jumpy.sprite
new file mode 100644 (file)
index 0000000..507f015
--- /dev/null
+++ b/data/images/creatures/jumpy/jumpy.sprite
@@ -0,0 +1,51 @@
+(supertux-sprite
+
+ (action
+  (name "left-up")
+  (x-offset 7)
+  (y-offset 8)
+  (images "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 "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 "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 "iced-left-up.png"))
+ 
+ (action
+  (name "right-iced")
+  (x-offset 7)
+  (y-offset 8)
+  (mirror-action "left-iced"))
+)
+

diff --git a/data/images/creatures/kugelblitz/kugelblitz.sprite b/data/images/creatures/kugelblitz/kugelblitz.sprite
new file mode 100644 (file)
index 0000000..5d894ec
--- /dev/null
+++ b/data/images/creatures/kugelblitz/kugelblitz.sprite
@@ -0,0 +1,27 @@
+(supertux-sprite
+ (action
+  (name "falling")
+  (x-offset 0)
+  (y-offset 0)
+  (images "falling-0.png"
+          "falling-1.png"
+          "falling-2.png"))
+ 
+ (action
+  (name "flying")
+  (x-offset 0)
+  (y-offset 0)
+  (images "flying-0.png"
+          "flying-1.png"
+          "flying-2.png"))
+
+ (action
+  (name "pop")
+  (x-offset 0)
+  (y-offset 0)
+  (fps 20)
+  (images "pop-0.png"
+          "pop-1.png"
+          "pop-2.png"
+          "pop-3.png"))
+) 

diff --git a/data/images/creatures/mr_bomb/bomb.sprite b/data/images/creatures/mr_bomb/bomb.sprite
new file mode 100644 (file)
index 0000000..946564b
--- /dev/null
+++ b/data/images/creatures/mr_bomb/bomb.sprite
@@ -0,0 +1,26 @@
+(supertux-sprite
+ 
+ (action
+  (name "ticking-left")
+  (fps 15.0)
+  (x-offset 3)
+  (y-offset 8)
+  (images "exploding-left-0.png"
+          "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 "explosion-0.png"
+          "explosion-1.png"))
+)
+

diff --git a/data/images/creatures/mr_bomb/mr_bomb.sprite b/data/images/creatures/mr_bomb/mr_bomb.sprite
new file mode 100644 (file)
index 0000000..9d2251a
--- /dev/null
+++ b/data/images/creatures/mr_bomb/mr_bomb.sprite
@@ -0,0 +1,31 @@
+(supertux-sprite
+ (action
+  (name "left")
+  (fps 10.0)
+  (x-offset 3)
+  (y-offset 12)
+  (images "left-0.png"
+          "left-1.png"
+          "left-2.png"
+          "left-3.png"))
+
+ (action
+  (name "right")
+  (fps 10.0)
+  (x-offset 7)
+  (y-offset 12)
+  (mirror-action "left"))
+ 
+ (action
+  (name "iced-left")
+  (x-offset 3)
+  (y-offset 12)
+  (images "iced-left.png"))
+ 
+ (action
+  (name "iced-right")
+  (x-offset 7)
+  (y-offset 12)
+  (mirror-action "iced-left"))
+)
+

diff --git a/data/images/creatures/snowball/snowball.sprite b/data/images/creatures/snowball/snowball.sprite
new file mode 100644 (file)
index 0000000..f6249e0
--- /dev/null
+++ b/data/images/creatures/snowball/snowball.sprite
@@ -0,0 +1,28 @@
+(supertux-sprite
+  (action
+    (name "left")
+    (x-offset 2)
+    (y-offset 4)
+    (images "left-0.png"
+            "left-1.png"
+            "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 "squished-left.png")
+  )
+  (action
+    (name "squished-right")
+    (x-offset 1)
+    (y-offset -19)
+    (mirror-action "squished-left")
+  )
+)

diff --git a/data/images/sprites.strf b/data/images/sprites.strf
index 9122dfc..1ada49e 100644 (file)
--- a/data/images/sprites.strf
+++ b/data/images/sprites.strf
@@ -868,126 +868,6 @@
          (y-offset 3)
          (mirror-action "falling-left")))
 
          (y-offset 3)
          (mirror-action "falling-left")))
 

- (sprite (name "snowball")
-       (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"))
-
-       (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)
-         (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")
  (sprite (name "stalactite")
        (action
          (name "normal")


@@ -1000,99 +880,6 @@
          (y-offset 16)
          (images "creatures/stalactite/broken.png")))
 
          (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")
-         (x-offset 2)
-         (y-offset 3)
-         (images "creatures/fish/left-0.png"
-                 "creatures/fish/left-1.png"))
-
-       (action
-         (name "down")
-         (x-offset 2)
-         (y-offset 11)
-         (images "creatures/fish/down.png"))
-
-       (action
-         (name "iced")
-         (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")))
-
- (sprite (name "flamefish")
-       (action
-         (name "normal")
-         (x-offset 2)
-         (y-offset 3)
-         (images "creatures/flame_fish/left-0.png"
-                 "creatures/flame_fish/left-1.png"))
-
-       (action
-         (name "down")
-         (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"))
-
-       (action
-         (name "right")
-         (x-offset 1)
-         (y-offset 0)
-         (mirror-action "left"))
-
-       (action
-         (name "squished")
-         (x-offset 1)
-         (y-offset -19)
-         (images "creatures/snowball/squished-left.png")))
-
- (sprite (name "flyingsnowball")
-       (action
-         (name "left")
-         (x-offset 4)
-         (y-offset 3)
-         (images "creatures/flying_snowball/left-0.png"
-                 "creatures/flying_snowball/left-1.png"))
-       (action
-         (name "right")
-         (x-offset 4)
-         (y-offset 3)
-         (mirror-action "left"))
-
-       (action
-         (name "squished-left")
-         (x-offset 4)
-         (y-offset -12)
-         (images "creatures/flying_snowball/squished-left.png"))
-       (action
-         (name "squished-right")
-         (x-offset 4)
-         (y-offset -12)
-         (mirror-action "squished-left")))

 (sprite (name "spidermite")
        (action
          (name "left")
 (sprite (name "spidermite")
        (action
          (name "left")


@@ -1144,35 +931,6 @@
          (y-offset 10)
          (mirror-action "iced-left")))
         
          (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
    ; MrRocket
    (sprite (name "mrrocket")
        (action


@@ -1375,34 +1133,6 @@
          (y-offset -19)
          (mirror-action "squished-left")))
 
          (y-offset -19)
          (mirror-action "squished-left")))
 

-; Kugelblitz
- (sprite (name "kugelblitz")
-       (action
-         (name "falling")
-         (x-offset 0)
-         (y-offset 0)
-         (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"))
-
-       (action
-         (name "pop")
-         (x-offset 0)
-         (y-offset 0)
-         (fps 20)
-         (images "creatures/kugelblitz/pop-0.png"
-                 "creatures/kugelblitz/pop-1.png"
-                 "creatures/kugelblitz/pop-2.png"
-                 "creatures/kugelblitz/pop-3.png"))
- )
-         

 ;; Game elements follow
           
  (sprite (name "egg")
 ;; Game elements follow
           
  (sprite (name "egg")