Merge pull request #877 from Malivil/dev

Misc. changes

Author: Malivil

.github/workflows/luacheck.yml

@@ -30,10 +30,10 @@ jobs:
         uses: leafo/gh-actions-luarocks@v4
 
       - name: Setup dependencies
-        run: luarocks install --deps-only gluacheck-dev-1.rockspec
+        run: luarocks install --deps-only luacheck-dev-1.rockspec
 
       - name: Build ‘luacheck’ (bootstrap)
-        run: luarocks make gluacheck-dev-1.rockspec
+        run: luarocks make luacheck-dev-1.rockspec
 
       - name: Run ‘luacheck’ (dogfood)
         run: lua -e 'package.path="./gluacheck/src/?.lua;./gluacheck/src/?/init.lua;"..package.path' gluacheck/bin/luacheck.lua gamemodes scripts

.luacheckrc

@@ -1089,6 +1089,9 @@ globals = {
     "VAMPIRE_DEATH_NONE",
     "VAMPIRE_DEATH_KILL_CONVERTED",
     "VAMPIRE_DEATH_REVERT_CONVERTED",
+    "VAMPIRE_OVERHEAL_MODE_HEALTH",
+    "VAMPIRE_OVERHEAL_MODE_MAX_HEALTH",
+    "VAMPIRE_OVERHEAL_MODE_BOTH",
     "VAMPIRE_THRALL_FF_MODE_NONE",
     "VAMPIRE_THRALL_FF_MODE_REFLECT",
     "VAMPIRE_THRALL_FF_MODE_IMMUNE",
@@ -1250,6 +1253,7 @@ std = {
                 EqualValues = {},
                 ExcludedKeys = {},
                 GetKeys = {},
+                GetFirstItemWithPropertyValue = {},
                 HasItemWithPropertyValue = {},
                 HasTable = {},
                 HasValue = {},

API/HOOKS.md

@@ -1263,13 +1263,14 @@ Called before a team chat message is sent. Used to modify the targets of the tea
 
 *Return:* Whether or not this team chat message should be sent (Defaults to `true`)
 
-### TTTTeamVoiceChatTargets(speaker, targets)
+### TTTTeamVoiceChatTargets(speaker, targets, state)
 Called before a team voice state message is sent. Used to modify the targets of the team voice state message.\
 *Realm:* Server\
 *Added in:* 2.0.7\
 *Parameters:*
 - *speaker* - The player trying to send their team voice state message
 - *targets* - The table of players that this message will be sent to. Add or remove players from this table to change the message recipients
+- *state* - Whether the speaker is speaking globally (`true`) or only to their team (`false`) *(Added in 2.3.5)*
 
 *Return:* Whether or not this team voice state message should be sent (Defaults to `true`)
 
@@ -1340,7 +1341,7 @@ Called after globals are synced but but before role colors and strings are set.
 *Realm:* Client and Server\
 *Added in:* 1.2.7
 
-### TTTVampireBodyEaten(ply, ent, living, healed)
+### TTTVampireBodyEaten(ply, ent, living, healed, maxchange)
 Called after a vampire eats a body.\
 *Realm:* Server\
 *Added in:* 1.6.16\
@@ -1349,6 +1350,7 @@ Called after a vampire eats a body.\
 - *ent* - The target entity. Generally either a player or a ragdoll
 - *living* - Whether the target entity was living at the time they were eaten
 - *healed* - The amount of health the player gained from eating the body
+- *maxchange* - The amount of maximum health the player gained from eating the body *(Added in 2.3.5)*
 
 ### TTTVampireInvisibilityChange(ply, invisible)
 Called when a vampire starts or ends their invisibility.\

API/METHODS_TABLE.md

@@ -9,8 +9,17 @@ Returns new table that contains the keys not present as values in in the given e
 - *tbl* - The table whose keys are being inspected
 - *excludes* - Table of values to exclude
 
+### table.GetFirstItemWithPropertyValue(tbl, key, val)
+Returns the first item in the given table that has an item whose property specified by the provided `key` has a value that matches the given `val`.\
+*Realm:* Client and Server\
+*Added in:* 2.3.5\
+*Parameters:*
+- *tbl* - The table whose values are being inspected
+- *key* - The property name whose value is being compared
+- *val* - The value to find in the given property
+
 ### table.HasItemWithPropertyValue(tbl, key, val)
-Returns whether the given table has an item whose property specified by the provided `key` has a value that makes the given `val`.\
+Returns whether the given table has an item whose property specified by the provided `key` has a value that matches the given `val`.\
 *Realm:* Client and Server\
 *Added in:* 1.8.7\
 *Parameters:*

CONVARS.md

@@ -300,9 +300,10 @@ ttt_vampire_show_target_icon                   0       // Whether Vampires have
 ttt_vampire_damage_reduction                   0       // The fraction an attacker's bullet damage will be reduced by when they are shooting a Vampire
 ttt_vampire_fang_timer                         5       // The amount of time fangs must be used to fully drain a target's blood
 ttt_vampire_fang_dead_timer                    0       // The amount of time fangs must be used to fully drain a dead target's blood. Set to 0 to use the same time as "ttt_vampire_fang_timer"
-ttt_vampire_fang_heal                          50      // The amount of health a vVampire will heal by when they fully drain a target's blood
+ttt_vampire_fang_heal                          50      // The amount of health a Vampire will heal by when they fully drain a target's blood
 ttt_vampire_fang_overheal                      25      // The amount over the Vampire's normal maximum health (e.g. 100 + this ConVar) that the Vampire can heal to by drinking blood.
 ttt_vampire_fang_overheal_living               -1      // The amount of overheal (see "ttt_vampire_fang_overheal") to give if the Vampire's target is living. Set to -1 to use the same amount as "ttt_vampire_fang_overheal" instead
+ttt_vampire_fang_overheal_mode                 0       // How to handle healing a vampire over their maximum health. 0 - Increase health. 1 - Increase max health. 2 - Increase both.
 ttt_vampire_fang_unfreeze_delay                2       // The number of seconds before players who were frozen in place by the fangs should be released if the Vampire stops using the fangs on them
 ttt_vampire_prime_death_mode                   0       // What to do when the prime Vampire(s) (e.g. players who spawn as Vampires originally) are killed. 0 - Do nothing. 1 - Kill all Vampire thralls (non-prime Vampires). 2 - Revert all Vampire thralls (non-prime Vampires) to their original role
 ttt_vampire_prime_only_convert                 1       // Whether only prime Vampires (e.g. players who spawn as Vampire originally) are allowed to convert other players
@@ -411,6 +412,7 @@ ttt_deputy_activation_credits                  0       // The number of credits
 
 // Mercenary
 ttt_mercenary_credits_starting                 1       // The number of credits a Mercenary should start with
+ttt_mercenary_armor_loadout                    1       // Whether the mercenary should get body armor as part of their loadout
 
 // Veteran
 ttt_veteran_damage_bonus                       0.5     // Damage bonus that the Veteran has when they are the last innocent alive (e.g. 0.5 = 50% more damage)
@@ -1240,7 +1242,8 @@ ttt_dna_scan_detectives_loadout                0       // Whether all detectives
 ttt_dna_scan_on_dialog                         1       // Whether to show a button to open the DNA scanner on the body search dialog
 ttt_dna_scan_only_drop_on_death                0       // Whether the DNA scanner should only be droppable when the holder dies
 ttt_spectator_corpse_search                    1       // Whether spectators can search bodies (not shared with other players)
-ttt_corpse_search_not_shared                   0       // Whether corpse searches are not shared with other players (only affects non-detective-like searchers)
+ttt_corpse_search_auto_confirm                 1       // Whether corpse searches are not shared with other players (only affects non-detective-like searchers)
+ttt_corpse_search_not_shared                   0       // Whether corpse searches automatically confirm the death of the player
 ttt_corpse_search_killer_team_text_traitor     0       // Whether corpse searches should include flavor text hinting at the team of their traitor team killer
 ttt_corpse_search_killer_team_text_innocent    0       // Whether corpse searches should include flavor text hinting at the team of their innocent team killer
 ttt_corpse_search_killer_team_text_monster     0       // Whether corpse searches should include flavor text hinting at the team of their monster team killer

RELEASE.md

@@ -1,5 +1,26 @@
 # Release Notes
 
+## 2.3.5 (Beta)
+**Released:**
+
+### Changes
+- Updated weapon switch and pickup HUD elements to use the same logic for getting weapon names
+  - Fixes very rare cases where they would say different things
+
+### Additions
+- 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)
+
+### Fixes
+- Fixed illusionist not blocking traitor team voice chat
+- Fixed promoted impersonator and deputy who are searched by a detective not always showing their true role on the scoreboard
+
+### Developer
+- Added `state` parameter to `TTTTeamVoiceChatTargets` hook
+- Added `table.GetFirstItemWithPropertyValue` static method
+- Added `maxchange` parameter to `TTTVampireBodyEaten` hook
+
 ## 2.3.4 (Beta)
 **Released: August 9th, 2025**
 

docs/api/hooks.html

@@ -1889,7 +1889,7 @@ <h3><a id="tttteamchattargetssender-msg-targets-from_chat" href="#tttteamchattar
             <em>Return:</em> Whether or not this team chat message should be sent (Defaults to <code>true</code>).
         </p>
 
-        <h3><a id="tttteamvoicechattargetsspeaker-targetsfrom_chat" href="#tttteamvoicechattargetsspeaker-targetsfrom_chat">TTTTeamVoiceChatTargets(speaker, targets)</a></h3>
+        <h3><a id="tttteamvoicechattargetsspeaker-targets-state" href="#tttteamvoicechattargetsspeaker-targets-state">TTTTeamVoiceChatTargets(speaker, targets, state)</a></h3>
         <p>
             Called before a team voice state message is sent. Used to modify the targets of the team voice state message.<br>
             <em>Realm:</em> Server<br>
@@ -1899,6 +1899,7 @@ <h3><a id="tttteamvoicechattargetsspeaker-targetsfrom_chat" href="#tttteamvoicec
         <ul>
             <li><em>speaker</em> - The player trying to send their team voice state message</li>
             <li><em>targets</em> - The table of players that this message will be sent to. Add or remove players from this table to change the message recipients</li>
+            <li><em>state</em> - Whether the speaker is speaking globally (<code>true</code>) or only to their team (<code>false</code>) <em>(Added in 2.3.5)</em></li>
         </ul>
         <p>
             <em>Return:</em> Whether or not this team voice state message should be sent (Defaults to <code>true</code>).
@@ -2001,7 +2002,7 @@ <h3><a id="tttupdaterolestate" href="#tttupdaterolestate">TTTUpdateRoleState()</
             <em>Added in:</em> 1.2.7
         </p>
 
-        <h3><a id="tttvampirebodyeatenply-ent-living-healed" href="#tttvampirebodyeatenply-ent-living-healed">TTTVampireBodyEaten(ply, ent, living, healed)</a></h3>
+        <h3><a id="tttvampirebodyeatenply-ent-living-healed-maxchange" href="#tttvampirebodyeatenply-ent-living-healed-maxchange">TTTVampireBodyEaten(ply, ent, living, healed, maxchange)</a></h3>
         <p>
             Called after a Vampire eats a body.<br>
             <em>Realm:</em> Server<br>
@@ -2013,6 +2014,7 @@ <h3><a id="tttvampirebodyeatenply-ent-living-healed" href="#tttvampirebodyeatenp
             <li><em>ent</em> - The target entity. Generally either a player or a ragdoll</li>
             <li><em>living</em> - Whether the target entity was living at the time they were eaten</li>
             <li><em>healed</em> - The amount of health the player gained from eating the body</li>
+            <li><em>maxchange</em> - The amount of maximum health the player gained from eating the body <em>(Added in 2.3.5)</em> <span data-text="Beta Only" class="betaonly betaicon tooltip">&nbsp;</span></li>
         </ul>
 
         <h3><a id="tttvampireinvisibilitychangeply-invisible" href="#tttvampireinvisibilitychangeply-invisible">TTTVampireInvisibilityChange(ply, invisible)</a></h3>

docs/api/methods_table.html

@@ -29,9 +29,22 @@ <h3><a id="tableexcludedkeystbl-excludes" href="#tableexcludedkeystbl-excludes">
             <li><em>excludes</em> - Table of values to exclude</li>
         </ul>
 
+        <h3><a id="tablegetfirstitemwithpropertyvaluetbl-key-val" href="#tablegetfirstitemwithpropertyvaluetbl-key-val">table.GetFirstItemWithPropertyValue(tbl, key, val)</a></h3>
+        <p>
+            Returns the first item in the given table that has an item whose property specified by the provided <code>key</code> has a value that matches the given <code>val</code>.<br>
+            <em>Realm:</em> Client and Server<br>
+            <em>Added in:</em> 2.3.5<br>
+            <em>Parameters:</em>
+        </p>
+        <ul>
+            <li><em>tbl</em> - The table whose values are being inspected</li>
+            <li><em>key</em> - The property name whose value is being compared</li>
+            <li><em>val</em> - The value to find in the given property</li>
+        </ul>
+
         <h3><a id="tablehasitemwithpropertyvaluetbl-key-val" href="#tablehasitemwithpropertyvaluetbl-key-val">table.HasItemWithPropertyValue(tbl, key, val)</a></h3>
         <p>
-            Returns whether the given table has an item whose property specified by the provided <code>key</code> has a value that makes the given <code>val</code>.<br>
+            Returns whether the given table has an item whose property specified by the provided <code>key</code> has a value that matches the given <code>val</code>.<br>
             <em>Realm:</em> Client and Server<br>
             <em>Added in:</em> 1.8.7<br>
             <em>Parameters:</em>

docs/teams/innocent.html

@@ -426,6 +426,12 @@ <h3 style="margin: 10px 0; padding: 0;">Role Configuration:</h3>
                         </tr>
                         </thead>
                         <tbody>
+                        <tr>
+                            <td>ttt_mercenary_armor_loadout <span data-text="Beta Only" class="betaonly betaicon tooltip">&nbsp;</span></td>
+                            <td>1</td>
+                            <td>Boolean</td>
+                            <td>Whether the mercenary should get body armor as part of their loadout.</td>
+                        </tr>
                         <tr>
                             <td>ttt_mercenary_credits_starting</td>
                             <td>1</td>

docs/teams/traitor.html

@@ -984,6 +984,18 @@ <h3 style="margin: 10px 0; padding: 0;">Role Configuration:</h3>
                             <td>Integer</td>
                             <td>The amount over the Vampire's normal maximum health that the Vampire can heal to by drinking blood from living players. <i>(Set to -1 to use the same amount as <code>ttt_vampire_fang_overheal</code> instead.)</i></td>
                         </tr>
+                        <tr>
+                            <td>ttt_vampire_fang_overheal_mode</td>
+                            <td>0</td>
+                            <td>Integer (0-1)</td>                            
+                            <td>How to handle healing a vampire over their maximum health:
+                                <ol start="0">
+                                    <li>Heal over their max health.</li>
+                                    <li>Increase their max health.</li>
+                                    <li>Increase their max health and heal them to full.</li>
+                                </ol>
+                            </td>
+                        </tr>
                         <tr>
                             <td>ttt_vampire_fang_timer</td>
                             <td>5</td>