diff --git a/lua/weapons/bobs_gun_base.lua b/lua/weapons/bobs_gun_base.lua index f014a875..99643a80 100644 --- a/lua/weapons/bobs_gun_base.lua +++ b/lua/weapons/bobs_gun_base.lua @@ -401,6 +401,7 @@ end function SWEP:PrimaryAttack() if not self:CanPrimaryAttack() then return end + if self:CheckWater() then return end local owner = entity_GetOwner(self) @@ -444,6 +445,16 @@ function SWEP:CheckWeaponsAndAmmo() end end +function SWEP:CheckWater() + if entity_GetOwner(self):WaterLevel() == 3 and not self.FiresUnderwater then + self:SetNextPrimaryFire( CurTime() + 0.2 ) + self:EmitSound( "Weapon_Pistol.Empty" ) + return true + end + + return false +end + --[[--------------------------------------------------------- Name: SWEP:ShootBulletInformation() Desc: This func add the damage, the recoil, the number of shots and the cone on the bullet. diff --git a/lua/weapons/m9k_an94.lua b/lua/weapons/m9k_an94.lua index fc9310a0..63919ef3 100644 --- a/lua/weapons/m9k_an94.lua +++ b/lua/weapons/m9k_an94.lua @@ -91,6 +91,8 @@ end SWEP.Primary.PrevShots = SWEP.Primary.NumShots function SWEP:PrimaryAttack() + if self:CheckWater() then return end + local owner = self:GetOwner() if self:CanPrimaryAttack() and owner:IsPlayer() then diff --git a/lua/weapons/m9k_contender.lua b/lua/weapons/m9k_contender.lua index fe73c8ec..26100e5d 100644 --- a/lua/weapons/m9k_contender.lua +++ b/lua/weapons/m9k_contender.lua @@ -70,6 +70,7 @@ function SWEP:PrimaryAttack() local owner = self:GetOwner() if owner:IsNPC() then return end + if self:CheckWater() then return end if not self:CanPrimaryAttack() then return end if owner:KeyDown( IN_SPEED ) then return end diff --git a/lua/weapons/m9k_dbarrel.lua b/lua/weapons/m9k_dbarrel.lua index 70b3c6ab..bc3fec81 100644 --- a/lua/weapons/m9k_dbarrel.lua +++ b/lua/weapons/m9k_dbarrel.lua @@ -68,7 +68,8 @@ cvars.AddChangeCallback( "M9KDamageMultiplier", dmgMultCallback, "dbarrel" ) function SWEP:SecondaryAttack() if not self:CanPrimaryAttack() then return end - + if self:CheckWater() then return end + local owner = self:GetOwner() local timerName = "ShotgunReload_" .. owner:UniqueID() @@ -107,6 +108,7 @@ end function SWEP:PrimaryAttack() if not self:CanPrimaryAttack() then return end + if self:CheckWater() then return end local owner = self:GetOwner()