From 39ab0d1124580b542409eda9b4e9da214b50493d Mon Sep 17 00:00:00 2001 From: eraser1 Date: Tue, 1 Sep 2015 19:15:42 -0500 Subject: [PATCH] Fix FindSuppressor + Update stable PBO --- .../addons/a3_dms/scripts/FindSuppressor.sqf | 46 +++++++++--------- Pre-Packed PBO/a3_dms.pbo | Bin 115354 -> 117760 bytes 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/@ExileServer/addons/a3_dms/scripts/FindSuppressor.sqf b/@ExileServer/addons/a3_dms/scripts/FindSuppressor.sqf index ffcf840..9bde86f 100644 --- a/@ExileServer/addons/a3_dms/scripts/FindSuppressor.sqf +++ b/@ExileServer/addons/a3_dms/scripts/FindSuppressor.sqf @@ -8,7 +8,7 @@ */ -private["_weapon","_result","_ammoName","_rnd338","_rnd93"]; +private["_weapon","_result","_weaponName","_rnd338","_rnd93"]; _result = ""; _weapon = _this; @@ -16,33 +16,35 @@ _weapon = _this; // Zafir accepts no suppressors :( if ((_weapon find "Zafir")>-1) exitWith {""}; -_rnd338 = ["muzzle_snds_338_black","muzzle_snds_338_green","muzzle_snds_338_sand"]; -_rnd93 = ["muzzle_snds_93mmg","muzzle_snds_93mmg_tan"]; -_ammoName = getText (configFile >> "cfgWeapons" >> _weapon >> "displayName"); +_weaponName = getText (configFile >> "cfgWeapons" >> _weapon >> "displayName"); +call +{ + if ((_weaponName find "6.5") > -1) exitWith + { + if (_weapon find "LMG_Mk200" > -1) then + { + _result = "muzzle_snds_H_MG"; + } + else + { + _result = "muzzle_snds_H"; + }; + }; -switch (_ammoName) do { + if ((_weaponName find "5.56") > -1) exitWith {_result = "muzzle_snds_M";}; - case ((_ammoName find "6.5") > -1): { - if (_ammoName find "LMG_Mk200" > -1) then { - _result = "muzzle_snds_H_MG"; - } else { - _result = "muzzle_snds_H"; - }; - }; + if ((_weaponName find "7.62") > -1) exitWith {_result = "muzzle_snds_H";}; - case ((_ammoName find "5.56") > -1): {_result = "muzzle_snds_M";}; + if ((_weaponName find ".45") > -1) exitWith {_result = "muzzle_snds_acp";}; - case ((_ammoName find "7.62") > -1): {_result = "muzzle_snds_H";}; + if ((_weaponName find "9 mm") > -1) exitWith {_result = "muzzle_snds_L";}; - case ((_ammoName find ".45") > -1): {_result = "muzzle_snds_acp";}; - - case ((_ammoName find "9 mm") > -1): {_result = "muzzle_snds_L";}; - - case ((_ammoName find ".338") > -1): {_result = _rnd338 call BIS_fnc_selectRandom;}; - - case ((_ammoName find "9.3 mm") > -1): {_result = _rnd93 call BIS_fnc_selectRandom;}; + if ((_weaponName find ".338") > -1) exitWith {_result = ["muzzle_snds_338_black","muzzle_snds_338_green","muzzle_snds_338_sand"] call BIS_fnc_selectRandom;}; + if ((_weaponName find "9.3 mm") > -1) exitWith {_result = ["muzzle_snds_93mmg","muzzle_snds_93mmg_tan"] call BIS_fnc_selectRandom;}; }; -_result + + +_result \ No newline at end of file diff --git a/Pre-Packed PBO/a3_dms.pbo b/Pre-Packed PBO/a3_dms.pbo index b083a12809425a6639819f9e5d39d0623c9a5286..79d8ea380e374a1f2545bcc1ad019af4321d3e81 100644 GIT binary patch delta 3799 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