Show progress in contrib level menus

data/levels/christmas2016/worldmap.stwm

@@ -1,6 +1,6 @@
 (supertux-level
   (version 3)
-  (name (_ "Christmas 2016"))
+  (name (_ "Christmas Special"))
   (author "Carsten Wirtz")
   (license "CC-BY-SA 4.0 International")
   (sector

data/levels/community2016/worldmap.stwm

@@ -1,6 +1,6 @@
 (supertux-level
   (version 3)
-  (name (_ "Community Island 2020"))
+  (name (_ "Community Island"))
   (author "alex")
   (license "CC-BY-SA 4.0 International")
   (sector

data/levels/halloween2014/worldmap.stwm

@@ -1,6 +1,6 @@
 (supertux-level
   (version 3)
-  (name (_ "Halloween 2014"))
+  (name (_ "Halloween Special"))
   (author "Ingo Ruhnke")
   (contact "[email protected]")
   (license "CC-BY-SA 4.0 International")

src/supertux/menu/sorted_contrib_menu.cpp

@@ -1,5 +1,6 @@
 //  SuperTux
 //  Copyright (C) 2021 mrkubax10 <[email protected]>
+//                2021 Jiri Palecek <[email protected]>
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -17,15 +18,19 @@
 #include "supertux/menu/sorted_contrib_menu.hpp"
 
 #include <sstream>
-#include "util/gettext.hpp"
+
+#include "boost/format.hpp"
+
+#include "gui/menu_manager.hpp"
+#include "gui/menu_item.hpp"
+#include "gui/item_action.hpp"
 #include "supertux/savegame.hpp"
 #include "supertux/player_status.hpp"
 #include "supertux/levelset.hpp"
 #include "supertux/game_manager.hpp"
 #include "supertux/menu/contrib_levelset_menu.hpp"
-#include "gui/menu_manager.hpp"
-#include "gui/menu_item.hpp"
-#include "gui/item_action.hpp"
+#include "util/gettext.hpp"
+
 SortedContribMenu::SortedContribMenu(std::vector<std::unique_ptr<World>>& worlds, const std::string& contrib_type, const std::string& title, const std::string& empty_message) :
   m_world_folders()
 { 
@@ -38,10 +43,83 @@ SortedContribMenu::SortedContribMenu(std::vector<std::unique_ptr<World>>& worlds
     {
       m_world_folders.push_back(worlds[i]->get_basedir());
       std::string title_str;
+      const auto savegame = Savegame::from_file(worlds[i]->get_savegame_filename());
+
       if (worlds[i]->is_levelset())
-        title_str = "[" + worlds[i]->get_title() + "]";
+      {
+        uint32_t level_count = 0, solved_count = 0;
+        const auto& state = savegame->get_levelset_state(worlds[i]->get_basedir());
+
+        for (const auto& level_state : state.level_states)
+        {
+          if (level_state.filename.empty() || level_state.filename.back() == '~') continue;
+          if (level_state.solved) ++solved_count;
+          ++level_count;
+        }
+
+        if (!level_count)
+        {
+          title_str = str(boost::format(_("[%s] *NEW*")) % worlds[i]->get_title());
+        }
+        else
+        {
+          title_str = str(boost::format(_("[%s] (%u/%u; %u%%)")) % worlds[i]->get_title() %
+                          solved_count % level_count % (100 * solved_count / level_count));
+        }
+      }
       else
-        title_str = worlds[i]->get_title();
+      {
+        uint32_t island_level_count = 0, island_solved_count = 0,
+                 world_level_count = 0,  world_solved_count = 0;
+        std::string wm_filename = savegame->get_player_status().last_worldmap;
+
+        if (wm_filename.empty())
+          wm_filename = worlds[i]->get_worldmap_filename();
+
+        wm_filename = "/" + wm_filename;
+
+        const auto& state = savegame->get_worldmap_state(wm_filename);
+        for (const auto& level_state : state.level_states)
+        {
+          if (level_state.filename.empty()) continue;
+          if (level_state.solved) ++island_solved_count;
+          ++island_level_count;
+        }
+
+        const auto levelset = std::unique_ptr<Levelset>(new Levelset(worlds[i]->get_basedir(), true));
+        world_level_count = levelset->get_num_levels();
+        const auto world_list = savegame->get_worldmaps();
+
+        for (const auto& world : world_list)
+        {
+          const auto& world_state = savegame->get_worldmap_state(world);
+          for (const auto& level_state : world_state.level_states)
+          {
+            if (level_state.filename.empty()) continue;
+            if (level_state.solved) ++world_solved_count;
+          }
+        }
+
+        if (!island_level_count && !world_solved_count)
+          title_str = str(boost::format(_("%s *NEW*")) % worlds[i]->get_title());
+        else
+        {
+          const auto wm_title = savegame->get_player_status().last_worldmap_title;
+
+          if (island_level_count == world_level_count)
+          {
+            title_str = str(boost::format(_("%s (%u/%u; %u%%)")) % worlds[i]->get_title() %
+                            island_solved_count % island_level_count % (100 * island_solved_count / island_level_count));
+          }
+          else
+          {
+            title_str = str(boost::format(_("%s (%u/%u; %u%%) - %s (%u/%u; %u%%)")) % worlds[i]->get_title() % 
+                            world_solved_count % world_level_count % (100 * world_solved_count / world_level_count) %
+                            wm_title % island_solved_count % island_level_count %
+                            (island_level_count ? (100 * island_solved_count / island_level_count) : 100));
+          }
+        }
+      }
       add_entry(world_id++, title_str).set_help(worlds[i]->get_description());
     }
   }

src/supertux/player_status.cpp

@@ -37,7 +37,8 @@ PlayerStatus::PlayerStatus() :
   max_air_time(0),
   max_earth_time(0),
   worldmap_sprite("images/worldmap/common/tux.sprite"),
-  last_worldmap()
+  last_worldmap(),
+  last_worldmap_title()
 {
   reset();
 
@@ -128,6 +129,7 @@ PlayerStatus::write(Writer& writer)
 
   writer.write("worldmap-sprite", worldmap_sprite, false);
   writer.write("last-worldmap", last_worldmap, false);
+  writer.write("last-worldmap-title", last_worldmap_title, false);
 }
 
 void
@@ -163,6 +165,8 @@ PlayerStatus::read(const ReaderMapping& mapping)
 
   mapping.get("worldmap-sprite", worldmap_sprite);
   mapping.get("last-worldmap", last_worldmap);
+  if (!mapping.get("last-worldmap-title", last_worldmap_title))
+    last_worldmap_title = "";
 }
 
 std::string PlayerStatus::get_bonus_prefix() const

src/supertux/player_status.hpp

@@ -61,6 +61,7 @@ class PlayerStatus final
 
   std::string worldmap_sprite; /**< the sprite of Tux that should be used in worldmap */
   std::string last_worldmap; /**< the last played worldmap */
+  std::string last_worldmap_title; /**< the title of the last played worldmap */
 
 private:
   PlayerStatus(const PlayerStatus&) = delete;

src/worldmap/worldmap.cpp

@@ -98,6 +98,8 @@ WorldMap::WorldMap(const std::string& filename, Savegame& savegame, const std::s
   // load worldmap objects
   WorldMapParser parser(*this);
   parser.load_worldmap(filename);
+
+  m_savegame.get_player_status().last_worldmap_title = m_name;
 }
 
 WorldMap::~WorldMap()