-
-
Notifications
You must be signed in to change notification settings - Fork 539
GhostTree new logic level insane, take a cup of java before reviewing this #3334
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
Hypernoot
wants to merge
10
commits into
SuperTux:master
Choose a base branch
from
Hypernoot:tree-hyper
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
856f780
WIP still-frame Ghost tree "animations" for coding [ci skip]
Rusty-Box 07c2e2a
Update ghosttree.sprite
Rusty-Box c89a553
Add "pinch_root" for Ghost Tree [ci skip]
Rusty-Box 5fadbb3
GhostTree: implement assumed states
Hypernoot f69e1b3
ghosttree: implement state logic
Hypernoot 8f8e968
Add root attacks
Hypernoot 3adf9da
ghosttree: main root attacks
Hypernoot 240fa42
ghosttree: sounds, explosions
Hypernoot 5b8a10e
Ghosttree: add blue root darts
Hypernoot db131cd
Ghosttree: fix code issues
Hypernoot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
(supertux-sprite | ||
(action | ||
(name "flying-left") | ||
(hitbox 15 12 70 8) | ||
(images "blue_root-left.png") | ||
) | ||
(action | ||
(name "flying-up") | ||
(hitbox 12 15 8 70) | ||
(images "blue_root-up.png") | ||
) | ||
(action | ||
(name "flying-right") | ||
(hitbox 11 12 70 8) | ||
(mirror-action "flying-left") | ||
) | ||
(action | ||
(name "flying-down") | ||
(hitbox 12 11 8 70) | ||
(flip-action "flying-up") | ||
) | ||
) |
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file was deleted.
Oops, something went wrong.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,59 @@ | ||
(supertux-sprite | ||
(action | ||
(name "default") | ||
(hitbox 230 300 40 60) | ||
(name "idle") | ||
(hitbox 526 520 48 48) | ||
(fps 10) | ||
(images | ||
"ghosttree.png" | ||
"idle-0.png" | ||
) | ||
) | ||
(action | ||
(name "swallow") | ||
(hitbox 230 300 40 60) | ||
(fps 16) | ||
(name "charge") | ||
(hitbox 526 520 48 48) | ||
(fps 10) | ||
(images | ||
"ghosttree-swallow-0.png" | ||
"ghosttree-swallow-1.png" | ||
"ghosttree-swallow-2.png" | ||
"ghosttree-swallow-3.png" | ||
"charge-0.png" | ||
) | ||
) | ||
(action | ||
(name "dying") | ||
(hitbox 230 300 40 60) | ||
(fps 4) | ||
(name "scream") | ||
(hitbox 526 520 48 48) | ||
(fps 10) | ||
(images | ||
"ghosttree-dying-0.png" | ||
"ghosttree-dying-0.png" | ||
"ghosttree-dying-0.png" | ||
"ghosttree-dying-0.png" | ||
"scream-0.png" | ||
) | ||
) | ||
|
||
(action | ||
(name "idle-pinch") | ||
(hitbox 296 520 48 48) | ||
(fps 10) | ||
(images | ||
"pinch_idle-0.png" | ||
) | ||
) | ||
(action | ||
(name "charge-pinch") | ||
(hitbox 296 520 48 48) | ||
(fps 10) | ||
(images | ||
"pinch_charge-0.png" | ||
) | ||
) | ||
(action | ||
(name "scream-pinch") | ||
(hitbox 296 520 48 48) | ||
(fps 10) | ||
(images | ||
"pinch_scream-0.png" | ||
) | ||
) | ||
(action | ||
(name "busted") | ||
(hitbox 296 520 48 48) | ||
(fps 10) | ||
(images | ||
"bust-0.png" | ||
) | ||
) | ||
) |
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
(supertux-sprite | ||
(action | ||
(name "variant1") | ||
(hitbox 37 37 16 188) | ||
(images "granito_root-0.png") | ||
) | ||
(action | ||
(name "variant2") | ||
(hitbox 37 37 16 188) | ||
(images "granito_root-1.png") | ||
) | ||
) |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion
3
data/images/creatures/ghosttree/root.sprite → ...ges/creatures/ghosttree/green_root.sprite
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
(supertux-sprite | ||
(action | ||
(name "default") | ||
(images "root.png") | ||
(hitbox 32 40 32 88) | ||
(images "green_root.png") | ||
) | ||
) |
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
(supertux-sprite | ||
(action | ||
(name "default") | ||
(hitbox 37 37 16 188) | ||
(images "main_root.png") | ||
) | ||
) |
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
(supertux-sprite | ||
(action | ||
(name "default") | ||
(hitbox 37 37 16 188) | ||
(images "pinch_root.png") | ||
) | ||
) |
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
(supertux-sprite | ||
(action | ||
(name "variant1") | ||
(hitbox 12 32 8 70) | ||
(images "red_root-0.png") | ||
) | ||
(action | ||
(name "variant2") | ||
(hitbox 12 32 8 70) | ||
(images "red_root-1.png") | ||
) | ||
(action | ||
(name "variant3") | ||
(hitbox 12 32 8 70) | ||
(images "red_root-2.png") | ||
) | ||
) |
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
This file was deleted.
Oops, something went wrong.
Diff not rendered.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any specific reason that the shape of the hitbox changes? 11 vs 15?