#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_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;
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")
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;
}
}
case BAD_MRICEBLOCK:
return "mriceblock";
break;
- case BAD_BSOD:
- return "bsod";
- break;
case BAD_MRBOMB:
return "mrbomb";
break;
return "snowball";
break;
default:
- return "bsod";
+ return "snowball";
}
}
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) {
}
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_mriceblock(float frame_ratio)
{
Player& tux = *World::current()->get_tux();
switch (kind)
{
- case BAD_BSOD:
- action_bsod(frame_ratio);
- break;
-
case BAD_MRICEBLOCK:
action_mriceblock(frame_ratio);
break;
if(kind == BAD_FLAME || kind == BAD_BOMB || kind == BAD_FISH)
return;
- kill_me();
+ kill_me(25);
}
void
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)
{
}
mode = KICK;
+ player->kick_timer.start(KICKING_TIME);
set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
}
make_player_jump(player);
- if((kind != BAD_MRICEBLOCK && mode != dying))
- {
- World::current()->add_score(base.x - scroll_x, base.y, 25 * player_status.score_multiplier);
- 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;
}
}
void
-BadGuy::kill_me()
+BadGuy::kill_me(int score)
{
if(kind == BAD_BOMB || kind == BAD_STALACTITE || kind == BAD_FLAME)
return;
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);
+ 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:
/* If we're a kicked mriceblock, kill any badguys we hit */
if(kind == BAD_MRICEBLOCK && mode == KICK)
{
- pbad_c->kill_me();
+ 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();
- kill_me();
+ pbad_c->kill_me(25);
+ kill_me(0);
}
/* Kill badguys that run into exploding 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 */
}
mode = KICK;
+ 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_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");
projects / supertux.git / blobdiff