Index: ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_filters.js =================================================================== --- ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_filters.js (revision 25403) +++ ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_filters.js (revision 25404) @@ -1,302 +1,308 @@ /** * Allow to filter replays by duration in 15min / 30min intervals. */ var g_DurationFilterIntervals = [ { "min": -1, "max": -1 }, { "min": -1, "max": 15 }, { "min": 15, "max": 30 }, { "min": 30, "max": 45 }, { "min": 45, "max": 60 }, { "min": 60, "max": 90 }, { "min": 90, "max": 120 }, { "min": 120, "max": -1 } ]; /** * Allow to filter by population capacity. */ const g_PopulationCapacities = prepareForDropdown(g_Settings && g_Settings.PopulationCapacities); const g_WorldPopulationCapacities = prepareForDropdown(g_Settings && g_Settings.WorldPopulationCapacities); /** * Reloads the selectable values in the filters. The filters depend on g_Settings and g_Replays * (including its derivatives g_MapSizes, g_MapNames). */ function initFilters(filters) { if (filters && filters.compatibility !== undefined) Engine.GetGUIObjectByName("compatibilityFilter").checked = filters.compatibility; if (filters && filters.playernames) Engine.GetGUIObjectByName("playersFilter").caption = filters.playernames; initDateFilter(filters); initMapSizeFilter(filters); initMapNameFilter(filters); initPopCapFilter(filters); initDurationFilter(filters); initSingleplayerFilter(filters); initVictoryConditionFilter(filters); initRatedGamesFilter(filters); } /** * Allow to filter by month. Uses g_Replays. */ function initDateFilter(filters) { var months = g_Replays.map(replay => getReplayMonth(replay)); months = months.filter((month, index) => months.indexOf(month) == index).sort(); var dateTimeFilter = Engine.GetGUIObjectByName("dateTimeFilter"); dateTimeFilter.list = [translateWithContext("datetime", "Any")].concat(months); dateTimeFilter.list_data = [""].concat(months); if (filters && filters.date) dateTimeFilter.selected = dateTimeFilter.list_data.indexOf(filters.date); if (dateTimeFilter.selected == -1 || dateTimeFilter.selected >= dateTimeFilter.list.length) dateTimeFilter.selected = 0; } /** * Allow to filter by mapsize. Uses g_MapSizes. */ function initMapSizeFilter(filters) { var mapSizeFilter = Engine.GetGUIObjectByName("mapSizeFilter"); mapSizeFilter.list = [translateWithContext("map size", "Any")].concat(g_MapSizes.Name); mapSizeFilter.list_data = [-1].concat(g_MapSizes.Tiles); if (filters && filters.mapSize) mapSizeFilter.selected = mapSizeFilter.list_data.indexOf(filters.mapSize); if (mapSizeFilter.selected == -1 || mapSizeFilter.selected >= mapSizeFilter.list.length) mapSizeFilter.selected = 0; } /** * Allow to filter by mapname. Uses g_MapNames. */ function initMapNameFilter(filters) { var mapNameFilter = Engine.GetGUIObjectByName("mapNameFilter"); mapNameFilter.list = [translateWithContext("map name", "Any")].concat(g_MapNames.map(name => translate(name))); mapNameFilter.list_data = [""].concat(g_MapNames); if (filters && filters.mapName) mapNameFilter.selected = mapNameFilter.list_data.indexOf(filters.mapName); if (mapNameFilter.selected == -1 || mapNameFilter.selected >= mapNameFilter.list.length) mapNameFilter.selected = 0; } /** * Allow to filter by population capacity. */ function initPopCapFilter(filters) { var populationFilter = Engine.GetGUIObjectByName("populationFilter"); populationFilter.list = [translateWithContext("population capacity", "Any")].concat(g_PopulationCapacities.Title); populationFilter.list_data = [""].concat(g_PopulationCapacities.Population); if (filters && filters.popCap) populationFilter.selected = populationFilter.list_data.indexOf(filters.popCap); if (populationFilter.selected == -1 || populationFilter.selected >= populationFilter.list.length) populationFilter.selected = 0; } /** * Allow to filter by game duration. Uses g_DurationFilterIntervals. */ function initDurationFilter(filters) { var durationFilter = Engine.GetGUIObjectByName("durationFilter"); durationFilter.list = g_DurationFilterIntervals.map((interval, index) => { if (index == 0) return translateWithContext("duration", "Any"); if (index == 1) // Translation: Shorter duration than max minutes. return sprintf(translatePluralWithContext("duration filter", "< %(max)s min", "< %(max)s min", interval.max), interval); if (index == g_DurationFilterIntervals.length - 1) // Translation: Longer duration than min minutes. return sprintf(translatePluralWithContext("duration filter", "> %(min)s min", "> %(min)s min", interval.min), interval); // Translation: Duration between min and max minutes. return sprintf(translateWithContext("duration filter", "%(min)s - %(max)s min"), interval); }); durationFilter.list_data = g_DurationFilterIntervals.map((interval, index) => index); if (filters && filters.duration) durationFilter.selected = durationFilter.list_data.indexOf(filters.duration); if (durationFilter.selected == -1 || durationFilter.selected >= g_DurationFilterIntervals.length) durationFilter.selected = 0; } function initSingleplayerFilter(filters) { let singleplayerFilter = Engine.GetGUIObjectByName("singleplayerFilter"); - singleplayerFilter.list = [translate("Single-player and multiplayer"), translate("Single-player"), translate("Multiplayer")]; - singleplayerFilter.list_data = ["", "Single-player", "Multiplayer"]; + singleplayerFilter.list = [ + translateWithContext("replay filter", "Any"), + translateWithContext("replay filter", "Single-player"), + translateWithContext("replay filter", "Multiplayer"), + translateWithContext("replay filter", "Campaigns") + ]; + singleplayerFilter.list_data = ["", "Single-player", "Multiplayer", "Campaigns"]; if (filters && filters.singleplayer) singleplayerFilter.selected = singleplayerFilter.list_data.indexOf(filters.singleplayer); if (singleplayerFilter.selected < 0 || singleplayerFilter.selected >= singleplayerFilter.list.length) singleplayerFilter.selected = 0; } function initVictoryConditionFilter(filters) { let victoryConditionFilter = Engine.GetGUIObjectByName("victoryConditionFilter"); victoryConditionFilter.list = [translate("Any victory condition")].concat(g_VictoryConditions.map(victoryCondition => translateVictoryCondition(victoryCondition.Name))); victoryConditionFilter.list_data = [""].concat(g_VictoryConditions.map(victoryCondition => victoryCondition.Name)); if (filters && filters.victoryCondition) victoryConditionFilter.selected = victoryConditionFilter.list_data.indexOf(filters.victoryCondition); if (victoryConditionFilter.selected < 0 || victoryConditionFilter.selected >= victoryConditionFilter.list.length) victoryConditionFilter.selected = 0; } function initRatedGamesFilter(filters) { let ratedGamesFilter = Engine.GetGUIObjectByName("ratedGamesFilter"); ratedGamesFilter.list = [translate("Rated and unrated games"), translate("Rated games"), translate("Unrated games")]; ratedGamesFilter.list_data = ["", "rated", "not rated"]; if (filters && filters.ratedGames) ratedGamesFilter.selected = ratedGamesFilter.list_data.indexOf(filters.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() { let sortKey = Engine.GetGUIObjectByName("replaySelection").selected_column; let sortOrder = Engine.GetGUIObjectByName("replaySelection").selected_column_order; g_ReplaysFiltered = g_Replays.filter(replay => filterReplay(replay)).sort((a, b) => { let cmpA, cmpB; switch (sortKey) { case 'months': cmpA = +a.attribs.timestamp; cmpB = +b.attribs.timestamp; break; case 'duration': cmpA = +a.duration; cmpB = +b.duration; break; case 'players': cmpA = +a.attribs.settings.PlayerData.length; cmpB = +b.attribs.settings.PlayerData.length; break; case 'mapName': cmpA = getReplayMapName(a); cmpB = getReplayMapName(b); break; case 'mapSize': cmpA = +a.attribs.settings.Size; cmpB = +b.attribs.settings.Size; break; case 'popCapacity': cmpA = +a.attribs.settings.PopulationCap; cmpB = +b.attribs.settings.PopulationCap; break; } if (cmpA < cmpB) return -sortOrder; else if (cmpA > cmpB) return +sortOrder; return 0; }); } /** * Decides whether the replay should be listed. * * @returns {bool} - true if replay should be visible */ function filterReplay(replay) { // Check for compatibility first (most likely to filter) let compatibilityFilter = Engine.GetGUIObjectByName("compatibilityFilter"); if (compatibilityFilter.checked && !isReplayCompatible(replay)) return false; // Filter by single-player or multiplayer. let singleplayerFilter = Engine.GetGUIObjectByName("singleplayerFilter"); let selectedSingleplayerFilter = singleplayerFilter.list_data[singleplayerFilter.selected] || ""; - if (selectedSingleplayerFilter == "Single-player" && replay.isMultiplayer || - selectedSingleplayerFilter == "Multiplayer" && !replay.isMultiplayer) + if (selectedSingleplayerFilter == "Campaigns" && !replay.isCampaign || + selectedSingleplayerFilter == "Single-player" && (replay.isMultiplayer || replay.isCampaign) || + selectedSingleplayerFilter == "Multiplayer" && (!replay.isMultiplayer || replay.isCampaign)) return false; // Filter by victory condition let victoryConditionFilter = Engine.GetGUIObjectByName("victoryConditionFilter"); if (victoryConditionFilter.selected > 0 && replay.attribs.settings.VictoryConditions.indexOf(victoryConditionFilter.list_data[victoryConditionFilter.selected]) == -1) return false; // Filter by rating let ratedGamesFilter = Engine.GetGUIObjectByName("ratedGamesFilter"); let selectedRatedGamesFilter = ratedGamesFilter.list_data[ratedGamesFilter.selected] || ""; if (selectedRatedGamesFilter == "rated" && !replay.isRated || selectedRatedGamesFilter == "not rated" && replay.isRated) return false; // Filter date/time (select a month) let dateTimeFilter = Engine.GetGUIObjectByName("dateTimeFilter"); if (dateTimeFilter.selected > 0 && getReplayMonth(replay) != dateTimeFilter.list_data[dateTimeFilter.selected]) return false; // Filter by playernames 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 let mapNameFilter = Engine.GetGUIObjectByName("mapNameFilter"); - if (mapNameFilter.selected > 0 && getReplayMapName(replay) != mapNameFilter.list_data[mapNameFilter.selected]) + if (mapNameFilter.selected > 0 && replay.attribs.settings.Name != mapNameFilter.list_data[mapNameFilter.selected]) return false; // Filter by map size let mapSizeFilter = Engine.GetGUIObjectByName("mapSizeFilter"); if (mapSizeFilter.selected > 0 && replay.attribs.settings.Size != mapSizeFilter.list_data[mapSizeFilter.selected]) return false; // Filter by population capacity let populationFilter = Engine.GetGUIObjectByName("populationFilter"); if (populationFilter.selected > 0 && replay.attribs.settings.PopulationCap != populationFilter.list_data[populationFilter.selected]) return false; // Filter by game duration let durationFilter = Engine.GetGUIObjectByName("durationFilter"); if (durationFilter.selected > 0) { let interval = g_DurationFilterIntervals[durationFilter.selected]; if ((interval.min > -1 && replay.duration < interval.min * 60) || (interval.max > -1 && replay.duration > interval.max * 60)) return false; } return true; } Index: ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_menu.js =================================================================== --- ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_menu.js (revision 25403) +++ ps/trunk/binaries/data/mods/public/gui/replaymenu/replay_menu.js (revision 25404) @@ -1,364 +1,366 @@ /** * Used for checking replay compatibility. */ const g_EngineInfo = Engine.GetEngineInfo(); /** * Needed for formatPlayerInfo to show the player civs in the details. */ const g_CivData = loadCivData(false, false); /** * Used for creating the mapsize filter. */ const g_MapSizes = prepareForDropdown(g_Settings && g_Settings.MapSizes); /** * All replays found in the directory. */ var g_Replays = []; /** * List of replays after applying the display filter. */ var g_ReplaysFiltered = []; /** * Array of unique usernames of all replays. Used for autocompleting usernames. */ var g_Playernames = []; /** * Sorted list of unique maptitles. Used by mapfilter. */ var g_MapNames = []; /** * Sorted list of the victory conditions occuring in the replays */ var g_VictoryConditions = g_Settings && g_Settings.VictoryConditions; /** * Directory name of the currently selected replay. Used to restore the selection after changing filters. */ var g_SelectedReplayDirectory = ""; /** * Skip duplicate expensive GUI updates before init is complete. */ var g_ReplaysLoaded = false; /** * Remember last viewed summary panel and charts. */ var g_SummarySelection; var g_MapCache = new MapCache(); /** * Initializes globals, loads replays and displays the list. */ function init(data) { if (!g_Settings) { Engine.SwitchGuiPage("page_pregame.xml"); return; } g_SummarySelection = data && data.summarySelection; loadReplays(data && data.replaySelectionData, false); if (!g_Replays) { Engine.SwitchGuiPage("page_pregame.xml"); return; } initHotkeyTooltips(); displayReplayList(); } /** * Store the list of replays loaded in C++ in g_Replays. * Check timestamp and compatibility and extract g_Playernames, g_MapNames, g_VictoryConditions. * Restore selected filters and item. * @param replaySelectionData - Currently selected filters and item to be restored after the loading. * @param compareFiles - If true, compares files briefly (which might be slow with optical harddrives), * otherwise blindly trusts the replay cache. */ function loadReplays(replaySelectionData, compareFiles) { g_Replays = Engine.GetReplays(compareFiles); if (!g_Replays) return; g_Playernames = []; for (let replay of g_Replays) { let nonAIPlayers = 0; // Check replay for compatibility replay.isCompatible = isReplayCompatible(replay); sanitizeInitAttributes(replay.attribs); // Extract map names if (g_MapNames.indexOf(replay.attribs.settings.Name) == -1 && replay.attribs.settings.Name != "") g_MapNames.push(replay.attribs.settings.Name); // Extract playernames for (let playerData of replay.attribs.settings.PlayerData) { if (!playerData || playerData.AI) continue; // Remove rating from nick let playername = playerData.Name; let ratingStart = playername.indexOf(" ("); if (ratingStart != -1) playername = playername.substr(0, ratingStart); if (g_Playernames.indexOf(playername) == -1) g_Playernames.push(playername); ++nonAIPlayers; } replay.isMultiplayer = nonAIPlayers > 1; + if (replay.attribs.campaignData) + replay.isCampaign = true; replay.isRated = nonAIPlayers == 2 && replay.attribs.settings.PlayerData.length == 2 && replay.attribs.settings.RatingEnabled; } g_MapNames.sort(); // Reload filters (since they depend on g_Replays and its derivatives) initFilters(replaySelectionData && replaySelectionData.filters); // Restore user selection if (replaySelectionData) { if (replaySelectionData.directory) g_SelectedReplayDirectory = replaySelectionData.directory; let replaySelection = Engine.GetGUIObjectByName("replaySelection"); if (replaySelectionData.column) replaySelection.selected_column = replaySelectionData.column; if (replaySelectionData.columnOrder) replaySelection.selected_column_order = replaySelectionData.columnOrder; } g_ReplaysLoaded = true; } /** * We may encounter malformed replays. */ function sanitizeInitAttributes(attribs) { if (!attribs.settings) attribs.settings = {}; if (!attribs.settings.Size) attribs.settings.Size = -1; if (!attribs.settings.Name) attribs.settings.Name = ""; if (!attribs.settings.PlayerData) attribs.settings.PlayerData = []; if (!attribs.settings.PopulationCap) attribs.settings.PopulationCap = 300; if (!attribs.mapType) attribs.mapType = "skirmish"; // Remove gaia if (attribs.settings.PlayerData.length && attribs.settings.PlayerData[0] == null) attribs.settings.PlayerData.shift(); attribs.settings.PlayerData.forEach((pData, index) => { if (!pData.Name) pData.Name = ""; }); } function initHotkeyTooltips() { Engine.GetGUIObjectByName("playersFilter").tooltip = translate("Filter replays by typing one or more, partial or complete player names.") + " " + colorizeAutocompleteHotkey(); let deleteTooltip = colorizeHotkey( translate("Delete the selected replay using %(hotkey)s."), "session.savedgames.delete"); if (deleteTooltip) deleteTooltip += colorizeHotkey( "\n" + translate("Hold %(hotkey)s to skip the confirmation dialog while deleting."), "session.savedgames.noconfirmation"); Engine.GetGUIObjectByName("deleteReplayButton").tooltip = deleteTooltip; } /** * Filter g_Replays, fill the GUI list with that data and show the description of the current replay. */ function displayReplayList() { if (!g_ReplaysLoaded) return; // Remember previously selected replay var replaySelection = Engine.GetGUIObjectByName("replaySelection"); if (replaySelection.selected != -1) g_SelectedReplayDirectory = g_ReplaysFiltered[replaySelection.selected].directory; filterReplays(); var list = g_ReplaysFiltered.map(replay => { let works = replay.isCompatible; return { "directories": replay.directory, "months": compatibilityColor(getReplayDateTime(replay), works), "popCaps": compatibilityColor(translatePopulationCapacity(replay.attribs.settings.PopulationCap, !!replay.attribs.settings.WorldPopulation), works), "mapNames": compatibilityColor(getReplayMapName(replay), works), "mapSizes": compatibilityColor(translateMapSize(replay.attribs.settings.Size), works), "durations": compatibilityColor(getReplayDuration(replay), works), "playerNames": compatibilityColor(getReplayPlayernames(replay), works) }; }); if (list.length) list = prepareForDropdown(list); // Push to GUI replaySelection.selected = -1; replaySelection.list_months = list.months || []; replaySelection.list_players = list.playerNames || []; replaySelection.list_mapName = list.mapNames || []; replaySelection.list_mapSize = list.mapSizes || []; replaySelection.list_popCapacity = list.popCaps || []; replaySelection.list_duration = list.durations || []; // Change these last, otherwise crash replaySelection.list = list.directories || []; replaySelection.list_data = list.directories || []; replaySelection.selected = replaySelection.list.findIndex(directory => directory == g_SelectedReplayDirectory); displayReplayDetails(); } /** * Shows preview image, description and player text in the right panel. */ function displayReplayDetails() { let selected = Engine.GetGUIObjectByName("replaySelection").selected; let replaySelected = selected > -1; Engine.GetGUIObjectByName("replayInfo").hidden = !replaySelected; Engine.GetGUIObjectByName("replayInfoEmpty").hidden = replaySelected; Engine.GetGUIObjectByName("startReplayButton").enabled = replaySelected; Engine.GetGUIObjectByName("deleteReplayButton").enabled = replaySelected; Engine.GetGUIObjectByName("replayFilename").hidden = !replaySelected; Engine.GetGUIObjectByName("summaryButton").hidden = true; if (!replaySelected) return; let replay = g_ReplaysFiltered[selected]; Engine.GetGUIObjectByName("sgMapName").caption = translate(replay.attribs.settings.Name); Engine.GetGUIObjectByName("sgMapSize").caption = translateMapSize(replay.attribs.settings.Size); Engine.GetGUIObjectByName("sgMapType").caption = translateMapType(replay.attribs.mapType); Engine.GetGUIObjectByName("sgVictory").caption = replay.attribs.settings.VictoryConditions.map(victoryConditionName => translateVictoryCondition(victoryConditionName)).join(translate(", ")); Engine.GetGUIObjectByName("sgNbPlayers").caption = sprintf(translate("Players: %(numberOfPlayers)s"), { "numberOfPlayers": replay.attribs.settings.PlayerData.length }); Engine.GetGUIObjectByName("replayFilename").caption = Engine.GetReplayDirectoryName(replay.directory); let metadata = Engine.GetReplayMetadata(replay.directory); Engine.GetGUIObjectByName("sgPlayersNames").caption = formatPlayerInfo( replay.attribs.settings.PlayerData, Engine.GetGUIObjectByName("showSpoiler").checked && metadata && metadata.playerStates && metadata.playerStates.map(pState => pState.state)); Engine.GetGUIObjectByName("sgMapPreview").sprite = g_MapCache.getMapPreview(replay.attribs.mapType, replay.attribs.map, replay.attribs?.mapPreview); Engine.GetGUIObjectByName("sgMapDescription").caption = g_MapCache.getTranslatedMapDescription(replay.attribs.mapType, replay.attribs.map); Engine.GetGUIObjectByName("summaryButton").hidden = !Engine.HasReplayMetadata(replay.directory); } /** * Returns a human-readable version of the replay date. */ function getReplayDateTime(replay) { return Engine.FormatMillisecondsIntoDateStringLocal(replay.attribs.timestamp * 1000, translate("yyyy-MM-dd HH:mm")); } /** * Returns a human-readable list of the playernames of that replay. * * @returns {string} */ function getReplayPlayernames(replay) { return replay.attribs.settings.PlayerData.map(pData => pData.Name).join(", "); } /** * Returns the name of the map of the given replay. * * @returns {string} */ function getReplayMapName(replay) { return translate(replay.attribs.settings.Name); } /** * Returns the month of the given replay in the format "yyyy-MM". * * @returns {string} */ function getReplayMonth(replay) { return Engine.FormatMillisecondsIntoDateStringLocal(replay.attribs.timestamp * 1000, translate("yyyy-MM")); } /** * Returns a human-readable version of the time when the replay started. * * @returns {string} */ function getReplayDuration(replay) { return timeToString(replay.duration * 1000); } /** * True if we can start the given replay with the currently loaded mods. */ function isReplayCompatible(replay) { return replayHasSameEngineVersion(replay) && hasSameMods(replay.attribs.mods, g_EngineInfo.mods); } /** * True if we can start the given replay with the currently loaded mods. */ function replayHasSameEngineVersion(replay) { return replay.attribs.engine_version && replay.attribs.engine_version == g_EngineInfo.engine_version; }