X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fplayer.cpp;h=7aa2004d032eae3a71925226171da26b6fa58b1f;hb=c4a1129cfccd204f4267f8ee838f95dd6ebad1cc;hp=efcc99e6503bb2dc30b34aa34d8e905e54b40f00;hpb=9458e4e665e14385042597c45ded27a6c7d4e8d2;p=supertux.git diff --git a/src/object/player.cpp b/src/object/player.cpp index efcc99e65..7aa2004d0 100644 --- a/src/object/player.cpp +++ b/src/object/player.cpp @@ -42,6 +42,8 @@ namespace { static const float BUTTJUMP_MIN_VELOCITY_Y = 400.0f; static const float SHOOTING_TIME = .150f; +static const float GLIDE_TIME_PER_FLOWER = 0.5f; +static const float STONE_TIME_PER_FLOWER = 2.0f; /** number of idle stages, including standing */ static const unsigned int IDLE_STAGE_COUNT = 5; @@ -72,10 +74,14 @@ static const float SKID_TIME = .3f; static const float MAX_WALK_XM = 230; /** maximum run velocity (pixel/s) */ static const float MAX_RUN_XM = 320; +/** bonus run velocity addition (pixel/s) */ +static const float BONUS_RUN_XM = 80; /** maximum horizontal climb velocity */ static const float MAX_CLIMB_XM = 96; /** maximum vertical climb velocity */ static const float MAX_CLIMB_YM = 128; +/** maximum vertical glide velocity */ +static const float MAX_GLIDE_YM = 128; /** instant velocity when tux starts to walk */ static const float WALK_SPEED = 100; @@ -119,12 +125,16 @@ Player::Player(PlayerStatus* _player_status, const std::string& name_) : backflip_direction(), peekingX(), peekingY(), + ability_time(), + stone(), swimming(), speedlimit(), scripting_controller_old(0), jump_early_apex(), on_ice(), ice_this_frame(), + lightsprite(SpriteManager::current()->create("images/creatures/tux/light.sprite")), + powersprite(SpriteManager::current()->create("images/creatures/tux/powerups.sprite")), dir(), old_dir(), last_ground_y(), @@ -140,6 +150,8 @@ Player::Player(PlayerStatus* _player_status, const std::string& name_) : safe_timer(), kick_timer(), shooting_timer(), + ability_timer(), + cooldown_timer(), dying_timer(), growing(), backflip_timer(), @@ -173,7 +185,7 @@ Player::Player(PlayerStatus* _player_status, const std::string& name_) : SoundManager::current()->preload("sounds/skid.wav"); SoundManager::current()->preload("sounds/flip.wav"); SoundManager::current()->preload("sounds/invincible_start.ogg"); - SoundManager::current()->preload("sounds/splash.ogg"); + SoundManager::current()->preload("sounds/splash.wav"); init(); } @@ -212,11 +224,16 @@ Player::init() backflipping = false; backflip_direction = 0; sprite->set_angle(0.0f); + powersprite->set_angle(0.0f); + lightsprite->set_angle(0.0f); visible = true; + ability_time = 0; + stone = false; swimming = false; on_ice = false; ice_this_frame = false; speedlimit = 0; //no special limit + lightsprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE)); on_ground_flag = false; grabbed_object = NULL; @@ -323,6 +340,8 @@ Player::trigger_sequence(std::string sequence_name) backflipping = false; backflip_direction = 0; sprite->set_angle(0.0f); + powersprite->set_angle(0.0f); + lightsprite->set_angle(0.0f); GameSession::current()->start_sequence(sequence_name); } @@ -343,11 +362,11 @@ Player::update(float elapsed_time) if(!dying && !deactivated) handle_input(); -/* + /* // handle_input() calls apply_friction() when Tux is not walking, so we'll have to do this ourselves if (deactivated) - apply_friction(); -*/ + apply_friction(); + */ // extend/shrink tux collision rectangle so that we fall through/walk over 1 // tile holes @@ -373,6 +392,11 @@ Player::update(float elapsed_time) if (backflip_timer.started()) physic.set_velocity_x(100 * backflip_direction); //rotate sprite during flip sprite->set_angle(sprite->get_angle() + (dir==LEFT?1:-1) * elapsed_time * (360.0f / 0.5f)); + if (player_status->bonus == EARTH_BONUS || player_status->bonus == AIR_BONUS) { + powersprite->set_angle(sprite->get_angle()); + if (player_status->bonus == EARTH_BONUS) + lightsprite->set_angle(sprite->get_angle()); + } } // set fall mode... @@ -392,12 +416,18 @@ Player::update(float elapsed_time) if (backflipping && (backflip_timer.get_timegone() > 0.15f)) { backflipping = false; backflip_direction = 0; - sprite->set_angle(0.0f); + if (!stone) { + sprite->set_angle(0.0f); + powersprite->set_angle(0.0f); + lightsprite->set_angle(0.0f); + } // if controls are currently deactivated, we take care of standing up ourselves if (deactivated) do_standup(); } + if (player_status->bonus == AIR_BONUS) + ability_time = player_status->max_air_time * GLIDE_TIME_PER_FLOWER; } // calculate movement for this frame @@ -427,13 +457,15 @@ Player::update(float elapsed_time) Vector ppos = Vector(px, py); Vector pspeed = Vector(0, 0); Vector paccel = Vector(0, 0); - Sector::current()->add_object(new SpriteParticle("images/objects/particles/sparkle.sprite", - // draw bright sparkle when there is lots of time left, dark sparkle when invincibility is about to end - (invincible_timer.get_timeleft() > TUX_INVINCIBLE_TIME_WARNING) ? - // make every other a longer sparkle to make trail a bit fuzzy - (size_t(game_time*20)%2) ? "small" : "medium" - : - "dark", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS+1+5)); + Sector::current()->add_object(std::make_shared( + "images/objects/particles/sparkle.sprite", + // draw bright sparkle when there is lots of time left, + // dark sparkle when invincibility is about to end + (invincible_timer.get_timeleft() > TUX_INVINCIBLE_TIME_WARNING) ? + // make every other a longer sparkle to make trail a bit fuzzy + (size_t(game_time*20)%2) ? "small" : "medium" + : + "dark", ppos, ANCHOR_MIDDLE, pspeed, paccel, LAYER_OBJECTS+1+5)); } } @@ -522,11 +554,11 @@ Player::handle_horizontal_input() ax = dirsign * RUN_ACCELERATION_X; } // limit speed - if(vx >= MAX_RUN_XM && dirsign > 0) { - vx = MAX_RUN_XM; + if(vx >= MAX_RUN_XM + BONUS_RUN_XM *((player_status->bonus == AIR_BONUS) ? 1 : 0) && dirsign > 0) { + vx = MAX_RUN_XM + BONUS_RUN_XM *((player_status->bonus == AIR_BONUS) ? 1 : 0); ax = 0; - } else if(vx <= -MAX_RUN_XM && dirsign < 0) { - vx = -MAX_RUN_XM; + } else if(vx <= -MAX_RUN_XM - BONUS_RUN_XM *((player_status->bonus == AIR_BONUS) ? 1 : 0) && dirsign < 0) { + vx = -MAX_RUN_XM - BONUS_RUN_XM *((player_status->bonus == AIR_BONUS) ? 1 : 0); ax = 0; } } @@ -550,11 +582,10 @@ Player::handle_horizontal_input() SoundManager::current()->play("sounds/skid.wav"); // dust some particles Sector::current()->add_object( - 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(.4f, .4f, .4f), 3, .8f, - LAYER_OBJECTS+1)); + std::make_shared( + Vector(dir == LEFT ? get_bbox().p2.x : get_bbox().p1.x, get_bbox().p2.y), + dir == LEFT ? 50 : -70, dir == LEFT ? 70 : -50, 260, 280, + Vector(0, 300), 3, Color(.4f, .4f, .4f), 3, .8f, LAYER_OBJECTS+1)); ax *= 2.5; } else { @@ -615,6 +646,8 @@ Player::do_standup() { return; if (backflipping) return; + if (stone) + return; if (adjust_height(BIG_TUX_HEIGHT)) { duck = false; @@ -640,7 +673,7 @@ Player::do_backflip() { backflip_direction = (dir == LEFT)?(+1):(-1); backflipping = true; - do_jump(-580); + do_jump((player_status->bonus == AIR_BONUS) ? -720 : -580); SoundManager::current()->play("sounds/flip.wav"); backflip_timer.start(TUX_BACKFLIP_TIME); } @@ -704,16 +737,40 @@ Player::handle_vertical_input() do_backflip(); } } else { + // airflower allows for higher jumps- // jump a bit higher if we are running; else do a normal jump - if (fabs(physic.get_velocity_x()) > MAX_WALK_XM) do_jump(-580); else do_jump(-520); + if(player_status->bonus == AIR_BONUS) + do_jump((fabs(physic.get_velocity_x()) > MAX_WALK_XM) ? -620 : -580); + else + do_jump((fabs(physic.get_velocity_x()) > MAX_WALK_XM) ? -580 : -520); } - } + // airflower glide only when holding jump key + } else if (controller->hold(Controller::JUMP) && player_status->bonus == AIR_BONUS && physic.get_velocity_y() > MAX_GLIDE_YM) { + if (ability_time > 0 && !ability_timer.started()) + ability_timer.start(ability_time); + else if (ability_timer.started()) { + // glide stops after some duration or if buttjump is initiated + if ((ability_timer.get_timeleft() <= 0.05f) || controller->hold(Controller::DOWN)) { + ability_time = 0; + ability_timer.stop(); + } else { + physic.set_velocity_y(MAX_GLIDE_YM); + physic.set_acceleration_y(0); + } + } + } + + // Let go of jump key else if(!controller->hold(Controller::JUMP)) { if (!backflipping && jumping && physic.get_velocity_y() < 0) { jumping = false; early_jump_apex(); } + if (player_status->bonus == AIR_BONUS && ability_timer.started()){ + ability_time = ability_timer.get_timeleft(); + ability_timer.stop(); + } } if(jump_early_apex && physic.get_velocity_y() >= 0) { @@ -778,27 +835,65 @@ Player::handle_input() } /* Handle horizontal movement: */ - if (!backflipping) handle_horizontal_input(); + if (!backflipping && !stone) handle_horizontal_input(); /* Jump/jumping? */ if (on_ground()) can_jump = true; /* Handle vertical movement: */ - handle_vertical_input(); + if (!stone) handle_vertical_input(); /* Shoot! */ if (controller->pressed(Controller::ACTION) && (player_status->bonus == FIRE_BONUS || player_status->bonus == ICE_BONUS)) { - if(Sector::current()->add_bullet( - get_pos() + ((dir == LEFT)? Vector(0, bbox.get_height()/2) - : Vector(32, bbox.get_height()/2)), - player_status, - physic.get_velocity_x(), dir)) + if((player_status->bonus == FIRE_BONUS && + Sector::current()->get_active_bullets() < player_status->max_fire_bullets) || + (player_status->bonus == ICE_BONUS && + Sector::current()->get_active_bullets() < player_status->max_ice_bullets)) + { + Vector pos = get_pos() + ((dir == LEFT)? Vector(0, bbox.get_height()/2) : Vector(32, bbox.get_height()/2)); + auto new_bullet = std::make_shared(pos, physic.get_velocity_x(), dir, player_status->bonus); + Sector::current()->add_object(new_bullet); + + SoundManager::current()->play("sounds/shoot.wav"); shooting_timer.start(SHOOTING_TIME); + } + } + + /* Turn to Stone */ + if (controller->pressed(Controller::DOWN) && player_status->bonus == EARTH_BONUS && !cooldown_timer.started()) { + if (controller->hold(Controller::ACTION) && !ability_timer.started()) { + ability_timer.start(player_status->max_earth_time * STONE_TIME_PER_FLOWER); + powersprite->stop_animation(); + stone = true; + physic.set_gravity_modifier(1.0f); // Undo jump_early_apex + } + } + + if (stone) + apply_friction(); + + /* Revert from Stone */ + if (stone && (!controller->hold(Controller::ACTION) || ability_timer.get_timeleft() <= 0.5f)) { + cooldown_timer.start(ability_timer.get_timegone()/2.0f); //The longer stone form is used, the longer until it can be used again + ability_timer.stop(); + sprite->set_angle(0.0f); + powersprite->set_angle(0.0f); + lightsprite->set_angle(0.0f); + stone = false; + for (int i = 0; i < 8; i++) + { + Vector ppos = Vector(get_bbox().get_left() + 8 + 16*((int)i/4), get_bbox().get_top() + 16*(i%4)); + float grey = graphicsRandom.randf(.4f, .8f); + Color pcolor = Color(grey, grey, grey); + Sector::current()->add_object(std::make_shared(ppos, -60, 240, 42, 81, Vector(0, 500), + 8, pcolor, 4 + graphicsRandom.randf(-0.4, 0.4), + 0.8 + graphicsRandom.randf(0, 0.4), LAYER_OBJECTS+2)); + } } /* Duck or Standup! */ - if (controller->hold(Controller::DOWN)) { + if (controller->hold(Controller::DOWN) && !stone) { do_duck(); } else { do_standup(); @@ -841,6 +936,8 @@ Player::handle_input() backflipping = false; backflip_direction = 0; sprite->set_angle(0.0f); + powersprite->set_angle(0.0f); + lightsprite->set_angle(0.0f); } } @@ -884,8 +981,6 @@ Player::try_grab() // make sure the Portable is a MovingObject MovingObject* moving_object = dynamic_cast (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; @@ -950,6 +1045,10 @@ Player::add_bonus(const std::string& bonustype) type = FIRE_BONUS; } else if(bonustype == "iceflower") { type = ICE_BONUS; + } else if(bonustype == "airflower") { + type = AIR_BONUS; + } else if(bonustype == "earthflower") { + type = EARTH_BONUS; } else if(bonustype == "none") { type = NO_BONUS; } else { @@ -971,11 +1070,7 @@ Player::add_bonus(BonusType type, bool animate) // ignore GROWUP_BONUS if we're already big if (type == GROWUP_BONUS) { - if (player_status->bonus == GROWUP_BONUS) - return true; - if (player_status->bonus == FIRE_BONUS) - return true; - if (player_status->bonus == ICE_BONUS) + if (player_status->bonus != NO_BONUS) return true; } @@ -1008,7 +1103,7 @@ Player::set_bonus(BonusType type, bool animate) Vector pspeed = Vector(((dir==LEFT) ? +100 : -100), -300); 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)); + Sector::current()->add_object(std::make_shared("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)) { @@ -1017,14 +1112,36 @@ Player::set_bonus(BonusType type, bool animate) Vector pspeed = Vector(((dir==LEFT) ? +100 : -100), -300); 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)); + Sector::current()->add_object(std::make_shared("images/objects/particles/icetux-cap.sprite", action, ppos, ANCHOR_TOP, pspeed, paccel, LAYER_OBJECTS-1)); + if (climbing) stop_climbing(*climbing); + } + if ((player_status->bonus == AIR_BONUS) && (animate)) { + // visually lose hat + Vector ppos = Vector((bbox.p1.x + bbox.p2.x) / 2, bbox.p1.y); + Vector pspeed = Vector(((dir==LEFT) ? +100 : -100), -300); + Vector paccel = Vector(0, 1000); + std::string action = (dir==LEFT)?"left":"right"; + Sector::current()->add_object(std::make_shared("images/objects/particles/airtux-hat.sprite", action, ppos, ANCHOR_TOP, pspeed, paccel, LAYER_OBJECTS-1)); + if (climbing) stop_climbing(*climbing); + } + if ((player_status->bonus == EARTH_BONUS) && (animate)) { + // visually lose hard-hat + Vector ppos = Vector((bbox.p1.x + bbox.p2.x) / 2, bbox.p1.y); + Vector pspeed = Vector(((dir==LEFT) ? +100 : -100), -300); + Vector paccel = Vector(0, 1000); + std::string action = (dir==LEFT)?"left":"right"; + Sector::current()->add_object(std::make_shared("images/objects/particles/earthtux-hardhat.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; + player_status->max_air_time = 0; + player_status->max_earth_time = 0; } if (type == FIRE_BONUS) player_status->max_fire_bullets++; if (type == ICE_BONUS) player_status->max_ice_bullets++; + if (type == AIR_BONUS) player_status->max_air_time++; + if (type == EARTH_BONUS) player_status->max_earth_time++; player_status->bonus = type; return true; @@ -1075,6 +1192,10 @@ Player::draw(DrawingContext& context) sa_prefix = "fire"; else if (player_status->bonus == ICE_BONUS) sa_prefix = "ice"; + else if (player_status->bonus == AIR_BONUS) + sa_prefix = "air"; + else if (player_status->bonus == EARTH_BONUS) + sa_prefix = "earth"; else sa_prefix = "small"; @@ -1093,6 +1214,9 @@ Player::draw(DrawingContext& context) // do_duck() will take care of cancelling growing manually // update() will take care of cancelling when growing completed } + else if (stone) { + sprite->set_action(sprite->get_action()+"-stone"); + } else if (climbing) { sprite->set_action(sa_prefix+"-climbing"+sa_postfix); } @@ -1146,6 +1270,13 @@ Player::draw(DrawingContext& context) } } + /* Set Tux powerup sprite action */ + if (player_status->bonus == EARTH_BONUS) { + powersprite->set_action(sprite->get_action()); + lightsprite->set_action(sprite->get_action()); + } else if (player_status->bonus == AIR_BONUS) + powersprite->set_action(sprite->get_action()); + /* // Tux is holding something if ((grabbed_object != 0 && physic.get_velocity_y() == 0) || @@ -1159,8 +1290,31 @@ Player::draw(DrawingContext& context) /* Draw Tux */ if (safe_timer.started() && size_t(game_time*40)%2) ; // don't draw Tux + else if (player_status->bonus == EARTH_BONUS){ // draw special effects with earthflower bonus + // shake at end of maximum stone duration + Vector shake_delta = (stone && ability_timer.get_timeleft() < 1.0f) ? Vector(graphicsRandom.rand(-3,3), 0) : Vector(0,0); + sprite->draw(context, get_pos() + shake_delta, LAYER_OBJECTS + 1); + // draw hardhat + powersprite->draw(context, get_pos() + shake_delta, LAYER_OBJECTS + 1); + // light + context.push_target(); + context.set_target(DrawingContext::LIGHTMAP); + lightsprite->draw(context, get_pos(), 0); + context.pop_target(); + // give an indicator that stone form cannot be used for a while + if (cooldown_timer.started() && graphicsRandom.rand(0, 4) == 0) { + float px = graphicsRandom.randf(bbox.p1.x, bbox.p2.x); + float py = bbox.p2.y+8; + Vector ppos = Vector(px, py); + Sector::current()->add_object(std::make_shared( + "images/objects/particles/sparkle.sprite", "dark", + ppos, ANCHOR_MIDDLE, Vector(0, 0), Vector(0, 0), LAYER_OBJECTS+1+5)); + } + } else { sprite->draw(context, get_pos(), LAYER_OBJECTS + 1); + if (player_status->bonus == AIR_BONUS) + powersprite->draw(context, get_pos(), LAYER_OBJECTS + 1); } } @@ -1182,7 +1336,7 @@ Player::collision_tile(uint32_t tile_attributes) if( tile_attributes & Tile::WATER ){ swimming = true; no_water = false; - SoundManager::current()->play( "sounds/splash.ogg" ); + SoundManager::current()->play( "sounds/splash.wav" ); } } #endif @@ -1208,16 +1362,14 @@ Player::collision_solid(const CollisionHit& hit) does_buttjump = false; physic.set_velocity_y(-300); on_ground_flag = false; - Sector::current()->add_object(new Particles( + Sector::current()->add_object(std::make_shared( Vector(get_bbox().p2.x, get_bbox().p2.y), - 270+20, 270+40, - Vector(280, -260), Vector(0, 300), 3, Color(.4f, .4f, .4f), 3, .8f, - LAYER_OBJECTS+1)); - Sector::current()->add_object(new Particles( + 50, 70, 260, 280, Vector(0, 300), 3, + Color(.4f, .4f, .4f), 3, .8f, LAYER_OBJECTS+1)); + Sector::current()->add_object(std::make_shared( Vector(get_bbox().p1.x, get_bbox().p2.y), - 90-40, 90-20, - Vector(280, -260), Vector(0, 300), 3, Color(.4f, .4f, .4f), 3, .8f, - LAYER_OBJECTS+1)); + -70, -50, 260, 280, Vector(0, 300), 3, + Color(.4f, .4f, .4f), 3, .8f, LAYER_OBJECTS+1)); Sector::current()->camera->shake(.1f, 0, 5); } @@ -1272,6 +1424,8 @@ Player::collision(GameObject& other, const CollisionHit& hit) if(badguy != NULL) { if(safe_timer.started() || invincible_timer.started()) return FORCE_MOVE; + if(stone) + return ABORT_MOVE; return CONTINUE; } @@ -1294,7 +1448,7 @@ Player::kill(bool completely) if(dying || deactivated || is_winning() ) return; - if(!completely && (safe_timer.started() || invincible_timer.started())) + if(!completely && (safe_timer.started() || invincible_timer.started() || stone)) return; growing = false; @@ -1303,11 +1457,17 @@ Player::kill(bool completely) physic.set_velocity_x(0); + sprite->set_angle(0.0f); + powersprite->set_angle(0.0f); + lightsprite->set_angle(0.0f); + if(!completely && is_big()) { SoundManager::current()->play("sounds/hurt.wav"); if(player_status->bonus == FIRE_BONUS - || player_status->bonus == ICE_BONUS) { + || player_status->bonus == ICE_BONUS + || player_status->bonus == AIR_BONUS + || player_status->bonus == EARTH_BONUS) { safe_timer.start(TUX_SAFE_TIME); set_bonus(GROWUP_BONUS, true); } else if(player_status->bonus == GROWUP_BONUS) { @@ -1316,6 +1476,8 @@ Player::kill(bool completely) duck = false; backflipping = false; sprite->set_angle(0.0f); + powersprite->set_angle(0.0f); + lightsprite->set_angle(0.0f); set_bonus(NO_BONUS, true); } else if(player_status->bonus == NO_BONUS) { safe_timer.start(TUX_SAFE_TIME); @@ -1336,7 +1498,7 @@ Player::kill(bool completely) for (int i = 0; i < 5; i++) { // the numbers: starting x, starting y, velocity y - Sector::current()->add_object(new FallingCoin(get_pos() + + Sector::current()->add_object(std::make_shared(get_pos() + Vector(graphicsRandom.rand(5), graphicsRandom.rand(-32,18)), graphicsRandom.rand(-100,100))); } @@ -1376,6 +1538,8 @@ Player::move(const Vector& vector) duck = false; backflipping = false; sprite->set_angle(0.0f); + powersprite->set_angle(0.0f); + lightsprite->set_angle(0.0f); last_ground_y = vector.y; if (climbing) stop_climbing(*climbing); @@ -1433,10 +1597,12 @@ Player::get_velocity() void Player::bounce(BadGuy& ) { - if(controller->hold(Controller::JUMP)) - physic.set_velocity_y(-520); - else - physic.set_velocity_y(-300); + if(!(player_status->bonus == AIR_BONUS)) + physic.set_velocity_y(controller->hold(Controller::JUMP) ? -520 : -300); + else { + physic.set_velocity_y(controller->hold(Controller::JUMP) ? -580 : -340); + ability_time = player_status->max_air_time * GLIDE_TIME_PER_FLOWER; + } } //scripting Functions Below @@ -1512,6 +1678,8 @@ Player::start_climbing(Climbable& climbable) backflipping = false; backflip_direction = 0; sprite->set_angle(0.0f); + powersprite->set_angle(0.0f); + lightsprite->set_angle(0.0f); } }