Merge pull request #95 from 501st-Aux-Mod-Team/flash-suppressor

Flash suppressor

addons - Copy/RD501_Units/opfor/B2/config.cpp

@@ -20,8 +20,7 @@ class CfgPatches
 		requiredVersion=0.1;
 		units[]={
 			macro_new_unit_class(opfor,B2_droid_Standard),
-			"RD501_B2_superdroid",
-			"SWOP_B2_superdroid_F_Spec"
+			macro_new_unit_class(opfor,B2_droid_Super)
 		};
 		weapons[]=
 		{

addons - Copy/RD501_Vehicles/land/dwarf_spider_droid/config.cpp

@@ -91,7 +91,7 @@ class CfgVehicles
 		armor = 150;
 		armorStructural = 1.0;
 		explosionShielding	= 0.1;
-		minTotalDamageThreshold	= 0.01;
+		minTotalDamageThreshold	= 0.02;
 		impactDamageMultiplier = 0.1;
 		class HitPoints
 		{

addons - Copy/RD501_Weapons/DC_Family/DC_15a/config.cpp

@@ -110,6 +110,8 @@ class cfgWeapons
 		class WeaponSlotsInfo
 		{
 			class CowsSlot;
+			class MuzzleSlot;
+			class PointerSlot;
 		};
 	};
 	class macro_new_weapon(DC,r15a):3AS_DC15A_F
@@ -152,6 +154,23 @@ class cfgWeapons
 				};
 
 			};
+			class MuzzleSlot: MuzzleSlot
+			{
+				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
+				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
+				compatibleItems[]=
+				{
+					"RD501_muzzle_flash"
+				};
+				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
+				iconPinpoint="Center";
+			};
+			class PointerSlot : PointerSlot
+			{
+				linkProxy = "\A3\data_f\proxies\weapon_slots\SIDE";
+				displayName = "Pointer Slot";
+				compatibleItems[] = {"acc_flashlight","acc_pointer_IR"}; 
+			};
 		};
 	};
 	//#include "DC_15a__LE_rifle.hpp"

addons - Copy/RD501_Weapons/DC_Family/DC_15c/config.cpp

@@ -20,7 +20,6 @@ class CfgPatches
 		};
 	};
 };
-
 class CfgWeapons
 {	
 	class RD501_stun_muzzle;
@@ -30,8 +29,10 @@ class CfgWeapons
 		class FullAuto;
 		class Single;
 		class WeaponSlotsInfo
-		{
-		class CowsSlot;	
+			{
+			class CowsSlot;	
+			class MuzzleSlot;
+			class PointerSlot;
 		};
 	};
 	class macro_new_weapon(DC,15c):3AS_DC15C_F
@@ -72,13 +73,29 @@ class CfgWeapons
 				iconPinpoint = "Bottom";
 				iconPosition[] = {0.5,0.35};
 				iconScale = 0.2;
-				linkProxy = "\a3\data_f\proxies\weapon_slots\top";
+				linkProxy = "\a3\data_f\proxies\weapon_slots\TOP";
 				scope = 0;
 				compatibleItems[] = 
 				{
-					macro_new_weapon(scope,dc_15a_acog)
+					macro_new_weapon(scope,dc_15a_acogtcw)
 				};
-
+			};
+			class MuzzleSlot: MuzzleSlot
+			{
+				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
+				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
+				compatibleItems[]=
+				{
+					"RD501_muzzle_flash"
+				};
+				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
+				iconPinpoint="Center";
+			};
+			class PointerSlot : PointerSlot
+			{
+				linkProxy = "\A3\data_f\proxies\weapon_slots\SIDE";
+				displayName = "Pointer Slot";
+				compatibleItems[] = {"acc_flashlight","acc_pointer_IR"}; 
 			};
 		};
 	};

addons - Copy/RD501_Weapons/DC_Family/DC_15gl/config.cpp

@@ -32,6 +32,8 @@ class CfgWeapons
 		class WeaponSlotsInfo
 		{
 		class CowsSlot;	
+		class PointerSlot;
+		class MuzzleSlot;
 		};
 	};
 	class macro_new_weapon(DC,15gl):JLTS_DC15A_ugl_plastic
@@ -86,6 +88,23 @@ class CfgWeapons
 				};
 
 			};
+			class MuzzleSlot: MuzzleSlot
+			{
+				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
+				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
+				compatibleItems[]=
+				{
+					"RD501_muzzle_flash"
+				};
+				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
+				iconPinpoint="Center";
+			};
+			class PointerSlot : PointerSlot
+			{
+				linkProxy = "\A3\data_f\proxies\weapon_slots\SIDE";
+				displayName = "Pointer Slot";
+				compatibleItems[] = {"acc_flashlight","acc_pointer_IR"}; 
+			};
 		};
 	};
 };

addons - Copy/RD501_Weapons/DC_Family/DC_15l/config.cpp

@@ -32,6 +32,8 @@ class CfgWeapons
 		class WeaponSlotsInfo
 		{
 		class CowsSlot;	
+		class MuzzleSlot;
+		class UnderBarrelSlot;
 		};
 	};
 	class macro_new_weapon(DC,15l):3AS_DC15L_F
@@ -66,7 +68,7 @@ class CfgWeapons
 				};
 
 			};
-		class UnderBarrelSlot
+		class UnderBarrelSlot:UnderBarrelSlot
 			{
 			linkProxy="\A3\Data_F_Mark\Proxies\Weapon_Slots\UNDERBARREL";
 			compatibleItems[]=
@@ -76,6 +78,17 @@ class CfgWeapons
 			iconPicture="\A3\Weapons_F_Mark\Data\UI\attachment_under.paa";
 			iconPinpoint="Bottom";
 			};
+			class MuzzleSlot: MuzzleSlot
+			{
+				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
+				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
+				compatibleItems[]=
+				{
+					"RD501_muzzle_flash"
+				};
+				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
+				iconPinpoint="Center";
+			};
 		};
 	};
 };

addons - Copy/RD501_Weapons/DC_Family/DC_15s/config.cpp

@@ -182,6 +182,12 @@ class cfgWeapons
 	{
 		class Single;
 		class FullAuto;
+		class WeaponSlotsInfo
+		{
+			class CowsSlot;
+			class MuzzleSlot;
+			class PointerSlot;
+		};
 	};
 	class macro_new_weapon(DC,r15s):3AS_DC15S_F
 	{
@@ -210,6 +216,41 @@ class cfgWeapons
 		{
 			reloadTime=0.066;
 		};
+		class WeaponSlotsInfo: WeaponSlotsInfo
+		{
+			mass = 30;
+			class CowsSlot: CowsSlot
+			{
+				displayName = "Optics Slot";
+				iconPicture = "\A3\Weapons_F\Data\UI\attachment_top.paa";
+				iconPinpoint = "Bottom";
+				iconPosition[] = {0.5,0.35};
+				iconScale = 0.2;
+				linkProxy = "\a3\data_f\proxies\weapon_slots\TOP";
+				scope = 0;
+				compatibleItems[] = 
+				{
+					
+				};
+			};
+			class MuzzleSlot: MuzzleSlot
+			{
+				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
+				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
+				compatibleItems[]=
+				{
+					"RD501_muzzle_flash"
+				};
+				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
+				iconPinpoint="Center";
+			};
+			class PointerSlot : PointerSlot
+			{
+				linkProxy = "\A3\data_f\proxies\weapon_slots\SIDE";
+				displayName = "Pointer Slot";
+				compatibleItems[] = {"acc_flashlight","acc_pointer_IR"}; 
+			};
+		};
 	};
 };
 };

addons - Copy/RD501_Weapons/Grenades/config.cpp

@@ -92,14 +92,24 @@ class CfgMagazines
 class CfgWeapons
 {
 	class Default;
-	class GrenadeLauncher: Default{};
-	class Throw: GrenadeLauncher
+	class GrenadeLauncher: Default
 	{
-		muzzles[] += {"Shadow_Muzzle"};
 		class ThrowMuzzle;
+	};
+	class Throw: GrenadeLauncher
+	{
+		muzzles[] += {"Shadow_Muzzle","Imploder_Muzzle","Thermaldet_Muzzle"};
 		class Shadow_Muzzle: ThrowMuzzle
 		{
-			magazines[] = {"RD501_BlueShadow_Grenade",macro_new_mag(imploder,1),macro_new_mag(thermaldet,1)};
+			magazines[] = {"RD501_BlueShadow_Grenade"};
+		};
+		class Imploder_Muzzle: ThrowMuzzle
+		{
+			magazines[] = {,macro_new_mag(imploder,1)};
+		};
+		class Thermaldet_Muzzle: ThrowMuzzle
+		{
+			magazines[] = {macro_new_mag(thermaldet,1)};
 		};
 	};
 };

addons - Copy/RD501_Weapons/Valken/config.cpp

@@ -31,6 +31,7 @@ class CfgWeapons
 		class WeaponSlotsInfo
 		{
 		class CowsSlot;	
+		class MuzzleSlot;
 		};
 	};
 	class macro_new_weapon_nofam(valken38x):3AS_Valken38X_F
@@ -44,7 +45,7 @@ class CfgWeapons
 		};
 		class Single : Single
 		{
-			reloadTime=0.65;
+			reloadTime=0.35;
 			dispersion=0.00045;
 		};
 		class WeaponSlotsInfo: WeaponSlotsInfo
@@ -57,7 +58,17 @@ class CfgWeapons
 				{
 					macro_new_weapon(scope,valken_6_12x)
 				};
-
+			};
+			class MuzzleSlot: MuzzleSlot
+			{
+				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
+				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
+				compatibleItems[]=
+				{
+					"RD501_muzzle_flash"
+				};
+				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
+				iconPinpoint="Center";
 			};
 		};
 	};
@@ -68,6 +79,7 @@ class CfgWeapons
 		class WeaponSlotsInfo
 		{
 		class CowsSlot;	
+		class MuzzleSlot;
 		};
 	};
 	class macro_new_weapon_nofam(valken38y):JLTS_DW32S
@@ -82,7 +94,7 @@ class CfgWeapons
 		muzzles[]={"this"};
 		class Single : Single
 		{
-			reloadTime=0.65;
+			reloadTime=0.35;
 			dispersion=0.00045;
 		};
 		class WeaponSlotsInfo: WeaponSlotsInfo
@@ -95,7 +107,17 @@ class CfgWeapons
 				{
 					macro_new_weapon(scope,valken_6_12x)
 				};
-
+			};
+			class MuzzleSlot: MuzzleSlot
+			{
+				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
+				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
+				compatibleItems[]=
+				{
+					"RD501_muzzle_flash"
+				};
+				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
+				iconPinpoint="Center";
 			};
 		};
 	};

addons - Copy/RD501_Weapons/Z6/config.cpp

@@ -108,6 +108,10 @@ class cfgWeapons
 	class JLTS_Z6:LMG_Mk200_F
 	{
 		class manual;
+		class WeaponSlotsInfo
+		{
+			class MuzzleSlot;
+		};
 	};
 	class macro_new_weapon_nofam(rZ6):JLTS_Z6
 	{
@@ -134,6 +138,21 @@ class cfgWeapons
 			burst = 25;
 			textureType = "fastAuto";
 		};
+		class WeaponSlotsInfo: WeaponSlotsInfo
+		{
+			mass = 30;
+			class MuzzleSlot: MuzzleSlot
+			{
+				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
+				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
+				compatibleItems[]=
+				{
+					"RD501_muzzle_flash"
+				};
+				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
+				iconPinpoint="Center";
+			};
+		};
 		class HitEffects
 		{
 			Hit_Foliage_green="";

addons - Copy/RD501_Weapons/_acc/config.cpp

@@ -0,0 +1,76 @@
+#define COMPONENT muzzleacc
+#include "../../RD501_main/config_macros.hpp"
+
+
+class CfgPatches
+{
+	class macro_patch_name(accxxx)
+	{
+		author="RD501";
+		addonRootClass= macro_patch_name(weapons)
+		requiredAddons[]=
+		{
+			macro_patch_name(weapons)
+		};
+		requiredVersion=0.1;
+		units[]={};
+		weapons[]={
+			"RD501_muzzle_flash"
+		};
+	};
+};
+
+class CfgWeapons
+{
+	class muzzle_snds_H;
+	class muzzle_snds_M:muzzle_snds_H
+	{
+		class ItemInfo;
+	};
+	class RD501_muzzle_flash:muzzle_snds_M
+	{
+		scope=2;
+		scopeInArsenal=2;
+		author="RD501";
+		displayName="Flash Hider Chip";
+		model="\A3\Weapons_F\Acc\acca_snds_lmg_blk_F.p3d";
+		picture="\RD501_Weapons\_acc\data\icon_flashhider.paa";
+		class ItemInfo: ItemInfo
+		{
+			mass=10;
+			class MagazineCoef
+			{
+				initSpeed=1.0;
+			};
+			class AmmoCoef
+			{
+				hit=1;
+				typicalSpeed=1;
+				airFriction=1;
+				visibleFire=1;
+				audibleFire=1;
+				visibleFireTime=1;
+				audibleFireTime=1;
+				cost = 1.0;
+			};
+			soundTypeIndex=0;
+			muzzleEnd="zaslehPoint";
+			alternativeFire="Zasleh2";
+			class MuzzleCoef
+			{
+				dispersionCoef=1.0;
+				artilleryDispersionCoef=1.0;
+				fireLightCoef=0.1;
+				recoilCoef=1.0;
+				recoilProneCoef=1.0;
+				minRangeCoef=1.0;
+				minRangeProbabCoef=1.0;
+				midRangeCoef=1.0;
+				midRangeProbabCoef=1.0;
+				maxRangeCoef=1.0;
+				maxRangeProbabCoef=1.0;
+			};
+		};
+		inertia=0.1;
+	};
+};

addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -46,7 +46,7 @@ class CfgMagazines
 	};
 	class macro_new_mag(5mw,10) : 3AS_45Rnd_EC50_Mag
 	{
-		displayName="10 Round 5MW Cell";
+		displayName="15 Round 5MW Cell";
 		count = 15;
 		ammo=macro_new_ammo(5mw)
 		typicalSpeed=400;

addons - Copy/RD501_Weapons/_scopes/DC_15A_LE_x4_x8.hpp

@@ -98,7 +98,7 @@ class macro_new_weapon(scope,valken_6_12x): itemCore
                 opticsZoomMin = scope_magnification(12);
                 opticsZoomMax = scope_magnification(1);
                 opticsZoomInit = scope_magnification(1);
-                discretefov[] = {scope_magnification(4),scope_magnification(12)};
+                discretefov[] = {scope_magnification(6),scope_magnification(12)};
                 discreteinitIndex = 0;
                 discreteDistance[] = {100, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000,4000};
                 discreteDistanceInitIndex = 1;