From: Christoph Sommer Date: Sat, 26 Jan 2008 00:05:33 +0000 (+0000) Subject: Single-Sprite Ice Tux, equalized Sprite dimensions across Big, Fire and Ice X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b278ab12b0618cdaffae4afb179750ff2dcded6d;p=supertux.git Single-Sprite Ice Tux, equalized Sprite dimensions across Big, Fire and Ice SVN-Revision: 5296 --- diff --git a/data/images/creatures/tux/big/backflip-0.png b/data/images/creatures/tux/big/backflip-0.png index a3291d2e1..c34457f07 100644 Binary files a/data/images/creatures/tux/big/backflip-0.png and b/data/images/creatures/tux/big/backflip-0.png differ diff --git a/data/images/creatures/tux/big/backflip-1.png b/data/images/creatures/tux/big/backflip-1.png index bd86934b7..6968e0057 100644 Binary files a/data/images/creatures/tux/big/backflip-1.png and b/data/images/creatures/tux/big/backflip-1.png differ diff --git a/data/images/creatures/tux/big/backflip-2.png b/data/images/creatures/tux/big/backflip-2.png index 7974fcab3..51c5c7565 100644 Binary files a/data/images/creatures/tux/big/backflip-2.png and b/data/images/creatures/tux/big/backflip-2.png differ diff --git a/data/images/creatures/tux/big/backflip-3.png b/data/images/creatures/tux/big/backflip-3.png index f3c6fecad..ca871dd32 100644 Binary files a/data/images/creatures/tux/big/backflip-3.png and b/data/images/creatures/tux/big/backflip-3.png differ diff --git a/data/images/creatures/tux/big/backflip-4.png b/data/images/creatures/tux/big/backflip-4.png index 9c21a7b51..24883e6a8 100644 Binary files a/data/images/creatures/tux/big/backflip-4.png and b/data/images/creatures/tux/big/backflip-4.png differ diff --git a/data/images/creatures/tux/big/buttjump-0.png b/data/images/creatures/tux/big/buttjump-0.png index 6354fa983..086562be4 100644 Binary files a/data/images/creatures/tux/big/buttjump-0.png and b/data/images/creatures/tux/big/buttjump-0.png differ diff --git a/data/images/creatures/tux/big/duck-0.png b/data/images/creatures/tux/big/duck-0.png index 2f4c9bbb5..ef880d4c4 100644 Binary files a/data/images/creatures/tux/big/duck-0.png and b/data/images/creatures/tux/big/duck-0.png differ diff --git a/data/images/creatures/tux/big/idle-0.png b/data/images/creatures/tux/big/idle-0.png index 8b72f0d3a..9709d7869 100644 Binary files a/data/images/creatures/tux/big/idle-0.png and b/data/images/creatures/tux/big/idle-0.png differ diff --git a/data/images/creatures/tux/big/idle-1.png b/data/images/creatures/tux/big/idle-1.png index 65508b22e..0d71ef651 100644 Binary files a/data/images/creatures/tux/big/idle-1.png and b/data/images/creatures/tux/big/idle-1.png differ diff --git a/data/images/creatures/tux/big/jump-0.png b/data/images/creatures/tux/big/jump-0.png index e2ef7d29c..88567350b 100644 Binary files a/data/images/creatures/tux/big/jump-0.png and b/data/images/creatures/tux/big/jump-0.png differ diff --git a/data/images/creatures/tux/big/kick-0.png b/data/images/creatures/tux/big/kick-0.png index a494c7ecf..452063710 100644 Binary files a/data/images/creatures/tux/big/kick-0.png and b/data/images/creatures/tux/big/kick-0.png differ diff --git a/data/images/creatures/tux/big/skid-0.png b/data/images/creatures/tux/big/skid-0.png index 3b1d54a32..797ee90fe 100644 Binary files a/data/images/creatures/tux/big/skid-0.png and b/data/images/creatures/tux/big/skid-0.png differ diff --git a/data/images/creatures/tux/big/stand-0.png b/data/images/creatures/tux/big/stand-0.png index ef6800c8a..c61b9d6e9 100644 Binary files a/data/images/creatures/tux/big/stand-0.png and b/data/images/creatures/tux/big/stand-0.png differ diff --git a/data/images/creatures/tux/big/walk-0.png b/data/images/creatures/tux/big/walk-0.png index 0bd06aeb8..7e3b61dba 100644 Binary files a/data/images/creatures/tux/big/walk-0.png and b/data/images/creatures/tux/big/walk-0.png differ diff --git a/data/images/creatures/tux/big/walk-1.png b/data/images/creatures/tux/big/walk-1.png index 50e22264e..8e7db2008 100644 Binary files a/data/images/creatures/tux/big/walk-1.png and b/data/images/creatures/tux/big/walk-1.png differ diff --git a/data/images/creatures/tux/big/walk-2.png b/data/images/creatures/tux/big/walk-2.png index 0acc74dfe..d67bbcead 100644 Binary files a/data/images/creatures/tux/big/walk-2.png and b/data/images/creatures/tux/big/walk-2.png differ diff --git a/data/images/creatures/tux/big/walk-3.png b/data/images/creatures/tux/big/walk-3.png index 991945074..e386fa349 100644 Binary files a/data/images/creatures/tux/big/walk-3.png and b/data/images/creatures/tux/big/walk-3.png differ diff --git a/data/images/creatures/tux/big/walk-4.png b/data/images/creatures/tux/big/walk-4.png index 1a746c1ff..f03ce2e3e 100644 Binary files a/data/images/creatures/tux/big/walk-4.png and b/data/images/creatures/tux/big/walk-4.png differ diff --git a/data/images/creatures/tux/big/walk-5.png b/data/images/creatures/tux/big/walk-5.png index 81396fbd3..be4097c30 100644 Binary files a/data/images/creatures/tux/big/walk-5.png and b/data/images/creatures/tux/big/walk-5.png differ diff --git a/data/images/creatures/tux/ice/backflip-0.png b/data/images/creatures/tux/ice/backflip-0.png new file mode 100644 index 000000000..fb7359121 Binary files /dev/null and b/data/images/creatures/tux/ice/backflip-0.png differ diff --git a/data/images/creatures/tux/ice/backflip-1.png b/data/images/creatures/tux/ice/backflip-1.png new file mode 100644 index 000000000..68e7f5584 Binary files /dev/null and b/data/images/creatures/tux/ice/backflip-1.png differ diff --git a/data/images/creatures/tux/ice/backflip-2.png b/data/images/creatures/tux/ice/backflip-2.png new file mode 100644 index 000000000..bab771a51 Binary files /dev/null and b/data/images/creatures/tux/ice/backflip-2.png differ diff --git a/data/images/creatures/tux/ice/backflip-3.png b/data/images/creatures/tux/ice/backflip-3.png new file mode 100644 index 000000000..9e08b07fa Binary files /dev/null and b/data/images/creatures/tux/ice/backflip-3.png differ diff --git a/data/images/creatures/tux/ice/backflip-4.png b/data/images/creatures/tux/ice/backflip-4.png new file mode 100644 index 000000000..fb7359121 Binary files /dev/null and b/data/images/creatures/tux/ice/backflip-4.png differ diff --git a/data/images/creatures/tux/ice/buttjump-0.png b/data/images/creatures/tux/ice/buttjump-0.png new file mode 100644 index 000000000..99a1f41da Binary files /dev/null and b/data/images/creatures/tux/ice/buttjump-0.png differ diff --git a/data/images/creatures/tux/ice/duck-0.png b/data/images/creatures/tux/ice/duck-0.png new file mode 100644 index 000000000..ee3abd105 Binary files /dev/null and b/data/images/creatures/tux/ice/duck-0.png differ diff --git a/data/images/creatures/tux/ice/idle-0.png b/data/images/creatures/tux/ice/idle-0.png new file mode 100644 index 000000000..63828da03 Binary files /dev/null and b/data/images/creatures/tux/ice/idle-0.png differ diff --git a/data/images/creatures/tux/ice/idle-1.png b/data/images/creatures/tux/ice/idle-1.png new file mode 100644 index 000000000..fdebee816 Binary files /dev/null and b/data/images/creatures/tux/ice/idle-1.png differ diff --git a/data/images/creatures/tux/ice/jump-0.png b/data/images/creatures/tux/ice/jump-0.png new file mode 100644 index 000000000..10acb9574 Binary files /dev/null and b/data/images/creatures/tux/ice/jump-0.png differ diff --git a/data/images/creatures/tux/ice/kick-0.png b/data/images/creatures/tux/ice/kick-0.png new file mode 100644 index 000000000..dcc51b169 Binary files /dev/null and b/data/images/creatures/tux/ice/kick-0.png differ diff --git a/data/images/creatures/tux/ice/skid-0.png b/data/images/creatures/tux/ice/skid-0.png new file mode 100644 index 000000000..f8b639dc5 Binary files /dev/null and b/data/images/creatures/tux/ice/skid-0.png differ diff --git a/data/images/creatures/tux/ice/stand-0.png b/data/images/creatures/tux/ice/stand-0.png new file mode 100644 index 000000000..b62aa677f Binary files /dev/null and b/data/images/creatures/tux/ice/stand-0.png differ diff --git a/data/images/creatures/tux/ice/walk-0.png b/data/images/creatures/tux/ice/walk-0.png new file mode 100644 index 000000000..e18d23fde Binary files /dev/null and b/data/images/creatures/tux/ice/walk-0.png differ diff --git a/data/images/creatures/tux/ice/walk-1.png b/data/images/creatures/tux/ice/walk-1.png new file mode 100644 index 000000000..ed2a779d0 Binary files /dev/null and b/data/images/creatures/tux/ice/walk-1.png differ diff --git a/data/images/creatures/tux/ice/walk-2.png b/data/images/creatures/tux/ice/walk-2.png new file mode 100644 index 000000000..7e3a4a856 Binary files /dev/null and b/data/images/creatures/tux/ice/walk-2.png differ diff --git a/data/images/creatures/tux/ice/walk-3.png b/data/images/creatures/tux/ice/walk-3.png new file mode 100644 index 000000000..87346e015 Binary files /dev/null and b/data/images/creatures/tux/ice/walk-3.png differ diff --git a/data/images/creatures/tux/ice/walk-4.png b/data/images/creatures/tux/ice/walk-4.png new file mode 100644 index 000000000..adabf3381 Binary files /dev/null and b/data/images/creatures/tux/ice/walk-4.png differ diff --git a/data/images/creatures/tux/ice/walk-5.png b/data/images/creatures/tux/ice/walk-5.png new file mode 100644 index 000000000..77efab80a Binary files /dev/null and b/data/images/creatures/tux/ice/walk-5.png differ diff --git a/data/images/creatures/tux/small/grow-0.png b/data/images/creatures/tux/small/grow-0.png index 26b7b58e7..e93da887c 100644 Binary files a/data/images/creatures/tux/small/grow-0.png and b/data/images/creatures/tux/small/grow-0.png differ diff --git a/data/images/creatures/tux/small/grow-1.png b/data/images/creatures/tux/small/grow-1.png index 8f47e5d12..5c0e41d94 100644 Binary files a/data/images/creatures/tux/small/grow-1.png and b/data/images/creatures/tux/small/grow-1.png differ diff --git a/data/images/creatures/tux/small/grow-2.png b/data/images/creatures/tux/small/grow-2.png index 9c3a7469b..7d747d051 100644 Binary files a/data/images/creatures/tux/small/grow-2.png and b/data/images/creatures/tux/small/grow-2.png differ diff --git a/data/images/creatures/tux/small/grow-3.png b/data/images/creatures/tux/small/grow-3.png index c8d898185..4f53edc7a 100644 Binary files a/data/images/creatures/tux/small/grow-3.png and b/data/images/creatures/tux/small/grow-3.png differ diff --git a/data/images/creatures/tux/small/grow-4.png b/data/images/creatures/tux/small/grow-4.png index f26062598..94a9b931a 100644 Binary files a/data/images/creatures/tux/small/grow-4.png and b/data/images/creatures/tux/small/grow-4.png differ diff --git a/data/images/creatures/tux/small/grow-5.png b/data/images/creatures/tux/small/grow-5.png index e88f67771..4ee1218c4 100644 Binary files a/data/images/creatures/tux/small/grow-5.png and b/data/images/creatures/tux/small/grow-5.png differ diff --git a/data/images/creatures/tux/small/grow-6.png b/data/images/creatures/tux/small/grow-6.png index 8641e8f5a..47b19859a 100644 Binary files a/data/images/creatures/tux/small/grow-6.png and b/data/images/creatures/tux/small/grow-6.png differ diff --git a/data/images/creatures/tux/tux.sprite b/data/images/creatures/tux/tux.sprite index 9f32b1aca..4061305d0 100644 --- a/data/images/creatures/tux/tux.sprite +++ b/data/images/creatures/tux/tux.sprite @@ -89,7 +89,7 @@ (action (name "grow-right") (fps 5.0) - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (images "small/grow-0.png" "small/grow-1.png" "small/grow-2.png" @@ -100,7 +100,7 @@ (action (name "grow-left") - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (mirror-action "grow-right")) @@ -109,7 +109,7 @@ (action (name "big-walk-right") (fps 15.0) - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (images "big/walk-0.png" "big/walk-1.png" "big/walk-2.png" @@ -120,64 +120,64 @@ (action (name "big-walk-left") (fps 15.0) - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (mirror-action "big-walk-right")) (action (name "big-stand-right") (fps 15.0) - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (images "big/stand-0.png")) (action (name "big-stand-left") (fps 15.0) - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (mirror-action "big-stand-right")) (action (name "big-jump-right") (fps 15.0) - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (images "big/jump-0.png")) (action (name "big-jump-left") (fps 15.0) - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (mirror-action "big-jump-right")) (action (name "big-skid-right") - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (images "big/skid-0.png")) (action (name "big-skid-left") - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (mirror-action "big-skid-right")) (action (name "big-kick-right") - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (images "big/kick-0.png")) (action (name "big-kick-left") - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (mirror-action "big-kick-right")) (action (name "big-idle-right") (fps 5.0) - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (images "big/idle-0.png" "big/idle-1.png" "big/idle-0.png")) (action (name "big-idle-left") - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (mirror-action "big-idle-right")) (action @@ -213,12 +213,12 @@ (action (name "big-buttjump-right") - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (images "big/buttjump-0.png")) (action (name "big-buttjump-left") - (hitbox 16 5 32 64) + (hitbox 16 13 32 64) (mirror-action "big-buttjump-right")) ; Fire Tux @@ -338,5 +338,121 @@ (hitbox 16 13 32 64) (mirror-action "fire-buttjump-right")) +; Fire Tux + + (action + (name "ice-walk-right") + (fps 15.0) + (hitbox 16 13 32 64) + (images "ice/walk-0.png" + "ice/walk-1.png" + "ice/walk-2.png" + "ice/walk-3.png" + "ice/walk-4.png" + "ice/walk-5.png")) + + (action + (name "ice-walk-left") + (fps 15.0) + (hitbox 16 13 32 64) + (mirror-action "ice-walk-right")) + + (action + (name "ice-stand-right") + (fps 15.0) + (hitbox 16 13 32 64) + (images "ice/stand-0.png")) + + (action + (name "ice-stand-left") + (fps 15.0) + (hitbox 16 13 32 64) + (mirror-action "ice-stand-right")) + + (action + (name "ice-jump-right") + (fps 15.0) + (hitbox 16 13 32 64) + (images "ice/jump-0.png")) + + (action + (name "ice-jump-left") + (fps 15.0) + (hitbox 16 13 32 64) + (mirror-action "ice-jump-right")) + + (action + (name "ice-skid-right") + (hitbox 16 13 32 64) + (images "ice/skid-0.png")) + + (action + (name "ice-skid-left") + (hitbox 16 13 32 64) + (mirror-action "ice-skid-right")) + + (action + (name "ice-kick-right") + (hitbox 16 13 32 64) + (images "ice/kick-0.png")) + + (action + (name "ice-kick-left") + (hitbox 16 13 32 64) + (mirror-action "ice-kick-right")) + + (action + (name "ice-idle-right") + (fps 5.0) + (hitbox 16 13 32 64) + (images "ice/idle-0.png" + "ice/idle-1.png" + "ice/idle-0.png")) + + (action + (name "ice-idle-left") + (hitbox 16 13 32 64) + (mirror-action "ice-idle-right")) + + (action + (name "ice-duck-right") + (hitbox 16 37 32 32) + (images "ice/duck-0.png")) + + (action + (name "ice-duck-left") + (hitbox 16 37 32 32) + (mirror-action "ice-duck-right")) + + (action + (name "ice-backflip-right") + (hitbox 16 37 32 32) + (fps 9.0) + (images "ice/backflip-0.png" + "ice/backflip-1.png" + "ice/backflip-2.png" + "ice/backflip-3.png" + "ice/backflip-4.png" + "ice/backflip-0.png" + "ice/backflip-0.png" + "ice/backflip-0.png" + "ice/backflip-0.png" + "ice/backflip-0.png")) + + (action + (name "ice-backflip-left") + (hitbox 16 37 32 32) + (fps 9.0) + (mirror-action "ice-backflip-right")) + + (action + (name "ice-buttjump-right") + (hitbox 16 13 32 64) + (images "ice/buttjump-0.png")) + + (action + (name "ice-buttjump-left") + (hitbox 16 13 32 64) + (mirror-action "ice-buttjump-right")) ) diff --git a/src/object/player.cpp b/src/object/player.cpp index e6cce1f4b..24192560a 100644 --- a/src/object/player.cpp +++ b/src/object/player.cpp @@ -913,7 +913,7 @@ Player::draw(DrawingContext& context) else if (player_status->bonus == FIRE_BONUS) sa_prefix = "fire"; else if (player_status->bonus == ICE_BONUS) - sa_prefix = "fire"; + sa_prefix = "ice"; else sa_prefix = "small";