X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy.cpp;h=7b8db66c90fb00d0b0b4cf3de033bab72bf9ef52;hb=c11b04d0525c1566260b02bacd78fd7faa7be8f1;hp=aa3d1a6fbeed88fbf2358f62d577f4fd416953c9;hpb=33859cef956033fc8536172e11f832f8c8ecc46d;p=supertux.git diff --git a/src/badguy.cpp b/src/badguy.cpp index aa3d1a6fb..7b8db66c9 100644 --- a/src/badguy.cpp +++ b/src/badguy.cpp @@ -32,24 +32,22 @@ #include "tile.h" #include "resources.h" #include "sprite_manager.h" +#include "gameloop.h" -Sprite* img_bsod_squished_left; -Sprite* img_bsod_squished_right; -Sprite* img_bsod_falling_left; -Sprite* img_bsod_falling_right; Sprite* img_mriceblock_flat_left; Sprite* img_mriceblock_flat_right; Sprite* img_mriceblock_falling_left; Sprite* img_mriceblock_falling_right; -Sprite* img_bsod_left; -Sprite* img_bsod_right; Sprite* img_mriceblock_left; Sprite* img_mriceblock_right; Sprite* img_jumpy_left_up; Sprite* img_jumpy_left_down; Sprite* img_jumpy_left_middle; +Sprite* img_jumpy_left_iced; Sprite* img_mrbomb_left; Sprite* img_mrbomb_right; +Sprite* img_mrbomb_iced_left; +Sprite* img_mrbomb_iced_right; Sprite* img_mrbomb_ticking_left; Sprite* img_mrbomb_ticking_right; Sprite* img_mrbomb_explosion; @@ -58,6 +56,8 @@ Sprite* img_stalactite_broken; Sprite* img_flame; Sprite* img_fish; Sprite* img_fish_down; +Sprite* img_fish_iced; +Sprite* img_fish_iced_down; Sprite* img_bouncingsnowball_left; Sprite* img_bouncingsnowball_right; Sprite* img_bouncingsnowball_squished; @@ -65,6 +65,8 @@ Sprite* img_flyingsnowball; Sprite* img_flyingsnowball_squished; Sprite* img_spiky_left; Sprite* img_spiky_right; +Sprite* img_spiky_iced_left; +Sprite* img_spiky_iced_right; Sprite* img_snowball_left; Sprite* img_snowball_right; Sprite* img_snowball_squished_left; @@ -78,8 +80,6 @@ BadGuyKind badguykind_from_string(const std::string& str) return BAD_JUMPY; else if (str == "laptop" || str == "mriceblock") // was laptop in old maps return BAD_MRICEBLOCK; - else if (str == "bsod") - return BAD_BSOD; else if (str == "mrbomb") return BAD_MRBOMB; else if (str == "stalactite") @@ -94,12 +94,12 @@ BadGuyKind badguykind_from_string(const std::string& str) return BAD_FLYINGSNOWBALL; else if (str == "spiky") return BAD_SPIKY; - else if (str == "snowball") + else if (str == "snowball" || str == "bsod") // was bsod in old maps return BAD_SNOWBALL; else { printf("Couldn't convert badguy: '%s'\n", str.c_str()); - return BAD_BSOD; + return BAD_SNOWBALL; } } @@ -113,9 +113,6 @@ std::string badguykind_to_string(BadGuyKind kind) case BAD_MRICEBLOCK: return "mriceblock"; break; - case BAD_BSOD: - return "bsod"; - break; case BAD_MRBOMB: return "mrbomb"; break; @@ -141,7 +138,7 @@ std::string badguykind_to_string(BadGuyKind kind) return "snowball"; break; default: - return "bsod"; + return "snowball"; } } @@ -162,15 +159,13 @@ BadGuy::BadGuy(float x, float y, BadGuyKind kind_, bool stay_on_platform_) old_base = base; dir = LEFT; seen = false; + frozen_timer.init(true); animation_offset = 0; sprite_left = sprite_right = 0; physic.reset(); timer.init(true); - if(kind == BAD_BSOD) { - physic.set_velocity(-BADGUY_WALK_SPEED, 0); - set_sprite(img_bsod_left, img_bsod_right); - } else if(kind == BAD_MRBOMB) { + if(kind == BAD_MRBOMB) { physic.set_velocity(-BADGUY_WALK_SPEED, 0); set_sprite(img_mrbomb_left, img_mrbomb_right); } else if (kind == BAD_MRICEBLOCK) { @@ -207,55 +202,25 @@ BadGuy::BadGuy(float x, float y, BadGuyKind kind_, bool stay_on_platform_) } // if we're in a solid tile at start correct that now - if(kind != BAD_FLAME && kind != BAD_FISH && collision_object_map(base)) { - printf("Warning: badguy started in wall!.\n"); - while(collision_object_map(base)) - --base.y; - } -} - -void -BadGuy::action_bsod(float frame_ratio) -{ - static const float BSODJUMP = 2; - - if (dying == DYING_NOT) - check_horizontal_bump(); - - fall(); - - // jump when we're about to fall - if (physic.get_velocity_y() == 0 && - !issolid(base.x+base.width/2, base.y + base.height)) - { - physic.enable_gravity(true); - physic.set_velocity(physic.get_velocity_x(), BSODJUMP); - } - - // Handle dying timer: - if (dying == DYING_SQUISHED && !timer.check()) + if(kind != BAD_FLAME && kind != BAD_FISH && collision_object_map(base)) { - /* Remove it if time's up: */ - remove_me(); - return; + std::cout << "Warning: badguy started in wall: kind: " << badguykind_to_string(kind) + << " pos: (" << base.x << ", " << base.y << ")" << std::endl; + while(collision_object_map(base)) + --base.y; } - - // move - physic.apply(frame_ratio, base.x, base.y); - if(dying != DYING_FALLING) - collision_swept_object_map(&old_base, &base); } void -BadGuy::action_mriceblock(float frame_ratio) +BadGuy::action_mriceblock(double frame_ratio) { Player& tux = *World::current()->get_tux(); - if(dying == DYING_NOT) + if(mode != HELD) fall(); /* Move left/right: */ - if (mode == NORMAL || mode == KICK) + if (mode != HELD) { // move physic.apply(frame_ratio, base.x, base.y); @@ -332,12 +297,18 @@ BadGuy::check_horizontal_bump(bool checkcliff) float halfheight = base.height / 2; if (dir == LEFT && issolid( base.x, (int) base.y + halfheight)) { + if (kind == BAD_MRICEBLOCK && mode == KICK) + World::current()->trybreakbrick(base.x, (int) base.y + halfheight, false); + dir = RIGHT; physic.set_velocity(-physic.get_velocity_x(), physic.get_velocity_y()); return; } if (dir == RIGHT && issolid( base.x + base.width, (int)base.y + halfheight)) { + if (kind == BAD_MRICEBLOCK && mode == KICK) + World::current()->trybreakbrick(base.x + base.width, (int) base.y + halfheight, false); + dir = LEFT; physic.set_velocity(-physic.get_velocity_x(), physic.get_velocity_y()); return; @@ -391,11 +362,16 @@ BadGuy::fall() if (!issolid(base.x + ((dir == LEFT) ? 0 : base.width), base.y + base.height)) { - physic.set_velocity_x(-physic.get_velocity_x()); if (dir == LEFT) + { dir = RIGHT; + physic.set_velocity_x(fabsf(physic.get_velocity_x())); + } else + { dir = LEFT; + physic.set_velocity_x(-fabsf(physic.get_velocity_x())); + } } } } @@ -413,14 +389,23 @@ BadGuy::remove_me() } void -BadGuy::action_jumpy(float frame_ratio) +BadGuy::action_jumpy(double frame_ratio) { - if (fabsf(physic.get_velocity_y()) < 2.5f) + if(frozen_timer.check()) + { + set_sprite(img_jumpy_left_iced, img_jumpy_left_iced); + return; + } + + const float vy = physic.get_velocity_y(); + + // XXX: These tests *should* use location from ground, not velocity + if (fabsf(vy) > 5.6f) + set_sprite(img_jumpy_left_down, img_jumpy_left_down); + else if (fabsf(vy) > 5.3f) set_sprite(img_jumpy_left_middle, img_jumpy_left_middle); - else if (physic.get_velocity_y() < 0) + else set_sprite(img_jumpy_left_up, img_jumpy_left_up); - else - set_sprite(img_jumpy_left_down, img_jumpy_left_down); Player& tux = *World::current()->get_tux(); @@ -453,8 +438,14 @@ BadGuy::action_jumpy(float frame_ratio) } void -BadGuy::action_mrbomb(float frame_ratio) +BadGuy::action_mrbomb(double frame_ratio) { + if(frozen_timer.check()) + { + set_sprite(img_mrbomb_iced_left, img_mrbomb_iced_right); + return; + } + if (dying == DYING_NOT) check_horizontal_bump(true); @@ -466,7 +457,7 @@ BadGuy::action_mrbomb(float frame_ratio) } void -BadGuy::action_bomb(float frame_ratio) +BadGuy::action_bomb(double frame_ratio) { static const int TICKINGTIME = 1000; static const int EXPLODETIME = 1000; @@ -503,7 +494,7 @@ BadGuy::action_bomb(float frame_ratio) } void -BadGuy::action_stalactite(float frame_ratio) +BadGuy::action_stalactite(double frame_ratio) { Player& tux = *World::current()->get_tux(); @@ -545,7 +536,7 @@ BadGuy::action_stalactite(float frame_ratio) } void -BadGuy::action_flame(float frame_ratio) +BadGuy::action_flame(double frame_ratio) { static const float radius = 100; static const float speed = 0.02; @@ -556,8 +547,18 @@ BadGuy::action_flame(float frame_ratio) } void -BadGuy::action_fish(float frame_ratio) +BadGuy::action_fish(double frame_ratio) { + if(frozen_timer.check()) + { + if(physic.get_velocity_y() < 0) + set_sprite(img_fish_iced_down, img_fish_iced_down); + else + set_sprite(img_fish_iced, img_fish_iced); + + return; + } + static const float JUMPV = 6; static const int WAITTIME = 1000; @@ -589,7 +590,7 @@ BadGuy::action_fish(float frame_ratio) } void -BadGuy::action_bouncingsnowball(float frame_ratio) +BadGuy::action_bouncingsnowball(double frame_ratio) { static const float JUMPV = 4.5; @@ -623,7 +624,7 @@ BadGuy::action_bouncingsnowball(float frame_ratio) } void -BadGuy::action_flyingsnowball(float frame_ratio) +BadGuy::action_flyingsnowball(double frame_ratio) { static const float FLYINGSPEED = 1; static const int DIRCHANGETIME = 1000; @@ -663,8 +664,14 @@ BadGuy::action_flyingsnowball(float frame_ratio) } void -BadGuy::action_spiky(float frame_ratio) +BadGuy::action_spiky(double frame_ratio) { + if(frozen_timer.check()) + { + set_sprite(img_spiky_iced_left, img_spiky_iced_right); + return; + } + if (dying == DYING_NOT) check_horizontal_bump(); @@ -684,7 +691,7 @@ BadGuy::action_spiky(float frame_ratio) } void -BadGuy::action_snowball(float frame_ratio) +BadGuy::action_snowball(double frame_ratio) { if (dying == DYING_NOT) check_horizontal_bump(); @@ -697,7 +704,7 @@ BadGuy::action_snowball(float frame_ratio) } void -BadGuy::action(float frame_ratio) +BadGuy::action(double frame_ratio) { // Remove if it's far off the screen: if (base.x < scroll_x - OFFSCREEN_DISTANCE) @@ -712,6 +719,17 @@ BadGuy::action(float frame_ratio) return; } + // Kill us if we landed on spikes + if (dying == DYING_NOT + && (kind != BAD_STALACTITE && kind != BAD_FLAME && kind != BAD_BOMB) + && (isspike(base.x, base.y) || isspike(base.x + base.width, base.y) + || isspike(base.x, base.y + base.height) + || isspike(base.x + base.width, base.y + base.height))) + { + physic.set_velocity_y(3); + kill_me(0); + } + // Once it's on screen, it's activated! if (base.x <= scroll_x + screen->w + OFFSCREEN_DISTANCE) seen = true; @@ -721,10 +739,6 @@ BadGuy::action(float frame_ratio) switch (kind) { - case BAD_BSOD: - action_bsod(frame_ratio); - break; - case BAD_MRICEBLOCK: action_mriceblock(frame_ratio); break; @@ -768,6 +782,8 @@ BadGuy::action(float frame_ratio) case BAD_SNOWBALL: action_snowball(frame_ratio); break; + default: + break; } } @@ -784,10 +800,10 @@ BadGuy::draw() } Sprite* sprite = (dir == LEFT) ? sprite_left : sprite_right; - sprite->draw(base.x - scroll_x, base.y); + sprite->draw(base.x, base.y); if (debug_mode) - fillrect(base.x - scroll_x, base.y, base.width, base.height, 75,0,75, 150); + fillrect(base.x - scroll_x, base.y - scroll_y, base.width, base.height, 75,0,75, 150); } void @@ -828,10 +844,12 @@ void BadGuy::bump() { // these can't be bumped - if(kind == BAD_FLAME || kind == BAD_BOMB || kind == BAD_FISH) + if(kind == BAD_FLAME || kind == BAD_BOMB || kind == BAD_FISH + || kind == BAD_FLYINGSNOWBALL) return; - - kill_me(); + + physic.set_velocity_y(3); + kill_me(25); } void @@ -846,7 +864,7 @@ BadGuy::squish_me(Player* player) { make_player_jump(player); - World::current()->add_score(base.x - scroll_x, + World::current()->add_score(base.x, base.y, 50 * player_status.score_multiplier); play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER); player_status.score_multiplier++; @@ -866,18 +884,12 @@ BadGuy::squish(Player* player) World::current()->add_bad_guy(base.x, base.y, BAD_BOMB); make_player_jump(player); - World::current()->add_score(base.x - scroll_x, base.y, 50 * player_status.score_multiplier); + World::current()->add_score(base.x, base.y, 50 * player_status.score_multiplier); play_sound(sounds[SND_SQUISH], SOUND_CENTER_SPEAKER); player_status.score_multiplier++; remove_me(); return; - } else if(kind == BAD_BSOD) { - squish_me(player); - set_sprite(img_bsod_squished_left, img_bsod_squished_right); - physic.set_velocity_x(0); - return; - } else if (kind == BAD_MRICEBLOCK) { if (mode == NORMAL || mode == KICK) { @@ -901,18 +913,18 @@ BadGuy::squish(Player* player) } mode = KICK; + player->kick_timer.start(KICKING_TIME); set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right); } make_player_jump(player); - - World::current()->add_score(base.x - scroll_x, base.y, 25 * player_status.score_multiplier); + player_status.score_multiplier++; // check for maximum number of squiches squishcount++; if(squishcount >= MAX_ICEBLOCK_SQUICHES) { - kill_me(); + kill_me(50); return; } @@ -924,7 +936,7 @@ BadGuy::squish(Player* player) make_player_jump(player); - World::current()->add_score(base.x - scroll_x, base.y, 25 * player_status.score_multiplier); + World::current()->add_score(base.x, base.y, 25 * player_status.score_multiplier); player_status.score_multiplier++; // simply remove the fish... @@ -946,9 +958,9 @@ BadGuy::squish(Player* player) } void -BadGuy::kill_me() +BadGuy::kill_me(int score) { - if(kind == BAD_BOMB || kind == BAD_STALACTITE || kind == BAD_FLAME) + if(kind == BAD_BOMB) return; dying = DYING_FALLING; @@ -959,29 +971,30 @@ BadGuy::kill_me() Player& tux = *World::current()->get_tux(); tux.holding_something = false; } - } else if(kind == BAD_BSOD) { - set_sprite(img_bsod_falling_left, img_bsod_falling_right); } - + physic.enable_gravity(true); - physic.set_velocity_y(0); /* Gain some points: */ - if (kind == BAD_BSOD) - World::current()->add_score(base.x - scroll_x, base.y, - 50 * player_status.score_multiplier); - else - World::current()->add_score(base.x - scroll_x, base.y, - 25 * player_status.score_multiplier); + if (score != 0) + World::current()->add_score(base.x, base.y, + score * player_status.score_multiplier); /* Play death sound: */ play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER); } +void BadGuy::explode(BadGuy *badguy) +{ +World::current()->add_bad_guy(badguy->base.x, badguy->base.y, BAD_BOMB); +badguy->remove_me(); +} + void BadGuy::collision(void *p_c_object, int c_object, CollisionType type) { BadGuy* pbad_c = NULL; + Bullet* pbullet_c = NULL; if(type == COLLISION_BUMP) { bump(); @@ -998,23 +1011,37 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type) switch (c_object) { case CO_BULLET: - kill_me(); + pbullet_c = (Bullet*) p_c_object; + + if(pbullet_c->kind == FIRE_BULLET) + { + if (kind != BAD_BOMB && kind != BAD_STALACTITE && kind != BAD_FLAME) + kill_me(10); + } + else if(pbullet_c->kind == ICE_BULLET) + { + //if(kind == BAD_FLAME) + // kill_me(10); + //else + frozen_timer.start(FROZEN_TIME); + } break; case CO_BADGUY: pbad_c = (BadGuy*) p_c_object; - /* If we're a kicked mriceblock, kill any badguys we hit */ - if(kind == BAD_MRICEBLOCK && mode == KICK) + /* If we're a kicked mriceblock, kill [almost] any badguys we hit */ + if(kind == BAD_MRICEBLOCK && mode == KICK && + kind != BAD_FLAME && kind != BAD_BOMB && kind != BAD_STALACTITE) { - pbad_c->kill_me(); + pbad_c->kill_me(25); } - // a held mriceblock gets kills the enemy too but falls to ground then + // a held mriceblock kills the enemy too but falls to ground then else if(kind == BAD_MRICEBLOCK && mode == HELD) { - pbad_c->kill_me(); - kill_me(); + pbad_c->kill_me(25); + kill_me(0); } /* Kill badguys that run into exploding bomb */ @@ -1023,21 +1050,26 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type) if (pbad_c->kind == BAD_MRBOMB) { // mrbomb transforms into a bomb now - World::current()->add_bad_guy(pbad_c->base.x, pbad_c->base.y, - BAD_BOMB); - pbad_c->remove_me(); + explode(pbad_c); return; } else if (pbad_c->kind != BAD_MRBOMB) { - pbad_c->kill_me(); + pbad_c->kill_me(50); } } /* Kill any badguys that get hit by stalactite */ else if (kind == BAD_STALACTITE && dying == DYING_NOT) { - pbad_c->kill_me(); + if (pbad_c->kind == BAD_MRBOMB) + { + // mrbomb transforms into a bomb now + explode(pbad_c); + return; + } + else + pbad_c->kill_me(50); } /* When enemies run into eachother, make them change directions */ @@ -1051,16 +1083,16 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type) // Bounce off of other badguy if we land on top of him if (base.y + base.height < pbad_c->base.y + pbad_c->base.height) { - Direction old_dir = dir; if (pbad_c->dir == LEFT) + { dir = RIGHT; + physic.set_velocity(fabsf(physic.get_velocity_x()), 2); + } else if (pbad_c->dir == RIGHT) + { dir = LEFT; - - if (dir != old_dir) - physic.inverse_velocity_x(); - - physic.set_velocity(fabs(physic.get_velocity_x()), 2); + physic.set_velocity(-fabsf(physic.get_velocity_x()), 2); + } break; } @@ -1069,12 +1101,21 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type) if (pbad_c->kind != BAD_FLAME) { - if (dir == LEFT) - dir = RIGHT; - else if (dir == RIGHT) - dir = LEFT; - - physic.inverse_velocity_x(); + if (dir == LEFT) + { + dir = RIGHT; + physic.set_velocity_x(fabsf(physic.get_velocity_x())); + + // in case badguys get "jammed" + if (physic.get_velocity_x() != 0) + base.x = pbad_c->base.x + pbad_c->base.width; + } + else if (dir == RIGHT) + { + dir = LEFT; + physic.set_velocity_x(-fabsf(physic.get_velocity_x())); + } + } } @@ -1099,6 +1140,7 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type) } mode = KICK; + player->kick_timer.start(KICKING_TIME); set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right); } break; @@ -1106,27 +1148,25 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type) } } + //--------------------------------------------------------------------------- void load_badguy_gfx() { - img_bsod_squished_left = sprite_manager->load("bsod-squished-left"); - img_bsod_squished_right = sprite_manager->load("bsod-squished-right"); - img_bsod_falling_left = sprite_manager->load("bsod-falling-left"); - img_bsod_falling_right = sprite_manager->load("bsod-falling-right"); img_mriceblock_flat_left = sprite_manager->load("mriceblock-flat-left"); img_mriceblock_flat_right = sprite_manager->load("mriceblock-flat-right"); img_mriceblock_falling_left = sprite_manager->load("mriceblock-falling-left"); img_mriceblock_falling_right = sprite_manager->load("mriceblock-falling-right"); - img_bsod_left = sprite_manager->load("bsod-left"); - img_bsod_right = sprite_manager->load("bsod-right"); img_mriceblock_left = sprite_manager->load("mriceblock-left"); img_mriceblock_right = sprite_manager->load("mriceblock-right"); img_jumpy_left_up = sprite_manager->load("jumpy-left-up"); img_jumpy_left_down = sprite_manager->load("jumpy-left-down"); img_jumpy_left_middle = sprite_manager->load("jumpy-left-middle"); + img_jumpy_left_iced = sprite_manager->load("jumpy-left-iced"); img_mrbomb_left = sprite_manager->load("mrbomb-left"); img_mrbomb_right = sprite_manager->load("mrbomb-right"); + img_mrbomb_iced_left = sprite_manager->load("mrbomb-iced-left"); + img_mrbomb_iced_right = sprite_manager->load("mrbomb-iced-right"); img_mrbomb_ticking_left = sprite_manager->load("mrbomb-ticking-left"); img_mrbomb_ticking_right = sprite_manager->load("mrbomb-ticking-right"); img_mrbomb_explosion = sprite_manager->load("mrbomb-explosion"); @@ -1135,6 +1175,8 @@ void load_badguy_gfx() img_flame = sprite_manager->load("flame"); img_fish = sprite_manager->load("fish"); img_fish_down = sprite_manager->load("fish-down"); + img_fish_iced = sprite_manager->load("fish-iced"); + img_fish_iced_down = sprite_manager->load("fish-iced-down"); img_bouncingsnowball_left = sprite_manager->load("bouncingsnowball-left"); img_bouncingsnowball_right = sprite_manager->load("bouncingsnowball-right"); img_bouncingsnowball_squished = sprite_manager->load("bouncingsnowball-squished"); @@ -1142,6 +1184,8 @@ void load_badguy_gfx() img_flyingsnowball_squished = sprite_manager->load("flyingsnowball-squished"); img_spiky_left = sprite_manager->load("spiky-left"); img_spiky_right = sprite_manager->load("spiky-right"); + img_spiky_iced_left = sprite_manager->load("spiky-iced-left"); + img_spiky_iced_right = sprite_manager->load("spiky-iced-right"); img_snowball_left = sprite_manager->load("snowball-left"); img_snowball_right = sprite_manager->load("snowball-right"); img_snowball_squished_left = sprite_manager->load("snowball-squished-left");