X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fplayer.cpp;h=2005f512d179c36d937e650fe1da40a2fac01c12;hb=5f1c84ed5ce0ab5450f92082a9aaaa9ca0effc39;hp=e2df3682daec5df13623c7ef65671bfafdb571fd;hpb=1e7b94ad52e7a8117dae067c6686070d965bf323;p=supertux.git diff --git a/src/object/player.cpp b/src/object/player.cpp index e2df3682d..2005f512d 100644 --- a/src/object/player.cpp +++ b/src/object/player.cpp @@ -1,7 +1,7 @@ // $Id$ // -// SuperTux - A Jump'n Run -// Copyright (C) 2003 Tobias Glaesser +// 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 @@ -31,7 +31,6 @@ #include "sprite/sprite.hpp" #include "sector.hpp" #include "resources.hpp" -#include "video/screen.hpp" #include "statistics.hpp" #include "game_session.hpp" #include "object/tilemap.hpp" @@ -41,11 +40,14 @@ #include "object/bullet.hpp" #include "trigger/trigger_base.hpp" #include "control/joystickkeyboardcontroller.hpp" +#include "scripting/squirrel_util.hpp" #include "main.hpp" #include "platform.hpp" #include "badguy/badguy.hpp" #include "player_status.hpp" -#include "msg.hpp" +#include "log.hpp" +#include "falling_coin.hpp" +#include "random_generator.hpp" static const int TILES_FOR_BUTTJUMP = 3; static const float SHOOTING_TIME = .150; @@ -62,6 +64,8 @@ static const float WALK_SPEED = 100; static const float KICK_TIME = .3; +static const float UNDUCK_HURT_TIME = 0.25; /**< if Tux cannot unduck for this long, he will get hurt */ + // growing animation Surface* growingtux_left[GROWING_FRAMES]; Surface* growingtux_right[GROWING_FRAMES]; @@ -94,18 +98,24 @@ TuxBodyParts::draw(DrawingContext& context, const Vector& pos, int layer) if(body != NULL) body->draw(context, pos, layer-3); if(arms != NULL) - arms->draw(context, pos, layer); + arms->draw(context, pos, layer+10); if(feet != NULL) feet->draw(context, pos, layer-2); } Player::Player(PlayerStatus* _player_status) - : player_status(_player_status), grabbed_object(0) + : player_status(_player_status), grabbed_object(NULL), ghost_mode(false) { controller = main_controller; smalltux_gameover = sprite_manager->create("images/creatures/tux_small/smalltux-gameover.sprite"); smalltux_star = sprite_manager->create("images/creatures/tux_small/smalltux-star.sprite"); bigtux_star = sprite_manager->create("images/creatures/tux_big/bigtux-star.sprite"); + + sound_manager->preload("sounds/bigjump.wav"); + sound_manager->preload("sounds/jump.wav"); + sound_manager->preload("sounds/hurt.wav"); + sound_manager->preload("sounds/skid.wav"); + init(); } @@ -120,10 +130,9 @@ void Player::init() { if(is_big()) - bbox.set_size(31.8, 63.8); + set_size(31.8, 62.8); else - bbox.set_size(31.8, 31.8); - adjust_height = 0; + set_size(31.8, 30.8); dir = RIGHT; old_dir = dir; @@ -142,7 +151,7 @@ Player::init() visible = true; on_ground_flag = false; - grabbed_object = 0; + grabbed_object = NULL; floor_normal = Vector(0,-1); @@ -150,11 +159,38 @@ Player::init() } void +Player::expose(HSQUIRRELVM vm, SQInteger table_idx) +{ + Scripting::Player* interface = static_cast (this); + Scripting::expose_object(vm, table_idx, interface, "Tux", false); +} + +void +Player::unexpose(HSQUIRRELVM vm, SQInteger table_idx) +{ + Scripting::unexpose_object(vm, table_idx, "Tux"); +} + +void Player::set_controller(Controller* controller) { this->controller = controller; } +bool +Player::adjust_height(float new_height) +{ + Rect bbox2 = bbox; + bbox2.move(Vector(0, bbox.get_height() - new_height)); + bbox2.set_height(new_height); + if (!Sector::current()->is_free_space(bbox2)) return false; + // adjust bbox accordingly + // note that we use members of moving_object for this, so we can run this during CD, too + set_pos(bbox2.p1); + set_size(bbox2.get_width(), bbox2.get_height()); + return true; +} + void Player::update(float elapsed_time) { @@ -163,51 +199,21 @@ Player::update(float elapsed_time) return; } - if(adjust_height != 0) { - bbox.move(Vector(0, bbox.get_height() - adjust_height)); - bbox.set_height(adjust_height); - adjust_height = 0; - } - - if(!controller->hold(Controller::ACTION) && grabbed_object) { - // move the grabbed object a bit away from tux - Vector pos = get_pos() + - Vector(dir == LEFT ? -bbox.get_width()-1 : bbox.get_width()+1, - bbox.get_height()*0.66666 - 32); - Rect dest(pos, pos + Vector(32, 32)); - if(Sector::current()->is_free_space(dest)) { - MovingObject* moving_object = dynamic_cast (grabbed_object); - if(moving_object) { - moving_object->set_pos(pos); - } else { - msg_debug("Non MovingObjetc grabbed?!?"); - } - grabbed_object->ungrab(*this, dir); - grabbed_object = 0; - } - } - if(!dying && !deactivated) handle_input(); movement = physic.get_movement(elapsed_time); -#if 0 - // special exception for cases where we're stuck under tiles after - // being ducked. In this case we drift out - if(!duck && on_ground() && old_base.x == base.x && old_base.y == base.y - && collision_object_map(base)) { - base.x += elapsed_time * WALK_SPEED * (dir ? 1: -1); - previous_base = old_base = base; - } -#endif - - if(grabbed_object != 0) { + if(grabbed_object != NULL && !dying) { Vector pos = get_pos() + - Vector(dir == LEFT ? -16 : 16, - bbox.get_height()*0.66666 - 32); + Vector(dir == LEFT ? -16 : 16, get_bbox().get_height()*0.66666 - 32); grabbed_object->grab(*this, pos, dir); } + + if(grabbed_object != NULL && dying){ + grabbed_object->ungrab(*this, dir); + grabbed_object = NULL; + } on_ground_flag = false; } @@ -285,7 +291,7 @@ Player::handle_horizontal_input() // dust some particles Sector::current()->add_object( new Particles( - Vector(dir == RIGHT ? bbox.p2.x : bbox.p1.x, bbox.p2.y), + Vector(dir == RIGHT ? get_bbox().p2.x : get_bbox().p1.x, get_bbox().p2.y), dir == RIGHT ? 270+20 : 90-40, dir == RIGHT ? 270+40 : 90-20, Vector(280, -260), Vector(0, 300), 3, Color(.4, .4, .4), 3, .8, LAYER_OBJECTS+1)); @@ -298,7 +304,7 @@ Player::handle_horizontal_input() // we get slower when not pressing any keys if(dirsign == 0) { - if(fabs(vx) < WALK_SPEED) { + if ((on_ground()) && (fabs(vx) < WALK_SPEED)) { vx = 0; ax = 0; } else if(vx < 0) { @@ -326,9 +332,9 @@ Player::handle_horizontal_input() // extend/shrink tux collision rectangle so that we fall through/walk over 1 // tile holes if(fabsf(vx) > MAX_WALK_XM) { - bbox.set_width(34); + set_width(34); } else { - bbox.set_width(31.8); + set_width(31.8); } // on downward slopes, adjust vertical velocity to match slope angle @@ -469,6 +475,29 @@ Player::handle_vertical_input() void Player::handle_input() { + if (ghost_mode) { + handle_input_ghost(); + return; + } + + if(!controller->hold(Controller::ACTION) && grabbed_object) { + // move the grabbed object a bit away from tux + Vector pos = get_pos() + + Vector(dir == LEFT ? -bbox.get_width()-1 : bbox.get_width()+1, + bbox.get_height()*0.66666 - 32); + Rect dest(pos, pos + Vector(32, 32)); + if(Sector::current()->is_free_space(dest)) { + MovingObject* moving_object = dynamic_cast (grabbed_object); + if(moving_object) { + moving_object->set_pos(pos); + } else { + log_debug << "Non MovingObjetc grabbed?!?" << std::endl; + } + grabbed_object->ungrab(*this, dir); + grabbed_object = NULL; + } + } + /* Handle horizontal movement: */ if (!backflipping) handle_horizontal_input(); else { @@ -497,39 +526,102 @@ Player::handle_input() /* Duck! */ if (controller->hold(Controller::DOWN) && is_big() && !duck && physic.get_velocity_y() == 0 && on_ground()) { - duck = true; - bbox.move(Vector(0, 32)); - bbox.set_height(31.8); - } else if(!controller->hold(Controller::DOWN) && is_big() && duck) { - // if we have some velocity left then check if there is space for - // unducking - bbox.move(Vector(0, -32)); - bbox.set_height(63.8); - if(Sector::current()->is_free_space(bbox) || ( - physic.get_velocity_x() > -.01 && physic.get_velocity_x() < .01 - && physic.get_velocity_y() > -.01 && physic.get_velocity_y() < .01)) - { + if (adjust_height(31.8)) { + duck = true; + unduck_hurt_timer.stop(); + } else { + // FIXME: what now? + } + } + /* Unduck! */ + else if(!controller->hold(Controller::DOWN) && is_big() && duck) { + if (adjust_height(63.8)) { duck = false; + unduck_hurt_timer.stop(); } else { - // undo the ducking changes - bbox.move(Vector(0, 32)); - bbox.set_height(31.8); + // if timer is not already running, start it. + if (unduck_hurt_timer.get_period() == 0) { + unduck_hurt_timer.start(UNDUCK_HURT_TIME); + } + else if (unduck_hurt_timer.check()) { + kill(false); + } } } } void -Player::set_bonus(BonusType type, bool animate) +Player::handle_input_ghost() { - if(player_status->bonus >= type) + float vx = 0; + float vy = 0; + if (controller->hold(Controller::LEFT)) vx -= MAX_RUN_XM; + if (controller->hold(Controller::RIGHT)) vx += MAX_RUN_XM; + if ((controller->hold(Controller::UP)) || (controller->hold(Controller::JUMP))) vy += MAX_RUN_XM; + if (controller->hold(Controller::DOWN)) vy -= MAX_RUN_XM; + if (controller->hold(Controller::ACTION)) set_ghost_mode(false); + physic.set_velocity(vx, vy); + physic.set_acceleration(0, 0); +} + +void +Player::add_coins(int count) +{ + player_status->add_coins(count); +} + +void +Player::add_bonus(const std::string& bonustype) +{ + if(bonustype == "grow") { + add_bonus(GROWUP_BONUS); + } else if(bonustype == "fireflower") { + add_bonus(FIRE_BONUS); + } else if(bonustype == "iceflower") { + add_bonus(ICE_BONUS); + } else if(bonustype == "none") { + add_bonus(NO_BONUS); + } else { + std::ostringstream msg; + msg << "Unknown bonus type " << bonustype; + throw std::runtime_error(msg.str()); + } +} + +void +Player::add_bonus(BonusType type, bool animate) +{ + // always ignore NO_BONUS + if (type == NO_BONUS) { return; - + } + + // ignore GROWUP_BONUS if we're already big + if (type == GROWUP_BONUS) { + if (player_status->bonus == GROWUP_BONUS) return; + if (player_status->bonus == FIRE_BONUS) return; + if (player_status->bonus == ICE_BONUS) return; + } + + set_bonus(type, animate); +} + +void +Player::set_bonus(BonusType type, bool animate) +{ if(player_status->bonus == NO_BONUS) { - adjust_height = 63.8; + if (!adjust_height(62.8)) return; if(animate) growing_timer.start(GROWING_TIME); } - + + if ((type == NO_BONUS) || (type == GROWUP_BONUS)) { + player_status->max_fire_bullets = 0; + player_status->max_ice_bullets = 0; + } + if (type == FIRE_BONUS) player_status->max_fire_bullets++; + if (type == ICE_BONUS) player_status->max_ice_bullets++; + player_status->bonus = type; } @@ -568,7 +660,7 @@ Player::draw(DrawingContext& context) else tux_body = small_tux; - int layer = LAYER_OBJECTS + 10; + int layer = LAYER_OBJECTS + 1; /* Set Tux sprite action */ if (duck && is_big()) @@ -658,30 +750,15 @@ Player::draw(DrawingContext& context) /* Draw Tux */ if(dying) { - smalltux_gameover->draw(context, get_pos(), layer); - } else if(growing_timer.get_timeleft() > 0) { - if(!is_big()) - { - if (dir == RIGHT) - context.draw_surface(growingtux_right[GROWING_FRAMES-1 - - int((growing_timer.get_timegone() * + smalltux_gameover->draw(context, get_pos(), LAYER_FLOATINGOBJECTS + 1); + } + else if ((growing_timer.get_timeleft() > 0) && (!duck)) { + if (dir == RIGHT) { + context.draw_surface(growingtux_right[int((growing_timer.get_timegone() * GROWING_FRAMES) / GROWING_TIME)], get_pos(), layer); - else - context.draw_surface(growingtux_left[GROWING_FRAMES-1 - - int((growing_timer.get_timegone() * - GROWING_FRAMES) / GROWING_TIME)], get_pos(), layer); - } - else - { - if (dir == RIGHT) - context.draw_surface(growingtux_right[ - int((growing_timer.get_timegone() * + } else { + context.draw_surface(growingtux_left[int((growing_timer.get_timegone() * GROWING_FRAMES) / GROWING_TIME)], get_pos(), layer); - else - context.draw_surface(growingtux_left[ - int((growing_timer.get_timegone() * - GROWING_FRAMES) / GROWING_TIME)], - get_pos(), layer); } } else if (safe_timer.started() && size_t(game_time*40)%2) @@ -706,7 +783,7 @@ void Player::collision_tile(uint32_t tile_attributes) { if(tile_attributes & Tile::HURTS) - kill(SHRINK); + kill(false); } HitResponse @@ -719,9 +796,12 @@ Player::collision(GameObject& other, const CollisionHit& hit) if(other.get_flags() & FLAG_PORTABLE) { Portable* portable = dynamic_cast (&other); - if(portable && grabbed_object == 0 && controller->hold(Controller::ACTION) + assert(portable != NULL); + if(portable && grabbed_object == NULL + && controller->hold(Controller::ACTION) && fabsf(hit.normal.x) > .9) { grabbed_object = portable; + grabbed_object->grab(*this, get_pos(), dir); return CONTINUE; } } @@ -806,7 +886,7 @@ Player::collision(GameObject& other, const CollisionHit& hit) BadGuy* badguy = dynamic_cast (&other); if(badguy != NULL) { - if(safe_timer.started()) + if(safe_timer.started() || invincible_timer.started()) return FORCE_MOVE; return CONTINUE; @@ -825,62 +905,64 @@ Player::make_invincible() /* Kill Player! */ void -Player::kill(HurtMode mode) +Player::kill(bool completely) { if(dying || deactivated) return; - if(mode != KILL && - (safe_timer.get_timeleft() > 0 || invincible_timer.get_timeleft() > 0)) + if(!completely && safe_timer.started() || invincible_timer.started()) return; sound_manager->play("sounds/hurt.wav"); physic.set_velocity_x(0); - if (mode == SHRINK && is_big()) - { - if (player_status->bonus == FIRE_BONUS - || player_status->bonus == ICE_BONUS) - { - safe_timer.start(TUX_SAFE_TIME); - player_status->bonus = GROWUP_BONUS; - } - else - { - //growing_timer.start(GROWING_TIME); - safe_timer.start(TUX_SAFE_TIME /* + GROWING_TIME */); - adjust_height = 31.8; - duck = false; - player_status->bonus = NO_BONUS; - } + if(!completely && is_big()) { + if(player_status->bonus == FIRE_BONUS + || player_status->bonus == ICE_BONUS) { + safe_timer.start(TUX_SAFE_TIME); + set_bonus(GROWUP_BONUS); + } else { + //growing_timer.start(GROWING_TIME); + safe_timer.start(TUX_SAFE_TIME /* + GROWING_TIME */); + adjust_height(30.8); + duck = false; + set_bonus(NO_BONUS); } - else + } else { + for (int i = 0; (i < 5) && (i < player_status->coins); i++) { - physic.enable_gravity(true); - physic.set_acceleration(0, 0); - physic.set_velocity(0, 700); - player_status->coins -= 25; - player_status->bonus = NO_BONUS; - dying = true; - dying_timer.start(3.0); - set_group(COLGROUP_DISABLED); - - DisplayEffect* effect = new DisplayEffect(); - effect->fade_out(3.0); - Sector::current()->add_object(effect); - sound_manager->stop_music(3.0); + // the numbers: starting x, starting y, velocity y + Sector::current()->add_object(new FallingCoin(get_pos() + + Vector(systemRandom.rand(5), systemRandom.rand(-32,18)), + systemRandom.rand(-100,100))); } + physic.enable_gravity(true); + physic.set_acceleration(0, 0); + physic.set_velocity(0, 700); + player_status->coins -= 25; + set_bonus(NO_BONUS); + dying = true; + dying_timer.start(3.0); + set_group(COLGROUP_DISABLED); + + DisplayEffect* effect = new DisplayEffect(); + effect->fade_out(3.0); + Sector::current()->add_object(effect); + sound_manager->stop_music(3.0); + } } void Player::move(const Vector& vector) { - bbox.set_pos(vector); + set_pos(vector); + + // TODO: do we need the following? Seems irrelevant to moving the player if(is_big()) - bbox.set_size(31.8, 63.8); + set_size(31.8, 63.8); else - bbox.set_size(31.8, 31.8); + set_size(31.8, 31.8); duck = false; last_ground_y = vector.y; @@ -891,28 +973,27 @@ void Player::check_bounds(Camera* camera) { /* Keep tux in bounds: */ - if (get_pos().x < 0) - { // Lock Tux to the size of the level, so that he doesn't fall of - // on the left side - bbox.set_pos(Vector(0, get_pos().y)); - } + if (get_pos().x < 0) { + // Lock Tux to the size of the level, so that he doesn't fall of + // on the left side + set_pos(Vector(0, get_pos().y)); + } /* Keep in-bounds, vertically: */ - if (get_pos().y > Sector::current()->solids->get_height() * 32) - { - kill(KILL); - return; - } + if (get_pos().y > Sector::current()->solids->get_height() * 32) { + kill(true); + return; + } bool adjust = false; // can happen if back scrolling is disabled if(get_pos().x < camera->get_translation().x) { - bbox.set_pos(Vector(camera->get_translation().x, get_pos().y)); + set_pos(Vector(camera->get_translation().x, get_pos().y)); adjust = true; } if(get_pos().x >= camera->get_translation().x + SCREEN_WIDTH - bbox.get_width()) { - bbox.set_pos(Vector( + set_pos(Vector( camera->get_translation().x + SCREEN_WIDTH - bbox.get_width(), get_pos().y)); adjust = true; @@ -937,6 +1018,15 @@ Player::add_velocity(const Vector& velocity) } void +Player::add_velocity(const Vector& velocity, const Vector& end_speed) +{ + if (end_speed.x > 0) physic.set_velocity_x(std::min(physic.get_velocity_x() + velocity.x, end_speed.x)); + if (end_speed.x < 0) physic.set_velocity_x(std::max(physic.get_velocity_x() + velocity.x, end_speed.x)); + if (end_speed.y > 0) physic.set_velocity_y(std::min(physic.get_velocity_y() + velocity.y, end_speed.y)); + if (end_speed.y < 0) physic.set_velocity_y(std::max(physic.get_velocity_y() + velocity.y, end_speed.y)); +} + +void Player::bounce(BadGuy& ) { if(controller->hold(Controller::JUMP)) @@ -953,6 +1043,8 @@ Player::deactivate() deactivated = true; physic.set_velocity_x(0); physic.set_velocity_y(0); + physic.set_acceleration_x(0); + physic.set_acceleration_y(0); } void @@ -965,3 +1057,21 @@ void Player::walk(float speed) { physic.set_velocity_x(speed); } + +void +Player::set_ghost_mode(bool enable) +{ + if (ghost_mode == enable) return; + if (enable) { + ghost_mode = true; + set_group(COLGROUP_DISABLED); + physic.enable_gravity(false); + log_debug << "You feel lightheaded. Use movement controls to float around, press ACTION to scare badguys." << std::endl; + } else { + ghost_mode = false; + set_group(COLGROUP_MOVING); + physic.enable_gravity(true); + log_debug << "You feel solid again." << std::endl; + } +} +