Merge pull request #115 from Lan2Play/feature/CommandAliases

Fix team score
Lan2Play · Dec 13, 2023 · a1c32be · a1c32be
2 parents 1c034b5 + 5b4b35e
commit a1c32be
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 33 deletions.
diff --git a/Docs/source/admin/commands.rst b/Docs/source/admin/commands.rst
@@ -11,6 +11,8 @@ If you want to use them from your console, remove the ``!`` in front of them.
 Player Commands
 ----------------------------------------
 
+``<requiredParameter>`` marks parameters that are required for commands
+
 +---------------+--------------+-----------------------------------------------------------------------------------+
 |    Command    |    Alias     |                                    Description                                    |
 +===============+==============+===================================================================================+
@@ -22,7 +24,7 @@ Player Commands
 +---------------+--------------+-----------------------------------------------------------------------------------+
 | ``!kill``     | ``!suicide`` | Kill the current player if allowed by the :ref:`admin/configuration:matchconfig`. |
 +---------------+--------------+-----------------------------------------------------------------------------------+
-| ``![number]`` |              | Select something in the current menu.                                             |
+| ``!<number>`` |              | Select something in the current menu.                                             |
 +---------------+--------------+-----------------------------------------------------------------------------------+
 | ``!stay``     |              | Vote to stay at the current team.                                                 |
 +---------------+--------------+-----------------------------------------------------------------------------------+
@@ -90,7 +92,26 @@ These commands are available through rcon or to users with the required permissi
 +----------------------------------------+-------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------+
 | ``!css_team2_seriesscore``             |                               | Returns the seriesscore of team 2                                                                                                                 |
 +----------------------------------------+-------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------+
-| ``!ps_mapscore_json``                  |                               | Returns the current map score as json  **TODO Example**                                                                                           |
+| ``!ps_mapscore_json``                  |                               | Returns the current map score as json (:ref:`Example<admin/commands:mapscore_json Example>`)                                                      |
 +----------------------------------------+-------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------+
 | ``!ps_seriesscore_json``               |                               | Returns the seriesscore as json **TODO Example**                                                                                                  |
-+----------------------------------------+-------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------+
++----------------------------------------+-------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------+
+
+mapscore_json Example
+'''''''''''''''''''''
+.. code-block:: json
+
+    {
+        "Team1": {
+            "Name": "Team 1",
+            "Score": 1,
+            "StartingSide": 3,
+            "CurrentSide": 3
+        },
+        "Team2": {
+            "Name": "Team 2",
+            "Score": 2,
+            "StartingSide": 2,
+            "CurrentSide": 2
+        }
+    }
diff --git a/Docs/source/develop/makefile.rst b/Docs/source/develop/makefile.rst
@@ -16,7 +16,7 @@ A few of the Commands have optional parameters that can be set via either a prom
 So for example if you had the available parameter ``STEAMUSER`` on the make command ``init-all``, that you want to set to ``username`` your finalized Make command would look like:
 
 .. code-block:: bash
-    
+
     make init-all STEAMUSER="username"
 
 
@@ -29,9 +29,9 @@ Publishes a debug build of Pugsharp with the locally installed .Net SDK and copi
 
 **Group Command**
 
-- :ref:`develop/makefile:git-pull` 
-- :ref:`develop/makefile:build-debug` 
-- :ref:`develop/makefile:copy-pugsharp` 
+- :ref:`develop/makefile:git-pull`
+- :ref:`develop/makefile:build-debug`
+- :ref:`develop/makefile:copy-pugsharp`
 
 **Parameters:**
 
@@ -43,9 +43,9 @@ Publishes a debug build of Pugsharp with .Net SDK inside of docker and copies it
 
 **Group Command**
 
-- :ref:`develop/makefile:git-pull` 
-- :ref:`develop/makefile:build-debug-docker` 
-- :ref:`develop/makefile:copy-pugsharp` 
+- :ref:`develop/makefile:git-pull`
+- :ref:`develop/makefile:build-debug-docker`
+- :ref:`develop/makefile:copy-pugsharp`
 
 **Parameters:**
 
@@ -57,12 +57,12 @@ Prepares the gameserver folder, initializes the .env file for the cs2 server, co
 
 **Group Command**
 
-- :ref:`develop/makefile:prepare-folders` 
-- :ref:`develop/makefile:init-env` 
-- :ref:`develop/makefile:install-deps` 
-- :ref:`develop/makefile:copy-pugsharp-sample-configs` 
-- :ref:`develop/makefile:pull-csserver` 
-- :ref:`develop/makefile:start-csserver` 
+- :ref:`develop/makefile:prepare-folders`
+- :ref:`develop/makefile:init-env`
+- :ref:`develop/makefile:install-deps`
+- :ref:`develop/makefile:copy-pugsharp-sample-configs`
+- :ref:`develop/makefile:pull-csserver`
+- :ref:`develop/makefile:start-csserver`
 
 **Parameters:**
 
@@ -74,12 +74,12 @@ Prepares the gameserver folder, initializes the .env file for the cs2 server, co
 
 **Group Command**
 
-- :ref:`develop/makefile:prepare-folders` 
-- :ref:`develop/makefile:init-env` 
-- :ref:`develop/makefile:install-deps-docker` 
-- :ref:`develop/makefile:copy-pugsharp-sample-configs` 
-- :ref:`develop/makefile:pull-csserver` 
-- :ref:`develop/makefile:start-csserver` 
+- :ref:`develop/makefile:prepare-folders`
+- :ref:`develop/makefile:init-env`
+- :ref:`develop/makefile:install-deps-docker`
+- :ref:`develop/makefile:copy-pugsharp-sample-configs`
+- :ref:`develop/makefile:pull-csserver`
+- :ref:`develop/makefile:start-csserver`
 
 **Parameters:**
 
@@ -91,7 +91,7 @@ Installs counterstrikesharp and metamod to your local cs2 server
 
 **Group Command**
 
-- :ref:`develop/makefile:install-counterstrikesharp` 
+- :ref:`develop/makefile:install-counterstrikesharp`
 - :ref:`develop/makefile:install-metamod`
 
 **Parameters:**
@@ -104,7 +104,7 @@ Installs counterstrikesharp and metamod to your local cs2 server
 
 **Group Command**
 
-- :ref:`develop/makefile:install-counterstrikesharp-docker` 
+- :ref:`develop/makefile:install-counterstrikesharp-docker`
 - :ref:`develop/makefile:install-metamod`
 
 **Parameters:**
@@ -117,9 +117,9 @@ Cleans the CS2 server including all plugins, the build folders and the local .en
 
 **Group Command**
 
-- :ref:`develop/makefile:clean-csserver` 
-- :ref:`develop/makefile:clean-env` 
-- :ref:`develop/makefile:clean-build` 
+- :ref:`develop/makefile:clean-csserver`
+- :ref:`develop/makefile:clean-env`
+- :ref:`develop/makefile:clean-build`
 
 **Parameters:**
 
@@ -131,8 +131,8 @@ starts a local deattached cs2 server and attaches to it
 
 **Group Command**
 
-- :ref:`develop/makefile:start-csserver` 
-- :ref:`develop/makefile:attach-csserver` 
+- :ref:`develop/makefile:start-csserver`
+- :ref:`develop/makefile:attach-csserver`
 
 **Parameters:**
 
@@ -238,15 +238,15 @@ No Parameters
 
 build-debug
 ........................
-Publishes a debug build of Pugsharp with the locally installed .Net SDK 
+Publishes a debug build of Pugsharp with the locally installed .Net SDK
 
 **Parameters:**
 
 No Parameters
 
 build-release
 ........................
-Publishes a release build of Pugsharp with the locally installed .Net SDK 
+Publishes a release build of Pugsharp with the locally installed .Net SDK
 
 **Parameters:**
 
@@ -277,15 +277,15 @@ copies pugsharp debug build in to the local cs2 server
 No Parameters
 
 copy-pugsharp-sample-configs
-........................
+............................
 copies pugsharp sample configs in to the local cs2 server
 
 **Parameters:**
 
 No Parameters
 
 git-pull
-........................
+............................
 pulls the repository
 
 **Parameters:**

diff --git a/PugSharp.Match/Match.cs b/PugSharp.Match/Match.cs
@@ -320,6 +320,9 @@ public void SendRoundResults(IRoundResults roundResults)
         var team1Results = MatchInfo.MatchTeam1.CurrentTeamSite == Team.Terrorist ? roundResults.TRoundResult : roundResults.CTRoundResult;
         var team2Results = MatchInfo.MatchTeam2.CurrentTeamSite == Team.Terrorist ? roundResults.TRoundResult : roundResults.CTRoundResult;
 
+        MatchInfo.CurrentMap.Team1Points = team1Results.Score;
+        MatchInfo.CurrentMap.Team2Points = team2Results.Score;
+
         _Logger.LogInformation("Team 1: {teamSite} : {teamScore}", MatchInfo.MatchTeam1.CurrentTeamSite, team1Results.Score);
         _Logger.LogInformation("Team 2: {teamSite} : {teamScore}", MatchInfo.MatchTeam2.CurrentTeamSite, team2Results.Score);