Radar move from shop UI

gamemodes/terrortown/gamemode/client/cl_equip.lua

@@ -837,20 +837,6 @@ function TraitorMenuPopup()
         GetTranslation("equip_tooltip_main")
     )
 
-    -- Item control
-    if client:HasEquipmentItem("item_ttt_radar") then
-        local dradar = RADAR.CreateMenu(dsheet, dframe)
-
-        dsheet:AddSheet(
-            GetTranslation("radar_name"),
-            dradar,
-            "icon16/magnifier.png",
-            false,
-            false,
-            GetTranslation("equip_tooltip_radar")
-        )
-    end
-
     -- Credit transferring
     if credits > 0 then
         local dtransfer = CreateTransferMenu(dsheet)

gamemodes/terrortown/gamemode/server/sv_main.lua

@@ -168,7 +168,6 @@ util.AddNetworkString("TTT_Credits")
 util.AddNetworkString("TTT_Bought")
 util.AddNetworkString("TTT_BoughtItem")
 util.AddNetworkString("TTT_InterruptChat")
-util.AddNetworkString("TTT_CorpseCall")
 util.AddNetworkString("TTT_PerformGesture")
 util.AddNetworkString("TTT_Role")
 util.AddNetworkString("TTT_RoleList")

gamemodes/terrortown/gamemode/server/sv_player_ext.lua

@@ -389,7 +389,6 @@ function plymeta:ResetRoundFlags()
 
     -- equipment stuff
     self.bomb_wire = nil
-    self.radar_charge = 0
     self.decoy = nil
 
     timer.Remove("give_equipment" .. self:UniqueID())

gamemodes/terrortown/gamemode/shared/sh_cvar_handler.lua

@@ -1,10 +1,6 @@
 ---
 -- All replicated convars are handled in this file
 
--- @realm shared
--- stylua: ignore
-CreateConVar("ttt2_radar_charge_time", "30", {FCVAR_NOTIFY, FCVAR_ARCHIVE, FCVAR_REPLICATED})
-
 ---
 -- @realm shared
 -- stylua: ignore

gamemodes/terrortown/gamemode/shared/sh_init.lua

@@ -47,8 +47,8 @@ SPECIAL_EQUIPMENT = {
     "weapon_ttt_stungun",
     "weapon_ttt_cse",
     "weapon_ttt_teleport",
+    "weapon_ttt_radar",
     "item_ttt_armor",
-    "item_ttt_radar",
     "item_ttt_nodrowningdmg",
     "item_ttt_noenergydmg",
     "item_ttt_noexplosiondmg",
@@ -72,8 +72,8 @@ TRAITOR_EQUIPMENT = {
     "weapon_ttt_sipistol",
     "weapon_ttt_teleport",
     "weapon_ttt_decoy",
+    "weapon_ttt_radar",
     "item_ttt_armor",
-    "item_ttt_radar",
     "item_ttt_disguiser",
 }
 
@@ -601,6 +601,7 @@ include("ttt2/libraries/marker_vision.lua")
 include("ttt2/libraries/weaponrenderer.lua")
 include("ttt2/libraries/game_effects.lua")
 include("ttt2/libraries/voicebattery.lua")
+include("ttt2/libraries/radar.lua")
 
 -- include ttt required files
 ttt_include("sh_decal")

gamemodes/terrortown/gamemode/shared/sh_player_ext.lua

@@ -684,9 +684,10 @@
 
 ---
 -- Returns whether a @{Player} carries a @{Weapon}
+-- @param[opt] string className
 -- @return boolean
 -- @realm shared
-function plymeta:HasEquipmentWeapon()
+function plymeta:HasEquipmentWeapon(className)
     local weps = self:GetWeapons()
 
     for i = 1, #weps do
@@ -696,6 +697,11 @@
             continue
         end
 
+        -- Check for specifc class
+        if className and not WEPS.GetClass(wep) == className then
+            continue
+        end
+
         return true
     end