Merge branch 'master' into fix-cl-main-error

TTT-2 · Nov 27, 2024 · 36d4198 · 36d4198
2 parents 074e1f5 + ad73933
commit 36d4198
Show file tree

Hide file tree

Showing 18 changed files with 53 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,8 @@ All notable changes to TTT2 will be documented here. Inspired by [keep a changel
 - Fixed Magneto-stick not using C_Hands (by @SvveetMavis)
 - Fixed console error when dropping ammo for weapons with no AmmoEnt (by @MrXonte)
 - Fixed client error for a not fully initialized client (by @Histalek)
+- Fixed the targetID corpse hint not respecting `ttt_identify_body_woconfirm` (by @Histalek)
+- Fixed the beacon not being properly translated when placed (by @Histalek)
 
 ### Changed
 

diff --git a/gamemodes/terrortown/entities/entities/ttt_beacon.lua b/gamemodes/terrortown/entities/entities/ttt_beacon.lua
@@ -10,7 +10,7 @@ DEFINE_BASECLASS("ttt_base_placeable")
 
 if CLIENT then
     ENT.Icon = "vgui/ttt/icon_beacon"
-    ENT.PrintName = "Beacon"
+    ENT.PrintName = "beacon_name"
 end
 
 ENT.Base = "ttt_base_placeable"

diff --git a/lua/terrortown/lang/de.lua b/lua/terrortown/lang/de.lua
@@ -2366,3 +2366,6 @@ L.label_voice_activation_mode_toggle_enabled = "Umschalten (Aktiviert zum Start)
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/en.lua b/lua/terrortown/lang/en.lua
@@ -2366,3 +2366,6 @@ L.label_loadingscreen_min_duration = "Minimum loading screen display time"
 L.label_keyhelper_leave_vehicle = "leave vehicle"
 L.name_vehicle = "Vehicle"
 L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/es.lua b/lua/terrortown/lang/es.lua
@@ -2366,3 +2366,6 @@ L.decoy_help_primary = "Colocar el señuelo"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/fr.lua b/lua/terrortown/lang/fr.lua
@@ -2366,3 +2366,6 @@ L.label_loadingscreen_min_duration = "Temps d'affichage minimum de l'écran de c
 L.label_keyhelper_leave_vehicle = "sortir du véhicule"
 L.name_vehicle = "Véhicule"
 L.vehicle_enter = "Appuyez sur [{usekey}] pour entrer dans le véhicule"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/it.lua b/lua/terrortown/lang/it.lua
@@ -2366,3 +2366,6 @@ L.decoy_help_primary = "Piazza un esca"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/ja.lua b/lua/terrortown/lang/ja.lua
@@ -2369,3 +2369,6 @@ L.label_player_role = "役職選択"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/ko.lua b/lua/terrortown/lang/ko.lua
@@ -2363,3 +2363,6 @@ L.label_crosshair_size_gap = "크로스헤어 공간 배율"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/pl.lua b/lua/terrortown/lang/pl.lua
@@ -2366,3 +2366,6 @@ L.decoy_help_primary = "Rozstaw Wabik"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/pt_br.lua b/lua/terrortown/lang/pt_br.lua
@@ -2366,3 +2366,6 @@ L.decoy_help_primary = "Plantar a isca"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/ru.lua b/lua/terrortown/lang/ru.lua
@@ -2368,3 +2368,6 @@ L.label_loadingscreen_min_duration = "Минимальное время отоб
 L.label_keyhelper_leave_vehicle = "покинуть транспорт"
 L.name_vehicle = "Транспорт"
 L.vehicle_enter = "[{usekey}] Сесть в транспорт."
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/sv.lua b/lua/terrortown/lang/sv.lua
@@ -2366,3 +2366,6 @@ L.body_confirm_one = "{finder} bekräftade att {victim} har dött."
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/tr.lua b/lua/terrortown/lang/tr.lua
@@ -2366,3 +2366,6 @@ L.label_loadingscreen_min_duration = "Minimum yükleme ekranı görüntüleme s
 L.label_keyhelper_leave_vehicle = "araçtan çık"
 L.name_vehicle = "Araç"
 L.vehicle_enter = "Araca girmek için [{usekey}] tuşuna bas"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/uk.lua b/lua/terrortown/lang/uk.lua
@@ -2366,3 +2366,6 @@ L.body_confirm_one = "{finder} підтверджує смерть {victim}."
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/zh_hans.lua b/lua/terrortown/lang/zh_hans.lua
@@ -2366,3 +2366,6 @@ L.label_player_role = "选择角色"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/terrortown/lang/zh_tw.lua b/lua/terrortown/lang/zh_tw.lua
@@ -2366,3 +2366,6 @@ L.decoy_help_primary = "安放誘餌"
 --L.label_keyhelper_leave_vehicle = "leave vehicle"
 --L.name_vehicle = "Vehicle"
 --L.vehicle_enter = "Press [{usekey}] to enter vehicle"
+
+-- 2024-11-27
+--L.corpse_hint_without_confirm = "Press [{usekey}] to search."
diff --git a/lua/ttt2/libraries/targetid.lua b/lua/ttt2/libraries/targetid.lua
@@ -560,6 +560,11 @@ function targetid.HUDDrawTargetIDRagdolls(tData)
         then
             tData:SetSubtitle(ParT("corpse_hint_inspect_limited", key_params))
             tData:AddDescriptionLine(TryT("corpse_hint_inspect_limited_details"))
+        elseif
+            bodysearch.GetInspectConfirmMode() == 0
+            and not GetConVar("ttt_identify_body_woconfirm"):GetBool()
+        then
+            tData:SetSubtitle(ParT("corpse_hint_without_confirm", key_params))
         else
             tData:SetSubtitle(ParT("corpse_hint", key_params))
         end