Merge branch 'master' of https://github.com/acemod/ACE3

addons/common/XEH_preInit.sqf

@@ -39,6 +39,7 @@ PREP(displayText);
 PREP(displayTextPicture);
 PREP(displayTextStructured);
 PREP(doAnimation);
+PREP(dropBackpack);
 PREP(endRadioTransmission);
 PREP(eraseCache);
 PREP(execNextFrame);

addons/common/functions/fnc_dropBackpack.sqf

@@ -0,0 +1,34 @@
+/*
+ * Author: commy2
+ *
+ * Drops a backback. Also returns the ground wepaon holder object of the dropped backpack.
+ *
+ * Argument:
+ * 0: Unit that has a backpack (Object)
+ *
+ * Return value:
+ * Ground wepaon holder with backpack (Object)
+ *
+ */
+#include "script_component.hpp"
+
+private "_unit";
+
+_unit = _this select 0;
+
+private "_backpackObject";
+_backpackObject = backpackContainer _unit;
+
+_unit addBackpack "Bag_Base";
+removeBackpack _unit;
+
+private "_holder";
+_holder = objNull;
+
+{
+    if (_backpackObject in everyBackpack _x) exitWith {
+        _holder = _x;
+    };
+} forEach (position _unit nearObjects ["WeaponHolder", 5]); 
+
+_holder

addons/explosives/ACE_Triggers.hpp

@@ -1,10 +1,10 @@
-class CfgACE_Triggers {
+class ACE_Triggers {
 /* onPlace parameters:
 0: OBJECT - unit placing
 1: OBJECT - Placed explosive
 2: STRING - Magazine classname
 3: ARRAY - vars
-Last Index: CfgACE_Triggers config of trigger type.
+Last Index: ACE_Triggers config of trigger type.
 onSetup parameters:
 0: STRING - Magazine Classname
 */

addons/explosives/config.cpp

@@ -18,7 +18,8 @@ class CfgPatches {
 #include "CfgMagazines.hpp"
 #include "CfgWeapons.hpp"
 #include "CfgVehicles.hpp"
-#include "CfgACE_Triggers.hpp"
+
+#include "ACE_Triggers.hpp"
 #include "ExplosivesUI.hpp"
 
 class CfgActions {

addons/explosives/functions/fnc_addClacker.sqf

@@ -12,7 +12,7 @@
  * None
  *
  * Example:
- * [player, _explosive, "SatchelCharge_Remote_Mag", [ConfigFile >> "CfgACE_Triggers" >> "Command"]] call ACE_Explosives_fnc_addClacker;
+ * [player, _explosive, "SatchelCharge_Remote_Mag", [ConfigFile >> "ACE_Triggers" >> "Command"]] call ACE_Explosives_fnc_addClacker;
  *
  * Public: Yes
  */

addons/explosives/functions/fnc_addDetonateActions.sqf

@@ -24,7 +24,7 @@ _result = [_unit] call FUNC(getPlacedExplosives);
 _children = [];
 {
     if (!isNull(_x select 0)) then {
-        _required = getArray (ConfigFile >> "CfgACE_Triggers" >> (_x select 4) >> "requires");
+        _required = getArray (ConfigFile >> "ACE_Triggers" >> (_x select 4) >> "requires");
         if (_detonator in _required) then {
             _item = ConfigFile >> "CfgMagazines" >> (_x select 3);
 

addons/explosives/functions/fnc_getPlacedExplosives.sqf

@@ -20,7 +20,7 @@ private ["_unit", "_clackerList", "_adjustedList", "_list", "_filter"];
 _unit = _this select 0;
 _filter = nil;
 if (count _this > 1) then {
-    _filter = ConfigFile >> "CfgACE_Triggers" >> (_this select 1);
+    _filter = ConfigFile >> "ACE_Triggers" >> (_this select 1);
 };
 _clackerList = [];
 _adjustedList = false;
@@ -31,7 +31,7 @@ _list = [];
         _clackerList set [_foreachIndex, "X"];
         _adjustedList = true;
     } else {
-        if (isNil "_filter" || {(ConfigFile >> "CfgACE_Triggers" >> (_x select 4)) == _filter}) then {
+        if (isNil "_filter" || {(ConfigFile >> "ACE_Triggers" >> (_x select 4)) == _filter}) then {
             _list pushBack _x;
         };
     };

addons/explosives/functions/fnc_placeExplosive.sqf

@@ -33,7 +33,7 @@ if (isNil "_triggerConfig") exitWith {
 };
 
 _magazineTrigger = ConfigFile >> "CfgMagazines" >> _magazineClass >> "ACE_Triggers" >> _triggerConfig;
-_triggerConfig = ConfigFile >> "CfgACE_Triggers" >> _triggerConfig;
+_triggerConfig = ConfigFile >> "ACE_Triggers" >> _triggerConfig;
 
 if (isNil "_triggerConfig") exitWith {
     diag_log format ["ACE_Explosives: Error config not found in PlaceExplosive: %1", _this];

addons/explosives/functions/fnc_selectTrigger.sqf

@@ -19,7 +19,7 @@
 private ["_config"];
 
 EXPLODE_3_PVT(_this,_explosive,_magazine,_trigger);
-_config = ConfigFile >> "CfgACE_Triggers" >> _trigger;
+_config = ConfigFile >> "ACE_Triggers" >> _trigger;
 
 // If the onSetup function returns true, it is handled elsewhere
 if (isText(_config >> "onSetup") && {[_explosive,_magazine] call compile getText (_config >> "onSetup")}) exitWith {};

addons/explosives/functions/fnc_triggerType.sqf

@@ -6,7 +6,7 @@
  * 0: Explosive magazine <STRING>
  *
  * Return Value:
- * Supported triggers as CfgACE_Triggers config entries <ARRAY>
+ * Supported triggers as ACE_Triggers config entries <ARRAY>
  *
  * Example:
  * _supports = ["SatchelCharge_Remote_Mag"] call ACE_Explosives_fnc_TriggerType
@@ -20,6 +20,6 @@ _config = getArray (ConfigFile >> "CfgMagazines" >> (_this select 0) >> "ACE_Tri
 _count = count _config;
 
 for "_index" from 0 to (_count - 1) do {
-    _result set [_index, ConfigFile >> "CfgACE_Triggers" >> (_config select _index)];
+    _result set [_index, ConfigFile >> "ACE_Triggers" >> (_config select _index)];
 };
 _result

addons/flashsuppressors/CfgVehicles.hpp

@@ -7,6 +7,8 @@ class CfgVehicles {
             MACRO_ADDITEM(ACE_muzzle_mzls_B,5);
             MACRO_ADDITEM(ACE_muzzle_mzls_smg_01,5);
             MACRO_ADDITEM(ACE_muzzle_mzls_smg_02,5);
+            MACRO_ADDITEM(ACE_muzzle_mzls_338,5);
+            MACRO_ADDITEM(ACE_muzzle_mzls_93mmg,5);
         };
     };
 
@@ -17,6 +19,8 @@ class CfgVehicles {
             MACRO_ADDITEM(ACE_muzzle_mzls_B,5);
             MACRO_ADDITEM(ACE_muzzle_mzls_smg_01,5);
             MACRO_ADDITEM(ACE_muzzle_mzls_smg_02,5);
+            MACRO_ADDITEM(ACE_muzzle_mzls_338,5);
+            MACRO_ADDITEM(ACE_muzzle_mzls_93mmg,5);
         };
     };
 
@@ -28,6 +32,8 @@ class CfgVehicles {
             MACRO_ADDITEM(ACE_muzzle_mzls_L,5);
             MACRO_ADDITEM(ACE_muzzle_mzls_smg_01,5);
             MACRO_ADDITEM(ACE_muzzle_mzls_smg_02,5);
+            MACRO_ADDITEM(ACE_muzzle_mzls_338,5);
+            MACRO_ADDITEM(ACE_muzzle_mzls_93mmg,5);
         };
     };
 
@@ -38,6 +44,8 @@ class CfgVehicles {
             MACRO_ADDITEM(ACE_muzzle_mzls_L,2);
             MACRO_ADDITEM(ACE_muzzle_mzls_smg_01,2);
             MACRO_ADDITEM(ACE_muzzle_mzls_smg_02,2);
+            MACRO_ADDITEM(ACE_muzzle_mzls_338,5);
+            MACRO_ADDITEM(ACE_muzzle_mzls_93mmg,5);
         };
     };
 };

addons/flashsuppressors/CfgWeapons.hpp

@@ -1,5 +1,231 @@
 
+class MuzzleSlot;
+
 class CfgWeapons {
+
+    /* MX */
+
+    class Rifle;
+    class Rifle_Base_F: Rifle {
+        class WeaponSlotsInfo;
+    };
+
+    class arifle_MX_Base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_H"};
+            };
+        };
+    };
+
+    class arifle_MX_SW_F: arifle_MX_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                // Shit is broken again
+                //compatibleItems[] += {"ACE_muzzle_mzls_H"};
+                compatibleItems[] = {"muzzle_snds_H","muzzle_snds_H_SW","ACE_muzzle_mzls_H"};
+            };
+        };
+    };
+
+
+    /* Katiba */
+
+    class arifle_katiba_Base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_H"};
+            };
+        };
+    };
+
+
+    /* Other */
+
+    class Rifle_Long_Base_F: Rifle_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class EBR_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_B"};
+            };
+        };
+    };
+
+    class DMR_01_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_B"};
+            };
+        };
+    };
+
+    class DMR_02_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_338"};
+            };
+        };
+    };
+
+    class DMR_03_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_B"};
+            };
+        };
+    };
+
+    class DMR_05_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_93mmg"};
+            };
+        };
+    };
+
+    class DMR_06_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_B"};
+            };
+        };
+    };
+
+    class MMG_01_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_93mmg"};
+            };
+        };
+    };
+
+    class MMG_02_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_338"};
+            };
+        };
+    };
+
+    class LMG_Mk200_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_H"};
+            };
+        };
+    };
+
+    class LMG_Zafir_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_B"};
+            };
+        };
+    };
+
+
+    /* Assault Rifles */
+
+    class Tavor_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_L"};
+            };
+        };
+    };
+
+    class mk20_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_L"};
+            };
+        };
+    };
+
+
+    /* SMGs */
+
+    class pdw2000_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
+            };
+        };
+    };
+
+    class SMG_01_Base: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
+            };
+        };
+    };
+
+    class SMG_02_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
+            };
+        };
+    };
+
+
+    /* Pistols */
+
+    class Pistol;
+    class Pistol_Base_F: Pistol {
+        class WeaponSlotsInfo;
+    };
+
+    class hgun_P07_F: Pistol_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
+                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
+            };
+        };
+    };
+
+    class hgun_Rook40_F: Pistol_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
+                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
+            };
+        };
+    };
+
+    class hgun_ACPC2_F: Pistol_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
+            };
+        };
+    };
+
+    class hgun_Pistol_heavy_01_F: Pistol_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
+            };
+        };
+    };
+
+    /*class hgun_Pistol_heavy_02_F: Pistol_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot {
+                linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
+                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
+            };
+        };
+    };*/
+
+
+    /* Flashsuppressors */
+
     class ItemCore;
     class InventoryMuzzleItem_Base_F;
 
@@ -239,4 +465,96 @@ class CfgWeapons {
 
         inertia = 0.1;
     };
+
+    class ACE_muzzle_mzls_338: ACE_muzzle_mzls_H {
+        author = "$STR_ACE_Common_ACETeam";
+        _generalMacro = "ACE_muzzle_mzls_338";
+        displayName = "$STR_ACE_muzzle_mzls_338";
+        picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_h_ca.paa";
+        model = "\A3\weapons_f\acc\acca_mzls_H_F";
+
+        class ItemInfo: ItemInfo {
+            mass = 8;
+            soundTypeIndex = 0;
+            muzzleEnd = "zaslehPoint";
+            alternativeFire = "Zasleh2";
+
+            class MagazineCoef {
+                initSpeed = 1.0;
+            };
+
+            class AmmoCoef {
+                hit = 1.0;
+                visibleFire = 0.5;
+                audibleFire = 1.0;
+                visibleFireTime = 0.5;
+                audibleFireTime = 1.0;
+                cost = 1.0;
+                typicalSpeed = 1.0;
+                airFriction = 1.0;
+            };
+
+            class MuzzleCoef {
+                dispersionCoef = "0.9f";
+                artilleryDispersionCoef = "1.0f";
+                fireLightCoef = "0.5f";
+                recoilCoef = "1.0f";
+                recoilProneCoef = "1.0f";
+                minRangeCoef = "1.0f";
+                minRangeProbabCoef = "1.0f";
+                midRangeCoef = "1.0f";
+                midRangeProbabCoef = "1.0f";
+                maxRangeCoef = "1.0f";
+                maxRangeProbabCoef = "1.0f";
+            };
+        };
+
+        inertia = 0.2;
+    };
+
+    class ACE_muzzle_mzls_93mmg: ACE_muzzle_mzls_H {
+        author = "$STR_ACE_Common_ACETeam";
+        _generalMacro = "ACE_muzzle_mzls_93mmg";
+        displayName = "$STR_ACE_muzzle_mzls_93mmg";
+        picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_h_ca.paa";
+        model = "\A3\weapons_f\acc\acca_mzls_H_F";
+
+        class ItemInfo: ItemInfo {
+            mass = 8;
+            soundTypeIndex = 0;
+            muzzleEnd = "zaslehPoint";
+            alternativeFire = "Zasleh2";
+
+            class MagazineCoef {
+                initSpeed = 1.0;
+            };
+
+            class AmmoCoef {
+                hit = 1.0;
+                visibleFire = 0.5;
+                audibleFire = 1.0;
+                visibleFireTime = 0.5;
+                audibleFireTime = 1.0;
+                cost = 1.0;
+                typicalSpeed = 1.0;
+                airFriction = 1.0;
+            };
+
+            class MuzzleCoef {
+                dispersionCoef = "0.9f";
+                artilleryDispersionCoef = "1.0f";
+                fireLightCoef = "0.5f";
+                recoilCoef = "1.0f";
+                recoilProneCoef = "1.0f";
+                minRangeCoef = "1.0f";
+                minRangeProbabCoef = "1.0f";
+                midRangeCoef = "1.0f";
+                midRangeProbabCoef = "1.0f";
+                maxRangeCoef = "1.0f";
+                maxRangeProbabCoef = "1.0f";
+            };
+        };
+
+        inertia = 0.2;
+    };
 };

addons/flashsuppressors/config.cpp

@@ -3,7 +3,15 @@
 class CfgPatches {
     class ADDON {
         units[] = {};
-        weapons[] = {"ACE_muzzle_mzls_H","ACE_muzzle_mzls_B","ACE_muzzle_mzls_L","ACE_muzzle_mzls_smg_01","ACE_muzzle_mzls_smg_02"};
+        weapons[] = {
+        	"ACE_muzzle_mzls_H",
+        	"ACE_muzzle_mzls_B",
+        	"ACE_muzzle_mzls_L",
+        	"ACE_muzzle_mzls_smg_01",
+        	"ACE_muzzle_mzls_smg_02",
+        	"ACE_muzzle_mzls_338",
+        	"ACE_muzzle_mzls_93mmg"
+        };
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_common"};
         author[] = {"commy2"};

addons/flashsuppressors/newclasses.txt

@@ -4,3 +4,5 @@ ACE_muzzle_mzls_B
 ACE_muzzle_mzls_L
 ACE_muzzle_mzls_smg_01
 ACE_muzzle_mzls_smg_02
+ACE_muzzle_mzls_338
+ACE_muzzle_mzls_93mmg

addons/flashsuppressors/stringtable.xml

@@ -62,5 +62,29 @@
       <Russian>Пламегаситель (9 мм)</Russian>
       <Spanish>Supresor (9 mm)</Spanish>
     </Key>
+    <Key ID="STR_ACE_muzzle_mzls_338">
+      <English>Flash Suppressor (.338)</English>
+      <Hungarian>Lángrejtő (.338)</Hungarian>
+      <German>Mündungsfeuerdämpfer (.338)</German>
+      <Italian>Soppressore di fiamma (.338)</Italian>
+      <Portuguese>Supressor de Clarão (.338)</Portuguese>
+      <Polish>Tłumik płomieni (.338)</Polish>
+      <Czech>Tlumič záblesku (.338)</Czech>
+      <French>Cache-flamme (.338)</French>
+      <Russian>Пламегаситель (.338)</Russian>
+      <Spanish>Supresor (.338)</Spanish>
+    </Key>
+    <Key ID="STR_ACE_muzzle_mzls_93mmg">
+      <English>Flash Suppressor (9.3 mm)</English>
+      <Hungarian>Lángrejtő (9,3 mm)</Hungarian>
+      <German>Mündungsfeuerdämpfer (9,3 mm)</German>
+      <Italian>Soppressore di fiamma (9.3mm)</Italian>
+      <Portuguese>Supressor de Clarão (9,3mm)</Portuguese>
+      <Polish>Tłumik płomieni (9,3 mm)</Polish>
+      <Czech>Tlumič záblesku (9,3 mm)</Czech>
+      <French>Cache-flamme (9,3 mm)</French>
+      <Russian>Пламегаситель (9,3 мм)</Russian>
+      <Spanish>Supresor (9,3 mm)</Spanish>
+    </Key>
   </Package>
-</Project>
+</Project>

addons/magazines/CfgWeapons.hpp

@@ -1,15 +1,9 @@
-class SlotInfo;
-class MuzzleSlot;
 
 class CfgWeapons {
 
     /* MX */
 
-    class Rifle;
-    class Rifle_Base_F: Rifle {
-        class WeaponSlotsInfo;
-    };
-
+    class Rifle_Base_F;
     class arifle_MX_Base_F: Rifle_Base_F {
         magazines[] += {
             "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim",
@@ -18,12 +12,6 @@ class CfgWeapons {
             "100Rnd_65x39_caseless_mag",
             "100Rnd_65x39_caseless_mag_Tracer"
         };
-
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_H"};
-            };
-        };
     };
 
     class arifle_MX_SW_F: arifle_MX_Base_F {
@@ -31,14 +19,6 @@ class CfgWeapons {
             "30Rnd_65x39_caseless_mag",
             "30Rnd_65x39_caseless_mag_Tracer"
         };
-
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                // Shit is broken again
-                //compatibleItems[] += {"ACE_muzzle_mzls_H"};
-                compatibleItems[] = {"muzzle_snds_H","muzzle_snds_H_SW","ACE_muzzle_mzls_H"};
-            };
-        };
     };
 
     class arifle_MXM_F: arifle_MX_Base_F {
@@ -57,51 +37,6 @@ class CfgWeapons {
             "ACE_30Rnd_65x39_caseless_green_mag_SD",
             "ACE_30Rnd_65x39_caseless_green_mag_AP"
         };
-
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_H"};
-            };
-        };
-    };
-
-
-    /* Other */
-
-    class Rifle_Long_Base_F: Rifle_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class EBR_base_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_B"};
-            };
-        };
-    };
-
-    class DMR_01_base_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_B"};
-            };
-        };
-    };
-
-    class LMG_Mk200_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_H"};
-            };
-        };
-    };
-
-    class LMG_Zafir_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_B"};
-            };
-        };
     };
 
 
@@ -113,12 +48,6 @@ class CfgWeapons {
             "ACE_30Rnd_556x45_Stanag_SD",
             "ACE_30Rnd_556x45_Stanag_AP"
         };
-
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_L"};
-            };
-        };
     };
 
     class mk20_base_F: Rifle_Base_F {
@@ -127,12 +56,6 @@ class CfgWeapons {
             "ACE_30Rnd_556x45_Stanag_SD",
             "ACE_30Rnd_556x45_Stanag_AP"
         };
-
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_L"};
-            };
-        };
     };
 
 
@@ -146,81 +69,6 @@ class CfgWeapons {
         };
     };
 
-    class pdw2000_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
-            };
-        };
-    };
-
-    class SMG_01_Base: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
-            };
-        };
-    };
-
-    class SMG_02_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
-            };
-        };
-    };
-
-
-    /* Pistols */
-
-    class Pistol;
-    class Pistol_Base_F: Pistol {
-        class WeaponSlotsInfo;
-    };
-
-    class hgun_P07_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
-            };
-        };
-    };
-
-    class hgun_Rook40_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
-            };
-        };
-    };
-
-    class hgun_ACPC2_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
-            };
-        };
-    };
-
-    class hgun_Pistol_heavy_01_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
-            };
-        };
-    };
-
-    /*class hgun_Pistol_heavy_02_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot {
-                linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
-            };
-        };
-    };*/
-
 
     /* Silencers */