#1698

.vscode/settings.json

@@ -84,6 +84,8 @@
         "typeinfo": "cpp",
         "qnetworkinterface": "cpp",
         "qsslsocket": "cpp",
-        "qvector": "cpp"
+        "qvector": "cpp",
+        "qjsonobject": "cpp",
+        "qjsonvalueref": "cpp"
     },
 }

coreengine/gameconsole.cpp

@@ -426,7 +426,7 @@ void GameConsole::logActions(bool log)
 
 void GameConsole::extractResources()
 {
-    QString targetDir = "extractedResources/";
+    QString targetDir = QString("extractedResources_Version_") + Mainapp::getGameVersion().replace(".", "_") + "/";
     QDir target(targetDir);
     if (target.exists())
     {

coreengine/mainapp.h

@@ -249,7 +249,7 @@ public slots:
      */
     static QString getGameVersion()
     {
-        return "Version: " + QString::number(VERSION_MAJOR) + "." + QString::number(VERSION_MINOR) + "." + QString::number(VERSION_REVISION)+ "-" + QString(VERSION_SUFFIX);
+        return QString::number(VERSION_MAJOR) + "." + QString::number(VERSION_MINOR) + "." + QString::number(VERSION_REVISION)+ "-" + QString(VERSION_SUFFIX);
     }
     /**
      * @brief showCrashReport

game/gamerules.cpp

@@ -1622,7 +1622,16 @@ void GameRules::serializeObject(QDataStream& pStream, bool forHash) const
     {
         pStream << m_multiplayerObserver;
         pStream << m_maxPerkCount;
-        pStream << m_matchType;
+        if (Mainapp::getSlave())
+        {
+            pStream << m_matchType;
+        }
+        else
+        {
+            // don't save match type on clients
+            QString dummy;
+            pStream << dummy; 
+        }
         pStream << m_mapPalette;
     }
     pStream << static_cast<qint32>(m_damageFormula);

general.qrc

@@ -2065,7 +2065,8 @@
         <file>ai/training/heavyai_training.js</file>
         <file>ai/training/normalai_training.js</file>
         <file>ai/training/situation_training.js</file>
-        <file>templates/serverscript/matchMaking/tournee.js</file>
+        <file>templates/serverscript/matchMaking/automatchmaker.js</file>
+        <file>templates/serverscript/matchMaking/automatchmaker.json</file>
         <file>resources/scripts/building/field_base.js</file>
         <file>resources/scripts/actions/ACTION_FOCUSMAP.js</file>
     </qresource>

menue/mainwindow.cpp

@@ -93,7 +93,7 @@ Mainwindow::Mainwindow(const QString & initialView)
     style.color = Qt::black;
     spLabel pTextfield = MemoryManagement::create<Label>(300);
     pTextfield->setStyle(style);
-    pTextfield->setHtmlText(Mainapp::getGameVersion());
+    pTextfield->setHtmlText("Version: " + Mainapp::getGameVersion());
     pTextfield->setPosition(oxygine::Stage::getStage()->getWidth() - 10 - pTextfield->getTextRect().width(), oxygine::Stage::getStage()->getHeight() - 10 - pTextfield->getTextRect().height());
     pTextfield->addClickListener([this](oxygine::Event*)
     {

network/automatchmaker.cpp

@@ -1,4 +1,5 @@
 #include <QJsonObject>
+#include <QJsonValueRef>
 #include <QJsonArray>
 #include <QJsonDocument>
 
@@ -80,19 +81,26 @@ void AutoMatchMaker::onNewMatchResultData(const QJsonObject & objData)
     pInterpreter->doFunction(m_matchId, "onNewMatchResultData", args);
 }
 
-void AutoMatchMaker::createNewGame(const QString players)
+void AutoMatchMaker::createNewGame(const QStringList players, const QStringList modList)
 {
     spNetworkInterface dummy;
     Multiplayermenu multiplayermenu(dummy, "", Multiplayermenu::NetworkMode::Host);
     Interpreter* pInterpreter = Interpreter::getInstance();
     QJSValueList args({pInterpreter->newQObject(this),
                        pInterpreter->newQObject(&multiplayermenu),
-                       players,
+                       pInterpreter->arraytoJSValue(players),
                        pInterpreter->newQObject(&m_mainServer)});
     pInterpreter->doFunction(m_matchId, "onCreateNewGame", args);
     QString saveFile = "savegames/" + m_matchId + QString::number(m_matchCounter) + ".lsav";
     auto doc = multiplayermenu.doSaveLobbyState(saveFile, "");
     QJsonObject objData = doc.object();
+    objData.remove(JsonKeys::JSONKEY_USEDMODS);
+    QJsonObject mods;
+    for (qint32 i = 0; i < modList.size(); ++i)
+    {
+        mods.insert(JsonKeys::JSONKEY_MOD + QString::number(i), modList[i]);
+    }
+    objData.insert(JsonKeys::JSONKEY_USEDMODS, mods);
     m_mainServer.onSlaveInfoDespawning(0, objData);
     ++m_matchCounter;
 }
@@ -431,6 +439,21 @@ QJsonObject AutoMatchMaker::getBracketGraphInfo()
     return graphInfo;
 }
 
+QString AutoMatchMaker::readDataFromJson(const QString & filePath)
+{
+    if (QFile::exists(filePath))
+    {
+        QFile file(filePath);
+        file.open(QIODevice::ReadOnly);
+        QTextStream stream(&file);
+        return stream.readAll();
+    }
+    else
+    {
+        return "";
+    }
+}
+
 bool AutoMatchMaker::getRunning() const
 {
     return m_running;

network/automatchmaker.h

@@ -80,7 +80,7 @@ class AutoMatchMaker : public QObject, public FileSerializable
      */
     QJsonObject getBracketGraphInfo();
     Q_INVOKABLE bool getSignedUp(const QString  playerId);
-    Q_INVOKABLE void createNewGame(const QString players);
+    Q_INVOKABLE void createNewGame(const QStringList players, const QStringList modList);
     Q_INVOKABLE QString getMatchId() const;
     Q_INVOKABLE void updateMmr(const QString player1, const QString player2, qint32 maxEloChange, GameEnums::GameResult gameResultForPlayer1);
     Q_INVOKABLE bool setMmr(const QString player, qint32 mmr);
@@ -130,6 +130,7 @@ class AutoMatchMaker : public QObject, public FileSerializable
     Q_INVOKABLE static QString getBracketGraphPreviousMatchId();
     Q_INVOKABLE static QString getBracketGraphPreviousWinnersId();
     Q_INVOKABLE static QString getBracketGraphPreviousPlayersId();
+    Q_INVOKABLE QString readDataFromJson(const QString & filePath);
 private:
     QString m_matchId;
     MainServer & m_mainServer;

templates/serverscript/matchMaking/automatchmaker.js

@@ -0,0 +1,55 @@
+var AUTOMATCHMAKER =
+{
+    jsonFileName = "server/automatchmaker.json",
+    getName = function(autoMatchMaker, server)
+    {
+        var obj = JSON.parse(autoMatchMaker.readDataFromJson(AUTOMATCHMAKER.jsonFileName));
+        return obj.name;
+    },
+
+    getDescription = function(autoMatchMaker, server)
+    {
+        var obj = JSON.parse(autoMatchMaker.readDataFromJson(AUTOMATCHMAKER.jsonFileName));
+        return obj.description;
+    },
+
+    getIsSignUpChangeAllowed = function(autoMatchMaker, server)
+    {
+        var obj = JSON.parse(autoMatchMaker.readDataFromJson(AUTOMATCHMAKER.jsonFileName));
+        return obj.isSignUpChangeAllowed;
+    },
+
+    onNewMatchResultData = function(autoMatchMaker, usernames, results, server)
+    {        
+        var obj = JSON.parse(autoMatchMaker.readDataFromJson(AUTOMATCHMAKER.jsonFileName));
+        autoMatchMaker.updateMmr(usernames[0], usernames[1], obj.maxMmrChange, results[0])
+        for (var i = 0; i < usernames.length; ++i)
+        {
+            AUTOMATCHMAKER.createNewMatchForPlayer(autoMatchMaker, usernames[i], server);
+        }        
+    },
+
+    onCreateNewGame = function(autoMatchMaker, multiplayerMenu, players, server)
+    {
+        // todo
+    },
+
+    createNewMatchForPlayer = function(autoMatchMaker, usernames, server)
+    {
+
+    },
+
+    onNewPlayerData = function(autoMatchMaker, player, minGames, maxGames, server)
+    {
+        for (var i = 0; i < minGames; ++i)
+        {
+            AUTOMATCHMAKER.createNewMatchForPlayer(autoMatchMaker, player, server);
+        }
+    },
+
+    getBracketGraphInfo = function(autoMatchMaker, server)
+    {
+        // JSON.stringify()
+        return "";
+    },    
+}

templates/serverscript/matchMaking/automatchmaker.json

@@ -0,0 +1,11 @@
+{
+    "name" : "My auto mach",
+    "description" : "My auto match description",
+    "isSignUpChangeAllowed" : true,
+    "maxMmrChange" : 30,
+    "searchRangeSteps" : 100,
+    "matchHistory" : 10,
+    "maps" : [],
+    "rule" : "",
+    "mods" : []
+}