#include <iostream>
#include <cmath>
-#include "globals.h"
+#include "app/globals.h"
#include "defines.h"
+#include "special/sprite_manager.h"
+#include "utils/lispwriter.h"
#include "badguy.h"
#include "tile.h"
#include "resources.h"
-#include "sprite_manager.h"
#include "camera.h"
-#include "lispwriter.h"
#include "level.h"
#include "sector.h"
#include "tilemap.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;
-Sprite* img_stalactite;
-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;
-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;
-Sprite* img_wingling_left;
-Sprite* img_walkingtree_left;
-Sprite* img_walkingtree_left_small;
+#include "statistics.h"
+#include "badguy_specs.h"
#define BADGUY_WALK_SPEED .8f
#define WINGLING_FLY_SPEED 1.6f
BadGuyKind badguykind_from_string(const std::string& str)
{
- if (str == "money" || str == "jumpy") // was money in old maps
+ if (str == "jumpy" || str == "money") // was "money" in ancient versions
return BAD_JUMPY;
- else if (str == "laptop" || str == "mriceblock") // was laptop in old maps
+ else if (str == "mriceblock" || str == "laptop") // was "laptop" in ancient versions
return BAD_MRICEBLOCK;
else if (str == "mrbomb")
return BAD_MRBOMB;
return BAD_FLAME;
else if (str == "fish")
return BAD_FISH;
+ else if (str == "flamefish")
+ return BAD_FLAMEFISH;
else if (str == "bouncingsnowball")
return BAD_BOUNCINGSNOWBALL;
else if (str == "flyingsnowball")
return BAD_FLYINGSNOWBALL;
else if (str == "spiky")
return BAD_SPIKY;
- else if (str == "snowball" || str == "bsod") // was bsod in old maps
+ else if (str == "snowball" || str == "bsod") // was "bsod" in ancient versions
return BAD_SNOWBALL;
else if (str == "wingling")
return BAD_WINGLING;
else if (str == "walkingtree")
return BAD_WALKINGTREE;
+ else if(str == "bomb") // not to be used as a real bad guys
+ return BAD_BOMB;
else
{
return BAD_INVALID;
case BAD_FISH:
return "fish";
break;
+ case BAD_FLAMEFISH:
+ return "flamefish";
+ break;
case BAD_BOUNCINGSNOWBALL:
return "bouncingsnowball";
break;
break;
case BAD_WALKINGTREE:
return "walkingtree";
+ case BAD_BOMB: // not to be used as a real bad guys
+ return "bomb";
+ break;
default:
return "snowball";
}
void
BadGuy::init()
{
- base.x = 0;
- base.y = 0;
- base.width = 0;
- base.height = 0;
+ base.x = start_position.x;
+ base.y = start_position.y;
+ base.width = 32;
+ base.height = 32;
mode = NORMAL;
- dying = DYING_NOT;
old_base = base;
dir = LEFT;
seen = false;
animation_offset = 0;
target.x = target.y = -1;
- sprite_left = sprite_right = 0;
physic.reset();
frozen_timer.init(true);
timer.init(true);
+ specs = badguyspecs_manager->load(badguykind_to_string(kind));
+
// if we're in a solid tile at start correct that now
- if(kind != BAD_FLAME && kind != BAD_FISH && collision_object_map(base))
+ if(Sector::current()) {
+ if(kind != BAD_FLAME && kind != BAD_FISH && kind != BAD_FLAMEFISH && collision_object_map(base))
{
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;
}
-
- if(Sector::current() && Sector::current()->camera) {
- Vector scroll = Sector::current()->camera->get_translation();
-
- if(start_position.x > scroll.x - X_OFFSCREEN_DISTANCE &&
- start_position.x < scroll.x + screen->w + X_OFFSCREEN_DISTANCE &&
- start_position.y > scroll.y - Y_OFFSCREEN_DISTANCE &&
- start_position.y < scroll.y + screen->h + Y_OFFSCREEN_DISTANCE) {
- activate(LEFT);
- }
- } else {
- if(start_position.x > 0 && start_position.x <= screen->w
- && start_position.y > 0 && start_position.y <= screen->h)
- activate(LEFT);
}
}
frozen_timer.init(true);
timer.init(true);
+ dying = DYING_NOT;
+ seen = true;
+
dir = activation_dir;
float dirsign = activation_dir == LEFT ? -1 : 1;
-
+
+ set_action("left", "right");
if(kind == BAD_MRBOMB) {
physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0);
- set_sprite(img_mrbomb_left, img_mrbomb_right);
} else if (kind == BAD_MRICEBLOCK) {
physic.set_velocity(dirsign * 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);
+ set_action("left-up", "right-up");
} else if(kind == BAD_BOMB) {
- set_sprite(img_mrbomb_ticking_left, img_mrbomb_ticking_right);
+ set_action("ticking-left", "ticking-right");
// hack so that the bomb doesn't hurt until it expldes...
dying = DYING_SQUISHED;
} else if(kind == BAD_FLAME) {
angle = 0;
physic.enable_gravity(false);
- set_sprite(img_flame, img_flame);
+ set_action("normal", "normal");
} else if(kind == BAD_BOUNCINGSNOWBALL) {
physic.set_velocity(dirsign * 1.3, 0);
- set_sprite(img_bouncingsnowball_left, img_bouncingsnowball_right);
} else if(kind == BAD_STALACTITE) {
physic.enable_gravity(false);
- set_sprite(img_stalactite, img_stalactite);
+ set_action("normal", "normal");
} else if(kind == BAD_FISH) {
- set_sprite(img_fish, img_fish);
+ set_action("normal", "normal");
+ physic.enable_gravity(true);
+ } else if(kind == BAD_FLAMEFISH) {
+ set_action("normal", "normal");
physic.enable_gravity(true);
} else if(kind == BAD_FLYINGSNOWBALL) {
- set_sprite(img_flyingsnowball, img_flyingsnowball);
physic.enable_gravity(false);
} else if(kind == BAD_SPIKY) {
physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0);
- set_sprite(img_spiky_left, img_spiky_right);
} else if(kind == BAD_SNOWBALL) {
physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0);
- set_sprite(img_snowball_left, img_snowball_right);
} else if(kind == BAD_WINGLING) {
physic.set_velocity(dirsign * WINGLING_FLY_SPEED, 0);
physic.enable_gravity(false);
- set_sprite(img_wingling_left, img_wingling_left);
+ set_action("left", "left");
} else if (kind == BAD_WALKINGTREE) {
- // TODO: why isn't the height/width being set properly in set_sprite?
+ // TODO: why isn't the height/width being set properly in set_action?
physic.set_velocity(dirsign * BADGUY_WALK_SPEED, 0);
mode = BGM_BIG;
- set_sprite(img_walkingtree_left, img_walkingtree_left);
+ set_action("left", "left");
base.width = 66;
base.height = 66;
}
+}
- base.x = start_position.x;
- base.y = start_position.y;
- old_base = base;
- seen = true;
+Surface*
+BadGuy::get_image()
+{
+// Set action as the "default" one.
+specs->sprite->set_action("left");
+if(BAD_JUMPY)
+ specs->sprite->set_action("left-up");
+else if(kind == BAD_BOMB)
+ specs->sprite->set_action("ticking-left");
+else if(kind == BAD_FLAME)
+ specs->sprite->set_action("normal");
+else if(kind == BAD_STALACTITE)
+ specs->sprite->set_action("normal");
+else if(kind == BAD_FISH)
+ specs->sprite->set_action("normal");
+else if(kind == BAD_FLAMEFISH)
+ specs->sprite->set_action("normal");
+
+return specs->sprite->get_frame(0);
}
void
if (mode != HELD)
{
// move
- physic.apply(elapsed_time, base.x, base.y);
+ physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
if (dying != DYING_FALLING)
collision_swept_object_map(&old_base,&base);
}
{ /* FIXME: The pbad object shouldn't know about pplayer objects. */
/* If we're holding the iceblock */
dir = tux.dir;
- if(dir==RIGHT)
+ if(tux.size == SMALL)
{
- base.x = tux.base.x + 16;
- base.y = tux.base.y + tux.base.height/1.5 - base.height;
+ if(dir == RIGHT)
+ base.x = tux.base.x + 24;
+ else // dir == LEFT
+ base.x = tux.base.x - 12;
+ base.y = tux.base.y + tux.base.height/1.5 - base.height;
}
- else /* facing left */
+ else // TUX == BIG
{
- base.x = tux.base.x - 16;
- base.y = tux.base.y + tux.base.height/1.5 - base.height;
+ if(dir == RIGHT)
+ base.x = tux.base.x + 24;
+ else // dir == LEFT
+ base.x = tux.base.x - 4;
+ base.y = tux.base.y + tux.base.height/1.5 - base.height;
}
+
if(collision_object_map(base))
{
base.x = tux.base.x;
if(tux.input.fire != DOWN) /* SHOOT! */
{
if(dir == LEFT)
- base.x -= 24;
+ base.x = tux.base.x - base.width;
else
- base.x += 24;
+ base.x = tux.base.x + tux.base.width;
old_base = base;
mode=KICK;
tux.kick_timer.start(KICKING_TIME);
- set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
+ set_action("flat-left", "flat-right");
physic.set_velocity_x((dir == LEFT) ? -3.5 : 3.5);
- sound_manager->play_sound(sounds[SND_KICK], this);
+ SoundManager::get()->play_sound(IDToSound(SND_KICK), this, Sector::current()->player->get_pos());
}
}
check_horizontal_bump();
if(mode == KICK && changed != dir)
{
- sound_manager->play_sound(sounds[SND_RICOCHET], get_pos());
+ SoundManager::get()->play_sound(IDToSound(SND_RICOCHET), get_pos(), Sector::current()->player->get_pos());
}
}
if(!timer.check())
{
mode = NORMAL;
- set_sprite(img_mriceblock_left, img_mriceblock_right);
+ set_action("left", "right");
physic.set_velocity( (dir == LEFT) ? -.8 : .8, 0);
}
}
BadGuy::check_horizontal_bump(bool checkcliff)
{
float halfheight = base.height / 2;
- if (dir == LEFT && issolid( base.x, (int) base.y + halfheight))
+ if (dir == LEFT && issolid( base.x, base.y + halfheight))
{
if (kind == BAD_MRICEBLOCK && mode == KICK)
+ {
Sector::current()->trybreakbrick(Vector(base.x, base.y + halfheight), false);
+ Sector::current()->tryemptybox(Vector(base.x, base.y + halfheight), dir);
+ }
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 (dir == RIGHT && issolid( base.x + base.width, base.y + halfheight))
{
if (kind == BAD_MRICEBLOCK && mode == KICK)
+ {
Sector::current()->trybreakbrick(
- Vector(base.x + base.width, (int) base.y + halfheight), false);
+ Vector(base.x + base.width, base.y + halfheight), false);
+ Sector::current()->tryemptybox(
+ Vector(base.x + base.width, base.y + halfheight), dir);
+ }
dir = LEFT;
physic.set_velocity(-physic.get_velocity_x(), physic.get_velocity_y());
{
if(frozen_timer.check())
{
- set_sprite(img_jumpy_left_iced, img_jumpy_left_iced);
+ set_action("left-iced", "right-iced");
return;
}
// 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);
+ set_action("left-down", "right-down");
else if (fabsf(vy) > 5.3f)
- set_sprite(img_jumpy_left_middle, img_jumpy_left_middle);
+ set_action("left-middle", "right-middle");
else
- set_sprite(img_jumpy_left_up, img_jumpy_left_up);
+ set_action("left-up", "right-up");
Player& tux = *Sector::current()->player;
}
// set direction based on tux
- if(tux.base.x > base.x)
- dir = RIGHT;
- else
- dir = LEFT;
+ if(dying == DYING_NOT)
+ {
+ if(tux.base.x > base.x)
+ dir = RIGHT;
+ else
+ dir = LEFT;
+ }
// move
- physic.apply(elapsed_time, base.x, base.y);
+ physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
if(dying == DYING_NOT)
collision_swept_object_map(&old_base, &base);
}
{
if(frozen_timer.check())
{
- set_sprite(img_mrbomb_iced_left, img_mrbomb_iced_right);
+ set_action("iced-left", "iced-right");
return;
}
fall();
- physic.apply(elapsed_time, base.x, base.y);
+ physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
if (dying != DYING_FALLING)
collision_swept_object_map(&old_base,&base);
}
} else if(!timer.check()) {
if(mode == BOMB_TICKING) {
mode = BOMB_EXPLODE;
- set_sprite(img_mrbomb_explosion, img_mrbomb_explosion);
+ set_action("explosion", "explosion");
dying = DYING_NOT; // now the bomb hurts
timer.start(EXPLODETIME);
- sound_manager->play_sound(sounds[SND_EXPLODE], this);
+ SoundManager::get()->play_sound(IDToSound(SND_EXPLODE), this, Sector::current()->player->get_pos());
} else if(mode == BOMB_EXPLODE) {
remove_me();
return;
}
// move
- physic.apply(elapsed_time, base.x, base.y);
+ physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
collision_swept_object_map(&old_base,&base);
}
timer.start(2000);
dying = DYING_SQUISHED;
mode = FLAT;
- set_sprite(img_stalactite_broken, img_stalactite_broken);
+ set_action("broken", "broken");
}
} else if(mode == FLAT) {
fall();
}
// move
- physic.apply(elapsed_time, base.x, base.y);
+ physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
if(dying == DYING_SQUISHED && !timer.check())
remove_me();
if(frozen_timer.check())
{
if(physic.get_velocity_y() < 0)
- set_sprite(img_fish_iced_down, img_fish_iced_down);
+ set_action("iced-down", "iced-down");
else
- set_sprite(img_fish_iced, img_fish_iced);
+ set_action("iced", "iced");
return;
}
&& physic.get_velocity_y() <= 0 && mode == NORMAL)
{
mode = FISH_WAIT;
- set_sprite(0, 0);
+ set_action("hide", "hide");
physic.set_velocity(0, 0);
physic.enable_gravity(false);
timer.start(WAITTIME);
else if(mode == FISH_WAIT && !timer.check())
{
// jump again
- set_sprite(img_fish, img_fish);
+ set_action("normal", "normal");
mode = NORMAL;
physic.set_velocity(0, JUMPV);
physic.enable_gravity(true);
}
- physic.apply(elapsed_time, base.x, base.y);
+ physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
if(dying == DYING_NOT)
collision_swept_object_map(&old_base, &base);
if(physic.get_velocity_y() < 0)
- set_sprite(img_fish_down, img_fish_down);
+ {
+ set_action("down", "down");
+ }
}
void
// check for right/left collisions
check_horizontal_bump();
- physic.apply(elapsed_time, base.x, base.y);
+ physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
if(dying == DYING_NOT)
collision_swept_object_map(&old_base, &base);
if(dying != DYING_NOT)
physic.enable_gravity(true);
- physic.apply(elapsed_time, base.x, base.y);
+ physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
if(dying == DYING_NOT || dying == DYING_SQUISHED)
collision_swept_object_map(&old_base, &base);
+ if(dying == DYING_NOT)
+ {
+ // set direction based on tux
+ if(Sector::current()->player->base.x > base.x)
+ dir = RIGHT;
+ else
+ dir = LEFT;
+ }
+
// Handle dying timer:
if (dying == DYING_SQUISHED && !timer.check())
remove_me();
{
if(frozen_timer.check())
{
- set_sprite(img_spiky_iced_left, img_spiky_iced_right);
+ set_action("iced-left", "iced-right");
return;
}
check_horizontal_bump();
fall();
-#if 0
- // 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_y(2);
- }
-#endif
- physic.apply(elapsed_time, base.x, base.y);
+ physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
if (dying != DYING_FALLING)
collision_swept_object_map(&old_base,&base);
}
fall();
- physic.apply(elapsed_time, base.x, base.y);
+ // 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_y(2);
+ }
+
+ physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
if (dying != DYING_FALLING)
collision_swept_object_map(&old_base,&base);
physic.set_velocity(dirsign * WINGLING_FLY_SPEED, 0);
}
- physic.apply(elapsed_time, base.x, base.y);
+ physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
// Handle dying timer:
void
BadGuy::action_walkingtree(double elapsed_time)
{
- Player& tux = *Sector::current()->player;
- Direction v_dir = physic.get_velocity_x() < 0 ? LEFT : RIGHT;
-
if (dying == DYING_NOT)
check_horizontal_bump();
fall();
- if (mode == BGM_BIG && tux.dying == DYING_NOT)
- {
- if ((tux.base.x + tux.base.width/2 > base.x + base.width/2) && v_dir == LEFT)
- {
- dir = RIGHT;
- physic.set_velocity_x(-physic.get_velocity_x());
- }
- else if ((tux.base.x + tux.base.width/2 < base.x + base.width/2) && v_dir == RIGHT)
- {
- dir = LEFT;
- physic.set_velocity_x(-physic.get_velocity_x());
- }
- }
-
-
- physic.apply(elapsed_time, base.x, base.y);
+ physic.apply(elapsed_time, base.x, base.y, Sector::current()->gravity);
if (dying != DYING_FALLING)
collision_swept_object_map(&old_base,&base);
kill_me(0);
}
- if(!seen) {
- /* activate badguys if they're just inside the offscreen_distance around the
- * screen. Don't activate them inside the screen, since that might have the
- * effect of badguys suddenly popping up from nowhere
+ if(!seen)
+ {
+ /* Activate badguys if they're just around the screen to avoid
+ * the effect of having badguys suddenly popping up from nowhere.
*/
if (start_position.x > scroll_x - X_OFFSCREEN_DISTANCE &&
- start_position.x < scroll_x - base.width)
+ start_position.x < scroll_x - base.width &&
+ start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
+ start_position.y < scroll_y + screen->h + Y_OFFSCREEN_DISTANCE)
activate(RIGHT);
- else if(start_position.x > scroll_y - Y_OFFSCREEN_DISTANCE &&
- start_position.y < scroll_y - base.height)
- activate(LEFT);
- else if(start_position.x > scroll_x + screen->w &&
- start_position.x < scroll_x + screen->w + X_OFFSCREEN_DISTANCE)
- activate(LEFT);
- else if(start_position.y > scroll_y + screen->h &&
+ else if (start_position.x > scroll_x + screen->w &&
+ start_position.x < scroll_x + screen->w + X_OFFSCREEN_DISTANCE &&
+ start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
start_position.y < scroll_y + screen->h + Y_OFFSCREEN_DISTANCE)
activate(LEFT);
- } else {
+ else if (start_position.x > scroll_x - X_OFFSCREEN_DISTANCE &&
+ start_position.x < scroll_x + screen->w + X_OFFSCREEN_DISTANCE &&
+ ((start_position.y > scroll_y + screen->h &&
+ start_position.y < scroll_y + screen->h + Y_OFFSCREEN_DISTANCE) ||
+ (start_position.y > scroll_y - Y_OFFSCREEN_DISTANCE &&
+ start_position.y < scroll_y)))
+ {
+ if(start_position.x < scroll_x - screen->w/2)
+ activate(RIGHT);
+ else
+ activate(LEFT);
+ }
+ /* Special case for badguys on start of the level.
+ * If in the future, it's possible to set Tux start pos, this case
+ * should contemplate that. */
+ else if (start_position.x > 0 && start_position.x < screen->w &&
+ start_position.y > 0 && start_position.y < screen->h)
+ activate(LEFT);
+ }
+ else
+ {
if(base.x + base.width < scroll_x - X_OFFSCREEN_DISTANCE*4
|| base.x > scroll_x + screen->w + X_OFFSCREEN_DISTANCE*4
|| base.y + base.height < scroll_y - Y_OFFSCREEN_DISTANCE*4
- || base.y > scroll_y + screen->h + Y_OFFSCREEN_DISTANCE*4) {
+ || base.y > scroll_y + screen->h + Y_OFFSCREEN_DISTANCE*4)
+ {
seen = false;
if(dying != DYING_NOT)
remove_me();
+ }
}
- }
-
+
if(!seen)
return;
break;
case BAD_FISH:
+ case BAD_FLAMEFISH:
action_fish(elapsed_time);
break;
void
BadGuy::draw(DrawingContext& context)
{
- Sprite* sprite = (dir == LEFT) ? sprite_left : sprite_right;
- if(sprite == 0)
+ if(!seen)
+ return;
+
+ if((dir == LEFT && action_left == "hide") ||
+ (dir == RIGHT && action_right == "hide"))
return;
+ if(dir == LEFT)
+ specs->sprite->set_action(action_left);
+ else // if(dir == RIGHT)
+ specs->sprite->set_action(action_right);
+
if(dying == DYING_FALLING && physic.get_velocity_y() < 0)
- sprite->draw(context, Vector(base.x, base.y), LAYER_FOREGROUNDTILES+1, VERTICAL_FLIP);
+ specs->sprite->draw(context, Vector(base.x, base.y), LAYER_FOREGROUNDTILES+1, VERTICAL_FLIP);
else
- sprite->draw(context, Vector(base.x, base.y), LAYER_OBJECTS);
+ specs->sprite->draw(context, Vector(base.x, base.y), LAYER_OBJECTS);
if(debug_mode)
context.draw_filled_rect(Vector(base.x, base.y),
}
void
-BadGuy::set_sprite(Sprite* left, Sprite* right)
+BadGuy::set_action(std::string left, std::string right)
{
+ base.width = 32;
+ base.height = 32;
+
+ action_left = left;
+ action_right = right;
+
+#if 0
if (1)
{
base.width = 32;
else
{
// FIXME: Using the image size for the physics and collision is
- // a bad idea, since images should always overlap there physical
+ // a bad idea, since images should always overlap their physical
// representation
if(left != 0) {
if(base.width == 0 && base.height == 0) {
animation_offset = 0;
sprite_left = left;
sprite_right = right;
+#endif
}
void
{
// these can't be bumped
if(kind == BAD_FLAME || kind == BAD_BOMB || kind == BAD_FISH
- || kind == BAD_FLYINGSNOWBALL)
+ || kind == BAD_FLAMEFISH || kind == BAD_FLYINGSNOWBALL)
return;
physic.set_velocity_y(3);
void
BadGuy::squish_me(Player* player)
{
- player->bounce();
+ player->bounce(this);
Sector::current()->add_score(Vector(base.x, base.y),
- 50 * player_status.score_multiplier);
+ 25 * player_status.score_multiplier);
- sound_manager->play_sound(sounds[SND_SQUISH], get_pos());
+ SoundManager::get()->play_sound(IDToSound(SND_SQUISH), get_pos(), Sector::current()->player->get_pos());
player_status.score_multiplier++;
dying = DYING_SQUISHED;
// mrbomb transforms into a bomb now
explode(false);
- player->bounce();
+ player->bounce(this);
Sector::current()->add_score(Vector(base.x, base.y),
- 50 * player_status.score_multiplier);
- sound_manager->play_sound(sounds[SND_SQUISH], get_pos());
+ 25 * player_status.score_multiplier);
+ SoundManager::get()->play_sound(IDToSound(SND_SQUISH), get_pos(), Sector::current()->player->get_pos());
+
player_status.score_multiplier++;
return;
if (mode == NORMAL || mode == KICK)
{
/* Flatten! */
- sound_manager->play_sound(sounds[SND_STOMP], get_pos());
+ SoundManager::get()->play_sound(IDToSound(SND_STOMP), get_pos(), Sector::current()->player->get_pos());
mode = FLAT;
- set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
+ set_action("flat-left", "flat-right");
physic.set_velocity_x(0);
timer.start(4000);
} else if (mode == FLAT) {
/* Kick! */
- sound_manager->play_sound(sounds[SND_KICK], this);
+ SoundManager::get()->play_sound(IDToSound(SND_KICK), this, Sector::current()->player->get_pos());
if (player->base.x < base.x + (base.width/2)) {
physic.set_velocity_x(5);
mode = KICK;
player->kick_timer.start(KICKING_TIME);
- set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
+ set_action("flat-left", "flat-right");
}
- player->bounce();
+ player->bounce(this);
player_status.score_multiplier++;
}
return;
- } else if(kind == BAD_FISH) {
+ } else if(kind == BAD_FISH || kind == BAD_FLAMEFISH) {
// fish can only be killed when falling down
if(physic.get_velocity_y() >= 0)
return;
- player->bounce();
+ player->bounce(this);
Sector::current()->add_score(Vector(base.x, base.y),
25 * player_status.score_multiplier);
+
player_status.score_multiplier++;
// simply remove the fish...
return;
} else if(kind == BAD_BOUNCINGSNOWBALL) {
squish_me(player);
- set_sprite(img_bouncingsnowball_squished,img_bouncingsnowball_squished);
+ set_action("squished", "squished");
return;
} else if(kind == BAD_FLYINGSNOWBALL) {
squish_me(player);
- set_sprite(img_flyingsnowball_squished,img_flyingsnowball_squished);
+ set_action("squished-left", "squished-right");
return;
} else if(kind == BAD_SNOWBALL) {
squish_me(player);
- set_sprite(img_snowball_squished_left, img_snowball_squished_right);
+ set_action("squished-left", "squished-right");
return;
} else if(kind == BAD_WINGLING) {
squish_me(player);
- set_sprite(img_wingling_left, img_wingling_left);
+ set_action("left", "right");
} else if(kind == BAD_WALKINGTREE) {
if (mode == BGM_BIG)
{
- set_sprite(img_walkingtree_left_small, img_walkingtree_left_small);
+ set_action("left-small", "left-small");
physic.set_velocity_x(physic.get_velocity_x() * 2.0f);
+
+ /* Move to the player's direction */
+ if(dir != Sector::current()->player->dir)
+ physic.set_velocity_x(-physic.get_velocity_x());
+ dir = Sector::current()->player->dir;
+
// XXX magic number: 66 is BGM_BIG height
- player->bounce();
+ player->bounce(this);
base.y += 66 - base.height;
-
+
Sector::current()->add_score(Vector(base.x, base.y),
25 * player_status.score_multiplier);
player_status.score_multiplier++;
if(kind == BAD_BOMB)
return;
+ if(mode != HELD)
+ global_stats.add_points(BADGUYS_KILLED_STAT, 1);
+
dying = DYING_FALLING;
if(kind == BAD_MRICEBLOCK) {
- set_sprite(img_mriceblock_falling_left, img_mriceblock_falling_right);
+ set_action("falling-left", "falling-right");
if(mode == HELD) {
mode = NORMAL;
Player& tux = *Sector::current()->player;
score * player_status.score_multiplier);
/* Play death sound: */
- sound_manager->play_sound(sounds[SND_FALL], this);
+ SoundManager::get()->play_sound(IDToSound(SND_FALL), this, Sector::current()->player->get_pos());
}
void
BadGuy::explode(bool right_way)
{
- BadGuy *badguy = Sector::current()->add_bad_guy(base.x, base.y, BAD_BOMB);
+ BadGuy *badguy = Sector::current()->add_bad_guy(base.x, base.y, BAD_BOMB, true);
if(right_way)
{
badguy->timer.start(0);
badguy->mode = BOMB_TICKING;
}
+ badguy->dir = dir;
remove_me();
}
if(pbullet_c->kind == FIRE_BULLET)
{
- if (kind != BAD_BOMB && kind != BAD_STALACTITE && kind != BAD_FLAME)
+ if (kind != BAD_BOMB && kind != BAD_STALACTITE && kind != BAD_FLAME
+ && kind != BAD_FLAMEFISH)
kill_me(10);
}
else if(pbullet_c->kind == ICE_BULLET)
{
- //if(kind == BAD_FLAME)
- // kill_me(10);
- //else
+ if(kind == BAD_FLAME || kind == BAD_FLAMEFISH)
+ kill_me(10);
+ else
frozen_timer.start(FROZEN_TIME);
}
break;
pbad_c->explode(true);
return;
}
- else if (pbad_c->kind != BAD_MRBOMB)
+ else
{
pbad_c->kill_me(50);
}
// Jumpy, fish, flame, stalactites, wingling are exceptions
if (pbad_c->kind == BAD_JUMPY || pbad_c->kind == BAD_FLAME
- || pbad_c->kind == BAD_STALACTITE || pbad_c->kind == BAD_FISH)
+ || pbad_c->kind == BAD_STALACTITE || pbad_c->kind == BAD_FISH
+ || pbad_c->kind == BAD_FLAMEFISH)
break;
// Bounce off of other badguy if we land on top of him
dir = RIGHT;
physic.set_velocity_x(fabsf(physic.get_velocity_x()));
- // in case badguys get "jammed"
+ // Put bad guys a part (or they get jammed)
+ // only needed to do to one of them
if (physic.get_velocity_x() != 0)
- base.x = pbad_c->base.x + pbad_c->base.width;
+ base.x = pbad_c->base.x + pbad_c->base.width + 1;
}
else if (dir == RIGHT)
{
/* Get kicked if were flat */
if (mode == FLAT && !dying)
{
- sound_manager->play_sound(sounds[SND_KICK], this);
+ SoundManager::get()->play_sound(IDToSound(SND_KICK), this, Sector::current()->player->get_pos());
// Hit from left side
if (player->base.x < base.x) {
mode = KICK;
player->kick_timer.start(KICKING_TIME);
- set_sprite(img_mriceblock_flat_left, img_mriceblock_flat_right);
+ set_action("flat-left", "flat-right");
}
break;
}
}
-
-//---------------------------------------------------------------------------
-
-void load_badguy_gfx()
-{
- 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");
- img_stalactite = sprite_manager->load("stalactite");
- img_stalactite_broken = sprite_manager->load("stalactite-broken");
- 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");
- img_flyingsnowball = sprite_manager->load("flyingsnowball");
- 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");
- img_wingling_left = sprite_manager->load("wingling-left");
- img_walkingtree_left = sprite_manager->load("walkingtree-left");
- img_walkingtree_left_small = sprite_manager->load("walkingtree-left-small");
-}
-
-void free_badguy_gfx()
-{
-}
-
// EOF //
projects / supertux.git / blobdiff