Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bag badguy animation #1648

Merged
merged 7 commits into from
Jan 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed data/images/creatures/bag/bag-bounce-3.png
Binary file not shown.
Binary file removed data/images/creatures/bag/bag-bounce-4.png
Binary file not shown.
Binary file removed data/images/creatures/bag/bag-land-4.png
Binary file not shown.
Binary file removed data/images/creatures/bag/bag-land-5.png
Binary file not shown.
47 changes: 25 additions & 22 deletions data/images/creatures/bag/bag.sprite
Original file line number Diff line number Diff line change
@@ -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"))
)
25 changes: 0 additions & 25 deletions data/images/creatures/bag/bouncing_bag.sprite

This file was deleted.

28 changes: 6 additions & 22 deletions data/levels/revenge_in_redmond/retro_age.stl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down