X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy.cpp;h=7b8db66c90fb00d0b0b4cf3de033bab72bf9ef52;hb=c11b04d0525c1566260b02bacd78fd7faa7be8f1;hp=91ca082a862b11c5221f590d24baf79edc14c2da;hpb=919d46f4dc58a127596d4b8a6b29409fcbf128b9;p=supertux.git diff --git a/src/badguy.cpp b/src/badguy.cpp index 91ca082a8..7b8db66c9 100644 --- a/src/badguy.cpp +++ b/src/badguy.cpp @@ -1,14 +1,24 @@ +// $Id$ +// +// SuperTux +// Copyright (C) 2000 Bill Kendrick +// Copyright (C) 2004 Tobias Glaesser +// Copyright (C) 2004 Matthias Braun // -// C Implementation: badguy -// -// Description: -// -// -// Author: Tobias Glaesser & Bill Kendrick, (C) 2004 -// -// Copyright: See COPYING file that comes with this distribution -// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. // +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +// 02111-1307, USA. #include #include @@ -22,24 +32,22 @@ #include "tile.h" #include "resources.h" #include "sprite_manager.h" - -Sprite* img_bsod_squished_left; -Sprite* img_bsod_squished_right; -Sprite* img_bsod_falling_left; -Sprite* img_bsod_falling_right; -Sprite* img_laptop_flat_left; -Sprite* img_laptop_flat_right; -Sprite* img_laptop_falling_left; -Sprite* img_laptop_falling_right; -Sprite* img_bsod_left; -Sprite* img_bsod_right; -Sprite* img_laptop_left; -Sprite* img_laptop_right; +#include "gameloop.h" + +Sprite* img_mriceblock_flat_left; +Sprite* img_mriceblock_flat_right; +Sprite* img_mriceblock_falling_left; +Sprite* img_mriceblock_falling_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; @@ -48,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; @@ -55,19 +65,21 @@ 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; Sprite* img_snowball_squished_right; +#define BADGUY_WALK_SPEED .8f + BadGuyKind badguykind_from_string(const std::string& str) { - if (str == "money") - return BAD_MONEY; - else if (str == "laptop" || str == "mriceblock") - return BAD_LAPTOP; - else if (str == "bsod") - return BAD_BSOD; + if (str == "money" || str == "jumpy") // was money in old maps + return BAD_JUMPY; + else if (str == "laptop" || str == "mriceblock") // was laptop in old maps + return BAD_MRICEBLOCK; else if (str == "mrbomb") return BAD_MRBOMB; else if (str == "stalactite") @@ -82,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; } } @@ -95,14 +107,11 @@ std::string badguykind_to_string(BadGuyKind kind) { switch(kind) { - case BAD_MONEY: - return "money"; - break; - case BAD_LAPTOP: - return "laptop"; + case BAD_JUMPY: + return "jumpy"; break; - case BAD_BSOD: - return "bsod"; + case BAD_MRICEBLOCK: + return "mriceblock"; break; case BAD_MRBOMB: return "mrbomb"; @@ -129,12 +138,12 @@ std::string badguykind_to_string(BadGuyKind kind) return "snowball"; break; default: - return "bsod"; + return "snowball"; } } -void -BadGuy::init(float x, float y, BadGuyKind kind_) +BadGuy::BadGuy(float x, float y, BadGuyKind kind_, bool stay_on_platform_) + : removable(false), squishcount(0) { base.x = x; base.y = y; @@ -143,107 +152,75 @@ BadGuy::init(float x, float y, BadGuyKind kind_) base.xm = 0; base.ym = 0; + stay_on_platform = stay_on_platform_; mode = NORMAL; dying = DYING_NOT; kind = kind_; old_base = base; dir = LEFT; seen = false; - animation_speed = 1; - animation_length = 1; + frozen_timer.init(true); animation_offset = 0; sprite_left = sprite_right = 0; physic.reset(); timer.init(true); - if(kind == BAD_BSOD) { - physic.set_velocity(-1.3, 0); - set_sprite(img_bsod_left, img_bsod_right, 4); - } else if(kind == BAD_MRBOMB) { - physic.set_velocity(-1.3, 0); - set_sprite(img_mrbomb_left, img_mrbomb_right, 4); - } else if (kind == BAD_LAPTOP) { - physic.set_velocity(-1.3, 0); - set_sprite(img_laptop_left, img_laptop_right, 4, 5); - } else if(kind == BAD_MONEY) { - set_sprite(img_jumpy_left_up, img_jumpy_left_up, 1); + if(kind == BAD_MRBOMB) { + physic.set_velocity(-BADGUY_WALK_SPEED, 0); + set_sprite(img_mrbomb_left, img_mrbomb_right); + } else if (kind == BAD_MRICEBLOCK) { + physic.set_velocity(-BADGUY_WALK_SPEED, 0); + set_sprite(img_mriceblock_left, img_mriceblock_right); + } else if(kind == BAD_JUMPY) { + set_sprite(img_jumpy_left_up, img_jumpy_left_up); } else if(kind == BAD_BOMB) { - set_sprite(img_mrbomb_ticking_left, img_mrbomb_ticking_right, 1); + set_sprite(img_mrbomb_ticking_left, img_mrbomb_ticking_right); // hack so that the bomb doesn't hurt until it expldes... dying = DYING_SQUISHED; } else if(kind == BAD_FLAME) { base.ym = 0; // we misuse base.ym as angle for the flame physic.enable_gravity(false); - set_sprite(img_flame, img_flame, 2, 0.5); + set_sprite(img_flame, img_flame); } else if(kind == BAD_BOUNCINGSNOWBALL) { physic.set_velocity(-1.3, 0); - set_sprite(img_bouncingsnowball_left, img_bouncingsnowball_right, 6); + set_sprite(img_bouncingsnowball_left, img_bouncingsnowball_right); } else if(kind == BAD_STALACTITE) { physic.enable_gravity(false); - set_sprite(img_stalactite, img_stalactite, 1); + set_sprite(img_stalactite, img_stalactite); } else if(kind == BAD_FISH) { - set_sprite(img_fish, img_fish, 2, 1); + set_sprite(img_fish, img_fish); physic.enable_gravity(true); } else if(kind == BAD_FLYINGSNOWBALL) { - set_sprite(img_flyingsnowball, img_flyingsnowball, 2, 5); + set_sprite(img_flyingsnowball, img_flyingsnowball); physic.enable_gravity(false); } else if(kind == BAD_SPIKY) { - physic.set_velocity(-1.3, 0); - set_sprite(img_spiky_left, img_spiky_right, 3); + physic.set_velocity(-BADGUY_WALK_SPEED, 0); + set_sprite(img_spiky_left, img_spiky_right); } else if(kind == BAD_SNOWBALL) { - physic.set_velocity(-1.3, 0); - set_sprite(img_snowball_left, img_snowball_right, 4, 5); + physic.set_velocity(-BADGUY_WALK_SPEED, 0); + set_sprite(img_snowball_left, img_snowball_right); } // 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_laptop(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); @@ -252,7 +229,7 @@ BadGuy::action_laptop(float frame_ratio) } else if (mode == HELD) { /* FIXME: The pbad object shouldn't know about pplayer objects. */ - /* If we're holding the laptop */ + /* If we're holding the iceblock */ dir = tux.dir; if(dir==RIGHT) { @@ -264,7 +241,7 @@ BadGuy::action_laptop(float frame_ratio) base.x = tux.base.x - 16; base.y = tux.base.y + tux.base.height/1.5 - base.height; } - if(collision_object_map(&base)) + if(collision_object_map(base)) { base.x = tux.base.x; base.y = tux.base.y + tux.base.height/1.5 - base.height; @@ -279,8 +256,9 @@ BadGuy::action_laptop(float frame_ratio) old_base = base; mode=KICK; - set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1); - physic.set_velocity((dir == LEFT) ? -8 : 8, -8); + tux.kick_timer.start(KICKING_TIME); + set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right); + physic.set_velocity_x((dir == LEFT) ? -3.5 : 3.5); play_sound(sounds[SND_KICK],SOUND_CENTER_SPEAKER); } } @@ -307,8 +285,8 @@ BadGuy::action_laptop(float frame_ratio) if(!timer.check()) { mode = NORMAL; - set_sprite(img_laptop_left, img_laptop_right, 4, 5); - physic.set_velocity( (dir == LEFT) ? -1.3 : 1.3, 0); + set_sprite(img_mriceblock_left, img_mriceblock_right); + physic.set_velocity( (dir == LEFT) ? -.8 : .8, 0); } } } @@ -319,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; @@ -368,10 +352,28 @@ BadGuy::fall() if (physic.get_velocity_y() < 0) { base.y = int((base.y + base.height)/32) * 32 - base.height; - physic.set_velocity(physic.get_velocity_x(), 0); + physic.set_velocity_y(0); } // no gravity anymore please physic.enable_gravity(false); + + if (stay_on_platform && mode == NORMAL) + { + if (!issolid(base.x + ((dir == LEFT) ? 0 : base.width), + base.y + base.height)) + { + 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())); + } + } + } } } else @@ -383,25 +385,27 @@ BadGuy::fall() void BadGuy::remove_me() { - for(std::vector::iterator i = World::current()->bad_guys.begin(); - i != World::current()->bad_guys.end(); ++i) - { - if( & (*i) == this) { - World::current()->bad_guys.erase(i); - return; - } - } + removable = true; } void -BadGuy::action_money(float frame_ratio) +BadGuy::action_jumpy(double frame_ratio) { - if (fabsf(physic.get_velocity_y()) < 2.5f) - set_sprite(img_jumpy_left_middle, img_jumpy_left_middle, 1); - else if (physic.get_velocity_y() < 0) - set_sprite(img_jumpy_left_up, img_jumpy_left_up, 1); - else - set_sprite(img_jumpy_left_down, img_jumpy_left_down, 1); + 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 + set_sprite(img_jumpy_left_up, img_jumpy_left_up); Player& tux = *World::current()->get_tux(); @@ -411,12 +415,12 @@ BadGuy::action_money(float frame_ratio) // jump when on ground if(dying == DYING_NOT && issolid(base.x, base.y+32)) { - physic.set_velocity(physic.get_velocity_x(), JUMPV); + physic.set_velocity_y(JUMPV); physic.enable_gravity(true); - mode = MONEY_JUMP; + mode = JUMPY_JUMP; } - else if(mode == MONEY_JUMP) + else if(mode == JUMPY_JUMP) { mode = NORMAL; } @@ -434,8 +438,14 @@ BadGuy::action_money(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); @@ -447,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; @@ -460,9 +470,18 @@ BadGuy::action_bomb(float frame_ratio) } else if(!timer.check()) { if(mode == BOMB_TICKING) { mode = BOMB_EXPLODE; - set_sprite(img_mrbomb_explosion, img_mrbomb_explosion, 1); + set_sprite(img_mrbomb_explosion, img_mrbomb_explosion); dying = DYING_NOT; // now the bomb hurts timer.start(EXPLODETIME); + + /* play explosion sound */ // FIXME: is the stereo all right? maybe we should use player cordinates... + if (base.x < scroll_x + screen->w/2 - 10) + play_sound(sounds[SND_EXPLODE], SOUND_LEFT_SPEAKER); + else if (base.x > scroll_x + screen->w/2 + 10) + play_sound(sounds[SND_EXPLODE], SOUND_RIGHT_SPEAKER); + else + play_sound(sounds[SND_EXPLODE], SOUND_CENTER_SPEAKER); + } else if(mode == BOMB_EXPLODE) { remove_me(); return; @@ -475,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(); @@ -503,7 +522,7 @@ BadGuy::action_stalactite(float frame_ratio) timer.start(2000); dying = DYING_SQUISHED; mode = FLAT; - set_sprite(img_stalactite_broken, img_stalactite_broken, 1); + set_sprite(img_stalactite_broken, img_stalactite_broken); } } else if(mode == FLAT) { fall(); @@ -517,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; @@ -528,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; @@ -546,8 +575,7 @@ BadGuy::action_fish(float frame_ratio) else if(mode == FISH_WAIT && !timer.check()) { // jump again - set_sprite(img_fish, img_fish, 2, 2); - animation_offset = global_frame_counter; // restart animation + set_sprite(img_fish, img_fish); mode = NORMAL; physic.set_velocity(0, JUMPV); physic.enable_gravity(true); @@ -562,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; @@ -571,7 +599,7 @@ BadGuy::action_bouncingsnowball(float frame_ratio) // jump when on ground if(dying == DYING_NOT && issolid(base.x, base.y+32)) { - physic.set_velocity(physic.get_velocity_x(), JUMPV); + physic.set_velocity_y(JUMPV); physic.enable_gravity(true); } else @@ -596,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; @@ -604,17 +632,17 @@ BadGuy::action_flyingsnowball(float frame_ratio) // go into flyup mode if none specified yet if(dying == DYING_NOT && mode == NORMAL) { mode = FLY_UP; - physic.set_velocity(physic.get_velocity_x(), FLYINGSPEED); + physic.set_velocity_y(FLYINGSPEED); timer.start(DIRCHANGETIME/2); } if(dying == DYING_NOT && !timer.check()) { if(mode == FLY_UP) { mode = FLY_DOWN; - physic.set_velocity(physic.get_velocity_x(), -FLYINGSPEED); + physic.set_velocity_y(-FLYINGSPEED); } else if(mode == FLY_DOWN) { mode = FLY_UP; - physic.set_velocity(physic.get_velocity_x(), FLYINGSPEED); + physic.set_velocity_y(FLYINGSPEED); } timer.start(DIRCHANGETIME); } @@ -636,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(); @@ -647,7 +681,7 @@ BadGuy::action_spiky(float frame_ratio) 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(), 2); + physic.set_velocity_y(2); } #endif @@ -657,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(); @@ -670,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) @@ -685,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; @@ -694,16 +739,12 @@ BadGuy::action(float frame_ratio) switch (kind) { - case BAD_BSOD: - action_bsod(frame_ratio); - break; - - case BAD_LAPTOP: - action_laptop(frame_ratio); + case BAD_MRICEBLOCK: + action_mriceblock(frame_ratio); break; - case BAD_MONEY: - action_money(frame_ratio); + case BAD_JUMPY: + action_jumpy(frame_ratio); break; case BAD_MRBOMB: @@ -741,6 +782,8 @@ BadGuy::action(float frame_ratio) case BAD_SNOWBALL: action_snowball(frame_ratio); break; + default: + break; } } @@ -753,23 +796,18 @@ BadGuy::draw() if(sprite_left == 0 || sprite_right == 0) { - std::cout << "BadGuy: Error no sprite loaded" << std::endl; return; } - float global_frame = (float(global_frame_counter - animation_offset) / 10); - global_frame *= animation_speed; - //size_t frame = size_t(global_frame) % animation_length; 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 -BadGuy::set_sprite(Sprite* left, Sprite* right, - int nanimlength, float nanimspeed) +BadGuy::set_sprite(Sprite* left, Sprite* right) { if (1) { @@ -797,8 +835,6 @@ BadGuy::set_sprite(Sprite* left, Sprite* right, } } - animation_length = nanimlength; - animation_speed = nanimspeed; animation_offset = 0; sprite_left = left; sprite_right = right; @@ -807,16 +843,19 @@ BadGuy::set_sprite(Sprite* left, Sprite* right, void BadGuy::bump() { - if(kind == BAD_BSOD || kind == BAD_LAPTOP || kind == BAD_MRBOMB - || kind == BAD_BOUNCINGSNOWBALL) { - kill_me(); - } + // these can't be bumped + if(kind == BAD_FLAME || kind == BAD_BOMB || kind == BAD_FISH + || kind == BAD_FLYINGSNOWBALL) + return; + + physic.set_velocity_y(3); + kill_me(25); } void BadGuy::make_player_jump(Player* player) { - player->physic.set_velocity(player->physic.get_velocity_x(), 2); + player->physic.set_velocity_y(2); player->base.y = base.y - player->base.height - 2; } @@ -825,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++; @@ -838,32 +877,27 @@ BadGuy::squish_me(Player* player) void BadGuy::squish(Player* player) { + static const int MAX_ICEBLOCK_SQUICHES = 10; + if(kind == BAD_MRBOMB) { // mrbomb transforms into a bomb now 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, 1); - physic.set_velocity(0, physic.get_velocity_y()); - return; - - } else if (kind == BAD_LAPTOP) { + } else if (kind == BAD_MRICEBLOCK) { if (mode == NORMAL || mode == KICK) { /* Flatten! */ play_sound(sounds[SND_STOMP], SOUND_CENTER_SPEAKER); mode = FLAT; - set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1); - physic.set_velocity(0, physic.get_velocity_y()); + set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right); + physic.set_velocity_x(0); timer.start(4000); } else if (mode == FLAT) { @@ -871,21 +905,29 @@ BadGuy::squish(Player* player) play_sound(sounds[SND_KICK], SOUND_CENTER_SPEAKER); if (player->base.x < base.x + (base.width/2)) { - physic.set_velocity(5, physic.get_velocity_y()); + physic.set_velocity_x(5); dir = RIGHT; } else { - physic.set_velocity(-5, physic.get_velocity_y()); + physic.set_velocity_x(-5); dir = LEFT; } mode = KICK; - set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1); + 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(50); + return; + } + return; } else if(kind == BAD_FISH) { // fish can only be killed when falling down @@ -894,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... @@ -902,55 +944,63 @@ BadGuy::squish(Player* player) return; } else if(kind == BAD_BOUNCINGSNOWBALL) { squish_me(player); - set_sprite(img_bouncingsnowball_squished,img_bouncingsnowball_squished,1); + set_sprite(img_bouncingsnowball_squished,img_bouncingsnowball_squished); return; } else if(kind == BAD_FLYINGSNOWBALL) { squish_me(player); - set_sprite(img_flyingsnowball_squished,img_flyingsnowball_squished,1); + set_sprite(img_flyingsnowball_squished,img_flyingsnowball_squished); return; } else if(kind == BAD_SNOWBALL) { squish_me(player); - set_sprite(img_snowball_squished_left, img_snowball_squished_right, 1); + set_sprite(img_snowball_squished_left, img_snowball_squished_right); return; } } 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; - if(kind == BAD_LAPTOP) - set_sprite(img_laptop_falling_left, img_laptop_falling_right, 1); - else if(kind == BAD_BSOD) - set_sprite(img_bsod_falling_left, img_bsod_falling_right, 1); - + if(kind == BAD_MRICEBLOCK) { + set_sprite(img_mriceblock_falling_left, img_mriceblock_falling_right); + if(mode == HELD) { + mode = NORMAL; + Player& tux = *World::current()->get_tux(); + tux.holding_something = false; + } + } + physic.enable_gravity(true); - physic.set_velocity(physic.get_velocity_x(), 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(); return; } + if(type == COLLISION_SQUISH) { Player* player = static_cast(p_c_object); squish(player); @@ -961,17 +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_LAPTOP && mode == KICK && - pbad_c->kind != BAD_FLAME && pbad_c->kind != BAD_BOMB) + /* 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 kills the enemy too but falls to ground then + else if(kind == BAD_MRICEBLOCK && mode == HELD) + { + pbad_c->kill_me(25); + kill_me(0); } /* Kill badguys that run into exploding bomb */ @@ -979,33 +1049,74 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type) { if (pbad_c->kind == BAD_MRBOMB) { - // FIXME: this is where other MrBombs *should* explode istead of dying - pbad_c->kill_me(); + // mrbomb transforms into a bomb now + explode(pbad_c); + return; } - else if (pbad_c->kind != BAD_BOMB) + 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 */ else { - // Jumpy is an exception - if (pbad_c->kind == BAD_MONEY) + // Jumpy, fish, flame, stalactites are exceptions + if (pbad_c->kind == BAD_JUMPY || pbad_c->kind == BAD_FLAME + || pbad_c->kind == BAD_STALACTITE || pbad_c->kind == BAD_FISH) break; - if (dir == LEFT) - dir = RIGHT; - else if (dir == RIGHT) - dir = LEFT; - physic.inverse_velocity_x(); + // 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) + { + if (pbad_c->dir == LEFT) + { + dir = RIGHT; + physic.set_velocity(fabsf(physic.get_velocity_x()), 2); + } + else if (pbad_c->dir == RIGHT) + { + dir = LEFT; + physic.set_velocity(-fabsf(physic.get_velocity_x()), 2); + } + + break; + } + else if (base.y + base.height > pbad_c->base.y + pbad_c->base.height) + break; + + if (pbad_c->kind != BAD_FLAME) + { + 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())); + } + + } } break; @@ -1019,44 +1130,43 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type) // Hit from left side if (player->base.x < base.x) { - physic.set_velocity(5, physic.get_velocity_y()); + physic.set_velocity_x(5); dir = RIGHT; } // Hit from right side else { - physic.set_velocity(-5, physic.get_velocity_y()); + physic.set_velocity_x(-5); dir = LEFT; } mode = KICK; - set_sprite(img_laptop_flat_left, img_laptop_flat_right, 1); + player->kick_timer.start(KICKING_TIME); + set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right); } break; } } + //--------------------------------------------------------------------------- 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_laptop_flat_left = sprite_manager->load("laptop-flat-left"); - img_laptop_flat_right = sprite_manager->load("laptop-flat-right"); - img_laptop_falling_left = sprite_manager->load("laptop-falling-left"); - img_laptop_falling_right = sprite_manager->load("laptop-falling-right"); - img_bsod_left = sprite_manager->load("bsod-left"); - img_bsod_right = sprite_manager->load("bsod-right"); - img_laptop_left = sprite_manager->load("laptop-left"); - img_laptop_right = sprite_manager->load("laptop-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_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"); @@ -1065,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"); @@ -1072,185 +1184,12 @@ 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"); img_snowball_squished_right = sprite_manager->load("snowball-squished-right"); -#if 0 - /* (BSOD) */ - img_bsod_left[0] = new Surface(datadir + "/images/shared/bsod-left-0.png", USE_ALPHA); - - img_bsod_left[1] = new Surface(datadir + - "/images/shared/bsod-left-1.png", - USE_ALPHA); - - img_bsod_left[2] = new Surface(datadir + - "/images/shared/bsod-left-2.png", - USE_ALPHA); - - img_bsod_left[3] = new Surface(datadir + - "/images/shared/bsod-left-3.png", - USE_ALPHA); - - img_bsod_right[0] = new Surface(datadir + - "/images/shared/bsod-right-0.png", - USE_ALPHA); - - img_bsod_right[1] = new Surface(datadir + - "/images/shared/bsod-right-1.png", - USE_ALPHA); - - img_bsod_right[2] = new Surface(datadir + - "/images/shared/bsod-right-2.png", - USE_ALPHA); - - img_bsod_right[3] = new Surface(datadir + - "/images/shared/bsod-right-3.png", - USE_ALPHA); - - img_bsod_squished_left[0] = new Surface(datadir + - "/images/shared/bsod-squished-left.png", - USE_ALPHA); - - img_bsod_squished_right[0] = new Surface(datadir + - "/images/shared/bsod-squished-right.png", - USE_ALPHA); - - img_bsod_falling_left[0] = new Surface(datadir + - "/images/shared/bsod-falling-left.png", - USE_ALPHA); - - img_bsod_falling_right[0] = new Surface(datadir + - "/images/shared/bsod-falling-right.png", - USE_ALPHA); - - - /* (Laptop) */ - - img_laptop_left[0] = new Surface(datadir + "/images/shared/mriceblock-left-0.png", USE_ALPHA); - img_laptop_left[1] = new Surface(datadir + "/images/shared/mriceblock-left-1.png", USE_ALPHA); - img_laptop_left[2] = new Surface(datadir + "/images/shared/mriceblock-left-2.png", USE_ALPHA); - img_laptop_left[3] = new Surface(datadir + "/images/shared/mriceblock-left-1.png", USE_ALPHA); - - img_laptop_right[0] = new Surface(datadir + "/images/shared/mriceblock-right-0.png", USE_ALPHA); - img_laptop_right[1] = new Surface(datadir + "/images/shared/mriceblock-right-1.png", USE_ALPHA); - img_laptop_right[2] = new Surface(datadir + "/images/shared/mriceblock-right-2.png", USE_ALPHA); - img_laptop_right[3] = new Surface(datadir + "/images/shared/mriceblock-right-1.png", USE_ALPHA); - - img_laptop_flat_left[0] = new Surface( - datadir + "/images/shared/laptop-flat-left.png", - USE_ALPHA); - - img_laptop_flat_right[0] = new Surface(datadir + - "/images/shared/laptop-flat-right.png", - USE_ALPHA); - - img_laptop_falling_left[0] = new Surface(datadir + - "/images/shared/laptop-falling-left.png", - USE_ALPHA); - - img_laptop_falling_right[0] = new Surface(datadir + - "/images/shared/laptop-falling-right.png", - USE_ALPHA); - - - /* (Money) */ - img_jumpy_left_up = new Surface(datadir + - "/images/shared/jumpy-left-up-0.png", - USE_ALPHA); - img_jumpy_left_down = new Surface(datadir + - "/images/shared/jumpy-left-down-0.png", - USE_ALPHA); - img_jumpy_left_middle = new Surface(datadir + - "/images/shared/jumpy-left-middle-0.png", - USE_ALPHA); - - /* Mr. Bomb */ - for(int i=0; i<4; ++i) { - char num[4]; - snprintf(num, 4, "%d", i); - img_mrbomb_left[i] = new Surface( - datadir + "/images/shared/mrbomb-left-" + num + ".png", USE_ALPHA); - img_mrbomb_right[i] = new Surface( - datadir + "/images/shared/mrbomb-right-" + num + ".png", USE_ALPHA); - } - img_mrbomb_ticking_left[0] = new Surface( - datadir + "/images/shared/mrbombx-left-0.png", USE_ALPHA); - img_mrbomb_ticking_right[0] = new Surface( - datadir + "/images/shared/mrbombx-right-0.png", USE_ALPHA); - img_mrbomb_explosion[0] = new Surface( - datadir + "/images/shared/mrbomb-explosion.png", USE_ALPHA); - - /* stalactite */ - img_stalactite[0] = new Surface( - datadir + "/images/shared/stalactite.png", USE_ALPHA); - img_stalactite_broken[0] = new Surface( - datadir + "/images/shared/stalactite-broken.png", USE_ALPHA); - - /* flame */ - img_flame[0] = new Surface( - datadir + "/images/shared/flame-0.png", USE_ALPHA); - img_flame[1] = new Surface( - datadir + "/images/shared/flame-1.png", USE_ALPHA); - - /* fish */ - img_fish[0] = new Surface( - datadir + "/images/shared/fish-left-0.png", USE_ALPHA); - img_fish[1] = new Surface( - datadir + "/images/shared/fish-left-1.png", USE_ALPHA); - img_fish_down[0] = new Surface( - datadir + "/images/shared/fish-down-0.png", USE_ALPHA); - - /* bouncing snowball */ - for(int i=0; i<6; ++i) { - char num[4]; - snprintf(num, 4, "%d", i); - img_bouncingsnowball_left[i] = new Surface( - datadir + "/images/shared/bouncingsnowball-left-" + num + ".png", - USE_ALPHA); - img_bouncingsnowball_right[i] = new Surface( - datadir + "/images/shared/bouncingsnowball-right-" + num + ".png", - USE_ALPHA); - } - img_bouncingsnowball_squished[0] = new Surface( - datadir + "/images/shared/bsod-squished-left.png", USE_ALPHA); - - /* flying snowball */ - img_flyingsnowball[0] = new Surface( - datadir + "/images/shared/flyingsnowball-left-0.png", USE_ALPHA); - img_flyingsnowball[1] = new Surface( - datadir + "/images/shared/flyingsnowball-left-1.png", USE_ALPHA); - img_flyingsnowball_squished[0] = new Surface( - datadir + "/images/shared/bsod-squished-left.png", USE_ALPHA); - - /* spiky */ - for(int i = 0; i < 3; ++i) { - char num[4]; - snprintf(num, 4, "%d", i); - img_spiky_left[i] = new Surface( - datadir + "/images/shared/spiky-left-" + num + ".png", - USE_ALPHA); - img_spiky_right[i] = new Surface( - datadir + "/images/shared/spiky-right-" + num + ".png", - USE_ALPHA); - } - - /** snowball */ - img_snowball_left[0] = new Surface(datadir + "/images/shared/snowball-left-0.png", USE_ALPHA); - img_snowball_left[1] = new Surface(datadir + "/images/shared/snowball-left-1.png", USE_ALPHA); - img_snowball_left[2] = new Surface(datadir + "/images/shared/snowball-left-2.png", USE_ALPHA); - img_snowball_left[3] = new Surface(datadir + "/images/shared/snowball-left-1.png", USE_ALPHA); - - img_snowball_right[0] = new Surface(datadir + "/images/shared/snowball-right-0.png", USE_ALPHA); - img_snowball_right[1] = new Surface(datadir + "/images/shared/snowball-right-1.png", USE_ALPHA); - img_snowball_right[2] = new Surface(datadir + "/images/shared/snowball-right-2.png", USE_ALPHA); - img_snowball_right[3] = new Surface(datadir + "/images/shared/snowball-right-1.png", USE_ALPHA); - - img_snowball_squished_left[0] = new Surface( - datadir + "/images/shared/bsod-squished-left.png", USE_ALPHA); - img_snowball_squished_right[0] = new Surface( - datadir + "/images/shared/bsod-squished-right.png", USE_ALPHA); -#endif } void free_badguy_gfx()