Version 3.41

addons - Copy/RD501_Helmets/airborne/config.cpp

@@ -39,6 +39,8 @@ class CfgWeapons
 	NEW_501_AB_HELM_JLTS(501st_Snorri_helmet,Snorri,Snorri.paa)
 	NEW_501_AB_HELM_JLTS(501st_Grinch_helmet,Grinch,Grinch.paa)
 	NEW_501_AB_HELM_JLTS(501st_Sparrow_helmet,Sparrow,Sparrow.paa)
+	NEW_501_AB_HELM_JLTS(501st_Omen_helmet,Omen,Omen.paa)
+	NEW_501_AB_HELM_JLTS(501st_Nuclear_helmet,Nuclear,Nuclear.paa)
 
 	
 

addons - Copy/RD501_Helmets/infantry/config.cpp

@@ -168,9 +168,11 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Gallagher,Gallagher,Gallagher.paa)
 	NEW_501_Inf_Helm_JLTS(Weapon,Weapon,Weapon.paa)
 	NEW_501_Inf_Helm_JLTS(Sparticus,Sparticus,Sparticus.paa)
+	NEW_501_Inf_Helm_JLTS(Anta,Anta,Anta.paa)
+	NEW_501_Inf_Helm_JLTS(Neta,Neta,Neta.paa)
+	NEW_501_Inf_Helm_JLTS(Spud,Spud,Spud.paa)
 	NEW_501_ARC_Helm_JLTS(Rayne,Rayne,Rayne.paa)
 	NEW_501_ARC_Helm_JLTS(Archaic,Archaic,Archaic.paa)
-	NEW_501_Inf_Helm_JLTS(Anta,Anta,Anta.paa)
 	NEW_501_ARC_Helm_JLTS(Duke,Duke,Duke.paa)
 	NEW_501_ARC_Helm_JLTS(Jink,Jink,Jink.paa)
 	NEW_501_ARC_Helm_JLTS(Brennan,Brennan,Brennan.paa)

addons - Copy/RD501_Units/blufor/clones/_headwear.hpp

@@ -196,15 +196,18 @@ class macro_new_weapon(nvg,shock_trooper) : JLTS_NVG_droid_chip_1
 	};
 class rd501_JLTS_CloneBinocular: JLTS_CloneBinocular
 {
-    displayname = "[501st] Clone Macrobinoculars (White)";
-};
-class rd501_JLTS_CloneBinocular_black: JLTS_CloneBinocular_black
-{
-    displayname = "[501st] Clone Macrobinoculars (Black)";
+    displayname = "[501st] Clone Macrobinoculars";
+	visionMode[]=
+    {
+        "Normal",
+        "NVG",
+        "TI"
+    };
+	thermalMode[] = {0,2};
 };
 class rd501_JLTS_CloneBinocular_black_TI: JLTS_CloneBinocular_black
 {
-    displayname = "[501st] Clone Macrobinoculars Scout (Black)";
+    displayname = "[501st] Clone Macrobinoculars Scout";
 	visionMode[]=
     {
         "Normal",

addons - Copy/RD501_Vehicle_Weapons/land/super_mg/config.cpp

@@ -25,67 +25,6 @@ class CfgPatches
 class CfgWeapons
 {
 
-	class SW_Z6_base_F;
-	class SWOP_Z6BLASTER:SW_Z6_base_F
-	{
-		
-		class FullAuto1;
-		class FullAuto2;
-	};
-	class macro_new_weapon(super_mg,z6) : SWOP_Z6BLASTER
-	{
-		scopeArsenal = 0; 
-		scope=2;
-		magazineReloadTime=10;
-		modes[] = {"FullAuto1", "medium1", "medium2", "far1", "far2"};
-		dlc="RD501"
-		author= "RD501";
-		baseWeapon = macro_new_weapon(super_mg,z6) ;
-		displayName = "Z6 Super Charged Rotary Blaster.";
-		descriptionShort = "Super Charged Z6 for vehicle mounts";
-		magazines[] = {
-			macro_new_mag(supercharged_z6,400)
-		};
-		modes[] = {"FullAuto1", "medium1", "medium2", "far1", "far2"};
-
-		class FullAuto1:FullAuto1
-		{
-			dispersion =0.0085;
-			reloadTime = 0.03;
-		};
-	};
-
-	class SWOP_BlasterRifle_Base;
-	class SWOP_DLT19BlasterRifle:SWOP_BlasterRifle_Base
-	{
-		modes[] = {"Single", "FullAuto", "close", "short", "medium"};
-		class FullAuto;
-	};
-	class macro_new_weapon(super_mg,dlt19) : SWOP_DLT19BlasterRifle
-	{
-		scopeArsenal = 0; 
-		magazineReloadTime=10;
-		modes[] = {"FullAuto", "close", "short", "medium"};
-		dlc="RD501"
-		author= "RD501";
-		baseWeapon = macro_new_weapon(super_mg,z6) ;
-		displayName = "DLT-19 Super Charged Blaster Rifle.";
-		descriptionShort = "Super Charged DLT-19 for vehicle mounts";
-		magazines[] = {
-			macro_new_mag(supercharged_dlt19,200)
-		};
-		modes[] = {"FullAuto1", "medium1", "medium2", "far1", "far2"};
-
-		class FullAuto:FullAuto
-		{
-			dispersion =0.0017;
-			reloadTime = 0.04;
-		};
-	};
-	
-
-
-
 	
 
 }; 

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

@@ -56,8 +56,12 @@ class Components: Components
 					};
 					class pylons2: pylons1
 					{
+						hardpoints[]=
+						{
+							"RD501_Universal_rail"
+						};
 						UIposition[]={0.050000001,0.44999999};
-						mirroredMissilePos=1;
+						//mirroredMissilePos=1;
 					};
 					class pylons3: pylons1
 					{
@@ -80,7 +84,7 @@ class Components: Components
 						priority=13;
 						maxweight=5000;
 						UIposition[]={0.1,0.34999999};
-						mirroredMissilePos=3;
+						//mirroredMissilePos=3;
 					};
 					class pylons5: pylons1
 					{
@@ -103,7 +107,7 @@ class Components: Components
 						priority=12;
 						maxweight=5000;
 						UIposition[]={0.15000001,0.25};
-						mirroredMissilePos=5;
+						//mirroredMissilePos=5;
 					};
 
 			class Pylons7

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

@@ -334,11 +334,18 @@ class CfgVehicles
 		weapons[]=
 			{
 				macro_new_weapon(generic,republic_aircraft_cannon),
+				"Bomb_Leaflets",
+				macro_new_weapon(wynd,ugm),
 				"Laserdesignator_pilotCamera"
 			};
 		magazines[]=
 			{
 				"Laserbatteries",
+				"1Rnd_Leaflets_Civ_F",
+				"1Rnd_Leaflets_Civ_F",
+				"1Rnd_Leaflets_Civ_F",
+				"1Rnd_Leaflets_Civ_F",
+				macro_new_mag(ugm,10),
 				macro_new_mag(generic_aircraft_gun_green,1000)
 			};
 		class Turrets: Turrets
@@ -351,13 +358,13 @@ class CfgVehicles
 				primaryGunner=1;
 				weapons[]=
 					{
-						macro_new_weapon(cannon,laat),
+						macro_new_weapon(generic,republic_aircraft_cannon),
 						"Laserdesignator_pilotCamera"
 					};
 				magazines[]=
 					{
 						"Laserbatteries",
-						macro_new_mag(laat_cannon,100)
+						macro_new_mag(generic_aircraft_gun_green,1000)
 					};
 				#include "../../common/common_optics.hpp"
 			};

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

@@ -46,10 +46,11 @@ class CfgVehicles
 	{
 		scope=2;
 		displayName="Republic NuClass Mk.I"
-		armor=1300;
+		armor=2300;
 		faction = macro_republic_faction
 		editorSubcategory = macro_editor_cat_air(Republic_heli)
 		vehicleClass = macro_editor_vehicle_type_air(Republic)
+		transportSoldier=35;
 		
 		#include "../../common/common_pilotCamera.hpp"
 

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

@@ -57,37 +57,7 @@ class CfgVehicles
 		RD501_magclamp_small_forbidden = 1;
 
 		//flight model
-		maxSpeed=1100;
-		aileronSensitivity=0.41;
-		elevatorSensitivity=0.41;
-		airBrakeFrictionCoef=120;
-
-		brakeDistance = 80;
-		noseDownCoef = 0;
-		acceleration = 225;
-
-		draconicForceXCoef=15;
-		draconicForceYCoef=6;
-		draconicForceZCoef=12;
-
-		altFullForce=18000;
-		altNoForce=19000;
-
-		draconicTorqueXCoef[]={2.0,1.5,1.0,0.9,1.0,0.9,0.75,0.8,0.9,0.95,1.0};
-		draconicTorqueYCoef[]={1.5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-
-		VTOLYawInfluence="3.5";
-		VTOLPitchInfluence="10";
-		VTOLRollInfluence="9";
-
-		rudderInfluence=0.9;
-		envelope[] = {0.5,2.11,2.43,1.97,1.72,2.69,3.87,5.27,6.89,8.72,9.7,9.6,9.2,8.5,8.2,8};
-		thrustCoef[] = {1.5,3.69,3.62,3.68,3.74,3.81,3.89,3.95,3.96,3.96,3.92,3.4,0.4,0,0,0};
-		elevatorCoef[] = {0.3,0.5,0.66,0.52,0.49,0.46,0.43,0.4,0.35,0.3,0.25,0.18,0.17,0.16,0.15,0.15};
-		aileronCoef[] = {0.4,0.5,0.8,0.95,1.02,1.04,1.03,1.01,1,0.7,0.6,0.55,0.5,0.45,0.4,0.35};
-		rudderCoef[]={0,0.6,0.9,1.0,1.1,1.0,0.9,0.8,0.6,0.35,0.3,0.25,0.2};
-		rudderControlsSensitivityCoef=4.5;
-		gearsUpFrictionCoef=0;
+		maxSpeed=1500;
 
 		class EventHandlers{};
 

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

@@ -0,0 +1,403 @@
+#include "../../../RD501_main/config_macros.hpp"
+class CfgPatches
+{
+	class macro_patch_name(LoyalistVic)
+	{
+		addonRootClass=macro_patch_name(vehicles)
+
+		requiredAddons[]=
+		{
+			macro_patch_name(vehicles)
+		};
+		requiredVersion=0.1;
+		units[]=
+		{,
+			macro_new_vehicle(Loyalist,Gladius),
+			macro_new_vehicle(Loyalist,Scimitar),
+			macro_new_vehicle(Loyalist,Broadsword)
+		};
+		weapons[]=
+		{
+			
+		};
+	};
+};
+
+
+#include "../../common/sensor_templates.hpp"
+class DefaultEventhandlers;
+class CfgVehicles
+{
+	class Car;
+	class Car_F: Car{
+		class Turrets;
+	};
+	class MRAP_03_base_F: Car_F
+	{
+		class Turrets: Turrets{};
+	};
+	class MRAP_03_hmg_base_F: MRAP_03_base_F
+	{
+		class Turrets: Turrets{};
+	};
+	class I_MRAP_03_hmg_F: MRAP_03_hmg_base_F
+	{
+		class Turrets: Turrets{class MainTurret;};
+	};
+	class macro_new_vehicle(Loyalist,Gladius):I_MRAP_03_hmg_F
+	{
+		displayName = "Loyalist FT-13 Gladius";
+		scope = 2;
+		forceInGarage = 1;
+		side = 0;
+		crew=macro_new_unit_class(opfor,human_rifleman)
+
+		faction = macro_cis_faction
+		editorSubcategory = macro_editor_cat(car)
+		vehicleClass = macro_editor_vehicle_type(Car)
+		class Turrets: Turrets
+		{
+			class MainTurret: MainTurret
+			{
+				memoryPointsGetInGunner="pos gunner";
+				memoryPointsGetInGunnerDir="pos gunner dir";
+				body="mainTurret";
+				gun="mainGun";
+				weapons[]=
+				{
+					macro_new_weapon(loyalist_mg,50cal)
+				};
+				magazines[]=
+				{
+					macro_new_mag(loyalist_mg,300),
+					macro_new_mag(loyalist_mg,300),
+					macro_new_mag(loyalist_mg,300)
+				};
+			};
+		};
+		class EventHandlers
+		{
+			init = "[_this select 0] execVM 'RD501_Vehicles\_init_functions\wheel_dmg.sqf';";
+		};
+	};
+	class Wheeled_APC_F: Car_F
+	{
+		class NewTurret;
+		class Turrets
+		{
+			class MainTurret: NewTurret
+			{
+				class ViewOptics;
+				class ViewGunner;
+				class Turrets
+				{
+					class CommanderOptics;
+				};
+			};
+		};
+	};
+	class APC_Wheeled_03_base_F: Wheeled_APC_F
+	{
+		class Turrets: Turrets
+		{
+			class MainTurret: MainTurret{};
+			
+		};
+	};
+	class I_APC_Wheeled_03_base_F: APC_Wheeled_03_base_F
+	{
+		class Turrets: Turrets
+		{
+			class MainTurret: MainTurret{};
+			
+		};
+	}
+	class I_APC_Wheeled_03_cannon_F: I_APC_Wheeled_03_base_F
+	{
+		class Turrets: Turrets
+		{
+			class MainTurret: MainTurret{};
+			
+		};
+	};
+	class macro_new_vehicle(Loyalist,Scimitar):I_APC_Wheeled_03_cannon_F
+	{
+		displayName = "Loyalist AF-3C Scimitar";
+		scope = 2;
+		forceInGarage = 1;
+		side = 0;
+		crew=macro_new_unit_class(opfor,human_rifleman)
+
+		maxSpeed=130;
+		enginePower=422.5;
+		peakTorque=2433.75;
+		faction = macro_cis_faction
+		editorSubcategory = macro_editor_cat(APC)
+		vehicleClass = macro_editor_vehicle_type(APC)
+		class Turrets: Turrets
+		{
+			class MainTurret: MainTurret
+			{
+				weapons[]=
+				{
+					macro_new_weapon(loyalist,20mm),
+					macro_new_weapon(wynd,ugm)
+				};
+				magazines[]=
+				{
+					macro_new_mag(loyalist_20mm,100),
+					macro_new_mag(loyalist_20mm,100),
+					macro_new_mag(loyalist_20mm,100),
+					macro_new_mag(ugm,10),
+					macro_new_mag(ugm,10)
+					
+				};
+			};
+		};
+		class EventHandlers
+		{
+			init = "[_this select 0] execVM 'RD501_Vehicles\_init_functions\wheel_dmg.sqf';";
+		};
+	};
+	class LandVehicle;
+	class Tank: LandVehicle
+	{
+		class NewTurret;
+		class Sounds;
+		class HitPoints;
+	};
+	class Tank_F: Tank
+	{
+		class Turrets
+		{
+			class MainTurret: NewTurret
+			{
+				class ViewGunner;
+				class Turrets
+				{
+					class CommanderOptics;
+				};
+			};
+		};
+	};
+	class APC_Tracked_03_base_F: Tank_F
+	{
+		class Turrets: Turrets
+		{
+			class MainTurret: MainTurret{};
+		};
+	};
+	class macro_new_vehicle(Loyalist,Broadsword):APC_Tracked_03_base_F
+	{
+		displayName = "Loyalist LT-X9 Broadsword";
+		scope = 2;
+		forceInGarage = 1;
+		side = 0;
+		crew=macro_new_unit_class(opfor,human_rifleman)
+
+		enginePower=585;
+		peakTorque=3610;
+		faction = macro_cis_faction
+		editorSubcategory = macro_editor_cat(APC)
+		vehicleClass = macro_editor_vehicle_type(APC)
+		hiddenSelectionsTextures[]=
+		{
+			"A3\armor_f_epb\apc_tracked_03\data\apc_tracked_03_ext_indp_co.paa",
+			"A3\armor_f_epb\apc_tracked_03\data\apc_tracked_03_ext2_indp_co.paa",
+			"A3\Armor_F\Data\camonet_AAF_Digi_Green_CO.paa",
+			"A3\armor_f\data\cage_aaf_co.paa"
+		};
+		class Turrets: Turrets
+		{
+			class MainTurret: MainTurret
+			{
+				weapons[]=
+				{
+					macro_new_weapon(loyalist,30mm)
+				};
+				magazines[]=
+				{
+					macro_new_mag(loyalist_30mm_HE,50),
+					macro_new_mag(loyalist_30mm_HE,50),
+					macro_new_mag(loyalist_30mm_HE,50),
+					macro_new_mag(loyalist_30mm_AP,10),
+					macro_new_mag(loyalist_30mm_AP,10)
+				};
+			};
+		};
+	}
+};
+
+class CfgWeapons
+{
+	class 3AS_Sabre_MG;
+	class player;
+	class macro_new_weapon(loyalist_mg,50cal):3AS_Sabre_MG
+	{
+		displayName="Loyalist Heavy MG";
+		magazineReloadTime=3;
+		magazines[]=
+		{
+			macro_new_mag(loyalist_mg,300)
+		};
+	};
+	class autocannon_Base_F;
+	class autocannon_30mm_CTWS: autocannon_Base_F{};
+	class macro_new_weapon(loyalist,20mm): autocannon_30mm_CTWS
+	{
+		displayName="Autocannon 20mm HE";
+		reloadTime=0.24;
+		muzzles[]=
+		{
+			"HE"
+		};
+		class HE: autocannon_Base_F
+		{
+			displayName="Autocannon 20mm HE";
+			magazines[]=
+			{
+				macro_new_mag(loyalist_20mm,100)
+			};
+			reloadTime=0.24;
+			magazineReloadTime=10;
+			class player: player
+			{
+				dispersion=0.0018;
+			};
+		};
+	};
+	class macro_new_weapon(loyalist,30mm): autocannon_30mm_CTWS
+	{
+		displayName="Autocannon 30mm Dual Purpose";
+		muzzles[]=
+		{
+			"HE",
+			"AP"
+		};
+		class HE: autocannon_Base_F
+		{
+			displayName="Autocannon 30mm HE";
+			magazines[]=
+			{
+				macro_new_mag(loyalist_30mm_HE,50)
+			};
+			reloadTime=0.3;
+			magazineReloadTime=10;
+			class player: player
+			{
+				dispersion=0.0018;
+			};
+		};
+		class AP: autocannon_Base_F
+		{
+			displayName="Autocannon 30mm AP";
+			magazines[]=
+			{
+				macro_new_mag(loyalist_30mm_AP,10)
+			};
+			reloadTime=1;
+			magazineReloadTime=10;
+			class player: player
+			{
+				dispersion=0.00108;
+			};
+		};
+	};
+};
+
+class CfgMagazines
+{
+	class 3AS_300Rnd_SabreMG_Mag;
+	class 140Rnd_30mm_MP_shells;
+	class macro_new_mag(loyalist_mg,300):3AS_300Rnd_SabreMG_Mag
+	{
+		displayName="300 Rnd Heavy MG Ammo";
+		displayNameShort="Heavy MG";
+		ammo=macro_new_ammo(loyalist_mg)
+	};
+	class macro_new_mag(loyalist_20mm,100):140Rnd_30mm_MP_shells
+	{
+		displayName="100 Rnd 20mm HE Cannon";
+		displayNameShort="20mm HE";
+		count = 100;
+		ammo=macro_new_ammo(loyalist_20mm)
+	};
+	class macro_new_mag(loyalist_30mm_HE,50):140Rnd_30mm_MP_shells
+	{
+		displayName="50 Rnd 30mm HE Cannon";
+		displayNameShort="30mm HE";
+		count=50;
+		ammo=macro_new_ammo(loyalist_30mm_HE)
+	};
+	class macro_new_mag(loyalist_30mm_AP,10):140Rnd_30mm_MP_shells
+	{
+		displayName="50 Rnd 30mm HE Cannon";
+		displayNameShort="30mm HE";
+		count = 10;
+		ammo=macro_new_ammo(loyalist_30mm_AP)
+	};
+};
+class CfgAmmo
+{
+	class 3AS_EC60_BluePlasma;
+	class B_30mm_MP;
+	class macro_new_ammo(loyalist_mg):3AS_EC60_BluePlasma
+	{
+		hit=30;
+		indirectHit=0;
+		indirectHitRange=0;
+		cartridge="FxCartridge_127";
+		visibleFire=8;
+		audibleFire=120;
+		dangerRadiusBulletClose=12;
+		dangerRadiusHit=16;
+		suppressionRadiusBulletClose=8;
+		suppressionRadiusHit=12;
+		cost=5;
+		airLock=1;
+		caliber=2.5999999;
+		typicalSpeed=880;
+		timeToLive=10;
+		model = "\RD501_Vehicle_Weapons\_ammo\data\laser_small_purple.p3d";
+		tracerScale=1;
+		tracerStartTime=0;
+		tracerEndTime=10;
+	};
+	class macro_new_ammo(loyalist_20mm):B_30mm_MP
+	{
+		hit=90;
+		indirectHit=3;
+		indirectHitRange=30;
+		explosive=0.60000002;
+		typicalSpeed=1070;
+		model = "\RD501_Vehicle_Weapons\_ammo\data\laser_medium_purple.p3d";
+		tracerScale=1;
+		tracerStartTime=0;
+		tracerEndTime=10;
+	};
+	class macro_new_ammo(loyalist_30mm_HE):B_30mm_MP
+	{
+		hit=140;
+		indirectHit=5;
+		indirectHitRange=90;
+		explosive=0.60000002;
+		typicalSpeed=1070;
+		model = "\RD501_Vehicle_Weapons\_ammo\data\laser_medium_purple.p3d";
+		tracerScale=1;
+		tracerStartTime=0;
+		tracerEndTime=10;
+	};
+	class macro_new_ammo(loyalist_30mm_HE):B_30mm_MP
+	{
+		hit=240;
+		indirectHit=0;
+		indirectHitRange=0;
+		explosive=0.60000002;
+		caliber=7.4000001;
+		typicalSpeed=1370;
+		model = "\RD501_Vehicle_Weapons\_ammo\data\laser_medium_purple.p3d";
+		tracerScale=1;
+		tracerStartTime=0;
+		tracerEndTime=10;
+	};
+};

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

@@ -20,8 +20,8 @@ class CfgPatches
 };
 class CfgWeapons
 {
-	class SWOP_DC15SAPistol;
-	class macro_new_weapon(DC,15sa):SWOP_DC15SAPistol
+	class 3AS_pistol_DC15SA_F;
+	class macro_new_weapon(DC,15sa):3AS_pistol_DC15SA_F
 	{
 		scope=2;
 		author = "RD501";

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

@@ -23,7 +23,8 @@ class CfgPatches
 			macro_new_weapon(DC,r17a),
 			macro_new_weapon(DC,17sig),
 			macro_new_weapon(DC,r17_shield),
-			macro_new_weapon(DC,r17a_shield)
+			macro_new_weapon(DC,r17a_shield),
+			macro_new_weapon(DC,r17_dual)
 			
 		};
 	};
@@ -31,82 +32,9 @@ class CfgPatches
 
 class cfgWeapons 
 {
-	/*class Mode_FullAuto;
-	class Pistol_Base_F;
-	class SWOP_DC17Pistol: Pistol_Base_F
-	{
-		
-		class Single;
-	};
-
-	class macro_new_weapon(DC,17):SWOP_DC17Pistol
-	{
-		displayName="DC-17";
-		scope=2;
-		scopeArsenal=2;
-		weaponPoolAvailable = 1;
-		selectionFireAnim="zasleh";
-		dlc = "RD501";
-
-		author= "RD501";
-		baseWeapon = macro_new_weapon(DC,17);
-		model="\MRC\JLTS\weapons\DC17SA\DC17SA.p3d";
-		hiddenSelections[]=
-		{
-			"camo1",
-			"illum"
-		};
-		hiddenSelectionsTextures[]=
-		{
-			"\MRC\JLTS\weapons\DC17SA\data\DC17SA_co.paa"
-		};
-		hiddenSelectionsMaterials[]=
-		{
-			"",
-			"\a3\characters_f_bootcamp\common\data\vrarmoremmisive.rvmat"
-		};
-		DC_Family_Flashlight
-
-		magazines[]={macro_new_mag(DC17,20),"DCStun_Mag"};
-		magazineWell[] = {macro_new_magwell(DC17_GL_Mags)};
-
-		ACE_Overheating_Dispersion = DC15a_Overheat_Dispersion
-		ACE_Overheating_SlowdownFactor = DC15a_Overheat_SlowdownFactor
-		ACE_Overheating_JamChance = DC15a_Overheat_JamChance
-		ACE_overheating_mrbs = DC15a_Overheat_mrbs
-		ACE_overheating_allowSwapBarrel = 1;
-		ACE_clearJamAction = "ReloadMagazine";
-
-		class Single:Single
-		{
-			dispersion =DC17_accuracy;
-			reloadTime = DC17_reloadtime;
-		};
-	};
-
-	class macro_new_weapon(DC,17a):macro_new_weapon(DC,17)
-	{
-		baseWeapon = macro_new_weapon(DC,17a);
-		displayName="DC-17a";
-		magazines[]+={ macro_new_mag(DC17,40)};
-		magazineWell[] = {};
-		// recoil="";
-		// recoilProne="";
-		class Single:Single
-		{
-			dispersion =DC17_accuracy;
-			reloadTime = DC17_reloadtime/2;
-			autoFire=1;
-		};
-	};
-
-	class Pistol_Base_F;
-	class SWOP_DC15SAPistol:Pistol_Base_F
-	{
-		class Single;
-	};*/
 	class RD501_stun_muzzle;
 	class hgun_P07_F;
+	class 3AS_DC17STest_F;
 	class JLTS_DC17SA:hgun_P07_F
 	{
 		class Single;
@@ -322,6 +250,29 @@ class cfgWeapons
 			};
 			JLTS_hasElectronics=0;
 		};
+	class macro_new_weapon(DC,r17_dual):3AS_DC17STest_F
+		{
+		displayName="Republic Dual DC-17";
+		canShootInWater=1;
+		magazines[]=
+		{
+			macro_new_mag(5mw_dual,10)
+		};
+		muzzles[]=
+		{
+			"this",
+			"Stun"
+		};
+		
+		class Stun: RD501_stun_muzzle
+		{
+			displayName="High Energy StunMode";
+			reloadAction="GestureReloadPistol";
+			magazines[]=
+			{
+				macro_new_mag(stun,5)
+			};
+		};
 	};
 /*
 	class RD501_DC_15_RB:SWOP_DC15SAPistol

addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -63,6 +63,15 @@ class CfgAmmo
 		airFriction=0;
 		waterFriction=-0.009;
 	};
+	class macro_new_ammo(5mw_dual) : 3AS_EC30_BluePlasma
+	{
+		hit=12;
+		airLock=1;
+		typicalSpeed=400;
+		caliber=1.4;
+		airFriction=0;
+		waterFriction=-0.009;
+	};
 	class macro_new_ammo(10mw) : 3AS_EC40_BluePlasma
 	{
 		hit=9;

addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -62,6 +62,16 @@ class CfgMagazines
 		initSpeed=400;
 		descriptionShort="Low power magazine";
 	};
+	class macro_new_mag(5mw_dual,10) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="15 Round 5MW Cell(Dual)";
+		picture="\RD501_Weapons\_mag\data\rd501_icon_mag_dc17.paa";
+		count = 15;
+		mass=4;
+		ammo=macro_new_ammo(5mw_dual)
+		initSpeed=400;
+		descriptionShort="Low power magazine";
+	};
 	class macro_new_mag(10mw,30) : 3AS_45Rnd_EC50_Mag
 	{
 		displayName="40 Round 10MW Cell";