X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fflyingsnowball.cpp;h=2ad19e45fb44fee98a6f48cc37aa9aaaae5a4b52;hb=fbfe2d469988518ba7e58b7230a3ce68e9ca5da5;hp=a36a998c12d1415e5e08d0b1f12d24d454273d6b;hpb=78e9b27b7059c9b9b16a7f871ab71f751ec75323;p=supertux.git diff --git a/src/badguy/flyingsnowball.cpp b/src/badguy/flyingsnowball.cpp index a36a998c1..2ad19e45f 100644 --- a/src/badguy/flyingsnowball.cpp +++ b/src/badguy/flyingsnowball.cpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux // Copyright (C) 2006 Matthias Braun // -// 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 2 -// of the License, or (at your option) any later version. +// 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 @@ -14,100 +12,94 @@ // 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, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -#include +// along with this program. If not, see . -#include +#include "badguy/flyingsnowball.hpp" -#include "flyingsnowball.hpp" -#include "random_generator.hpp" +#include "math/random_generator.hpp" #include "object/sprite_particle.hpp" - -static const float FLYTIME = 1.0; -static const float FLYSPEED = 100.0; +#include "object/player.hpp" +#include "supertux/object_factory.hpp" +#include "supertux/sector.hpp" namespace { - const float PUFF_PROBABILITY = 0.1; /**< chanche of puffs being spawned in the current cycle */ - const float PUFF_INTERVAL_MIN = 0.1; /**< spawn new puff of smoke at most that often */ - const float PUFF_INTERVAL_MAX = 1.1; /**< spawn new puff of smoke at least that often */ +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 lisp::Lisp& reader) - : BadGuy(reader, "images/creatures/flying_snowball/flying_snowball.sprite") +FlyingSnowBall::FlyingSnowBall(const Reader& reader) : + BadGuy(reader, "images/creatures/flying_snowball/flying_snowball.sprite"), + normal_propeller_speed(), + puff_timer() { - physic.enable_gravity(false); + physic.enable_gravity(true); } -FlyingSnowBall::FlyingSnowBall(const Vector& pos) - : BadGuy(pos, "images/creatures/flying_snowball/flying_snowball.sprite") +FlyingSnowBall::FlyingSnowBall(const Vector& pos) : + BadGuy(pos, "images/creatures/flying_snowball/flying_snowball.sprite"), + normal_propeller_speed(), + puff_timer() { - 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(systemRandom.randf(PUFF_INTERVAL_MIN, PUFF_INTERVAL_MAX)); + 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_update(float elapsed_time) +FlyingSnowBall::active_update(float elapsed_time) { - if(timer.check()) { - if(mode == FLY_UP) { - mode = FLY_DOWN; - physic.set_velocity_y(-FLYSPEED); - - // stop puffing - puff_timer.stop(); - - } else if(mode == FLY_DOWN) { - mode = FLY_UP; - physic.set_velocity_y(FLYSPEED); - - // roll a dice whether to start puffing - if (systemRandom.randf(0, 1) < PUFF_PROBABILITY) { - puff_timer.start(systemRandom.randf(PUFF_INTERVAL_MIN, PUFF_INTERVAL_MAX)); - } - - } - 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); Player* player = this->get_nearest_player(); @@ -119,11 +111,14 @@ FlyingSnowBall::active_update(float elapsed_time) // spawn smoke puffs if (puff_timer.check()) { Vector ppos = bbox.get_middle(); - Vector pspeed = Vector(systemRandom.randf(-10, 10), 150); + Vector pspeed = Vector(gameRandom.randf(-10, 10), 150); Vector paccel = Vector(0,0); - Sector::current()->add_object(new SpriteParticle("images/objects/particles/smoke.sprite", ppos, pspeed, paccel, LAYER_OBJECTS-1)); - puff_timer.start(systemRandom.randf(PUFF_INTERVAL_MIN, PUFF_INTERVAL_MAX)); + 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); } } -IMPLEMENT_FACTORY(FlyingSnowBall, "flyingsnowball") +/* EOF */