HaodongMo/ARC-9
1
0
Fork 0
mirror of https://github.com/HaodongMo/ARC-9.git synced 2025-03-04 03:02:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

decoupled sway and slomo

Browse Source 
lines will need updating
maybe even split sway further into hip and aim sway (Iike tacrp)
This commit is contained in:
littlebabyman 2024-12-09 14:04:39 +02:00
parent a21673e5dd
commit ee844edfd2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lua/arc9/client/cl_settings_menu.lua
View File

@ -242,10 +242,10 @@ ARC9.SettingsTable = {
{ type = "label", text = "settings.tabname.features", desc = "settings.tabname.features.desc" },
{ sv = true, type = "bool", text = "settings.server.gameplay.mod_sway.title", desc = "settings.server.gameplay.mod_sway.desc", convar = "mod_sway" },
{ type = "bool", text = "settings.gameplay.togglebreath.title", desc = "settings.gameplay.togglebreath.desc", convar = "togglebreath", parentconvar = "mod_sway" },
{ sv = true, type = "bool", text = "settings.server.gameplay.breath_slowmo.title", desc = "settings.server.gameplay.breath_slowmo.desc", convar = "breath_slowmo", parentconvar = "mod_sway" },
{ type = "bool", text = "settings.centerhint.breath_hud.title", desc = "settings.centerhint.breath_hud.desc", convar = "breath_hud", parentconvar = "mod_sway" },
{ type = "bool", text = "settings.centerhint.breath_pp.title", desc = "settings.centerhint.breath_pp.desc", convar = "breath_pp", parentconvar = "breath_hud", parentconvar = "mod_sway" },
{ type = "bool", text = "settings.gameplay.togglebreath.title", desc = "settings.gameplay.togglebreath.desc", convar = "togglebreath" },
{ sv = true, type = "bool", text = "settings.server.gameplay.breath_slowmo.title", desc = "settings.server.gameplay.breath_slowmo.desc", convar = "breath_slowmo" },
{ type = "bool", text = "settings.centerhint.breath_hud.title", desc = "settings.centerhint.breath_hud.desc", convar = "breath_hud" },
{ type = "bool", text = "settings.centerhint.breath_pp.title", desc = "settings.centerhint.breath_pp.desc", convar = "breath_pp" },
{ sv = true, type = "bool", text = "settings.server.gameplay.mod_peek.title", desc = "settings.server.gameplay.mod_peek.desc", convar = "mod_peek" },
{ type = "bool", text = "settings.gameplay.togglepeek.title", desc = "settings.gameplay.togglepeek.desc", convar = "togglepeek", parentconvar = "mod_peek" },

3
lua/weapons/arc9_base/sh_sway.lua
View File

@ -8,6 +8,7 @@ local hudconvar = GetConVar("arc9_breath_hud")
local swayconvar = GetConVar("arc9_mod_sway")
function SWEP:ThinkHoldBreath()
if !swayconvar:GetBool() or !slomoconvar:GetBool() then return end
if !self:GetOwner():IsPlayer() then return end
local holdbreathtime = self:GetValue("HoldBreathTime")
if holdbreathtime <= 0 then return end
@ -99,6 +100,7 @@ local lastpressed = false
SWEP.IsHoldingBreath = false
function SWEP:HoldingBreath()
if !swayconvar:GetBool() or !slomoconvar:GetBool() then return end
if self:GetSightAmount() < 0.05 then self.IsHoldingBreath = false return end
local ownerkeydownspeed = self:GetOwner():KeyDown(IN_SPEED)
@ -119,6 +121,7 @@ end
local pp_amount = 0
function SWEP:HoldBreathPP()
if !swayconvar:GetBool() or !slomoconvar:GetBool() then return end
if self:GetValue("HoldBreathTime") <= 0 then return end
if !ppconvar:GetBool() then return end
local amt_d = (100 - self:GetBreath()) / 100