Fixes

addons - Copy/RD501_Droid_Dispenser/functions/fnc_moduleOrbitalDroidDispenser.sqf

@@ -4,7 +4,7 @@ LOG("Spawned Orbital Drop Droid Dispenser Logic");
 
 _logic = _this select 0;
 _units = _this select 1;
-_activated = _this seelct 2;
+_activated = _this select 2;
 
 if ({local _x} count (objectcurators _logic) > 0) then {
     //--- Reveal the circle to curators

addons - Copy/RD501_Droids/droid_macros.hpp

@@ -13,8 +13,8 @@
 #define macro_e5_mag "JLTS_E5_mag"
 #define macro_e5_mags _8(macro_e5_mag)
 
-#define macro_lmg "SWOP_E5C"
-#define macro_lmg_mag "SWOP_E5C_Mag"
+#define macro_lmg "RD501_e5_C"
+#define macro_lmg_mag "RD501_20mw_x90_mag"
 #define macro_lmg_mags _8(macro_lmg_mag)
 
 #define macro_at_heavy "JLTS_E60R_AT"
@@ -28,16 +28,16 @@
 #define macro_aa_mag "Titan_AA"
 #define macro_aa_mags _4(macro_aa_mag)
 
-#define macro_scattergun "swop_CISShotgun"
-#define macro_scattergun_mag "swop_CISShotgun_Mag"
+#define macro_scattergun "JLTS_DP23"
+#define macro_scattergun_mag "JLTS_DP23_mag"
 #define macro_scattergun_mags _5(macro_scattergun_mag)
 
-#define macro_marksman_rifle "JLTS_E5S"
-#define macro_marksman_rifle_mag "JLTS_E5S_mag"
+#define macro_marksman_rifle "RD501_e5_s"
+#define macro_marksman_rifle_mag "RD501_30mw_x15_mag"
 #define macro_marksman_rifle_mags _10(macro_marksman_rifle_mag)
 
-#define macro_spec_ops_gun "SWOP_E22"
-#define macro_spec_ops_gun_mag "SWOP_E22BlasterRifle_Mag"
+#define macro_spec_ops_gun "RD501_e_22"
+#define macro_spec_ops_gun_mag "JLTS_E5_mag"
 #define macro_spec_ops_gun_mags _6(macro_spec_ops_gun_mag)
 
 #define macro_bx_gun "SWOP_EE4BlasterRifle"

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

@@ -118,6 +118,8 @@ class cfgWeapons
 	{
 		displayName="Republic DC-15A";
 		reloadTime=0.1;
+		ACE_overheating_mrbs = 3000000000;
+		recoil="recoil_mx";
 		magazines[]=
 		{
 			macro_new_mag(20mwup,20),

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

@@ -39,7 +39,8 @@ class CfgWeapons
 	{
 		displayName="Republic DC-15C";
 		dispersion=0.00116;
-		
+		ACE_overheating_mrbs = 3000000000;
+		recoil="recoil_mxc";
 		magazines[]=
 		{
 			macro_new_mag(10mw,30)

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

@@ -40,6 +40,7 @@ class CfgWeapons
 	{
 		displayName="Republic DC-15A UGL";
 		JLTS_hasElectronics=0;
+		ACE_Overheating_JamChance = 0;
 		magazines[]=
 		{
 			macro_new_mag(10mw,30)
@@ -84,19 +85,16 @@ class CfgWeapons
 				scope = 0;
 				compatibleItems[] = 
 				{
-					macro_new_weapon(scope,dc_15a_acog),
-					"RD501_RCO",
-					"RD501_RCO_2",
-					"RD501_RCO_3",
+					//macro_new_weapon(scope,dc_15a_acog),
+					//"RD501_RCO",
+					//"RD501_RCO_2",
+					//"RD501_RCO_3",
 					"RD501_MRCO",
 					"RD501_MRCO_2",
-					"RD501_MRCO_3",
-					"RD501_Holosight",
-					"RD501_Holosight_2",
-					"RD501_Holosight_3",
-					"RD501_DMS",
-					"RD501_DMS_2",
-					"RD501_DMS_3"
+					"RD501_MRCO_3"
+					//"RD501_Holosight",
+					//"RD501_Holosight_2",
+					//"RD501_Holosight_3"
 				};
 
 			};

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

@@ -42,6 +42,7 @@ class CfgWeapons
 		recoil="recoil_mmg_02";
 		deployedPivot="bipod";
 		dispersion=0.00145;
+		ACE_overheating_mrbs = 3000000000;
 		magazines[]=
 		{
 			macro_new_mag(20mw,240)

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

@@ -195,6 +195,7 @@ class cfgWeapons
 		reloadTime=0.66;
 		recoil="recoil_smg_01";
 		reloadAction="ReloadMagazine";
+		ACE_overheating_mrbs = 3000000000;
 		magazines[]=
 		{
 			macro_new_mag(5mw,60)

addons - Copy/RD501_Weapons/Droid_weapons/E22/config.cpp

@@ -0,0 +1,32 @@
+#define COMPONENT E22
+#include "../../../RD501_main/config_macros.hpp"
+#include "../../_common/common.hpp"
+class CfgPatches
+{
+	class macro_patch_name(e22)
+	{
+		author=DANKAUTHORS;
+		addonRootClass= macro_patch_name(weapons)
+		requiredAddons[]=
+		{
+			macro_patch_name(weapons)
+		};
+		requiredVersion=0.1;
+		units[]={};
+		weapons[]={
+			macro_new_weapon(e,22)
+		};
+	};
+};
+class CfgWeapons
+{
+	class SWOP_E22;
+	class macro_new_weapon(e,22):SWOP_E22
+	{
+		author="RD501";
+		baseWeapon=macro_new_weapon(e,22)
+		scope=2;
+		displayName="CIS E22"
+		magazines[]={"JLTS_E5_mag"};
+	};
+};

addons - Copy/RD501_Weapons/Droid_weapons/E5S/config.cpp

@@ -0,0 +1,39 @@
+#define COMPONENT E5S
+#include "../../../RD501_main/config_macros.hpp"
+#include "../../_common/common.hpp"
+class CfgPatches
+{
+	class macro_patch_name(e5s)
+	{
+		author=DANKAUTHORS;
+		addonRootClass= macro_patch_name(weapons)
+		requiredAddons[]=
+		{
+			macro_patch_name(weapons)
+		};
+		requiredVersion=0.1;
+		units[]={};
+		weapons[]={
+			macro_new_weapon(e5,s)
+		};
+	};
+};
+class CfgWeapons
+{
+	class arifle_MX_Base_F;
+	class JLTS_E5S: arifle_MX_Base_F
+	{
+		class Single;
+	};
+	class macro_new_weapon(e5,s) : JLTS_E5S
+	{
+		scope=2;
+		baseWeapon=macro_new_weapon(e5,s)
+		displayName= "CIS E5S Sniper Rifle"
+		magazines[]={macro_new_mag(30mw,15)};
+		class Single:Single
+		{
+			reloadTime=1.2;
+		};
+	};
+};

addons - Copy/RD501_Weapons/E5_Family/E5_C/config.cpp → addons - Copy/RD501_Weapons/Droid_weapons/E5_C/config.cpp

@@ -19,7 +19,7 @@ class CfgPatches
 		weapons[]={
 			//macro_new_weapon(e5,c)
 			"SWOP_E5C",
-			macro_new_weapon(e5,C_aqua)
+			macro_new_weapon(e5,C)
 		};
 	};
 };
@@ -42,16 +42,16 @@ class cfgWeapons
 	
 	};
 
-	class macro_new_weapon(e5,C_aqua): SWOP_E5C
+	class macro_new_weapon(e5,C): SWOP_E5C
 	{
 		dlc = "rd501";
 		author = "RD501";
 		scope = 2;
-		displayname = "E5C-A Blaster Rifle";
+		displayname = "CIS E5C-A Blaster Rifle";
 		baseweapon = "E5C-A Blaster Rifle";
 		canShootInWater = 1;
-		//magazines[] = {"RD501_Aqua_E5_Mag","RD501_Aqua_E5_Mag","RD501_Aqua_E5_Mag","RD501_Aqua_E5_Mag","RD501_Aqua_E5_Mag","RD501_Aqua_E5_Mag","RD501_Aqua_E5_Mag"};
-		descriptionShort = "Submersible E5 Rifle";
+		magazines[] = {macro_new_mag(20mw,90)};
+		descriptionShort = "E5C Rifle";
 		selectionFireAnim = "muzzleFlash";
 		magazines[]={macro_new_mag(E5c_aqua,90)};
 		class GunParticles : GunParticles

addons - Copy/RD501_Weapons/Valken/config.cpp

@@ -38,6 +38,7 @@ class CfgWeapons
 	{
 		displayName="Republic Valken 38X";
 		dispersion=0.00045;
+		ACE_Overheating_JamChance = 0;
 		magazines[]=
 		{
 			macro_new_mag(20mwdp,20),
@@ -86,6 +87,7 @@ class CfgWeapons
 	{
 		displayName="Republic Valken 38Y";
 		dispersion=0.00045;
+		ACE_Overheating_JamChance = 0;
 		magazines[]=
 		{
 			macro_new_mag(20mwdp,20),
@@ -102,10 +104,19 @@ class CfgWeapons
 			mass = 30;
 			class CowsSlot: 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_DMS",
+					"RD501_DMS_2",
+					"RD501_DMS_3"
 				};
 			};
 			class MuzzleSlot: MuzzleSlot

addons - Copy/RD501_Weapons/Z6/config.cpp

@@ -121,6 +121,7 @@ class cfgWeapons
 		recoil="recoil_lim"
 		baseWeapon=macro_new_weapon_nofam(rZ6)
         displayName="Republic Z6 Chaingun";
+		ACE_Overheating_JamChance = 0;
 		magazines[]=
 		{
 			macro_new_mag(10mw,400)

addons - Copy/RD501_Weapons/_acc/config.cpp

@@ -333,15 +333,14 @@ class CfgWeapons
 						"OpticsCHAbera2",
 						"OpticsBlur3"
 					};
-					opticsZoomMin=0.0625;
-					opticsZoomMax=0.125;
-					opticsZoomInit=0.125;
-					discreteDistance[]={100,200,300,400,500,600,700,800,900,1000,1100,1200};
-					discreteDistanceInitIndex=1;
+					opticsZoomMin = scope_magnification(12);
+					opticsZoomMax = scope_magnification(6);
+					opticsZoomInit = scope_magnification(6);
+					discreteinitIndex = 0;
+					discretefov[] = {scope_magnification(6),scope_magnification(12)};
+					discreteDistanceInitIndex = 1;
 					distanceZoomMin=300;
 					distanceZoomMax=1200;
-					discretefov[]={0.125,0.0625};
-					discreteInitIndex=0;
 					memoryPointCamera="opticView";
 					visionMode[]=
 					{

addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -108,6 +108,14 @@ class CfgMagazines
 		typicalSpeed=800;
 		descriptionShort="Medium power box magazine";
 	};
+	class macro_new_mag(20mw,90) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="90 Round E5C Cell";
+		count = 90;
+		ammo=macro_new_ammo(20mw)
+		typicalSpeed=800;
+		descriptionShort="Medium power box magazine";
+	};
 	class macro_new_mag(30mw,10) : 3AS_45Rnd_EC50_Mag
 	{
 		displayName="10 Round 30MW Cell";
@@ -116,6 +124,14 @@ class CfgMagazines
 		typicalSpeed=1000;
 		descriptionShort="High power magazine";
 	};
+	class macro_new_mag(30mw,15) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="15 Round E5S Cell";
+		count = 15;
+		ammo=macro_new_ammo(30mw)
+		typicalSpeed=1000;
+		descriptionShort="High power magazine";
+	};
 	class macro_new_mag(30mw,7) : 3AS_45Rnd_EC50_Mag
 	{
 		displayName="7 Round 30MW Cell";