From 6ad15e02c77f0ec1badac7de39c1a889867f158c Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 30 Sep 2016 15:10:20 -0500 Subject: [PATCH] Fix spotting rifle loudness (#4488) --- addons/hearing/functions/fnc_firedNear.sqf | 2 ++ optionals/compat_rhs_usf3/CfgAmmo.hpp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/addons/hearing/functions/fnc_firedNear.sqf b/addons/hearing/functions/fnc_firedNear.sqf index 46bbee4fae..488e9f56e4 100644 --- a/addons/hearing/functions/fnc_firedNear.sqf +++ b/addons/hearing/functions/fnc_firedNear.sqf @@ -74,6 +74,8 @@ if (isNil "_loudness") then { private _initSpeed = getNumber(configFile >> "CfgMagazines" >> _magazine >> "initSpeed"); private _caliber = getNumber (configFile >> "CfgAmmo" >> _ammo >> "ACE_caliber"); _caliber = call { + // If explicilty defined, use ACE_caliber + if ((count configProperties [(configFile >> "CfgAmmo" >> _ammo), "configName _x == 'ACE_caliber'", false]) == 1) exitWith {_caliber}; if (_ammo isKindOf ["ShellBase", (configFile >> "CfgAmmo")]) exitWith { 80 }; if (_ammo isKindOf ["RocketBase", (configFile >> "CfgAmmo")]) exitWith { 200 }; if (_ammo isKindOf ["MissileBase", (configFile >> "CfgAmmo")]) exitWith { 600 }; diff --git a/optionals/compat_rhs_usf3/CfgAmmo.hpp b/optionals/compat_rhs_usf3/CfgAmmo.hpp index 60c543a6f3..030d01d0f8 100644 --- a/optionals/compat_rhs_usf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp @@ -271,4 +271,7 @@ class CfgAmmo { ace_frag_skip = 0; ace_frag_force = 1; }; + class rhs_ammo_smaw_SR: RocketBase { + ACE_caliber = 9; + }; };