Mr. Tree now spawns two badguys when hit

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

diff --git a/src/badguy/kugelblitz.cpp b/src/badguy/kugelblitz.cpp
index 1f861fe..eb4fc2e 100644 (file)
--- a/src/badguy/kugelblitz.cpp
+++ b/src/badguy/kugelblitz.cpp
@@ -20,8 +20,8 @@
 #include <config.h>
 
 #include "kugelblitz.hpp"
-#include "sector.hpp"
 #include "object/tilemap.hpp"
+#include "object/camera.hpp"
 #include "tile.hpp"
 
 #define  LIFETIME 5
@@ -29,13 +29,16 @@
 #define  BASE_SPEED 200
 #define  RAND_SPEED 150
 
+static const float X_OFFSCREEN_DISTANCE = 1600;
+static const float Y_OFFSCREEN_DISTANCE = 1200;
+
 Kugelblitz::Kugelblitz(const lisp::Lisp& reader)
     : groundhit_pos_set(false)
 {
   reader.get("x", start_position.x);
   start_position.y = 0; //place above visible area
   bbox.set_size(63.8, 63.8);
-  sprite = sprite_manager->create("kugelblitz");
+  sprite = sprite_manager->create("images/creatures/kugelblitz/kugelblitz.sprite");
   sprite->set_action("falling");
   physic.enable_gravity(false);
 }
@@ -46,7 +49,6 @@ Kugelblitz::write(lisp::Writer& writer)
   writer.start_list("kugelblitz");
 
   writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
 
   writer.end_list("kugelblitz");
 }
@@ -61,16 +63,37 @@ Kugelblitz::activate()
 }
 
 HitResponse
-Kugelblitz::collision_solid(GameObject& other, const CollisionHit& chit)
+Kugelblitz::collision_solid(GameObject& , const CollisionHit& chit)
 {
-  //TODO: Explode when Tux is hit
   return hit(chit);
 }
 
 HitResponse
+Kugelblitz::collision_player(Player& player, const CollisionHit& )
+{
+  if(player.is_invincible()) {
+    explode();
+    return ABORT_MOVE;
+  }
+  // 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 is it possible to squish us, then this will hurt
+    if(!collision_squished(player))
+      player.kill(Player::SHRINK);
+      explode();
+    return FORCE_MOVE;
+  }
+  player.kill(Player::SHRINK);
+  explode();
+  return FORCE_MOVE;
+}
+
+HitResponse
 Kugelblitz::collision_badguy(BadGuy& other , const CollisionHit& chit)
 {
-  //Let the Kugelblitz explode, too?
+  //Let the Kugelblitz explode, too? The problem with that is that
+  //two Kugelblitzes would cancel each other out on contact...
   other.kill_fall();
   return hit(chit);
 }
@@ -105,12 +128,7 @@ void
 Kugelblitz::active_update(float elapsed_time)
 {
   if (lifetime.check()) {
-    if (!dying) {
-      sprite->set_action("pop");
-      lifetime.start(0.2);
-      dying = true;
-    }
-    else remove_me();
+    explode();
   }
   else {
     if (groundhit_pos_set) {
@@ -123,6 +141,13 @@ Kugelblitz::active_update(float elapsed_time)
     }
     if (Sector::current()->solids->get_tile_at(get_pos())->getAttributes() == 16) {
       //HIT WATER
+      Sector::current()->add_object(new Electrifier(75,1421,1.5));
+      Sector::current()->add_object(new Electrifier(76,1422,1.5));
+      explode();
+    }
+    if (Sector::current()->solids->get_tile_at(get_pos())->getAttributes() == 48) {
+      //HIT ELECTRIFIED WATER
+      explode();
     }
   }
   BadGuy::active_update(elapsed_time);  
@@ -133,4 +158,59 @@ Kugelblitz::kill_fall()
 {
 }
 
+void
+Kugelblitz::explode()
+{
+  if (!dying) {
+    sprite->set_action("pop");
+    lifetime.start(0.2);
+    dying = true;
+  }
+  else remove_me();
+}
+
+void
+Kugelblitz::try_activate()
+{
+  //FIXME: Don't activate Kugelblitz before it's on-screen
+  float scroll_x = Sector::current()->camera->get_translation().x;
+  float scroll_y = Sector::current()->camera->get_translation().y;
+
+  /* Activate badguys if they're just around the screen to avoid
+   * the effect of having badguys suddenly popping up from nowhere.
+   */
+  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;
+    set_state(STATE_ACTIVE);
+    activate();
+  } else if (start_position.x > scroll_x &&
+      start_position.x < scroll_x + X_OFFSCREEN_DISTANCE &&
+      start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
+      start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE) {
+    dir = LEFT;
+    set_state(STATE_ACTIVE);
+    activate();
+  } 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();
+  } else if(state == STATE_INIT
+      && start_position.x > scroll_x - X_OFFSCREEN_DISTANCE
+      && start_position.x < scroll_x + X_OFFSCREEN_DISTANCE
+      && start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE
+      && start_position.y < scroll_y + Y_OFFSCREEN_DISTANCE) {
+    dir = LEFT;
+    set_state(STATE_ACTIVE);
+    activate();
+  }
+}
+
 IMPLEMENT_FACTORY(Kugelblitz, "kugelblitz")