Rank restrictions: Different CVars for restrict text & voice chats (#302)

* Rank restrictions: Separate restrictions for voice and text chats

* Rank restrictions: fix compile errors

* Rank restrictions: update cfg

* fix compilation

Author: Nord1cWarr1or

cstrike/addons/amxmodx/configs/plugins/ChatAdditions/CA_Addon_RankRestrictions.cfg

@@ -1,4 +1,4 @@
-// Restrictions Types
+// Restrictions Type
 // 0 - Disable restrictions
 // 1 - Level restrictions
 // 2 - Kills count restrictions
@@ -17,11 +17,17 @@ ca_rankrestrictions_type "1"
 // Maximum: "1.000000"
 ca_rankrestrictions_type_kills "1"
 
-// Min kills count to access voice & text chat
+// Min kills count to access VOICE chat
 // -
 // Default: "10"
 // Minimum: "0.000000"
-ca_rankrestrictions_min_kills "10"
+ca_rankrestrictions_min_kills_voice_chat "10"
+
+// Min kills count to access TEXT chat
+// -
+// Default: "10"
+// Minimum: "0.000000"
+ca_rankrestrictions_min_kills_text_chat "10"
 
 // Level System Types
 // 0 - Advanced Experience System
@@ -37,11 +43,17 @@ ca_rankrestrictions_min_kills "10"
 // Maximum: "6.000000"
 ca_rankrestrictions_type_level "1"
 
-// Min Level to access voice & text chat
+// Min Level to access VOICE chat
+// -
+// Default: "2"
+// Minimum: "0.000000"
+ca_rankrestrictions_min_level_voice_chat "2"
+
+// Min Level to access TEXT chat
 // -
 // Default: "2"
 // Minimum: "0.000000"
-ca_rankrestrictions_min_level "2"
+ca_rankrestrictions_min_level_text_chat "2"
 
 // User immunity flag
 // -
@@ -53,4 +65,4 @@ ca_rankrestrictions_immunity_flag "a"
 // Default: "0"
 // Minimum: "0.000000"
 // Maximum: "1.000000"
-ca_rankrestrictions_steam_immunity "0"
+ca_rankrestrictions_steam_immunity "0"

cstrike/addons/amxmodx/scripting/CA_Addon_RankRestrictions.sma

@@ -17,17 +17,25 @@ native get_user_skill(player, &Float: skill);
 native get_user_stats(player, stats[STATSX_MAX_STATS], bodyhits[MAX_BODYHITS]);
 //
 
-enum any: rankRestrictionsType {
+
+enum any: eChatType {
+  voice_chat,
+  text_chat
+}
+
+enum any: eRankRestrictionsType {
   rr_type_none,
   rr_type_level,
   rr_type_frags
 }
 
 new ca_rankrestrictions_type,
   ca_rankrestrictions_type_kills,
-  ca_rankrestrictions_min_kills,
+  ca_rankrestrictions_min_kills_voice_chat,
+  ca_rankrestrictions_min_kills_text_chat,
   ca_rankrestrictions_type_level,
-  ca_rankrestrictions_min_level,
+  ca_rankrestrictions_min_level_voice_chat,
+  ca_rankrestrictions_min_level_text_chat,
   ca_rankrestrictions_immunity_flag[16],
   ca_rankrestrictions_steam_immunity
 
@@ -84,7 +92,7 @@ public native_filter(const name[], index, trap) {
 
 Create_CVars() {
   bind_pcvar_num(create_cvar("ca_rankrestrictions_type", "1", 
-    .description = "Restrictions Types\n\
+    .description = "Restrictions Type\n\
       0 - Disable restrictions\n\
       1 - Level restrictions\n\
       2 - Kills count restrictions",
@@ -102,10 +110,16 @@ Create_CVars() {
     ), ca_rankrestrictions_type_kills
   )
 
-  bind_pcvar_num(create_cvar("ca_rankrestrictions_min_kills", "10",
-    .description = "Min kills count to access voice & text chat",
+  bind_pcvar_num(create_cvar("ca_rankrestrictions_min_kills_voice_chat", "10",
+    .description = "Min kills count to access VOICE chat",
+    .has_min = true, .min_val = 0.0
+    ), ca_rankrestrictions_min_kills_voice_chat
+  )
+
+  bind_pcvar_num(create_cvar("ca_rankrestrictions_min_kills_text_chat", "10",
+    .description = "Min kills count to access TEXT chat",
     .has_min = true, .min_val = 0.0
-    ), ca_rankrestrictions_min_kills
+    ), ca_rankrestrictions_min_kills_text_chat
   )
 
   bind_pcvar_num(create_cvar("ca_rankrestrictions_type_level", "1",
@@ -122,10 +136,16 @@ Create_CVars() {
     ), ca_rankrestrictions_type_level
   )
 
-  bind_pcvar_num(create_cvar("ca_rankrestrictions_min_level", "2",
-    .description = "Min Level to access voice & text chat",
+  bind_pcvar_num(create_cvar("ca_rankrestrictions_min_level_voice_chat", "2",
+    .description = "Min Level to access VOICE chat",
     .has_min = true, .min_val = 0.0
-    ), ca_rankrestrictions_min_level
+    ), ca_rankrestrictions_min_level_voice_chat
+  )
+
+  bind_pcvar_num(create_cvar("ca_rankrestrictions_min_level_text_chat", "2",
+    .description = "Min Level to access TEXT chat",
+    .has_min = true, .min_val = 0.0
+    ), ca_rankrestrictions_min_level_text_chat
   )
 
   bind_pcvar_string(create_cvar("ca_rankrestrictions_immunity_flag", "a",
@@ -143,19 +163,23 @@ Create_CVars() {
 }
 
 public CA_Client_Say(player, const bool: isTeamMessage, const message[]) {
-  if(!CanCommunicate(player)) {
+  if(!CanCommunicate(player, true, text_chat)) {
     return CA_SUPERCEDE
   }
 
   return CA_CONTINUE
 }
 
 public CA_Client_Voice(const listener, const sender) {
-  // need chat notification?
-  return CanCommunicate(sender, false) ? CA_CONTINUE : CA_SUPERCEDE
+  if(!CanCommunicate(sender, false, voice_chat)) {
+    // need chat notification?
+    return CA_SUPERCEDE
+  }
+  
+  return CA_CONTINUE
 }
 
-bool: CanCommunicate(const player, const bool: print = true) {
+bool: CanCommunicate(const player, const bool: print, chatType) {
   if(ca_rankrestrictions_type <= rr_type_none) {
     return true
   }
@@ -169,24 +193,50 @@ bool: CanCommunicate(const player, const bool: print = true) {
     return true
   }
 
-  if(ca_rankrestrictions_type == rr_type_level && GetUserLevel(player) < ca_rankrestrictions_min_level) {
-    if(print) {
-      client_print_color(player, print_team_red, "%L",
-        player, "RankRestrictions_Warning_MinLevel", ca_rankrestrictions_min_level
-      )
+  switch(chatType) {
+    case voice_chat: {
+      if(ca_rankrestrictions_type == rr_type_level && GetUserLevel(player) < ca_rankrestrictions_min_level_voice_chat) {
+        if(print) {
+          client_print_color(player, print_team_red, "%L",
+            player, "RankRestrictions_Warning_MinLevel", ca_rankrestrictions_min_level_voice_chat
+          )
+        }
+
+        return false
+      }
+
+      if(ca_rankrestrictions_type == rr_type_frags && GetUserFragsFromStats(player) < ca_rankrestrictions_min_kills_voice_chat) {
+        if(print) {
+          client_print_color(player, print_team_red, "%L",
+            player, "RankRestrictions_Warning_MinKills", ca_rankrestrictions_min_kills_voice_chat
+          )
+        }
+
+        return false
+      }
     }
 
-    return false
-  }
-
-  if(ca_rankrestrictions_type == rr_type_frags && GetUserFragsFromStats(player) < ca_rankrestrictions_min_kills) {
-    if(print) {
-      client_print_color(player, print_team_red, "%L",
-        player, "RankRestrictions_Warning_MinKills", ca_rankrestrictions_min_kills
-      )
+    case text_chat: {
+      if(ca_rankrestrictions_type == rr_type_level && GetUserLevel(player) < ca_rankrestrictions_min_level_text_chat) {
+        if(print) {
+          client_print_color(player, print_team_red, "%L",
+            player, "RankRestrictions_Warning_MinLevel", ca_rankrestrictions_min_level_text_chat
+          )
+        }
+
+        return false
+      }
+
+      if(ca_rankrestrictions_type == rr_type_frags && GetUserFragsFromStats(player) < ca_rankrestrictions_min_kills_text_chat) {
+        if(print) {
+          client_print_color(player, print_team_red, "%L",
+            player, "RankRestrictions_Warning_MinKills", ca_rankrestrictions_min_kills_text_chat
+          )
+        }
+
+        return false
+      }
     }
-
-    return false
   }
 
   return true