X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fflyingsnowball.cpp;h=2ad19e45fb44fee98a6f48cc37aa9aaaae5a4b52;hb=35f17b8b7e5e0bafca3a34550fa300db704aedaa;hp=e07179a7666733a20e1595e50e102de9c4c49c41;hpb=8e02ba38e2a98f9ea7f092e333f8085520e6c22a;p=supertux.git

diff --git a/src/badguy/flyingsnowball.cpp b/src/badguy/flyingsnowball.cpp
index e07179a76..2ad19e45f 100644
--- a/src/badguy/flyingsnowball.cpp
+++ b/src/badguy/flyingsnowball.cpp
@@ -1,82 +1,124 @@
-#include <config.h>
-#include <stdio.h>
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "flyingsnowball.h"
+#include "badguy/flyingsnowball.hpp"
 
-static const float FLYTIME = 1.0;
-static const float FLYSPEED = 100.0;
+#include "math/random_generator.hpp"
+#include "object/sprite_particle.hpp"
+#include "object/player.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
 
-FlyingSnowBall::FlyingSnowBall(const lisp::Lisp& reader)
+namespace {
+const float PUFF_INTERVAL_MIN = 4.0f; /**< spawn new puff of smoke at most that often */
+const float PUFF_INTERVAL_MAX = 8.0f; /**< spawn new puff of smoke at least that often */
+}
+
+FlyingSnowBall::FlyingSnowBall(const Reader& reader) :
+  BadGuy(reader, "images/creatures/flying_snowball/flying_snowball.sprite"),
+  normal_propeller_speed(),
+  puff_timer()
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("flyingsnowball");
-  physic.enable_gravity(false);
+  physic.enable_gravity(true);
 }
 
-FlyingSnowBall::FlyingSnowBall(float pos_x, float pos_y)
+FlyingSnowBall::FlyingSnowBall(const Vector& pos) :
+  BadGuy(pos, "images/creatures/flying_snowball/flying_snowball.sprite"),
+  normal_propeller_speed(),
+  puff_timer()
 {
-  start_position.x = pos_x;
-  start_position.y = pos_y;
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("flyingsnowball");
-  physic.enable_gravity(false);
+  physic.enable_gravity(true);
 }
 
 void
-FlyingSnowBall::write(lisp::Writer& writer)
+FlyingSnowBall::initialize()
 {
-  writer.start_list("flyingsnowball");
-
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-
-  writer.end_list("flyingsnowball");
+  sprite->set_action(dir == LEFT ? "left" : "right");
 }
 
-void 
+void
 FlyingSnowBall::activate()
 {
-  sprite->set_action(dir == LEFT ? "left" : "right");
-  mode = FLY_UP;
-  physic.set_velocity_y(FLYSPEED);
-  timer.start(FLYTIME/2);
+  puff_timer.start(gameRandom.randf(PUFF_INTERVAL_MIN, PUFF_INTERVAL_MAX));
+  normal_propeller_speed = gameRandom.randf(0.95, 1.05);
 }
 
 bool
-FlyingSnowBall::collision_squished(Player& player)
+FlyingSnowBall::collision_squished(GameObject& object)
 {
   sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
-  kill_squished(player);
+  physic.set_acceleration_y(0);
+  physic.set_velocity_y(0);
+  kill_squished(object);
   return true;
 }
 
-HitResponse
-FlyingSnowBall::collision_solid(GameObject& , const CollisionHit& hit)
+void
+FlyingSnowBall::collision_solid(const CollisionHit& hit)
 {
-  if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
+  if(hit.top || hit.bottom) {
     physic.set_velocity_y(0);
   }
-
-  return CONTINUE;
 }
 
 void
-FlyingSnowBall::active_action(float elapsed_time) 
+FlyingSnowBall::active_update(float elapsed_time)
 {
-  if(timer.check()) {
-    if(mode == FLY_UP) {
-      mode = FLY_DOWN;
-      physic.set_velocity_y(-FLYSPEED);
-    } else if(mode == FLY_DOWN) {
-      mode = FLY_UP;
-      physic.set_velocity_y(FLYSPEED);
-    }
-    timer.start(FLYTIME);
+
+  const float grav = Sector::current()->get_gravity() * 100.0f;
+  if (get_pos().y > start_position.y + 2*32) {
+
+    // Flying too low - increased propeller speed
+    physic.set_acceleration_y(-grav*1.2);
+
+    physic.set_velocity_y(physic.get_velocity_y() * 0.99);
+
+  } else if (get_pos().y < start_position.y - 2*32) {
+
+    // Flying too high - decreased propeller speed 
+    physic.set_acceleration_y(-grav*0.8);
+
+    physic.set_velocity_y(physic.get_velocity_y() * 0.99f);
+
+  } else {
+
+    // Flying at acceptable altitude - normal propeller speed 
+    physic.set_acceleration_y(-grav*normal_propeller_speed);
+
   }
+
   movement=physic.get_movement(elapsed_time);
-  dir= Sector::current()->player->get_pos().x>get_pos().x?RIGHT:LEFT;
-  sprite->set_action(dir == LEFT ? "left" : "right");
+
+  Player* player = this->get_nearest_player();
+  if (player) {
+    dir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT;
+    sprite->set_action(dir == LEFT ? "left" : "right");
+  }
+
+  // spawn smoke puffs
+  if (puff_timer.check()) {
+    Vector ppos = bbox.get_middle();
+    Vector pspeed = Vector(gameRandom.randf(-10, 10), 150);
+    Vector paccel = Vector(0,0);
+    Sector::current()->add_object(new SpriteParticle("images/objects/particles/smoke.sprite", "default", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS-1));
+    puff_timer.start(gameRandom.randf(PUFF_INTERVAL_MIN, PUFF_INTERVAL_MAX));
+
+    normal_propeller_speed = gameRandom.randf(0.95, 1.05);
+    physic.set_velocity_y(physic.get_velocity_y() - 50);
+  }
 }
 
+/* EOF */