Skip to content

Improve ghoul behaviour (rebase+fix) #3230

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

Open
wants to merge 4 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/ghoul/d1.png
Binary file not shown.
Binary file added data/images/creatures/ghoul/down-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/ghoul/down-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/ghoul/down-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/ghoul/down-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/ghoul/down-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/ghoul/down-5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed data/images/creatures/ghoul/g1.png
Binary file not shown.
Binary file removed data/images/creatures/ghoul/g2.png
Binary file not shown.
Binary file removed data/images/creatures/ghoul/g3.png
Binary file not shown.
Binary file removed data/images/creatures/ghoul/g4.png
Binary file not shown.
Binary file removed data/images/creatures/ghoul/g5.png
Binary file not shown.
Binary file removed data/images/creatures/ghoul/g6.png
Binary file not shown.
Binary file removed data/images/creatures/ghoul/g7.png
Binary file not shown.
Binary file removed data/images/creatures/ghoul/g8.png
Binary file not shown.
116 changes: 90 additions & 26 deletions data/images/creatures/ghoul/ghoul.sprite
Original file line number Diff line number Diff line change
@@ -1,37 +1,101 @@
(supertux-sprite
(action
(name "accel1-left")
(loops 1)
(fps 15)
(hitbox 21 7 28 38)
(images "up-0.png"
"up-1.png"
"up-2.png"
"up-3.png")
)
(action
(name "accel1-right")
(loops 1)
(fps 15)
(hitbox 22 7 28 38)
(mirror-action "accel1-left")
)
(action
(name "accel2-up")
(loops 1)
(fps 15)
(hitbox 21 7 28 38)
(images "up-4.png"
"up-5.png"
"up-6.png"
"up-7.png")
)
(action
(name "accel2-up")
(loops 1)
(fps 15)
(hitbox 22 7 28 38)
(mirror-action "accel2-up")
)
(action
(name "left-up")
(fps 15)
(hitbox 21 7 28 38)
(images "up-8.png")
)
(action
(name "right-up")
(fps 15)
(hitbox 22 7 28 38)
(mirror-action "left-up")
)
(action
(name "left")
(fps 12)
(hitbox 8 10 45 45)
(images "g2.png"
"g3.png"
"g4.png"
"g5.png"
"g5.png"
"g6.png"
"g7.png"
"g7.png"
"g7.png"
"g8.png"
"g1.png"
"g1.png"
"g1.png"
"g1.png"
"g1.png"
"g1.png"
"g1.png"
"g1.png"
"g1.png")
(fps 12)
(hitbox 21 7 28 38)
(images "down-0.png"
"down-1.png"
"down-2.png"
"down-3.png"
"down-4.png"
"down-5.png")
)
(action
(name "right")
(fps 12)
(hitbox 47 10 45 45)
(fps 12)
(hitbox 22 7 28 38)
(mirror-action "left")
)
(action
(name "squished")
(hitbox 0 0 1 48)
(images "d1.png")
(name "stunned-left")
(fps 15)
(loops 1)
(hitbox 21 7 28 38)
(images "stun-0.png"
"stun-1.png"
"stun-2.png"
"stun-3.png"
"stun-4.png")
)
(action
(name "stunned-right")
(fps 15)
(loops 1)
(hitbox 22 7 28 38)
(mirror-action "stunned-left")
)
(action
(name "recovering-left")
(fps 15)
(loops 1)
(hitbox 21 7 28 38)
(images "stun-4.png"
"stun-3.png"
"stun-2.png"
"stun-1.png"
"stun-0.png")
)
(action
(name "recovering-right")
(fps 15)
(loops 1)
(hitbox 22 7 28 38)
(mirror-action "recovering-left")
)
)
Binary file added data/images/creatures/ghoul/stun-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/ghoul/stun-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/ghoul/stun-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/ghoul/stun-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/ghoul/stun-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/ghoul/up-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/ghoul/up-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/ghoul/up-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/ghoul/up-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/ghoul/up-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/images/creatures/ghoul/up-5.png
Binary file added data/images/creatures/ghoul/up-6.png
Binary file added data/images/creatures/ghoul/up-7.png
Binary file added data/images/creatures/ghoul/up-8.png
2 changes: 1 addition & 1 deletion data/images/engine/editor/objects.stoi
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
(icon "images/creatures/mole/corrupted/root_sapling-0.png"))
(object
(class "ghoul")
(icon "images/creatures/ghoul/g1.png"))
(icon "images/creatures/ghoul/down-0.png"))
(object
(class "mrbomb")
(icon "images/creatures/mr_bomb/left-0.png"))
Expand Down
Binary file added data/sounds/ghoul_recovering.ogg
Binary file not shown.
Binary file added data/sounds/ghoul_stunned.ogg
Binary file not shown.
Loading
Loading