removed some unused yeti images, added some new yeti images, testing a new ending...

SVN-Revision: 3412

diff --git a/data/images/creatures/yeti/busted1.png b/data/images/creatures/yeti/busted1.png
new file mode 100644 (file)
index 0000000..3cd5688
Binary files /dev/null and b/data/images/creatures/yeti/busted1.png differ

diff --git a/data/images/creatures/yeti/busted2.png b/data/images/creatures/yeti/busted2.png
new file mode 100644 (file)
index 0000000..d818bc3
Binary files /dev/null and b/data/images/creatures/yeti/busted2.png differ

diff --git a/data/images/creatures/yeti/busted3.png b/data/images/creatures/yeti/busted3.png
new file mode 100644 (file)
index 0000000..4c3b627
Binary files /dev/null and b/data/images/creatures/yeti/busted3.png differ

diff --git a/data/images/creatures/yeti/iceyeti_flip0.png b/data/images/creatures/yeti/iceyeti_flip0.png
deleted file mode 100644 (file)
index a8ba3c7..0000000
Binary files a/data/images/creatures/yeti/iceyeti_flip0.png and /dev/null differ

diff --git a/data/images/creatures/yeti/iceyeti_flip1.png b/data/images/creatures/yeti/iceyeti_flip1.png
deleted file mode 100644 (file)
index 0e87cee..0000000
Binary files a/data/images/creatures/yeti/iceyeti_flip1.png and /dev/null differ

diff --git a/data/images/creatures/yeti/iceyeti_flip2.png b/data/images/creatures/yeti/iceyeti_flip2.png
deleted file mode 100644 (file)
index ff7c38a..0000000
Binary files a/data/images/creatures/yeti/iceyeti_flip2.png and /dev/null differ

diff --git a/data/images/creatures/yeti/iceyeti_flip3.png b/data/images/creatures/yeti/iceyeti_flip3.png
deleted file mode 100644 (file)
index 6c7079e..0000000
Binary files a/data/images/creatures/yeti/iceyeti_flip3.png and /dev/null differ

diff --git a/data/images/creatures/yeti/iceyeti_hit.png b/data/images/creatures/yeti/iceyeti_hit.png
deleted file mode 100644 (file)
index 25294b1..0000000
Binary files a/data/images/creatures/yeti/iceyeti_hit.png and /dev/null differ

diff --git a/data/images/creatures/yeti/iceyeti_jump.png b/data/images/creatures/yeti/iceyeti_jump.png
deleted file mode 100644 (file)
index aa3af04..0000000
Binary files a/data/images/creatures/yeti/iceyeti_jump.png and /dev/null differ

diff --git a/data/images/creatures/yeti/yeti.sprite b/data/images/creatures/yeti/yeti.sprite
index 426f890..f33b39c 100644 (file)
--- a/data/images/creatures/yeti/yeti.sprite
+++ b/data/images/creatures/yeti/yeti.sprite
@@ -24,7 +24,7 @@
   (action
     (name "jump-right")
     (images 
-      "y-jump.png"
+      "yeti_jump.png"
       )
     (x-offset 17)
     (y-offset 12)
@@ -65,15 +65,13 @@
     )
   (action
     (name "dead")
-    (fps 6)
+    (fps 2)
     (images 
-      "iceyeti_dust0.png"
-      "iceyeti_dust1.png"
-      "iceyeti_dust2.png"
-      "iceyeti_dust3.png"
-      "iceyeti_dust3.png"
+      "busted1.png"
+"busted2.png"
+"busted3.png"
       )
-    (x-offset 0)
-    (y-offset 27)
+    (x-offset 300)
+    (y-offset 400)
     )
   )

diff --git a/data/images/creatures/yeti/yeti_jump.png b/data/images/creatures/yeti/yeti_jump.png
new file mode 100644 (file)
index 0000000..fb917e8
Binary files /dev/null and b/data/images/creatures/yeti/yeti_jump.png differ

diff --git a/data/levels/world1/27 - No More Mr Ice Guy.stl b/data/levels/world1/27 - No More Mr Ice Guy.stl
index 8f17e27..22819db 100644 (file)
--- a/data/levels/world1/27 - No More Mr Ice Guy.stl
+++ b/data/levels/world1/27 - No More Mr Ice Guy.stl
@@ -110,10 +110,10 @@ Effect.fade_in(1);
 play_sound(\"sounds/yeti_finish.ogg\");
 Text.set_text(\"You Made It!\");
 Text.set_font(\"big\");
-Text.fade_in(1.5);
-wait(6);
-Effect.fade_out(1.5);
-wait(1.5);
+Text.fade_in(8.5);
+wait(2);
+Effect.fade_out(2.5);
+wait(2.5);
 Level.finish(true);
 ")
         )

diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp
index adb6344..28cbfda 100644 (file)
--- a/src/badguy/yeti.cpp
+++ b/src/badguy/yeti.cpp
@@ -36,14 +36,14 @@ namespace {
   const float RUN_VX = 350; /**< horizontal speed while running */
 
   const float JUMP_UP_VX = 350; /**< horizontal speed while jumping on the dais */
-  const float JUMP_UP_VY = 700; /**< vertical speed while jumping on the dais */
+  const float JUMP_UP_VY = 800; /**< vertical speed while jumping on the dais */
 
   const float STOMP_VY = 250; /** vertical speed while stomping on the dais */
 
   const float LEFT_STAND_X = 16; /**< x-coordinate of left dais' end position */
   const float RIGHT_STAND_X = 800-60-16; /**< x-coordinate of right dais' end position */ 
-  const float LEFT_JUMP_X = LEFT_STAND_X+284; /**< x-coordinate of from where to jump on the left dais */
-  const float RIGHT_JUMP_X = RIGHT_STAND_X-284; /**< x-coordinate of from where to jump on the right dais */
+  const float LEFT_JUMP_X = LEFT_STAND_X+224; /**< x-coordinate of from where to jump on the left dais */
+  const float RIGHT_JUMP_X = RIGHT_STAND_X-224; /**< x-coordinate of from where to jump on the right dais */
   const float STOMP_WAIT = .5; /**< time we stay on the dais before jumping again */
   const float SAFE_TIME = .5; /**< the time we are safe when tux just hit us */
   const int INITIAL_HITPOINTS = 3; /**< number of hits we can take */