VoiceChat: Added option for team proximity voicechat (#1811)

NickCloudAT · web-flow · commit 7ee2866605c3 · 2025-06-12T18:55:07.000+02:00
This adds a new convar/menu option to enable/disable proximity voice chat for the team voice chat. This tackles #1810 I was NOT yet able to test this! For me it seems 100% fine but if anyone can/wants to test it before merging, please do so.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ All notable changes to TTT2 will be documented here. Inspired by [keep a changel
 - Added 2 new sprint settings (by @wgetJane)
   - Stamina cooldown time before stamina begins regenerating after sprinting, 0.8 seconds by default
   - Option to require forward key to be held to sprint, enabled by default
+- Added option to enable/disable proximity voice chat for the team voice chat (by @NickCloudAT)
 
 ### Changed
 
diff --git a/gamemodes/terrortown/gamemode/server/sv_voice.lua b/gamemodes/terrortown/gamemode/server/sv_voice.lua
@@ -29,6 +29,11 @@ local cv_ttt_limit_spectator_voice =
 -- @realm server
 local loc_voice = CreateConVar("ttt_locational_voice", "0", { FCVAR_NOTIFY, FCVAR_ARCHIVE })
 
+---
+-- @realm server
+local loc_voice_team =
+    CreateConVar("ttt_locational_voice_team", "0", { FCVAR_NOTIFY, FCVAR_ARCHIVE })
+
 ---
 -- @realm server
 local loc_voice_prep =
@@ -44,6 +49,7 @@ local loc_voice_range_sq = loc_voice_range:GetInt() ^ 2
 hook.Add("TTT2SyncGlobals", "AddVoiceGlobals", function()
     SetGlobalBool(sv_voiceenable:GetName(), sv_voiceenable:GetBool())
     SetGlobalBool(loc_voice:GetName(), loc_voice:GetBool())
+    SetGlobalBool(loc_voice_team:GetName(), loc_voice_team:GetBool())
 end)
 
 cvars.AddChangeCallback(sv_voiceenable:GetName(), function(cv, old, new)
@@ -54,6 +60,10 @@ cvars.AddChangeCallback(loc_voice:GetName(), function(cv, old, new)
     SetGlobalBool(loc_voice:GetName(), tobool(tonumber(new)))
 end)
 
+cvars.AddChangeCallback(loc_voice_team:GetName(), function(cv, old, new)
+    SetGlobalBool(loc_voice_team:GetName(), tobool(tonumber(new)))
+end)
+
 cvars.AddChangeCallback(loc_voice_range:GetName(), function(cv, old, new)
     loc_voice_range_sq = tonumber(new) ^ 2
 end)
@@ -99,7 +109,7 @@ local function PlayerCanHearTeam(listener, speaker, speakerTeam)
         return false, false
     end
 
-    return true, loc_voice:GetBool()
+    return true, loc_voice:GetBool() and loc_voice_team:GetBool()
 end
 
 local function PlayerIsMuted(listener, speaker)
diff --git a/lua/terrortown/lang/de.lua b/lua/terrortown/lang/de.lua
@@ -1658,6 +1658,7 @@ L.label_voice_drain_normal = "Entladung pro Tick für normale Spieler"
 L.label_voice_drain_admin = "Entladung pro Tick für Admins und öffentliche Ordnungsrollen"
 L.label_voice_drain_recharge = "Aufladungsrate pro Tick wenn nicht gesprochen wird"
 L.label_locational_voice = "Aktiviere Proximity Sprachchat für lebende Spieler"
+L.label_locational_voice_team = "Aktiviere Proximity Team-Sprachat für lebende Spieler"
 L.label_locational_voice_prep = "Aktiviere Proximity Sprachchat während der Vorbereitungszeit"
 L.label_locational_voice_range = "Proximity Sprachchat Reichweite"
 L.label_armor_on_spawn = "Spielerrüstung beim (Neu-)Spawnen"
diff --git a/lua/terrortown/lang/en.lua b/lua/terrortown/lang/en.lua
@@ -1664,6 +1664,7 @@ L.label_voice_drain_normal = "Drain per tick for normal players"
 L.label_voice_drain_admin = "Drain per tick for admins and public policing roles"
 L.label_voice_drain_recharge = "Recharge rate per tick of not voice chatting"
 L.label_locational_voice = "Enable proximity voice chat for living players"
+L.label_locational_voice_team = "Enable proximity team voice chat for living players"
 L.label_locational_voice_prep = "Enable proximity voice chat during preparing phase"
 L.label_locational_voice_range = "Proximity voice chat range"
 L.label_armor_on_spawn = "Player armor on (re-)spawn"
diff --git a/lua/terrortown/lang/es.lua b/lua/terrortown/lang/es.lua
@@ -1664,6 +1664,7 @@ L.desc_event_kill_other_using = "{victim} ({vrole} / {vteam}) fue asesinado por
 --L.label_voice_drain_admin = "Drain per tick for admins and public policing roles"
 --L.label_voice_drain_recharge = "Recharge rate per tick of not voice chatting"
 --L.label_locational_voice = "Enable proximity voice chat for living players"
+--L.label_locational_voice_team = "Enable proximity team voice chat for living players"
 --L.label_locational_voice_prep = "Enable proximity voice chat during preparing phase"
 --L.label_locational_voice_range = "Proximity voice chat range"
 --L.label_armor_on_spawn = "Player armor on (re-)spawn"
diff --git a/lua/terrortown/lang/fr.lua b/lua/terrortown/lang/fr.lua
@@ -1658,6 +1658,7 @@ L.label_voice_drain_normal = "Consommation par tick pour les joueurs"
 L.label_voice_drain_admin = "Consommation par tick pour les admin et rôles de détective"
 L.label_voice_drain_recharge = "Temps de recharge par tick"
 L.label_locational_voice = "Activer le chat vocal de proximité pour les joueurs vivants"
+--L.label_locational_voice_team = "Enable proximity team voice chat for living players"
 L.label_locational_voice_prep = "Activer le chat vocal de proximité pendant la phase de préparation"
 L.label_locational_voice_range = "Portée du chat vocal de proximité"
 L.label_armor_on_spawn = "Armure du joueur lors d'une (ré)apparition"
diff --git a/lua/terrortown/lang/it.lua b/lua/terrortown/lang/it.lua
@@ -1664,6 +1664,7 @@ L.desc_event_kill_other_using = "{victim} ({vrole} / {vteam}) è stata ucciso da
 --L.label_voice_drain_admin = "Drain per tick for admins and public policing roles"
 --L.label_voice_drain_recharge = "Recharge rate per tick of not voice chatting"
 --L.label_locational_voice = "Enable proximity voice chat for living players"
+--L.label_locational_voice_team = "Enable proximity team voice chat for living players"
 --L.label_locational_voice_prep = "Enable proximity voice chat during preparing phase"
 --L.label_locational_voice_range = "Proximity voice chat range"
 --L.label_armor_on_spawn = "Player armor on (re-)spawn"
diff --git a/lua/terrortown/lang/ja.lua b/lua/terrortown/lang/ja.lua
@@ -1659,6 +1659,7 @@ L.label_voice_drain_normal = "通常プレイヤーのボイスチャットの
 L.label_voice_drain_admin = "管理者および確白役職のボイスチャットのバッテリーのチックあたりの減少値"
 L.label_voice_drain_recharge = "ボイスチャットをしていないティックあたりのリチャージ率"
 L.label_locational_voice = "生存者同士における近接ボイスチャットの有効"
+--L.label_locational_voice_team = "Enable proximity team voice chat for living players"
 L.label_locational_voice_prep = "準備フェーズにおける近接ボイスチャットの有効"
 L.label_locational_voice_range = "近接ボイスチャット範囲"
 L.label_armor_on_spawn = "全プレイヤーアーマー装着"
diff --git a/lua/terrortown/lang/ko.lua b/lua/terrortown/lang/ko.lua
@@ -1660,6 +1660,7 @@ L.help_max_slots = "한 슬롯당 최대 무기 수를 설정합니다. '-1'은
 --L.label_voice_drain_admin = "Drain per tick for admins and public policing roles"
 --L.label_voice_drain_recharge = "Recharge rate per tick of not voice chatting"
 --L.label_locational_voice = "Enable proximity voice chat for living players"
+--L.label_locational_voice_team = "Enable proximity team voice chat for living players"
 --L.label_locational_voice_prep = "Enable proximity voice chat during preparing phase"
 --L.label_locational_voice_range = "Proximity voice chat range"
 --L.label_armor_on_spawn = "Player armor on (re-)spawn"
diff --git a/lua/terrortown/lang/pl.lua b/lua/terrortown/lang/pl.lua
@@ -1664,6 +1664,7 @@ L.none = "Brak Roli"
 --L.label_voice_drain_admin = "Drain per tick for admins and public policing roles"
 --L.label_voice_drain_recharge = "Recharge rate per tick of not voice chatting"
 --L.label_locational_voice = "Enable proximity voice chat for living players"
+--L.label_locational_voice_team = "Enable proximity team voice chat for living players"
 --L.label_locational_voice_prep = "Enable proximity voice chat during preparing phase"
 --L.label_locational_voice_range = "Proximity voice chat range"
 --L.label_armor_on_spawn = "Player armor on (re-)spawn"
diff --git a/lua/terrortown/lang/pt_br.lua b/lua/terrortown/lang/pt_br.lua
@@ -1664,6 +1664,7 @@ L.xfer_team_indicator = "Time"
 --L.label_voice_drain_admin = "Drain per tick for admins and public policing roles"
 --L.label_voice_drain_recharge = "Recharge rate per tick of not voice chatting"
 --L.label_locational_voice = "Enable proximity voice chat for living players"
+--L.label_locational_voice_team = "Enable proximity team voice chat for living players"
 --L.label_locational_voice_prep = "Enable proximity voice chat during preparing phase"
 --L.label_locational_voice_range = "Proximity voice chat range"
 --L.label_armor_on_spawn = "Player armor on (re-)spawn"
diff --git a/lua/terrortown/lang/ru.lua b/lua/terrortown/lang/ru.lua
@@ -1666,6 +1666,7 @@ L.label_voice_drain_normal = "Расход за тик: обычные роли"
 L.label_voice_drain_admin = "Расход за тик: полицейские роли, администраторы"
 L.label_voice_drain_recharge = "Частота подзарядки за тик при голосовом молчании"
 L.label_locational_voice = "Включить ближний голосовой чат для живых игроков."
+--L.label_locational_voice_team = "Enable proximity team voice chat for living players"
 L.label_locational_voice_prep = "Включить ближний голосовой чат во время подготовки."
 L.label_locational_voice_range = "Дальность ближнего голосового чата"
 L.label_armor_on_spawn = "Броня игрока при появлении или возрождении"
diff --git a/lua/terrortown/lang/sv.lua b/lua/terrortown/lang/sv.lua
@@ -1664,6 +1664,7 @@ L.hilite_win_traitors = "FÖRRÄDISK VINST"
 --L.label_voice_drain_admin = "Drain per tick for admins and public policing roles"
 --L.label_voice_drain_recharge = "Recharge rate per tick of not voice chatting"
 --L.label_locational_voice = "Enable proximity voice chat for living players"
+--L.label_locational_voice_team = "Enable proximity team voice chat for living players"
 --L.label_locational_voice_prep = "Enable proximity voice chat during preparing phase"
 --L.label_locational_voice_range = "Proximity voice chat range"
 --L.label_armor_on_spawn = "Player armor on (re-)spawn"
diff --git a/lua/terrortown/lang/tr.lua b/lua/terrortown/lang/tr.lua
@@ -1664,6 +1664,7 @@ L.label_voice_drain_normal = "Normal oyuncular için tik başına azalma"
 L.label_voice_drain_admin = "Yöneticiler ve genel polislik rolleri için tik başına azalma"
 L.label_voice_drain_recharge = "Sesli sohbet etmeme işareti başına şarj oranı"
 L.label_locational_voice = "Canlı oyuncular için yakın sesli sohbeti etkinleştir"
+--L.label_locational_voice_team = "Enable proximity team voice chat for living players"
 L.label_locational_voice_prep = "Hazırlanma sürecinde konumsal ses sohbetini etkinleştir"
 L.label_locational_voice_range = "Konumsal ses sohbetinin uzaklık oranı"
 L.label_armor_on_spawn = "(Yeniden) canlanmada oyuncu zırhı"
diff --git a/lua/terrortown/lang/uk.lua b/lua/terrortown/lang/uk.lua
@@ -1664,6 +1664,7 @@ L.hilite_win_traitors = "ЗРАДНИКИ ПЕРЕМОГЛИ"
 --L.label_voice_drain_admin = "Drain per tick for admins and public policing roles"
 --L.label_voice_drain_recharge = "Recharge rate per tick of not voice chatting"
 --L.label_locational_voice = "Enable proximity voice chat for living players"
+--L.label_locational_voice_team = "Enable proximity team voice chat for living players"
 --L.label_locational_voice_prep = "Enable proximity voice chat during preparing phase"
 --L.label_locational_voice_range = "Proximity voice chat range"
 --L.label_armor_on_spawn = "Player armor on (re-)spawn"
diff --git a/lua/terrortown/lang/zh_hans.lua b/lua/terrortown/lang/zh_hans.lua
@@ -1658,6 +1658,7 @@ L.label_voice_drain_normal = "普通玩家的每滴答消耗量"
 L.label_voice_drain_admin = "让管理员和公开警察角色的电池会耗尽"
 L.label_voice_drain_recharge = "不进行语音聊天时每滴答的充能率"
 L.label_locational_voice = "为活着的玩家启用近距离语音聊天功能"
+--L.label_locational_voice_team = "Enable proximity team voice chat for living players"
 L.label_locational_voice_prep = "在准备阶段启用近距离语音聊天"
 L.label_locational_voice_range = "近距离语音聊天范围"
 L.label_armor_on_spawn = "玩家在重生时的默认护甲量"
diff --git a/lua/terrortown/lang/zh_tw.lua b/lua/terrortown/lang/zh_tw.lua
@@ -1658,6 +1658,7 @@ L.label_voice_drain_normal = "普通玩家的每滴答消耗量"
 L.label_voice_drain_admin = "讓管理員和公共警察角色的電池會耗盡"
 L.label_voice_drain_recharge = "不進行語音聊天時每滴答的充能率"
 L.label_locational_voice = "為活著的玩家啟用近距離語音聊天功能"
+--L.label_locational_voice_team = "Enable proximity team voice chat for living players"
 --L.label_locational_voice_prep = "Enable proximity voice chat during preparing phase"
 --L.label_locational_voice_range = "Proximity voice chat range"
 L.label_armor_on_spawn = "玩家在重生時的默認護甲量"
diff --git a/lua/terrortown/menus/gamemode/administration/chat.lua b/lua/terrortown/menus/gamemode/administration/chat.lua
@@ -87,6 +87,12 @@ function CLGAMEMODESUBMENU:Populate(parent)
         master = enbLocVoice,
     })
 
+    form3:MakeCheckBox({
+        serverConvar = "ttt_locational_voice_team",
+        label = "label_locational_voice_team",
+        master = enbLocVoice,
+    })
+
     local form4 = vgui.CreateTTT2Form(parent, "header_textchat")
 
     form4:MakeCheckBox({
