X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fyeti.cpp;h=c1da901e298b599420f01349a2a8609c6c30005c;hb=2b18d7e2549f4be99533fed58c0f07887a19db37;hp=5412c97533499727b1e9c2ca1f51ec76aefdefef;hpb=908a780ca974cc9d8bf6c2815d9eec6e8ec25fbb;p=supertux.git diff --git a/src/badguy/yeti.cpp b/src/badguy/yeti.cpp index 5412c9753..c1da901e2 100644 --- a/src/badguy/yeti.cpp +++ b/src/badguy/yeti.cpp @@ -1,16 +1,36 @@ +// $Id$ +// +// SuperTux +// Copyright (C) 2005 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 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, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +// 02111-1307, USA. + #include #include #include "yeti.h" #include "object/camera.h" #include "yeti_stalactite.h" +#include "bouncing_snowball.h" static const float JUMP_VEL1 = 250; static const float JUMP_VEL2 = 700; -static const float RUN_SPEED = 300; +static const float RUN_SPEED = 350; static const float JUMP_TIME = 1.6; static const float ANGRY_JUMP_WAIT = .5; -static const float STUN_TIME = 2; static const int INITIAL_HITPOINTS = 3; static const int INITIAL_BULLET_HP = 10; @@ -24,11 +44,8 @@ Yeti::Yeti(const lisp::Lisp& reader) side = LEFT; hitpoints = INITIAL_HITPOINTS; bullet_hitpoints = INITIAL_BULLET_HP; - sound_gna = SoundManager::get()->load_sound( - get_resource_filename("sounds/yeti_gna.wav")); - sound_roar = SoundManager::get()->load_sound( - get_resource_filename("sounds/yeti_roar.wav")); - jump_time_left = 0.0f; + sound_manager->preload_sound("yeti_gna"); + sound_manager->preload_sound("yeti_roar"); } Yeti::~Yeti() @@ -44,27 +61,21 @@ Yeti::active_action(float elapsed_time) break; case GO_RIGHT: physic.set_velocity_x(RUN_SPEED); - if(jump_timer.check()) + if(timer.check()) physic.set_velocity_y(JUMP_VEL2); break; case GO_LEFT: physic.set_velocity_x(-RUN_SPEED); - if(jump_timer.check()) + if(timer.check()) physic.set_velocity_y(JUMP_VEL2); break; case ANGRY_JUMPING: - if(jump_timer.check()) { + if(timer.check()) { // jump - SoundManager::get()->play_sound(sound_gna); + sound_manager->play_sound("yeti_gna"); physic.set_velocity_y(JUMP_VEL1); } break; - - case STUNNED: - if (stun_timer.check()) { - go_right(); - } - default: break; } @@ -79,7 +90,7 @@ Yeti::go_right() physic.set_velocity_y(JUMP_VEL1); physic.set_velocity_x(RUN_SPEED); state = GO_RIGHT; - jump_timer.start(JUMP_TIME); + timer.start(JUMP_TIME); } void @@ -88,41 +99,35 @@ Yeti::go_left() physic.set_velocity_y(JUMP_VEL1); physic.set_velocity_x(-RUN_SPEED); state = GO_LEFT; - jump_timer.start(JUMP_TIME); + timer.start(JUMP_TIME); } void Yeti::angry_jumping() { jumpcount = 0; - jump_timer.start(ANGRY_JUMP_WAIT); + timer.start(ANGRY_JUMP_WAIT); state = ANGRY_JUMPING; physic.set_velocity_x(0); } void -Yeti::stun() +Yeti::summon_snowball() { - physic.set_acceleration(0.0f, 0.0f); - physic.set_velocity(0.0f, 0.0f); - jump_time_left = jump_timer.get_timeleft(); - jump_timer.stop(); - stun_timer.start(STUN_TIME); - state = STUNNED; + Sector::current()->add_object(new BouncingSnowball(get_pos().x+(side == LEFT ? 64 : -64), get_pos().y, (side == LEFT ? RIGHT : LEFT))); } HitResponse Yeti::collision_player(Player& player, const CollisionHit& hit) -{ +{ if(player.is_invincible()) { kill_fall(); return ABORT_MOVE; - } + } if(hit.normal.y > .9) { - //TODO: fix inaccuracy (tux sometimes dies even if badguy was hit) - // give badguys some invincible time (prevent them from being hit multiple times) hitpoints--; bullet_hitpoints--; + sound_manager->play_sound("yeti_roar"); if(collision_squished(player)) return ABORT_MOVE; else if (hitpoints <= 0) { @@ -131,38 +136,22 @@ Yeti::collision_player(Player& player, const CollisionHit& hit) return FORCE_MOVE; } } - - if (state == STUNNED) - return ABORT_MOVE; - player.kill(Player::SHRINK); return FORCE_MOVE; } -HitResponse -Yeti::collision_badguy(BadGuy& badguy, const CollisionHit&) -{ - YetiStalactite* yeti_stal = dynamic_cast(&badguy); - - if (state == STUNNED && yeti_stal && yeti_stal->is_harmful()) - { - kill_fall(); - } - - return FORCE_MOVE; -} - - bool Yeti::collision_squished(Player& player) { - // we don't use the player object, even though it was given to us - (void)player; - - // stun yeti - stun(); - - return true; + bool result = false; + player.bounce(*this); + if (hitpoints <= 0) { + bullet_hitpoints = 0; + //sprite->set_action("dead"); + kill_squished(player); + result = true; + } + return result; } void @@ -201,14 +190,16 @@ Yeti::collision_solid(GameObject& , const CollisionHit& hit) physic.set_velocity_y(0); if(state == INIT) { go_right(); - } else if(state == GO_LEFT && !jump_timer.started()) { + } else if(state == GO_LEFT && !timer.started()) { side = LEFT; + summon_snowball(); angry_jumping(); - } else if(state == GO_RIGHT && !jump_timer.started()) { + } else if(state == GO_RIGHT && !timer.started()) { side = RIGHT; + summon_snowball(); angry_jumping(); } else if(state == ANGRY_JUMPING) { - if(!jump_timer.started()) { + if(!timer.started()) { // we just landed jumpcount++; // make a stalactite falling down and shake camera a bit @@ -223,7 +214,7 @@ Yeti::collision_solid(GameObject& , const CollisionHit& hit) go_left(); } else { // jump again - jump_timer.start(ANGRY_JUMP_WAIT); + timer.start(ANGRY_JUMP_WAIT); } } } @@ -235,11 +226,11 @@ Yeti::collision_solid(GameObject& , const CollisionHit& hit) void Yeti::kill_fall() { - SoundManager::get()->play_sound(sound_roar); + sound_manager->play_sound("yeti_roar"); bullet_hitpoints--; if (bullet_hitpoints <= 0) { - SoundManager::get()->play_sound(IDToSound(SND_FALL), this, - Sector::current()->player->get_pos()); + sound_manager->play_sound("fall", this, + Sector::current()->player->get_pos()); physic.set_velocity_y(0); physic.enable_gravity(true); set_state(STATE_FALLING);