From: Stephen Groundwater Date: Sun, 30 Apr 2006 15:44:52 +0000 (+0000) Subject: Removed images associated with a second yeti defeat animation sprite, removed superbi... X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=74725a22655d6cd9427a59b20c42bbea78bbdd40;p=supertux.git Removed images associated with a second yeti defeat animation sprite, removed superbig_tug image (decided against using this), added rough test image ideas for yeti defeat animation (now with birdies over head). 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 index 41ca05e1c..000000000 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 ce841dfdb..2e588e3de 100644 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 7ff5c72eb..f0bcca47e 100644 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 df1a0dec5..2b7692acf 100644 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 index bb01c26c1..000000000 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 index a2c7ac039..000000000 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 index dfecc6357..000000000 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 index 3544d4b4d..000000000 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 ec1a089e3..177c124a9 100644 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 d5e29a565..e605da977 100644 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 index 27d642b80..000000000 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 index 1499bb94f..000000000 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 530a4067b..69f2fee38 100644 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 index c88badea4..000000000 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 index f4b84e632..000000000 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 5649428bf..2581d7daf 100644 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 index f2e7834d1..000000000 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 index d0a1dd32b..000000000 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 5fb622656..501d816e0 100644 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 index ff5662660..000000000 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 index fec855e97..000000000 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 3a0ad887b..55406bdfe 100644 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 index 61f73e3ec..000000000 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 index 9bf92928b..000000000 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 2db736525..c499a5a82 100644 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 index 079b1c7d6..000000000 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 index 826a13d70..000000000 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 f685dad2b..4a8fda6f8 100644 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 index 02c93f9bf..000000000 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 index 9ac810212..000000000 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 index 6ec95fba4..000000000 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 index 5a2b37d7c..000000000 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 50218d368..c18790fc7 100644 --- 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 d9b4f6b84..88aa34958 100644 --- 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 index 9fb43a58a..000000000 --- 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 index 1daff33d2..000000000 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 index 37da8570a..000000000 Binary files a/data/images/creatures/yeti/yeti_jump_h1_a.png and /dev/null differ