Fix granito bugs

src/badguy/badguy.hpp

@@ -146,6 +146,8 @@ class BadGuy : public MovingSprite,
 
   bool is_in_water() const;
 
+  virtual bool is_heavy() const { return false; }
+
   /** Get melting particle sprite filename */
   virtual std::string get_water_sprite() const {
     return "images/objects/water_drop/water_drop.sprite";

src/badguy/granito.cpp

@@ -36,7 +36,7 @@ Granito::Granito(const ReaderMapping& reader, const std::string& sprite_name, in
   parse_type(reader);
 
   walk_speed = 0;
-  max_drop_height = 600;
+  set_ledge_behavior(LedgeBehavior::NORMAL);
 
   m_countMe = false;
 
@@ -215,7 +215,8 @@ Granito::collision(GameObject& other, const CollisionHit& hit)
 
   if (hit.bottom)
   {
-    if (m_state == STATE_SIT) return WalkingBadguy::collision(other, hit);
+    if (m_state == STATE_SIT)
+      return WalkingBadguy::collision(other, hit);
 
     // Yo big granito can i sit on top of your head?
     GranitoBig* granito = dynamic_cast<GranitoBig*>(&other);
@@ -240,7 +241,7 @@ Granito::collision(GameObject& other, const CollisionHit& hit)
     Sector::get().run_script(m_carried_script, "carried-script");
   }
 
-  return WalkingBadguy::collision(other, hit);
+  return FORCE_MOVE;
 }
 
 void
@@ -330,13 +331,11 @@ Granito::initialize()
 
   if (m_type == WALK)
   {
-    m_original_state = STATE_WALK;
-    restore_original_state();
+    walk();
   }
   else if (m_type == SIT)
   {
-    m_original_state = STATE_SIT;
-    restore_original_state();
+    sit();
   }
 
   switch (m_type)

src/badguy/granito.hpp

@@ -56,6 +56,7 @@ class Granito : public WalkingBadguy
   virtual bool is_snipable() const override { return false; }
   virtual bool is_freezable() const override { return false; }
   virtual bool is_flammable() const override { return false; }
+  virtual bool is_heavy() const override { return true; }
 
   virtual void kill_fall() override;
 

src/badguy/granito_big.cpp

@@ -24,6 +24,7 @@ GranitoBig::GranitoBig(const ReaderMapping& reader) :
   m_carrying(nullptr)
 {
   parse_type(reader);
+  set_ledge_behavior(LedgeBehavior::SMART);
 
   reader.get("carrying-script", m_carried_script);
 

src/badguy/granito_giant.cpp

@@ -25,7 +25,7 @@ GranitoGiant::GranitoGiant(const ReaderMapping& reader):
 }
 
 HitResponse
-GranitoGiant::collision_player(Player &player, const CollisionHit &hit)
+GranitoGiant::collision(GameObject& other, const CollisionHit& hit)
 {
   return FORCE_MOVE;
 }

src/badguy/granito_giant.hpp

@@ -24,7 +24,7 @@ class GranitoGiant final : public BadGuy
 public:
   explicit GranitoGiant(const ReaderMapping& reader);
 
-  virtual HitResponse collision_player(Player& player, const CollisionHit& hit) override;
+  virtual HitResponse collision(GameObject& other, const CollisionHit& hit) override;
   virtual void initialize() override;
 
   static std::string class_name() { return "granito_giant"; }

src/collision/collision_system.cpp

@@ -164,7 +164,9 @@ collision::Constraints check_collisions(const Vector& obj_movement, const Rectf&
     if (other_object && other_object->is_unisolid())
     {
       // Constrain only on fall on top of the unisolid object.
-      if (moving_obj_rect.get_bottom() - obj_movement.y <= grown_other_obj_rect.get_top())
+      // Here we are checking the movements of the objects to prevent
+      // overshoot if both objects are going in convergent directions
+      if (moving_obj_rect.get_bottom() - obj_movement.y <= grown_other_obj_rect.get_top() - (other_object->get_movement().y - 5.f))
       {
         constraints.constrain_bottom(other_obj_rect.get_top());
         constraints.hit.bottom = true;
@@ -726,15 +728,16 @@ CollisionSystem::is_free_of_statics(const Rectf& rect, const CollisionObject* ig
 }
 
 bool
-CollisionSystem::is_free_of_movingstatics(const Rectf& rect, const CollisionObject* ignore_object) const
+CollisionSystem::is_free_of_movingstatics(const Rectf& rect, const CollisionObject* ignore_object, const bool ignoreUnisolid) const
 {
   using namespace collision;
 
-  if (!is_free_of_tiles(rect)) return false;
+  if (!is_free_of_tiles(rect, ignoreUnisolid)) return false;
 
   for (const auto& object : m_objects) {
     if (object == ignore_object) continue;
     if (!object->is_valid()) continue;
+    if (object->is_unisolid() && ignoreUnisolid) continue;
     if ((object->get_group() == COLGROUP_MOVING)
         || (object->get_group() == COLGROUP_MOVING_STATIC)
         || (object->get_group() == COLGROUP_STATIC)) {

src/collision/collision_system.hpp

@@ -64,7 +64,7 @@ class CollisionSystem final
 
   bool is_free_of_tiles(const Rectf& rect, const bool ignoreUnisolid = false, uint32_t tiletype = Tile::SOLID) const;
   bool is_free_of_statics(const Rectf& rect, const CollisionObject* ignore_object, const bool ignoreUnisolid) const;
-  bool is_free_of_movingstatics(const Rectf& rect, const CollisionObject* ignore_object) const;
+  bool is_free_of_movingstatics(const Rectf& rect, const CollisionObject* ignore_object, const bool ignoreUnisolid) const;
   bool is_free_of_specifically_movingstatics(const Rectf& rect, const CollisionObject* ignore_object) const;
 
 

src/object/explosion.cpp

@@ -119,7 +119,7 @@ Explosion::explode()
       }
 
       auto badguy = dynamic_cast<WalkingBadguy*>(obj);
-      if (badguy && badguy->is_active()) {
+      if (badguy && badguy->is_active() && !badguy->is_heavy()) {
         badguy->add_velocity(add_speed);
       }
 

src/object/player.cpp

@@ -1292,7 +1292,7 @@ Player::do_standup(bool force_standup)
   float new_height = m_swimming ? TUX_WIDTH : BIG_TUX_HEIGHT;
   new_bbox.move(Vector(0, m_col.m_bbox.get_height() - new_height));
   new_bbox.set_height(new_height);
-  if (!Sector::get().is_free_of_movingstatics(new_bbox, this) && !force_standup)
+  if (!Sector::get().is_free_of_movingstatics(new_bbox, this, true) && !force_standup)
   {
     m_crawl = true;
     return;

src/supertux/sector.cpp

@@ -566,16 +566,17 @@ Sector::is_free_of_statics(float left, float top, float right, float bottom,
 }
 
 bool
-Sector::is_free_of_movingstatics(const Rectf& rect, const MovingObject* ignore_object) const
+Sector::is_free_of_movingstatics(const Rectf& rect, const MovingObject* ignore_object, const bool ignoreUnisolid) const
 {
   return m_collision_system->is_free_of_movingstatics(rect,
-                                                      ignore_object ? ignore_object->get_collision_object() : nullptr);
+                                                      ignore_object ? ignore_object->get_collision_object() : nullptr,
+                                                      ignoreUnisolid);
 }
 
 bool
 Sector::is_free_of_movingstatics(float left, float top, float right, float bottom) const
 {
-  return m_collision_system->is_free_of_movingstatics(Rectf(Vector(left, top), Vector(right, bottom)), nullptr);
+  return m_collision_system->is_free_of_movingstatics(Rectf(Vector(left, top), Vector(right, bottom)), nullptr, false);
 }
 
 bool

src/supertux/sector.hpp

@@ -148,7 +148,7 @@ class Sector final : public Base::Sector
       1.) solid tiles and
       2.) MovingObjects in COLGROUP_STATIC, COLGROUP_MOVINGSTATIC or COLGROUP_MOVING.
       This includes badguys and players. */
-  bool is_free_of_movingstatics(const Rectf& rect, const MovingObject* ignore_object = nullptr) const;
+  bool is_free_of_movingstatics(const Rectf& rect, const MovingObject* ignore_object = nullptr, const bool ignoreUnisolid = false) const;
   /**
    * @scripting
    * @description Checks if the specified sector-relative rectangle is free of both: