diff --git a/data/images/creatures/ghosttree/blue_root-left.png b/data/images/creatures/ghosttree/blue_root-left.png new file mode 100644 index 00000000000..1b1f00b34e1 Binary files /dev/null and b/data/images/creatures/ghosttree/blue_root-left.png differ diff --git a/data/images/creatures/ghosttree/blue_root-up.png b/data/images/creatures/ghosttree/blue_root-up.png new file mode 100644 index 00000000000..9e29207fe16 Binary files /dev/null and b/data/images/creatures/ghosttree/blue_root-up.png differ diff --git a/data/images/creatures/ghosttree/blue_root.sprite b/data/images/creatures/ghosttree/blue_root.sprite new file mode 100644 index 00000000000..760834b99dd --- /dev/null +++ b/data/images/creatures/ghosttree/blue_root.sprite @@ -0,0 +1,22 @@ +(supertux-sprite + (action + (name "left") + (hitbox 15 12 70 8) + (images "blue_root-left.png") + ) + (action + (name "up") + (hitbox 12 15 8 70) + (images "blue_root-up.png") + ) + (action + (name "right") + (hitbox 11 12 70 8) + (mirror-action "left") + ) + (action + (name "down") + (hitbox 12 11 8 70) + (flip-action "down") + ) +) diff --git a/data/images/creatures/ghosttree/bust-0.png b/data/images/creatures/ghosttree/bust-0.png new file mode 100644 index 00000000000..22b9ca9b0b8 Binary files /dev/null and b/data/images/creatures/ghosttree/bust-0.png differ diff --git a/data/images/creatures/ghosttree/charge-0.png b/data/images/creatures/ghosttree/charge-0.png new file mode 100644 index 00000000000..3a6736615d9 Binary files /dev/null and b/data/images/creatures/ghosttree/charge-0.png differ diff --git a/data/images/creatures/ghosttree/ghosttree-dying-0.png b/data/images/creatures/ghosttree/ghosttree-dying-0.png deleted file mode 100644 index d6aa453c22e..00000000000 Binary files a/data/images/creatures/ghosttree/ghosttree-dying-0.png and /dev/null differ diff --git a/data/images/creatures/ghosttree/ghosttree-glow-dying-0.png b/data/images/creatures/ghosttree/ghosttree-glow-dying-0.png deleted file mode 100644 index 03672c3abc8..00000000000 Binary files a/data/images/creatures/ghosttree/ghosttree-glow-dying-0.png and /dev/null differ diff --git a/data/images/creatures/ghosttree/ghosttree-glow.png b/data/images/creatures/ghosttree/ghosttree-glow.png deleted file mode 100644 index f54ad3d1e82..00000000000 Binary files a/data/images/creatures/ghosttree/ghosttree-glow.png and /dev/null differ diff --git a/data/images/creatures/ghosttree/ghosttree-glow.sprite b/data/images/creatures/ghosttree/ghosttree-glow.sprite deleted file mode 100644 index c9c80b57db3..00000000000 --- a/data/images/creatures/ghosttree/ghosttree-glow.sprite +++ /dev/null @@ -1,20 +0,0 @@ -(supertux-sprite - (action - (name "default") - (hitbox 230 300 40 60) - (images - "ghosttree-glow.png" - ) - ) - (action - (name "dying") - (hitbox 230 300 40 60) - (fps 4) - (images - "ghosttree-glow-dying-0.png" - "ghosttree-glow-dying-0.png" - "ghosttree-glow-dying-0.png" - "ghosttree-glow-dying-0.png" - ) - ) -) diff --git a/data/images/creatures/ghosttree/ghosttree-swallow-0.png b/data/images/creatures/ghosttree/ghosttree-swallow-0.png deleted file mode 100644 index be9f9f6e8f8..00000000000 Binary files a/data/images/creatures/ghosttree/ghosttree-swallow-0.png and /dev/null differ diff --git a/data/images/creatures/ghosttree/ghosttree-swallow-1.png b/data/images/creatures/ghosttree/ghosttree-swallow-1.png deleted file mode 100644 index 43d5720ab78..00000000000 Binary files a/data/images/creatures/ghosttree/ghosttree-swallow-1.png and /dev/null differ diff --git a/data/images/creatures/ghosttree/ghosttree-swallow-2.png b/data/images/creatures/ghosttree/ghosttree-swallow-2.png deleted file mode 100644 index b0396403766..00000000000 Binary files a/data/images/creatures/ghosttree/ghosttree-swallow-2.png and /dev/null differ diff --git a/data/images/creatures/ghosttree/ghosttree-swallow-3.png b/data/images/creatures/ghosttree/ghosttree-swallow-3.png deleted file mode 100644 index c9a691f672f..00000000000 Binary files a/data/images/creatures/ghosttree/ghosttree-swallow-3.png and /dev/null differ diff --git a/data/images/creatures/ghosttree/ghosttree.png b/data/images/creatures/ghosttree/ghosttree.png deleted file mode 100644 index ee4d4d59e33..00000000000 Binary files a/data/images/creatures/ghosttree/ghosttree.png and /dev/null differ diff --git a/data/images/creatures/ghosttree/ghosttree.sprite b/data/images/creatures/ghosttree/ghosttree.sprite index d1494af7d8d..1faa9b9ed7d 100644 --- a/data/images/creatures/ghosttree/ghosttree.sprite +++ b/data/images/creatures/ghosttree/ghosttree.sprite @@ -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" ) ) ) diff --git a/data/images/creatures/ghosttree/ghosttree_dust_wm_0.png b/data/images/creatures/ghosttree/ghosttree_dust_wm_0.png deleted file mode 100644 index 39ec81489ae..00000000000 Binary files a/data/images/creatures/ghosttree/ghosttree_dust_wm_0.png and /dev/null differ diff --git a/data/images/creatures/ghosttree/granito_root-0.png b/data/images/creatures/ghosttree/granito_root-0.png new file mode 100644 index 00000000000..79b5e496052 Binary files /dev/null and b/data/images/creatures/ghosttree/granito_root-0.png differ diff --git a/data/images/creatures/ghosttree/granito_root-1.png b/data/images/creatures/ghosttree/granito_root-1.png new file mode 100644 index 00000000000..c6856333802 Binary files /dev/null and b/data/images/creatures/ghosttree/granito_root-1.png differ diff --git a/data/images/creatures/ghosttree/granito_root.sprite b/data/images/creatures/ghosttree/granito_root.sprite new file mode 100644 index 00000000000..32a910bbccb --- /dev/null +++ b/data/images/creatures/ghosttree/granito_root.sprite @@ -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") + ) +) diff --git a/data/images/creatures/ghosttree/green_root.png b/data/images/creatures/ghosttree/green_root.png new file mode 100644 index 00000000000..fb6b46e0357 Binary files /dev/null and b/data/images/creatures/ghosttree/green_root.png differ diff --git a/data/images/creatures/ghosttree/root.sprite b/data/images/creatures/ghosttree/green_root.sprite similarity index 50% rename from data/images/creatures/ghosttree/root.sprite rename to data/images/creatures/ghosttree/green_root.sprite index 7e54ff1feb7..ce189c26328 100644 --- a/data/images/creatures/ghosttree/root.sprite +++ b/data/images/creatures/ghosttree/green_root.sprite @@ -1,6 +1,7 @@ (supertux-sprite (action (name "default") - (images "root.png") + (hitbox 32 40 32 88) + (images "green_root.png") ) ) diff --git a/data/images/creatures/ghosttree/hudlife.png b/data/images/creatures/ghosttree/hudlife.png index 80d24a63c60..424ac6cdca3 100644 Binary files a/data/images/creatures/ghosttree/hudlife.png and b/data/images/creatures/ghosttree/hudlife.png differ diff --git a/data/images/creatures/ghosttree/idle-0.png b/data/images/creatures/ghosttree/idle-0.png new file mode 100644 index 00000000000..1bef45988d0 Binary files /dev/null and b/data/images/creatures/ghosttree/idle-0.png differ diff --git a/data/images/creatures/ghosttree/main_root.png b/data/images/creatures/ghosttree/main_root.png new file mode 100644 index 00000000000..214aefc11f6 Binary files /dev/null and b/data/images/creatures/ghosttree/main_root.png differ diff --git a/data/images/creatures/ghosttree/main_root.sprite b/data/images/creatures/ghosttree/main_root.sprite new file mode 100644 index 00000000000..bdcecc875d8 --- /dev/null +++ b/data/images/creatures/ghosttree/main_root.sprite @@ -0,0 +1,7 @@ +(supertux-sprite + (action + (name "default") + (hitbox 37 37 16 188) + (images "main_root.png") + ) +) diff --git a/data/images/creatures/ghosttree/pinch_charge-0.png b/data/images/creatures/ghosttree/pinch_charge-0.png new file mode 100644 index 00000000000..8ae5a10c89f Binary files /dev/null and b/data/images/creatures/ghosttree/pinch_charge-0.png differ diff --git a/data/images/creatures/ghosttree/pinch_idle-0.png b/data/images/creatures/ghosttree/pinch_idle-0.png new file mode 100644 index 00000000000..284f9fc3d36 Binary files /dev/null and b/data/images/creatures/ghosttree/pinch_idle-0.png differ diff --git a/data/images/creatures/ghosttree/pinch_root.png b/data/images/creatures/ghosttree/pinch_root.png new file mode 100644 index 00000000000..0169e4ab1af Binary files /dev/null and b/data/images/creatures/ghosttree/pinch_root.png differ diff --git a/data/images/creatures/ghosttree/pinch_root.sprite b/data/images/creatures/ghosttree/pinch_root.sprite new file mode 100644 index 00000000000..3114159405c --- /dev/null +++ b/data/images/creatures/ghosttree/pinch_root.sprite @@ -0,0 +1,7 @@ +(supertux-sprite + (action + (name "default") + (hitbox 37 37 16 188) + (images "pinch_root.png") + ) +) diff --git a/data/images/creatures/ghosttree/pinch_scream-0.png b/data/images/creatures/ghosttree/pinch_scream-0.png new file mode 100644 index 00000000000..307dd31172b Binary files /dev/null and b/data/images/creatures/ghosttree/pinch_scream-0.png differ diff --git a/data/images/creatures/ghosttree/red_root-0.png b/data/images/creatures/ghosttree/red_root-0.png new file mode 100644 index 00000000000..e50e12a77cd Binary files /dev/null and b/data/images/creatures/ghosttree/red_root-0.png differ diff --git a/data/images/creatures/ghosttree/red_root-1.png b/data/images/creatures/ghosttree/red_root-1.png new file mode 100644 index 00000000000..1a28134b3d9 Binary files /dev/null and b/data/images/creatures/ghosttree/red_root-1.png differ diff --git a/data/images/creatures/ghosttree/red_root-2.png b/data/images/creatures/ghosttree/red_root-2.png new file mode 100644 index 00000000000..6b065f79bd2 Binary files /dev/null and b/data/images/creatures/ghosttree/red_root-2.png differ diff --git a/data/images/creatures/ghosttree/red_root.sprite b/data/images/creatures/ghosttree/red_root.sprite new file mode 100644 index 00000000000..48ec0a97976 --- /dev/null +++ b/data/images/creatures/ghosttree/red_root.sprite @@ -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 --git a/data/images/creatures/ghosttree/root-base-0.png b/data/images/creatures/ghosttree/root-base-0.png deleted file mode 100644 index a674613cd55..00000000000 Binary files a/data/images/creatures/ghosttree/root-base-0.png and /dev/null differ diff --git a/data/images/creatures/ghosttree/root-base-1.png b/data/images/creatures/ghosttree/root-base-1.png deleted file mode 100644 index 2195d12e979..00000000000 Binary files a/data/images/creatures/ghosttree/root-base-1.png and /dev/null differ diff --git a/data/images/creatures/ghosttree/root-base-2.png b/data/images/creatures/ghosttree/root-base-2.png deleted file mode 100644 index e2c540ff824..00000000000 Binary files a/data/images/creatures/ghosttree/root-base-2.png and /dev/null differ diff --git a/data/images/creatures/ghosttree/root-base-3.png b/data/images/creatures/ghosttree/root-base-3.png deleted file mode 100644 index 87f5fad4bbf..00000000000 Binary files a/data/images/creatures/ghosttree/root-base-3.png and /dev/null differ diff --git a/data/images/creatures/ghosttree/root-base.sprite b/data/images/creatures/ghosttree/root-base.sprite deleted file mode 100644 index edfa363a273..00000000000 --- a/data/images/creatures/ghosttree/root-base.sprite +++ /dev/null @@ -1,22 +0,0 @@ -(supertux-sprite - (action - (name "appearing") - (fps 16) - (images - "root-base-0.png" - "root-base-1.png" - "root-base-2.png" - "root-base-3.png" - ) - ) - (action - (name "vanishing") - (fps 16) - (images - "root-base-3.png" - "root-base-2.png" - "root-base-1.png" - "root-base-0.png" - ) - ) -) diff --git a/data/images/creatures/ghosttree/root.png b/data/images/creatures/ghosttree/root.png deleted file mode 100644 index da5aee936ab..00000000000 Binary files a/data/images/creatures/ghosttree/root.png and /dev/null differ diff --git a/data/images/creatures/ghosttree/scream-0.png b/data/images/creatures/ghosttree/scream-0.png new file mode 100644 index 00000000000..744c1e3453e Binary files /dev/null and b/data/images/creatures/ghosttree/scream-0.png differ