From: Stephen Groundwater Date: Tue, 24 Jan 2006 03:09:38 +0000 (+0000) Subject: Changed Mr.Tree, first hit drops leafs, second hit hollows his shell. Also made the... X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=29ede8953957b7c40bea8b2ae73357d984a8fcaa;p=supertux.git Changed Mr.Tree, first hit drops leafs, second hit hollows his shell. Also made the ice shrub object more blue and removed my duplicate tile defs. SVN-Revision: 3037 --- diff --git a/data/images/creatures/mr_tree/mr_tree.sprite b/data/images/creatures/mr_tree/mr_tree.sprite index 1372377c5..dcaaec67d 100644 --- a/data/images/creatures/mr_tree/mr_tree.sprite +++ b/data/images/creatures/mr_tree/mr_tree.sprite @@ -10,8 +10,6 @@ "walk-left-4.png" "walk-left-5.png" - - ) ) (action @@ -26,9 +24,7 @@ (images "small-left-0.png" "small-left-1.png" "small-left-2.png" - "small-left-3.png" - "small-left-2.png" - "small-left-1.png") +) ) (action (y-offset -3) diff --git a/data/images/creatures/mr_tree/small-left-0.png b/data/images/creatures/mr_tree/small-left-0.png index 545c0e615..954161a8e 100644 Binary files a/data/images/creatures/mr_tree/small-left-0.png and b/data/images/creatures/mr_tree/small-left-0.png differ diff --git a/data/images/creatures/mr_tree/small-left-1.png b/data/images/creatures/mr_tree/small-left-1.png index 98da8d005..0b350cc4e 100644 Binary files a/data/images/creatures/mr_tree/small-left-1.png and b/data/images/creatures/mr_tree/small-left-1.png differ diff --git a/data/images/creatures/mr_tree/small-left-2.png b/data/images/creatures/mr_tree/small-left-2.png index 09f8e795c..b4ccfb3d2 100644 Binary files a/data/images/creatures/mr_tree/small-left-2.png and b/data/images/creatures/mr_tree/small-left-2.png differ diff --git a/data/images/creatures/mr_tree/small-left-3.png b/data/images/creatures/mr_tree/small-left-3.png index 4964f62fb..37f13cff7 100644 Binary files a/data/images/creatures/mr_tree/small-left-3.png and b/data/images/creatures/mr_tree/small-left-3.png differ diff --git a/data/images/creatures/mr_tree/small-left-4.png b/data/images/creatures/mr_tree/small-left-4.png new file mode 100644 index 000000000..c15939ad2 Binary files /dev/null and b/data/images/creatures/mr_tree/small-left-4.png differ diff --git a/data/images/creatures/mr_tree/small-left-5.png b/data/images/creatures/mr_tree/small-left-5.png new file mode 100644 index 000000000..a823178a7 Binary files /dev/null and b/data/images/creatures/mr_tree/small-left-5.png differ diff --git a/data/images/creatures/mr_tree/squished-left.png b/data/images/creatures/mr_tree/squished-left.png index ee2291179..5ecc6fe62 100644 Binary files a/data/images/creatures/mr_tree/squished-left.png and b/data/images/creatures/mr_tree/squished-left.png differ diff --git a/data/images/creatures/mr_tree/stumpy.xcf b/data/images/creatures/mr_tree/stumpy.xcf index d62e57766..46915daea 100644 Binary files a/data/images/creatures/mr_tree/stumpy.xcf and b/data/images/creatures/mr_tree/stumpy.xcf differ diff --git a/data/images/creatures/mr_tree/walk-left-0.png b/data/images/creatures/mr_tree/walk-left-0.png index 449917e03..c83c93b78 100644 Binary files a/data/images/creatures/mr_tree/walk-left-0.png and b/data/images/creatures/mr_tree/walk-left-0.png differ diff --git a/data/images/creatures/mr_tree/walk-left-1.png b/data/images/creatures/mr_tree/walk-left-1.png index 9ad05c97c..1c7137993 100644 Binary files a/data/images/creatures/mr_tree/walk-left-1.png and b/data/images/creatures/mr_tree/walk-left-1.png differ diff --git a/data/images/creatures/mr_tree/walk-left-2.png b/data/images/creatures/mr_tree/walk-left-2.png index 979e3be87..7944a86cb 100644 Binary files a/data/images/creatures/mr_tree/walk-left-2.png and b/data/images/creatures/mr_tree/walk-left-2.png differ diff --git a/data/images/creatures/mr_tree/walk-left-3.png b/data/images/creatures/mr_tree/walk-left-3.png index 02c7c3022..cf13be4ea 100644 Binary files a/data/images/creatures/mr_tree/walk-left-3.png and b/data/images/creatures/mr_tree/walk-left-3.png differ diff --git a/data/images/creatures/mr_tree/walk-left-4.png b/data/images/creatures/mr_tree/walk-left-4.png index 9e32407e4..5c3974da9 100644 Binary files a/data/images/creatures/mr_tree/walk-left-4.png and b/data/images/creatures/mr_tree/walk-left-4.png differ diff --git a/data/images/creatures/mr_tree/walk-left-5.png b/data/images/creatures/mr_tree/walk-left-5.png index a0c768c4e..88f586ccd 100644 Binary files a/data/images/creatures/mr_tree/walk-left-5.png and b/data/images/creatures/mr_tree/walk-left-5.png differ diff --git a/data/images/creatures/mr_tree/walk-left-6.png b/data/images/creatures/mr_tree/walk-left-6.png deleted file mode 100644 index 4add4a73c..000000000 Binary files a/data/images/creatures/mr_tree/walk-left-6.png and /dev/null differ diff --git a/data/images/tiles.strf b/data/images/tiles.strf index 6b481bf81..a23e8fb21 100644 --- a/data/images/tiles.strf +++ b/data/images/tiles.strf @@ -6141,18 +6141,6 @@ ) (solid #f) ) - (tile - (id 1532) - (images - (region "objects/radio/radio1.png" 0 0 32 32) - ) - (solid #f) -) - (tile - (id 1533) - (images - (region "objects/radio/radio1.png" 32 0 32 32) - ) - (solid #f) + ) ) diff --git a/data/images/tiles/doodads/iceshrub.png b/data/images/tiles/doodads/iceshrub.png index 7edcee8f4..1f3ef7d91 100644 Binary files a/data/images/tiles/doodads/iceshrub.png and b/data/images/tiles/doodads/iceshrub.png differ