diff --git a/data/images/creatures/bag/bag-bounce-3.png b/data/images/creatures/bag/bag-bounce-3.png deleted file mode 100644 index 8ca2fec6d9c..00000000000 Binary files a/data/images/creatures/bag/bag-bounce-3.png and /dev/null differ diff --git a/data/images/creatures/bag/bag-bounce-4.png b/data/images/creatures/bag/bag-bounce-4.png deleted file mode 100644 index 8b57113bfb5..00000000000 Binary files a/data/images/creatures/bag/bag-bounce-4.png and /dev/null differ diff --git a/data/images/creatures/bag/bag-land-4.png b/data/images/creatures/bag/bag-land-4.png deleted file mode 100644 index 10e977458b0..00000000000 Binary files a/data/images/creatures/bag/bag-land-4.png and /dev/null differ diff --git a/data/images/creatures/bag/bag-land-5.png b/data/images/creatures/bag/bag-land-5.png deleted file mode 100644 index 5eab8e93b95..00000000000 Binary files a/data/images/creatures/bag/bag-land-5.png and /dev/null differ diff --git a/data/images/creatures/bag/bag.sprite b/data/images/creatures/bag/bag.sprite index 3df630a7cb2..8501f70d352 100644 --- a/data/images/creatures/bag/bag.sprite +++ b/data/images/creatures/bag/bag.sprite @@ -1,58 +1,61 @@ (supertux-sprite (action (name "left-up") - (hitbox 7 8 31.8 31.8) - (images "bag-bounce-0.png") - (images "bag-bounce-1.png") - (images "bag-bounce-2.png") - (images "bag-bounce-3.png") - (images "bag-bounce-4.png")) + (loops 1) + (fps 25) + (hitbox 7 12 31.8 31.8) + (images "bag-land-2.png" + "bag-land-1.png" + "bag-land-0.png" + "bag-bounce-1.png" + "bag-bounce-2.png" + "bag-bounce-2.png" + "bag-bounce-1.png" + "bag-bounce-0.png")) (action (name "right-up") - (hitbox 7 8 31.8 31.8) + (loops 1) + (fps 25) + (hitbox 7 12 31.8 31.8) (mirror-action "left-up")) (action (name "left-down") - (hitbox 7 8 31.8 31.8) - (images "bag-land-0.png") - (images "bag-land-1.png") - (images "bag-land-2.png") - (images "bag-land-3.png") - (images "bag-land-4.png") - (images "bag-land-5.png")) + (hitbox 7 12 31.8 31.8) + (images "bag-land-3.png")) (action (name "right-down") - (hitbox 7 8 31.8 31.8) + (hitbox 7 12 31.8 31.8) (mirror-action "left-down")) (action (name "left-middle") - (hitbox 7 8 31.8 31.8) - (images "bag-bounce-0.png")) + (hitbox 7 12 31.8 31.8) + (images "bag-land-3.png")) (action (name "right-middle") - (hitbox 7 8 31.8 31.8) + (hitbox 7 12 31.8 31.8) (mirror-action "left-middle")) (action (name "iced-left") - (hitbox 7 8 31.8 31.8) + (hitbox 7 12 31.8 31.8) (images "iced-left-up.png")) (action (name "iced-right") - (hitbox 7 8 31.8 31.8) + (hitbox 7 12 31.8 31.8) (mirror-action "iced-left")) (action (name "editor-left") - (clone-action "left-middle")) + (hitbox 7 12 31.8 31.8) + (images "bag-bounce-0.png")) (action (name "editor-right") - (clone-action "right-middle")) + (mirror-action "editor-left")) ) diff --git a/data/images/creatures/bag/bouncing_bag.sprite b/data/images/creatures/bag/bouncing_bag.sprite deleted file mode 100644 index 8ef503dabf0..00000000000 --- a/data/images/creatures/bag/bouncing_bag.sprite +++ /dev/null @@ -1,25 +0,0 @@ -(supertux-sprite - (action - (name "left") - (fps 20) - (hitbox 16 7 32 32) - (images "bag-bounce-0.png" - "bag-bounce-1.png" - "bag-bounce-2.png" - "bag-bounce-3.png" - "bag-bounce-4.png" - ) - ) - (action - (name "right") - (fps 20) - (hitbox 16 7 32 32) - (mirror-action "left") - ) - - (action - (name "squished") - (hitbox 0 0 32 32) - (images "bag-squished.png") - ) -) diff --git a/data/levels/revenge_in_redmond/retro_age.stl b/data/levels/revenge_in_redmond/retro_age.stl index 46e76344def..b8e14a930d8 100644 --- a/data/levels/revenge_in_redmond/retro_age.stl +++ b/data/levels/revenge_in_redmond/retro_age.stl @@ -109,74 +109,68 @@ ) (bouncingsnowball (direction "left") - (sprite "/images/creatures/bag/bouncing_bag.sprite") + (sprite "/images/creatures/bouncing_snowball/bouncing_snowball.sprite") (x 6816) (y 1152) ) (bouncingsnowball (direction "left") - (sprite "/images/creatures/bag/bouncing_bag.sprite") + (sprite "/images/creatures/bouncing_snowball/bouncing_snowball.sprite") (x 6976) (y 1152) ) (bouncingsnowball (direction "left") - (sprite "/images/creatures/bag/bouncing_bag.sprite") + (sprite "/images/creatures/bouncing_snowball/bouncing_snowball.sprite") (x 7136) (y 1152) ) (bouncingsnowball (direction "left") - (sprite "/images/creatures/bag/bouncing_bag.sprite") + (sprite "/images/creatures/bouncing_snowball/bouncing_snowball.sprite") (x 10496) (y 992) ) (bouncingsnowball (direction "left") - (sprite "/images/creatures/bag/bouncing_bag.sprite") + (sprite "/images/creatures/bouncing_snowball/bouncing_snowball.sprite") (x 10624) (y 928) ) (bouncingsnowball (direction "left") - (sprite "/images/creatures/bag/bouncing_bag.sprite") + (sprite "/images/creatures/bouncing_snowball/bouncing_snowball.sprite") (x 10752) (y 864) ) (brick (x 1760) (y 928) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (brick (x 1792) (y 928) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (brick (x 1888) (y 928) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (brick (x 1920) (y 928) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (brick (x 2880) (y 928) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (brick (x 2912) (y 928) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (camera @@ -1019,61 +1013,51 @@ (brick (x 1952) (y 1024) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (brick (x 1984) (y 1024) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (brick (x 2208) (y 1024) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (brick (x 2240) (y 1024) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (brick (x 2464) (y 1024) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (brick (x 2496) (y 1024) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (brick (x 7040) (y 992) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (brick (x 7008) (y 992) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (brick (x 6912) (y 992) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (brick (x 6880) (y 992) - (sprite "/images/objects/bonus_block/retro_brick.sprite") (breakable #t) ) (camera