Ticket #3143: 3143_lobby_data_v2.2.patch
File 3143_lobby_data_v2.2.patch, 12.6 KB (added by , 8 years ago) |
---|
-
binaries/data/mods/public/gui/gamesetup/gamesetup.js
676 676 { 677 677 if (g_IsController && Engine.HasXmppClient()) 678 678 { 679 let playerNames = Object.keys(g_PlayerAssignments).map(guid => g_PlayerAssignments[guid].name);680 Engine.SendChangeStateGame( playerNames.length, playerNames.join(", "));679 let clients = formatClients(); 680 Engine.SendChangeStateGame(clients.players.length, clients.players.join(", "), clients.observers.join(", ")); 681 681 } 682 682 683 683 Engine.SwitchGuiPage("page_loading.xml", { … … 1922 1922 setReady(false, false); 1923 1923 } 1924 1924 1925 function formatClients() 1926 { 1927 let observerNames = []; 1928 let playerNames = []; 1929 for (let guid in g_PlayerAssignments) 1930 { 1931 if (g_PlayerAssignments[guid].player == -1) 1932 observerNames.push(g_PlayerAssignments[guid].name); 1933 else 1934 playerNames.push(g_PlayerAssignments[guid].name + ", " + 1935 (g_GameAttributes.settings.PlayerData[g_PlayerAssignments[guid].player - 1].Team + 1)); 1936 } 1937 return { 1938 "players": playerNames, 1939 "observers": observerNames.sort() 1940 }; 1941 } 1942 1925 1943 /** 1926 1944 * Send the relevant gamesettings to the lobbybot. 1927 1945 */ … … 1935 1953 1936 1954 let mapSize = g_GameAttributes.mapType == "random" ? Engine.GetGUIObjectByName("mapSize").list_data[selectedMapSize] : "Default"; 1937 1955 let victoryCondition = Engine.GetGUIObjectByName("victoryCondition").list[selectedVictoryCondition]; 1938 let playerNames = Object.keys(g_PlayerAssignments).map(guid => g_PlayerAssignments[guid].name).sort();1956 let clients = formatClients(); 1939 1957 1940 1958 let stanza = { 1941 1959 "name": g_ServerName, … … 1945 1963 "mapSize": mapSize, 1946 1964 "mapType": g_GameAttributes.mapType, 1947 1965 "victoryCondition": victoryCondition, 1948 "nbp": Object.keys(g_PlayerAssignments).length || 1, 1949 "tnbp": g_GameAttributes.settings.PlayerData.length, 1950 "players": playerNames.join(", ") 1966 "nbp": clients.players.length, 1967 "maxnbp": g_GameAttributes.settings.PlayerData.length, 1968 "players": clients.players.join(", "), 1969 "observers": clients.observers.join(", ") 1951 1970 }; 1952 1971 1953 1972 // Only send the stanza if the relevant settings actually changed -
binaries/data/mods/public/gui/lobby/lobby.js
285 285 return true; 286 286 287 287 if (playersNumberFilter.selected != 0 && 288 game. tnbp != playersNumberFilter.list_data[playersNumberFilter.selected])288 game.maxnbp != playersNumberFilter.list_data[playersNumberFilter.selected]) 289 289 return true; 290 290 291 291 if (mapTypeFilter.selected != 0 && … … 292 292 game.mapType != mapTypeFilter.list_data[mapTypeFilter.selected]) 293 293 return true; 294 294 295 if (!showFullFilter.checked && game. tnbp <= game.nbp)295 if (!showFullFilter.checked && game.maxnbp <= game.nbp) 296 296 return true; 297 297 298 298 return false; … … 555 555 break; 556 556 case 'nPlayers': 557 557 // Compare playercount ratio 558 sortA = a.nbp * b. tnbp;559 sortB = b.nbp * a. tnbp;558 sortA = a.nbp * b.maxnbp; 559 sortB = b.nbp * a.maxnbp; 560 560 break; 561 561 case 'status': 562 562 default: … … 591 591 list_mapName.push(translate(game.niceMapName)); 592 592 list_mapSize.push(translateMapSize(game.mapSize)); 593 593 list_mapType.push(g_MapTypes.Title[mapTypeIdx] || ""); 594 list_nPlayers.push(game.nbp + "/" + game. tnbp);594 list_nPlayers.push(game.nbp + "/" + game.maxnbp); 595 595 list.push(gameName); 596 596 list_data.push(i); 597 597 } … … 625 625 626 626 Engine.GetGUIObjectByName("sgMapName").caption = translate(game.niceMapName); 627 627 Engine.GetGUIObjectByName("sgNbPlayers").caption = sprintf( 628 translate("Players: %(current)s/%( total)s"), {628 translate("Players: %(current)s/%(max)s"), { 629 629 "current": game.nbp, 630 " total": game.tnbp630 "max": game.maxnbp 631 631 }); 632 632 633 Engine.GetGUIObjectByName("sgPlayersNames").caption = game.players; 633 let players = game.players.split(", "); 634 let teams = []; 635 for (let i = 0; i < players.length; i += 2) 636 { 637 let teamIndex = players[i + 1]; 638 if (!teams[teamIndex]) 639 teams[teamIndex] = []; 640 teams[teamIndex].push(players[i]); 641 } 642 643 let playersCaption = ""; 644 for (let team in teams) 645 { 646 teams[team].sort(); 647 playersCaption += (team == 0 ? sprintf(translate("No Team: %(players)s\n"), { "players": teams[team].join(", ") }) : 648 sprintf(translate("Team %(teamnumber)s: %(players)s\n"), { "teamnumber": team, "players": teams[team].join(", ") }) 649 ); 650 } 651 if (game.observers) 652 playersCaption += sprintf(translate("Observers: %(observers)s"), { "observers": game.observers }); 653 654 Engine.GetGUIObjectByName("sgPlayersNames").caption = playersCaption; 634 655 Engine.GetGUIObjectByName("sgMapSize").caption = translateMapSize(game.mapSize); 635 656 636 657 let mapTypeIdx = g_MapTypes.Name.indexOf(game.mapType); … … 662 683 663 684 let username = g_UserRating ? g_Username + " (" + g_UserRating + ")" : g_Username; 664 685 665 if (game.state == "init" || game.players.s plit(", ").indexOf(username) > -1)686 if (game.state == "init" || game.players.str.split(/,\s[0-9],\s/).indexOf(username) > -1) 666 687 joinSelectedGame(); 667 688 else 668 689 messageBox( -
binaries/data/mods/public/gui/session/messages.js
482 482 // Update lobby gamestatus 483 483 if (g_IsController && Engine.HasXmppClient()) 484 484 { 485 let players = Object.keys(g_PlayerAssignments).map(guid => g_PlayerAssignments[guid].name); 486 Engine.SendChangeStateGame(Object.keys(g_PlayerAssignments).length, players.join(", ")); 485 let observerNames = []; 486 let playerNames = []; 487 let playerData = getPlayerData(); 488 for (let guid in g_PlayerAssignments) 489 { 490 if (g_PlayerAssignments[guid].player == -1) 491 observerNames.push(g_PlayerAssignments[guid].name); 492 else 493 playerNames.push(g_PlayerAssignments[guid].name + ", " + 494 (playerData[g_PlayerAssignments[guid].player].team + 1)); 495 } 496 observerNames = observerNames.sort(); 497 Engine.SendChangeStateGame(playerNames.length, playerNames.join(", "), observerNames.join(", ")); 487 498 } 488 499 } 489 500 -
source/lobby/IXmppClient.h
1 /* Copyright (C) 201 5Wildfire Games.1 /* Copyright (C) 2016 Wildfire Games. 2 2 * This file is part of 0 A.D. 3 3 * 4 4 * 0 A.D. is free software: you can redistribute it and/or modify … … 38 38 virtual void SendIqGameReport(ScriptInterface& scriptInterface, JS::HandleValue data) = 0; 39 39 virtual void SendIqRegisterGame(ScriptInterface& scriptInterface, JS::HandleValue data) = 0; 40 40 virtual void SendIqUnregisterGame() = 0; 41 virtual void SendIqChangeStateGame(const std::string& nbp, const std::string& players ) = 0;41 virtual void SendIqChangeStateGame(const std::string& nbp, const std::string& players, const std::string& observers) = 0; 42 42 virtual void SetNick(const std::string& nick) = 0; 43 43 virtual void GetNick(std::string& nick) = 0; 44 44 virtual void kick(const std::string& nick, const std::string& reason) = 0; -
source/lobby/scripting/JSInterface_Lobby.cpp
1 /* Copyright (C) 201 4Wildfire Games.1 /* Copyright (C) 2016 Wildfire Games. 2 2 * This file is part of 0 A.D. 3 3 * 4 4 * 0 A.D. is free software: you can redistribute it and/or modify … … 45 45 scriptInterface.RegisterFunction<void, JS::HandleValue, &JSI_Lobby::SendRegisterGame>("SendRegisterGame"); 46 46 scriptInterface.RegisterFunction<void, JS::HandleValue, &JSI_Lobby::SendGameReport>("SendGameReport"); 47 47 scriptInterface.RegisterFunction<void, &JSI_Lobby::SendUnregisterGame>("SendUnregisterGame"); 48 scriptInterface.RegisterFunction<void, std::wstring, std::wstring, &JSI_Lobby::SendChangeStateGame>("SendChangeStateGame");48 scriptInterface.RegisterFunction<void, std::wstring, std::wstring, std::wstring, &JSI_Lobby::SendChangeStateGame>("SendChangeStateGame"); 49 49 scriptInterface.RegisterFunction<JS::Value, &JSI_Lobby::GetPlayerList>("GetPlayerList"); 50 50 scriptInterface.RegisterFunction<void, &JSI_Lobby::LobbyClearPresenceUpdates>("LobbyClearPresenceUpdates"); 51 51 scriptInterface.RegisterFunction<int, &JSI_Lobby::LobbyGetMucMessageCount>("LobbyGetMucMessageCount"); … … 170 170 g_XmppClient->SendIqUnregisterGame(); 171 171 } 172 172 173 void JSI_Lobby::SendChangeStateGame(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::wstring& nbp, const std::wstring& players )173 void JSI_Lobby::SendChangeStateGame(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::wstring& nbp, const std::wstring& players, const std::wstring& observers) 174 174 { 175 175 if (!g_XmppClient) 176 176 return; 177 g_XmppClient->SendIqChangeStateGame(utf8_from_wstring(nbp), utf8_from_wstring(players) );177 g_XmppClient->SendIqChangeStateGame(utf8_from_wstring(nbp), utf8_from_wstring(players), utf8_from_wstring(observers)); 178 178 } 179 179 180 180 JS::Value JSI_Lobby::GetPlayerList(ScriptInterface::CxPrivate* pCxPrivate) -
source/lobby/scripting/JSInterface_Lobby.h
1 /* Copyright (C) 201 4Wildfire Games.1 /* Copyright (C) 2016 Wildfire Games. 2 2 * This file is part of 0 A.D. 3 3 * 4 4 * 0 A.D. is free software: you can redistribute it and/or modify … … 43 43 void SendGameReport(ScriptInterface::CxPrivate* pCxPrivate, JS::HandleValue data); 44 44 void SendRegisterGame(ScriptInterface::CxPrivate* pCxPrivate, JS::HandleValue data); 45 45 void SendUnregisterGame(ScriptInterface::CxPrivate* pCxPrivate); 46 void SendChangeStateGame(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& nbp, const std::wstring& players );46 void SendChangeStateGame(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& nbp, const std::wstring& players, const std::wstring& observers); 47 47 JS::Value GetPlayerList(ScriptInterface::CxPrivate* pCxPrivate); 48 48 void LobbyClearPresenceUpdates(ScriptInterface::CxPrivate* pCxPrivate); 49 49 int LobbyGetMucMessageCount(ScriptInterface::CxPrivate* pCxPrivate); -
source/lobby/XmppClient.cpp
408 408 * decides which - but we need to update the current players that are 409 409 * in-game so the server can make the calculation. 410 410 */ 411 void XmppClient::SendIqChangeStateGame(const std::string& nbp, const std::string& players )411 void XmppClient::SendIqChangeStateGame(const std::string& nbp, const std::string& players, const std::string& observers) 412 412 { 413 413 glooxwrapper::JID xpartamuppJid(m_xpartamuppId); 414 414 … … 418 418 glooxwrapper::Tag* game = glooxwrapper::Tag::allocate("game"); 419 419 game->addAttribute("nbp", nbp); 420 420 game->addAttribute("players", players); 421 game->addAttribute("observers", observers); 421 422 g->m_GameList.emplace_back(game); 422 423 423 424 glooxwrapper::IQ iq(gloox::IQ::Set, xpartamuppJid); … … 502 503 JSAutoRequest rq(cx); 503 504 504 505 scriptInterface.Eval("([])", ret); 505 const char* stats[] = { "name", "ip", "port", "state", "nbp", " tnbp", "players", "mapName", "niceMapName", "mapSize", "mapType", "victoryCondition" };506 const char* stats[] = { "name", "ip", "port", "state", "nbp", "maxnbp", "players", "observers", "mapName", "niceMapName", "mapSize", "mapType", "victoryCondition" }; 506 507 for(const glooxwrapper::Tag* const& t : m_GameList) 507 508 { 508 509 JS::RootedValue game(cx); -
source/lobby/XmppClient.h
68 68 void SendIqGameReport(ScriptInterface& scriptInterface, JS::HandleValue data); 69 69 void SendIqRegisterGame(ScriptInterface& scriptInterface, JS::HandleValue data); 70 70 void SendIqUnregisterGame(); 71 void SendIqChangeStateGame(const std::string& nbp, const std::string& players );71 void SendIqChangeStateGame(const std::string& nbp, const std::string& players, const std::string& observers); 72 72 void SetNick(const std::string& nick); 73 73 void GetNick(std::string& nick); 74 74 void kick(const std::string& nick, const std::string& reason);