ice yeti animation updates

[supertux.git] / src / badguy / yeti.cpp

diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp
index c1da901..7ca7c6b 100644 (file)
--- a/src/badguy/yeti.cpp
+++ b/src/badguy/yeti.cpp
@@ -17,44 +17,61 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
-
 #include <config.h>
 
 #include <float.h>
-#include "yeti.h"
-#include "object/camera.h"
-#include "yeti_stalactite.h"
-#include "bouncing_snowball.h"
+#include <sstream>
+#include <memory>
+#include "yeti.hpp"
+#include "object/camera.hpp"
+#include "yeti_stalactite.hpp"
+#include "bouncing_snowball.hpp"
+#include "game_session.hpp"
+#include "scripting/script_interpreter.hpp"
 
 static const float JUMP_VEL1 = 250;
 static const float JUMP_VEL2 = 700;
 static const float RUN_SPEED = 350;
 static const float JUMP_TIME = 1.6;
 static const float ANGRY_JUMP_WAIT = .5;
+/// the time we are safe when tux just hit us
+static const float SAFE_TIME = .5;
 static const int INITIAL_HITPOINTS = 3;
-static const int INITIAL_BULLET_HP = 10;
 
 Yeti::Yeti(const lisp::Lisp& reader)
 {
   reader.get("x", start_position.x);
   reader.get("y", start_position.y);
   bbox.set_size(80, 120);
-  sprite = sprite_manager->create("yeti");
+  sprite = sprite_manager->create("images/creatures/yeti/yeti.sprite");
+  sprite->set_action("right");
   state = INIT;
   side = LEFT;
-  hitpoints = INITIAL_HITPOINTS;
-  bullet_hitpoints = INITIAL_BULLET_HP;
+#if 0
   sound_manager->preload_sound("yeti_gna");
-  sound_manager->preload_sound("yeti_roar");  
+  sound_manager->preload_sound("yeti_roar");
+#endif
+  hit_points = INITIAL_HITPOINTS;
+  reader.get("dead-script", dead_script);
+  countMe = false;
 }
 
 Yeti::~Yeti()
 {
-  Mix_FreeChunk(sound_gna);
 }
 
 void
-Yeti::active_action(float elapsed_time)
+Yeti::draw(DrawingContext& context)
+{
+  // we blink when we are safe
+  if(safe_timer.started() && size_t(game_time*40)%2)
+    return;
+
+  BadGuy::draw(context);
+}
+
+void
+Yeti::active_update(float elapsed_time)
 {
   switch(state) {
     case INIT:
@@ -72,7 +89,7 @@ Yeti::active_action(float elapsed_time)
     case ANGRY_JUMPING:
       if(timer.check()) {
         // jump
-        sound_manager->play_sound("yeti_gna");
+        sound_manager->play("sounds/yeti_gna.wav");
         physic.set_velocity_y(JUMP_VEL1);
       }
       break;
@@ -117,46 +134,50 @@ Yeti::summon_snowball()
   Sector::current()->add_object(new BouncingSnowball(get_pos().x+(side == LEFT ? 64 : -64), get_pos().y, (side == LEFT ? RIGHT : LEFT)));
 }
 
-HitResponse
-Yeti::collision_player(Player& player, const CollisionHit& hit)
-{
-  if(player.is_invincible()) {
-    kill_fall();
-    return ABORT_MOVE;
-  }
-  if(hit.normal.y > .9) {
-    hitpoints--;
-    bullet_hitpoints--;
-    sound_manager->play_sound("yeti_roar");    
-    if(collision_squished(player))
-      return ABORT_MOVE;
-    else if (hitpoints <= 0) {
-      bullet_hitpoints = 0;
-      player.kill(Player::SHRINK);
-      return FORCE_MOVE;
-    }
-  }
-  player.kill(Player::SHRINK);
-  return FORCE_MOVE;
-}
-
 bool
 Yeti::collision_squished(Player& player)
 {
-  bool result = false;
+  if(safe_timer.started())
+    return true;
+
   player.bounce(*this);
-  if (hitpoints <= 0) {
-    bullet_hitpoints = 0;
-    //sprite->set_action("dead"); 
+  sound_manager->play("sounds/yeti_roar.wav");
+  hit_points--;
+  if(hit_points <= 0) {
+    sprite->set_action("dead");
     kill_squished(player);
-    result = true;
+
+    // start script
+    if(dead_script != "") {
+      ScriptInterpreter::add_script_object(Sector::current(),
+          "Yeti - dead-script", dead_script);
+    }
+  } else {
+    safe_timer.start(SAFE_TIME);
   }
-  return result;
+  
+  return true;
 }
 
 void
-Yeti::write(lisp::Writer& )
+Yeti::kill_fall()
+{
+  // shooting bullets or being invincible won't work :)
+}
+
+void
+Yeti::write(lisp::Writer& writer)
 {
+  writer.start_list("yeti");
+
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
+
+  if(dead_script != "") {
+    writer.write_string("dead-script", dead_script);
+  }
+
+  writer.end_list("yeti");
 }
 
 void
@@ -193,14 +214,18 @@ Yeti::collision_solid(GameObject& , const CollisionHit& hit)
     } else if(state == GO_LEFT && !timer.started()) {
       side = LEFT;
       summon_snowball();
+      sprite->set_action("right");
       angry_jumping();
     } else if(state == GO_RIGHT && !timer.started()) {
       side = RIGHT;
       summon_snowball();
+      sprite->set_action("left");
       angry_jumping();
     } else if(state == ANGRY_JUMPING) {
       if(!timer.started()) {
         // we just landed
+       // FixME need help here setting the walk,stand,jump image states
+       sprite->set_action("jump-right");
         jumpcount++;
         // make a stalactite falling down and shake camera a bit
         Sector::current()->camera->shake(.1, 0, 10);
@@ -223,18 +248,4 @@ Yeti::collision_solid(GameObject& , const CollisionHit& hit)
   return CONTINUE;
 }
 
-void
-Yeti::kill_fall()
-{
-  sound_manager->play_sound("yeti_roar");  
-  bullet_hitpoints--;
-  if (bullet_hitpoints <= 0) {
-    sound_manager->play_sound("fall", this,
-                              Sector::current()->player->get_pos());
-    physic.set_velocity_y(0);
-    physic.enable_gravity(true);
-    set_state(STATE_FALLING);
-  }
-}
-
 IMPLEMENT_FACTORY(Yeti, "yeti")