Skip to content

Commit

Permalink
[beta] 0.0.71
Browse files Browse the repository at this point in the history
  • Loading branch information
ravo10 committed Apr 19, 2021
1 parent 17ab92a commit 9262420
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* Advanced validity checking of area ( when ```finos_disablestrictmode == 0``` )

### Console Variables
* ```**finos_maxfin_os_ent** ( def. = 20 ) [ FCVAR_PROTECTED ]``` - Amount of Fin OS fin's possible for each Player to spawn.
* ```**finos_maxfin_os_ent** ( def. = 20 ) [ FCVAR_PROTECTED ]``` - Amount of Fin OS fin's possible for each Player to spawn ( only for multiplayer ).
* ```**finos_rhodensistyfluidvalue** ( def. = 1.29 ) [ FCVAR_PROTECTED ]``` - Mass density ( rho ) that will be applied to Fin OS fin.
* ```**finos_maxscalarvalue** ( def. = 69 ) [ FCVAR_PROTECTED ]``` - Maximum scalar value a player can apply to a Fin OS fin.
* ```**finos_disablestrictmode** ( def. = 0 ) [ FCVAR_PROTECTED ]``` - Disables checking for angle of prop and crossing vector lines, if you just want to be joking around ( other servers might not accept the duplicate tho ).
Expand Down
8 changes: 4 additions & 4 deletions fin_os/lua/weapons/fin_os/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1096,7 +1096,7 @@ function FINOS_FinOSFinMaxAmountReachedByPlayer( ent, owner )

-- Tell the Player that the max amount is reached
FINOS_AlertPlayer( "You've hit the FIN OS limit!", owner )
FINOS_SendNotification( "You've reached the FIN OS limit!", FIN_OS_NOTIFY_ERROR, owner, 2.3 )
FINOS_SendNotification( "You've hit the FIN OS limit!", FIN_OS_NOTIFY_ERROR, owner, 2.3 )
owner:SendLua( [[surface.PlaySound( "fin_os/fin_os_button10.wav" )]] )

return true
Expand Down Expand Up @@ -1169,6 +1169,9 @@ function FINOS_RemoveFinAndDataFromEntity( ent, owner, onlyBasicCleaning, ignore

ent[ "FinOS_data" ] = nil

-- Remove saved duplicator settings for entity
if not ignoreFinOSBrain then duplicator.ClearEntityModifier( ent, "FinOS" ) end

if onlyBasicCleaning then return foundOneFinWing end

ent:SetNWBool( "fin_os_active", false )
Expand All @@ -1182,9 +1185,6 @@ function FINOS_RemoveFinAndDataFromEntity( ent, owner, onlyBasicCleaning, ignore

end

-- Remove saved duplicator settings for entity
if not ignoreFinOSBrain then duplicator.ClearEntityModifier( ent, "FinOS" ) end

-- Remove fin
if ent:GetNWEntity( "fin_os_flapEntity" ):IsValid() then RemoveFlapFromFin( ent:GetNWEntity( "fin_os_flapEntity" ) ) end

Expand Down
8 changes: 8 additions & 0 deletions fin_os/lua/weapons/fin_os/reload.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ function SWEP:Reload()
-- Remove fin or flap
if Entity and Entity:IsValid() then

-- Check if it is actually a fin or flap
if not Entity[ "FinOS_data" ] and not Entity:GetNWBool( "fin_os_is_a_fin_flap" ) then

FINOS_SendNotification( "This is not a FIN OS fin or flap!", FIN_OS_NOTIFY_ERROR, OWNER, 3 )
return

end

-- Remove disabling tool gun
self:SetDisableTool( false )
timer.Remove( "fin_os__EntAreaPointCrossingLinesTIMER000" .. self:EntIndex() )
Expand Down
11 changes: 10 additions & 1 deletion fin_os/lua/weapons/fin_os/shared.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@
-- INITIIALIZATION INITIIALIZATION INITIIALIZATION INITIIALIZATION INITIIALIZATION
-- INITIIALIZATION INITIIALIZATION INITIIALIZATION INITIIALIZATION INITIIALIZATION
-- ///////////////////////////////////////////////////////////////////////////////
sound.Add( {
name = "FinOS.ToolFire",
channel = CHAN_STATIC,
volume = 1,
level = 66,
pitch = { 101, 104 },
sound = "fin_os/fin_os_toolgun_shoot.wav"
} )

SWEP.PrintName = "FIN OS Tool"
SWEP.Author = "ravo (Norway)"
SWEP.Category = "ravo Norway"
Expand Down Expand Up @@ -40,7 +49,7 @@ SWEP.AutoSwitchFrom = false

SWEP.Tool = {}

SWEP.ShootSound = Sound( "Airboat.FireGunRevDown" )
SWEP.ShootSound = Sound( "FinOS.ToolFire" )

SWEP.Primary.ClipSize = -1
SWEP.Primary.DefaultClip = -1
Expand Down
Binary file added fin_os/sound/fin_os/fin_os_toolgun_shoot.wav
Binary file not shown.

0 comments on commit 9262420

Please sign in to comment.