Feature: Random map rotation (#27)

nerudaj · Oct 29, 2024 · 82e8ae1 · 82e8ae1
1 parent 4f94912
commit 82e8ae1
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 3 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+Rend 0.10.0 changelog:
+
+UX:
+* Random map rotation can be chosen in game setup lobby
+
 Rend 0.9.0 changelog:
 
 Gameplay:

diff --git a/src/lib-app/include/app/AppStateGameSetup.hpp b/src/lib-app/include/app/AppStateGameSetup.hpp
@@ -35,6 +35,10 @@ class [[nodiscard]] AppStateGameSetup final : public AppStateLobbyBase
 
     void selectMapPackAndSendUpdate(const std::string& packname);
 
+    void adjustMapOrderAndSendUpdate();
+
+    void shuffleMapOrder();
+
     void openMapPicker();
 
     void handleMapRotationUpdate();

diff --git a/src/lib-app/src/app/AppStateGameSetup.cpp b/src/lib-app/src/app/AppStateGameSetup.cpp
@@ -9,6 +9,7 @@
 #include <app/AppStateMapRotationWrapper.hpp>
 #include <atomic>
 #include <expected>
+#include <random>
 
 AppStateGameSetup::AppStateGameSetup(
     dgm::App& app, mem::Rc<DependencyContainer> dic) noexcept
@@ -74,8 +75,6 @@ void AppStateGameSetup::buildLayoutGameSetupImpl(tgui::Panel::Ptr target)
                         lobbySettings.gameMode =
                             static_cast<GameMode>(optionIdx);
                         sendLobbyUpdate();
-                        // TODO: recompute available mappacks
-                        // and maps within
                     }))
             .addOption(
                 Strings::AppState::GameSetup::POINTLIMIT,
@@ -97,6 +96,15 @@ void AppStateGameSetup::buildLayoutGameSetupImpl(tgui::Panel::Ptr target)
                     lobbySettings.packname,
                     [this](std::size_t idx)
                     { selectMapPackAndSendUpdate(mapPackNames.at(idx)); }))
+            .addOption(
+                Strings::AppState::GameSetup::RANDOM_ROTATION,
+                WidgetBuilder::createCheckbox(
+                    lobbySettings.useRandomMapRotation,
+                    [&](bool value)
+                    {
+                        lobbySettings.useRandomMapRotation = value;
+                        adjustMapOrderAndSendUpdate();
+                    }))
             .addOption(
                 Strings::AppState::GameSetup::SELECT_MAPS,
                 WidgetBuilder::createButton(
@@ -122,6 +130,7 @@ void AppStateGameSetup::selectMapPack(const std::string& packname)
             [](const std::string& name)
             { return MapSettings { .name = name, .enabled = true }; })
         | std::ranges::to<std::vector>();
+
     lobbySettings.mapOrder =
         std::views::iota(size_t { 0 }, lobbySettings.mapSettings.size())
         | std::ranges::to<std::vector>();
@@ -130,9 +139,31 @@ void AppStateGameSetup::selectMapPack(const std::string& packname)
 void AppStateGameSetup::selectMapPackAndSendUpdate(const std::string& packname)
 {
     selectMapPack(packname);
+
+    if (lobbySettings.useRandomMapRotation) shuffleMapOrder();
+
+    sendLobbyUpdate();
+}
+
+void AppStateGameSetup::adjustMapOrderAndSendUpdate()
+{
+    if (lobbySettings.useRandomMapRotation)
+        shuffleMapOrder();
+    else
+        std::ranges::sort(lobbySettings.mapOrder);
+
     sendLobbyUpdate();
 }
 
+void AppStateGameSetup::shuffleMapOrder()
+{
+    auto&& generator = std::mt19937(std::random_device()());
+    std::shuffle(
+        lobbySettings.mapOrder.begin(),
+        lobbySettings.mapOrder.end(),
+        generator);
+}
+
 void AppStateGameSetup::openMapPicker()
 {
     mapPickerDialog = mem::Box<MapPickerDialog>(

diff --git a/src/lib-app/src/app/AppStateLobbyBase.cpp b/src/lib-app/src/app/AppStateLobbyBase.cpp
@@ -77,10 +77,25 @@ void AppStateLobbyBase::handleMapDownload(const MapDownloadResponse& data)
     dic->logger->log(0, "Map downloaded and saved to {}", mapPath.string());
 }
 
+std::vector<MapSettings> getOrderedMapList(const LobbySettings& lobbySettings)
+{
+    auto orderedMaplist =
+        std::views::zip(lobbySettings.mapOrder, lobbySettings.mapSettings)
+        | std::ranges::to<std::vector>();
+
+    std::ranges::sort(
+        orderedMaplist,
+        [](auto& a, auto& b) { return std::get<0>(a) < std::get<0>(b); });
+
+    return orderedMaplist
+           | std::views::transform([](const auto& t) { return std::get<1>(t); })
+           | std::ranges::to<std::vector>();
+}
+
 void AppStateLobbyBase::startGame()
 {
     auto&& maplist =
-        lobbySettings.mapSettings
+        getOrderedMapList(lobbySettings)
         | std::views::filter([](const MapSettings& ms) { return ms.enabled; })
         | std::views::transform([](const MapSettings& ms) { return ms.name; })
         | std::ranges::to<std::vector>();

diff --git a/src/lib-defines/include/Configs/Strings.hpp b/src/lib-defines/include/Configs/Strings.hpp
@@ -67,6 +67,7 @@ namespace Strings
             RAWSTRING SERVER_IP = "server ip";
             RAWSTRING MAX_NPCS = "maximum number of bots";
             RAWSTRING SELECT_PACK = "select map pack";
+            RAWSTRING RANDOM_ROTATION = "random map rotation";
             RAWSTRING SELECT_MAPS = "configure map rotation";
             RAWSTRING SELECT_GAMEMODE = "choose game mode";
             RAWSTRING GAMEMODE_DM = "deathmatch";

diff --git a/src/lib-network/include/LobbySettings.hpp b/src/lib-network/include/LobbySettings.hpp
@@ -20,6 +20,7 @@ struct [[nodiscard]] LobbySettings final
     std::string packname = "";
     std::vector<MapSettings> mapSettings = {};
     std::vector<size_t> mapOrder = {};
+    bool useRandomMapRotation = true;
     GameMode gameMode = GameMode::Deathmatch;
     int pointlimit = 0;
     size_t maxNpcs = 0;