Merge pull request #639 from shavitush/very_good_yes

Dropping Chat-Processor

README.md

@@ -18,13 +18,12 @@ Including a records system, map zones (start/end marks etc), bonuses, HUD with u
 # Requirements:
 * Steam version of Counter-Strike: Source or Counter-Strike: Global Offensive.
 * [SourceMod 1.9 or above](http://www.sourcemod.net/downloads.php)
+* A MySQL database (preferably locally hosted) if your database is likely to grow big, or if you want to use the rankings plugin. MySQL server version of 5.5.5 or above (MariaDB equivalent works too) is highly recommended.
 
-# Optional requirements:
-* [DHooks](http://users.alliedmods.net/~drifter/builds/dhooks/2.1/) - required for 250/260 runspeed for all weapons.
-* [Bunnyhop Statistics](https://forums.alliedmods.net/showthread.php?t=286135) - to show amount of scrolls for non-auto styles in the key display. Required for TF2 servers.
-* [SteamWorks](https://forums.alliedmods.net/showthread.php?t=229556) - for the `{serverip}` advertisement variable.
-* [Chat-Processor](https://github.com/Drixevel/Chat-Processor) - if you're enabling the `shavit-chat` module.
-* A MySQL database (preferably locally hosted) if your database is likely to grow or want to use the rankings plugin. MySQL server version of 5.5.5 or above (MariaDB equivalent works too) is recommended.
+# Optional requirements, for the best experience:
+* [DHooks](http://users.alliedmods.net/~drifter/builds/dhooks/2.1/)
+* [Bunnyhop Statistics](https://forums.alliedmods.net/showthread.php?t=286135)
+* [SteamWorks](https://forums.alliedmods.net/showthread.php?t=229556)
 
 #  Installation:
 Refer to the [wiki page](https://github.com/shavitush/bhoptimer/wiki/1.-Installation).

addons/sourcemod/configs/shavit-chatsettings.cfg

@@ -0,0 +1,46 @@
+// These are the chat messages for the bhoptimer implementation of a chat processor.
+// Notes:
+// In CS:S and TF2, the colon uses the default chat color.
+// In CS:GO, the colon uses the same color the player name uses.
+"Chat Messages"
+{
+	"CS:S"
+	{
+		"Cstrike_Chat_CT_Loc"		"(Counter-Terrorist) {name} {def}{colon}  {msg}"
+		"Cstrike_Chat_CT"			"(Counter-Terrorist) {name} {def}{colon}  {msg}"
+		"Cstrike_Chat_T_Loc"		"(Terrorist) {name} {def}{colon}  {msg}"
+		"Cstrike_Chat_T"			"(Terrorist) {name} {def}{colon}  {msg}"
+		"Cstrike_Chat_CT_Dead"		"*DEAD*(Counter-Terrorist) {name} {def}{colon}  {msg}"
+		"Cstrike_Chat_T_Dead"		"*DEAD*(Terrorist) {name} {def}{colon}  {msg}"
+		"Cstrike_Chat_Spec"			"(Spectator) {name} {def}{colon}  {msg}"
+		"Cstrike_Chat_All"			"{name} {def}{colon}  {msg}"
+		"Cstrike_Chat_AllDead"		"*DEAD* {name} {def}{colon}  {msg}"
+		"Cstrike_Chat_AllSpec"		"*SPEC* {name} {def}{colon}  {msg}"
+	}
+
+	"CS:GO"
+	{
+		"Cstrike_Chat_CT_Loc"		"(Counter-Terrorist) {name} {colon}  {msg}"
+		"Cstrike_Chat_CT"			"(Counter-Terrorist) {name} {colon}  {msg}"
+		"Cstrike_Chat_T_Loc"		"(Terrorist) {name} {colon}  {msg}"
+		"Cstrike_Chat_T"			"(Terrorist) {name} {colon}  {msg}"
+		"Cstrike_Chat_CT_Dead"		"*DEAD*(Counter-Terrorist) {name} {colon}  {msg}"
+		"Cstrike_Chat_T_Dead"		"*DEAD*(Terrorist) {name} {colon}  {msg}"
+		"Cstrike_Chat_Spec"			"(Spectator) {name} {colon}  {msg}"
+		"Cstrike_Chat_All"			"{name} {colon}  {msg}"
+		"Cstrike_Chat_AllDead"		"*DEAD* {name} {colon}  {msg}"
+		"Cstrike_Chat_AllSpec"		"*SPEC* {name} {colon}  {msg}"
+	}
+
+	"TF2"
+	{
+		"TF_Chat_Team_Loc"			"(TEAM) {name} {def}{colon}  {msg}"
+		"TF_Chat_Team"				"(TEAM) {name} {def}{colon}  {msg}"
+		"TF_Chat_Team_Dead"			"*DEAD*(TEAM) {name} {def}{colon}  {msg}"
+		"TF_Chat_Spec"				"(Spectator) {name} {def}{colon}  {msg}"
+		"TF_Chat_All"				"{name} {def}{colon}  {msg}"
+		"TF_Chat_AllDead"			"*DEAD* {name} {def}{colon}  {msg}"
+		"TF_Chat_AllSpec"			"*SPEC* {name} {def}{colon}  {msg}"
+		"TF_Chat_Coach"				"(Coach) {name} {def}{colon}  {msg}"
+	}
+}

addons/sourcemod/configs/shavit-zones.cfg

@@ -1,6 +1,6 @@
 // Absolutely DON'T delete subkeys from this file.
 //
-// Visible defaults to 1.
+// 'visible' defaults to 1, 'flat' defaults to 0.
 // Other values default to 255, except for width which is 0.5.
 "Zones"
 {
@@ -22,6 +22,8 @@
 
 			"alpha"		"255"
 			"width"		"0.5"
+
+			"flat"		"0"
 		}
 
 		"End"
@@ -108,12 +110,6 @@
 			"width"		"4.0"
 		}
 
-		// This is unused, ignore it.
-		"SPAWN POINT"
-		{
-
-		}
-
 		"Easybhop"
 		{
 			"visible"	"1"
@@ -234,12 +230,6 @@
 			"width"		"2.0"
 		}
 
-		// This is unused, ignore it.
-		"Bonus SPAWN POINT"
-		{
-
-		}
-
 		"Bonus Easybhop"
 		{
 			"visible"	"1"

addons/sourcemod/scripting/include/shavit.inc

@@ -23,7 +23,7 @@
 #endif
 #define _shavit_included
 
-#define SHAVIT_VERSION "2.1.2"
+#define SHAVIT_VERSION "2.2.0"
 #define STYLE_LIMIT 256
 #define MAX_ZONES 64