Weapon and inheritance fixes

addons - Copy/RD501_Vehicles/air/ARC_170X/arc170_inheritance.hpp

@@ -1,6 +1,6 @@
 class 3as_arc_170_base;
 class Turrets;
-class 3as_arc_170_razor: 3as_arc_170_base
+/*class 3as_arc_170_razor: 3as_arc_170_base
 {
 	class Components;
 	class Turrets: Turrets
@@ -8,17 +8,17 @@ class 3as_arc_170_razor: 3as_arc_170_base
 		class LaserPilot;
 		class Reargun;
 	};
-};
-class 3as_arc_170_blue: 3as_arc_170_razor
+};*/
+class 3as_arc_170_blue: 3as_arc_170_base
 {
-	class Components:Components{};
+	class Components;
 	class Turrets: Turrets
 	{
 		class LaserPilot;
 		class Reargun;
 	};
 };
-class 3as_arc_170_green: 3as_arc_170_razor
+class 3as_arc_170_green: 3as_arc_170_blue
 {
 	class Components:Components{};
 	class Turrets: Turrets
@@ -27,7 +27,7 @@ class 3as_arc_170_green: 3as_arc_170_razor
 		class Reargun;
 	};
 };
-class 3as_arc_170_Orange: 3as_arc_170_razor
+class 3as_arc_170_Orange: 3as_arc_170_blue
 {
 	class Components:Components{};
 	class Turrets: Turrets
@@ -36,7 +36,7 @@ class 3as_arc_170_Orange: 3as_arc_170_razor
 		class Reargun;
 	};
 };
-class 3as_arc_170_yellow: 3as_arc_170_razor
+class 3as_arc_170_yellow: 3as_arc_170_blue
 {
 	class Components:Components{};
 	class Turrets: Turrets
@@ -45,7 +45,7 @@ class 3as_arc_170_yellow: 3as_arc_170_razor
 		class Reargun;
 	};
 };
-class 3as_arc_170_red: 3as_arc_170_razor
+class 3as_arc_170_red: 3as_arc_170_blue
 {
 	class Components:Components{};
 	class Turrets: Turrets

addons - Copy/RD501_Vehicles/air/ARC_170X/config.cpp

@@ -26,12 +26,12 @@ class CfgVehicles
 {
 	#include "arc170_inheritance.hpp"
 
-	class macro_new_vehicle(arc_170,razor): 3as_arc_170_razor
+	/*class macro_new_vehicle(arc_170,razor): 3as_arc_170_razor
 	{
 		displayName="ARC-170 (Razor)";
 		#include "../../common/universal_mfd.hpp"
 		#include "arc170_common.hpp"
-	};
+	};*/
 	class macro_new_vehicle(arc_170,blue): 3as_arc_170_blue
 	{
 		displayName="ARC-170 (Blue)";

addons - Copy/RD501_Weapons/Westar/config.cpp

@@ -68,6 +68,7 @@ class cfgWeapons
 	{
 		class Single;
 		class FullAuto;
+		class WeaponSlotsInfo;
 	};
 	class macro_new_weapon(westar,rm5):3AS_WestarM5_F
 	{
@@ -87,6 +88,53 @@ class cfgWeapons
 		{
 			reloadTime=0.1;
 		};
+		class WeaponSlotsInfo: WeaponSlotsInfo
+		{
+			mass = 30;
+			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"}; 
+			};
+		};
 	};
 };
 

addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -31,6 +31,7 @@ class CfgAmmo
 	class SWOP_termDet;
 	class B_12Gauge_Pellets_Submunition;
 	class  B_12Gauge_Pellets_Submunition_Deploy;
+	class FlareBase;
 	class macro_new_ammo(2mw):3AS_EC20_BluePlasma
 	{
 		hit=4;
@@ -260,7 +261,7 @@ class CfgAmmo
 	class macro_new_ammo(shotgun_scatter): B_12Gauge_Pellets_Submunition
 	{
 		hit=20;
-		submunitionConeAngle = 0.8;
+		submunitionConeAngle = 1;
 		submunitionAmmo=macro_new_ammo(shotgun_scatter_submunition)
 	};
 	class macro_new_ammo(shotgun_scatter_submunition) : B_12Gauge_Pellets_Submunition_Deploy
@@ -270,7 +271,7 @@ class CfgAmmo
 	class macro_new_ammo(shotgun_HE): B_12Gauge_Pellets_Submunition
 	{
 		hit=20;
-		submunitionConeAngle = 3;
+		submunitionConeAngle = 4;
 		submunitionAmmo=macro_new_ammo(shotgun_HE_submunition)
 	};
 	class macro_new_ammo(shotgun_HE_submunition) : B_12Gauge_Pellets_Submunition_Deploy
@@ -291,4 +292,75 @@ class CfgAmmo
 		timeToLive = 0.05;
 		JLTS_isEMPAmmo=1;
 	};
-};
+///////////////////////////////////////////////////////////////////////
+/////////////////////////Flares///////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+   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/_common/common.hpp

@@ -61,7 +61,11 @@
 	macro_new_mag(40mm_Purple,3)
 
 #define MACRO_GL_flare_rounds_1rnd \
-	"UGL_FlareGreen_F",\
-	"UGL_FlareRed_F",\
-	"UGL_FlareWhite_F",\
-	"UGL_FlareYellow_F"
+	macro_new_mag(40mm_white,1),\
+	macro_new_mag(40mm_CIR,1),\
+	macro_new_mag(40mm_Green,1),\
+	macro_new_mag(40mm_Red,1),\
+	macro_new_mag(40mm_Yellow,1),\
+	macro_new_mag(40mm_Blue,1),\
+	macro_new_mag(40mm_Cyan,1),\
+	macro_new_mag(40mm_Purple,1)

addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -376,4 +376,160 @@ class CfgMagazines
 		ammo = macro_new_ammo(shotgun_EMP)
 		descriptionShort = "2 Rnd EMP";
 	};
+	////////////////////////////////////////////////////
+	/////////////Flare    Magazines/////////////////////
+	////////////////////////////////////////////////////
+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;
+};
 };