Removed images associated with a second yeti defeat animation sprite, removed superbi...

SVN-Revision: 3464

diff --git a/data/images/creatures/tux_big/superbig_tux.png b/data/images/creatures/tux_big/superbig_tux.png
deleted file mode 100644 (file)
index 41ca05e..0000000
Binary files a/data/images/creatures/tux_big/superbig_tux.png and /dev/null differ

diff --git a/data/images/creatures/yeti/busted1.png b/data/images/creatures/yeti/busted1.png
index ce841df..2e588e3 100644 (file)
Binary files a/data/images/creatures/yeti/busted1.png and b/data/images/creatures/yeti/busted1.png differ

diff --git a/data/images/creatures/yeti/busted2.png b/data/images/creatures/yeti/busted2.png
index 7ff5c72..f0bcca4 100644 (file)
Binary files a/data/images/creatures/yeti/busted2.png and b/data/images/creatures/yeti/busted2.png differ

diff --git a/data/images/creatures/yeti/y-jump2.png b/data/images/creatures/yeti/y-jump2.png
index df1a0de..2b7692a 100644 (file)
Binary files a/data/images/creatures/yeti/y-jump2.png and b/data/images/creatures/yeti/y-jump2.png differ

diff --git a/data/images/creatures/yeti/y-jump2_h2.png b/data/images/creatures/yeti/y-jump2_h2.png
deleted file mode 100644 (file)
index bb01c26..0000000
Binary files a/data/images/creatures/yeti/y-jump2_h2.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y-jump2_h2_a.png b/data/images/creatures/yeti/y-jump2_h2_a.png
deleted file mode 100644 (file)
index a2c7ac0..0000000
Binary files a/data/images/creatures/yeti/y-jump2_h2_a.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y-jump_h1.png b/data/images/creatures/yeti/y-jump_h1.png
deleted file mode 100644 (file)
index dfecc63..0000000
Binary files a/data/images/creatures/yeti/y-jump_h1.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y-jump_h1_a.png b/data/images/creatures/yeti/y-jump_h1_a.png
deleted file mode 100644 (file)
index 3544d4b..0000000
Binary files a/data/images/creatures/yeti/y-jump_h1_a.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y.png b/data/images/creatures/yeti/y.png
index ec1a089..177c124 100644 (file)
Binary files a/data/images/creatures/yeti/y.png and b/data/images/creatures/yeti/y.png differ

diff --git a/data/images/creatures/yeti/y1.png b/data/images/creatures/yeti/y1.png
index d5e29a5..e605da9 100644 (file)
Binary files a/data/images/creatures/yeti/y1.png and b/data/images/creatures/yeti/y1.png differ

diff --git a/data/images/creatures/yeti/y1_h1.png b/data/images/creatures/yeti/y1_h1.png
deleted file mode 100644 (file)
index 27d642b..0000000
Binary files a/data/images/creatures/yeti/y1_h1.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y1_h1_a.png b/data/images/creatures/yeti/y1_h1_a.png
deleted file mode 100644 (file)
index 1499bb9..0000000
Binary files a/data/images/creatures/yeti/y1_h1_a.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y2.png b/data/images/creatures/yeti/y2.png
index 530a406..69f2fee 100644 (file)
Binary files a/data/images/creatures/yeti/y2.png and b/data/images/creatures/yeti/y2.png differ

diff --git a/data/images/creatures/yeti/y2_h1.png b/data/images/creatures/yeti/y2_h1.png
deleted file mode 100644 (file)
index c88bade..0000000
Binary files a/data/images/creatures/yeti/y2_h1.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y2_h1_a.png b/data/images/creatures/yeti/y2_h1_a.png
deleted file mode 100644 (file)
index f4b84e6..0000000
Binary files a/data/images/creatures/yeti/y2_h1_a.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y3.png b/data/images/creatures/yeti/y3.png
index 5649428..2581d7d 100644 (file)
Binary files a/data/images/creatures/yeti/y3.png and b/data/images/creatures/yeti/y3.png differ

diff --git a/data/images/creatures/yeti/y3_h1.png b/data/images/creatures/yeti/y3_h1.png
deleted file mode 100644 (file)
index f2e7834..0000000
Binary files a/data/images/creatures/yeti/y3_h1.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y3_h1_a.png b/data/images/creatures/yeti/y3_h1_a.png
deleted file mode 100644 (file)
index d0a1dd3..0000000
Binary files a/data/images/creatures/yeti/y3_h1_a.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y4.png b/data/images/creatures/yeti/y4.png
index 5fb6226..501d816 100644 (file)
Binary files a/data/images/creatures/yeti/y4.png and b/data/images/creatures/yeti/y4.png differ

diff --git a/data/images/creatures/yeti/y4_h1.png b/data/images/creatures/yeti/y4_h1.png
deleted file mode 100644 (file)
index ff56626..0000000
Binary files a/data/images/creatures/yeti/y4_h1.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y4_h1_a.png b/data/images/creatures/yeti/y4_h1_a.png
deleted file mode 100644 (file)
index fec855e..0000000
Binary files a/data/images/creatures/yeti/y4_h1_a.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y5.png b/data/images/creatures/yeti/y5.png
index 3a0ad88..55406bd 100644 (file)
Binary files a/data/images/creatures/yeti/y5.png and b/data/images/creatures/yeti/y5.png differ

diff --git a/data/images/creatures/yeti/y5_h1.png b/data/images/creatures/yeti/y5_h1.png
deleted file mode 100644 (file)
index 61f73e3..0000000
Binary files a/data/images/creatures/yeti/y5_h1.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y5_h1_a.png b/data/images/creatures/yeti/y5_h1_a.png
deleted file mode 100644 (file)
index 9bf9292..0000000
Binary files a/data/images/creatures/yeti/y5_h1_a.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y6.png b/data/images/creatures/yeti/y6.png
index 2db7365..c499a5a 100644 (file)
Binary files a/data/images/creatures/yeti/y6.png and b/data/images/creatures/yeti/y6.png differ

diff --git a/data/images/creatures/yeti/y6_h1.png b/data/images/creatures/yeti/y6_h1.png
deleted file mode 100644 (file)
index 079b1c7..0000000
Binary files a/data/images/creatures/yeti/y6_h1.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y6_h1_a.png b/data/images/creatures/yeti/y6_h1_a.png
deleted file mode 100644 (file)
index 826a13d..0000000
Binary files a/data/images/creatures/yeti/y6_h1_a.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y7.png b/data/images/creatures/yeti/y7.png
index f685dad..4a8fda6 100644 (file)
Binary files a/data/images/creatures/yeti/y7.png and b/data/images/creatures/yeti/y7.png differ

diff --git a/data/images/creatures/yeti/y7_h1.png b/data/images/creatures/yeti/y7_h1.png
deleted file mode 100644 (file)
index 02c93f9..0000000
Binary files a/data/images/creatures/yeti/y7_h1.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y7_h1_a.png b/data/images/creatures/yeti/y7_h1_a.png
deleted file mode 100644 (file)
index 9ac8102..0000000
Binary files a/data/images/creatures/yeti/y7_h1_a.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y_h1.png b/data/images/creatures/yeti/y_h1.png
deleted file mode 100644 (file)
index 6ec95fb..0000000
Binary files a/data/images/creatures/yeti/y_h1.png and /dev/null differ

diff --git a/data/images/creatures/yeti/y_h1_a.png b/data/images/creatures/yeti/y_h1_a.png
deleted file mode 100644 (file)
index 5a2b37d..0000000
Binary files a/data/images/creatures/yeti/y_h1_a.png and /dev/null differ

diff --git a/data/images/creatures/yeti/yeti.sprite b/data/images/creatures/yeti/yeti.sprite
index 50218d3..c18790f 100644 (file)
--- a/data/images/creatures/yeti/yeti.sprite
+++ b/data/images/creatures/yeti/yeti.sprite
@@ -65,15 +65,14 @@
     )
   (action
     (name "dead")
-    (fps 2)
+    (fps 3)
     (images 
       "busted1.png"
-      "busted2.png"
-      "busted3.png"
-      "../tux_big/superbig_tux.png"
-      "../tux_big/superbig_tux.png"
-      "../tux_big/superbig_tux.png"
-      "../tux_big/superbig_tux.png"
+ "busted1.png"
+ "busted2.png"
+ "busted1.png"
+ "busted2.png"
+
       )
     (x-offset 300)
     (y-offset 400)

diff --git a/data/images/creatures/yeti/yeti.sprite~ b/data/images/creatures/yeti/yeti.sprite~
index d9b4f6b..88aa349 100644 (file)
--- a/data/images/creatures/yeti/yeti.sprite~
+++ b/data/images/creatures/yeti/yeti.sprite~
@@ -1,85 +1,78 @@
 (supertux-sprite
   (action
     (name "run-right")
-    (fps 8.0)
+    (fps 4.0)
     (x-offset 17)
-    (y-offset 34)
+    (y-offset 12)
     (images 
-      "y1_h1.png"
-      "y1_h1_a.png"
-      "y2_h1.png"
-      "y2_h1_a.png"
-      "y3_h1.png"
-      "y3_h1_a.png"
-      "y4_h1.png"      
-      "y4_h1_a.png" 
-      "y5_h1.png"
-      "y5_h1_a.png"
-      "y6_h1.png"
-      "y6_h1_a.png"
-      "y7_h1.png" 
-      "y7_h1_a.png"
+      "y1.png"
+      "y2.png"
+      "y3.png"
+      "y4.png"     
+      "y5.png"
+      "y6.png"
+      "y7.png"
       )
     )
   (action
     (name "run-left")
     (mirror-action "run-right")
-    (fps 8.0)
+    (fps 4.0)
     (x-offset 17)
-    (y-offset 34)
+    (y-offset 12)
     )
   (action
     (name "jump-right")
     (images 
-      "yeti_jump_h1.png"
-      "yeti_jump_h1_a.png"
+      "yeti_jump.png"
       )
     (x-offset 17)
-    (y-offset 34)
+    (y-offset 12)
     )
   (action
     (name "jump-left")
     (mirror-action "jump-right")
     (x-offset 17)
-    (y-offset 34)
+    (y-offset 12)
     )
   (action
     (name "stand-right")
     (images 
-      "y_h1.png"
-      "y_h1_a.png"
+      "y.png"
       )
     (x-offset 17)
-    (y-offset 34)
+    (y-offset 12)
     )
   (action
     (name "stand-left")
     (mirror-action "stand-right")
     (x-offset 17)
-    (y-offset 34)
+    (y-offset 12)
     )
   (action
     (name "stomp-right")
     (images 
-      "y-jump_h1.png"
-      "y-jump_h1_a.png"
+      "y-jump.png"
       )
     (x-offset 17)
-    (y-offset 34)
+    (y-offset 12)
     )
   (action
     (name "stomp-left")
     (mirror-action "stomp-right")
     (x-offset 17)
-    (y-offset 34)
+    (y-offset 12)
     )
   (action
     (name "dead")
     (fps 1)
     (images 
       "busted1.png"
-      "busted4.png"
-      "busted4.png"
+ "busted1.png"
+ "busted2.png"
+ "busted1.png"
+ "busted2.png"
+
       )
     (x-offset 300)
     (y-offset 400)

diff --git a/data/images/creatures/yeti/yeti_ONE_HIT.sprite b/data/images/creatures/yeti/yeti_ONE_HIT.sprite
deleted file mode 100644 (file)
index 9fb43a5..0000000
--- a/data/images/creatures/yeti/yeti_ONE_HIT.sprite
+++ /dev/null
@@ -1,87 +0,0 @@
-(supertux-sprite
-  (action
-    (name "run-right")
-    (fps 8.0)
-    (x-offset 17)
-    (y-offset 34)
-    (images 
-      "y1_h1.png"
-      "y1_h1_a.png"
-      "y2_h1.png"
-      "y2_h1_a.png"
-      "y3_h1.png"
-      "y3_h1_a.png"
-      "y4_h1.png"      
-      "y4_h1_a.png" 
-      "y5_h1.png"
-      "y5_h1_a.png"
-      "y6_h1.png"
-      "y6_h1_a.png"
-      "y7_h1.png" 
-      "y7_h1_a.png"
-      )
-    )
-  (action
-    (name "run-left")
-    (mirror-action "run-right")
-    (fps 8.0)
-    (x-offset 17)
-    (y-offset 34)
-    )
-  (action
-    (name "jump-right")
-    (images 
-      "yeti_jump_h1.png"
-      "yeti_jump_h1_a.png"
-      )
-    (x-offset 17)
-    (y-offset 34)
-    )
-  (action
-    (name "jump-left")
-    (mirror-action "jump-right")
-    (x-offset 17)
-    (y-offset 34)
-    )
-  (action
-    (name "stand-right")
-    (images 
-      "y_h1.png"
-      "y_h1_a.png"
-      )
-    (x-offset 17)
-    (y-offset 34)
-    )
-  (action
-    (name "stand-left")
-    (mirror-action "stand-right")
-    (x-offset 17)
-    (y-offset 34)
-    )
-  (action
-    (name "stomp-right")
-    (images 
-      "y-jump_h1.png"
-      "y-jump_h1_a.png"
-      )
-    (x-offset 17)
-    (y-offset 34)
-    )
-  (action
-    (name "stomp-left")
-    (mirror-action "stomp-right")
-    (x-offset 17)
-    (y-offset 34)
-    )
-  (action
-    (name "dead")
-    (fps 1)
-    (images 
-      "busted1.png"
-      "busted2.png"
-      "busted3.png"
-      )
-    (x-offset 300)
-    (y-offset 400)
-    )
-  )

diff --git a/data/images/creatures/yeti/yeti_jump_h1.png b/data/images/creatures/yeti/yeti_jump_h1.png
deleted file mode 100644 (file)
index 1daff33..0000000
Binary files a/data/images/creatures/yeti/yeti_jump_h1.png and /dev/null differ

diff --git a/data/images/creatures/yeti/yeti_jump_h1_a.png b/data/images/creatures/yeti/yeti_jump_h1_a.png
deleted file mode 100644 (file)
index 37da857..0000000
Binary files a/data/images/creatures/yeti/yeti_jump_h1_a.png and /dev/null differ