Weapon scope changes

addons - Copy/RD501_Vehicles/land/resupply_box/ammo_small_mag.hpp

@@ -75,12 +75,12 @@ class _transport_launcher_AA_mags
 };
 class _transport_launcher_PLXAT_mags
 {
-	magazine =  "JLTS_PLX1_AT_Missile"
+	magazine =  "JLTS_PLX1_AT_mag"
 	count = 10;
 };
 class _transport_launcher_PLXAP_mags
 {
-	magazine =  "JLTS_PLX1_AP_Missile"
+	magazine =  "JLTS_PLX1_AP_mag"
 	count = 10;
 };
 class _transport_he3

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

@@ -29,90 +29,13 @@ class CfgPatches
 
 class cfgWeapons 
 {
-	/*class Rifle_Long_Base_F;
-	class SWOP_BlasterRifle_Base:Rifle_Long_Base_F
-	{
-		class WeaponSlotsInfo;
-	};
-
-	class SWOP_DC15ABlasterRifle:SWOP_BlasterRifle_Base
-	{
-		
-		class FlashLight;
-		class Single;
-		class Burst;
-		class FullAuto;
-		class Secondary;
-
-		class WeaponSlotsInfo: WeaponSlotsInfo
-		{
-			class CowsSlot;
-		};
-	};
-
-	class SWOP_DC15ABlasterRifle_mod0:SWOP_DC15ABlasterRifle
-	{
-		
-		class FullAuto:FullAuto
-		{
-
-		};
-
-		class WeaponSlotsInfo: WeaponSlotsInfo
-		{
-			class CowsSlot;
-		};
-	};
-	
-	class SWOP_DC15AGL:SWOP_DC15ABlasterRifle
-	{
-	
-		class Single:Single
-		{
-
-		};
-		class Burst:Burst
-		{
-
-		};
-		class FullAuto:FullAuto
-		{
-
-		};
-
-		class EGLM;
-
-		class WeaponSlotsInfo: WeaponSlotsInfo
-		{
-			class CowsSlot;
-		};
-
-	};
-
-	class SWOP_DC15ABlasterRifle_mod1: SWOP_DC15ABlasterRifle
-	{
-		class Single:Single
-		{
-
-		};
-
-		class WeaponSlotsInfo: WeaponSlotsInfo
-		{
-			class CowsSlot;
-		};
-	}*/
 	class 3AS_DC15A_Base_F;
 	class RD501_stun_muzzle;
 	class 3AS_DC15A_F:3AS_DC15A_Base_F
 	{
 		class Single;
 		class Burst;
-		class WeaponSlotsInfo
-		{
-			class CowsSlot;
-			class MuzzleSlot;
-			class PointerSlot;
-		};
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon(DC,15a):3AS_DC15A_F
 	{
@@ -147,16 +70,34 @@ class cfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass = 30;
-			class CowsSlot: CowsSlot
+			class CowsSlot
 			{
-				access = 1;
+				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[] = 
 				{
-					macro_new_weapon(scope,dc_r15a_acog)
+					"RD501_RCO",
+					"RD501_RCO_2",
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
 				};
 
 			};
-			class MuzzleSlot: MuzzleSlot
+			class MuzzleSlot
 			{
 				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
 				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
@@ -167,7 +108,7 @@ class cfgWeapons
 				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
 				iconPinpoint="Center";
 			};
-			class PointerSlot : PointerSlot
+			class PointerSlot
 			{
 				linkProxy = "\A3\data_f\proxies\weapon_slots\SIDE";
 				displayName = "Pointer Slot";

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

@@ -28,12 +28,7 @@ class CfgWeapons
 	{
 		class FullAuto;
 		class Single;
-		class WeaponSlotsInfo
-			{
-			class CowsSlot;	
-			class MuzzleSlot;
-			class PointerSlot;
-		};
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon(DC,15c):3AS_DC15C_F
 	{
@@ -67,7 +62,7 @@ class CfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass = 30;
-			class CowsSlot: CowsSlot
+			class CowsSlot
 			{
 				displayName = "Optics Slot";
 				iconPicture = "\A3\Weapons_F\Data\UI\attachment_top.paa";
@@ -80,10 +75,20 @@ class CfgWeapons
 				{
 					"RD501_RCO",
 					"RD501_RCO_2",
-					"RD501_RCO_3"
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
 				};
 			};
-			class MuzzleSlot: MuzzleSlot
+			class MuzzleSlot
 			{
 				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
 				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
@@ -94,7 +99,7 @@ class CfgWeapons
 				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
 				iconPinpoint="Center";
 			};
-			class PointerSlot : PointerSlot
+			class PointerSlot
 			{
 				linkProxy = "\A3\data_f\proxies\weapon_slots\SIDE";
 				displayName = "Pointer Slot";

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

@@ -94,16 +94,19 @@ class CfgWeapons
 				scope = 0;
 				compatibleItems[] = 
 				{
-					//macro_new_weapon(scope,dc_15a_acog),
-					//"RD501_RCO",
-					//"RD501_RCO_2",
-					//"RD501_RCO_3",
+					"RD501_RCO",
+					"RD501_RCO_2",
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
 					"RD501_MRCO",
 					"RD501_MRCO_2",
 					"RD501_MRCO_3"
-					//"RD501_Holosight",
-					//"RD501_Holosight_2",
-					//"RD501_Holosight_3"
 				};
 
 			};
@@ -164,20 +167,58 @@ class CfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass=80;
+			class 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[] = 
+				{
+					"RD501_RCO",
+					"RD501_RCO_2",
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
+				};
+			};
+			class 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
+			{
+				linkProxy = "\A3\data_f\proxies\weapon_slots\SIDE";
+				displayName = "Pointer Slot";
+				compatibleItems[] = {"acc_flashlight","acc_pointer_IR"}; 
+			};
 		};
 	};
-	class 3AS_DC15C_Base_GL;
-	class 3AS_DC15C_GL: 3AS_DC15C_Base_GL
+	class 3AS_DC15C_Base_F;
+	class 3AS_DC15C_GL: 3AS_DC15C_Base_F
 	{
 		class 3AS_15CGL;
 		class FullAuto;
 		class Single;
-		class WeaponSlotsInfo
-			{
-			class CowsSlot;	
-			class MuzzleSlot;
-			class PointerSlot;
-		};
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon(DC,15cgl):3AS_DC15C_GL
 	{
@@ -185,6 +226,7 @@ class CfgWeapons
 		dispersion=0.00116;
 		ACE_Overheating_mrbs = 300000;
 		recoil="recoil_mxc";
+		scope = 2;
 		magazines[]=
 		{
 			macro_new_mag(10mw,30)
@@ -224,7 +266,7 @@ class CfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass = 30;
-			class CowsSlot: CowsSlot
+			class CowsSlot
 			{
 				displayName = "Optics Slot";
 				iconPicture = "\A3\Weapons_F\Data\UI\attachment_top.paa";
@@ -235,12 +277,22 @@ class CfgWeapons
 				scope = 0;
 				compatibleItems[] = 
 				{
-					/*"RD501_RCO",
+					"RD501_RCO",
 					"RD501_RCO_2",
-					"RD501_RCO_3"*/
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
 				};
 			};
-			class MuzzleSlot: MuzzleSlot
+			class MuzzleSlot
 			{
 				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
 				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
@@ -251,7 +303,7 @@ class CfgWeapons
 				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
 				iconPinpoint="Center";
 			};
-			class PointerSlot : PointerSlot
+			class PointerSlot 
 			{
 				linkProxy = "\A3\data_f\proxies\weapon_slots\SIDE";
 				displayName = "Pointer Slot";

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

@@ -29,12 +29,7 @@ class CfgWeapons
 	{
 		class FullAuto;
 		class Single;
-		class WeaponSlotsInfo
-		{
-		class CowsSlot;	
-		class MuzzleSlot;
-		class UnderBarrelSlot;
-		};
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon(DC,15l):3AS_DC15L_F
 	{
@@ -59,16 +54,34 @@ class CfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass = 30;
-			class CowsSlot: CowsSlot
+			class CowsSlot
 			{
-				access = 1;
+				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[] = 
 				{
-					macro_new_weapon(scope,dc_15a_acogtcw)
+					"RD501_RCO",
+					"RD501_RCO_2",
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
 				};
 
 			};
-		class UnderBarrelSlot:UnderBarrelSlot
+		class UnderBarrelSlot
 			{
 			linkProxy="\A3\Data_F_Mark\Proxies\Weapon_Slots\UNDERBARREL";
 			compatibleItems[]=
@@ -78,7 +91,7 @@ class CfgWeapons
 			iconPicture="\A3\Weapons_F_Mark\Data\UI\attachment_under.paa";
 			iconPinpoint="Bottom";
 			};
-			class MuzzleSlot: MuzzleSlot
+			class MuzzleSlot
 			{
 				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
 				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";

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

@@ -182,12 +182,7 @@ class cfgWeapons
 	{
 		class Single;
 		class FullAuto;
-		class WeaponSlotsInfo
-		{
-			class CowsSlot;
-			class MuzzleSlot;
-			class PointerSlot;
-		};
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon(DC,r15s):3AS_DC15S_F
 	{
@@ -220,7 +215,7 @@ class cfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass = 30;
-			class CowsSlot: CowsSlot
+			class CowsSlot
 			{
 				displayName = "Optics Slot";
 				iconPicture = "\A3\Weapons_F\Data\UI\attachment_top.paa";
@@ -231,12 +226,22 @@ class cfgWeapons
 				scope = 0;
 				compatibleItems[] = 
 				{
+					"RD501_RCO",
+					"RD501_RCO_2",
+					"RD501_RCO_3",
 					"RD501_Holosight",
 					"RD501_Holosight_2",
-					"RD501_Holosight_3"
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
 				};
 			};
-			class MuzzleSlot: MuzzleSlot
+			class MuzzleSlot
 			{
 				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
 				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
@@ -247,7 +252,7 @@ class cfgWeapons
 				iconPicture="\A3\Weapons_F\Data\UI\attachment_muzzle.paa";
 				iconPinpoint="Center";
 			};
-			class PointerSlot : PointerSlot
+			class PointerSlot
 			{
 				linkProxy = "\A3\data_f\proxies\weapon_slots\SIDE";
 				displayName = "Pointer Slot";

addons - Copy/RD501_Weapons/Valken/config.cpp

@@ -28,11 +28,7 @@ class CfgWeapons
 	class 3AS_Valken38X_F:3AS_Valken38X_Base_F
 	{
 		class Single;
-		class WeaponSlotsInfo
-		{
-		class CowsSlot;	
-		class MuzzleSlot;
-		};
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon_nofam(valken38x):3AS_Valken38X_F
 	{
@@ -52,15 +48,34 @@ class CfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass = 80;
-			class CowsSlot: CowsSlot
+			class CowsSlot
 			{
-				access = 1;
+				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;
+				access=1;
 				compatibleItems[] = 
 				{
-					macro_new_weapon(scope,valken_6_12x)
+					"RD501_RCO",
+					"RD501_RCO_2",
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
+					"RD501_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3",
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
 				};
 			};
-			class MuzzleSlot: MuzzleSlot
+			class MuzzleSlot
 			{
 				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
 				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";
@@ -77,11 +92,7 @@ class CfgWeapons
 	class JLTS_DW32S:arifle_MX_Base_F
 	{
 		class Single;
-		class WeaponSlotsInfo
-		{
-		class CowsSlot;	
-		class MuzzleSlot;
-		};
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon_nofam(valken38y):JLTS_DW32S
 	{
@@ -102,7 +113,7 @@ class CfgWeapons
 		class WeaponSlotsInfo: WeaponSlotsInfo
 		{
 			mass = 80;
-			class CowsSlot: CowsSlot
+			class CowsSlot
 			{
 				displayName = "Optics Slot";
 				iconPicture = "\A3\Weapons_F\Data\UI\attachment_top.paa";
@@ -114,13 +125,22 @@ class CfgWeapons
 				access=1;
 				compatibleItems[] = 
 				{
+					"RD501_RCO",
+					"RD501_RCO_2",
+					"RD501_RCO_3",
+					"RD501_Holosight",
+					"RD501_Holosight_2",
+					"RD501_Holosight_3",
 					"RD501_DMS",
 					"RD501_DMS_2",
 					"RD501_DMS_3",
-					"RD501_DMS_4"
+					"RD501_DMS_4",
+					"RD501_MRCO",
+					"RD501_MRCO_2",
+					"RD501_MRCO_3"
 				};
 			};
-			class MuzzleSlot: MuzzleSlot
+			class MuzzleSlot
 			{
 				linkProxy="\A3\data_f\proxies\weapon_slots\MUZZLE";
 				displayName="$str_a3_cfgweapons_abr_base_f_weaponslotsinfo_muzzleslot0";

addons - Copy/RD501_Weapons/_ammo/40mm_flare.hpp

@@ -1,69 +0,0 @@
-    class macro_new_ammo(40mm_white): FlareBase
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-	
-		lightColor[] = {1, 1, 1 ,1};
-		useFlare = 1;
-		deflecting = 30;
-		smokeColor[] = {1, 1, 1, 1};
-
-		brightness = 1200;
-		size = 3;//1
-		triggerTime = 3;
-		triggerSpeedCoef = 1;
-		audibleFire = 20;
-		
-		intensity  = 1000000;
-		flareSize = 3;//1
-		timeToLive = 120;
-        flareMaxDistance = 300;
-		
-	};
-
-
-	class macro_new_ammo(40mm_green): macro_new_ammo(40mm_white)
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-		
-		lightColor[] = {0, 1, 0, 0};
-	};
-	class macro_new_ammo(40mm_red): macro_new_ammo(40mm_white)
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-		
-		lightColor[] = {1, 0, 0, 0};
-	};
-	class macro_new_ammo(40mm_yellow): macro_new_ammo(40mm_white)
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-		
-		lightColor[] = {1, 1, 0, 0};
-	};
-	class macro_new_ammo(40mm_CIR): macro_new_ammo(40mm_white)
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-		lightColor[] = {0.5, 0.5, 0.25, 0};
-	};
-
-	class macro_new_ammo(40mm_blue): macro_new_ammo(40mm_white)
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-	
-		lightColor[] = {0, 0, 1, 0};
-	};
-
-	class macro_new_ammo(40mm_cyan): macro_new_ammo(40mm_white)
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-	
-		lightColor[] = {0, 1, 1, 0};
-	};
-
-	class macro_new_ammo(40mm_purple): macro_new_ammo(40mm_white)
-	{
-		model = "\A3\Weapons_F\Ammo\UGL_Flare";
-		
-		lightColor[] = {.7, 0, 1, 0};
-	};
-
-	

addons - Copy/RD501_Weapons/_mag/flare_mag.hpp

@@ -1,153 +0,0 @@
-class macro_new_mag(40mm_white,3): UGL_FlareWhite_F
-{
-	author = "RD501";
-	scope = 2;
-	type = 16;
-	displayName = "Flare 3 Rounds (White)";
-	displayNameShort = "White Flare";
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_CA.paa";
-	model = "\A3\Weapons_F\Ammo\UGL_Flare";
-	ammo = macro_new_ammo(40mm_white);
-	initSpeed = 80;
-	count = 3;
-	nameSound = "";
-	descriptionShort = "Type: Flare 3 Rounds - White <br />Rounds: 1<br />Used in: EGLM, 3GL";
-	weaponPoolAvailable = 1;
-	mass = 4;
-};
-
-class macro_new_mag(40mm_white,1):macro_new_mag(40mm_white,3)
-{
-	displayName = "Flare 1 Rounds (White)";
-	descriptionShort = "Type: Flare 1 Rounds - White";
-	mass = 1;
-    count = 1;
-};
-
-class macro_new_mag(40mm_CIR,3): macro_new_mag(40mm_white,3)
-{
-	author = "Bohemia Interactive";
-	displayName = "Flare 3 Rounds (IR)";
-	ammo = macro_new_ammo(40mm_cir);
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_purple_CA.paa";
-	descriptionShort = "Type: Flare - IR<br />Rounds: 1<br />Used in: EGLM, 3GL";
-	displayNameShort = "IR";
-};
-
-class macro_new_mag(40mm_CIR,1):macro_new_mag(40mm_CIR,3)
-{
-	displayName = "Flare 1 Rounds (IR)";
-	descriptionShort = "Type: Flare 1 Rounds - IR";
-	mass = 1;
-    count = 1;
-};
-
-class macro_new_mag(40mm_Green,3): macro_new_mag(40mm_white,3)
-{
-	author = "Bohemia Interactive";
-	displayName = "Flare 3 Rounds (Green)";
-	displayNameShort = "Green Flare";
-	ammo = macro_new_ammo(40mm_green);
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_Green_CA.paa";
-	descriptionShort = "Type: Flare - Green<br />Rounds: 1<br />Used in: EGLM, 3GL";
-};
-
-class macro_new_mag(40mm_Green,1):macro_new_mag(40mm_Green,3)
-{
-	displayName = "Flare 1 Rounds (Green)";
-	descriptionShort = "Type: Flare 1 Rounds - Green";
-	mass = 1;
-    count = 1;
-};
-
-class macro_new_mag(40mm_Red,3): macro_new_mag(40mm_white,3)
-{
-	author = "Bohemia Interactive";
-	displayName = "Flare 3 Rounds (Red)";
-	ammo = macro_new_ammo(40mm_red);
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_Red_CA.paa";
-	descriptionShort = "Type: Flare - Red<br />Rounds: 1<br />Used in: EGLM, 3GL";
-	displayNameShort = "Red Flare";
-};
-
-
-class macro_new_mag(40mm_Red,1):macro_new_mag(40mm_Red,3)
-{
-	displayName = "Flare 1 Rounds (Red)";
-	descriptionShort = "Type: Flare 1 Rounds - Red";
-	mass = 1;
-    count = 1;
-};
-
-class macro_new_mag(40mm_Yellow,3): macro_new_mag(40mm_white,3)
-{
-	author = "Bohemia Interactive";
-	displayName = "Flare 3 Rounds (Yellow)";
-	ammo = macro_new_ammo(40mm_yellow);
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_yelow_CA.paa";
-	descriptionShort = "Type: Flare - Yellow<br />Rounds: 1<br />Used in: EGLM, 3GL";
-	displayNameShort = "Yellow Flare";
-};
-
-class macro_new_mag(40mm_Yellow,1):macro_new_mag(40mm_Yellow,3)
-{
-	displayName = "Flare 1 Rounds (Yellow)";
-	descriptionShort = "Type: Flare 1 Rounds - Yellow";
-	mass = 1;
-    count = 1;
-};
-
-class macro_new_mag(40mm_Blue,3): macro_new_mag(40mm_white,3)
-{
-	author = "Bohemia Interactive";
-	displayName = "Flare 3 Rounds (Blue)";
-	ammo = macro_new_ammo(40mm_blue);
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_yelow_CA.paa";
-	descriptionShort = "Type: Flare - Blue<br />Rounds: 1<br />Used in: EGLM, 3GL";
-	displayNameShort = "Blue Flare";
-};
-
-class macro_new_mag(40mm_Blue,1):macro_new_mag(40mm_Blue,3)
-{
-	displayName = "Flare 1 Rounds (Blue)";
-	descriptionShort = "Type: Flare 1 Rounds - Blue";
-	mass = 1;
-    count = 1;
-};
-
-
-class macro_new_mag(40mm_Cyan,3): macro_new_mag(40mm_white,3)
-{
-	author = "Bohemia Interactive";
-	displayName = "Flare 3 Rounds (Cyan)";
-	ammo = macro_new_ammo(40mm_cyan);
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_yelow_CA.paa";
-	descriptionShort = "Type: Flare - Cyan<br />Rounds: 1<br />Used in: EGLM, 3GL";
-	displayNameShort = "Cyan Flare";
-};
-
-class macro_new_mag(40mm_Cyan,1):macro_new_mag(40mm_Cyan,3)
-{
-	displayName = "Flare 1 Rounds (Cyan)";
-	descriptionShort = "Type: Flare 1 Rounds - Cyan";
-	mass = 1;
-    count = 1;
-};
-
-class macro_new_mag(40mm_Purple,3): macro_new_mag(40mm_white,3)
-{
-	author = "Bohemia Interactive";
-	displayName = "Flare 3 Rounds (Purple)";
-	ammo = macro_new_ammo(40mm_purple);
-	picture = "\A3\Weapons_F\Data\UI\gear_UGL_Flare_yelow_CA.paa";
-	descriptionShort = "Type: Flare - Purple<br />Rounds: 1<br />Used in: EGLM, 3GL";
-	displayNameShort = "Purple Flare";
-};
-
-class macro_new_mag(40mm_Purple,1):macro_new_mag(40mm_Purple,3)
-{
-	displayName = "Flare 1 Rounds (Purple)";
-	descriptionShort = "Type: Flare 1 Rounds - Purple";
-	mass = 1;
-    count = 1;
-};