#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;
+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;
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")
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;
}
}
{
switch(kind)
{
- case BAD_MONEY:
- return "money";
+ case BAD_JUMPY:
+ return "jumpy";
break;
- case BAD_LAPTOP:
- return "laptop";
- break;
- case BAD_BSOD:
- return "bsod";
+ case BAD_MRICEBLOCK:
+ return "mriceblock";
break;
case BAD_MRBOMB:
return "mrbomb";
return "snowball";
break;
default:
- return "bsod";
+ return "snowball";
}
}
BadGuy::BadGuy(float x, float y, BadGuyKind kind_, bool stay_on_platform_)
- : removable(false)
+ : removable(false), squishcount(0)
{
base.x = x;
base.y = y;
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_LAPTOP) {
+ } else if (kind == BAD_MRICEBLOCK) {
physic.set_velocity(-BADGUY_WALK_SPEED, 0);
- set_sprite(img_laptop_left, img_laptop_right);
- } else if(kind == BAD_MONEY) {
+ 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);
}
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())
- {
- /* Remove it if time's up: */
- remove_me();
- return;
- }
-
- // 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(float frame_ratio)
{
Player& tux = *World::current()->get_tux();
}
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)
{
mode=KICK;
tux.kick_timer.start(KICKING_TIME);
- set_sprite(img_laptop_flat_left, img_laptop_flat_right);
+ 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);
}
if(!timer.check())
{
mode = NORMAL;
- set_sprite(img_laptop_left, img_laptop_right);
+ set_sprite(img_mriceblock_left, img_mriceblock_right);
physic.set_velocity( (dir == LEFT) ? -.8 : .8, 0);
}
}
}
void
-BadGuy::action_money(float frame_ratio)
+BadGuy::action_jumpy(float frame_ratio)
{
if (fabsf(physic.get_velocity_y()) < 2.5f)
set_sprite(img_jumpy_left_middle, img_jumpy_left_middle);
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;
}
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:
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)
+ return;
+
+ kill_me(25);
}
void
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);
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_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);
+ set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
physic.set_velocity_x(0);
timer.start(4000);
}
mode = KICK;
- set_sprite(img_laptop_flat_left, img_laptop_flat_right);
+ 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
}
void
-BadGuy::kill_me()
+BadGuy::kill_me(int score)
{
if(kind == BAD_BOMB || kind == BAD_STALACTITE || kind == BAD_FLAME)
return;
dying = DYING_FALLING;
- if(kind == BAD_LAPTOP)
- set_sprite(img_laptop_falling_left, img_laptop_falling_right);
- else if(kind == BAD_BSOD)
- set_sprite(img_bsod_falling_left, img_bsod_falling_right);
+ 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_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);
+ score * player_status.score_multiplier);
/* Play death sound: */
play_sound(sounds[SND_FALL], SOUND_CENTER_SPEAKER);
switch (c_object)
{
case CO_BULLET:
- kill_me();
+ kill_me(10);
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(kind == BAD_MRICEBLOCK && mode == KICK)
+ {
+ pbad_c->kill_me(25);
+ }
+
+ // a held mriceblock gets kills the enemy too but falls to ground then
+ else if(kind == BAD_MRICEBLOCK && mode == HELD)
{
- pbad_c->kill_me();
+ pbad_c->kill_me(25);
+ kill_me(0);
}
/* Kill badguys that run into exploding bomb */
{
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
+ World::current()->add_bad_guy(pbad_c->base.x, pbad_c->base.y,
+ BAD_BOMB);
+ pbad_c->remove_me();
+ 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();
+ 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;
// Bounce off of other badguy if we land on top of him
else if (base.y + base.height > pbad_c->base.y + pbad_c->base.height)
break;
- if (dir == LEFT)
- dir = RIGHT;
- else if (dir == RIGHT)
- dir = LEFT;
-
- physic.inverse_velocity_x();
+ if (pbad_c->kind != BAD_FLAME)
+ {
+ if (dir == LEFT)
+ dir = RIGHT;
+ else if (dir == RIGHT)
+ dir = LEFT;
+
+ physic.inverse_velocity_x();
+ }
}
break;
}
mode = KICK;
- set_sprite(img_laptop_flat_left, img_laptop_flat_right);
+ 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");
projects / supertux.git / blobdiff