Improvements to object type support, object versioning

data/images/objects/bonus_block/retro_invisibleblock.sprite

@@ -0,0 +1,10 @@
+(supertux-sprite
+  (action
+    (name "default-editor")
+    (images "box-invisible.png")
+  )
+  (action
+    (name "empty")
+    (images "box-empty.png")
+  )
+)

src/badguy/crusher.cpp

@@ -59,7 +59,6 @@ Crusher::Crusher(const ReaderMapping& reader) :
   m_whites()
 {
   parse_type(reader);
-  on_type_change(-1);
 
   reader.get("sideways", m_sideways);
   // TODO: Add distinct sounds for crusher hitting the ground and hitting Tux.
@@ -74,22 +73,49 @@ Crusher::get_types() const
   return {
     { "ice-krush", _("Ice (normal)") },
     { "ice-krosh", _("Ice (big)") },
+    { "rock-krush", _("Rock (normal)") },
+    { "rock-krosh", _("Rock (big)") },
     { "corrupted-krush", _("Corrupted (normal)") },
     { "corrupted-krosh", _("Corrupted (big)") }
   };
 }
 
+std::string
+Crusher::get_default_sprite_name() const
+{
+  const std::string size_prefix = (m_ic_size == NORMAL ? "krush" : "krosh");
+  switch (m_ic_type)
+  {
+    case ROCK:
+      return "images/creatures/crusher/" + size_prefix + "_rock.sprite";
+    case CORRUPTED:
+      return "images/creatures/crusher/corrupted/" + size_prefix + "_corrupt.sprite";
+    default:
+      return "images/creatures/crusher/" + size_prefix + "_ice.sprite";
+  }
+}
+
 void
 Crusher::on_type_change(int old_type)
 {
-  m_ic_size = (m_type == 0 || m_type == 2 ? NORMAL : LARGE);
-  m_ic_type = (m_type == 0 || m_type == 1 ? ICE : CORRUPTED);
-
-  if (!has_found_sprite()) // Change sprite only if a custom sprite has not just been loaded.
+  m_ic_size = (m_type % 2 == 0 ? NORMAL : LARGE);
+  switch (m_type)
   {
-    const std::string size_prefix = (m_ic_size == NORMAL ? "krush" : "krosh");
-    change_sprite("images/creatures/crusher/" + (m_ic_type == CORRUPTED ? "corrupted/" + size_prefix + "_corrupt" : size_prefix + "_ice") + ".sprite");
+    case 0:
+    case 1:
+      m_ic_type = ICE;
+      break;
+    case 2:
+    case 3:
+      m_ic_type = ROCK;
+      break;
+    case 4:
+    case 5:
+      m_ic_type = CORRUPTED;
+      break;
   }
+
+  MovingSprite::on_type_change();
 }
 
 HitResponse

src/badguy/crusher.hpp

@@ -51,6 +51,7 @@ class Crusher final : public MovingSprite
   enum Type
   {
     ICE,
+    ROCK,
     CORRUPTED
   };
 
@@ -72,6 +73,7 @@ class Crusher final : public MovingSprite
 
   virtual ObjectSettings get_settings() override;
   GameObjectTypes get_types() const override;
+  std::string get_default_sprite_name() const override;
 
   virtual void on_flip(float height) override;
 

src/badguy/dispenser.cpp

@@ -75,9 +75,7 @@ Dispenser::Dispenser(const ReaderMapping& reader) :
 //  if (badguys.size() <= 0)
 //    throw std::runtime_error("No badguys in dispenser.");
 
-  set_correct_action();
-
-  m_col.m_bbox.set_size(m_sprite->get_current_hitbox_width(), m_sprite->get_current_hitbox_height());
+  update_hitbox();
   m_countMe = false;
 }
 
@@ -343,9 +341,6 @@ Dispenser::is_portable() const
 void
 Dispenser::set_correct_action()
 {
-  if (!has_found_sprite()) // Change sprite only if a custom sprite has not just been loaded.
-    change_sprite("images/creatures/dispenser/" + (m_type == DispenserType::POINT ? "invisible" : type_value_to_id(m_type)) + ".sprite");
-
   switch (m_type)
   {
     case DispenserType::CANNON:
@@ -362,6 +357,7 @@ Dispenser::set_correct_action()
 void
 Dispenser::on_type_change(int old_type)
 {
+  MovingSprite::on_type_change();
   set_correct_action();
 }
 
@@ -389,12 +385,24 @@ GameObjectTypes
 Dispenser::get_types() const
 {
   return {
-    { "cannon", _("cannon") },
     { "dropper", _("dropper") },
+    { "cannon", _("cannon") },
     { "point", _("invisible") }
   };
 }
 
+std::string
+Dispenser::get_default_sprite_name() const
+{
+  switch (m_type)
+  {
+    case POINT:
+      return "images/creatures/dispenser/invisible.sprite";
+    default:
+      return "images/creatures/dispenser/" + type_value_to_id(m_type) + ".sprite";
+  }
+}
+
 void
 Dispenser::on_flip(float height)
 {

src/badguy/dispenser.hpp

@@ -28,7 +28,7 @@ class Dispenser final : public BadGuy,
 {
 private:
   enum DispenserType {
-    CANNON, DROPPER, POINT
+    DROPPER, CANNON, POINT
   };
 
 public:
@@ -55,6 +55,7 @@ class Dispenser final : public BadGuy,
 
   virtual ObjectSettings get_settings() override;
   virtual GameObjectTypes get_types() const override;
+  std::string get_default_sprite_name() const override;
 
   virtual void on_flip(float height) override;
 

src/badguy/fish_chasing.cpp

@@ -34,11 +34,24 @@ FishChasing::FishChasing(const ReaderMapping& reader) :
   m_lost_distance(),
   m_chase_speed()
 {
+  parse_type(reader);
   reader.get("track-distance", m_track_distance, TRACK_DISTANCE);
   reader.get("lost-distance", m_lost_distance, LOST_DISTANCE);
   reader.get("chase-speed", m_chase_speed, CHASE_SPEED);
 }
 
+std::string
+FishChasing::get_default_sprite_name() const
+{
+  switch (m_type)
+  {
+    case FOREST:
+      return "images/creatures/fish/forest/brownfish.sprite";
+    default:
+      return m_default_sprite_name;
+  }
+}
+
 void
 FishChasing::active_update(float dt_sec) {
   // Perform basic updates.

src/badguy/fish_chasing.hpp

@@ -34,6 +34,8 @@ class FishChasing final : public FishSwimming
   virtual std::string get_overlay_size() const override { return "2x2"; }
   virtual ObjectSettings get_settings() override;
 
+  std::string get_default_sprite_name() const override;
+
 private:
   enum ChaseState {
     NORMAL,

src/badguy/fish_harmless.hpp

@@ -33,6 +33,8 @@ class FishHarmless final : public FishSwimming
   virtual std::string get_display_name() const override { return display_name(); }
   virtual std::string get_overlay_size() const override { return "1x1"; }
 
+  GameObjectTypes get_types() const override { return {}; }
+
 private:
   FishHarmless(const FishHarmless&) = delete;
   FishHarmless& operator=(const FishHarmless&) = delete;

src/badguy/fish_swimming.cpp

@@ -33,6 +33,7 @@ FishSwimming::FishSwimming(const ReaderMapping& reader) :
   m_float_timer(),
   m_radius()
 {
+  parse_type(reader);
   reader.get("radius", m_radius, 100.0f);
 }
 
@@ -46,6 +47,27 @@ FishSwimming::FishSwimming(const ReaderMapping& reader, const std::string& sprit
   reader.get("radius", m_radius, 100.0f);
 }
 
+GameObjectTypes
+FishSwimming::get_types() const
+{
+  return {
+    { "snow", _("Snow") },
+    { "forest", _("Forest") }
+  };
+}
+
+std::string
+FishSwimming::get_default_sprite_name() const
+{
+  switch (m_type)
+  {
+    case FOREST:
+      return "images/creatures/fish/forest/bluefish.sprite";
+    default:
+      return m_default_sprite_name;
+  }
+}
+
 ObjectSettings
 FishSwimming::get_settings()
 {

src/badguy/fish_swimming.hpp

@@ -41,10 +41,18 @@ class FishSwimming : public BadGuy
   virtual std::string get_overlay_size() const override { return "2x1"; }
   virtual ObjectSettings get_settings() override;
 
+  virtual GameObjectTypes get_types() const override;
+  virtual std::string get_default_sprite_name() const override;
+
   void turn_around();
   void maintain_velocity(float goal_x_velocity);
 
 protected:
+  enum Type {
+    SNOW,
+    FOREST
+  };
+
   enum FishYState {
     DISRUPTED,
     BALANCED