diff --git a/README.md b/README.md index 9155b79..cc3456b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [So]ccer [Mo]d [E]dit [-] [2019] (Current Version: 1.3.2 | Latest Tested Version: 1.3.2) +# [So]ccer [Mo]d [E]dit [-] [2019] (Current Version: 1.3.2 | Latest Tested Version: 1.3.3) An edited Version of Marco Boogers SourceMod plugin aimed at Counter-Strike:Source soccer servers. I merely edited and added stuff without any prior knowledge, so expect some heavily improvable code. @@ -27,7 +27,9 @@ I incorporated parts of the following plugins and only modified them partially t If the problem / question remains feel free to create an issue [here](https://github.com/MK99MA/soccermod-2019edit/issues) -## [>>Grass Replacer<<](https://github.com/MK99MA/SoMoE-19/raw/master/Grassreplacer.zip) +## [>>Mostly accurate CHANGELOG<<](https://somoe-19.readthedocs.io/en/latest/changelogs/changes.html). -Use this file & follow it's readme to automatically replace the grass for maps using Lolobubus original grass texture! +## [>>Related map background for the main menu<<](https://github.com/MK99MA/SoMoE-19/raw/master/MainMenuBackground.zip) + +Could be used to force cstrike to cache its grass texture right after starting. Obsolete since 1.3.2 and the addition of server-sided grass replacer options. diff --git a/addons/sourcemod/plugins/old/1.3.3/soccer_mod.smx b/addons/sourcemod/plugins/old/1.3.3/soccer_mod.smx new file mode 100644 index 0000000..495aa87 Binary files /dev/null and b/addons/sourcemod/plugins/old/1.3.3/soccer_mod.smx differ diff --git a/addons/sourcemod/plugins/soccer_mod.smx b/addons/sourcemod/plugins/soccer_mod.smx index ac29ef1..495aa87 100644 Binary files a/addons/sourcemod/plugins/soccer_mod.smx and b/addons/sourcemod/plugins/soccer_mod.smx differ diff --git a/addons/sourcemod/scripting/soccer_mod.sp b/addons/sourcemod/scripting/soccer_mod.sp index 4f497c4..7cd49fb 100644 --- a/addons/sourcemod/scripting/soccer_mod.sp +++ b/addons/sourcemod/scripting/soccer_mod.sp @@ -1,7 +1,7 @@ // ************************************************************************************************************** // ************************************************** DEFINES *************************************************** // ************************************************************************************************************** -#define PLUGIN_VERSION "1.3.2" +#define PLUGIN_VERSION "1.3.3" #define UPDATE_URL "https://raw.githubusercontent.com/MK99MA/SoMoE-19/master/addons/sourcemod/updatefile.txt" #define MAX_NAMES 10 #define MAXCONES_DYN 15 @@ -878,6 +878,16 @@ public Action cmd_jointeam(int client, const char[] command, int iArgs) if (ImportJoinNumber(steamid) > 12) CPrintToChatAll("{%s}[%s] {%s}NOTICE: %N joined on position %i.", prefixcolor, prefix, textcolor, client, ImportJoinNumber(steamid)); } } + if((first12Set == 2) && CapPrep) + { + if(team == 2 || team == 3) + { + char steamid[32] + GetClientAuthId(client, AuthId_Engine, steamid, sizeof(steamid)); + + if (ImportJoinNumber(steamid) > capnr) CPrintToChatAll("{%s}[%s] {%s}NOTICE: %N joined on position %i.", prefixcolor, prefix, textcolor, client, ImportJoinNumber(steamid)); + } + } return Plugin_Continue; } diff --git a/addons/sourcemod/scripting/soccer_mod/modules/cap.sp b/addons/sourcemod/scripting/soccer_mod/modules/cap.sp index e2894c6..fcb9d9d 100644 --- a/addons/sourcemod/scripting/soccer_mod/modules/cap.sp +++ b/addons/sourcemod/scripting/soccer_mod/modules/cap.sp @@ -579,7 +579,11 @@ public void CapAddRandomPlayer(int client) if((first12Set == 1) && CapPrep) { - if (ImportJoinNumber(targetSteamid) > 12) CPrintToChatAll("{%s}[%s] {%s}NOTICE: %N joined on position %i.", prefixcolor, prefixcolor, textcolor, randomPlayer, ImportJoinNumber(targetSteamid)); + if (ImportJoinNumber(targetSteamid) > 12) CPrintToChatAll("{%s}[%s] {%s}NOTICE: %N joined on position %i.", prefixcolor, prefix, textcolor, randomPlayer, ImportJoinNumber(targetSteamid)); + } + if((first12Set == 2) && CapPrep) + { + if (ImportJoinNumber(targetSteamid) > capnr) CPrintToChatAll("{%s}[%s] {%s}NOTICE: %N joined on position %i.", prefixcolor, prefix, textcolor, randomPlayer, ImportJoinNumber(targetSteamid)); } } else CPrintToChat(client, "{%s}[%s] {%s}No players in spectator", prefixcolor, prefix, textcolor); diff --git a/addons/sourcemod/updatefile.txt b/addons/sourcemod/updatefile.txt index 5fe3827..42c3706 100644 --- a/addons/sourcemod/updatefile.txt +++ b/addons/sourcemod/updatefile.txt @@ -4,13 +4,11 @@ { "Version" { - "Latest" "1.3.2" - "Previous" "1.3.1" + "Latest" "1.3.3" + "Previous" "1.3.2" } - "Notes" "More Fixes to joinlist" - "Notes" "Added pre-cap-join option to first 12 rule" - "Notes" "Added !aim command" + "Notes" "Minor changes & fixes" } "Files" diff --git a/docs/changelogs/changes.rst b/docs/changelogs/changes.rst index ae7fde9..3b84b3c 100644 --- a/docs/changelogs/changes.rst +++ b/docs/changelogs/changes.rst @@ -5,7 +5,7 @@ Changelog ========= ----- -1.3.2 +1.3.2 & 1.3.3 ----- *** @@ -13,12 +13,14 @@ New *** - Added Pre-Cap-Join option to First12 Toggle + - Added notification if a player that shouldn't be allowed to play joins a team / gets forced - Added !aim command to find out coordinates to use with replacer configs ******* Changes ******* + - Removed match reset at mapstart - sm_maprr;sm_start combination should work again ***** Fixes diff --git a/docs/index.rst b/docs/index.rst index 5671952..bc6271d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -8,7 +8,7 @@ Welcome to the `SoMoE-19 `_ documentation! ====================================== .. toctree:: - :caption: Current Version: 1.3.2: + :caption: Current Version: 1.3.3: credits features