Made Mr_Tree graphic smaller, from 99 to 85 pixels.

SVN-Revision: 3082

diff --git a/data/images/creatures/mr_tree/mr_tree.sprite b/data/images/creatures/mr_tree/mr_tree.sprite
index 34f6656..e18e1e4 100644 (file)
--- a/data/images/creatures/mr_tree/mr_tree.sprite
+++ b/data/images/creatures/mr_tree/mr_tree.sprite
@@ -1,37 +1,34 @@
 (supertux-sprite
  (action
-  (y-offset )
-  (name "left")
+  (y-offset -2)
+  (name "large-left")
   (images "walk-left-1.png"
-"walk-left-2.png"
-"walk-left-3.png"
-"walk-left-4.png"
-"walk-left-5.png"
-"walk-left-6.png"
-
-
-
+          "walk-left-2.png"
+          "walk-left-3.png"
+          "walk-left-4.png"
+          "walk-left-5.png"
+          "walk-left-6.png"
 )
  )
  (action
-  (y-offset )
-  (name "right")
-  (mirror-action "left")
+  (y-offset -2)
+  (name "large-right")
+  (mirror-action "large-left")
  )
  (action
-  (y-offset 27)
+  (y-offset 12)
   (name "small-left")
   (images "small-left-1.png"
-"small-left-2.png"
-"small-left-3.png"
-"small-left-4.png"
-"small-left-5.png"
-"small-left-6.png"
+          "small-left-2.png"
+          "small-left-3.png"
+          "small-left-4.png"
+          "small-left-5.png"
+          "small-left-6.png"
 
 )
  )
   (action
-   (y-offset 27)
+   (y-offset 12)
    (name "small-right")
    (mirror-action "small-left")
   )

diff --git a/data/images/creatures/mr_tree/small-left-1.png b/data/images/creatures/mr_tree/small-left-1.png
index bbb2d55..d994e1c 100644 (file)
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 dd2b36e..112820b 100644 (file)
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 d23ef22..8d0d8c4 100644 (file)
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
index 51539e0..c6d2de6 100644 (file)
Binary files a/data/images/creatures/mr_tree/small-left-4.png 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
index d689da9..93b819e 100644 (file)
Binary files a/data/images/creatures/mr_tree/small-left-5.png and b/data/images/creatures/mr_tree/small-left-5.png differ

diff --git a/data/images/creatures/mr_tree/small-left-6.png b/data/images/creatures/mr_tree/small-left-6.png
index 8b6fdd1..f9859ef 100644 (file)
Binary files a/data/images/creatures/mr_tree/small-left-6.png and b/data/images/creatures/mr_tree/small-left-6.png differ

diff --git a/data/images/creatures/mr_tree/stumpy.xcf b/data/images/creatures/mr_tree/stumpy.xcf
index 75f1015..05ab8b5 100644 (file)
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-1.png b/data/images/creatures/mr_tree/walk-left-1.png
index e077fba..07375a7 100644 (file)
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 9f12b51..83f892a 100644 (file)
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 6c4bba3..3ed3e72 100644 (file)
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 e27e6d5..b115f0f 100644 (file)
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 5f507a9..fbb9ac9 100644 (file)
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
index 76db912..4435b86 100644 (file)
Binary files a/data/images/creatures/mr_tree/walk-left-6.png and b/data/images/creatures/mr_tree/walk-left-6.png differ

diff --git a/src/badguy/mrtree.cpp b/src/badguy/mrtree.cpp
index 8955e1c..028d7f4 100644 (file)
--- a/src/badguy/mrtree.cpp
+++ b/src/badguy/mrtree.cpp
@@ -32,7 +32,7 @@ MrTree::MrTree(const lisp::Lisp& reader)
   reader.get("y", start_position.y);
   stay_on_platform = false;
   reader.get("stay-on-platform", stay_on_platform);
-  bbox.set_size(99.8, 99.8);
+  bbox.set_size(84.8, 84.8);
   sprite = sprite_manager->create("images/creatures/mr_tree/mr_tree.sprite");
 }
 
@@ -52,10 +52,10 @@ MrTree::activate()
 {
   if(mystate == STATE_BIG) {
     physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
-    sprite->set_action(dir == LEFT ? "left" : "right");
+    sprite->set_action(dir == LEFT ? "large-left" : "large-right");
   } else {
     physic.set_velocity_x(dir == LEFT ? -WALKSPEED_SMALL : WALKSPEED_SMALL);
-    bbox.set_size(31.8, 68.8);
+    bbox.set_size(31.8, 31.8);
     sprite->set_action(dir == LEFT ? "small-left" : "small-right");
   }
 }
@@ -66,7 +66,7 @@ MrTree::active_update(float elapsed_time)
   if (stay_on_platform && may_fall_off_platform())
   {
     dir = (dir == LEFT ? RIGHT : LEFT);
-    sprite->set_action(dir == LEFT ? "left" : "right");
+    sprite->set_action(dir == LEFT ? "large-left" : "large-right");
     physic.set_velocity_x(-physic.get_velocity_x());
   }