PowerUp type support, object versioning

src/badguy/dispenser.cpp

@@ -75,7 +75,7 @@ Dispenser::Dispenser(const ReaderMapping& reader) :
 //  if (badguys.size() <= 0)
 //    throw std::runtime_error("No badguys in dispenser.");
 
-  m_col.m_bbox.set_size(m_sprite->get_current_hitbox_width(), m_sprite->get_current_hitbox_height());
+  update_hitbox();
   m_countMe = false;
 }
 
@@ -385,8 +385,8 @@ GameObjectTypes
 Dispenser::get_types() const
 {
   return {
-    { "cannon", _("cannon") },
     { "dropper", _("dropper") },
+    { "cannon", _("cannon") },
     { "point", _("invisible") }
   };
 }

src/badguy/dispenser.hpp

@@ -28,7 +28,7 @@ class Dispenser final : public BadGuy,
 {
 private:
   enum DispenserType {
-    CANNON, DROPPER, POINT
+    DROPPER, CANNON, POINT
   };
 
 public:

src/editor/object_menu.cpp

@@ -17,6 +17,7 @@
 #include "editor/object_menu.hpp"
 
 #include "editor/editor.hpp"
+#include "gui/dialog.hpp"
 #include "gui/menu_item.hpp"
 #include "gui/menu_manager.hpp"
 #include "supertux/d_scope.hpp"
@@ -43,6 +44,12 @@ ObjectMenu::ObjectMenu(GameObject* go, const std::function<bool (GameObject*)>&
     }
   }
 
+  if (!m_object->is_up_to_date())
+  {
+    add_hl();
+    add_entry(MNID_UPDATE, _("Update"));
+  }
+
   if (m_remove_function)
   {
     add_hl();
@@ -62,6 +69,16 @@ ObjectMenu::menu_action(MenuItem& item)
 {
   switch (item.get_id())
   {
+    case MNID_UPDATE:
+      Dialog::show_confirmation(_("This will update the object to its latest functionality.") + "\n \n" +
+                                _("Keep in mind this is very likely to break the proper behaviour of the object.") + "\n" +
+                                _("Make sure to re-check any behaviour, related to the object."), [this]() {
+        m_object->update_version();
+        m_editor.m_reactivate_request = true;
+        MenuManager::instance().pop_menu();
+      });
+      break;
+
     case MNID_REMOVE:
       m_editor.delete_markers();
       m_editor.m_reactivate_request = true;

src/editor/object_menu.hpp

@@ -28,10 +28,11 @@ class ObjectMenu final : public Menu
 {
 public:
   enum {
+    MNID_UPDATE,
     MNID_REMOVE,
     MNID_REMOVEFUNCTION,
     MNID_TEST_FROM_HERE,
-    MNID_OPEN_PARTICLE_EDITOR,
+    MNID_OPEN_PARTICLE_EDITOR
   };
 
 public:

src/editor/tip.cpp

@@ -26,6 +26,7 @@
 
 Tip::Tip(GameObject& object) :
   m_strings(),
+  m_warnings(),
   m_header()
 {
   auto os = object.get_settings();
@@ -48,6 +49,10 @@ Tip::Tip(GameObject& object) :
       }
     }
   }
+
+  if (!object.is_up_to_date())
+    m_warnings.push_back(_("This object's current functionality is deprecated.") + "\n" +
+                         _("Updating to get its latest functionality is recommended."));
 }
 
 Tip::Tip(std::string text) :
@@ -68,12 +73,21 @@ Tip::draw(DrawingContext& context, const Vector& pos, const bool align_right)
   auto position = pos;
   position.y += 35;
   context.color().draw_text(Resources::normal_font, m_header, position,
-                              align_right ? ALIGN_RIGHT : ALIGN_LEFT, LAYER_GUI + 10, g_config->labeltextcolor);
+                            align_right ? ALIGN_RIGHT : ALIGN_LEFT, LAYER_GUI + 10, g_config->labeltextcolor);
+
+  for (const auto& str : m_strings)
+  {
+    position.y += 22;
+    context.color().draw_text(Resources::normal_font, str, position,
+                              align_right ? ALIGN_RIGHT : ALIGN_LEFT, LAYER_GUI + 10, ColorScheme::Menu::default_color);
+  }
 
-  for (const auto& str : m_strings) {
+  position.y += 35;
+  for (const auto& str : m_warnings)
+  {
     position.y += 22;
     context.color().draw_text(Resources::normal_font, str, position,
-                                align_right ? ALIGN_RIGHT : ALIGN_LEFT, LAYER_GUI + 10, ColorScheme::Menu::default_color);
+                              align_right ? ALIGN_RIGHT : ALIGN_LEFT, LAYER_GUI + 10, ColorScheme::Menu::warning_color);
   }
 }
 

src/editor/tip.hpp

@@ -37,6 +37,7 @@ class Tip final
 
 private:
   std::vector<std::string> m_strings;
+  std::vector<std::string> m_warnings;
   std::string m_header;
 
 private:

src/object/bonus_block.cpp

@@ -374,7 +374,7 @@ BonusBlock::try_open(Player* player)
     }
     case Content::POTION:
     {
-      Sector::get().add<SpecialRiser>(get_pos(), std::make_unique<PowerUp>(get_pos(), "images/powerups/potions/red-potion.sprite"));
+      Sector::get().add<SpecialRiser>(get_pos(), std::make_unique<PowerUp>(get_pos(), PowerUp::FLIP));
       break;
     }
     case Content::RAIN:
@@ -447,25 +447,25 @@ BonusBlock::try_drop(Player *player)
 
     case Content::FIREGROW:
     {
-      drop_growup_bonus(player, "images/powerups/fireflower/fireflower.sprite", direction, countdown);
+      drop_growup_bonus(player, PowerUp::FIRE, direction, countdown);
       break;
     }
 
     case Content::ICEGROW:
     {
-      drop_growup_bonus(player, "images/powerups/iceflower/iceflower.sprite", direction, countdown);
+      drop_growup_bonus(player, PowerUp::ICE, direction, countdown);
       break;
     }
 
     case Content::AIRGROW:
     {
-      drop_growup_bonus(player, "images/powerups/airflower/airflower.sprite", direction, countdown);
+      drop_growup_bonus(player, PowerUp::AIR, direction, countdown);
       break;
     }
 
     case Content::EARTHGROW:
     {
-      drop_growup_bonus(player, "images/powerups/earthflower/earthflower.sprite", direction, countdown);
+      drop_growup_bonus(player, PowerUp::EARTH, direction, countdown);
       break;
     }
 
@@ -523,7 +523,7 @@ BonusBlock::try_drop(Player *player)
     }
     case Content::POTION:
     {
-      Sector::get().add<PowerUp>(get_pos() + Vector(0, 32), "images/powerups/potions/red-potion.sprite");
+      Sector::get().add<PowerUp>(get_pos() + Vector(0, 32), PowerUp::FLIP);
       countdown = true;
       break;
     }
@@ -570,15 +570,15 @@ BonusBlock::raise_growup_bonus(Player* player, const BonusType& bonus, const Dir
 }
 
 void
-BonusBlock::drop_growup_bonus(Player* player, const std::string& bonus_sprite_name, const Direction& dir, bool& countdown)
+BonusBlock::drop_growup_bonus(Player* player, int type, const Direction& dir, bool& countdown)
 {
   if (player->get_status().bonus[player->get_id()] == NO_BONUS)
   {
     Sector::get().add<GrowUp>(get_pos() + Vector(0, 32), dir);
   }
   else
   {
-    Sector::get().add<PowerUp>(get_pos() + Vector(0, 32), bonus_sprite_name);
+    Sector::get().add<PowerUp>(get_pos() + Vector(0, 32), type);
   }
   SoundManager::current()->play("sounds/upgrade.wav", get_pos(), upgrade_sound_gain);
   countdown = true;
@@ -690,7 +690,7 @@ BonusBlock::preload_contents(int d)
       break;
 
     case 12: // Red potion
-      m_object = std::make_unique<PowerUp>(get_pos(), "images/powerups/potions/red-potion.sprite");
+      m_object = std::make_unique<PowerUp>(get_pos(), PowerUp::FLIP);
       break;
 
     default:

src/object/bonus_block.hpp

@@ -72,7 +72,7 @@ class BonusBlock final : public Block
 
   void preload_contents(int d);
   void raise_growup_bonus(Player* player, const BonusType& bonus, const Direction& dir);
-  void drop_growup_bonus(Player* player, const std::string& bonus_sprite_name, const Direction& dir, bool& countdown);
+  void drop_growup_bonus(Player* player, int type, const Direction& dir, bool& countdown);
 
   BonusBlock::Content get_content_by_data(int tile_data) const;
   BonusBlock::Content get_content_from_string(const std::string& contentstring) const;

src/object/moving_sprite.cpp

@@ -123,6 +123,12 @@ MovingSprite::on_type_change(int old_type)
     change_sprite(get_default_sprite_name());
 }
 
+bool
+MovingSprite::matches_sprite(const std::string& sprite_file)
+{
+  return m_sprite_name == sprite_file || m_sprite_name == "/" + sprite_file;
+}
+
 void
 MovingSprite::update_hitbox()
 {

src/object/moving_sprite.hpp

@@ -61,6 +61,7 @@ class MovingSprite : public MovingObject
   const std::string& get_sprite_name() const { return m_sprite_name; }
   virtual std::string get_default_sprite_name() const { return m_default_sprite_name; }
 
+  bool matches_sprite(const std::string& sprite_file);
   void change_sprite(const std::string& new_sprite_name);
   void spawn_explosion_sprites(int count, const std::string& sprite_path);