Index: binaries/data/mods/mod/gui/modmod/modmod.js =================================================================== --- binaries/data/mods/mod/gui/modmod/modmod.js +++ binaries/data/mods/mod/gui/modmod/modmod.js @@ -7,7 +7,6 @@ * "name": "0ad", * "version": "0.0.16", * "label": "0 A.D. - Empires Ascendant", - * "type": "content|functionality|mixed/mod-pack", * "url": "http://wildfregames.com/", * "description": "A free, open-source, historical RTS game.", * "dependencies": [] @@ -96,7 +95,6 @@ { Engine.GetGUIObjectByName("negateFilter").checked = false; Engine.GetGUIObjectByName("modGenericFilter").caption = translate("Filter"); - Engine.GetGUIObjectByName("modTypeFilter").selected = 0; let sortBy = Engine.GetGUIObjectByName("sortBy"); sortBy.list = g_SortOptions.map(option => option.title); @@ -129,8 +127,6 @@ function displayModList(listObjectName, folders) { - updateModTypes(); - let sortOption = g_SortOptions[Engine.GetGUIObjectByName("sortBy").selected]; if (sortOption && listObjectName == "modsDisabledList") { @@ -145,24 +141,12 @@ listObject.list_name = folders.map(folder => g_Mods[folder].name); listObject.list_modFolderName = folders; listObject.list_modLabel = folders.map(folder => g_Mods[folder].label); - listObject.list_modType = folders.map(folder => g_Mods[folder].type || ""); listObject.list_modURL = folders.map(folder => g_Mods[folder].url || ""); listObject.list_modVersion = folders.map(folder => g_Mods[folder].version); listObject.list_modDependencies = folders.map(folder => g_Mods[folder].dependencies.join(" ")); listObject.list = folders; } -function updateModTypes() -{ - let types = [translate("Type: Any")]; - for (let folder in g_Mods) - { - if (g_Mods[folder].type && types.indexOf(g_Mods[folder].type) == -1) - types.push(g_Mods[folder].type); - } - Engine.GetGUIObjectByName("modTypeFilter").list = types; -} - function enableMod() { let modsDisabledList = Engine.GetGUIObjectByName("modsDisabledList"); @@ -212,9 +196,7 @@ { Engine.GetGUIObjectByName("modGenericFilter").caption = ""; Engine.GetGUIObjectByName("negateFilter").checked = false; - - // Calling displayModLists is not needed as the selection changes and that calls applyFilters - Engine.GetGUIObjectByName("modTypeFilter").selected = 0; + displayModLists(); } function applyFilters() @@ -242,19 +224,14 @@ { let mod = g_Mods[folder]; - let modTypeFilter = Engine.GetGUIObjectByName("modTypeFilter"); let negateFilter = Engine.GetGUIObjectByName("negateFilter").checked; - - if (modTypeFilter.selected > 0 && (mod.type || "") != modTypeFilter.list[modTypeFilter.selected]) - return negateFilter; - let searchText = Engine.GetGUIObjectByName("modGenericFilter").caption; + if (searchText && searchText != translate("Filter") && folder.indexOf(searchText) == -1 && mod.name.indexOf(searchText) == -1 && mod.label.indexOf(searchText) == -1 && - (mod.type || "").indexOf(searchText) == -1 && (mod.url || "").indexOf(searchText) == -1 && mod.version.indexOf(searchText) == -1 && mod.description.indexOf(searchText) == -1 && @@ -334,13 +311,11 @@ /** * Compares the given versions using the given operator. - * '-' or '_' is ignored. Only numbers are supported. - * @note "5.3" < "5.3.0" */ function versionSatisfied(version1, operator, version2) { - let versionList1 = version1.split(/[-_]/)[0].split(/\./g); - let versionList2 = version2.split(/[-_]/)[0].split(/\./g); + let versionList1 = version1.split("."); + let versionList2 = version2.split("."); let eq = operator.indexOf("=") != -1; let lt = operator.indexOf("<") != -1; Index: binaries/data/mods/mod/gui/modmod/modmod.xml =================================================================== --- binaries/data/mods/mod/gui/modmod/modmod.xml +++ binaries/data/mods/mod/gui/modmod/modmod.xml @@ -32,26 +32,17 @@ applyFilters(); - - applyFilters(); - - applyFilters(); - + Negate @@ -115,12 +106,9 @@ (Folder) - + Mod Label - - Mod Type - Dependencies @@ -164,12 +152,9 @@ (Folder) - + Mod Label - - Mod Type - Dependencies