diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9a9d665..2f728eb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,7 +41,7 @@ jobs: # TF2 Comp Fixes: https://github.com/ldesgoui/tf2-comp-fixes - name: Get latest version of TF2 Comp Fixes and its DHooks dependency run: | - wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/latest/download/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip && rm updatefile.txt + wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/latest/download/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip wget -q -O tmp.zip https://github.com/peace-maker/DHooks2/releases/latest/download/dhooks-2.2.0-detours10-sm110.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip working-directory: ${{ env.SOURCEMOD_PATH }}/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9f72b78..dc0fb19 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ jobs: # TF2 Comp Fixes: https://github.com/ldesgoui/tf2-comp-fixes - name: Get latest version of TF2 Comp Fixes and its DHooks2 dependency run: | - wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/latest/download/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip && rm updatefile.txt + wget -q -O tmp.zip https://github.com/ldesgoui/tf2-comp-fixes/releases/latest/download/tf2-comp-fixes.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip wget -q -O tmp.zip https://github.com/peace-maker/DHooks2/releases/latest/download/dhooks-2.2.0-detours10-sm110.zip && unzip -o tmp.zip -d ../../ && rm tmp.zip working-directory: ${{ env.SOURCEMOD_PATH }}/ diff --git a/README.md b/README.md index 12c373f..3609d22 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Beta Build](https://github.com/RGLgg/server-resources-updater/workflows/Beta%20Build/badge.svg)](https://github.com/RGLgg/server-resources-updater/actions?query=workflow%3A%22Beta+Build%22) [![Release Build](https://github.com/RGLgg/server-resources-updater/workflows/Release%20Build/badge.svg)](https://github.com/RGLgg/server-resources-updater/actions?query=workflow%3A%22Release+Build%22) [![Sourcemod Version](https://img.shields.io/badge/SourceMod-v1.10%2B-blue?labelColor=d9860a&color=5596cf)](http://www.sourcemod.net/downloads.php?branch=stable) -[![GitHub release (latest by date)](https://img.shields.io/github/v/release/RGLgg/server-resources-updater)](https://github.com/RGLgg/server-resources-updater/releases) +[![GitHub release (latest by date)](https://img.shields.io/github/v/release/RGLgg/server-resources-updater)](https://github.com/RGLgg/server-resources-updater/releases/latest) [![GitHub All Releases](https://img.shields.io/github/downloads/RGLgg/server-resources-updater/total)](https://github.com/RGLgg/server-resources-updater/releases/latest/download/server-resources-updater.zip) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://github.com/RGLgg/server-resources-updater/blob/master/LICENSE) @@ -12,6 +12,7 @@ Parts of this README are still in the process of being updated. **Please ensure you read ALL of the [Installation](https://github.com/RGLgg/server-resources-updater/tree/master#installation) section.** Clicking on the `Clone and download` button will not work, instead ensure your server has [SourceMod 1.10](http://www.sourcemod.net/downloads.php?branch=stable) and click this badge [![GitHub All Releases](https://img.shields.io/github/downloads/RGLgg/server-resources-updater/total)](https://github.com/RGLgg/server-resources-updater/releases/latest/download/server-resources-updater.zip) + # Pre-Bundled Plugins & Dependencies * [Updater](https://git.empiresmod.com/sourcemod/Updater) * Automatically updates SourceMod plugins and files. @@ -33,19 +34,22 @@ Clicking on the `Clone and download` button will not work, instead ensure your s * Updated version of F2's original [pause](https://github.com/F2/F2s-sourcemod-plugins/tree/master/pause) to prevent building of Medic ÜberCharge during a pause . * Originally created by F2. Edited by Aad. * [RGL.gg QoL Tweaks](https://github.com/RGLgg/server-resources-updater/blob/master/addons/sourcemod/scripting/rglqol.sp) - * Adds QoL tweaks for easier competitive server management + * Adds QoL tweaks for easier competitive server management and competitive integrity * By stephanieLGBT and Aad * [RGL.gg Server Resources Updater](https://github.com/RGLgg/server-resources-updater/blob/master/addons/sourcemod/scripting/rglupdater.sp) * Automatically updates RGL.gg plugins and files * By stephanieLGBT and Aad + # Server Resources for RGL.gg Hi! This github repository contains all of the **required** plugins, configs, maps, etc. for RGL league play. The configs were created from scratch, though they were inspired by the UGC, ETF2L, and CEVO configs. The autoupdater plugin was also created from scratch, but heavily inspired by Miggy's (RIP) [UGCUpdate](https://github.com/Miggthulu/UGCUpdate) and [IntegriTF2](https://github.com/Miggthulu/IntegriTF2) plugins. In creating the configs, I tried my best to prevent extra and/or useless commands while also minimizing the ability for cheating, exploitation, and unfair play due to preexisting client and/or server settings. -The RGL updater plugin automatically updates itself and the rest of the files downloaded to your server as this repository gets updated. It also contains Quality of Life tweaks for TF2 servers, such as: +The RGL updater plugin automatically updates itself and the rest of the files downloaded to your server as this repository gets updated. + +It also contains Quality of Life tweaks for TF2 servers, such as: * Preventing servers from automatically changing level after a match @@ -59,6 +63,7 @@ If you find that was missed something in the configs, or if something doesn't wo If you have problems with the plugin, or if you have a suggestion, please submit an issue with details. + # Installation ## Prerequisites [![Sourcemod Version](https://img.shields.io/badge/SourceMod-v1.10%2B-blue?labelColor=d9860a&color=5596cf)](http://www.sourcemod.net/downloads.php?branch=stable) @@ -83,9 +88,6 @@ After installation, typing `sm version` into the server console will confirm if If you're still having trouble, there's step by step instructions with pictures over in the [wiki](https://github.com/stephanieLGBT/rgl-server-resources/wiki/Installation-Tutorial)! - - - ## Updating Instructions The plugin updates itself, along with the RGL configs, after every exec and changelevel. You should never manually edit any config that isn't a gamemode specific custom.cfg, because it will get automatically overwritten. This is to prevent cheating and ensure each server is running the same settings. diff --git a/addons/sourcemod/scripting/rglqol.sp b/addons/sourcemod/scripting/rglqol.sp index 2622ff5..70133fd 100644 --- a/addons/sourcemod/scripting/rglqol.sp +++ b/addons/sourcemod/scripting/rglqol.sp @@ -88,8 +88,7 @@ public Action prWelcomeClient(Handle timer, int userid) int client = GetClientOfUserId(userid); if (client) { - PrintColoredChat(client, "\x07FFA07A[RGLQoL]\x01 This server is running RGL Updater version \x07FFA07A%s\x01", PLUGIN_VERSION); - PrintColoredChat(client, "\x07FFA07A[RGLQoL]\x01 Remember, per RGL rules, players must record POV demos for every match!"); + PrintColoredChat(client, "\x07FFA07A[RGLQoL]\x01 This server is running RGL QoL version \x07FFA07A%s\x01", PLUGIN_VERSION); } } diff --git a/addons/sourcemod/scripting/rglupdater.sp b/addons/sourcemod/scripting/rglupdater.sp index 191c6aa..0014350 100644 --- a/addons/sourcemod/scripting/rglupdater.sp +++ b/addons/sourcemod/scripting/rglupdater.sp @@ -60,6 +60,21 @@ public OnRGLBetaChanged(ConVar convar, char[] oldValue, char[] newValue) updatePlug = true; } +public OnClientPostAdminCheck(client) +{ + CreateTimer(15.0, prWelcomeClient, GetClientUserId(client), TIMER_FLAG_NO_MAPCHANGE); +} + +public Action prWelcomeClient(Handle timer, int userid) +{ + int client = GetClientOfUserId(userid); + if (client) + { + PrintColoredChat(client, "\x07FFA07A[RGLUpdater]\x01 This server is running RGL Updater version \x07FFA07A%s\x01", PLUGIN_VERSION); + PrintColoredChat(client, "\x07FFA07A[RGLUpdater]\x01 Remember, per RGL rules, players must record POV demos for every match!"); + } +} + CheckRGLBeta() { if (!GetConVarBool(FindConVar("rgl_beta")))