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

Update flamed enemies with an overlay like ice #3133

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
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/fatbat/burn-0.png
Binary file not shown.
Binary file removed data/images/creatures/fatbat/burn-1.png
Binary file not shown.
Binary file removed data/images/creatures/fatbat/burn-10.png
Binary file not shown.
Binary file removed data/images/creatures/fatbat/burn-2.png
Binary file not shown.
Binary file removed data/images/creatures/fatbat/burn-3.png
Binary file not shown.
Binary file removed data/images/creatures/fatbat/burn-4.png
Binary file not shown.
Binary file removed data/images/creatures/fatbat/burn-5.png
Binary file not shown.
Binary file removed data/images/creatures/fatbat/burn-6.png
Binary file not shown.
Binary file removed data/images/creatures/fatbat/burn-7.png
Binary file not shown.
Binary file removed data/images/creatures/fatbat/burn-8.png
Binary file not shown.
Binary file removed data/images/creatures/fatbat/burn-9.png
Binary file not shown.
36 changes: 12 additions & 24 deletions data/images/creatures/fatbat/fatbat.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -62,30 +62,7 @@
(name "squished-right")
(hitbox 34 15 32 38)
(mirror-action "squished-left")
)
(action
(name "burning-left")
(fps 15)
(hitbox 30 15 32 38)
(images "burn-0.png"
"burn-1.png"
"burn-2.png"
"burn-3.png"
"burn-4.png"
"burn-5.png"
"burn-6.png"
"burn-7.png"
"burn-8.png"
"burn-9.png"
"burn-10.png"
)
)
(action
(name "burning-right")
(fps 15)
(hitbox 34 15 32 38)
(mirror-action "burning-left")
)
)

(action
(name "iced-left")
Expand All @@ -106,5 +83,16 @@
(fps 20)
(loops 1)
(mirror-action "left"))

(action
(hitbox 15 0 64 64)
(name "burning-left")
(clone-action "iced-left")
)
(action
(hitbox 15 0 64 64)
(name "burning-right")
(mirror-action "burning-left")
)

)
12 changes: 11 additions & 1 deletion data/images/creatures/fish/forest/bluefish.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@
(action
(name "iced-right")
(hitbox 2 10 64 43)
(mirror-action "iced-left"))
(mirror-action "iced-left"))

(action
(hitbox 2 10 64 43)
(name "burning-left")
(clone-action "iced-left"))

(action
(hitbox 2 10 64 43)
(name "burning-right")
(mirror-action "burning-left"))

)
10 changes: 10 additions & 0 deletions data/images/creatures/fish/forest/brownfish.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
(action
(name "iced-right")
(hitbox 1 0 64 64)
(mirror-action "iced-left"))

(action
(name "burning-left")
(hitbox -1 0 64 64)
(images "swim_blue-0.png"))

(action
(name "burning-right")
(hitbox 1 0 64 64)
(mirror-action "iced-left"))

)
Binary file removed data/images/creatures/fish/forest/burning-0.png
Binary file not shown.
Binary file removed data/images/creatures/fish/forest/burning-1.png
Binary file not shown.
Binary file removed data/images/creatures/fish/forest/burning-2.png
Binary file not shown.
Binary file removed data/images/creatures/fish/forest/burning-3.png
Binary file not shown.
Binary file removed data/images/creatures/fish/forest/burning-4.png
Binary file not shown.
Binary file removed data/images/creatures/fish/forest/burning-5.png
Binary file not shown.
Binary file removed data/images/creatures/fish/forest/burning-6.png
Binary file not shown.
Binary file removed data/images/creatures/fish/forest/burning-7.png
Binary file not shown.
Binary file removed data/images/creatures/fish/forest/burning-8.png
Binary file not shown.
Binary file removed data/images/creatures/fish/forest/burning-9.png
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,14 @@
(hitbox 8 15 48 35)
(mirror-action "iced-left"))

(action
(hitbox 8 15 48 35)
(name "burning-left")
(clone-action "iced-left"))

(action
(hitbox 8 15 48 35)
(name "burning-right")
(mirror-action "burning-left"))

)
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,14 @@
(hitbox 12 10 46 46)
(mirror-action "iced-left"))

(action
(name "burning-left")
(hitbox 8 10 46 46)
(images "swim_blue-0.png"))

(action
(name "burning-right")
(hitbox 12 10 46 46)
(mirror-action "iced-left"))

)
19 changes: 5 additions & 14 deletions data/images/creatures/fish/forest/jumpfish.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,11 @@
(action
(name "iced-down")
(hitbox 14 9 45 64)
(images "wait_blue-1.png"))
(images "wait_blue-1.png"))

(action
(name "burning-left")
(fps 15)
(hitbox 4 29 32 32)
(images "burning-0.png"
"burning-1.png"
"burning-2.png"
"burning-3.png"
"burning-4.png"
"burning-5.png"
"burning-6.png"
"burning-7.png"
"burning-8.png"
"burning-9.png"))
(hitbox 9 24 45 64)
(images "jump_blue-0.png"))

)
10 changes: 10 additions & 0 deletions data/images/creatures/fish/ice/bluefish.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,14 @@
(hitbox 2 10 64 43)
(mirror-action "iced-left"))

(action
(hitbox 2 10 64 43)
(name "burning-left")
(clone-action "iced-left"))

(action
(hitbox 2 10 64 43)
(name "burning-right")
(mirror-action "burning-left"))

)
10 changes: 10 additions & 0 deletions data/images/creatures/fish/ice/greenfish.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,14 @@
(hitbox 0 0 64 64)
(mirror-action "iced-left"))

(action
(hitbox 0 0 64 64)
(name "burning-left")
(clone-action "iced-left"))

(action
(hitbox 0 0 64 64)
(name "burning-right")
(mirror-action "burning-left"))

)
Binary file removed data/images/creatures/igel/burning-0.png
Binary file not shown.
Binary file removed data/images/creatures/igel/burning-1.png
Binary file not shown.
Binary file removed data/images/creatures/igel/burning-2.png
Binary file not shown.
Binary file removed data/images/creatures/igel/burning-3.png
Binary file not shown.
Binary file removed data/images/creatures/igel/burning-4.png
Diff not rendered.
Binary file removed data/images/creatures/igel/burning-5.png
Diff not rendered.
Binary file removed data/images/creatures/igel/burning-6.png
Diff not rendered.
Binary file removed data/images/creatures/igel/burning-7.png
Diff not rendered.
Binary file removed data/images/creatures/igel/burning-8.png
Diff not rendered.
Binary file removed data/images/creatures/igel/burning-9.png
Diff not rendered.
17 changes: 3 additions & 14 deletions data/images/creatures/igel/corrupted/corrupted_igel.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -80,24 +80,13 @@
(mirror-action "iced-left")
)
(action
(hitbox 2 18 64 43)
(name "burning-left")
(hitbox 15 10 36 32)
(fps 15)
(images "../burning-0.png"
"../burning-1.png"
"../burning-2.png"
"../burning-3.png"
"../burning-4.png"
"../burning-5.png"
"../burning-6.png"
"../burning-7.png"
"../burning-8.png"
"../burning-9.png")
(clone-action "iced-left")
)
(action
(hitbox 2 18 64 43)
(name "burning-right")
(fps 15)
(hitbox 17 10 36 32)
(mirror-action "burning-left")
)
)
19 changes: 4 additions & 15 deletions data/images/creatures/igel/igel.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -78,26 +78,15 @@
(name "iced-right")
(hitbox 2 4 64 43)
(mirror-action "iced-left")
)
)
(action
(hitbox 2 4 64 43)
(name "burning-left")
(hitbox 15 10 36 32)
(fps 15)
(images "burning-0.png"
"burning-1.png"
"burning-2.png"
"burning-3.png"
"burning-4.png"
"burning-5.png"
"burning-6.png"
"burning-7.png"
"burning-8.png"
"burning-9.png")
(clone-action "iced-left")
)
(action
(hitbox 2 4 64 43)
(name "burning-right")
(fps 15)
(hitbox 17 10 36 32)
(mirror-action "burning-left")
)
)
17 changes: 3 additions & 14 deletions data/images/creatures/jumpy/corruptjumpy.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,13 @@
(mirror-action "iced-left"))

(action
(hitbox 2 8 45 64)
(name "burning-left")
(fps 15)
(hitbox 7 8 32 50)
(images "wooden-burning-0.png"
"wooden-burning-1.png"
"wooden-burning-2.png"
"wooden-burning-3.png"
"wooden-burning-4.png"
"wooden-burning-5.png"
"wooden-burning-6.png"
"wooden-burning-7.png"
"wooden-burning-8.png"
"wooden-burning-9.png"
"wooden-burning-10.png"))
(clone-action "iced-left"))

(action
(hitbox 4 8 45 64)
(name "burning-right")
(hitbox 9 8 32 50)
(mirror-action "burning-left"))

(action
Expand Down
Binary file removed data/images/creatures/jumpy/wooden-burning-0.png
Diff not rendered.
Binary file removed data/images/creatures/jumpy/wooden-burning-1.png
Diff not rendered.
Binary file removed data/images/creatures/jumpy/wooden-burning-10.png
Diff not rendered.
Binary file removed data/images/creatures/jumpy/wooden-burning-2.png
Diff not rendered.
Binary file removed data/images/creatures/jumpy/wooden-burning-3.png
Diff not rendered.
Binary file removed data/images/creatures/jumpy/wooden-burning-4.png
Diff not rendered.
Binary file removed data/images/creatures/jumpy/wooden-burning-5.png
Diff not rendered.
Binary file removed data/images/creatures/jumpy/wooden-burning-6.png
Diff not rendered.
Binary file removed data/images/creatures/jumpy/wooden-burning-7.png
Diff not rendered.
Binary file removed data/images/creatures/jumpy/wooden-burning-8.png
Diff not rendered.
Binary file removed data/images/creatures/jumpy/wooden-burning-9.png
Diff not rendered.
19 changes: 4 additions & 15 deletions data/images/creatures/jumpy/woodjumpy.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -49,26 +49,15 @@
(name "iced-right")
(hitbox 4 8 45 64)
(mirror-action "iced-left"))

(action
(hitbox 2 8 45 64)
(name "burning-left")
(fps 15)
(hitbox 7 8 32 50)
(images "wooden-burning-0.png"
"wooden-burning-1.png"
"wooden-burning-2.png"
"wooden-burning-3.png"
"wooden-burning-4.png"
"wooden-burning-5.png"
"wooden-burning-6.png"
"wooden-burning-7.png"
"wooden-burning-8.png"
"wooden-burning-9.png"
"wooden-burning-10.png"))
(clone-action "iced-left"))

(action
(hitbox 4 8 45 64)
(name "burning-right")
(hitbox 9 8 32 50)
(mirror-action "burning-left"))

(action
Expand Down
26 changes: 10 additions & 16 deletions data/images/creatures/leafshot/corrupted/rotshot.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@
(hitbox 23 17 36 26)
(mirror-action "iced-left")
)
(action
(hitbox 5 17 36 26)
(name "burning-left")
(clone-action "iced-left")
)
(action
(hitbox 23 17 36 26)
(name "burning-right")
(mirror-action "burning-left")
)
(action
(name "squished-left")
(hitbox 9 12 32 32)
Expand All @@ -46,20 +56,4 @@
(hitbox 23 17 36 26)
(mirror-action "collision-left")
)
(action
(name "burning-left")
(hitbox 4 28 36 18)
(images "../burning-0.png"
"../burning-1.png"
"../burning-2.png"
"../burning-3.png"
"../burning-4.png"
"../burning-5.png"
"../burning-6.png"
"../burning-7.png")
)
(action
(name "burning-right")
(mirror-action "burning-left")
)
)
26 changes: 10 additions & 16 deletions data/images/creatures/leafshot/leafshot.sprite
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@
(name "iced-right")
(hitbox 23 17 36 26)
(mirror-action "iced-left")
)
(action
(hitbox 5 17 36 26)
(name "burning-left")
(clone-action "iced-left")
)
(action
(hitbox 23 17 36 26)
(name "burning-right")
(mirror-action "burning-left")
)
(action
(name "squished-left")
Expand All @@ -46,20 +56,4 @@
(hitbox 23 17 36 26)
(mirror-action "collision-left")
)
(action
(name "burning-left")
(hitbox 4 28 36 18)
(images "burning-0.png"
"burning-1.png"
"burning-2.png"
"burning-3.png"
"burning-4.png"
"burning-5.png"
"burning-6.png"
"burning-7.png")
)
(action
(name "burning-right")
(mirror-action "burning-left")
)
)
Binary file removed data/images/creatures/mr_tree/burning-0.png
Diff not rendered.
Binary file removed data/images/creatures/mr_tree/burning-1.png
Diff not rendered.
Binary file removed data/images/creatures/mr_tree/burning-10.png
Diff not rendered.
Binary file removed data/images/creatures/mr_tree/burning-2.png
Diff not rendered.
Binary file removed data/images/creatures/mr_tree/burning-3.png
Diff not rendered.
Binary file removed data/images/creatures/mr_tree/burning-4.png
Diff not rendered.
Binary file removed data/images/creatures/mr_tree/burning-5.png
Diff not rendered.
Binary file removed data/images/creatures/mr_tree/burning-6.png
Diff not rendered.
Binary file removed data/images/creatures/mr_tree/burning-7.png
Diff not rendered.
Binary file removed data/images/creatures/mr_tree/burning-8.png
Diff not rendered.
Binary file removed data/images/creatures/mr_tree/burning-9.png
Diff not rendered.
Loading
Loading