X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fbadguy.cpp;h=19e8d8b496aca34a4e78f3014698cb5b5dba1510;hb=791b577793d178a35031a6585ebc9a73b94f299c;hp=b9ae2332a7246f2e9a6c5a42ced32592655c89c1;hpb=52de79ad8301a395a5a2999ecbdf31731c0b65f8;p=supertux.git

diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index b9ae2332a..19e8d8b49 100644
--- a/src/badguy/badguy.cpp
+++ b/src/badguy/badguy.cpp
@@ -16,7 +16,6 @@
 //  You should have received a copy of the GNU General Public License
 //  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 "badguy.hpp"
@@ -26,20 +25,52 @@
 #include "statistics.hpp"
 #include "game_session.hpp"
 #include "log.hpp"
+#include "level.hpp"
+#include "object/bullet.hpp"
+#include "main.hpp"
+#include "object/particles.hpp"
+#include "random_generator.hpp"
 
 static const float SQUISH_TIME = 2;
 static const float X_OFFSCREEN_DISTANCE = 1600;
 static const float Y_OFFSCREEN_DISTANCE = 1200;
 
-BadGuy::BadGuy()
-  : countMe(true), sprite(0), dir(LEFT), state(STATE_INIT)
+BadGuy::BadGuy(const Vector& pos, const std::string& sprite_name, int layer)
+  : MovingSprite(pos, sprite_name, layer, COLGROUP_DISABLED), countMe(true),
+    dir(LEFT), start_dir(AUTO), frozen(false), ignited(false),
+    state(STATE_INIT), on_ground_flag(false)
 {
-  set_group(COLGROUP_DISABLED);
+  start_position = bbox.p1;
+
+  sound_manager->preload("sounds/squish.wav");
+  sound_manager->preload("sounds/fall.wav");
 }
 
-BadGuy::~BadGuy()
+BadGuy::BadGuy(const Vector& pos, Direction direction, const std::string& sprite_name, int layer)
+  : MovingSprite(pos, sprite_name, layer, COLGROUP_DISABLED), countMe(true),
+    dir(direction), start_dir(direction), frozen(false), ignited(false),
+    state(STATE_INIT), on_ground_flag(false)
 {
-  delete sprite;
+  start_position = bbox.p1;
+
+  sound_manager->preload("sounds/squish.wav");
+  sound_manager->preload("sounds/fall.wav");
+}
+
+BadGuy::BadGuy(const lisp::Lisp& reader, const std::string& sprite_name, int layer)
+  : MovingSprite(reader, sprite_name, layer, COLGROUP_DISABLED), countMe(true), dir(LEFT), start_dir(AUTO), frozen(false), ignited(false), state(STATE_INIT), on_ground_flag(false)
+{
+  start_position = bbox.p1;
+
+  std::string dir_str = "auto";
+  reader.get("direction", dir_str);
+  start_dir = str2dir( dir_str );
+  dir = start_dir;
+
+  reader.get("dead-script", dead_script);
+
+  sound_manager->preload("sounds/squish.wav");
+  sound_manager->preload("sounds/fall.wav");
 }
 
 void
@@ -52,10 +83,10 @@ BadGuy::draw(DrawingContext& context)
   if(state == STATE_FALLING) {
     DrawingEffect old_effect = context.get_drawing_effect();
     context.set_drawing_effect((DrawingEffect) (old_effect | VERTICAL_FLIP));
-    sprite->draw(context, get_pos(), LAYER_OBJECTS);
+    sprite->draw(context, get_pos(), layer);
     context.set_drawing_effect(old_effect);
   } else {
-    sprite->draw(context, get_pos(), LAYER_OBJECTS);
+    sprite->draw(context, get_pos(), layer);
   }
 }
 
@@ -67,9 +98,10 @@ BadGuy::update(float elapsed_time)
     return;
   }
   if(is_offscreen()) {
+    if (state == STATE_ACTIVE) deactivate();
     set_state(STATE_INACTIVE);
   }
-  
+
   switch(state) {
     case STATE_ACTIVE:
       active_update(elapsed_time);
@@ -90,6 +122,23 @@ BadGuy::update(float elapsed_time)
       movement = physic.get_movement(elapsed_time);
       break;
   }
+
+  on_ground_flag = false;
+}
+
+Direction
+BadGuy::str2dir( std::string dir_str )
+{
+  if( dir_str == "auto" )
+    return AUTO;
+  if( dir_str == "left" )
+    return LEFT;
+  if( dir_str == "right" )
+    return RIGHT;
+
+  //default to "auto"
+  log_warning << "Badguy::str2dir: unknown direction \"" << dir_str << "\"" << std::endl;;
+  return AUTO;
 }
 
 void
@@ -103,9 +152,9 @@ BadGuy::deactivate()
 }
 
 void
-BadGuy::save(lisp::Writer& )
+BadGuy::write(lisp::Writer& )
 {
-	log_warning << "tried to write out a generic badguy" << std::endl;
+  log_warning << "tried to write out a generic badguy" << std::endl;
 }
 
 void
@@ -122,8 +171,17 @@ BadGuy::inactive_update(float )
 void
 BadGuy::collision_tile(uint32_t tile_attributes)
 {
-  if(tile_attributes & Tile::HURTS)
-    kill_fall();
+  if(tile_attributes & Tile::HURTS) {
+    if (tile_attributes & Tile::FIRE) {
+      if (is_flammable()) ignite();
+    }
+    else if (tile_attributes & Tile::ICE) {
+      if (is_freezable()) freeze();
+    }
+    else {
+      kill_fall();
+    }
+  }
 }
 
 HitResponse
@@ -134,22 +192,39 @@ BadGuy::collision(GameObject& other, const CollisionHit& hit)
     case STATE_INACTIVE:
       return ABORT_MOVE;
     case STATE_ACTIVE: {
-      if(other.get_flags() & FLAG_SOLID)
-        return collision_solid(other, hit);
-
       BadGuy* badguy = dynamic_cast<BadGuy*> (&other);
-      if(badguy && badguy->state == STATE_ACTIVE)
-        return collision_badguy(*badguy, hit);
+      if(badguy && badguy->state == STATE_ACTIVE && badguy->get_group() == COLGROUP_MOVING) {
+
+	// hit from above?
+	if (badguy->get_bbox().p2.y < (bbox.p1.y + 16)) {
+	  if(collision_squished(*badguy)) {
+	    return ABORT_MOVE;
+	  }
+	}
+
+	return collision_badguy(*badguy, hit);
+      }
 
       Player* player = dynamic_cast<Player*> (&other);
-      if(player)
+      if(player) {
+
+	// hit from above?
+	if (player->get_bbox().p2.y < (bbox.p1.y + 16)) {
+	  if(collision_squished(*player)) {
+	    return ABORT_MOVE;
+	  }
+	}
+
         return collision_player(*player, hit);
+      }
+
+      Bullet* bullet = dynamic_cast<Bullet*> (&other);
+      if(bullet)
+        return collision_bullet(*bullet, hit);
 
       return FORCE_MOVE;
     }
     case STATE_SQUISHED:
-      if(other.get_flags() & FLAG_SOLID)
-        return CONTINUE;
       return FORCE_MOVE;
     case STATE_FALLING:
       return FORCE_MOVE;
@@ -158,10 +233,12 @@ BadGuy::collision(GameObject& other, const CollisionHit& hit)
   return ABORT_MOVE;
 }
 
-HitResponse
-BadGuy::collision_solid(GameObject& , const CollisionHit& )
+void
+BadGuy::collision_solid(const CollisionHit& hit)
 {
-  return FORCE_MOVE;
+  physic.set_velocity_x(0);
+  physic.set_velocity_y(0);
+  update_on_ground_flag(hit);
 }
 
 HitResponse
@@ -172,24 +249,9 @@ BadGuy::collision_player(Player& player, const CollisionHit& )
     return ABORT_MOVE;
   }
 
-  /*
-  printf("PlayerHit: GT %3.1f PM: %3.1f %3.1f BM: %3.1f %3.1f Hit: %3.1f %3.1f\n",
-          game_time,
-          player.get_movement().x, player.get_movement().y,
-          get_movement().x, get_movement().y,
-          hit.normal.x, hit.normal.y);
-  */
-
-  // hit from above?
-  if(player.get_movement().y /*- get_movement().y*/ > 0 
-          && player.get_bbox().p2.y <
-      (get_bbox().p1.y + get_bbox().p2.y) / 2) {
-    // if it's not possible to squish us, then this will hurt
-    if(collision_squished(player))
-      return ABORT_MOVE;
-  }
-
-  player.kill(Player::SHRINK);
+  if(frozen)
+    unfreeze();
+  player.kill(false);
   return FORCE_MOVE;
 }
 
@@ -200,13 +262,59 @@ BadGuy::collision_badguy(BadGuy& , const CollisionHit& )
 }
 
 bool
-BadGuy::collision_squished(Player& )
+BadGuy::collision_squished(GameObject& )
 {
   return false;
 }
 
+HitResponse
+BadGuy::collision_bullet(Bullet& bullet, const CollisionHit& hit)
+{
+  if (is_frozen()) {
+    if(bullet.get_type() == FIRE_BONUS) {
+      // fire bullet thaws frozen badguys
+      unfreeze();
+      bullet.remove_me();
+      return ABORT_MOVE;
+    } else {
+      // other bullets ricochet
+      bullet.ricochet(*this, hit);
+      return FORCE_MOVE;
+    }
+  }
+  else if (is_ignited()) {
+    if(bullet.get_type() == ICE_BONUS) {
+      // ice bullets extinguish ignited badguys
+      extinguish();
+      bullet.remove_me();
+      return ABORT_MOVE;
+    } else {
+      // other bullets are absorbed by ignited badguys
+      bullet.remove_me();
+      return FORCE_MOVE;
+    }
+  }
+  else if(bullet.get_type() == FIRE_BONUS && is_flammable()) {
+    // fire bullets ignite flammable badguys
+    ignite();
+    bullet.remove_me();
+    return ABORT_MOVE;
+  }
+  else if(bullet.get_type() == ICE_BONUS && is_freezable()) {
+    // ice bullets freeze freezable badguys
+    freeze();
+    bullet.remove_me();
+    return ABORT_MOVE;
+  }
+  else {
+    // in all other cases, bullets ricochet
+    bullet.ricochet(*this, hit);
+    return FORCE_MOVE;
+  }
+}
+
 void
-BadGuy::kill_squished(Player& player)
+BadGuy::kill_squished(GameObject& object)
 {
   sound_manager->play("sounds/squish.wav", get_pos());
   physic.enable_gravity(true);
@@ -214,18 +322,46 @@ BadGuy::kill_squished(Player& player)
   physic.set_velocity_y(0);
   set_state(STATE_SQUISHED);
   set_group(COLGROUP_MOVING_ONLY_STATIC);
-  Sector::current()->get_level()->stats.add_points(BADGUYS_KILLED_STAT, 1);
-  player.bounce(*this);
+  Player* player = dynamic_cast<Player*>(&object);
+  if (player) {
+    if (countMe) Sector::current()->get_level()->stats.badguys++;
+    player->bounce(*this);
+  }
+
+  // start dead-script
+  if(dead_script != "") {
+    std::istringstream stream(dead_script);
+    Sector::current()->run_script(stream, "dead-script");
+  }
 }
 
 void
 BadGuy::kill_fall()
 {
   sound_manager->play("sounds/fall.wav", get_pos());
-  Sector::current()->get_level()->stats.add_points(BADGUYS_KILLED_STAT, 1);
+  if (countMe) Sector::current()->get_level()->stats.badguys++;
   physic.set_velocity_y(0);
   physic.enable_gravity(true);
   set_state(STATE_FALLING);
+
+  // start dead-script
+  if(dead_script != "") {
+    std::istringstream stream(dead_script);
+    Sector::current()->run_script(stream, "dead-script");
+  }
+}
+
+void
+BadGuy::run_dead_script()
+{
+   if (countMe)
+     Sector::current()->get_level()->stats.badguys++;
+   
+   // start dead-script
+  if(dead_script != "") {
+    std::istringstream stream(dead_script);
+    Sector::current()->run_script(stream, "dead-script");
+  }
 }
 
 void
@@ -264,11 +400,11 @@ BadGuy::is_offscreen()
 {
   float scroll_x = Sector::current()->camera->get_translation().x;
   float scroll_y = Sector::current()->camera->get_translation().y;
-     
+
   if(bbox.p2.x < scroll_x - X_OFFSCREEN_DISTANCE
-      || bbox.p1.x > scroll_x + X_OFFSCREEN_DISTANCE
+      || bbox.p1.x > scroll_x + X_OFFSCREEN_DISTANCE + SCREEN_WIDTH
       || bbox.p2.y < scroll_y - Y_OFFSCREEN_DISTANCE
-      || bbox.p1.y > scroll_y + Y_OFFSCREEN_DISTANCE)
+      || bbox.p1.y > scroll_y + Y_OFFSCREEN_DISTANCE + SCREEN_HEIGHT)
     return true;
 
   return false;
@@ -283,82 +419,83 @@ BadGuy::try_activate()
   /* Activate badguys if they're just around the screen to avoid
    * the effect of having badguys suddenly popping up from nowhere.
    */
+  //Badguy left of screen
   if (start_position.x > scroll_x - X_OFFSCREEN_DISTANCE &&
       start_position.x < scroll_x - bbox.get_width() &&
       start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
-      start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE) {
-    dir = RIGHT;
+      start_position.y < scroll_y + SCREEN_HEIGHT + Y_OFFSCREEN_DISTANCE) {
+    if (start_dir != AUTO) dir = start_dir; else dir = RIGHT;
     set_state(STATE_ACTIVE);
     activate();
-  } else if (start_position.x > scroll_x &&
-      start_position.x < scroll_x + X_OFFSCREEN_DISTANCE &&
+  //Badguy right of screen
+  } else if (start_position.x > scroll_x +  SCREEN_WIDTH &&
+      start_position.x < scroll_x + SCREEN_WIDTH + X_OFFSCREEN_DISTANCE &&
       start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
-      start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE) {
-    dir = LEFT;
+      start_position.y < scroll_y + SCREEN_HEIGHT + Y_OFFSCREEN_DISTANCE) {
+    if (start_dir != AUTO) dir = start_dir; else dir = LEFT;
     set_state(STATE_ACTIVE);
     activate();
+  //Badguy over or under screen
   } else if (start_position.x > scroll_x - X_OFFSCREEN_DISTANCE &&
-      start_position.x < scroll_x + X_OFFSCREEN_DISTANCE &&
-      ((start_position.y > scroll_y &&
-        start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE) ||
-       (start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
-        start_position.y < scroll_y))) {
-    dir = start_position.x < scroll_x ? RIGHT : LEFT;
-    set_state(STATE_ACTIVE);
-    activate();
+       start_position.x < scroll_x + SCREEN_WIDTH + X_OFFSCREEN_DISTANCE &&
+       ((start_position.y > scroll_y + SCREEN_HEIGHT &&
+         start_position.y < scroll_y + SCREEN_HEIGHT + Y_OFFSCREEN_DISTANCE) ||
+        (start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
+         start_position.y < scroll_y - bbox.get_height()  ))) {
+     if (start_dir != AUTO) dir = start_dir;
+     else{
+         // if nearest player is to our right, start facing right
+         Player* player = get_nearest_player();
+         if (player && (player->get_bbox().p1.x > get_bbox().p2.x)) {
+             dir = RIGHT;
+         } else {
+	         dir = LEFT;
+         }
+     }
+     set_state(STATE_ACTIVE);
+     activate();
   } else if(state == STATE_INIT
       && start_position.x > scroll_x - X_OFFSCREEN_DISTANCE
-      && start_position.x < scroll_x + X_OFFSCREEN_DISTANCE
+      && start_position.x < scroll_x + X_OFFSCREEN_DISTANCE + SCREEN_WIDTH
       && start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE
-      && start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE) {
-    dir = LEFT;
+      && start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE + SCREEN_HEIGHT ) {
+    if (start_dir != AUTO) {
+      dir = start_dir;
+    } else {
+      // if nearest player is to our right, start facing right
+      Player* player = get_nearest_player();
+      if (player && (player->get_bbox().p1.x > get_bbox().p2.x)) {
+	dir = RIGHT;
+      } else {
+	dir = LEFT;
+      }
+    }
     set_state(STATE_ACTIVE);
     activate();
-  } 
+  }
 }
 
 bool
-BadGuy::may_fall_off_platform()
-{
-  int tile_x, tile_y;
-  // First, let's say the badguy moves 32 units in the
-  // direction it's heading, so do some voodoo maths magic
-  // to determine its future position.
-  Vector pos;
-  if (dir == LEFT)
-    pos = Vector(bbox.p1.x - 32.f, bbox.p2.y);
-  else
-    pos = Vector(bbox.p2.x, bbox.p2.y);
-
-  // Now, snap the badguy's X coordinate to the 32x32/cell grid.
-  if (dir == LEFT) // use the ceiling
-    tile_x = (int)ceilf(pos.x/32.0f);
-  else // use the floor
-    tile_x = (int)floorf(pos.x/32.0f);
-
-  // We might be falling down, so use the ceiling to round upward and
-  // get the lower position. (Positive Y goes downward.)
-  tile_y = (int)ceilf(pos.y/32.0f);
-
-#if defined(DEBUG_STAY_ON_PLATFORM)
-  // Draw!
-  GameSession::current()->context->draw_filled_rect(Vector(tile_x*32.0f, tile_y*32.0f), Vector(32.f, 32.f), Color(1.f, 0.f, 0.f), 999);
-#endif
-
-  // Now, if the badguy intersects with a tile, he won't fall off.
-  // If he doesn't intersect, he probably will.
-  // Note that the tile's Y coordinate is offset by +1 from the object's Y.
-  if (Sector::current()->solids->get_tile(tile_x, tile_y)->getAttributes() & FLAG_SOLID)
-  {
-    // It's a solid tile. Good.
-    return false;
+BadGuy::might_fall(int height)
+{
+  // make sure we check for at least a 1-pixel fall
+  assert(height > 0);
+
+  float x1;
+  float x2;
+  float y1 = bbox.p2.y + 1;
+  float y2 = bbox.p2.y + 1 + height;
+  if (dir == LEFT) {
+    x1 = bbox.p1.x - 1;
+    x2 = bbox.p1.x - 1;
+  } else {
+    x1 = bbox.p2.x + 1;
+    x2 = bbox.p2.x + 1;
   }
-
-  // Watch out there buddy, you might take a sticky end!
-  return true;
+  return Sector::current()->is_free_of_statics(Rect(x1, y1, x2, y2));
 }
 
-Player* 
+Player*
 BadGuy::get_nearest_player()
 {
   // FIXME: does not really return nearest player
@@ -371,3 +508,73 @@ BadGuy::get_nearest_player()
 
   return 0;
 }
+
+void
+BadGuy::update_on_ground_flag(const CollisionHit& hit)
+{
+  if (hit.bottom) {
+    on_ground_flag = true;
+    floor_normal = hit.slope_normal;
+  }
+}
+
+bool
+BadGuy::on_ground()
+{
+  return on_ground_flag;
+}
+
+Vector
+BadGuy::get_floor_normal()
+{
+  return floor_normal;
+}
+
+void
+BadGuy::freeze()
+{
+  set_group(COLGROUP_MOVING_STATIC);
+  frozen = true;
+}
+
+void
+BadGuy::unfreeze()
+{
+  set_group(COLGROUP_MOVING);
+  frozen = false;
+}
+
+bool
+BadGuy::is_freezable() const
+{
+  return false;
+}
+
+bool
+BadGuy::is_frozen() const
+{
+  return frozen;
+}
+
+void
+BadGuy::ignite()
+{
+  kill_fall();
+}
+
+void
+BadGuy::extinguish()
+{
+}
+
+bool
+BadGuy::is_flammable() const
+{
+  return true;
+}
+
+bool
+BadGuy::is_ignited() const
+{
+  return ignited;
+}