Ticket #3476: t3476_dont_even_look_at_it_wip.patch

binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -1892 +1892 @@
         var mapSize = Engine.GetGUIObjectByName("mapSize").list_data[selectedMapSize];
     else
         var mapSize = "Default";
+    
+    var victoryCondition = Engine.GetGUIObjectByName("victoryCondition").list[selectedVictoryCondition];
 
-    var victoryCondition = Engine.GetGUIObjectByName("victoryCondition").list[selectedVictoryCondition];
+    
+    /*var object = g_GameAttributes.settings.PlayerData;
+    var output = 'PlayerData:\n';
+    for (var player in object) {
+        output += "player" + player + ":\n";
+        for (var property in object[player]) {
+            output += "\t" + property + ': ' + object[player][property]+'\n';
+        }
+    }
+    error(output);
+    
+    return;
+    var object = g_PlayerAssignments;
+    var output = 'PlayerAssignments:\n';
+    for (var guid in object) {
+        output += "guid" + guid + "\n";
+        for (var property in object[guid]) {
+            output += "\t" + property + ': ' + object[guid][property]+'\n';
+        }
+    }
+    error(output);
+    return;
+    
+    */
+
+    // DEPRECATED
+    // nbp = client count
+    // tnbp = slots available
     var numberOfPlayers = Object.keys(g_PlayerAssignments).length;
     var players = [ assignment.name for each (assignment in g_PlayerAssignments) ].join(", ");
-
     var nbp = numberOfPlayers ? numberOfPlayers : 1;
     var tnbp = g_GameAttributes.settings.PlayerData.length;
+    var players = [ assignment.name for each (assignment in g_PlayerAssignments) ].join(", ");
 
+    // new
+    var teams = getTeams(g_PlayerAssignments, g_GameAttributes.settings.PlayerData);
+    var maxPlayers = g_GameAttributes.settings.PlayerData.length;
+    var playerCount = 0;
+    for(var i in g_PlayerAssignments)
+    {
+        if (g_PlayerAssignments[i]["player"] != -1)
+            playerCount += 1;
+    }
+
+    // The player names are saved in the assignments
+    // The team settings are saved in g_GameAttributes.settings.PlayerData
+
+    error("Sending stanza");
+    
     var gameData = {
         "name":g_ServerName,
         "mapName":g_GameAttributes.map,
@@ -1907 +1951 @@
         "mapSize":mapSize,
         "mapType":g_GameAttributes.mapType,
         "victoryCondition":victoryCondition,
-        "nbp":nbp,
+        
+        // those 3 deprecated
+        "nbp":playerCount,
         "tnbp":tnbp,
-        "players":players
+        "players":players,
+
+        "playerCount":playerCount,
+        "maxPlayers":maxPlayers,
+        "teams":JSON.stringify(teams),
+        // save turnnumber, so that we can compute lag time with real time - ingame time - pause time
+        "pausedTime":0,
+        "turn":0 // get m_CurrentTurn
     };
     Engine.SendRegisterGame(gameData);
 }
 
+function getTeams(g_PlayerAssignments, playerData)
+{
+    var teams = {};
+    for(var i in playerData)
+    {
+        var team = playerData[i]["Team"] + 1;
+        var ai = playerData[i]["AI"];
+        
+        // get player name
+        var add = false;
+        var name = "(unassigned)";
+        if (ai != "")
+        {
+            name = ai + " AI";
+            add = true;
+        } else {
+            for(var j in g_PlayerAssignments)
+            {
+                if (g_PlayerAssignments[j]["player"] == parseInt(i) + 1) {
+                    name = g_PlayerAssignments[j]["name"];
+                    add = true;
+                }
+            }
+        }
+
+        if (add) {
+            if (!teams.hasOwnProperty(team)) {
+                teams[team] = [];
+            }
+            teams[team].push(name);
+        }
+    }
+    
+    // add observers
+    teams[-1] = [];
+    for(var i in g_PlayerAssignments)
+    {
+        if (g_PlayerAssignments[i]["player"] == -1)
+            teams["-1"].push(g_PlayerAssignments[i]["name"]);
+    }
+    
+    return teams;
+}
+
 function getVictoryConditions()
 {
     var r = {};

binaries/data/mods/public/gui/lobby/lobby.js

@@ -113 +113 @@
     // We assume index 0 means display all for any given filter.
     if (mapSizeFilter.selected != 0 && game.mapSize != mapSizeFilter.list_data[mapSizeFilter.selected])
         return true;
-    if (playersNumberFilter.selected != 0 && game.tnbp != playersNumberFilter.list_data[playersNumberFilter.selected])
+    if (playersNumberFilter.selected != 0 && game.maxPlayers != playersNumberFilter.list_data[playersNumberFilter.selected])
         return true;
     if (mapTypeFilter.selected != 0 && game.mapType != mapTypeFilter.list_data[mapTypeFilter.selected])
         return true;
-    if (!showFullFilter.checked && game.tnbp <= game.nbp)
+    if (!showFullFilter.checked && game.playerCount >= game.maxPlayers)
         return true;
 
     return false;
@@ -361 +361 @@
     // Store the game whole game list data so that we can access it later
     // to update the game info panel.
     g_GameList = gameList;
-
+    
     // Sort the list of games to that games 'waiting' are displayed at the top, followed by 'init', followed by 'running'.
     var gameStatuses = ['waiting', 'init', 'running'];
     g_GameList.sort(function (a,b) {
@@ -406 +406 @@
             list_mapSize.push(translatedMapSize(g.mapSize));
             let idx = g_mapTypes.indexOf(g.mapType);
             list_mapType.push(idx != -1 ? g_mapTypesText[idx] : "");
-            list_nPlayers.push(g.nbp + "/" +g.tnbp);
+            list_nPlayers.push(g.playerCount + "/" +g.maxPlayers);
             list.push(g.name);
             list_data.push(c);
         }
@@ -528 +528 @@
 
     // Display the map name, number of players, the names of the players, the map size and the map type.
     Engine.GetGUIObjectByName("sgMapName").caption = translate(g_GameList[g].niceMapName);
-    Engine.GetGUIObjectByName("sgNbPlayers").caption = g_GameList[g].nbp + "/" + g_GameList[g].tnbp;
-    Engine.GetGUIObjectByName("sgPlayersNames").caption = g_GameList[g].players;
+    Engine.GetGUIObjectByName("sgNbPlayers").caption = g_GameList[g].playerCount + "/" + g_GameList[g].maxPlayers;
+    Engine.GetGUIObjectByName("sgPlayersNames").caption = getGameText(g_GameList[g]);
     Engine.GetGUIObjectByName("sgMapSize").caption = translatedMapSize(g_GameList[g].mapSize);
     let idx = g_mapTypes.indexOf(g_GameList[g].mapType);
     Engine.GetGUIObjectByName("sgMapType").caption = idx != -1 ? g_mapTypesText[idx] : "";
@@ -550 +550 @@
     Engine.GetGUIObjectByName("sgMapPreview").sprite = "cropped:(0.7812,0.5859)session/icons/mappreview/" + mapPreview;
 }
 
+function getGameText(game)
+{
+    var teams = JSON.parse(game["teams"]);
+    
+    // find out if free for all
+    var freeForAll = true;
+    for (var team=1; team<=4; team++)           
+    {
+        if (teams.hasOwnProperty(team) && teams[team].length > 0) {
+            freeForAll = false;
+            break;
+        }
+    }
+    
+    // assemble text
+    var text = "";
+    var printOrder = [1,2,3,4,0,-1];
+    for(var p in printOrder)
+    {
+    
+        var team = printOrder[p];
+        if (!teams.hasOwnProperty(team) || teams[team].length == 0) {
+            continue;
+        }
+        
+        var names = teams[team].join(", ");
+        
+        if (team > 0)
+            text += "Team: " +  team + ": " + names + "\n";
+        else if (team == -1)
+            text += "Observer: " + names + "\n";
+        else if (team == 0)
+        {
+            if (freeForAll)
+                text += names + "\n";
+            else
+                text += "No Team: " + names + "\n";
+        }
+    }
+    
+    if (game["state"] == "running")
+    {
+        text += "Started: \n";
+        text += "Time: \n";
+        text += "Lag: \n"; // show period spend lagging
+    }
+
+    return text;
+}
+
+
 /**
  * Start the joining process on the currectly selected game.
  */
@@ -599 +650 @@
 
 function onTick()
 {
+
     updateTimers();
     checkSpamMonitor();
 
@@ -839 +891 @@
         updateSpamMonitor(msg.from);
     if (isSpam(msg.text, msg.from))
         return;
-
+    
     // Format Text
     var formatted = ircFormat(msg.text, msg.from, msg.color, msg.key, msg.datetime);
 

source/gui/scripting/ScriptFunctions.cpp

@@ -420 +420 @@
     return ps_generate_guid().FromUTF8();
 }
 
+u32 getCurrentTurn(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
+{
+    return g_Game->GetTurnManager()->m_CurrentTurn;
+}
+
 void RestartInAtlas(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
 {
     restart_mainloop_in_atlas();
@@ -969 +974 @@
     scriptInterface.RegisterFunction<void, int, &SetPlayerID>("SetPlayerID");
     scriptInterface.RegisterFunction<void, std::string, &OpenURL>("OpenURL");
     scriptInterface.RegisterFunction<std::wstring, &GetMatchID>("GetMatchID");
+    scriptInterface.RegisterFunction<u32, &GetCurrentTurn>("GetCurrentTurn");
     scriptInterface.RegisterFunction<void, &RestartInAtlas>("RestartInAtlas");
     scriptInterface.RegisterFunction<bool, &AtlasIsAvailable>("AtlasIsAvailable");
     scriptInterface.RegisterFunction<bool, &IsAtlasRunning>("IsAtlasRunning");

source/lobby/XmppClient.cpp

@@ -373 +373 @@
         std::wstring value;
         scriptInterface.GetProperty(data, properties[i].c_str(), value);
         game->addAttribute(properties[i], utf8_from_wstring(value));
+
+        //debug_printf("ADDING %s = %s\n", properties[i].c_str(), value.c_str());
     }
 
     // Push the stanza onto the IQ
@@ -528 +530 @@
         JS::RootedValue game(cx);
         scriptInterface.Eval("({})", &game);
 
-        const char* stats[] = { "name", "ip", "state", "nbp", "tnbp", "players", "mapName", "niceMapName", "mapSize", "mapType", "victoryCondition" };
+        const char* stats[] = { "name", "ip", "state", "nbp", "tnbp", "playerCount", "maxPlayers", "teams", "pausedTime", "turn", "players", "mapName", "niceMapName", "mapSize", "mapType", "victoryCondition" };
         for (size_t i = 0; i < ARRAY_SIZE(stats); ++i)
             scriptInterface.SetProperty(game, stats[i], wstring_from_utf8((*it)->findAttribute(stats[i]).to_string()));
 

source/tools/XpartaMuPP/XpartaMuPP.py

@@ -20 +20 @@
 import logging, time, traceback
 from optparse import OptionParser
 
-import sleekxmpp
+import sleekxmpp,sys
 from sleekxmpp.stanza import Iq
 from sleekxmpp.xmlstream import ElementBase, register_stanza_plugin, ET
 from sleekxmpp.xmlstream.handler import Callback
@@ -281 +281 @@
     """
       Add a game
     """
+    # DEPRECATED
     data['players-init'] = data['players']
     data['nbp-init'] = data['nbp']
+    
+    data['playerCount-init'] = data['playerCount']
+    data['teams-init'] = data['teams']
+    
+    # save when the game started so that we can compute lag time
+    data['game-started'] = time.time()
+
     data['state'] = 'init'
     self.gameList[str(JID)] = data
   def removeGame(self, JID):
@@ -301 +309 @@
     """
     JID = str(JID)
     if JID in self.gameList:
+      self.gameList[JID]['nbp'] = data['nbp']
       if self.gameList[JID]['nbp-init'] > data['nbp']:
         logging.debug("change game (%s) state from %s to %s", JID, self.gameList[JID]['state'], 'waiting')
-        self.gameList[JID]['nbp'] = data['nbp']
         self.gameList[JID]['state'] = 'waiting'
       else:
         logging.debug("change game (%s) state from %s to %s", JID, self.gameList[JID]['state'], 'running')