X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fdispenser.cpp;h=2a9d03e9e05e393682f8b4c6d2a5c7c50828a5b1;hb=013a5ca196545a094f27c1b708facd0084d58d55;hp=de9f930a5b3a6a1c48fb1f2d056f6632387a90b5;hpb=e1e5d6003f07e50811e7001f15f1c1c94617437a;p=supertux.git

diff --git a/src/badguy/dispenser.cpp b/src/badguy/dispenser.cpp
index de9f930a5..2a9d03e9e 100644
--- a/src/badguy/dispenser.cpp
+++ b/src/badguy/dispenser.cpp
@@ -20,6 +20,7 @@
 #include <config.h>
 
 #include "dispenser.hpp"
+#include "object/bullet.hpp"
 #include "badguy/bouncing_snowball.hpp"
 #include "badguy/snowball.hpp"
 #include "badguy/mrbomb.hpp"
@@ -28,24 +29,31 @@
 #include "badguy/poisonivy.hpp"
 #include "badguy/snail.hpp"
 #include "badguy/skullyhop.hpp"
+#include "badguy/captainsnowball.hpp"
+#include "badguy/kamikazesnowball.hpp"
 #include "random_generator.hpp"
 
 Dispenser::Dispenser(const lisp::Lisp& reader)
 	: BadGuy(reader, "images/creatures/dispenser/dispenser.sprite")
 {
-  std::string launchdirection = "";
-  launchdir = dir;
-  reader.get("launchdirection", launchdirection);
-  if( launchdirection == "left" || launchdirection == "LEFT"  )
-    launchdir = LEFT;
-  if( launchdirection == "right" || launchdirection == "RIGHT"  ) 
-    launchdir = RIGHT;
+  set_colgroup_active(COLGROUP_MOVING_STATIC);
+  sound_manager->preload("sounds/squish.wav");
   reader.get("cycle", cycle);
   reader.get("badguy", badguy);
+  autotarget = false;
+  swivel = false;
+  broken = false;
   if (badguy == "mrrocket") {
-     sprite->set_action(launchdir == LEFT ? "working-left" : "working-right");
+     sprite->set_action(dir == LEFT ? "working-left" : "working-right");
+     set_colgroup_active(COLGROUP_MOVING); //if this were COLGROUP_MOVING_STATIC MrRocket would explode on launch.
+     if( start_dir == AUTO ){
+      autotarget = true;
+     }
+  } else if ( badguy == "kamikazesnowball" ||  badguy == "captainsnowball" ) {
+     sprite->set_action("working");
+  } else {
+    sprite->set_action("dropper");
   }
-  else {sprite->set_action("dropper");}
   bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
   countMe = false;
 }
@@ -65,37 +73,114 @@ Dispenser::write(lisp::Writer& writer)
 
 void
 Dispenser::activate()
-{  
+{
+   if( broken ){
+     return;
+   }
+   if( autotarget && !swivel ){ // auto cannon sprite might be wrong
+      Player* player = this->get_nearest_player();
+      if( player ){
+        dir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT;
+        sprite->set_action(dir == LEFT ? "working-left" : "working-right");
+      }
+   }
    dispense_timer.start(cycle, true);
    launch_badguy();
 }
 
+void
+Dispenser::deactivate()
+{
+   dispense_timer.stop();
+}
+
+//TODO: Add launching velocity to certain badguys
 bool
-Dispenser::collision_squished(Player& player)
+Dispenser::collision_squished(GameObject& object)
 {
-  //TODO: Should it act like a normal tile when killed?
-  sprite->set_action(launchdir == LEFT ? "broken-left" : "broken-right");
+  //Cannon launching MrRocket can be broken by jumping on it
+  //other dispencers are not that fragile.
+  if (broken || badguy != "mrrocket") {
+    return false;
+  }
+  sprite->set_action(dir == LEFT ? "broken-left" : "broken-right");
   dispense_timer.start(0);
-  player.bounce(*this);
-  kill_squished(player);
+  set_colgroup_active(COLGROUP_MOVING_STATIC); // Tux can stand on broken cannon.
+  Player* player = dynamic_cast<Player*>(&object);
+  if (player){
+    player->bounce(*this);
+  }
+  sound_manager->play("sounds/squish.wav", get_pos());
+  broken = true;
   return true;
 }
 
+HitResponse
+Dispenser::collision(GameObject& other, const CollisionHit& hit)
+{
+  Player* player = dynamic_cast<Player*> (&other);
+  if(player) {
+    // hit from above?
+    if (player->get_bbox().p2.y < (bbox.p1.y + 16)) {
+      collision_squished(*player);
+      return FORCE_MOVE;
+    }
+    if(frozen){
+      unfreeze();
+    }
+    return FORCE_MOVE;
+  }
+
+  Bullet* bullet = dynamic_cast<Bullet*> (&other);
+  if(bullet){
+    return collision_bullet(*bullet, hit);
+  }
+
+  return FORCE_MOVE;
+}
+
+
 void
 Dispenser::active_update(float )
 {
   if (dispense_timer.check()) {
-    launch_badguy();
+    // auto always shoots in Tux's direction
+    if( autotarget ){ 
+      if( sprite->animation_done()) {
+        sprite->set_action(dir == LEFT ? "working-left" : "working-right");
+        swivel = false;
+      }
+
+      Player* player = this->get_nearest_player();
+      if( player && !swivel ){
+        Direction targetdir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT;
+        if( dir != targetdir ){ // no target: swivel cannon 
+          swivel = true;
+          dir = targetdir;
+          sprite->set_action(dir == LEFT ? "swivel-left" : "swivel-right", 1);
+        } else { // tux in sight: shoot
+          launch_badguy();
+        }
+      }
+    } else {
+      launch_badguy();
+    }
   }
 }
 
-//TODO: Add launching velocity to certain badguys
 //      Add themed randomizer
 void
 Dispenser::launch_badguy()
 {
   //FIXME: Does is_offscreen() work right here?
   if (!is_offscreen()) {
+    Direction launchdir = dir;
+    if( !autotarget && start_dir == AUTO ){
+      Player* player = this->get_nearest_player();
+      if( player ){
+        launchdir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT;
+      } 
+    } 
     if (badguy == "snowball")
       Sector::current()->add_object(new SnowBall(Vector(get_pos().x, get_pos().y+32), launchdir));
     else if (badguy == "bouncingsnowball")
@@ -106,8 +191,12 @@ Dispenser::launch_badguy()
       Sector::current()->add_object(new MrIceBlock(Vector(get_pos().x, get_pos().y+32), launchdir));
     else if (badguy == "snail")
       Sector::current()->add_object(new Snail(Vector(get_pos().x, get_pos().y+32), launchdir));
-    else if (badguy == "mrrocket") {
-      Sector::current()->add_object(new MrRocket(Vector(get_pos().x+(launchdir == LEFT ? -32 : 32), get_pos().y), launchdir));}
+    else if (badguy == "mrrocket") 
+      Sector::current()->add_object(new MrRocket(Vector(get_pos().x+(launchdir == LEFT ? -32 : 32), get_pos().y), launchdir));
+    else if (badguy == "captainsnowball")
+      Sector::current()->add_object(new CaptainSnowball(Vector(get_pos().x+(launchdir == LEFT ? -32 : 32), get_pos().y), launchdir));
+    else if (badguy == "kamikazesnowball")
+      Sector::current()->add_object(new KamikazeSnowball(Vector(get_pos().x+(launchdir == LEFT ? -32 : 32), get_pos().y), launchdir));
     else if (badguy == "poisonivy")
       Sector::current()->add_object(new PoisonIvy(Vector(get_pos().x, get_pos().y+32), launchdir));
     else if (badguy == "skullyhop")
@@ -128,4 +217,23 @@ Dispenser::launch_badguy()
   }
 }
 
+void
+Dispenser::freeze()
+{
+  BadGuy::freeze();
+  dispense_timer.stop();
+}
+
+void
+Dispenser::unfreeze()
+{
+  BadGuy::unfreeze();
+  activate();
+}
+
+bool
+Dispenser::is_freezable() const
+{
+  return true;
+}
 IMPLEMENT_FACTORY(Dispenser, "dispenser")