Ticket #3436: 3436_singMulti_filter_v6.1.patch

binaries/data/mods/public/gui/replaymenu/replay_actions.js

@@ -9 +9 @@
     let mapNameFilter = Engine.GetGUIObjectByName("mapNameFilter");
     let mapSizeFilter = Engine.GetGUIObjectByName("mapSizeFilter");
     let populationFilter = Engine.GetGUIObjectByName("populationFilter");
     let durationFilter = Engine.GetGUIObjectByName("durationFilter");
     let compatibilityFilter = Engine.GetGUIObjectByName("compatibilityFilter");
+    let singleplayerFilter = Engine.GetGUIObjectByName("singleplayerFilter");
+    let victoryConFilter = Engine.GetGUIObjectByName("victoryConditionFilter");
+    let ratedGamesFilter = Engine.GetGUIObjectByName("ratedGamesFilter");
 
     return {
         "directory": selectedDirectory,
         "column": replaySelection.selected_column,
         "columnOrder": replaySelection.selected_column_order,
@@ -21 +24 @@
             "playernames": playersFilter.caption,
             "mapName": mapNameFilter.list_data[mapNameFilter.selected],
             "mapSize": mapSizeFilter.list_data[mapSizeFilter.selected],
             "popCap": populationFilter.list_data[populationFilter.selected],
             "duration": durationFilter.list_data[durationFilter.selected],
-            "compatibility": compatibilityFilter.checked
+            "compatibility": compatibilityFilter.checked,
+            "singleplayer": singleplayerFilter.list_data[singleplayerFilter.selected],
+            "victoryCondition": victoryConFilter.list_data[victoryConFilter.selected],
+            "ratedGames": ratedGamesFilter.selected
         }
     };
 }
 
 /**

binaries/data/mods/public/gui/replaymenu/replay_filters.js

@@ -31 +31 @@
     initDateFilter(filters && filters.date);
     initMapSizeFilter(filters && filters.mapSize);
     initMapNameFilter(filters && filters.mapName);
     initPopCapFilter(filters && filters.popCap);
     initDurationFilter(filters && filters.duration);
+    initSingleplayerFilter(filters && filters.singleplayer);
+    initVictoryConditionFilter(filters && filters.victoryCondition);
+    initRatedGamesFilter(filters && filters.ratedGames);
 }
 
 /**
  * Allow to filter by month. Uses g_Replays.
  */
@@ -131 +134 @@
 
     if (durationFilter.selected == -1 || durationFilter.selected >= g_DurationFilterIntervals.length)
         durationFilter.selected = 0;
 }
 
+function initSingleplayerFilter(singleplayer)
+{
+    let singleplayerFilter = Engine.GetGUIObjectByName("singleplayerFilter");
+    singleplayerFilter.list = [translateWithContext("gamemode", "Single- and multiplayer"), translate("Single Player"), translate("Multiplayer")];
+    singleplayerFilter.list_data = ["", "Singleplayer", "Multiplayer"];
+
+    if (singleplayer)
+        singleplayerFilter.selected = singleplayerFilter.list_data.indexOf(singleplayer);
+
+    if (singleplayerFilter.selected < 0 || singleplayerFilter.selected >= singleplayerFilter.list.length)
+        singleplayerFilter.selected = 0;
+}
+
+function initVictoryConditionFilter(victoryCondition)
+{
+    let victoryConditionFilter = Engine.GetGUIObjectByName("victoryConditionFilter");
+    victoryConditionFilter.list = [translateWithContext("victory condition", "Any Gametype")].concat(g_VictoryConditions.map(victoryCondition => translateVictoryCondition(victoryCondition)));
+    victoryConditionFilter.list_data = [""].concat(g_VictoryConditions);
+
+    if (victoryCondition)
+        victoryConditionFilter.selected = victoryConditionFilter.list_data.indexOf(victoryCondition);
+
+    if (victoryConditionFilter.selected < 0 || victoryConditionFilter.selected >= victoryConditionFilter.list.length)
+        victoryConditionFilter.selected = 0;
+}
+
+function initRatedGamesFilter(ratedGames)
+{
+    let ratedGamesFilter = Engine.GetGUIObjectByName("ratedGamesFilter");
+    ratedGamesFilter.list = [translateWithContext("rated game", "Rated and unrated games"), translate("Rated Games"), translate("Unrated Games")];
+    ratedGamesFilter.list_data = ["", "rated", "not rated"];
+
+    if (ratedGames)
+        ratedGamesFilter.selected = ratedGamesFilter.list_data.indexOf(ratedGames);
+
+    if (ratedGamesFilter.selected < 0 || ratedGamesFilter.selected >= ratedGamesFilter.list.length)
+        ratedGamesFilter.selected = 0;
+}
+
 /**
  * Initializes g_ReplaysFiltered with replays that are not filtered out and sort it.
  */
 function filterReplays()
 {
@@ -191 +233 @@
     // Check for compatibility first (most likely to filter)
     let compatibilityFilter = Engine.GetGUIObjectByName("compatibilityFilter");
     if (compatibilityFilter.checked && !isReplayCompatible(replay))
         return false;
 
+    // Filter by multiplayer/singleplayer
+    let singleplayerFilter = Engine.GetGUIObjectByName("singleplayerFilter");
+    if (singleplayerFilter.selected == 1 && replay.isMultiplayer ||
+        singleplayerFilter.selected == 2 && !replay.isMultiplayer)
+        return false;
+
+    // Filter by victory condition
+    let victoryConditionFilter = Engine.GetGUIObjectByName("victoryConditionFilter");
+    if (victoryConditionFilter.selected > 0 && replay.attribs.settings.GameType != victoryConditionFilter.list_data[victoryConditionFilter.selected])
+        return false;
+
+    // Filter by rating
+    let ratedGamesFilter = Engine.GetGUIObjectByName("ratedGamesFilter");
+    if (ratedGamesFilter.selected == 1 && !replay.attribs.settings.RatingEnabled ||
+        ratedGamesFilter.selected == 2 && replay.attribs.settings.RatingEnabled)
+        return false
+
     // Filter date/time (select a month)
-    var dateTimeFilter = Engine.GetGUIObjectByName("dateTimeFilter");
+    let dateTimeFilter = Engine.GetGUIObjectByName("dateTimeFilter");
     if (dateTimeFilter.selected > 0 && getReplayMonth(replay) != dateTimeFilter.list_data[dateTimeFilter.selected])
         return false;
 
     // Filter by playernames
-    var playersFilter = Engine.GetGUIObjectByName("playersFilter");
-    var keywords = playersFilter.caption.toLowerCase().split(" ");
+    let playersFilter = Engine.GetGUIObjectByName("playersFilter");
+    let keywords = playersFilter.caption.toLowerCase().split(" ");
     if (keywords.length)
     {
         // We just check if all typed words are somewhere in the playerlist of that replay
         let playerList = replay.attribs.settings.PlayerData.map(player => player ? player.Name : "").join(" ").toLowerCase();
         if (!keywords.every(keyword => playerList.indexOf(keyword) != -1))
             return false;
     }
 
     // Filter by map name
-    var mapNameFilter = Engine.GetGUIObjectByName("mapNameFilter");
+    let mapNameFilter = Engine.GetGUIObjectByName("mapNameFilter");
     if (mapNameFilter.selected > 0 && getReplayMapName(replay) != mapNameFilter.list_data[mapNameFilter.selected])
         return false;
 
     // Filter by map size
-    var mapSizeFilter = Engine.GetGUIObjectByName("mapSizeFilter");
+    let mapSizeFilter = Engine.GetGUIObjectByName("mapSizeFilter");
     if (mapSizeFilter.selected > 0 && replay.attribs.settings.Size != mapSizeFilter.list_data[mapSizeFilter.selected])
         return false;
 
     // Filter by population capacity
-    var populationFilter = Engine.GetGUIObjectByName("populationFilter");
+    let populationFilter = Engine.GetGUIObjectByName("populationFilter");
     if (populationFilter.selected > 0 && replay.attribs.settings.PopulationCap != populationFilter.list_data[populationFilter.selected])
         return false;
 
     // Filter by game duration
-    var durationFilter = Engine.GetGUIObjectByName("durationFilter");
+    let durationFilter = Engine.GetGUIObjectByName("durationFilter");
     if (durationFilter.selected > 0)
     {
         let interval = g_DurationFilterIntervals[durationFilter.selected];
 
         if ((interval.min > -1 && replay.duration < interval.min * 60) ||

binaries/data/mods/public/gui/replaymenu/replay_menu.js

@@ -32 +32 @@
  * Sorted list of unique maptitles. Used by mapfilter.
  */
 var g_MapNames = [];
 
 /**
+ * Sorted list of the victory conditions occuring in the replays
+ */
+var g_VictoryConditions = [];
+
+/**
  * Directory name of the currently selected replay. Used to restore the selection after changing filters.
  */
 var g_SelectedReplayDirectory = "";
 
 /**
@@ -60 +65 @@
     displayReplayList();
 }
 
 /**
  * Store the list of replays loaded in C++ in g_Replays.
- * Check timestamp and compatibility and extract g_Playernames, g_MapNames.
+ * Check timestamp and compatibility and extract g_Playernames, g_MapNames, g_VictoryConditions.
  * Restore selected filters and item.
  */
 function loadReplays(replaySelectionData)
 {
     g_Replays = Engine.GetReplays();
@@ -73 +78 @@
         return;
 
     g_Playernames = [];
     for (let replay of g_Replays)
     {
+        let nonAIPlayers = 0;
         // Use time saved in file, otherwise file mod date
         replay.timestamp = replay.attribs.timestamp ? +replay.attribs.timestamp : +replay.filemod_timestamp-replay.duration;
 
         // Check replay for compatibility
         replay.isCompatible = isReplayCompatible(replay);
@@ -85 +91 @@
 
         // Extract map names
         if (g_MapNames.indexOf(replay.attribs.settings.Name) == -1 && replay.attribs.settings.Name != "")
             g_MapNames.push(replay.attribs.settings.Name);
 
+        // Extract victory conditions
+        if (replay.attribs.settings.GameType && g_VictoryConditions.indexOf(replay.attribs.settings.GameType) == -1)
+            g_VictoryConditions.push(replay.attribs.settings.GameType);
+
         // Extract playernames
         for (let playerData of replay.attribs.settings.PlayerData)
         {
             if (!playerData || playerData.AI)
                 continue;
@@ -99 +109 @@
             if (ratingStart != -1)
                 playername = playername.substr(0, ratingStart);
 
             if (g_Playernames.indexOf(playername) == -1)
                 g_Playernames.push(playername);
+            ++nonAIPlayers;
         }
+        replay.isMultiplayer = nonAIPlayers > 1;
     }
     g_MapNames.sort();
+    g_VictoryConditions.sort();
 
     // Reload filters (since they depend on g_Replays and its derivatives)
     initFilters(replaySelectionData && replaySelectionData.filters);
 
     // Restore user selection

binaries/data/mods/public/gui/replaymenu/replay_menu.xml

@@ -108 +108 @@
             <!-- Compatibility Filter Label -->
             <object type="text" size="20 2 100% 100%" text_align="left" textcolor="white">
                 <translatableAttribute id="caption">Filter compatible replays</translatableAttribute>
             </object>
 
+            <!-- Singleplayer Multiplayer Filter -->
+            <object name="singleplayerFilter" type="dropdown" style="ModernDropDown" size="0 30 100% 55" font="sans-bold-13">
+                <action on="SelectionChange">displayReplayList();</action>
+            </object>
+
+            <!-- Victory Condition Filter -->
+            <object name="victoryConditionFilter" type="dropdown" style="ModernDropDown" size="0 60 100% 85" font="sans-bold-13">
+                <action on="SelectionChange">displayReplayList();</action>
+            </object>
+
+            <!-- Rated Games Filter -->
+            <object name="ratedGamesFilter" type="dropdown" style="ModernDropDown" size="0 90 100% 115" font="sans-bold-13">
+                <action on="SelectionChange">displayReplayList();</action>
+            </object>
+
             <!-- Placeholder to show if no replay is selected -->
-            <object name="replayInfoEmpty" size="0 30 100% 100%-60" type="image" sprite="ModernDarkBoxGold" hidden="false">
+            <object name="replayInfoEmpty" size="0 120 100% 100%-60" type="image" sprite="ModernDarkBoxGold" hidden="false">
                 <object name="logo" size="50%-110 40 50%+110 140" type="image" sprite="logo"/>
                 <object name="subjectBox" type="image" sprite="ModernDarkBoxWhite" size="3% 180 97% 99%">
                     <object name="subject" size="5 5 100%-5 100%-5" type="text" style="ModernText" text_align="center"/>
                 </object>
             </object>
 
             <!--  -->
-            <object name="replayInfo" size="0 30 100% 100%-60" type="image" sprite="ModernDarkBoxGold" hidden="true">
+            <object name="replayInfo" size="0 120 100% 100%-60" type="image" sprite="ModernDarkBoxGold" hidden="true">
 
                 <!-- Map Name Label -->
                 <object name="sgMapName" size="0 5 100% 20" type="text" style="ModernLabelText"/>
 
                 <!-- Map Preview Image -->