From: LMH Date: Sun, 14 Dec 2014 12:40:28 +0000 (-1000) Subject: Reduced number of needed powerup hat images X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b761ae23a0330537b33154b4ab3c1d24ee10a2f0;p=supertux.git Reduced number of needed powerup hat images --- diff --git a/data/images/creatures/tux/air/hat/walk-0.png b/data/images/creatures/tux/air/hat/walk-0.png index 8e1db06fa..96600cd19 100644 Binary files a/data/images/creatures/tux/air/hat/walk-0.png and b/data/images/creatures/tux/air/hat/walk-0.png differ diff --git a/data/images/creatures/tux/air/hat/walk-1.png b/data/images/creatures/tux/air/hat/walk-1.png index 0337b3ae9..9049f8447 100644 Binary files a/data/images/creatures/tux/air/hat/walk-1.png and b/data/images/creatures/tux/air/hat/walk-1.png differ diff --git a/data/images/creatures/tux/air/hat/walk-2.png b/data/images/creatures/tux/air/hat/walk-2.png deleted file mode 100644 index 20ba9b55a..000000000 Binary files a/data/images/creatures/tux/air/hat/walk-2.png and /dev/null differ diff --git a/data/images/creatures/tux/earth/hardhat/walk-0.png b/data/images/creatures/tux/earth/hardhat/walk-0.png index 2b13056d0..d0e46f2dc 100644 Binary files a/data/images/creatures/tux/earth/hardhat/walk-0.png and b/data/images/creatures/tux/earth/hardhat/walk-0.png differ diff --git a/data/images/creatures/tux/earth/hardhat/walk-1.png b/data/images/creatures/tux/earth/hardhat/walk-1.png index b8e924d70..86c72b8ec 100644 Binary files a/data/images/creatures/tux/earth/hardhat/walk-1.png and b/data/images/creatures/tux/earth/hardhat/walk-1.png differ diff --git a/data/images/creatures/tux/earth/hardhat/walk-2.png b/data/images/creatures/tux/earth/hardhat/walk-2.png deleted file mode 100644 index b2369de59..000000000 Binary files a/data/images/creatures/tux/earth/hardhat/walk-2.png and /dev/null differ diff --git a/data/images/creatures/tux/powerups.sprite b/data/images/creatures/tux/powerups.sprite index 846f33305..e6cf2b8ed 100644 --- a/data/images/creatures/tux/powerups.sprite +++ b/data/images/creatures/tux/powerups.sprite @@ -4,23 +4,23 @@ (name "AUTO") (images "../../objects/bonus_block/invisible.png")) -; Earth Tux +; Air Tux (action (name "air-walk-right") (fps 15) - (hitbox 16 14 32 64) + (hitbox 15 14 32 64) (images "air/hat/walk-0.png" "air/hat/walk-1.png" - "air/hat/walk-2.png" + "air/hat/stand.png" "air/hat/walk-0.png" "air/hat/walk-1.png" - "air/hat/walk-2.png")) + "air/hat/stand.png")) (action (name "air-walk-left") (fps 15) - (hitbox 16 14 32 64) + (hitbox 17 14 32 64) (mirror-action "air-walk-right")) (action @@ -125,18 +125,18 @@ (action (name "earth-walk-right") (fps 15) - (hitbox 16 14 32 64) + (hitbox 15 14 32 64) (images "earth/hardhat/walk-0.png" "earth/hardhat/walk-1.png" - "earth/hardhat/walk-2.png" + "earth/hardhat/stand.png" "earth/hardhat/walk-0.png" "earth/hardhat/walk-1.png" - "earth/hardhat/walk-2.png")) + "earth/hardhat/stand.png")) (action (name "earth-walk-left") (fps 15) - (hitbox 16 14 32 64) + (hitbox 17 14 32 64) (mirror-action "earth-walk-right")) (action