From cf4ef679418d46fda1bf14e4a4695b7abb12dd66 Mon Sep 17 00:00:00 2001
From: Christoph Sommer <mail@christoph-sommer.de>
Date: Wed, 8 Mar 2006 09:34:12 +0000
Subject: [PATCH] Moved Tux' and Badguys' sprites from sprites.strf to
 individual .sprite files

SVN-Revision: 3075
---
 data/images/creatures/angrystone/angrystone.sprite |  10 +
 .../creatures/mr_iceblock/mr_iceblock.sprite       |  34 +
 data/images/creatures/skullyhop/skullyhop.sprite   |  44 +
 data/images/creatures/snowsnail/snowsnail.sprite   |  48 +
 data/images/creatures/spidermite/spidermite.sprite |  25 +
 data/images/creatures/stalactite/stalactite.sprite |  11 +
 .../creatures/tux_big/big-fire-tux-head.sprite     | 107 +++
 data/images/creatures/tux_big/big-tux-arms.sprite  | 125 +++
 data/images/creatures/tux_big/big-tux-body.sprite  |  95 ++
 data/images/creatures/tux_big/big-tux-feet.sprite  |  97 ++
 data/images/creatures/tux_big/big-tux-head.sprite  | 110 +++
 data/images/creatures/tux_big/bigtux-star.sprite   |   7 +
 .../creatures/tux_grow/tux-grow-left.sprite.old    |  12 +
 .../creatures/tux_grow/tux-grow-right.sprite.old   |  12 +
 .../creatures/tux_small/small-tux-arms.sprite      |  89 ++
 .../creatures/tux_small/small-tux-body.sprite      |  73 ++
 .../creatures/tux_small/smalltux-gameover.sprite   |   7 +
 .../creatures/tux_small/smalltux-star.sprite       |   7 +
 data/images/creatures/zeekling/zeekling.sprite     |  36 +
 data/images/sprites.strf                           | 999 +--------------------
 src/badguy/mriceblock.cpp                          |   4 +-
 src/badguy/skullyhop.cpp                           |   4 +-
 src/badguy/snowsnail.cpp                           |   4 +-
 src/badguy/spidermite.cpp                          |   4 +-
 src/badguy/stalactite.cpp                          |   2 +-
 src/badguy/zeekling.cpp                            |   4 +-
 src/object/player.cpp                              |   6 +-
 src/resources.cpp                                  |  28 +-
 28 files changed, 979 insertions(+), 1025 deletions(-)
 create mode 100644 data/images/creatures/angrystone/angrystone.sprite
 create mode 100644 data/images/creatures/mr_iceblock/mr_iceblock.sprite
 create mode 100644 data/images/creatures/skullyhop/skullyhop.sprite
 create mode 100644 data/images/creatures/snowsnail/snowsnail.sprite
 create mode 100644 data/images/creatures/spidermite/spidermite.sprite
 create mode 100644 data/images/creatures/stalactite/stalactite.sprite
 create mode 100644 data/images/creatures/tux_big/big-fire-tux-head.sprite
 create mode 100644 data/images/creatures/tux_big/big-tux-arms.sprite
 create mode 100644 data/images/creatures/tux_big/big-tux-body.sprite
 create mode 100644 data/images/creatures/tux_big/big-tux-feet.sprite
 create mode 100644 data/images/creatures/tux_big/big-tux-head.sprite
 create mode 100644 data/images/creatures/tux_big/bigtux-star.sprite
 create mode 100644 data/images/creatures/tux_grow/tux-grow-left.sprite.old
 create mode 100644 data/images/creatures/tux_grow/tux-grow-right.sprite.old
 create mode 100644 data/images/creatures/tux_small/small-tux-arms.sprite
 create mode 100644 data/images/creatures/tux_small/small-tux-body.sprite
 create mode 100644 data/images/creatures/tux_small/smalltux-gameover.sprite
 create mode 100644 data/images/creatures/tux_small/smalltux-star.sprite
 create mode 100644 data/images/creatures/zeekling/zeekling.sprite

diff --git a/data/images/creatures/angrystone/angrystone.sprite b/data/images/creatures/angrystone/angrystone.sprite
new file mode 100644
index 000000000..bccffabb1
--- /dev/null
+++ b/data/images/creatures/angrystone/angrystone.sprite
@@ -0,0 +1,10 @@
+(supertux-sprite
+	(action
+	  (name "idle")
+	  (images "idle-0.png"))
+	(action
+	  (name "charging")
+	  (images "charging-0.png"))
+	(action
+	  (name "attacking")
+	  (images "attacking-0.png")))
diff --git a/data/images/creatures/mr_iceblock/mr_iceblock.sprite b/data/images/creatures/mr_iceblock/mr_iceblock.sprite
new file mode 100644
index 000000000..69e659fee
--- /dev/null
+++ b/data/images/creatures/mr_iceblock/mr_iceblock.sprite
@@ -0,0 +1,34 @@
+(supertux-sprite
+	(action
+	  (name "left")
+	  (x-offset 2)
+	  (y-offset 3)
+	  (images "left-0.png"
+		  "left-1.png"
+		  "left-2.png"
+		  "left-1.png"))
+
+	(action (name "right")
+		(x-offset 2)
+		(y-offset 3)
+		(mirror-action "left"))
+
+	(action (name "falling-left")
+		(x-offset 2)
+		(y-offset 3)
+		(images "flat-left.png"))
+
+	(action (name "falling-right")
+		(x-offset 2)
+		(y-offset 3)
+		(mirror-action "falling-left"))
+
+	(action (name "flat-left")
+		(x-offset 2)
+		(y-offset 3)
+		(images "flat-left.png"))
+
+	(action (name "flat-right")
+		(x-offset 2)
+		(y-offset 3)
+		(mirror-action "falling-left")))
diff --git a/data/images/creatures/skullyhop/skullyhop.sprite b/data/images/creatures/skullyhop/skullyhop.sprite
new file mode 100644
index 000000000..78e4212db
--- /dev/null
+++ b/data/images/creatures/skullyhop/skullyhop.sprite
@@ -0,0 +1,44 @@
+(supertux-sprite
+	(action
+	  (name "standing-left")
+	  (x-offset 0)
+	  (y-offset 0)
+	  (images "standing-0.png"))
+	(action
+	  (name "standing-right")
+	  (x-offset 0)
+	  (y-offset 0)
+	  (mirror-action "standing-left"))
+	(action
+	  (name "charging-left")
+	  (x-offset 0)
+	  (y-offset 0)
+	  (fps 10.0)
+	  (images "charging-0.png"
+		  "charging-1.png"))
+	(action
+	  (name "charging-right")
+	  (fps 10.0)
+	  (x-offset 0)
+	  (y-offset 0)
+	  (mirror-action "charging-left"))
+	(action
+	  (name "jumping-left")
+	  (x-offset 0)
+	  (y-offset 0)
+	  (images "jumping-0.png"))
+	(action
+	  (name "jumping-right")
+	  (x-offset 0)
+	  (y-offset 0)
+	  (mirror-action "jumping-left"))
+	(action
+	  (name "squished-left")
+	  (x-offset 0)
+	  (y-offset -14)
+	  (images "squished-0.png"))
+	(action
+	  (name "squished-right")
+	  (x-offset 0)
+	  (y-offset -14)
+	  (mirror-action "squished-left")))
diff --git a/data/images/creatures/snowsnail/snowsnail.sprite b/data/images/creatures/snowsnail/snowsnail.sprite
new file mode 100644
index 000000000..83aff2003
--- /dev/null
+++ b/data/images/creatures/snowsnail/snowsnail.sprite
@@ -0,0 +1,48 @@
+(supertux-sprite
+	(action
+	  (name "left")
+	  (x-offset 2)
+	  (y-offset 3)
+	  (images "snowsnail1.png"
+		  "snowsnail2.png"
+		  "snowsnail3.png"
+		  ))
+
+	(action (name "right")
+		(x-offset 2)
+		(y-offset 3)
+		(mirror-action "left"))
+
+	(action (name "falling-left")
+		(x-offset 2)
+		(y-offset 3)
+		(images "snowsnail_flip1.png"
+			"snowsnail_flip2.png"
+			"snowsnail_flip3.png"
+			"snowsnail_flip4.png"
+			"snowsnail_flip5.png"
+			"snowsnail_flip6.png"
+			"snowsnail_flip7.png"
+			))
+
+	(action (name "falling-right")
+		(x-offset 2)
+		(y-offset 3)
+		(mirror-action "falling-left"))
+
+	(action (name "flat-left")
+		(x-offset 2)
+		(y-offset 3)
+		(images "snowsnail_flip1.png"
+			"snowsnail_flip2.png"
+			"snowsnail_flip3.png"
+			"snowsnail_flip4.png"
+			"snowsnail_flip5.png"
+			"snowsnail_flip6.png"
+			"snowsnail_flip7.png"
+			))
+
+	(action (name "flat-right")
+		(x-offset 2)
+		(y-offset 3)
+		(mirror-action "falling-left")))
diff --git a/data/images/creatures/spidermite/spidermite.sprite b/data/images/creatures/spidermite/spidermite.sprite
new file mode 100644
index 000000000..4d02d44f4
--- /dev/null
+++ b/data/images/creatures/spidermite/spidermite.sprite
@@ -0,0 +1,25 @@
+(supertux-sprite
+	(action
+	  (name "left")
+	  (x-offset 4)
+	  (y-offset 3)
+	  (images "spidermite.png"
+		  "spidermite0.png"
+		  "spidermite1.png"
+		  "spidermite0.png"))
+	(action
+	  (name "right")
+	  (x-offset 4)
+	  (y-offset 3)
+	  (mirror-action "left"))
+
+	(action
+	  (name "squished-left")
+	  (x-offset 4)
+	  (y-offset -12)
+	  (images "spidermite-squish.png"))
+	(action
+	  (name "squished-right")
+	  (x-offset 4)
+	  (y-offset -12)
+	  (mirror-action "squished-left")))
diff --git a/data/images/creatures/stalactite/stalactite.sprite b/data/images/creatures/stalactite/stalactite.sprite
new file mode 100644
index 000000000..cc3034efb
--- /dev/null
+++ b/data/images/creatures/stalactite/stalactite.sprite
@@ -0,0 +1,11 @@
+(supertux-sprite
+	(action
+	  (name "normal")
+	  (x-offset 0)
+	  (y-offset 0)
+	  (images "falling.png"))
+	(action
+	  (name "squished")
+	  (x-offset 0)
+	  (y-offset 16)
+	  (images "broken.png")))
diff --git a/data/images/creatures/tux_big/big-fire-tux-head.sprite b/data/images/creatures/tux_big/big-fire-tux-head.sprite
new file mode 100644
index 000000000..d30bd3527
--- /dev/null
+++ b/data/images/creatures/tux_big/big-fire-tux-head.sprite
@@ -0,0 +1,107 @@
+(supertux-sprite
+       (action
+         (name "walk-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 32)
+         (images "head-fire-stand-0.png"))
+
+       (action
+         (name "walk-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "walk-right"))
+
+       (action
+         (name "stand-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 32)
+         (images "head-fire-stand-0.png"))
+
+       (action
+         (name "stand-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "stand-right"))
+
+       (action
+         (name "jump-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 30)
+         (images "head-fire-stand-0.png"))
+
+       (action
+         (name "jump-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 30)
+         (mirror-action "jump-right"))
+
+       (action
+         (name "duck-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 62)
+         (images "head-fire-duck-0.png"))
+
+       (action
+         (name "duck-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 62)
+         (mirror-action "duck-right"))
+
+       (action
+         (name "skid-right")
+         (x-offset 6)
+         (y-offset 31)
+         (images "head-fire-skid-0.png"))
+
+       (action
+         (name "skid-left")
+         (x-offset 27)
+         (y-offset 31)
+         (mirror-action "skid-right"))
+
+       (action
+         (name "kick-right")
+         (x-offset 5)
+         (y-offset 32)
+         (images "head-fire-stand-0.png"))
+
+       (action
+         (name "kick-left")
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "kick-right"))
+
+       (action
+         (name "buttjump-right")
+         (x-offset 5)
+         (y-offset 32)
+         (images "head-fire-stand-0.png"))
+
+       (action
+         (name "buttjump-left")
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "buttjump-right"))
+
+       (action
+         (name "idle-right")
+         (fps 1.0)
+         (x-offset 6)
+         (y-offset 31)
+         (images "head-idle-blink-0.png"
+                 "head-idle-blink-1.png"))
+
+       (action
+         (name "idle-left")
+         (fps 1.0)
+         (x-offset 27)
+         (y-offset 31)
+         (mirror-action "idle-right")))
diff --git a/data/images/creatures/tux_big/big-tux-arms.sprite b/data/images/creatures/tux_big/big-tux-arms.sprite
new file mode 100644
index 000000000..a79f2a046
--- /dev/null
+++ b/data/images/creatures/tux_big/big-tux-arms.sprite
@@ -0,0 +1,125 @@
+(supertux-sprite
+       (action
+         (name "walk-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 32)
+         (images "arms-walk-0.png"
+                 "arms-walk-1.png"
+                 "arms-walk-2.png"
+                 "arms-walk-3.png"
+                 "arms-walk-4.png"
+                 "arms-walk-5.png"))
+
+       (action
+         (name "walk-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "walk-right"))
+
+       (action
+         (name "stand-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 32)
+         (images "arms-stand-0.png"))
+
+       (action
+         (name "stand-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "stand-right"))
+
+       (action
+         (name "jump-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 30)
+         (images "arms-jump-0.png"))
+
+       (action
+         (name "jump-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 30)
+         (mirror-action "jump-right"))
+
+       (action
+         (name "duck-right")
+         (x-offset 5)
+         (y-offset 62)
+         (images "arms-duck-0.png"))
+
+       (action
+         (name "duck-left")
+         (x-offset 27)
+         (y-offset 62)
+         (mirror-action "duck-right"))
+
+       (action
+         (name "skid-right")
+         (x-offset 6)
+         (y-offset 31)
+         (images "arms-skid-0.png"))
+
+       (action
+         (name "skid-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 31)
+         (mirror-action "skid-right"))
+
+       (action
+         (name "kick-right")
+         (x-offset 5)
+         (y-offset 32)
+         (images "arms-stand-0.png"))
+
+       (action
+         (name "kick-left")
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "kick-right"))
+
+       (action
+         (name "buttjump-right")
+         (x-offset 5)
+         (y-offset 32)
+         (images "arms-stand-0.png"))
+
+       (action
+         (name "buttjump-left")
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "buttjump-right"))
+
+; Grabbing is arms specific!
+       (action 
+         (name "grab-right")
+         (x-offset 5)
+         (y-offset 32)
+         (z-order 2)
+         (images "arms-grab-0.png"))
+
+       (action
+         (name "grab-left")
+         (x-offset 27)
+         (y-offset 32)
+         (z-order 2)
+         (mirror-action "grab-right"))
+
+       (action
+         (name "duck+grab-right")
+         (x-offset 5)
+         (y-offset 62)
+         (z-order 2)
+         (images "arms-duck+grab-0.png"))
+
+       (action
+         (name "duck+grab-left")
+         (x-offset 27)
+         (y-offset 62)
+         (z-order 2)
+         (mirror-action "duck+grab-right")))
diff --git a/data/images/creatures/tux_big/big-tux-body.sprite b/data/images/creatures/tux_big/big-tux-body.sprite
new file mode 100644
index 000000000..ea9b4126c
--- /dev/null
+++ b/data/images/creatures/tux_big/big-tux-body.sprite
@@ -0,0 +1,95 @@
+(supertux-sprite
+       (action
+         (name "walk-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 32)
+         (images "body-stand-0.png"))
+
+       (action
+         (name "walk-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "walk-right"))
+
+       (action
+         (name "stand-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 32)
+         (images "body-stand-0.png"))
+
+       (action
+         (name "stand-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "stand-right"))
+
+       (action
+         (name "jump-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 30)
+         (images "body-stand-0.png"))
+
+       (action
+         (name "jump-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 30)
+         (mirror-action "jump-right"))
+
+       (action
+         (name "duck-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 62)
+         (images "body-duck-0.png"))
+
+       (action
+         (name "duck-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 62)
+         (mirror-action "duck-right"))
+
+       (action
+         (name "skid-right")
+         (x-offset 6)
+         (y-offset 31)
+         (images "body-skid-0.png"))
+
+       (action
+         (name "skid-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 31)
+         (mirror-action "skid-right"))
+
+       (action
+         (name "kick-right")
+         (x-offset 5)
+         (y-offset 32)
+         (images "body-stand-0.png"))
+
+       (action
+         (name "kick-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "kick-right"))
+
+       (action
+         (name "buttjump-right")
+         (x-offset 5)
+         (y-offset 32)
+         (images "body-stand-0.png"))
+
+       (action
+         (name "buttjump-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "buttjump-right")))
diff --git a/data/images/creatures/tux_big/big-tux-feet.sprite b/data/images/creatures/tux_big/big-tux-feet.sprite
new file mode 100644
index 000000000..ace4e1a5c
--- /dev/null
+++ b/data/images/creatures/tux_big/big-tux-feet.sprite
@@ -0,0 +1,97 @@
+(supertux-sprite
+       (action
+         (name "walk-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 32)
+         (images "feet-walk-0.png"
+                 "feet-walk-1.png"
+                 "feet-walk-2.png"
+                 "feet-walk-3.png"
+                 "feet-walk-4.png"
+                 "feet-walk-5.png"))
+
+       (action
+         (name "walk-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "walk-right"))
+
+       (action
+         (name "stand-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 32)
+         (images "feet-stand-0.png"))
+
+       (action
+         (name "stand-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "stand-right"))
+
+       (action
+         (name "jump-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 30)
+         (images "feet-jump-0.png"))
+
+       (action
+         (name "jump-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 30)
+         (mirror-action "jump-right"))
+
+       (action
+         (name "duck-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 62)
+         (images "feet-duck-0.png"))
+
+       (action
+         (name "duck-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 62)
+         (mirror-action "duck-right"))
+
+       (action
+         (name "skid-right")
+         (x-offset 6)
+         (y-offset 31)
+         (images "feet-skid-0.png"))
+
+       (action
+         (name "skid-left")
+         (x-offset 27)
+         (y-offset 31)
+         (mirror-action "skid-right"))
+
+       (action
+         (name "kick-right")
+         (x-offset 5)
+         (y-offset 32)
+         (images "feet-kick-0.png"))
+
+       (action
+         (name "kick-left")
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "kick-right"))
+
+       (action
+         (name "buttjump-right")
+         (x-offset 5)
+         (y-offset 32)
+         (images "feet-buttjump-0.png"))
+
+       (action
+         (name "buttjump-left")
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "buttjump-right")))
diff --git a/data/images/creatures/tux_big/big-tux-head.sprite b/data/images/creatures/tux_big/big-tux-head.sprite
new file mode 100644
index 000000000..5cc7f37a8
--- /dev/null
+++ b/data/images/creatures/tux_big/big-tux-head.sprite
@@ -0,0 +1,110 @@
+(supertux-sprite
+       (action
+         (name "walk-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 32)
+         (images "head-stand-0.png"))
+
+       (action
+         (name "walk-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "walk-right"))
+
+       (action
+         (name "stand-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 32)
+         (images "head-stand-0.png"))
+
+       (action
+         (name "stand-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "stand-right"))
+
+       (action
+         (name "jump-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 30)
+         (images "head-stand-0.png"))
+
+       (action
+         (name "jump-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 30)
+         (mirror-action "jump-right"))
+
+       (action
+         (name "duck-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 62)
+         (images "head-duck-0.png"))
+
+       (action
+         (name "duck-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 62)
+         (mirror-action "duck-right"))
+
+       (action
+         (name "skid-right")
+         (x-offset 6)
+         (y-offset 31)
+         (images "head-skid-0.png"))
+
+       (action
+         (name "skid-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 31)
+         (mirror-action "skid-right"))
+
+       (action
+         (name "kick-right")
+         (x-offset 5)
+         (y-offset 32)
+         (images "head-stand-0.png"))
+
+       (action
+         (name "kick-left")
+         (fps 15.0)
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "kick-right"))
+
+       (action
+         (name "buttjump-right")
+         (x-offset 5)
+         (y-offset 32)
+         (images "head-stand-0.png"))
+
+       (action
+         (name "buttjump-left")
+         (x-offset 27)
+         (y-offset 32)
+         (mirror-action "buttjump-right"))
+
+       (action
+         (name "idle-right")
+         (fps 1.0)
+         (x-offset 6)
+         (y-offset 31)
+         (images "head-idle-blink-0.png"
+                 "head-idle-blink-1.png"))
+
+
+       (action
+         (name "idle-left")
+         (fps 1.0)
+         (x-offset 27)
+         (y-offset 31)
+         (mirror-action "idle-right")))
diff --git a/data/images/creatures/tux_big/bigtux-star.sprite b/data/images/creatures/tux_big/bigtux-star.sprite
new file mode 100644
index 000000000..791ea566e
--- /dev/null
+++ b/data/images/creatures/tux_big/bigtux-star.sprite
@@ -0,0 +1,7 @@
+(supertux-sprite
+       (action
+         (x-offset 8)
+         (y-offset 8)
+         (images "extra-star-0.png"
+                 "extra-star-1.png"
+                 "extra-star-2.png")))
diff --git a/data/images/creatures/tux_grow/tux-grow-left.sprite.old b/data/images/creatures/tux_grow/tux-grow-left.sprite.old
new file mode 100644
index 000000000..26d994610
--- /dev/null
+++ b/data/images/creatures/tux_grow/tux-grow-left.sprite.old
@@ -0,0 +1,12 @@
+(supertux-sprite
+       (action
+          (fps 4.0)
+          (x-offset 6)
+          (y-offset 2)
+          (images "left-1.png"
+                  "left-2.png"
+                  "left-3.png"
+                  "left-4.png"
+                  "left-5.png"
+                  "left-6.png"
+                  "left-7.png")))
diff --git a/data/images/creatures/tux_grow/tux-grow-right.sprite.old b/data/images/creatures/tux_grow/tux-grow-right.sprite.old
new file mode 100644
index 000000000..eefff2e54
--- /dev/null
+++ b/data/images/creatures/tux_grow/tux-grow-right.sprite.old
@@ -0,0 +1,12 @@
+(supertux-sprite
+        (action
+          (fps 4.0)
+          (x-offset 6)
+          (y-offset 2)
+          (images "right-1.png"
+                  "right-2.png"
+                  "right-3.png"
+                  "right-4.png"
+                  "right-5.png"
+                  "right-6.png"
+                  "right-7.png")))
diff --git a/data/images/creatures/tux_small/small-tux-arms.sprite b/data/images/creatures/tux_small/small-tux-arms.sprite
new file mode 100644
index 000000000..ec2c1413b
--- /dev/null
+++ b/data/images/creatures/tux_small/small-tux-arms.sprite
@@ -0,0 +1,89 @@
+(supertux-sprite
+       (action
+         (name "walk-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 14)
+         (images "arms-walk-0.png"
+                 "arms-walk-1.png"
+                 "arms-walk-2.png"
+                 "arms-walk-3.png"
+                 "arms-walk-4.png"
+                 "arms-walk-5.png"
+                 "arms-walk-6.png"
+                 "arms-walk-7.png"))
+
+       (action
+         (name "walk-left")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 14)
+         (mirror-action "walk-right"))
+
+       (action
+         (name "stand-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 14)
+         (images "arms-walk-5.png"))
+
+       (action
+         (name "stand-left")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 14)
+         (mirror-action "stand-right"))
+
+       (action
+         (name "jump-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 14)
+         (images "arms-jump-0.png"))
+
+       (action
+         (name "jump-left")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 14)
+         (mirror-action "jump-right"))
+
+       (action
+         (name "skid-right")
+         (x-offset 6)
+         (y-offset 15)
+         (images "arms-skid-0.png"))
+
+       (action
+         (name "skid-left")
+         (fps 15.0)
+         (x-offset 6)
+         (y-offset 15)
+         (mirror-action "skid-right"))
+
+       (action
+         (name "kick-right")
+         (x-offset 5)
+         (y-offset 14)
+         (images "arms-kick-0.png"))
+
+       (action
+         (name "kick-left")
+         (x-offset 5)
+         (y-offset 14)
+         (mirror-action "kick-right"))
+
+; Grabbing is arms specific!
+       (action 
+         (name "grab-right")
+         (x-offset 5)
+         (y-offset 14)
+         (z-order 2)
+         (images "arms-grab-0.png"))
+
+       (action
+         (name "grab-left")
+         (x-offset 5)
+         (y-offset 14)
+         (z-order 2)
+         (mirror-action "grab-right")))
diff --git a/data/images/creatures/tux_small/small-tux-body.sprite b/data/images/creatures/tux_small/small-tux-body.sprite
new file mode 100644
index 000000000..4ad1e104c
--- /dev/null
+++ b/data/images/creatures/tux_small/small-tux-body.sprite
@@ -0,0 +1,73 @@
+(supertux-sprite
+       (action
+         (name "walk-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 14)
+         (images "body-walk-0.png"
+                 "body-walk-1.png"
+                 "body-walk-2.png"
+                 "body-walk-3.png"
+                 "body-walk-4.png"
+                 "body-walk-5.png"
+                 "body-walk-6.png"
+                 "body-walk-7.png"))
+
+       (action
+         (name "walk-left")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 14)
+         (mirror-action "walk-right"))
+
+       (action
+         (name "stand-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 14)
+         (images "body-walk-5.png"))
+
+       (action
+         (name "stand-left")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 14)
+         (mirror-action "stand-right"))
+
+       (action
+         (name "jump-right")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 14)
+         (images "body-jump-0.png"))
+
+       (action
+         (name "jump-left")
+         (fps 15.0)
+         (x-offset 5)
+         (y-offset 14)
+         (mirror-action "jump-right"))
+
+       (action
+         (name "skid-right")
+         (x-offset 6)
+         (y-offset 15)
+         (images "body-skid-0.png"))
+
+       (action
+         (name "skid-left")
+         (x-offset 6)
+         (y-offset 15)
+         (mirror-action "skid-right"))
+
+       (action
+         (name "kick-right")
+         (x-offset 5)
+         (y-offset 14)
+         (images "body-kick-0.png"))
+
+       (action
+         (name "kick-left")
+         (x-offset 5)
+         (y-offset 14)
+         (mirror-action "kick-right")))
diff --git a/data/images/creatures/tux_small/smalltux-gameover.sprite b/data/images/creatures/tux_small/smalltux-gameover.sprite
new file mode 100644
index 000000000..0a96764a8
--- /dev/null
+++ b/data/images/creatures/tux_small/smalltux-gameover.sprite
@@ -0,0 +1,7 @@
+(supertux-sprite
+       (action
+         (fps 10.0)
+         (x-offset 13)
+         (y-offset 6)
+         (images "gameover-0.png"
+                 "gameover-1.png")))
diff --git a/data/images/creatures/tux_small/smalltux-star.sprite b/data/images/creatures/tux_small/smalltux-star.sprite
new file mode 100644
index 000000000..97614211f
--- /dev/null
+++ b/data/images/creatures/tux_small/smalltux-star.sprite
@@ -0,0 +1,7 @@
+(supertux-sprite
+       (action
+         (x-offset 5)
+         (y-offset 15)
+         (images "extra-star-0.png"
+                 "extra-star-1.png"
+                 "extra-star-2.png")))
diff --git a/data/images/creatures/zeekling/zeekling.sprite b/data/images/creatures/zeekling/zeekling.sprite
new file mode 100644
index 000000000..3909abf87
--- /dev/null
+++ b/data/images/creatures/zeekling/zeekling.sprite
@@ -0,0 +1,36 @@
+; Zeekling
+(supertux-sprite
+ (action
+  (name "left")
+  (x-offset 2)
+  (y-offset 4)
+  (images "left-0.png"
+   "left-1.png"
+   "left-2.png"
+   "left-3.png"))
+ (action
+  (name "right")
+  (x-offset 2)
+  (y-offset 4)
+  (mirror-action "left"))
+ (action
+  (name "squished-left")
+  (x-offset 2)
+  (y-offset -19)
+  (images "squished.png"))
+ (action
+  (name "squished-right")
+  (x-offset 2)
+  (y-offset -19)
+  (mirror-action "squished-left"))
+ (action
+  (name "diving-left")
+  (x-offset 2)
+  (y-offset 4)
+  (images "diving.png"))
+ (action
+  (name "diving-right")
+  (x-offset 2)
+  (y-offset 4)
+  (mirror-action "left")))
+
diff --git a/data/images/sprites.strf b/data/images/sprites.strf
index f81049e3c..145c17ed6 100644
--- a/data/images/sprites.strf
+++ b/data/images/sprites.strf
@@ -1,1004 +1,9 @@
 ;; -*- mode: scheme; -*-
 (supertux-resources
 
-; Small Tux sprite
- (sprite
-;; Small Tux arms
-       (name "small-tux-arms")
-       (action
-         (name "walk-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 14)
-         (images "creatures/tux_small/arms-walk-0.png"
-                 "creatures/tux_small/arms-walk-1.png"
-                 "creatures/tux_small/arms-walk-2.png"
-                 "creatures/tux_small/arms-walk-3.png"
-                 "creatures/tux_small/arms-walk-4.png"
-                 "creatures/tux_small/arms-walk-5.png"
-                 "creatures/tux_small/arms-walk-6.png"
-                 "creatures/tux_small/arms-walk-7.png"))
-
-       (action
-         (name "walk-left")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 14)
-         (mirror-action "walk-right"))
-
-       (action
-         (name "stand-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 14)
-         (images "creatures/tux_small/arms-walk-5.png"))
-
-       (action
-         (name "stand-left")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 14)
-         (mirror-action "stand-right"))
-
-       (action
-         (name "jump-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 14)
-         (images "creatures/tux_small/arms-jump-0.png"))
-
-       (action
-         (name "jump-left")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 14)
-         (mirror-action "jump-right"))
-
-       (action
-         (name "skid-right")
-         (x-offset 6)
-         (y-offset 15)
-         (images "creatures/tux_small/arms-skid-0.png"))
-
-       (action
-         (name "skid-left")
-         (fps 15.0)
-         (x-offset 6)
-         (y-offset 15)
-         (mirror-action "skid-right"))
-
-       (action
-         (name "kick-right")
-         (x-offset 5)
-         (y-offset 14)
-         (images "creatures/tux_small/arms-kick-0.png"))
-
-       (action
-         (name "kick-left")
-         (x-offset 5)
-         (y-offset 14)
-         (mirror-action "kick-right"))
-
-; Grabbing is arms specific!
-       (action 
-         (name "grab-right")
-         (x-offset 5)
-         (y-offset 14)
-         (z-order 2)
-         (images "creatures/tux_small/arms-grab-0.png"))
-
-       (action
-         (name "grab-left")
-         (x-offset 5)
-         (y-offset 14)
-         (z-order 2)
-         (mirror-action "grab-right")))
-
-;; Small Tux Body
- (sprite
-       (name "small-tux-body")
-       (action
-         (name "walk-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 14)
-         (images "creatures/tux_small/body-walk-0.png"
-                 "creatures/tux_small/body-walk-1.png"
-                 "creatures/tux_small/body-walk-2.png"
-                 "creatures/tux_small/body-walk-3.png"
-                 "creatures/tux_small/body-walk-4.png"
-                 "creatures/tux_small/body-walk-5.png"
-                 "creatures/tux_small/body-walk-6.png"
-                 "creatures/tux_small/body-walk-7.png"))
-
-       (action
-         (name "walk-left")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 14)
-         (mirror-action "walk-right"))
-
-       (action
-         (name "stand-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 14)
-         (images "creatures/tux_small/body-walk-5.png"))
-
-       (action
-         (name "stand-left")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 14)
-         (mirror-action "stand-right"))
-
-       (action
-         (name "jump-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 14)
-         (images "creatures/tux_small/body-jump-0.png"))
-
-       (action
-         (name "jump-left")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 14)
-         (mirror-action "jump-right"))
-
-       (action
-         (name "skid-right")
-         (x-offset 6)
-         (y-offset 15)
-         (images "creatures/tux_small/body-skid-0.png"))
-
-       (action
-         (name "skid-left")
-         (x-offset 6)
-         (y-offset 15)
-         (mirror-action "skid-right"))
-
-       (action
-         (name "kick-right")
-         (x-offset 5)
-         (y-offset 14)
-         (images "creatures/tux_small/body-kick-0.png"))
-
-       (action
-         (name "kick-left")
-         (x-offset 5)
-         (y-offset 14)
-         (mirror-action "kick-right")))
-
-; End of Small Tux sprite
-
-; Big Tux (no power) sprite
- (sprite
-;; Big Tux arms
-       (name "big-tux-arms")
-
-       (action
-         (name "walk-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/arms-walk-0.png"
-                 "creatures/tux_big/arms-walk-1.png"
-                 "creatures/tux_big/arms-walk-2.png"
-                 "creatures/tux_big/arms-walk-3.png"
-                 "creatures/tux_big/arms-walk-4.png"
-                 "creatures/tux_big/arms-walk-5.png"))
-
-       (action
-         (name "walk-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "walk-right"))
-
-       (action
-         (name "stand-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/arms-stand-0.png"))
-
-       (action
-         (name "stand-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "stand-right"))
-
-       (action
-         (name "jump-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 30)
-         (images "creatures/tux_big/arms-jump-0.png"))
-
-       (action
-         (name "jump-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 30)
-         (mirror-action "jump-right"))
-
-       (action
-         (name "duck-right")
-         (x-offset 5)
-         (y-offset 62)
-         (images "creatures/tux_big/arms-duck-0.png"))
-
-       (action
-         (name "duck-left")
-         (x-offset 27)
-         (y-offset 62)
-         (mirror-action "duck-right"))
-
-       (action
-         (name "skid-right")
-         (x-offset 6)
-         (y-offset 31)
-         (images "creatures/tux_big/arms-skid-0.png"))
-
-       (action
-         (name "skid-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 31)
-         (mirror-action "skid-right"))
-
-       (action
-         (name "kick-right")
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/arms-stand-0.png"))
-
-       (action
-         (name "kick-left")
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "kick-right"))
+;; Tux is now in seperate .sprite files
 
-       (action
-         (name "buttjump-right")
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/arms-stand-0.png"))
-
-       (action
-         (name "buttjump-left")
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "buttjump-right"))
-
-; Grabbing is arms specific!
-       (action 
-         (name "grab-right")
-         (x-offset 5)
-         (y-offset 32)
-         (z-order 2)
-         (images "creatures/tux_big/arms-grab-0.png"))
-
-       (action
-         (name "grab-left")
-         (x-offset 27)
-         (y-offset 32)
-         (z-order 2)
-         (mirror-action "grab-right"))
-
-       (action
-         (name "duck+grab-right")
-         (x-offset 5)
-         (y-offset 62)
-         (z-order 2)
-         (images "creatures/tux_big/arms-duck+grab-0.png"))
-
-       (action
-         (name "duck+grab-left")
-         (x-offset 27)
-         (y-offset 62)
-         (z-order 2)
-         (mirror-action "duck+grab-right")))
-
-;; Big Tux Head
- (sprite
-       (name "big-tux-head")
-       (action
-         (name "walk-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/head-stand-0.png"))
-
-       (action
-         (name "walk-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "walk-right"))
-
-       (action
-         (name "stand-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/head-stand-0.png"))
-
-       (action
-         (name "stand-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "stand-right"))
-
-       (action
-         (name "jump-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 30)
-         (images "creatures/tux_big/head-stand-0.png"))
-
-       (action
-         (name "jump-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 30)
-         (mirror-action "jump-right"))
-
-       (action
-         (name "duck-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 62)
-         (images "creatures/tux_big/head-duck-0.png"))
-
-       (action
-         (name "duck-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 62)
-         (mirror-action "duck-right"))
-
-       (action
-         (name "skid-right")
-         (x-offset 6)
-         (y-offset 31)
-         (images "creatures/tux_big/head-skid-0.png"))
-
-       (action
-         (name "skid-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 31)
-         (mirror-action "skid-right"))
-
-       (action
-         (name "kick-right")
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/head-stand-0.png"))
-
-       (action
-         (name "kick-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "kick-right"))
-
-       (action
-         (name "buttjump-right")
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/head-stand-0.png"))
-
-       (action
-         (name "buttjump-left")
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "buttjump-right"))
-
-       (action
-         (name "idle-right")
-         (fps 1.0)
-         (x-offset 6)
-         (y-offset 31)
-         (images "creatures/tux_big/head-idle-blink-0.png"
-                 "creatures/tux_big/head-idle-blink-1.png"))
-
-
-       (action
-         (name "idle-left")
-         (fps 1.0)
-         (x-offset 27)
-         (y-offset 31)
-         (mirror-action "idle-right")))
-
-;; Big Tux Body
- (sprite
-       (name "big-tux-body")
-       (action
-         (name "walk-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/body-stand-0.png"))
-
-       (action
-         (name "walk-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "walk-right"))
-
-       (action
-         (name "stand-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/body-stand-0.png"))
-
-       (action
-         (name "stand-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "stand-right"))
-
-       (action
-         (name "jump-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 30)
-         (images "creatures/tux_big/body-stand-0.png"))
-
-       (action
-         (name "jump-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 30)
-         (mirror-action "jump-right"))
-
-       (action
-         (name "duck-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 62)
-         (images "creatures/tux_big/body-duck-0.png"))
-
-       (action
-         (name "duck-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 62)
-         (mirror-action "duck-right"))
-
-       (action
-         (name "skid-right")
-         (x-offset 6)
-         (y-offset 31)
-         (images "creatures/tux_big/body-skid-0.png"))
-
-       (action
-         (name "skid-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 31)
-         (mirror-action "skid-right"))
-
-       (action
-         (name "kick-right")
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/body-stand-0.png"))
-
-       (action
-         (name "kick-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "kick-right"))
-
-       (action
-         (name "buttjump-right")
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/body-stand-0.png"))
-
-       (action
-         (name "buttjump-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "buttjump-right")))
-
-;; Big Tux Feet
- (sprite
-       (name "big-tux-feet")
-       (action
-         (name "walk-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/feet-walk-0.png"
-                 "creatures/tux_big/feet-walk-1.png"
-                 "creatures/tux_big/feet-walk-2.png"
-                 "creatures/tux_big/feet-walk-3.png"
-                 "creatures/tux_big/feet-walk-4.png"
-                 "creatures/tux_big/feet-walk-5.png"))
-
-       (action
-         (name "walk-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "walk-right"))
-
-       (action
-         (name "stand-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/feet-stand-0.png"))
-
-       (action
-         (name "stand-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "stand-right"))
-
-       (action
-         (name "jump-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 30)
-         (images "creatures/tux_big/feet-jump-0.png"))
-
-       (action
-         (name "jump-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 30)
-         (mirror-action "jump-right"))
-
-       (action
-         (name "duck-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 62)
-         (images "creatures/tux_big/feet-duck-0.png"))
-
-       (action
-         (name "duck-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 62)
-         (mirror-action "duck-right"))
-
-       (action
-         (name "skid-right")
-         (x-offset 6)
-         (y-offset 31)
-         (images "creatures/tux_big/feet-skid-0.png"))
-
-       (action
-         (name "skid-left")
-         (x-offset 27)
-         (y-offset 31)
-         (mirror-action "skid-right"))
-
-       (action
-         (name "kick-right")
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/feet-kick-0.png"))
-
-       (action
-         (name "kick-left")
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "kick-right"))
-
-       (action
-         (name "buttjump-right")
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/feet-buttjump-0.png"))
-
-       (action
-         (name "buttjump-left")
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "buttjump-right")))
-
-; End of Big Tux (no power) sprite
-
-; Big Fire Tux sprite
- ;; Big Tux Head
- (sprite
-       (name "big-fire-tux-head")
-       (action
-         (name "walk-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/head-fire-stand-0.png"))
-
-       (action
-         (name "walk-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "walk-right"))
-
-       (action
-         (name "stand-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/head-fire-stand-0.png"))
-
-       (action
-         (name "stand-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "stand-right"))
-
-       (action
-         (name "jump-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 30)
-         (images "creatures/tux_big/head-fire-stand-0.png"))
-
-       (action
-         (name "jump-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 30)
-         (mirror-action "jump-right"))
-
-       (action
-         (name "duck-right")
-         (fps 15.0)
-         (x-offset 5)
-         (y-offset 62)
-         (images "creatures/tux_big/head-fire-duck-0.png"))
-
-       (action
-         (name "duck-left")
-         (fps 15.0)
-         (x-offset 27)
-         (y-offset 62)
-         (mirror-action "duck-right"))
-
-       (action
-         (name "skid-right")
-         (x-offset 6)
-         (y-offset 31)
-         (images "creatures/tux_big/head-fire-skid-0.png"))
-
-       (action
-         (name "skid-left")
-         (x-offset 27)
-         (y-offset 31)
-         (mirror-action "skid-right"))
-
-       (action
-         (name "kick-right")
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/head-fire-stand-0.png"))
-
-       (action
-         (name "kick-left")
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "kick-right"))
-
-       (action
-         (name "buttjump-right")
-         (x-offset 5)
-         (y-offset 32)
-         (images "creatures/tux_big/head-fire-stand-0.png"))
-
-       (action
-         (name "buttjump-left")
-         (x-offset 27)
-         (y-offset 32)
-         (mirror-action "buttjump-right"))
-
-       (action
-         (name "idle-right")
-         (fps 1.0)
-         (x-offset 6)
-         (y-offset 31)
-         (images "creatures/tux_big/head-idle-blink-0.png"
-                 "creatures/tux_big/head-idle-blink-1.png"))
-
-       (action
-         (name "idle-left")
-         (fps 1.0)
-         (x-offset 27)
-         (y-offset 31)
-         (mirror-action "idle-right")))
-
-; End of Big Fire Tux sprite
-
-
- (sprite (name "smalltux-gameover")
-       (action
-         (fps 10.0)
-         (x-offset 13)
-         (y-offset 6)
-         (images "creatures/tux_small/gameover-0.png"
-                 "creatures/tux_small/gameover-1.png")))
-
- (sprite (name "smalltux-star")
-       (action
-         (x-offset 5)
-         (y-offset 15)
-         (images "creatures/tux_small/extra-star-0.png"
-                 "creatures/tux_small/extra-star-1.png"
-                 "creatures/tux_small/extra-star-2.png")))
-
- (sprite (name "bigtux-star")
-       (action
-         (x-offset 8)
-         (y-offset 8)
-         (images "creatures/tux_big/extra-star-0.png"
-                 "creatures/tux_big/extra-star-1.png"
-                 "creatures/tux_big/extra-star-2.png")))
-
-;   ;; Growing Tux animation
-;  (sprite (name "tux-grow-left")
-;        (action
-;          (fps 4.0)
-;          (x-offset 6)
-;          (y-offset 2)
-;          (images "creatures/tux_grow/left-1.png"
-;                  "creatures/tux_grow/left-2.png"
-;                  "creatures/tux_grow/left-3.png"
-;                  "creatures/tux_grow/left-4.png"
-;                  "creatures/tux_grow/left-5.png"
-;                  "creatures/tux_grow/left-6.png"
-;                  "creatures/tux_grow/left-7.png")))
-; 
-;  (sprite (name "tux-grow-right")
-;        (action
-;          (fps 4.0)
-;          (x-offset 6)
-;          (y-offset 2)
-;          (images "creatures/tux_grow/right-1.png"
-;                  "creatures/tux_grow/right-2.png"
-;                  "creatures/tux_grow/right-3.png"
-;                  "creatures/tux_grow/right-4.png"
-;                  "creatures/tux_grow/right-5.png"
-;                  "creatures/tux_grow/right-6.png"
-;                  "creatures/tux_grow/right-7.png")))
-
-
-;; Bad Guys follow
- 
- ;; MrIceBlock
- (sprite (name "mriceblock")
-    (action
-         (name "left")
-         (x-offset 2)
-         (y-offset 3)
-         (images "creatures/mr_iceblock/left-0.png"
-                 "creatures/mr_iceblock/left-1.png"
-                 "creatures/mr_iceblock/left-2.png"
-                 "creatures/mr_iceblock/left-1.png"))
-
-    (action (name "right")
-         (x-offset 2)
-         (y-offset 3)
-         (mirror-action "left"))
-
-    (action (name "falling-left")
-         (x-offset 2)
-         (y-offset 3)
-         (images "creatures/mr_iceblock/flat-left.png"))
-
-    (action (name "falling-right")
-         (x-offset 2)
-         (y-offset 3)
-         (mirror-action "falling-left"))
- 
-    (action (name "flat-left")
-         (x-offset 2)
-         (y-offset 3)
-         (images "creatures/mr_iceblock/flat-left.png"))
-
-    (action (name "flat-right")
-         (x-offset 2)
-         (y-offset 3)
-         (mirror-action "falling-left")))
- ;; SnowSnail
- (sprite (name "snowsnail")
-    (action
-         (name "left")
-         (x-offset 2)
-         (y-offset 3)
-         (images "creatures/snowsnail/snowsnail1.png"
-	         "creatures/snowsnail/snowsnail2.png"
-                 "creatures/snowsnail/snowsnail3.png"
-))
-
-    (action (name "right")
-         (x-offset 2)
-         (y-offset 3)
-         (mirror-action "left"))
-
-    (action (name "falling-left")
-         (x-offset 2)
-         (y-offset 3)
-         (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 "falling-right")
-         (x-offset 2)
-         (y-offset 3)
-         (mirror-action "falling-left"))
-
-    (action (name "flat-left")
-         (x-offset 2)
-         (y-offset 3)
-	 (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 "flat-right")
-         (x-offset 2)
-         (y-offset 3)
-         (mirror-action "falling-left")))
-
- (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 "spidermite")
-       (action
-         (name "left")
-         (x-offset 4)
-         (y-offset 3)
-         (images "creatures/spidermite/spidermite.png"
-"creatures/spidermite/spidermite0.png"
-                 "creatures/spidermite/spidermite1.png"
-"creatures/spidermite/spidermite0.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/spidermite/spidermite-squish.png"))
-       (action
-         (name "squished-right")
-         (x-offset 4)
-         (y-offset -12)
-         (mirror-action "squished-left")))
-
-; Zeekling
- (sprite (name "zeekling")
-       (action
-         (name "left")
-         (x-offset 2)
-         (y-offset 4)
-         (images "creatures/zeekling/left-0.png"
-                 "creatures/zeekling/left-1.png"
-		 "creatures/zeekling/left-2.png"
-                 "creatures/zeekling/left-3.png"))
-       (action
-         (name "right")
-         (x-offset 2)
-         (y-offset 4)
-         (mirror-action "left"))
-       (action
-         (name "squished-left")
-         (x-offset 2)
-         (y-offset -19)
-         (images "creatures/zeekling/squished.png"))
-       (action
-         (name "squished-right")
-         (x-offset 2)
-         (y-offset -19)
-         (mirror-action "squished-left"))
-       (action
-         (name "diving-left")
-         (x-offset 2)
-         (y-offset 4)
-         (images "creatures/zeekling/diving.png"))
-       (action
-         (name "diving-right")
-         (x-offset 2)
-         (y-offset 4)
-         (mirror-action "left")))
-
-; Angry Stone
- (sprite (name "angrystone")
-       (action
-         (name "idle")
-         (images "creatures/angrystone/idle-0.png"))
-       (action
-         (name "charging")
-         (images "creatures/angrystone/charging-0.png"))
-       (action
-         (name "attacking")
-         (images "creatures/angrystone/attacking-0.png")))
-
-; SkullyHop
- (sprite (name "skullyhop")
-       (action
-         (name "standing-left")
-         (x-offset 0)
-         (y-offset 0)
-         (images "creatures/skullyhop/standing-0.png"))
-       (action
-         (name "standing-right")
-         (x-offset 0)
-         (y-offset 0)
-         (mirror-action "standing-left"))
-       (action
-         (name "charging-left")
-         (x-offset 0)
-         (y-offset 0)
-         (fps 10.0)
-         (images "creatures/skullyhop/charging-0.png"
-                 "creatures/skullyhop/charging-1.png"))
-       (action
-         (name "charging-right")
-         (fps 10.0)
-         (x-offset 0)
-         (y-offset 0)
-         (mirror-action "charging-left"))
-       (action
-         (name "jumping-left")
-         (x-offset 0)
-         (y-offset 0)
-         (images "creatures/skullyhop/jumping-0.png"))
-       (action
-         (name "jumping-right")
-         (x-offset 0)
-         (y-offset 0)
-         (mirror-action "jumping-left"))
-       (action
-         (name "squished-left")
-         (x-offset 0)
-         (y-offset -14)
-         (images "creatures/skullyhop/squished-0.png"))
-       (action
-         (name "squished-right")
-         (x-offset 0)
-         (y-offset -14)
-         (mirror-action "squished-left")))
+;; Bad Guys are in separate .sprite files
 
 ;; Game elements follow
           
diff --git a/src/badguy/mriceblock.cpp b/src/badguy/mriceblock.cpp
index 782062b76..18efa2f53 100644
--- a/src/badguy/mriceblock.cpp
+++ b/src/badguy/mriceblock.cpp
@@ -35,7 +35,7 @@ MrIceBlock::MrIceBlock(const lisp::Lisp& reader)
   stay_on_platform = false;
   reader.get("stay-on-platform", stay_on_platform);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("mriceblock");
+  sprite = sprite_manager->create("images/creatures/mr_iceblock/mr_iceblock.sprite");
   set_direction = false;
 }
 
@@ -46,7 +46,7 @@ MrIceBlock::MrIceBlock(float pos_x, float pos_y, Direction d, bool stay_on_plat
   start_position.y = pos_y;
   stay_on_platform = stay_on_plat;
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("mriceblock");
+  sprite = sprite_manager->create("images/creatures/mr_iceblock/mr_iceblock.sprite");
   set_direction = true;
   initial_direction = d;
 }
diff --git a/src/badguy/skullyhop.cpp b/src/badguy/skullyhop.cpp
index 418a63fc3..db6bfcfb9 100644
--- a/src/badguy/skullyhop.cpp
+++ b/src/badguy/skullyhop.cpp
@@ -33,7 +33,7 @@ SkullyHop::SkullyHop(const lisp::Lisp& reader)
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
   bbox.set_size(33.8, 43.8); //sprite is 34x44
-  sprite = sprite_manager->create("skullyhop");
+  sprite = sprite_manager->create("images/creatures/skullyhop/skullyhop.sprite");
   has_initial_direction = false;
 }
 
@@ -42,7 +42,7 @@ SkullyHop::SkullyHop(float pos_x, float pos_y, Direction d)
   start_position.x = pos_x;
   start_position.y = pos_y;
   bbox.set_size(33.8, 43.8); //sprite is 34x44
-  sprite = sprite_manager->create("skullyhop");
+  sprite = sprite_manager->create("images/creatures/skullyhop/skullyhop.sprite");
   has_initial_direction = true;
   initial_direction = d;
 }
diff --git a/src/badguy/snowsnail.cpp b/src/badguy/snowsnail.cpp
index 446d4077b..c644dc463 100644
--- a/src/badguy/snowsnail.cpp
+++ b/src/badguy/snowsnail.cpp
@@ -33,7 +33,7 @@ SnowSnail::SnowSnail(const lisp::Lisp& reader)
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("snowsnail");
+  sprite = sprite_manager->create("images/creatures/snowsnail/snowsnail.sprite");
   set_direction = false;
 }
 
@@ -43,7 +43,7 @@ SnowSnail::SnowSnail(float pos_x, float pos_y, Direction d)
   start_position.x = pos_x;
   start_position.y = pos_y;
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("snowsnail");
+  sprite = sprite_manager->create("images/creatures/snowsnail/snowsnail.sprite");
   set_direction = true;
   initial_direction = d;
 }
diff --git a/src/badguy/spidermite.cpp b/src/badguy/spidermite.cpp
index 7e475d76f..2acd750f7 100644
--- a/src/badguy/spidermite.cpp
+++ b/src/badguy/spidermite.cpp
@@ -31,7 +31,7 @@ SpiderMite::SpiderMite(const lisp::Lisp& reader)
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("spidermite");
+  sprite = sprite_manager->create("images/creatures/spidermite/spidermite.sprite");
   physic.enable_gravity(false);
 }
 
@@ -40,7 +40,7 @@ SpiderMite::SpiderMite(float pos_x, float pos_y)
   start_position.x = pos_x;
   start_position.y = pos_y;
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("spidermite");
+  sprite = sprite_manager->create("images/creatures/spidermite/spidermite.sprite");
   physic.enable_gravity(false);
 }
 
diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp
index 03b6742c4..b06a979b2 100644
--- a/src/badguy/stalactite.cpp
+++ b/src/badguy/stalactite.cpp
@@ -31,7 +31,7 @@ Stalactite::Stalactite(const lisp::Lisp& lisp)
   lisp.get("x", start_position.x);
   lisp.get("y", start_position.y);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("stalactite");
+  sprite = sprite_manager->create("images/creatures/stalactite/stalactite.sprite");
   state = STALACTITE_HANGING;
   countMe = false;
 }
diff --git a/src/badguy/zeekling.cpp b/src/badguy/zeekling.cpp
index 65ae3e91a..f6d795d0a 100644
--- a/src/badguy/zeekling.cpp
+++ b/src/badguy/zeekling.cpp
@@ -29,7 +29,7 @@ Zeekling::Zeekling(const lisp::Lisp& reader)
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("zeekling");
+  sprite = sprite_manager->create("images/creatures/zeekling/zeekling.sprite");
   set_direction = false;
   state = FLYING;
 }
@@ -39,7 +39,7 @@ Zeekling::Zeekling(float pos_x, float pos_y, Direction d)
   start_position.x = pos_x;
   start_position.y = pos_y;
   bbox.set_size(63.8, 50.8);
-  sprite = sprite_manager->create("zeekling");
+  sprite = sprite_manager->create("images/creatures/zeekling/zeekling.sprite");
   set_direction = true;
   initial_direction = d;
   state = FLYING;
diff --git a/src/object/player.cpp b/src/object/player.cpp
index 1e354bdd8..199ff5a79 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -101,9 +101,9 @@ Player::Player(PlayerStatus* _player_status)
   : player_status(_player_status), grabbed_object(0)
 {
   controller = main_controller;
-  smalltux_gameover = sprite_manager->create("smalltux-gameover");
-  smalltux_star = sprite_manager->create("smalltux-star");
-  bigtux_star = sprite_manager->create("bigtux-star");
+  smalltux_gameover = sprite_manager->create("images/creatures/tux_small/smalltux-gameover.sprite");
+  smalltux_star = sprite_manager->create("images/creatures/tux_small/smalltux-star.sprite");
+  bigtux_star = sprite_manager->create("images/creatures/tux_big/bigtux-star.sprite");
   init();
 }
 
diff --git a/src/resources.cpp b/src/resources.cpp
index e6583862e..7d909b651 100644
--- a/src/resources.cpp
+++ b/src/resources.cpp
@@ -91,27 +91,27 @@ void load_shared()
 
   small_tux = new TuxBodyParts();
   small_tux->head = 0;
-  small_tux->body = sprite_manager->create("small-tux-body");
-  small_tux->arms = sprite_manager->create("small-tux-arms");
+  small_tux->body = sprite_manager->create("images/creatures/tux_small/small-tux-body.sprite");
+  small_tux->arms = sprite_manager->create("images/creatures/tux_small/small-tux-arms.sprite");
   small_tux->feet = 0;
 
   big_tux = new TuxBodyParts();
-  big_tux->head = sprite_manager->create("big-tux-head");
-  big_tux->body = sprite_manager->create("big-tux-body");
-  big_tux->arms = sprite_manager->create("big-tux-arms");
-  big_tux->feet = sprite_manager->create("big-tux-feet");
+  big_tux->head = sprite_manager->create("images/creatures/tux_big/big-tux-head.sprite");
+  big_tux->body = sprite_manager->create("images/creatures/tux_big/big-tux-body.sprite");
+  big_tux->arms = sprite_manager->create("images/creatures/tux_big/big-tux-arms.sprite");
+  big_tux->feet = sprite_manager->create("images/creatures/tux_big/big-tux-feet.sprite");
 
   fire_tux = new TuxBodyParts();
-  fire_tux->head = sprite_manager->create("big-fire-tux-head");
-  fire_tux->body = sprite_manager->create("big-tux-body");
-  fire_tux->arms = sprite_manager->create("big-tux-arms");
-  fire_tux->feet = sprite_manager->create("big-tux-feet");
+  fire_tux->head = sprite_manager->create("images/creatures/tux_big/big-fire-tux-head.sprite");
+  fire_tux->body = sprite_manager->create("images/creatures/tux_big/big-tux-body.sprite");
+  fire_tux->arms = sprite_manager->create("images/creatures/tux_big/big-tux-arms.sprite");
+  fire_tux->feet = sprite_manager->create("images/creatures/tux_big/big-tux-feet.sprite");
 
   ice_tux = new TuxBodyParts();
-  ice_tux->head = sprite_manager->create("big-tux-head");
-  ice_tux->body = sprite_manager->create("big-tux-body");
-  ice_tux->arms = sprite_manager->create("big-tux-arms");
-  ice_tux->feet = sprite_manager->create("big-tux-feet");
+  ice_tux->head = sprite_manager->create("images/creatures/tux_big/big-tux-head.sprite");
+  ice_tux->body = sprite_manager->create("images/creatures/tux_big/big-tux-body.sprite");
+  ice_tux->arms = sprite_manager->create("images/creatures/tux_big/big-tux-arms.sprite");
+  ice_tux->feet = sprite_manager->create("images/creatures/tux_big/big-tux-feet.sprite");
 
   /* Tux life: */
   tux_life = new Surface("images/creatures/tux_small/tux-life.png");
-- 
2.11.0