Skip to content

Commit

Permalink
Corrupted Granito (SuperTux#2663)
Browse files Browse the repository at this point in the history
Corrupted Granito is a hostile version of the friendly Granito NPC (SuperTux#2635)
They have different forms with different behaviors.

- Small, replacing Skullyhop as the default variant of the "hopping" enemy type
- Big, a stationary enemy, exploding and bursting into spiky roots if Tux remains too close for too long
- Hive, a variant of the Dispenser object used to dispense Small Corrupted Granito and visually fit in with the enviornment
- DartTrap, a new default variant of the DartTrap enemy

Note: The original versions of certain enemy types, i.e. Skullyhops + DartTrap will remain in the game and re-added as object types!

Thank you @MatusGuy for contributing the code!
  • Loading branch information
Rusty-Box authored Nov 28, 2023
1 parent 835386b commit 82326ac
Show file tree
Hide file tree
Showing 120 changed files with 858 additions and 79 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 61 additions & 0 deletions data/images/creatures/darttrap/granito/darttrap_granito.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
(supertux-sprite
(action
(hitbox -3 -3 32 64)
(name "idle-left")
(images "empty_left.png")
)
(action
(hitbox 17 -3 32 64)
(name "idle-right")
(mirror-action "idle-left")
)
(action
(hitbox -3 17 64 32)
(name "idle-down")
(images "empty_down.png")
)
(action
(hitbox -3 -3 64 32)
(name "idle-up")
(flip-action "idle-down")
)

(action
(hitbox -3 -3 32 64)
(name "loading-left")
(fps 15)
(loops 1)
(images
"empty_left.png"
"charge_left-0.png"
"charge_left-1.png"
"charge_left-2.png"
"charge_left-3.png")
)
(action
(hitbox 17 -3 32 64)
(name "loading-right")
(fps 15)
(loops 1)
(mirror-action "loading-left")
)
(action
(hitbox -3 17 64 32)
(name "loading-down")
(fps 15)
(loops 1)
(images
"empty_down.png"
"charge_down-0.png"
"charge_down-1.png"
"charge_down-2.png"
"charge_down-3.png")
)
(action
(hitbox -3 -3 64 32)
(name "loading-up")
(fps 15)
(loops 1)
(flip-action "loading-down")
)
)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions data/images/creatures/darttrap/granito/root_dart.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
(supertux-sprite
(action
(name "flying-left")
(hitbox 6 13 20 8)
(images "root_dart_left.png")
)
(action
(name "flying-right")
(hitbox 6 13 20 8)
(mirror-action "flying-left")
)
(action
(name "flying-down")
(hitbox 13 6 8 20)
(images "root_dart_down.png")
)
(action
(name "flying-up")
(hitbox 13 6 8 20)
(flip-action "flying-down")
)
)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
79 changes: 79 additions & 0 deletions data/images/creatures/darttrap/skull/darttrap_skull.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
(supertux-sprite
(action
(hitbox -8 2 32 64)
(name "idle-left")
(loops 1)
(fps 10)
(images "empty_left-0.png"
"empty_left-1.png"
"empty_left-2.png"
"empty_left-3.png"
"empty_left-4.png"
)
)
(action
(hitbox 14 2 32 64)
(name "idle-right")
(loops 1)
(fps 10)
(mirror-action "idle-left")
)
(action
(hitbox 2 14 64 32)
(name "idle-down")
(loops 1)
(fps 10)
(images "empty_down-0.png"
"empty_down-1.png"
"empty_down-2.png"
"empty_down-3.png"
"empty_down-4.png"
)
)
(action
(hitbox 2 -8 64 32)
(name "idle-up")
(loops 1)
(fps 10)
(flip-action "idle-down")
)

(action
(hitbox -8 2 32 64)
(name "loading-left")
(loops 1)
(fps 10)
(images "empty_left-4.png"
"charge_left-0.png"
"charge_left-1.png"
"charge_left-2.png"
"charge_left-3.png"
)
)
(action
(hitbox 14 2 32 64)
(name "loading-right")
(loops 1)
(fps 10)
(mirror-action "loading-left")
)
(action
(hitbox 2 14 64 32)
(name "loading-down")
(loops 1)
(fps 10)
(images "empty_down-4.png"
"charge_down-0.png"
"charge_down-1.png"
"charge_down-2.png"
"charge_down-3.png"
)
)
(action
(hitbox 2 -8 64 32)
(name "loading-up")
(loops 1)
(fps 10)
(flip-action "loading-down")
)
)
43 changes: 43 additions & 0 deletions data/images/creatures/granito/corrupted/big/rock_mine.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
(supertux-sprite
(action
(name "idle-left")
(hitbox 18 26 48 48)
(images "rock_mine-0.png")
)
(action
(name "cracked-1-left")
(hitbox 18 26 48 48)
(images "rock_mine-1.png")
)
(action
(name "cracked-2-left")
(hitbox 18 26 48 48)
(images "rock_mine-2.png")
)
(action
(name "broken-left")
(hitbox 18 26 48 48)
(images "rock_mine-3.png")
)

(action
(name "idle-right")
(hitbox 18 26 48 48)
(mirror-action "idle-left")
)
(action
(name "cracked-1-right")
(hitbox 18 26 48 48)
(mirror-action "cracked-1-left")
)
(action
(name "cracked-2-right")
(hitbox 18 26 48 48)
(mirror-action "cracked-2-left")
)
(action
(name "broken-right")
(hitbox 18 26 48 48)
(mirror-action "broken-left")
)
)
6 changes: 6 additions & 0 deletions data/images/creatures/granito/corrupted/big/root_spike.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
(supertux-sprite
(action
(name "default")
(hitbox 11 11 16 16)
(images "root_spike.png"))
)
73 changes: 73 additions & 0 deletions data/images/creatures/granito/corrupted/corrupted_granito.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
(supertux-sprite
(action
(name "standing-left")
(hitbox 15 15 32 42)
(fps 15)
(loops 1)
(images "idle_left-0.png"
"idle_left-1.png"
"idle_left-2.png"
"idle_left-3.png"
"idle_left-4.png"
"idle_left-5.png"))

(action
(name "standing-right")
(hitbox 28 15 32 42)
(fps 15)
(loops 1)
(images "idle_right-0.png"
"idle_right-1.png"
"idle_right-2.png"
"idle_right-3.png"
"idle_right-4.png"
"idle_right-5.png"))

(action
(name "charging-left")
(hitbox 15 15 32 42)
(loops 1)
(fps 20)
(images "idle_left-0.png"
"idle_left-1.png"
"idle_left-2.png"))

(action
(name "charging-right")
(hitbox 28 15 32 42)
(loops 1)
(fps 20)
(images "idle_right-0.png"
"idle_right-1.png"
"idle_right-2.png"))

(action
(name "jumping-left")
(hitbox 15 15 32 42)
(loops 1)
(fps 20)
(images "jump_left-0.png"
"jump_left-1.png"
"jump_left-2.png"
"jump_left-3.png"))

(action
(name "jumping-right")
(hitbox 28 15 32 42)
(loops 1)
(fps 20)
(images "jump_right-0.png"
"jump_right-1.png"
"jump_right-2.png"
"jump_right-3.png"))

(action
(name "squished-left")
(hitbox 15 15 32 42)
(images "squished-left.png"))

(action
(name "squished-right")
(hitbox 28 15 32 42)
(images "squished-right.png"))
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
(supertux-sprite
(action
(name "husk1-left")
(hitbox 85 27 90 156)
(fps 5)
(images "corrupted_granito_husk-0.png")
)
(action
(name "husk1-right")
(hitbox 47 27 90 156)
(fps 5)
(mirror-action "husk1-left")
)
(action
(name "husk2-left")
(hitbox 88 28 80 156)
(images "corrupted_granito_husk-1.png")
)
(action
(name "husk2-right")
(hitbox 82 28 80 156)
(mirror-action "husk2-left")
)
(action
(name "husk3-left")
(hitbox 69 36 80 148)
(fps 5)
(images "corrupted_granito_husk-2.png")
)
(action
(name "husk3-right")
(hitbox 89 36 80 148)
(fps 5)
(mirror-action "husk3-left")
)
)
12 changes: 12 additions & 0 deletions data/images/creatures/granito/corrupted/hive/granito_hive.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
(supertux-sprite
(action
(name "left")
(hitbox 24 4 56 46)
(images "granito_hive-0.png")
)
(action
(name "right")
(hitbox 30 4 56 46)
(mirror-action "left");
)
)
Binary file added data/images/creatures/skullyhop/charge_down-1.png
Binary file added data/images/creatures/skullyhop/charge_down-2.png
Binary file added data/images/creatures/skullyhop/charge_down-3.png
Binary file added data/images/creatures/skullyhop/charge_left-0.png
Binary file added data/images/creatures/skullyhop/charge_left-1.png
Binary file added data/images/creatures/skullyhop/charge_left-2.png
Binary file added data/images/creatures/skullyhop/charge_left-3.png
Binary file added data/images/creatures/skullyhop/dart_light.png
Binary file added data/images/creatures/skullyhop/empty_down-1.png
Binary file added data/images/creatures/skullyhop/empty_down-4.png
Binary file added data/images/creatures/skullyhop/empty_left-0.png
Binary file added data/images/creatures/skullyhop/empty_left-1.png
Binary file added data/images/creatures/skullyhop/empty_left-3.png
Binary file added data/images/creatures/skullyhop/empty_left-4.png
22 changes: 22 additions & 0 deletions data/images/creatures/skullyhop/skull_dart.sprite
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
(supertux-sprite
(action
(name "flying-left")
(hitbox 6 12 22 9)
(images "skull_dart_left.png")
)
(action
(name "flying-right")
(hitbox 4 12 22 9)
(mirror-action "flying-left")
)
(action
(name "flying-down")
(hitbox 12 4 9 22)
(images "skull_dart_down.png")
)
(action
(name "flying-up")
(hitbox 12 6 9 22)
(flip-action "flying-down")
)
)
11 changes: 7 additions & 4 deletions data/images/engine/editor/objects.stoi
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,14 @@
(class "zeekling")
(icon "images/creatures/zeekling/zeekling-0.png"))
(object
(class "skullyhop")
(icon "images/creatures/skullyhop/stand-0.png"))
(class "corrupted_granito")
(icon "images/creatures/granito/corrupted/idle_left-0.png"))
(object
(class "corrupted_granito_big")
(icon "images/creatures/granito/corrupted/big/rock_mine-0.png"))
(object
(class "darttrap")
(icon "images/creatures/darttrap/charge_left-1.png"))
(icon "images/creatures/darttrap/granito/empty_left.png"))
(object
(class "ghoul")
(icon "images/creatures/ghoul/g1.png"))
Expand Down Expand Up @@ -180,7 +183,7 @@
(icon "images/engine/editor/stalactite_ice_yeti.png"))
(object
(class "dart")
(icon "images/creatures/darttrap/skull_dart_left.png"))
(icon "images/creatures/darttrap/granito/root_dart_left.png"))
)

(objectgroup
Expand Down
Binary file added data/images/particles/granito_piece-0.png
Binary file added data/images/particles/granito_piece-1.png
Binary file added data/images/particles/granito_piece-2.png
Binary file added data/images/particles/granito_piece-3.png
Binary file added data/images/particles/granito_piece-4.png
Binary file added data/images/particles/granito_piece-5.png
Loading

0 comments on commit 82326ac

Please sign in to comment.