Merge pull request #28 from FlyingCat-X/v1.2.1-stable

Update LLHL to 1.2.1-stable
Changes: 
- Use a simplified method to get server's FPS (Thanks to Th3-822)
- Changed the version of metamod that will be included with LLHL in the releases. (Metamod v1.21p39 -> Metamod v1.21.1-am)

.github/workflows/amxx.yml

@@ -20,12 +20,10 @@ jobs:
         tar -xzf amxx-linux.tar.gz -C amxx-linux
         unzip amxx-windows.zip -d amxx-windows
 
-    - name: Download Metamod v1.21p39 by Solokiller
+    - name: Download Metamod v1.21.1-am
       run: |
-        wget "https://github.com/Solokiller/Metamod-P-CMake/releases/download/v1.21p39/Metamod-P-opt-fast-Linux.zip" -O metamod.zip
-        wget "https://github.com/Solokiller/Metamod-P-CMake/releases/download/v1.21p39/Metamod-P-opt-fast.zip" -O metamod-win.zip
-        unzip metamod.zip
-        unzip metamod-win.zip -d metamod
+        wget "https://www.amxmodx.org/release/metamod-1.21.1-am.zip" -O metamod.zip
+        unzip -j metamod.zip -x '*.dylib' -d metamod
 
     - name: Create LLHL folder structure for Windows and Linux
       run: |

README.md

@@ -68,8 +68,7 @@ Download the [Latest Release](https://github.com/FlyingCat-X/llhl/releases/).
 - Turn your server on and enjoy.
 
 ## Thanks to
-- Th3-822: FPS Limiter and blocking name and model changes.
-- Alka: Server FPS.
+- Th3-822: FPS Limiter, Server FPS and blocking name and model changes.
 - Arkshine: Unstuck command.
 - naz: Useful codes for hook messages from AG engine.
 - BulliT: For developing AG Mod and sharing the source code.

README_ES.md

@@ -67,8 +67,7 @@ Descargar la [Última versión](https://github.com/FlyingCat-X/llhl/releases/).
 - Enciende tu servidor y disfruta.
 
 ## Agradecimientos
-- Th3-822: Limitador de FPS y bloqueador de cambios de nombre y model.
-- Alka: FPS del servidor.
+- Th3-822: Limitador de FPS, FPS del Servidor y bloqueador de cambios de nombre y model.
 - Arkshine: Comando unstuck.
 - naz: Códigos útiles para hookear los mensajes del motor de AG.
 - BulliT: Por desarrollar el AG mod y compartir el código fuente.

README_PT.md

@@ -66,8 +66,7 @@ Baixe a [última versão](https://github.com/FlyingCat-X/llhl/releases/).
 - Ligue seu servidor e divirta-se.
 
 ## Agradecimientos
-- Th3-822: Limitador FPS e bloqueador de mudança de nome e modelo.
-- Alka: FPS do servidor.
+- Th3-822: Limitador FPS, FPS do servidor e bloqueador de mudança de nome e modelo.
 - Arkshine: Comando unstuck.
 - naz: Códigos úteis para hookear as mensagens do motor AG.
 - BulliT: Para desenvolver o mod AG e compartilhar o código-fonte.

ag/addons/amxmodx/scripting/llhl.sma

@@ -1,6 +1,6 @@
 /*
     LLHL Gamemode for AG 6.6 and AGMini
-    Version: 1.2-stable
+    Version: 1.2.1-stable
     Author: FlyingCat
 
     # Information:
@@ -71,7 +71,7 @@
 #define PLUGIN          "Liga Latinoamericana de Half Life"
 #define PLUGIN_ACRONYM  "LLHL"
 #define PLUGIN_GAMEMODE "llhl"
-#define VERSION         "1.2-stable"
+#define VERSION         "1.2.1-stable"
 #define AUTHOR          "FlyingCat"
 #define GH_API_URL      "https://api.github.com/repos/FlyingCat-X/llhl/tags?per_page=1"
 
@@ -143,7 +143,6 @@ new gCommandSended[16];
 new gSHA1Hash[64];
 
 new Float:gUnstuckLastUsed[MAX_PLAYERS + 1];
-new Float:gServerFPS;
 static Float:gActualServerFPS;
 
 new GripRequestOptions:gGripIncomingHeader;
@@ -477,7 +476,7 @@ public FwMsgVote(id) {
 }
 
 public FwMsgIntermission(id) {
-    gActualServerFPS = gServerFPS;
+    gActualServerFPS = get_global_float(GL_frametime);
     client_cmd(0, "stop;wait;wait;+showscores");
     set_task(0.1, "TaskPreIntermission", TASK_SHOWVENGINE);
     message_begin(0, SVC_FINALE);
@@ -489,7 +488,7 @@ public FwMsgIntermission(id) {
 public TaskPreIntermission() {
     // Show vEngine
     set_dhudmessage(0, 100, 200, -1.0, -0.125, 0, 0.0, 99.0);
-    show_dhudmessage(0, "%s v%s^n----------------------^nMax Player FPS Allowed: %i^nHLTV Allowed: %i^nServer fps: %.1f^nGhostmine Blocker: %s", PLUGIN_ACRONYM, VERSION, get_pcvar_num(gCvarMaxFps), get_pcvar_num(gCvarNumHLTVAllowed), gActualServerFPS, !cvar_exists("sv_ag_block_ghostmine") ? "Not available" : get_pcvar_num(gCvarBlockGhostmine) ? "On" : "Off");
+    show_dhudmessage(0, "%s v%s^n----------------------^nMax Player FPS Allowed: %i^nHLTV Allowed: %i^nServer fps: %.1f^nGhostmine Blocker: %s", PLUGIN_ACRONYM, VERSION, get_pcvar_num(gCvarMaxFps), get_pcvar_num(gCvarNumHLTVAllowed), (1.0 / gActualServerFPS), !cvar_exists("sv_ag_block_ghostmine") ? "Not available" : get_pcvar_num(gCvarBlockGhostmine) ? "On" : "Off");
     client_cmd(0, "wait;wait;snapshot");
 }
 
@@ -683,21 +682,6 @@ public FwClientUserInfoChangedPre(id, info) {
     return FMRES_IGNORED;
 }
 
-public FwStartFrame() {
-    static Float:gametime, Float:framesPer = 0.0;
-    static Float:tempFps;
-
-    gametime = get_gametime();
-
-    if(framesPer >= gametime) {
-        tempFps += 1.0;
-    } else {
-        framesPer = framesPer + 1.0;
-        gServerFPS = tempFps;
-        tempFps = 0.0;
-    }
-}
-
 public CmdAgpauseRehldsHook(id) {
     if (get_playersnum() == 1 && gGameState == GAME_IDLE) {
         new name[32], authID[32], formatted[32], fileName[32];

ag/motd_llhl.txt

@@ -1,4 +1,4 @@
-Bienvenido al modo de juego LLHL v1.2-stable
+Bienvenido al modo de juego LLHL v1.2.1-stable
 Este modo de juego se usa actualmente para la Liga Latinoamericana de Half-Life (LLHL)
 
 -- Nuevas caracteristicas --
@@ -30,7 +30,7 @@ Conserva todas tus capturas de pantalla y demos generadas con este modo de juego
 Un administrador podria pedirte que las subas.
 
 -- Informacion del modo de juego --
-# Version: 1.2-stable
+# Version: 1.2.1-stable
 # Autor: FlyingCat (Discord: Suisei#1966)
 # Repositorio: https://git.io/jkttq
 # Descarga: https://github.com/FlyingCat-X/llhl/releases/latest