Skip to content
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
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/ghosttree/blue_root-up.png
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/ghosttree/blue_root.sprite
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)
Copy link
Contributor

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?

(mirror-action "flying-left")
)
(action
(name "flying-down")
(hitbox 12 11 8 70)
(flip-action "flying-up")
)
)
Binary file added data/images/creatures/ghosttree/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.
Binary file added data/images/creatures/ghosttree/charge-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 not shown.
Binary file not shown.
Binary file removed data/images/creatures/ghosttree/ghosttree-glow.png
Binary file not shown.
20 changes: 0 additions & 20 deletions data/images/creatures/ghosttree/ghosttree-glow.sprite

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed data/images/creatures/ghosttree/ghosttree.png
Binary file not shown.
62 changes: 45 additions & 17 deletions data/images/creatures/ghosttree/ghosttree.sprite
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.
12 changes: 12 additions & 0 deletions data/images/creatures/ghosttree/granito_root.sprite
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")
)
)
Binary file added data/images/creatures/ghosttree/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.
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")
)
)
Binary file modified data/images/creatures/ghosttree/hudlife.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/ghosttree/idle-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/ghosttree/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.
7 changes: 7 additions & 0 deletions data/images/creatures/ghosttree/main_root.sprite
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.
Binary file added data/images/creatures/ghosttree/pinch_idle-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/ghosttree/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.
7 changes: 7 additions & 0 deletions data/images/creatures/ghosttree/pinch_root.sprite
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.
Binary file added data/images/creatures/ghosttree/red_root-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/ghosttree/red_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.
Binary file added data/images/creatures/ghosttree/red_root-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions data/images/creatures/ghosttree/red_root.sprite
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")
)
)
Binary file removed data/images/creatures/ghosttree/root-base-0.png
Diff not rendered.
Binary file removed data/images/creatures/ghosttree/root-base-1.png
Diff not rendered.
Binary file removed data/images/creatures/ghosttree/root-base-2.png
Diff not rendered.
Binary file removed data/images/creatures/ghosttree/root-base-3.png
Diff not rendered.
22 changes: 0 additions & 22 deletions data/images/creatures/ghosttree/root-base.sprite

This file was deleted.

Binary file removed data/images/creatures/ghosttree/root.png
Diff not rendered.
Binary file added data/images/creatures/ghosttree/scream-0.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 @@ -166,7 +166,7 @@
(icon "images/creatures/yeti/hudlife.png"))
(object
(class "ghosttree")
(icon "images/creatures/ghosttree/ghosttree.png"))
(icon "images/creatures/ghosttree/idle-0.png"))
)

(objectgroup
Expand Down
Binary file modified data/sounds/tree_howling.ogg
Binary file not shown.
Binary file added data/sounds/tree_pinch.ogg
Binary file not shown.
Binary file modified data/sounds/tree_suck.ogg
Binary file not shown.
5 changes: 5 additions & 0 deletions src/badguy/dart.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ Dart::Dart(const Vector& pos, Direction d, const BadGuy* parent_, const std::str
set_action("flying", m_dir);
}

Dart::~Dart ()
{

}

bool
Dart::updatePointers(const GameObject* from_object, GameObject* to_object)
{
Expand Down
1 change: 1 addition & 0 deletions src/badguy/dart.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class Dart final : public BadGuy
public:
Dart(const ReaderMapping& reader);
Dart(const Vector& pos, Direction d, const BadGuy* parent, const std::string& sprite = "images/creatures/darttrap/granito/root_dart.sprite");
~Dart(); // An empty destructor is required to deallocate the sound_source properly.

virtual void initialize() override;
virtual void activate() override;
Expand Down
Loading
Loading