X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fdispenser.cpp;h=1f48673bdb89c57866f7b9f31ce61243935721c8;hb=1f5ff04e5283398473b4ac033258b17af0ed08f0;hp=73a931b6abe78a3408d01281e9f0c09ce173cbf2;hpb=9a59c6599a15d5e6614d956de2111edc572b9486;p=supertux.git diff --git a/src/badguy/dispenser.cpp b/src/badguy/dispenser.cpp index 73a931b6a..1f48673bd 100644 --- a/src/badguy/dispenser.cpp +++ b/src/badguy/dispenser.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,97 +12,140 @@ // 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 - -#include "dispenser.hpp" -#include "badguy/bouncing_snowball.hpp" -#include "badguy/snowball.hpp" -#include "badguy/mrbomb.hpp" -#include "badguy/mriceblock.hpp" -#include "badguy/mrrocket.hpp" -#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") +// along with this program. If not, see . + +#include "badguy/dispenser.hpp" + +#include "audio/sound_manager.hpp" +#include "math/random_generator.hpp" +#include "object/bullet.hpp" +#include "object/player.hpp" +#include "supertux/object_factory.hpp" +#include "supertux/sector.hpp" +#include "util/reader.hpp" + +#include + +Dispenser::Dispenser(const Reader& reader) : + BadGuy(reader, "images/creatures/dispenser/dispenser.sprite"), + cycle(), + badguys(), + next_badguy(), + dispense_timer(), + autotarget(), + swivel(), + broken(), + random(), + type() { + set_colgroup_active(COLGROUP_MOVING_STATIC); + SoundManager::current()->preload("sounds/squish.wav"); reader.get("cycle", cycle); - reader.get("badguy", badguy); + reader.get("badguy", badguys); + random = false; // default + reader.get("random", random); + type = "dropper"; //default + reader.get("type", type); + next_badguy = 0; autotarget = false; swivel = false; - if (badguy == "mrrocket") { - sprite->set_action(dir == LEFT ? "working-left" : "working-right"); - if( start_dir == AUTO ){ + broken = false; + + if (badguys.size() <= 0) + throw std::runtime_error("No badguys in dispenser."); + + if (type == "rocketlauncher") { + 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 if (type == "cannon") { + sprite->set_action("working"); } else { sprite->set_action("dropper"); } + bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height()); countMe = false; } void -Dispenser::write(lisp::Writer& writer) -{ - writer.start_list("dispenser"); - - writer.write_float("x", start_position.x); - writer.write_float("y", start_position.y); - writer.write_float("cycle", cycle); - writer.write_string("badguy", badguy); - - writer.end_list("dispenser"); -} - -void Dispenser::activate() { - if( autotarget && !swivel ){ // auto canon 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(); + 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(); + dispense_timer.stop(); } //TODO: Add launching velocity to certain badguys bool Dispenser::collision_squished(GameObject& object) { - //TODO: Should it act like a normal tile when killed? + //Cannon launching MrRocket can be broken by jumping on it + //other dispensers are not that fragile. + if (broken || type != "rocketlauncher") { + return false; + } + sprite->set_action(dir == LEFT ? "broken-left" : "broken-right"); dispense_timer.start(0); + set_colgroup_active(COLGROUP_MOVING_STATIC); // Tux can stand on broken cannon. Player* player = dynamic_cast(&object); - if (player) player->bounce(*this); - kill_squished(object); + if (player){ + player->bounce(*this); + } + SoundManager::current()->play("sounds/squish.wav", get_pos()); + broken = true; return true; } +HitResponse +Dispenser::collision(GameObject& other, const CollisionHit& hit) +{ + Player* player = dynamic_cast (&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 (&other); + if(bullet){ + return collision_bullet(*bullet, hit); + } + + return FORCE_MOVE; +} + void Dispenser::active_update(float ) { if (dispense_timer.check()) { // auto always shoots in Tux's direction - if( autotarget ){ + if( autotarget ){ if( sprite->animation_done()) { sprite->set_action(dir == LEFT ? "working-left" : "working-right"); swivel = false; @@ -113,7 +154,7 @@ Dispenser::active_update(float ) 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 + if( dir != targetdir ){ // no target: swivel cannon swivel = true; dir = targetdir; sprite->set_action(dir == LEFT ? "swivel-left" : "swivel-right", 1); @@ -127,7 +168,6 @@ Dispenser::active_update(float ) } } -// Add themed randomizer void Dispenser::launch_badguy() { @@ -138,40 +178,71 @@ Dispenser::launch_badguy() 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") - Sector::current()->add_object(new BouncingSnowball(Vector(get_pos().x, get_pos().y+32), launchdir)); - else if (badguy == "mrbomb") - Sector::current()->add_object(new MrBomb(Vector(get_pos().x, get_pos().y+32), launchdir)); - else if (badguy == "mriceblock") - 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 == "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") - Sector::current()->add_object(new SkullyHop(Vector(get_pos().x, get_pos().y+44), launchdir)); - else if (badguy == "random") - { - switch (systemRandom.rand(7)) + } + } + + if (badguys.size() > 1) { + if (random) { + next_badguy = gameRandom.rand(badguys.size()); + } + else { + next_badguy++; + + if (next_badguy >= badguys.size()) + next_badguy = 0; + } + } + + std::string badguy = badguys[next_badguy]; + + if(badguy == "random") { + log_warning << "random is outdated; use a list of badguys to select from." << std::endl; + return; + } + if(badguy == "goldbomb") { + log_warning << "goldbomb is not allowed to be dispensed" << std::endl; + return; + } + + try { + GameObjectPtr game_object; + Vector spawnpoint; + Rectf object_bbox; + + /* Need to allocate the badguy first to figure out its bounding box. */ + game_object = ObjectFactory::instance().create(badguy, get_pos(), launchdir); + if (game_object == NULL) + throw std::runtime_error("Creating " + badguy + " object failed."); + + BadGuy& bad_guy = dynamic_cast(*game_object); + + object_bbox = bad_guy.get_bbox(); + + if (type == "dropper") + { + spawnpoint = get_anchor_pos (get_bbox(), ANCHOR_BOTTOM); + spawnpoint.x -= 0.5 * object_bbox.get_width(); + } + else if ((type == "cannon") || (type == "rocketlauncher")) { - case 0: Sector::current()->add_object(new SnowBall(Vector(get_pos().x, get_pos().y+32), launchdir)); break; - case 1: Sector::current()->add_object(new BouncingSnowball(Vector(get_pos().x, get_pos().y+32), launchdir)); break; - case 2: Sector::current()->add_object(new MrBomb(Vector(get_pos().x, get_pos().y+32), launchdir)); break; - case 3: Sector::current()->add_object(new MrIceBlock(Vector(get_pos().x, get_pos().y+32), launchdir)); break; - case 4: Sector::current()->add_object(new PoisonIvy(Vector(get_pos().x, get_pos().y+32), launchdir)); break; - case 5: Sector::current()->add_object(new Snail(Vector(get_pos().x, get_pos().y+32), launchdir)); break; - case 6: Sector::current()->add_object(new SkullyHop(Vector(get_pos().x, get_pos().y+44), launchdir)); break; + spawnpoint = get_pos(); /* top-left corner of the cannon */ + if (launchdir == LEFT) + spawnpoint.x -= object_bbox.get_width() + 1; + else + spawnpoint.x += get_bbox().get_width() + 1; } + + /* Now we set the real spawn position */ + bad_guy.set_pos(spawnpoint); + + /* We don't want to count dispensed badguys in level stats */ + if(bad_guy.countMe) + bad_guy.countMe = false; + + Sector::current()->add_object(game_object); + } catch(const std::exception& e) { + log_warning << "Error dispensing badguy: " << e.what() << std::endl; + return; } } } @@ -195,4 +266,5 @@ Dispenser::is_freezable() const { return true; } -IMPLEMENT_FACTORY(Dispenser, "dispenser") + +/* EOF */