better integration

TonybynMp4 · May 23, 2024 · 9a2e7f7 · 9a2e7f7
1 parent 517c6f4
commit 9a2e7f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/client/main.lua b/client/main.lua
@@ -7,6 +7,8 @@ local soundLoop = false
 
 --Apprarently used by R* when drunk, makes car radio inaudible & adds reverb to everything
 local function soundModeLoop()
+    if not config.useDrunkSoundMode then return end
+
     soundLoop = true
     CreateThread(function()
         while soundLoop and alcoholLevel > 0 do
@@ -51,6 +53,11 @@ local function drunkLoop()
 
             if severity then
                 drunkEffect(severity)
+                if not soundLoop and severity.toggleDrunkSounds then
+                    soundModeLoop()
+                elseif soundLoop and not severity.toggleDrunkSounds then
+                    soundLoop = false
+                end
             end
 
             Wait(60000 * sharedConfig.alcoholDecayTime)
@@ -121,9 +128,7 @@ AddStateBagChangeHandler('alcohol', ('player:%s'):format(cache.serverId), functi
     end
     alcoholLevel = value
 
-    if not soundLoop then
-        soundModeLoop()
-    elseif alcoholLevel <= 0 then
+    if alcoholLevel <= 0 then
         soundLoop = false
     end
 end)

diff --git a/config/client.lua b/config/client.lua
@@ -16,16 +16,19 @@ return {
             [2.0] = {
                 timecycle = 'Drunk',
                 shake = 0.75,
+                toggleDrunkSounds = true,
                 walk = 'move_m@drunk@moderatedrunk'
             },
             [3.0] = {
                 timecycle = 'spectator5',
                 shake = 1.25,
+                toggleDrunkSounds = true,
                 walk = 'move_m@drunk@a'
             },
             [4.0] = {
                 timecycle = 'spectator5',
                 shake = 2.0,
+                toggleDrunkSounds = true,
                 walk = 'MOVE_M@DRUNK@VERYDRUNK'
             },
         },