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

Corrupted Granito #2663

Merged
merged 39 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
320072b
Add sprites for corrupted Granito [ci skip]
Rusty-Box Oct 18, 2023
8ea265e
Make Corrupted Granito new default of Skullyhops
Rusty-Box Oct 18, 2023
3857e69
Move skeletal dart trap into skullyhop folder
Rusty-Box Oct 18, 2023
9a67d93
Fix error
Rusty-Box Oct 19, 2023
222d044
More fixing
Rusty-Box Oct 19, 2023
e15efca
Update objects.stoi
Rusty-Box Oct 19, 2023
0c8bc13
Set Corrupted Granito as default sprite for DartTrap
Rusty-Box Oct 19, 2023
b26807a
Update objects.stoi [ci skip]
Rusty-Box Oct 19, 2023
6dc2e1c
More fixes
Rusty-Box Oct 19, 2023
3be4965
Minor tweaks to hitboxes + fixes [ci skip]
Rusty-Box Oct 19, 2023
6baed7a
Add `.sprite` file for the root spike
Rusty-Box Oct 19, 2023
f07aad8
Dart trap object types
MatusGuy Nov 6, 2023
c715617
whoops
MatusGuy Nov 6, 2023
853893c
Add WIP Granito Hive sprite for coding [ci skip]
Rusty-Box Nov 8, 2023
6569a58
Merge branch 'corrupted-granito' of https://github.com/Rusty-Box/supe…
Rusty-Box Nov 8, 2023
913a4f8
Corrupted granito as skullyhop
MatusGuy Nov 8, 2023
c0ebda6
Merge branch 'corrupted-granito' of https://github.com/Rusty-Box/supe…
MatusGuy Nov 8, 2023
972bbdd
Rename "Corrupted Granito" type to just "Granito" for Dart Trap
Rusty-Box Nov 8, 2023
1c46169
wip granito hive
MatusGuy Nov 9, 2023
877cffa
Merge branch 'corrupted-granito' of https://github.com/Rusty-Box/supe…
MatusGuy Nov 9, 2023
b614e68
Granito hive
MatusGuy Nov 14, 2023
f5d0391
shard set sprite
MatusGuy Nov 14, 2023
0309aea
Merge branch 'SuperTux:master' into corrupted-granito
MatusGuy Nov 15, 2023
ad57c43
Wip corrupted big granito
MatusGuy Nov 16, 2023
656f33a
Add particles sprites for Corrupted Granito [ci skip]
Rusty-Box Nov 18, 2023
d46756c
Corrupted big granito shake
MatusGuy Nov 20, 2023
1e840ff
Merge branch 'corrupted-granito' of https://github.com/Rusty-Box/supe…
MatusGuy Nov 20, 2023
7d7660c
rock particles
MatusGuy Nov 20, 2023
ebb28e1
Revert "rock particles"
MatusGuy Nov 22, 2023
c2d2144
Revert "Revert "rock particles""
MatusGuy Nov 22, 2023
8c48c06
Timer fixes and corrupted big granito fixes
MatusGuy Nov 24, 2023
7a599d0
remove debug print
MatusGuy Nov 24, 2023
424b426
remove more debug print
MatusGuy Nov 24, 2023
cf390cd
h
MatusGuy Nov 25, 2023
a23ba3c
Add 3 husk variants for Corrupted Giant Granito [ci skip]
Rusty-Box Nov 25, 2023
babf644
Code style + various fixes
Vankata453 Nov 25, 2023
1231168
remove parentheses
MatusGuy Nov 25, 2023
230e274
Minor tweaks to Corrupted Granito Hive sprite [ci skip]
Rusty-Box Nov 25, 2023
c822ec4
Change corrutped big granito layer
MatusGuy Nov 25, 2023
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
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
Loading