#include <iostream>
#include <cassert>
-#include "gameloop.h"
#include "app/globals.h"
+#include "app/gettext.h"
#include "player.h"
#include "defines.h"
#include "scene.h"
#include "resources.h"
#include "interactive_object.h"
#include "video/screen.h"
+#include "statistics.h"
+#include "gameloop.h"
// behavior definitions:
#define TILES_FOR_BUTTJUMP 3
Uint32 drawing_effect)
{
if(head != NULL)
- head->draw(context, pos, layer, drawing_effect);
+ head->draw(context, pos, layer-1, drawing_effect);
if(body != NULL)
- body->draw(context, pos, layer, drawing_effect);
+ body->draw(context, pos, layer-3, drawing_effect);
if(arms != NULL)
- arms->draw(context, pos, layer, drawing_effect);
+ arms->draw(context, pos, layer, drawing_effect);
if(feet != NULL)
- feet->draw(context, pos, layer, drawing_effect);
+ feet->draw(context, pos, layer-2, drawing_effect);
}
Player::Player()
last_ground_y = 0;
fall_mode = ON_GROUND;
jumping = false;
+ flapping = false;
can_jump = true;
+ can_flap = false;
+ falling_from_flap = false;
+ enable_hover = false;
butt_jump = false;
frame_main = 0;
shooting_timer.init(true);
growing_timer.init(true);
idle_timer.init(true);
+ flapping_timer.init(true);
physic.reset();
}
physic.set_velocity_y(0);
jumped_in_solid = true;
jumping = false;
+ flapping = false;
}
}
else
physic.enable_gravity(false);
/* Reset score multiplier (for multi-hits): */
if (!invincible_timer.started())
+ {
+ if(player_status.score_multiplier > 2)
+ { // show a message
+ char str[124];
+ sprintf(str, _("%d bad guys in a row!"), player_status.score_multiplier-1);
+ Sector::current()->add_floating_text(base, str);
+ }
player_status.score_multiplier = 1;
+ }
}
if(jumped_in_solid)
{
/* Make sure jumping is off. */
jumping = false;
+ flapping = false;
}
}
}
void
Player::handle_vertical_input()
{
+
// set fall mode...
if(on_ground()) {
fall_mode = ON_GROUND;
--base.y;
jumping = true;
+ flapping = false;
can_jump = false;
+ can_flap = false;
if (size == SMALL)
SoundManager::get()->play_sound(IDToSound(SND_JUMP));
else
SoundManager::get()->play_sound(IDToSound(SND_BIGJUMP));
}
// Let go of jump key
- else if(input.up == UP && jumping && physic.get_velocity_y() > 0)
+ else if(input.up == UP)
{
- jumping = false;
- physic.set_velocity_y(0);
+ if (!flapping && !duck && !falling_from_flap && !on_ground())
+ {
+ can_flap = true;
+ }
+ if (jumping && physic.get_velocity_y() > 0)
+ {
+ jumping = false;
+ physic.set_velocity_y(0);
+ }
}
+ // Flapping
+ if (input.up == DOWN && can_flap)
+ {
+ if (!flapping_timer.started())
+ {
+ flapping_timer.start(TUX_FLAPPING_TIME);
+ }
+ if (!flapping_timer.check())
+ {
+ can_flap = false;
+ falling_from_flap = true;
+ }
+ jumping = true;
+ flapping = true;
+ if (flapping_timer.get_gone() <= TUX_FLAPPING_TIME)
+ {
+ physic.set_velocity_y((float)flapping_timer.get_gone()/450);
+ }
+ }
+
+ // Hover
+ //(disabled by default, use cheat code "hover" to toggle on/off)
+ //TODO: needs some tweaking, especially when used together with double jump and jumping off badguys
+ if (enable_hover && input.up == DOWN && !jumping && !butt_jump && physic.get_velocity_y() <= 0)
+ {
+ physic.set_velocity_y(-1);
+ }
+
/* In case the player has pressed Down while in a certain range of air,
enable butt jump action */
if (input.down == DOWN && !butt_jump && !duck)
BadGuy* badguy = dynamic_cast<BadGuy*> (*i);
if(badguy)
{
-
- if (fabsf(base.x - badguy->base.x) < 150 &&
- fabsf(base.y - badguy->base.y) < 60 &&
- (issolid(badguy->base.x + 1, badguy->base.y + badguy->base.height) ||
- issolid(badguy->base.x + badguy->base.width - 1, badguy->base.y + badguy->base.height)))
- badguy->kill_me(25);
+ // don't kill when badguys are already dying or in a certain mode
+ if(badguy->dying == DYING_NOT && badguy->mode != BadGuy::BOMB_TICKING &&
+ badguy->mode != BadGuy::BOMB_EXPLODE)
+ {
+ if (fabsf(base.x - badguy->base.x) < 150 &&
+ fabsf(base.y - badguy->base.y) < 60 &&
+ (issolid(badguy->base.x + 1, badguy->base.y + badguy->base.height) ||
+ issolid(badguy->base.x + badguy->base.width - 1, badguy->base.y + badguy->base.height)))
+ badguy->kill_me(25);
+ }
}
}
}
}
if(on_ground()) /* Make sure jumping is off. */
- jumping = false;
+ {
+ jumping = false;
+ flapping = false;
+ falling_from_flap = false;
+ if (flapping_timer.started()) {flapping_timer.stop();}
+ }
input.old_up = input.up;
}
Vector pos = Vector(base.x, base.y);
/* Set Tux sprite action */
- if (duck && size != SMALL)
- tux_body->set_action("duck");
+ if (duck && size == BIG)
+ {
+ if(dir == LEFT)
+ tux_body->set_action("duck-left");
+ else // dir == RIGHT
+ tux_body->set_action("duck-right");
+ }
else if (skidding_timer.started())
- tux_body->set_action("skid");
+ {
+ if(dir == LEFT)
+ tux_body->set_action("skid-left");
+ else // dir == RIGHT
+ tux_body->set_action("skid-right");
+ }
else if (kick_timer.started())
- tux_body->set_action("kick");
+ {
+ if(dir == LEFT)
+ tux_body->set_action("kick-left");
+ else // dir == RIGHT
+ tux_body->set_action("kick-right");
+ }
else if (butt_jump)
- tux_body->set_action("buttjump");
+ {
+ if(dir == LEFT)
+ tux_body->set_action("buttjump-left");
+ else // dir == RIGHT
+ tux_body->set_action("buttjump-right");
+ }
else if (physic.get_velocity_y() != 0)
- tux_body->set_action("jump");
+ {
+ if(dir == LEFT)
+ tux_body->set_action("jump-left");
+ else // dir == RIGHT
+ tux_body->set_action("jump-right");
+ }
else
{
if (fabsf(physic.get_velocity_x()) < 1.0f) // standing
{
- tux_body->set_action("stand");
+ if(dir == LEFT)
+ tux_body->set_action("stand-left");
+ else // dir == RIGHT
+ tux_body->set_action("stand-right");
}
else // moving
{
- tux_body->set_action("walk");
+ if(dir == LEFT)
+ tux_body->set_action("walk-left");
+ else // dir == RIGHT
+ tux_body->set_action("walk-right");
}
}
{
if(size == BIG)
{
- tux_body->head->set_action("idle");
+ if(dir == LEFT)
+ tux_body->head->set_action("idle-left");
+ else // dir == RIGHT
+ tux_body->head->set_action("idle-right");
+
tux_body->head->start_animation(1);
}
shooting_timer.check())
{
if (duck)
- tux_body->arms->set_action("duck+grab");
+ {
+ if(dir == LEFT)
+ tux_body->arms->set_action("duck+grab-left");
+ else // dir == RIGHT
+ tux_body->arms->set_action("duck+grab-right");
+ }
else
- tux_body->arms->set_action("grab");
+ {
+ if(dir == LEFT)
+ tux_body->arms->set_action("grab-left");
+ else // dir == RIGHT
+ tux_body->arms->set_action("grab-right");
+ }
}
/* Draw Tux */
// Draw blinking star overlay
if (invincible_timer.started() &&
- (invincible_timer.get_left() > TUX_INVINCIBLE_TIME_WARNING || global_frame_counter % 3))
+ (invincible_timer.get_left() > TUX_INVINCIBLE_TIME_WARNING || global_frame_counter % 3)
+ && !dying)
{
if (size == SMALL || duck)
smalltux_star->draw(context, pos, LAYER_OBJECTS + 2);
void
Player::bounce(BadGuy* badguy)
{
+ //Make sure we stopped flapping
+ flapping = false;
+ falling_from_flap = false;
+
if (input.up)
physic.set_velocity_y(5.2);
else
projects / supertux.git / blobdiff