Index: binaries/data/config/default.cfg =================================================================== --- binaries/data/config/default.cfg +++ binaries/data/config/default.cfg @@ -380,6 +380,14 @@ xpartamupp = "wfgbot23" ; Name of the server-side xmpp client that manage games buddies = "," ; Comma separated list of playernames that the current user has marked as buddies +[lobby.players] +sort = "," ; Comma separated list of columns sort ordering of players +order = "ascending" + +[lobby.games] +sort = "," ; Comma separated list of columns sort ordering of games +order = "ascending" + [lobby.columns] gamerating = false ; Show the average rating of the participating players in a column of the gamelist Index: binaries/data/mods/public/gui/common/functions_utility.js =================================================================== --- binaries/data/mods/public/gui/common/functions_utility.js +++ binaries/data/mods/public/gui/common/functions_utility.js @@ -3,6 +3,25 @@ */ var g_LastNickNotification = -1; +/** + * XEP-0172 doesn't restrict nicknames, but our lobby policy does. + * So use this human readable delimiter to separate buddy names in the config file. + */ +var g_ConfigListDelimiter = ","; + +/** + * Divide 1 with rate to turn around order and + * round to 8th decimal place (setted to fixed 8 decimal places) + */ +function setUserConfigValues(key, array) +{ +// warn(uneval(array)); + // Don't save empty strings to the config file + let value = array.filter(value => value).join(g_ConfigListDelimiter) || g_ConfigListDelimiter; +// warn(uneval(value)); + Engine.ConfigDB_CreateValue("user", key, value); +} + // Get list of XML files in pathname with recursion, excepting those starting with _ function getXMLFileList(pathname) { Index: binaries/data/mods/public/gui/common/gamedescription.js =================================================================== --- binaries/data/mods/public/gui/common/gamedescription.js +++ binaries/data/mods/public/gui/common/gamedescription.js @@ -9,13 +9,6 @@ var g_DefaultLobbyRating = 1200; /** - * XEP-0172 doesn't restrict nicknames, but our lobby policy does. - * So use this human readable delimiter to separate buddy names in the config file. - */ -var g_BuddyListDelimiter = ","; - - -/** * Returns the nickname without the lobby rating. */ function splitRatingFromNick(playerName) @@ -31,7 +24,7 @@ /** * Array of playernames that the current user has marked as buddies. */ -var g_Buddies = Engine.ConfigDB_GetValue("user", "lobby.buddies").split(g_BuddyListDelimiter); +var g_Buddies = Engine.ConfigDB_GetValue("user", "lobby.buddies").split(g_ConfigListDelimiter); /** * Denotes which players are a lobby buddy of the current user. Index: binaries/data/mods/public/gui/lobby/lobby.js =================================================================== --- binaries/data/mods/public/gui/lobby/lobby.js +++ binaries/data/mods/public/gui/lobby/lobby.js @@ -327,6 +327,26 @@ }; /** + * Initial sorting order for playerslist + */ +let g_PlayersSort = Engine.ConfigDB_GetValue("user", "lobby.players.sort").split(g_ConfigListDelimiter); + +/** + * Initial sorting order for gameslist + */ +let g_GamesSort = Engine.ConfigDB_GetValue("user", "lobby.games.sort").split(g_ConfigListDelimiter); + +/** + * Initial sorting order direction for playerslist + */ +let g_PlayersSortOrder = Engine.ConfigDB_GetValue("user", "lobby.players.order") == "ascending" ? 1 : -1; + +/** + * Initial sorting order direction for gameslist + */ +let g_GamesSortOrder = Engine.ConfigDB_GetValue("user", "lobby.games.order") == "ascending" ? 1 : -1; + +/** * Called after the XmppConnection succeeded and when returning from a game. * * @param {Object} attribs @@ -342,6 +362,11 @@ initMusic(); global.music.setState(global.music.states.MENU); + Engine.GetGUIObjectByName("playersBox").selected_column = g_PlayersSort[0] || "name"; + Engine.GetGUIObjectByName("gamesBox").selected_column = g_GamesSort[0] || "name"; + Engine.GetGUIObjectByName("playersBox").selected_column_order = parseInt(g_PlayersSortOrder); + Engine.GetGUIObjectByName("gamesBox").selected_column_order = parseInt(g_GamesSortOrder); + initGameFilters(); Engine.LobbySetPlayerPresence("available"); @@ -550,50 +575,98 @@ toggleBuddyButton.enabled = playerName && playerName != g_Username; } +function reverseNumberRoundedToDigit(number, digit) +{ + return Math.round((1/number)*Math.pow(10, digit))/Math.pow(10, digit); +} + +/** + * Fills up number to length with zeros in front (f.e. for number as string comparison) + */ +function fedUpWithZeros(number, length) +{ + return (Array(length).join("0") + number).slice(-length); +} + /** * Do a full update of the player listing, including ratings from cached C++ information. */ function updatePlayerList() { let playersBox = Engine.GetGUIObjectByName("playersBox"); - let sortBy = playersBox.selected_column || "name"; - let sortOrder = playersBox.selected_column_order || 1; - + let sortBy = playersBox.selected_column; + let sortOrder = playersBox.selected_column_order; + let configChanged = false; + let buddyStatusList = []; let playerList = []; let presenceList = []; let nickList = []; let ratingList = []; + + if (sortOrder != g_PlayersSortOrder) + { + g_PlayersSortOrder = sortOrder; + setUserConfigValues("lobby.players.order", [g_PlayersSortOrder == 1 ? "ascending" : "descending"]); + configChanged = true; + } + + if (sortBy != g_PlayersSort[0]) + { + while (g_PlayersSort.lastIndexOf(sortBy) != -1) + g_PlayersSort.splice(g_PlayersSort.lastIndexOf(sortBy), 1); + g_PlayersSort.unshift(sortBy); + setUserConfigValues("lobby.players.sort", g_PlayersSort); + configChanged = true; + } + + if (configChanged) + Engine.ConfigDB_WriteFile("user", "config/user.cfg"); - let cleanPlayerList = Engine.GetPlayerList().map(player => { + let cleanPlayerList = [{name:"fpre", presence:"available", rating:"1700", role:"participant", isBuddy:false}, {name:"nigel87", presence:"available", rating:"1560", role:"participant", isBuddy:true}, {name:"phoenixdesk", presence:"available", rating:"1229", role:"participant", isBuddy:true}, {name:"Achelao", presence:"playing", rating:"1547", role:"participant", isBuddy:true}, {name:"borg-", presence:"playing", rating:"2159", role:"participant", isBuddy:true}, {name:"chrstgtr", presence:"playing", rating:"1641", role:"participant", isBuddy:true}, {name:"elexis", presence:"playing", rating:"", role:"moderator", isBuddy:true}, {name:"iApprove", presence:"playing", rating:"1464", role:"participant", isBuddy:true}, {name:"LeGenDz", presence:"playing", rating:"1471", role:"participant", isBuddy:true}, {name:"Pretension", presence:"playing", rating:"", role:"participant", isBuddy:true}, {name:"user1", presence:"playing", rating:"", role:"moderator", isBuddy:true}, {name:"fsvn", presence:"available", rating:"1175", role:"participant", isBuddy:false}, {name:"GoodBay", presence:"available", rating:"1135", role:"participant", isBuddy:false}, {name:"MadMeatBallMan", presence:"available", rating:"", role:"participant", isBuddy:false}, {name:"Ratings", presence:"available", rating:"", role:"moderator", isBuddy:false}, {name:"roxanne", presence:"available", rating:"909", role:"participant", isBuddy:false}, {name:"WFGbot", presence:"available", rating:"", role:"moderator", isBuddy:false}, {name:"ahmedteling", presence:"playing", rating:"1030", role:"participant", isBuddy:false}, {name:"Andresfcb2003", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"Bolvar", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"CaptIsler", presence:"playing", rating:"1100", role:"participant", isBuddy:false}, {name:"cleuberjs", presence:"playing", rating:"1064", role:"participant", isBuddy:false}, {name:"Crowley", presence:"playing", rating:"1135", role:"participant", isBuddy:false}, {name:"Emilio2006", presence:"playing", rating:"1089", role:"participant", isBuddy:false}, {name:"Ferhat_C", presence:"playing", rating:"961", role:"participant", isBuddy:false}, {name:"gaetheboss", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"good", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"HirnWolf", presence:"playing", rating:"1311", role:"participant", isBuddy:false}, {name:"iceblendedmocha", presence:"playing", rating:"1253", role:"participant", isBuddy:false}, {name:"imperator3", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"josavatar", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"K4OS", presence:"playing", rating:"1353", role:"participant", isBuddy:false}, {name:"kazutoo", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"Kuchen", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"Lombave", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"lucasbr788", presence:"playing", rating:"1202", role:"participant", isBuddy:false}, {name:"marciofly1", presence:"playing", rating:"1185", role:"participant", isBuddy:false}, {name:"markeloff_1.6", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"MTT123", presence:"playing", rating:"1283", role:"participant", isBuddy:false}, {name:"OutLander1", presence:"playing", rating:"1265", role:"participant", isBuddy:false}, {name:"outlander384", presence:"playing", rating:"1226", role:"participant", isBuddy:false}, {name:"Outlaw_7", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"Pale.May", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"playsofty", presence:"playing", rating:"1109", role:"participant", isBuddy:false}, {name:"protolich", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"Quicksilver", presence:"playing", rating:"1277", role:"participant", isBuddy:false}, {name:"Ragnark-", presence:"playing", rating:"1222", role:"participant", isBuddy:false}, {name:"Resul-55", presence:"playing", rating:"1335", role:"participant", isBuddy:false}, {name:"silius117", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"softcase", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"thatazoreanguy", presence:"playing", rating:"", role:"participant", isBuddy:false}, {name:"thered", presence:"playing", rating:"", role:"participant", isBuddy:false}].map(player => { player.isBuddy = g_Buddies.indexOf(player.name) != -1; + return player; }).sort((a, b) => { - let sortA, sortB; + let sortA = "", sortB = ""; let statusOrder = Object.keys(g_PlayerStatuses); let statusA = statusOrder.indexOf(a.presence) + a.name.toLowerCase(); let statusB = statusOrder.indexOf(b.presence) + b.name.toLowerCase(); - - switch (sortBy) - { - case 'buddy': - sortA = (a.isBuddy ? 1 : 2) + statusA; - sortB = (b.isBuddy ? 1 : 2) + statusB; - break; - case 'rating': - sortA = +a.rating; - sortB = +b.rating; - break; - case 'status': - sortA = statusA; - sortB = statusB; - break; - case 'name': - default: - sortA = a.name.toLowerCase(); - sortB = b.name.toLowerCase(); - break; - } + + for (let i = 0; i < g_PlayersSort.length; i++) + switch (g_PlayersSort[i]) + { + case 'buddy': + sortA += "" + (a.name.toLowerCase() == g_Username.toLowerCase() ? 1 : a.isBuddy ? 1 : 2); + sortB += "" + (b.name.toLowerCase() == g_Username.toLowerCase() ? 1 : b.isBuddy ? 1 : 2); + break; + case 'rating': + // switch order desc/asc cause rate importance shall be first + if (i != 0) + { + /** + * Divide 1 with rate to turn around order and + * round to 8th decimal place (setted to fixed 8 decimal places) + */ + sortA += (+(reverseNumberRoundedToDigit(a.rating ? a.rating : 1, 8))).toFixed(8); + sortB += (+(reverseNumberRoundedToDigit(b.rating ? b.rating : 1, 8))).toFixed(8); + } + else + { + sortA += fedUpWithZeros(b.rating ? b.rating : 1, 6); + sortB += fedUpWithZeros(a.rating ? a.rating : 1, 6); + } + break; + case 'status': + sortA += "" + statusOrder.indexOf(a.presence); + sortB += "" + statusOrder.indexOf(b.presence); + break; + case 'name': + default: + sortA += a.name.toLowerCase(); + sortB += b.name.toLowerCase(); + break; + } if (sortA < sortB) return -sortOrder; if (sortA > sortB) return +sortOrder; return 0; @@ -639,7 +712,7 @@ let playerList = Engine.GetGUIObjectByName("playersBox"); let name = playerList.list[playerList.selected]; - if (!name || name == g_Username || name.indexOf(g_BuddyListDelimiter) != -1) + if (!name || name == g_Username || name.indexOf(g_ConfigListDelimiter) != -1) return; let index = g_Buddies.indexOf(name); @@ -650,10 +723,7 @@ updateToggleBuddy(); - // Don't save empty strings to the config file - let buddies = g_Buddies.filter(nick => nick).join(g_BuddyListDelimiter) || g_BuddyListDelimiter; - Engine.ConfigDB_CreateValue("user", "lobby.buddies", buddies); - Engine.ConfigDB_WriteValueToFile("user", "lobby.buddies", buddies, "config/user.cfg"); + setUserConfigValues("lobby.buddies", g_Buddies); updatePlayerList(); updateGameList(); @@ -855,15 +925,34 @@ let gamesBox = Engine.GetGUIObjectByName("gamesBox"); let sortBy = gamesBox.selected_column; let sortOrder = gamesBox.selected_column_order; - + let configChanged = false; + if (gamesBox.selected > -1) { g_SelectedGameIP = g_GameList[gamesBox.selected].ip; g_SelectedGamePort = g_GameList[gamesBox.selected].port; } + + if (sortOrder != g_GamesSortOrder) + { + g_GamesSortOrder = sortOrder; + setUserConfigValues("lobby.games.order", [g_GamesSortOrder == 1 ? "ascending" : "descending"]); + configChanged = true; + } + + if (sortBy != g_GamesSort[0]) + { + while (g_GamesSort.lastIndexOf(sortBy) != -1) + g_GamesSort.splice(g_GamesSort.lastIndexOf(sortBy), 1); + g_GamesSort.unshift(sortBy); + setUserConfigValues("lobby.games.sort", g_GamesSort); + configChanged = true; + } + + if (configChanged) + Engine.ConfigDB_WriteFile("user", "config/user.cfg"); - g_GameList = Engine.GetGameList().map(game => { - + g_GameList = [{name:"CaptIsler's game", ip:"69.79.227.33", port:"20595", stunIP:"69.79.227.33", stunPort:"20595", hostUsername:"CaptIsler", state:"waiting", nbp:"3", maxnbp:"4", players:"{\"0\":\\[{\"Name\":\"CaptIsler (1100)\",\"Team\":0},{\"Name\":\"marciofly1 (1185)\",\"Team\":0}],\"1\":\\[{\"Name\":\"Andresfcb2003\",\"Team\":1},{\"Name\":\"delfinouno\",\"Team\":1,\"Offline\":true,\"State\":\"defeated\"}]}", mapName:"maps/random/mainland", niceMapName:"Mainland", mapSize:"384", mapType:"random", victoryCondition:"conquest", startTime:"1502491208", hasBuddies:0, gameRating:1171}, {name:"jjoin", ip:"88.232.31.170", port:"20595", stunIP:"", stunPort:"", hostUsername:"Resul-55", state:"waiting", nbp:"1", maxnbp:"4", players:"{\"0\":\\[{\"Name\":\"Resul-55 (1335)\",\"Team\":0,\"State\":\"defeated\"},{\"Name\":\"JordiStc2 (1157)\",\"Team\":0,\"Offline\":true,\"State\":\"defeated\"}],\"1\":\\[{\"Name\":\"Adrianoo (1132)\",\"Team\":1,\"Offline\":true,\"State\":\"won\"},{\"Name\":\"ElJaUnCa\",\"Team\":1,\"Offline\":true,\"State\":\"defeated\"}]}", mapName:"maps/skirmishes/Corinthian Isthmus (4)", niceMapName:"Corinthian Isthmus (4)", mapSize:"Default", mapType:"skirmish", victoryCondition:"conquest", startTime:"1502484628", hasBuddies:0, gameRating:1206}, {name:"1c1", ip:"73.191.6.77", port:"20595", stunIP:"73.191.6.77", stunPort:"20595", hostUsername:"protolich", state:"running", nbp:"2", maxnbp:"2", players:"{\"-1\":\\[{\"Name\":\"protolich\",\"Team\":-1},{\"Name\":\"outlander384 (1226)\",\"Team\":-1}]}", mapName:"maps/random/unknown_land", niceMapName:"Unknown Land", mapSize:"256", mapType:"random", victoryCondition:"conquest", startTime:"1502492620", hasBuddies:0, gameRating:1213}, {name:"2v2 3v3", ip:"80.142.22.43", port:"20595", stunIP:"80.142.22.43", stunPort:"20595", hostUsername:"Quicksilver", state:"running", nbp:"4", maxnbp:"4", players:"{\"0\":\\[{\"Name\":\"Quicksilver (1258)\",\"Team\":0},{\"Name\":\"K4OS (1353)\",\"Team\":0}],\"1\":\\[{\"Name\":\"MTT123 (1283)\",\"Team\":1},{\"Name\":\"markeloff_1.6\",\"Team\":1}],\"observer\":\\[{\"Name\":\"user1\",\"Team\":\"observer\"},{\"Name\":\"Achelao (1547)\",\"Team\":\"observer\"}]}", mapName:"maps/random/african_plains", niceMapName:"African Plains", mapSize:"256", mapType:"random", victoryCondition:"conquest", startTime:"1502493352", hasBuddies:1, gameRating:1274}, {name:"2vs2 for noobs", ip:"24.133.23.153", port:"20595", stunIP:"24.133.23.153", stunPort:"48043", hostUsername:"Ferhat_C", state:"running", nbp:"4", maxnbp:"4", players:"{\"0\":\\[{\"Name\":\"Ferhat_C (961)\",\"Team\":0},{\"Name\":\"softcase\",\"Team\":0}],\"1\":\\[{\"Name\":\"silius117\",\"Team\":1},{\"Name\":\"Ragnark- (1222)\",\"Team\":1}]}", mapName:"maps/random/mainland", niceMapName:"Mainland", mapSize:"256", mapType:"random", victoryCondition:"conquest", startTime:"1502493326", hasBuddies:0, gameRating:1146}, {name:"ahmedteling's game", ip:"197.2.63.204", port:"20595", stunIP:"197.2.63.204", stunPort:"20595", hostUsername:"ahmedteling", state:"running", nbp:"2", maxnbp:"2", players:"{\"0\":\\[{\"Name\":\"ahmedteling (1062)\",\"Team\":0}],\"1\":\\[{\"Name\":\"playsofty (1055)\",\"Team\":1}]}", mapName:"maps/random/empire", niceMapName:"Empire", mapSize:"320", mapType:"random", victoryCondition:"conquest", startTime:"1502493395", hasBuddies:0, gameRating:1059}, {name:"Crowley's game", ip:"5.146.195.89", port:"20595", stunIP:"5.146.195.89", stunPort:"23806", hostUsername:"Crowley", state:"running", nbp:"3", maxnbp:"5", players:"{\"0\":\\[{\"Name\":\"Crowley (1135)\",\"Team\":0},{\"Name\":\"OutLander1 (1265)\",\"Team\":0},{\"Name\":\"Kuchen\",\"Team\":0}],\"1\":\\[{\"Name\":\"Viriato\",\"Team\":1,\"AI\":\"petra\",\"AIDiff\":3},{\"Name\":\"Demosthenes\",\"Team\":1,\"AI\":\"petra\",\"AIDiff\":3}]}", mapName:"maps/random/island_stronghold", niceMapName:"Island Stronghold", mapSize:"384", mapType:"random", victoryCondition:"conquest_structures", startTime:"1502485786", hasBuddies:0, gameRating:1200}, {name:"Emilio2006's game", ip:"189.216.75.3", port:"20595", stunIP:"189.216.75.3", stunPort:"18583", hostUsername:"Emilio2006", state:"running", nbp:"2", maxnbp:"2", players:"{\"-1\":\\[{\"Name\":\"Emilio2006 (1089)\",\"Team\":-1},{\"Name\":\"iceblendedmocha (1253)\",\"Team\":-1}],\"observer\":\\[{\"Name\":\"imperator3\",\"Team\":\"observer\"}]}", mapName:"maps/random/cycladic_archipelago", niceMapName:"Cycladic Archipelago", mapSize:"256", mapType:"random", victoryCondition:"conquest", startTime:"1502494400", hasBuddies:0, gameRating:1171}, {name:"gaetheboss's game", ip:"85.69.131.38", port:"20595", stunIP:"85.69.131.38", stunPort:"20595", hostUsername:"gaetheboss", state:"running", nbp:"2", maxnbp:"4", players:"{\"0\":\\[{\"Name\":\"gaetheboss\",\"Team\":0},{\"Name\":\"Lombave\",\"Team\":0}],\"1\":\\[{\"Name\":\"Alcibiades\",\"Team\":1,\"AI\":\"petra\",\"AIDiff\":3},{\"Name\":\"Antiochus V Eupator\",\"Team\":1,\"AI\":\"petra\",\"AIDiff\":3}]}", mapName:"maps/skirmishes/Corinthian Isthmus (4)", niceMapName:"Corinthian Isthmus (4)", mapSize:"Default", mapType:"skirmish", victoryCondition:"conquest", startTime:"1502488118", hasBuddies:0, gameRating:1200}, {name:"HirnWolf's game", ip:"151.62.141.194", port:"20595", stunIP:"151.62.141.194", stunPort:"20595", hostUsername:"HirnWolf", state:"running", nbp:"4", maxnbp:"4", players:"{\"0\":\\[{\"Name\":\"HirnWolf (1311)\",\"Team\":0},{\"Name\":\"kazutoo\",\"Team\":0}],\"1\":\\[{\"Name\":\"lucasbr788 (1202)\",\"Team\":1},{\"Name\":\"cleuberjs (1064)\",\"Team\":1}]}", mapName:"maps/random/rivers", niceMapName:"Rivers", mapSize:"320", mapType:"random", victoryCondition:"conquest", startTime:"1502491882", hasBuddies:0, gameRating:1194}, {name:"Pale.May's game", ip:"85.242.180.216", port:"20595", stunIP:"85.242.180.216", stunPort:"20595", hostUsername:"Pale.May", state:"running", nbp:"2", maxnbp:"6", players:"{\"0\":\\[{\"Name\":\"Pale.May\",\"Team\":0},{\"Name\":\"thatazoreanguy\",\"Team\":0},{\"Name\":\"Darayavahush I\",\"Team\":0,\"AI\":\"petra\",\"AIDiff\":1}],\"1\":\\[{\"Name\":\"Viriato\",\"Team\":1,\"AI\":\"petra\",\"AIDiff\":1}],\"2\":\\[{\"Name\":\"Demosthenes\",\"Team\":2,\"AI\":\"petra\",\"AIDiff\":1}],\"3\":\\[{\"Name\":\"Hasdrubal Barca\",\"Team\":3,\"AI\":\"petra\",\"AIDiff\":1}]}", mapName:"maps/skirmishes/Two Seas (6)", niceMapName:"Two Seas (6)", mapSize:"Default", mapType:"skirmish", victoryCondition:"conquest", startTime:"1502492263", hasBuddies:0, gameRating:1200}, {name:"please dont join", ip:"24.66.44.35", port:"20595", stunIP:"24.66.44.35", stunPort:"20595", hostUsername:"Bolvar", state:"running", nbp:"2", maxnbp:"4", players:"{\"0\":\\[{\"Name\":\"Bolvar\",\"Team\":0},{\"Name\":\"Outlaw_7\",\"Team\":0}],\"1\":\\[{\"Name\":\"Ashokavardhan Maurya\",\"Team\":1,\"AI\":\"petra\",\"AIDiff\":2},{\"Name\":\"Gaius Servilius Structus Ahala\",\"Team\":1,\"AI\":\"petra\",\"AIDiff\":2}]}", mapName:"maps/skirmishes/Caspian Sea (2v2)", niceMapName:"Caspian Sea (2v2)", mapSize:"Default", mapType:"skirmish", victoryCondition:"conquest", startTime:"1502490832", hasBuddies:0, gameRating:1200}, {name:"Pretension's game", ip:"81.240.97.23", port:"20595", stunIP:"81.240.97.23", stunPort:"58098", hostUsername:"Pretension", state:"running", nbp:"4", maxnbp:"4", players:"{\"0\":\\[{\"Name\":\"Pretension\",\"Team\":0},{\"Name\":\"iApprove (1464)\",\"Team\":0}],\"1\":\\[{\"Name\":\"chrstgtr (1641)\",\"Team\":1},{\"Name\":\"LeGenDz (1471)\",\"Team\":1}]}", mapName:"maps/random/african_plains", niceMapName:"African Plains", mapSize:"320", mapType:"random", victoryCondition:"conquest", startTime:"1502492173", hasBuddies:2, gameRating:1444}].map(game => { game.hasBuddies = 0; // Compute average rating of participating players @@ -888,32 +977,54 @@ return game; }).filter(game => !filterGame(game)).sort((a, b) => { - let sortA, sortB; - switch (sortBy) - { - case 'name': - sortA = g_GameStatusOrder.indexOf(a.state) + a.name.toLowerCase(); - sortB = g_GameStatusOrder.indexOf(b.state) + b.name.toLowerCase(); - break; - case 'gameRating': - case 'mapSize': - case 'mapType': - sortA = a[sortBy]; - sortB = b[sortBy]; - break; - case 'buddy': - sortA = String(b.hasBuddies) + g_GameStatusOrder.indexOf(a.state) + a.name.toLowerCase(); - sortB = String(a.hasBuddies) + g_GameStatusOrder.indexOf(b.state) + b.name.toLowerCase(); - break; - case 'mapName': - sortA = translate(a.niceMapName); - sortB = translate(b.niceMapName); - break; - case 'nPlayers': - sortA = a.maxnbp; - sortB = b.maxnbp; - break; - } + let sortA = "", sortB = ""; + + for (let i = 0; i < g_GamesSort.length; i++) + switch (g_GamesSort[i]) + { + case 'buddy': + sortA += String(b.hasBuddies); + sortB += String(a.hasBuddies); + break; + case 'gameRating': + // switch order desc/asc cause rate importance shall be first + if (i != 0) + { + /** + * Divide 1 with rate to turn around order and + * round to 8th decimal place (setted to fixed 8 decimal places) + */ + sortA += (+(reverseNumberRoundedToDigit(a.gameRating ? a.gameRating : 1, 8))).toFixed(8); + sortB += (+(reverseNumberRoundedToDigit(b.gameRating ? b.gameRating : 1, 8))).toFixed(8); + } + else + { + sortA += fedUpWithZeros(b.gameRating ? b.gameRating : 1, 6); + sortB += fedUpWithZeros(a.gameRating ? a.gameRating : 1, 6); + } + break; + case 'mapSize': + sortA += a.mapSize; + sortB += b.mapSize; + break; + case 'mapType': + sortA += a.mapType; + sortB += b.mapType; + break; + case 'mapName': + sortA += translate(a.niceMapName); + sortB += translate(b.niceMapName); + break; + case 'nPlayers': + sortA += fedUpWithZeros(eval(a.nbp) + eval(a.maxnbp), 6); + sortB += fedUpWithZeros(eval(b.nbp) + eval(b.maxnbp), 6); + break; + case 'name': + default: + sortA += g_GameStatusOrder.indexOf(a.state) + a.name.toLowerCase(); + sortB += g_GameStatusOrder.indexOf(b.state) + b.name.toLowerCase(); + break; + } if (sortA < sortB) return -sortOrder; if (sortA > sortB) return +sortOrder; return 0;