moved the zeekling into base

deleted unused old files

SVN-Revision: 2440

diff --git a/basest/Makefile.am b/basest/Makefile.am
deleted file mode 100644 (file)
index 7709257..0000000
--- a/basest/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-iconsdir=$(datadir)/pixmaps
-icons_DATA = images/supertux.png
-
-desktopdir = $(datadir)/applications
-desktop_DATA = supertux.desktop
-
-EXTRA_DIST = \
-  intro.txt \
-  extro.txt \
-  extro-bonus.txt \
-  credits.txt \
-  badguys.strf \
-  images/supertux.strf \
-  $(wildcard sounds/*.wav) \
-  $(wildcard images/*.png) \
-  $(wildcard images/*.xpm) \
-  $(wildcard images/background/*.png) \
-  $(wildcard images/background/*.jpg) \
-  $(wildcard images/fonts/*.png) \
-  $(wildcard images/highscore/*.png) \
-  $(wildcard images/icons/*.png) \
-  $(wildcard images/icons/*.xpm) \
-  $(wildcard images/intro/*.png) \
-  $(wildcard images/leveleditor/*.png) \
-  $(wildcard images/map/*.png) \
-  $(wildcard images/shared/*.png) \
-  $(wildcard images/shared/smalltux/*.png) \
-  $(wildcard images/shared/bigtux/*.png) \
-  $(wildcard images/status/*.png) \
-  $(wildcard images/themes/*/*.png) \
-  $(wildcard images/worldmap/*.png) \
-  $(wildcard images/worldmap/*.stwt) \
-  $(wildcard images/title/*.png) \
-  $(wildcard images/title/*.jpg) \
-  $(wildcard images/tilesets/*.png) \
-  $(wildcard images/tilesets/*.stgt) \
-  $(wildcard levels/*/*.stl) \
-  $(wildcard levels/*/*.stwm) \
-  $(wildcard levels/*/info) \
-  $(wildcard music/*.mod) \
-  $(wildcard music/*.MOD) \
-  $(wildcard sounds/*.wav)
-
-nobase_dist_pkgdata_DATA = $(EXTRA_DIST)
-
-# EOF #

diff --git a/basest/badguys.strf b/basest/badguys.strf
deleted file mode 100644 (file)
index ff2b33c..0000000
--- a/basest/badguys.strf
+++ /dev/null
@@ -1,59 +0,0 @@
-; Bad Guys(tm) config file
-(supertux-badguys-specifications 
-  (badguy
-    (kind "mriceblock")
-    (sprite "mriceblock")
-  )
-  (badguy
-    (kind "jumpy")
-    (sprite "jumpy")
-  )
-  (badguy
-    (kind "mrbomb")
-    (sprite "mrbomb")
-  )
-  (badguy
-    (kind "bomb")
-    (sprite "bomb")
-  )
-  (badguy
-    (kind "stalactite")
-    (sprite "stalactite")
-  )
-  (badguy
-    (kind "flame")
-    (sprite "flame")
-  )
-  (badguy
-    (kind "fish")
-    (sprite "fish")
-  )
-  (badguy
-    (kind "flamefish")
-    (sprite "flamefish")
-  )
-  (badguy
-    (kind "bouncingsnowball")
-    (sprite "bouncingsnowball")
-  )
-  (badguy
-    (kind "flyingsnowball")
-    (sprite "flyingsnowball")
-  )
-  (badguy
-    (kind "spiky")
-    (sprite "spiky")
-  )
-  (badguy
-    (kind "snowball")
-    (sprite "snowball")
-  )
-  (badguy
-    (kind "wingling")
-    (sprite "wingling")
-  )
-  (badguy
-    (kind "walkingtree")
-    (sprite "walkingtree")
-  )
-)

diff --git a/basest/images/creatures/zeekling/left-0.png b/basest/images/creatures/zeekling/left-0.png
new file mode 100644 (file)
index 0000000..2b8081d
Binary files /dev/null and b/basest/images/creatures/zeekling/left-0.png differ

diff --git a/basest/images/creatures/zeekling/left-1.png b/basest/images/creatures/zeekling/left-1.png
new file mode 100644 (file)
index 0000000..e6604cc
Binary files /dev/null and b/basest/images/creatures/zeekling/left-1.png differ

diff --git a/basest/images/creatures/zeekling/left-2.png b/basest/images/creatures/zeekling/left-2.png
new file mode 100644 (file)
index 0000000..aa36cf2
Binary files /dev/null and b/basest/images/creatures/zeekling/left-2.png differ

diff --git a/basest/images/creatures/zeekling/left-3.png b/basest/images/creatures/zeekling/left-3.png
new file mode 100644 (file)
index 0000000..64544e6
Binary files /dev/null and b/basest/images/creatures/zeekling/left-3.png differ

diff --git a/basest/images/creatures/zeekling/squished.png b/basest/images/creatures/zeekling/squished.png
new file mode 100644 (file)
index 0000000..f6cdcf9
Binary files /dev/null and b/basest/images/creatures/zeekling/squished.png differ

diff --git a/basest/images/sprites.strf b/basest/images/sprites.strf
index d7a1f57..c3a4abe 100644 (file)
--- a/basest/images/sprites.strf
+++ b/basest/images/sprites.strf
@@ -1290,6 +1290,31 @@
          (y-offset -19)
          (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 1)
+         (y-offset -19)
+         (images "creatures/zeekling/squished.png"))
+       (action
+         (name "squished-right")
+         (x-offset 1)
+         (y-offset -19)
+         (mirror-action "squished-left")))
          
 ;; Game elements follow
           

diff --git a/basest/levels/world2/level1.stl b/basest/levels/world2/level1.stl
index d9d66c8..a6d2b5b 100644 (file)
--- a/basest/levels/world2/level1.stl
+++ b/basest/levels/world2/level1.stl
@@ -393,7 +393,12 @@
                     (height 65.0)
                     (message "You have found a secret area!"))
       (infoblock (x 2816) (y 1600)
-        (message (_ " Hint: If there seems to be no way to reach a door, remember that maybe you are supposed to reach it from the other side..."))
+        (message (_ "-Hint:
+#If there seems to be
+#no way to reach a door,
+#remember that you might
+#be supposed to come out
+#of that door..."))
       )
        (particles-rain
        )

diff --git a/contrib/images/shared/zeekling-sprite-1.png b/contrib/images/shared/zeekling-sprite-1.png
deleted file mode 100644 (file)
index 2b8081d..0000000
Binary files a/contrib/images/shared/zeekling-sprite-1.png and /dev/null differ

diff --git a/contrib/images/shared/zeekling-sprite-2.png b/contrib/images/shared/zeekling-sprite-2.png
deleted file mode 100644 (file)
index e6604cc..0000000
Binary files a/contrib/images/shared/zeekling-sprite-2.png and /dev/null differ

diff --git a/contrib/images/shared/zeekling-sprite-3.png b/contrib/images/shared/zeekling-sprite-3.png
deleted file mode 100644 (file)
index aa36cf2..0000000
Binary files a/contrib/images/shared/zeekling-sprite-3.png and /dev/null differ

diff --git a/contrib/images/shared/zeekling-sprite-4.png b/contrib/images/shared/zeekling-sprite-4.png
deleted file mode 100644 (file)
index 64544e6..0000000
Binary files a/contrib/images/shared/zeekling-sprite-4.png and /dev/null differ

diff --git a/contrib/images/xcf/ghostforest.xcf b/contrib/images/xcf/ghostforest.xcf
new file mode 100644 (file)
index 0000000..337f462
Binary files /dev/null and b/contrib/images/xcf/ghostforest.xcf differ