- added spikes

[supertux.git] / src / badguy.cpp

diff --git a/src/badguy.cpp b/src/badguy.cpp
index 78927ee..7b8db66 100644 (file)
--- a/src/badguy.cpp
+++ b/src/badguy.cpp
@@ -32,6 +32,7 @@
 #include "tile.h"
 #include "resources.h"
 #include "sprite_manager.h"
+#include "gameloop.h"
 
 Sprite* img_mriceblock_flat_left;
 Sprite* img_mriceblock_flat_right;
@@ -42,8 +43,11 @@ 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;
@@ -52,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;
@@ -59,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;
@@ -151,6 +159,7 @@ 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();
@@ -288,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;
@@ -376,6 +391,12 @@ BadGuy::remove_me()
 void
 BadGuy::action_jumpy(double frame_ratio)
 {
+  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
@@ -419,6 +440,12 @@ BadGuy::action_jumpy(double frame_ratio)
 void
 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);
 
@@ -522,6 +549,16 @@ BadGuy::action_flame(double frame_ratio)
 void
 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;
     
@@ -629,6 +666,12 @@ BadGuy::action_flyingsnowball(double frame_ratio)
 void
 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();
 
@@ -676,6 +719,17 @@ BadGuy::action(double 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;
@@ -749,7 +803,7 @@ BadGuy::draw()
   sprite->draw(base.x, base.y);
 
   if (debug_mode)
-    fillrect(base.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
@@ -906,7 +960,7 @@ BadGuy::squish(Player* player)
 void
 BadGuy::kill_me(int score)
 {
-  if(kind == BAD_BOMB || kind == BAD_STALACTITE || kind == BAD_FLAME)
+  if(kind == BAD_BOMB)
     return;
 
   dying = DYING_FALLING;
@@ -918,10 +972,11 @@ BadGuy::kill_me(int score)
       tux.holding_something = false;
     }
   }
-  
+
   physic.enable_gravity(true);
 
   /* Gain some points: */
+  if (score != 0)
     World::current()->add_score(base.x, base.y,
                     score * player_status.score_multiplier);
 
@@ -939,6 +994,7 @@ 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();
@@ -955,19 +1011,33 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
   switch (c_object)
     {
     case CO_BULLET:
-      kill_me(10);
+      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(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(25);
@@ -1024,8 +1094,6 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
             physic.set_velocity(-fabsf(physic.get_velocity_x()), 2);
           }
 
-
-
           break;
         }
         else if (base.y + base.height > pbad_c->base.y + pbad_c->base.height)
@@ -1037,6 +1105,10 @@ BadGuy::collision(void *p_c_object, int c_object, CollisionType type)
             {
               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)
             {
@@ -1090,8 +1162,11 @@ void load_badguy_gfx()
   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");
@@ -1100,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");
@@ -1107,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");