Merge pull request #886 from Malivil/dev

Added ability for the Tracker to be a special innocent instead of a special detective (disabled by default)

Author: Malivil

CONVARS.md

@@ -525,6 +525,7 @@ ttt_paladin_heal_self                          1       // Whether the Paladin's
 ttt_paladin_credits_starting                   1       // The number of credits a Paladin should start with
 
 // Tracker
+ttt_tracker_is_innocent                        0       // Whether the Tracker should be treated as a special innocent
 ttt_tracker_footstep_time                      15      // The amount of time players' footsteps should show to the Tracker before fading. Set to 0 to disable
 ttt_tracker_footstep_color                     1       // Whether players' footsteps should have different colors
 ttt_tracker_credits_starting                   1       // The number of credits a Tracker should start with

RELEASE.md

@@ -8,6 +8,7 @@
 - Added ability to control whether the mercenary gets body armor as part of their loadout (defaults to `true`)
 - Added ability to change vampire's fang drain overheal to overheal (default), increase max health, or do both
 - Added ability to disable automatically confirming a players death when searching their body (disabled by default)
+- Added ability for the Tracker to be a special innocent instead of a special detective (disabled by default)
 
 ### Changes
 - Updated weapon switch and pickup HUD elements to use the same logic for getting weapon names

docs/teams/detective.html

@@ -668,7 +668,7 @@ <h3 style="margin: 10px 0; padding: 0;">Role Configuration:</h3>
             </div>
         </div>
         <div id="tracker" class="collapsible">
-            <button class="header" style="background-color:var(--special-detective);"><i class="icon-tracker"></i>Tracker</button>
+            <button class="header" style="background-image:linear-gradient(110deg, var(--special-detective) 0%, var(--special-detective) 70%, var(--special-innocent) 70%, var(--special-innocent) 100%);"><i class="icon-tracker"></i>Tracker</button>
             <div class="content">
                 <div class="moreless">[more]</div>
                 <p>The <span class="inline-icon" style="color:var(--special-detective);"><i class="icon-tracker"></i><a href="#tracker">Tracker</a></span> can see a trail of footsteps left by other players.</p>
@@ -706,6 +706,12 @@ <h3 style="margin: 10px 0; padding: 0;">Role Configuration:</h3>
                             <td>Integer</td>
                             <td>The time in seconds a player's footsteps should show to the Tracker before fading. <i>(Set to 0 to disable.)</i></td>
                         </tr>
+                        <tr>
+                            <td>ttt_tracker_is_innocent <span data-text="Beta Only" class="betaonly betaicon tooltip">&nbsp;</span></td>
+                            <td>0</td>
+                            <td>Boolean</td>
+                            <td>Whether the Tracker should be treated as a special innocent.</td>
+                        </tr>
                         <tr>
                             <td>ttt_tracker_radar_loadout</td>
                             <td>0</td>

docs/teams/innocent.html

@@ -1055,7 +1055,7 @@ <h3 style="margin: 10px 0; padding: 0;">Role Configuration:</h3>
         <div class="noncollapsible">
             <button class="header" style="cursor: default; background-color:var(--special-innocent);"><i class="icon-team"></i>Configurable Innocents</button>
             <div class="content">
-                <p>The following roles can be configured to be a <span style="color:var(--special-innocent);">special innocent</span> instead of their default team: <span class="inline-icon" style="color:var(--special-detective);"><i class="icon-sapper"></i><a href="../teams/detective.html#sapper">Sapper</a></span>.</p>
+                <p>The following roles can be configured to be a <span style="color:var(--special-innocent);">special innocent</span> instead of their default team: <span class="inline-icon" style="color:var(--special-detective);"><i class="icon-sapper"></i><a href="../teams/detective.html#sapper">Sapper</a></span> and <span class="inline-icon" style="color:var(--special-detective);"><i class="icon-tracker"></i><a href="../teams/detective.html#tracker">Tracker</a></span>.</p>
             </div>
         </div>
     </div>

gamemodes/terrortown/gamemode/roles/tracker/shared.lua

@@ -2,29 +2,13 @@ AddCSLuaFile()
 
 local hook = hook
 
-local function InitializeEquipment()
-    if DefaultEquipment then
-        DefaultEquipment[ROLE_TRACKER] = {
-            EQUIP_ARMOR,
-            EQUIP_RADAR
-        }
-    end
-end
-InitializeEquipment()
-
-hook.Add("Initialize", "Tracker_Shared_Initialize", function()
-    InitializeEquipment()
-end)
-hook.Add("TTTPrepareRound", "Tracker_Shared_TTTPrepareRound", function()
-    InitializeEquipment()
-end)
-
 ------------------
 -- ROLE CONVARS --
 ------------------
 
 CreateConVar("ttt_tracker_footstep_time", "15", FCVAR_REPLICATED, "The amount of time players' footsteps should show to the tracker before fading. Set to 0 to disable", 0, 60)
 CreateConVar("ttt_tracker_footstep_color", "1", FCVAR_REPLICATED)
+local tracker_is_innocent = CreateConVar("ttt_tracker_is_innocent", "0", FCVAR_REPLICATED, "Whether the tracker should be treated as a special innocent", 0, 1)
 
 ROLE_CONVARS[ROLE_TRACKER] = {}
 table.insert(ROLE_CONVARS[ROLE_TRACKER], {
@@ -39,4 +23,34 @@ table.insert(ROLE_CONVARS[ROLE_TRACKER], {
 table.insert(ROLE_CONVARS[ROLE_TRACKER], {
     cvar = "ttt_tracker_radar_loadout",
     type = ROLE_CONVAR_TYPE_BOOL
-})
+})
+table.insert(ROLE_CONVARS[ROLE_TRACKER], {
+    cvar = "ttt_tracker_is_innocent",
+    type = ROLE_CONVAR_TYPE_BOOL
+})
+
+-------------------
+-- ROLE FEATURES --
+-------------------
+
+local function InitializeEquipment()
+    if DefaultEquipment then
+        DefaultEquipment[ROLE_TRACKER] = {
+            EQUIP_ARMOR,
+            EQUIP_RADAR
+        }
+    end
+end
+InitializeEquipment()
+
+hook.Add("Initialize", "Tracker_Shared_Initialize", function()
+    InitializeEquipment()
+end)
+hook.Add("TTTPrepareRound", "Tracker_Shared_TTTPrepareRound", function()
+    InitializeEquipment()
+end)
+
+hook.Add("TTTUpdateRoleState", "Tracker_TTTUpdateRoleState", function()
+    local is_innocent = tracker_is_innocent:GetBool()
+    DETECTIVE_ROLES[ROLE_TRACKER] = not is_innocent
+end)