diff --git a/FCData/scripts/Default/Entities/Weapons/AG36.lua b/FCData/scripts/Default/Entities/Weapons/AG36.lua index 624db47..bf64a3c 100644 --- a/FCData/scripts/Default/Entities/Weapons/AG36.lua +++ b/FCData/scripts/Default/Entities/Weapons/AG36.lua @@ -69,6 +69,9 @@ AG36SP = { BHapticsFireRight = "m4_fire_r", BHapticsFireLeft = "m4_fire_l", BHapticsIntensity = 0.1, + ProtubeKickPower = 0.7, + ProtubeRumblePower = 0, + ProtubeRumbleSeconds = 0, ScopeTexId = GetScopeTex(), @@ -196,6 +199,9 @@ AG36SP = { BHapticsFireRight = "rl_fire_r", BHapticsFireLeft = "rl_fire_l", BHapticsIntensity = 0.3, + ProtubeKickPower = 1.0, + ProtubeRumblePower = 0.8, + ProtubeRumbleSeconds = 1.0, SoundMinMaxVol = { 255, 4, 2600 }, @@ -287,6 +293,9 @@ AG36MP = { BHapticsFireRight = "m4_fire_r", BHapticsFireLeft = "m4_fire_l", BHapticsIntensity = 0.1, + ProtubeKickPower = 0.7, + ProtubeRumblePower = 0, + ProtubeRumbleSeconds = 0, ScopeTexId = GetScopeTex(), @@ -419,6 +428,9 @@ AG36MP = { BHapticsFireRight = "rl_fire_r", BHapticsFireLeft = "rl_fire_l", BHapticsIntensity = 0.3, + ProtubeKickPower = 1.0, + ProtubeRumblePower = 0.8, + ProtubeRumbleSeconds = 1.0, SoundMinMaxVol = { 255, 4, 2600 }, diff --git a/FCData/scripts/Default/Entities/Weapons/BasicWeapon.lua b/FCData/scripts/Default/Entities/Weapons/BasicWeapon.lua index 3d262c2..52909b2 100644 --- a/FCData/scripts/Default/Entities/Weapons/BasicWeapon.lua +++ b/FCData/scripts/Default/Entities/Weapons/BasicWeapon.lua @@ -643,6 +643,9 @@ function BasicWeapon.Client:OnFire( Params ) my_player.cnt:TriggerBHapticsEffect("recoilarm_r", "recoilarm_l", 1 + CurFireParams.BHapticsIntensity); my_player.cnt:TriggerBHapticsEffect("recoilvisor", "recoilvisor", 1 + CurFireParams.BHapticsIntensity); end + if (CurFireParams.ProtubeKickPower ~= nil) then + my_player.cnt:TriggerProtubeEffect(CurFireParams.ProtubeKickPower, CurFireParams.ProtubeRumblePower, CurFireParams.ProtubeRumbleSeconds); + end end self.bFiredShot = 1; diff --git a/FCData/scripts/Default/Entities/Weapons/Falcon.lua b/FCData/scripts/Default/Entities/Weapons/Falcon.lua index 461e509..30058fb 100644 --- a/FCData/scripts/Default/Entities/Weapons/Falcon.lua +++ b/FCData/scripts/Default/Entities/Weapons/Falcon.lua @@ -75,7 +75,10 @@ Falcon = { BHapticsFireRight = "pistol_fire_r", BHapticsFireLeft = "pistol_fire_l", BHapticsIntensity = 0.1, - + ProtubeKickPower = 0.6, + ProtubeRumblePower = 0.0, + ProtubeRumbleSeconds = 0.0, + ShellCases = { geometry=System:LoadObject("Objects/Weapons/shells/smgshell.cgf"), focus = 1.5, diff --git a/FCData/scripts/Default/Entities/Weapons/M249.lua b/FCData/scripts/Default/Entities/Weapons/M249.lua index 928651b..01faaf3 100644 --- a/FCData/scripts/Default/Entities/Weapons/M249.lua +++ b/FCData/scripts/Default/Entities/Weapons/M249.lua @@ -52,6 +52,9 @@ M249 = { DrySound = "Sounds/Weapons/DE/dryfire.wav", HapticFireEffect = "m4_fire", + ProtubeKickPower = 0.5, + ProtubeRumblePower = 0.0, + ProtubeRumbleSeconds = 0.0, LightFlash = { fRadius = 3.0, diff --git a/FCData/scripts/Default/Entities/Weapons/M4.lua b/FCData/scripts/Default/Entities/Weapons/M4.lua index 349babe..b7083e9 100644 --- a/FCData/scripts/Default/Entities/Weapons/M4.lua +++ b/FCData/scripts/Default/Entities/Weapons/M4.lua @@ -72,6 +72,9 @@ M4 = { BHapticsFireRight = "m4_fire_r", BHapticsFireLeft = "m4_fire_l", BHapticsIntensity = 0.07, + ProtubeKickPower = 0.5, + ProtubeRumblePower = 0.0, + ProtubeRumbleSeconds = 0.0, LightFlash = { fRadius = 3.0, @@ -219,6 +222,9 @@ M4 = { BHapticsFireRight = "pistol_fire_r", BHapticsFireLeft = "pistol_fire_l", BHapticsIntensity = 0.1, + ProtubeKickPower = 0.7, + ProtubeRumblePower = 0.0, + ProtubeRumbleSeconds = 0.0, ShellCases = { geometry=System:LoadObject("Objects/Weapons/shells/rifleshell.cgf"), diff --git a/FCData/scripts/Default/Entities/Weapons/MG.lua b/FCData/scripts/Default/Entities/Weapons/MG.lua index e47024a..05328ca 100644 --- a/FCData/scripts/Default/Entities/Weapons/MG.lua +++ b/FCData/scripts/Default/Entities/Weapons/MG.lua @@ -54,6 +54,9 @@ MG = { BHapticsFireRight = "m4_fire_r", BHapticsFireLeft = "m4_fire_l", BHapticsIntensity = 0.1, + ProtubeKickPower = 0.5, + ProtubeRumblePower = 0.0, + ProtubeRumbleSeconds = 0.0, LightFlash = { fRadius = 5.0, diff --git a/FCData/scripts/Default/Entities/Weapons/MP5.lua b/FCData/scripts/Default/Entities/Weapons/MP5.lua index 0c2d1b8..34931b5 100644 --- a/FCData/scripts/Default/Entities/Weapons/MP5.lua +++ b/FCData/scripts/Default/Entities/Weapons/MP5.lua @@ -75,6 +75,9 @@ MP5 = { BHapticsFireRight = "m4_fire_r", BHapticsFireLeft = "m4_fire_l", BHapticsIntensity = 0.07, + ProtubeKickPower = 0.4, + ProtubeRumblePower = 0.0, + ProtubeRumbleSeconds = 0.0, SmokeEffect = { size = {0.15,0.07,0.035,0.01}, @@ -178,6 +181,9 @@ MP5 = { BHapticsFireRight = "m4_fire_r", BHapticsFireLeft = "m4_fire_l", BHapticsIntensity = 0.1, + ProtubeKickPower = 0.6, + ProtubeRumblePower = 0.0, + ProtubeRumbleSeconds = 0.0, LightFlash = { fRadius = 3.0, diff --git a/FCData/scripts/Default/Entities/Weapons/Mortar.lua b/FCData/scripts/Default/Entities/Weapons/Mortar.lua index 2fa243b..c1859b3 100644 --- a/FCData/scripts/Default/Entities/Weapons/Mortar.lua +++ b/FCData/scripts/Default/Entities/Weapons/Mortar.lua @@ -35,6 +35,9 @@ Mortar = { }, DrySound = "Sounds/Weapons/Mortar/DryFire.wav", HapticFireEffect = "mortar_fire", + ProtubeKickPower = 1.0, + ProtubeRumblePower = 0.8, + ProtubeRumbleSeconds = 1.0, LightFlash = { fRadius = 5.0, diff --git a/FCData/scripts/Default/Entities/Weapons/OICW.lua b/FCData/scripts/Default/Entities/Weapons/OICW.lua index 4d782b7..c73ab30 100644 --- a/FCData/scripts/Default/Entities/Weapons/OICW.lua +++ b/FCData/scripts/Default/Entities/Weapons/OICW.lua @@ -73,6 +73,9 @@ OICWSP = { BHapticsFireRight = "m4_fire_r", BHapticsFireLeft = "m4_fire_l", BHapticsIntensity = 0.1, + ProtubeKickPower = 0.3, + ProtubeRumblePower = 0.0, + ProtubeRumbleSeconds = 0.0, ScopeTexId = GetScopeTex(), @@ -197,6 +200,9 @@ OICWSP = { BHapticsFireRight = "rl_fire_r", BHapticsFireLeft = "rl_fire_l", BHapticsIntensity = 0.3, + ProtubeKickPower = 1.0, + ProtubeRumblePower = 0.8, + ProtubeRumbleSeconds = 1.0, LightFlash = { fRadius = 3.0, @@ -286,6 +292,9 @@ OICWMP = { BHapticsFireRight = "m4_fire_r", BHapticsFireLeft = "m4_fire_l", BHapticsIntensity = 0.1, + ProtubeKickPower = 0.3, + ProtubeRumblePower = 0.0, + ProtubeRumbleSeconds = 0.0, ScopeTexId = GetScopeTex(), @@ -415,6 +424,9 @@ OICWMP = { BHapticsFireRight = "rl_fire_r", BHapticsFireLeft = "rl_fire_l", BHapticsIntensity = 0.3, + ProtubeKickPower = 1.0, + ProtubeRumblePower = 0.8, + ProtubeRumbleSeconds = 1.0, LightFlash = { diff --git a/FCData/scripts/Default/Entities/Weapons/P90.lua b/FCData/scripts/Default/Entities/Weapons/P90.lua index e24d6ee..87e0c6f 100644 --- a/FCData/scripts/Default/Entities/Weapons/P90.lua +++ b/FCData/scripts/Default/Entities/Weapons/P90.lua @@ -64,6 +64,9 @@ P90 = { BHapticsFireRight = "m4_fire_r", BHapticsFireLeft = "m4_fire_l", BHapticsIntensity = 0.07, + ProtubeKickPower = 0.6, + ProtubeRumblePower = 0.0, + ProtubeRumbleSeconds = 0.0, LightFlash = { fRadius = 3.0, diff --git a/FCData/scripts/Default/Entities/Weapons/RL.LUA b/FCData/scripts/Default/Entities/Weapons/RL.LUA index 7b2b7a7..1d2838d 100644 --- a/FCData/scripts/Default/Entities/Weapons/RL.LUA +++ b/FCData/scripts/Default/Entities/Weapons/RL.LUA @@ -53,6 +53,9 @@ RLSP = { BHapticsFireRight = "rl_fire_r", BHapticsFireLeft = "rl_fire_l", BHapticsIntensity = 0.4, + ProtubeKickPower = 1.0, + ProtubeRumblePower = 1.0, + ProtubeRumbleSeconds = 1.0, -- Light from flying rocket is enough so this light is not needed -- LightFlash = { @@ -135,6 +138,9 @@ RLMP = { BHapticsFireRight = "rl_fire_r", BHapticsFireLeft = "rl_fire_l", BHapticsIntensity = 0.4, + ProtubeKickPower = 1.0, + ProtubeRumblePower = 1.0, + ProtubeRumbleSeconds = 1.0, -- Light from flying rocket is enough so this light is not needed -- LightFlash = { diff --git a/FCData/scripts/Default/Entities/Weapons/Shotgun.lua b/FCData/scripts/Default/Entities/Weapons/Shotgun.lua index e8a0cf1..f5911c8 100644 --- a/FCData/scripts/Default/Entities/Weapons/Shotgun.lua +++ b/FCData/scripts/Default/Entities/Weapons/Shotgun.lua @@ -70,6 +70,9 @@ Shotgun = { BHapticsFireRight = "shotgun_fire_r", BHapticsFireLeft = "shotgun_fire_l", BHapticsIntensity = 0.7, + ProtubeKickPower = 0.8, + ProtubeRumblePower = 0.8, + ProtubeRumbleSeconds = 0.5, LightFlash = { fRadius = 5.0, diff --git a/FCData/scripts/Default/Entities/Weapons/SniperRifle.lua b/FCData/scripts/Default/Entities/Weapons/SniperRifle.lua index cc104cc..bcf1413 100644 --- a/FCData/scripts/Default/Entities/Weapons/SniperRifle.lua +++ b/FCData/scripts/Default/Entities/Weapons/SniperRifle.lua @@ -74,6 +74,9 @@ SniperRifle = { BHapticsFireRight = "rl_fire_r", BHapticsFireLeft = "rl_fire_l", BHapticsIntensity = 0.15, + ProtubeKickPower = 1.0, + ProtubeRumblePower = 1.0, + ProtubeRumbleSeconds = 0.5, LightFlash = { fRadius = 3.0, @@ -187,6 +190,9 @@ SniperRifle = { }, DrySound = "Sounds/Weapons/AW50/DryFire.wav", HapticFireEffect = "sniper_fire", + ProtubeKickPower = 1.0, + ProtubeRumblePower = 1.0, + ProtubeRumbleSeconds = 0.5, LightFlash = { fRadius = 3.0,