#include "falling_coin.hpp"
#include "random_generator.hpp"
#include "object/sprite_particle.hpp"
+#include "trigger/climbable.hpp"
+
+//#define DO_SWIMMING
static const int TILES_FOR_BUTTJUMP = 3;
-static const float SHOOTING_TIME = .150;
+static const float SHOOTING_TIME = .150f;
/// time before idle animation starts
-static const float IDLE_TIME = 2.5;
+static const float IDLE_TIME = 2.5f;
+/** acceleration in horizontal direction when walking
+ * (all acceleratiosn are in pixel/s^2) */
static const float WALK_ACCELERATION_X = 300;
+/** acceleration in horizontal direction when running */
static const float RUN_ACCELERATION_X = 400;
+/** acceleration when skidding */
static const float SKID_XM = 200;
-static const float SKID_TIME = .3;
+/** time of skidding in seconds */
+static const float SKID_TIME = .3f;
+/** maximum walk velocity (pixel/s) */
static const float MAX_WALK_XM = 230;
+/** maximum run velcoity (pixel/s) */
static const float MAX_RUN_XM = 320;
+/** maximum horizontal climb velocity */
+static const float MAX_CLIMB_XM = 48;
+/** maximum vertical climb velocity */
+static const float MAX_CLIMB_YM = 128;
+/** instant velocity when tux starts to walk */
static const float WALK_SPEED = 100;
-static const float KICK_TIME = .3;
-static const float CHEER_TIME = 1;
+/** time of the kick (kicking mriceblock) animation */
+static const float KICK_TIME = .3f;
+/** time of tux cheering (currently unused) */
+static const float CHEER_TIME = 1.0f;
-static const float UNDUCK_HURT_TIME = 0.25; /**< if Tux cannot unduck for this long, he will get hurt */
+/** if Tux cannot unduck for this long, he will get hurt */
+static const float UNDUCK_HURT_TIME = 0.25f;
// growing animation
Surface* growingtux_left[GROWING_FRAMES];
}
void
-TuxBodyParts::draw(DrawingContext& context, const Vector& pos, int layer)
+TuxBodyParts::draw(DrawingContext& context, const Vector& pos, int layer, Portable* grabbed_object)
{
if(head != NULL)
- head->draw(context, pos, layer-1);
+ head->draw(context, pos, layer-2);
if(body != NULL)
- body->draw(context, pos, layer-3);
+ body->draw(context, pos, layer-4);
if(arms != NULL)
- arms->draw(context, pos, layer+10);
+ arms->draw(context, pos, layer-1 + (grabbed_object?10:0));
if(feet != NULL)
- feet->draw(context, pos, layer-2);
+ feet->draw(context, pos, layer-3);
}
Player::Player(PlayerStatus* _player_status, const std::string& name)
- : player_status(_player_status), grabbed_object(NULL), ghost_mode(false)
+ : player_status(_player_status), grabbed_object(NULL), ghost_mode(false), climbing(0)
{
this->name = name;
controller = main_controller;
sound_manager->preload("sounds/invincible.wav");
sound_manager->preload("sounds/splash.ogg");
-
init();
}
Player::~Player()
{
+ if (climbing) stop_climbing(*climbing);
delete smalltux_gameover;
delete smalltux_star;
delete bigtux_star;
Player::init()
{
if(is_big())
- set_size(31.8, 62.8);
+ set_size(31.8f, 62.8f);
else
- set_size(31.8, 30.8);
+ set_size(31.8f, 30.8f);
dir = RIGHT;
old_dir = dir;
backflip_direction = 0;
visible = true;
swimming = false;
+ speedlimit = 0; //no special limit
on_ground_flag = false;
grabbed_object = NULL;
- physic = Physic();
+ climbing = 0;
+
+ physic.reset();
}
void
Scripting::unexpose_object(vm, table_idx, name);
}
+float
+Player::get_speedlimit()
+{
+ return speedlimit;
+}
+
+void
+Player::set_speedlimit(float newlimit)
+{
+ speedlimit=newlimit;
+}
+
void
Player::set_controller(Controller* controller)
{
if(new_height > bbox.get_height()) {
Rect additional_space = bbox2;
additional_space.set_height(new_height - bbox.get_height());
- if(!Sector::current()->is_free_of_statics(additional_space, this))
+ if(!Sector::current()->is_free_of_statics(additional_space, this, true))
return false;
}
}
void
+Player::trigger_sequence(std::string sequence_name)
+{
+ if (climbing) stop_climbing(*climbing);
+ GameSession::current()->start_sequence(sequence_name);
+}
+
+void
Player::update(float elapsed_time)
{
if( no_water ){
// extend/shrink tux collision rectangle so that we fall through/walk over 1
// tile holes
- if(fabsf(physic.vx) > MAX_WALK_XM) {
+ if(fabsf(physic.get_velocity_x()) > MAX_WALK_XM) {
set_width(34);
} else {
- set_width(31.8);
+ set_width(31.8f);
}
// on downward slopes, adjust vertical velocity so tux walks smoothly down
if (on_ground()) {
if(floor_normal.y != 0) {
- if ((floor_normal.x * physic.vx) >= 0) {
- physic.vy = 250;
+ if ((floor_normal.x * physic.get_velocity_x()) >= 0) {
+ physic.set_velocity_y(250);
}
}
}
if (backflipping) {
//prevent player from changing direction when backflipping
dir = (backflip_direction == 1) ? LEFT : RIGHT;
- if (backflip_timer.started()) physic.vx = 100 * backflip_direction;
+ if (backflip_timer.started()) physic.set_velocity_x(100 * backflip_direction);
}
// set fall mode...
void
Player::apply_friction()
{
- if ((on_ground()) && (fabs(physic.vx) < WALK_SPEED)) {
- physic.vx = 0;
- physic.ax = 0;
- } else if(physic.vx < 0) {
- physic.ax = WALK_ACCELERATION_X * 1.5;
- } else {
- physic.ax = WALK_ACCELERATION_X * -1.5;
+ if ((on_ground()) && (fabs(physic.get_velocity_x()) < WALK_SPEED)) {
+ physic.set_velocity_x(0);
+ physic.set_acceleration_x(0);
+ } else if(physic.get_velocity_x() < 0) {
+ physic.set_acceleration_x(WALK_ACCELERATION_X * 1.5);
+ } else if(physic.get_velocity_x() > 0) {
+ physic.set_acceleration_x(WALK_ACCELERATION_X * -1.5);
}
}
void
Player::handle_horizontal_input()
{
- float vx = physic.vx;
- float vy = physic.vy;
- float ax = physic.ax;
- float ay = physic.ay;
+ float vx = physic.get_velocity_x();
+ float vy = physic.get_velocity_y();
+ float ax = physic.get_acceleration_x();
+ float ay = physic.get_acceleration_y();
float dirsign = 0;
- if(!duck || physic.vy != 0) {
+ if(!duck || physic.get_velocity_y() != 0) {
if(controller->hold(Controller::LEFT) && !controller->hold(Controller::RIGHT)) {
old_dir = dir;
dir = LEFT;
}
}
- // only run if action key is pressed and we're not holding anything
- if (!(controller->hold(Controller::ACTION) && (!grabbed_object))) {
+ // do not run if action key is pressed or we're holding something
+ // so tux can only walk while shooting
+ if ( controller->hold(Controller::ACTION) || grabbed_object ) {
ax = dirsign * WALK_ACCELERATION_X;
// limit speed
if(vx >= MAX_WALK_XM && dirsign > 0) {
ax = 0;
}
} else {
- ax = dirsign * RUN_ACCELERATION_X;
+ if( vx * dirsign < MAX_WALK_XM ) {
+ ax = dirsign * WALK_ACCELERATION_X;
+ } else {
+ ax = dirsign * RUN_ACCELERATION_X;
+ }
// limit speed
if(vx >= MAX_RUN_XM && dirsign > 0) {
vx = MAX_RUN_XM;
vx = dirsign * WALK_SPEED;
}
+ //Check speedlimit.
+ if( speedlimit > 0 && vx * dirsign >= speedlimit ) {
+ vx = dirsign * speedlimit;
+ ax = 0;
+ }
+
// changing directions?
if(on_ground() && ((vx < 0 && dirsign >0) || (vx>0 && dirsign<0))) {
// let's skid!
new Particles(
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,
+ Vector(280, -260), Vector(0, 300), 3, Color(.4f, .4f, .4f), 3, .8f,
LAYER_OBJECTS+1));
ax *= 2.5;
}
}
- physic.vx = vx;
- physic.vy = vy;
- physic.ax = ax;
- physic.ay = ay;
+ physic.set_velocity(vx, vy);
+ physic.set_acceleration(ax, ay);
// we get slower when not pressing any keys
if(dirsign == 0) {
if (!is_big())
return;
- if (physic.vy != 0)
+ if (physic.get_velocity_y() != 0)
return;
if (!on_ground())
return;
- if (adjust_height(31.8)) {
+ if (adjust_height(31.8f)) {
duck = true;
unduck_hurt_timer.stop();
} else {
if (backflipping)
return;
- if (adjust_height(63.8)) {
+ if (adjust_height(63.8f)) {
duck = false;
unduck_hurt_timer.stop();
} else {
backflipping = true;
do_jump(-580);
sound_manager->play("sounds/flip.wav");
- backflip_timer.start(0.15);
+ backflip_timer.start(0.15f);
}
void
if (!on_ground())
return;
- physic.vy = yspeed;
+ physic.set_velocity_y(yspeed);
//bbox.move(Vector(0, -1));
jumping = true;
on_ground_flag = false;
if(controller->pressed(Controller::JUMP) && (can_jump)) {
if (duck) {
// when running, only jump a little bit; else do a backflip
- if ((physic.vx != 0) || (controller->hold(Controller::LEFT)) || (controller->hold(Controller::RIGHT))) do_jump(-300); else do_backflip();
+ if ((physic.get_velocity_x() != 0) || (controller->hold(Controller::LEFT)) || (controller->hold(Controller::RIGHT))) do_jump(-300); else do_backflip();
} else {
// jump a bit higher if we are running; else do a normal jump
- if (fabs(physic.vx) > MAX_WALK_XM) do_jump(-580); else do_jump(-520);
+ if (fabs(physic.get_velocity_x()) > MAX_WALK_XM) do_jump(-580); else do_jump(-520);
}
}
// Let go of jump key
else if(!controller->hold(Controller::JUMP)) {
- if (!backflipping && jumping && physic.vy < 0) {
+ if (!backflipping && jumping && physic.get_velocity_y() < 0) {
jumping = false;
- physic.vy = 0;
+ physic.set_velocity_y(0);
}
}
butt_jump = false;
// swimming
- physic.ay = 0;
+ physic.set_acceleration_y(0);
+#ifdef SWIMMING
if (swimming) {
if (controller->hold(Controller::UP) || controller->hold(Controller::JUMP))
- physic.ay = -2000;
- physic.vy = physic.vy * 0.94;
+ physic.set_acceleration_y(-2000);
+ physic.set_velocity_y(physic.get_velocity_y() * 0.94);
}
+#endif
}
void
handle_input_ghost();
return;
}
+ if (climbing) {
+ handle_input_climbing();
+ return;
+ }
/* Peeking */
if( controller->released( Controller::PEEK_LEFT ) ) {
if( controller->released( Controller::PEEK_RIGHT ) ) {
peeking = AUTO;
}
+ if( controller->released( Controller::UP ) ) {
+ peeking = AUTO;
+ }
+ if( controller->released( Controller::DOWN ) ) {
+ peeking = AUTO;
+ }
if( controller->pressed( Controller::PEEK_LEFT ) ) {
peeking = LEFT;
}
if( controller->pressed( Controller::PEEK_RIGHT ) ) {
peeking = RIGHT;
}
+ if( controller->pressed( Controller::UP ) ) {
+ peeking = UP;
+ }
+ if( controller->pressed( Controller::DOWN ) ) {
+ peeking = DOWN;
+ }
/* Handle horizontal movement: */
if (!backflipping) handle_horizontal_input();
if(Sector::current()->add_bullet(
get_pos() + ((dir == LEFT)? Vector(0, bbox.get_height()/2)
: Vector(32, bbox.get_height()/2)),
- physic.vx, dir))
+ physic.get_velocity_x(), dir))
shooting_timer.start(SHOOTING_TIME);
}
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_of_statics(dest)) {
+ if(Sector::current()->is_free_of_movingstatics(dest)) {
MovingObject* moving_object = dynamic_cast<MovingObject*> (grabbed_object);
if(moving_object) {
moving_object->set_pos(pos);
} else {
- log_debug << "Non MovingObjetc grabbed?!?" << std::endl;
+ log_debug << "Non MovingObject grabbed?!?" << std::endl;
+ }
+ if(controller->hold(Controller::UP)) {
+ grabbed_object->ungrab(*this, UP);
+ } else {
+ grabbed_object->ungrab(*this, dir);
}
- grabbed_object->ungrab(*this, dir);
grabbed_object = NULL;
}
}
}
-void
+void
Player::try_grab()
{
if(controller->hold(Controller::ACTION) && !grabbed_object
if(!portable->is_portable())
continue;
+ // make sure the Portable is a MovingObject
MovingObject* moving_object = dynamic_cast<MovingObject*> (portable);
- assert(portable);
+ assert(moving_object);
if(moving_object == NULL)
continue;
+ // make sure the Portable isn't currently non-solid
+ if(moving_object->get_group() == COLGROUP_DISABLED) continue;
+
+ // check if we are within reach
if(moving_object->get_bbox().contains(pos)) {
+ if (climbing) stop_climbing(*climbing);
grabbed_object = portable;
grabbed_object->grab(*this, get_pos(), dir);
break;
if (controller->hold(Controller::ACTION)) {
set_ghost_mode(false);
}
- physic.vx = vx;
- physic.vy = vy;
- physic.ax = 0;
- physic.ay = 0;
+ physic.set_velocity(vx, vy);
+ physic.set_acceleration(0, 0);
}
void
Player::set_bonus(BonusType type, bool animate)
{
if(player_status->bonus == NO_BONUS) {
- if (!adjust_height(62.8)) {
+ if (!adjust_height(62.8f)) {
printf("can't adjust\n");
return false;
}
if(animate)
growing_timer.start(GROWING_TIME);
+ if (climbing) stop_climbing(*climbing);
}
if ((type == NO_BONUS) || (type == GROWUP_BONUS)) {
Vector paccel = Vector(0, 1000);
std::string action = (dir==LEFT)?"left":"right";
Sector::current()->add_object(new SpriteParticle("images/objects/particles/firetux-helmet.sprite", action, ppos, ANCHOR_TOP, pspeed, paccel, LAYER_OBJECTS-1));
+ if (climbing) stop_climbing(*climbing);
}
if ((player_status->bonus == ICE_BONUS) && (animate)) {
// visually lose cap
Vector paccel = Vector(0, 1000);
std::string action = (dir==LEFT)?"left":"right";
Sector::current()->add_object(new SpriteParticle("images/objects/particles/icetux-cap.sprite", action, ppos, ANCHOR_TOP, pspeed, paccel, LAYER_OBJECTS-1));
+ if (climbing) stop_climbing(*climbing);
}
player_status->max_fire_bullets = 0;
player_status->max_ice_bullets = 0;
int layer = LAYER_OBJECTS + 1;
/* Set Tux sprite action */
- if (backflipping)
+ if (climbing)
+ {
+ tux_body->set_action("skid-left");
+ }
+ else if (backflipping)
{
if(dir == LEFT)
tux_body->set_action("backflip-left");
}
else
{
- if (fabsf(physic.vx) < 1.0f) // standing
+ if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
{
if(dir == LEFT)
tux_body->set_action("stand-left");
}
// Tux is holding something
- if ((grabbed_object != 0 && physic.vy == 0) ||
+ if ((grabbed_object != 0 && physic.get_velocity_y() == 0) ||
(shooting_timer.get_timeleft() > 0 && !shooting_timer.check()))
{
if (duck)
else if (safe_timer.started() && size_t(game_time*40)%2)
; // don't draw Tux
else
- tux_body->draw(context, get_pos(), layer);
+ tux_body->draw(context, get_pos(), layer, grabbed_object);
}
if(tile_attributes & Tile::HURTS)
kill(false);
+#ifdef SWIMMING
if( swimming ){
if( tile_attributes & Tile::WATER ){
no_water = false;
sound_manager->play( "sounds/splash.ogg" );
}
}
+#endif
}
void
Player::collision_solid(const CollisionHit& hit)
{
if(hit.bottom) {
- if(physic.vy > 0)
- physic.vy = 0;
+ if(physic.get_velocity_y() > 0)
+ physic.set_velocity_y(0);
on_ground_flag = true;
floor_normal = hit.slope_normal;
} else if(hit.top) {
- if(physic.vy < 0)
- physic.vy = .2;
+ if(physic.get_velocity_y() < 0)
+ physic.set_velocity_y(.2f);
}
if(hit.left || hit.right) {
- physic.vx = 0;
+ physic.set_velocity_x(0);
}
// crushed?
return;
sound_manager->play("sounds/hurt.wav");
+ if (climbing) stop_climbing(*climbing);
- physic.vx = 0;
+ physic.set_velocity_x(0);
- if(!completely && is_big()) {
+ if(!completely && (is_big() || growing_timer.started())) {
if(player_status->bonus == FIRE_BONUS
|| player_status->bonus == ICE_BONUS) {
safe_timer.start(TUX_SAFE_TIME);
set_bonus(GROWUP_BONUS, true);
- } else {
+ } else if(player_status->bonus == GROWUP_BONUS) {
//growing_timer.start(GROWING_TIME);
safe_timer.start(TUX_SAFE_TIME /* + GROWING_TIME */);
- adjust_height(30.8);
+ adjust_height(30.8f);
duck = false;
set_bonus(NO_BONUS, true);
+ } else if(player_status->bonus == NO_BONUS) {
+ growing_timer.stop();
+ safe_timer.start(TUX_SAFE_TIME);
+ adjust_height(30.8f);
+ duck = false;
}
} else {
- for (int i = 0; (i < 5) && (i < player_status->coins); i++)
+ if (player_status->coins >= 25 && !GameSession::current()->get_reset_point_sectorname().empty())
+ {
+ for (int i = 0; i < 5; i++)
+ {
+ // 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)));
+ }
+ player_status->coins -= std::max(player_status->coins/10, 25);
+ }
+ else
{
- // 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)));
+ GameSession::current()->set_reset_point("", Vector());
}
- physic.gravity_enabled = true;
- physic.vx = 0;
- physic.vy = -700;
- physic.ax = 0;
- physic.ay = 0;
- player_status->coins -= 25;
+ physic.enable_gravity(true);
+ physic.set_acceleration(0, 0);
+ physic.set_velocity(0, -700);
set_bonus(NO_BONUS, true);
dying = true;
dying_timer.start(3.0);
// TODO: do we need the following? Seems irrelevant to moving the player
if(is_big())
- set_size(31.8, 63.8);
+ set_size(31.8f, 63.8f);
else
- set_size(31.8, 31.8);
+ set_size(31.8f, 31.8f);
duck = false;
last_ground_y = vector.y;
+ if (climbing) stop_climbing(*climbing);
- physic = Physic();
+ physic.reset();
}
void
void
Player::add_velocity(const Vector& velocity)
{
- physic.vx += velocity.x;
- physic.vy += velocity.y;
+ physic.set_velocity(physic.get_velocity() + velocity);
}
void
Player::add_velocity(const Vector& velocity, const Vector& end_speed)
{
if (end_speed.x > 0)
- physic.vx = std::min(physic.vx + velocity.x, end_speed.x);
+ physic.set_velocity_x(std::min(physic.get_velocity_x() + velocity.x, end_speed.x));
if (end_speed.x < 0)
- physic.vx = std::max(physic.vx + velocity.x, end_speed.x);
+ physic.set_velocity_x(std::max(physic.get_velocity_x() + velocity.x, end_speed.x));
if (end_speed.y > 0)
- physic.vy = std::min(physic.vy + velocity.y, end_speed.y);
+ physic.set_velocity_y(std::min(physic.get_velocity_y() + velocity.y, end_speed.y));
if (end_speed.y < 0)
- physic.vy = std::max(physic.vy + velocity.y, end_speed.y);
+ physic.set_velocity_y(std::max(physic.get_velocity_y() + velocity.y, end_speed.y));
}
void
Player::bounce(BadGuy& )
{
if(controller->hold(Controller::JUMP))
- physic.vy = -520;
+ physic.set_velocity_y(-520);
else
- physic.vy = -300;
+ physic.set_velocity_y(-300);
}
//Scripting Functions Below
if (deactivated)
return;
deactivated = true;
- physic.vx = 0;
- physic.vy = 0;
- physic.ax = 0;
- physic.ay = 0;
+ physic.set_velocity_x(0);
+ physic.set_velocity_y(0);
+ physic.set_acceleration_x(0);
+ physic.set_acceleration_y(0);
+ if (climbing) stop_climbing(*climbing);
}
void
void Player::walk(float speed)
{
- physic.vx = speed;
+ physic.set_velocity_x(speed);
}
void
if (ghost_mode == enable)
return;
+ if (climbing) stop_climbing(*climbing);
+
if (enable) {
ghost_mode = true;
set_group(COLGROUP_DISABLED);
- physic.gravity_enabled = false;
+ 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.gravity_enabled = true;
+ physic.enable_gravity(true);
log_debug << "You feel solid again." << std::endl;
}
}
+
+
+void
+Player::start_climbing(Climbable& climbable)
+{
+ if (climbing == &climbable) return;
+
+ climbing = &climbable;
+ physic.enable_gravity(false);
+ physic.set_velocity(0, 0);
+ physic.set_acceleration(0, 0);
+}
+
+void
+Player::stop_climbing(Climbable& /*climbable*/)
+{
+ if (!climbing) return;
+
+ climbing = 0;
+
+ if (grabbed_object) {
+ grabbed_object->ungrab(*this, dir);
+ grabbed_object = NULL;
+ }
+
+ physic.enable_gravity(true);
+ physic.set_velocity(0, 0);
+ physic.set_acceleration(0, 0);
+
+ if ((controller->hold(Controller::JUMP)) || (controller->hold(Controller::UP))) {
+ on_ground_flag = true;
+ // TODO: This won't help. Why?
+ do_jump(-300);
+ }
+}
+
+void
+Player::handle_input_climbing()
+{
+ if (!climbing) {
+ log_warning << "handle_input_climbing called with climbing set to 0. Input handling skipped" << std::endl;
+ return;
+ }
+
+ float vx = 0;
+ float vy = 0;
+ if (controller->hold(Controller::LEFT)) {
+ dir = LEFT;
+ vx -= MAX_CLIMB_XM;
+ }
+ if (controller->hold(Controller::RIGHT)) {
+ dir = RIGHT;
+ vx += MAX_CLIMB_XM;
+ }
+ if (controller->hold(Controller::UP)) {
+ vy -= MAX_CLIMB_YM;
+ }
+ if (controller->hold(Controller::DOWN)) {
+ vy += MAX_CLIMB_YM;
+ }
+ if (controller->hold(Controller::JUMP)) {
+ if (can_jump) {
+ stop_climbing(*climbing);
+ return;
+ }
+ } else {
+ can_jump = true;
+ }
+ if (controller->hold(Controller::ACTION)) {
+ stop_climbing(*climbing);
+ return;
+ }
+ physic.set_velocity(vx, vy);
+ physic.set_acceleration(0, 0);
+}
+
+
projects / supertux.git / blobdiff