Are we there yet?

addons - Copy/RD501_Droids/B1/config.cpp

@@ -13,8 +13,7 @@ class CfgPatches
    			"JLTS_weapons_RPS6",
 			"JLTS_weapons_E5",
 			"JLTS_weapons_E5S",
-			"JLTS_weapons_E60R",
-			"212th_swop_weapons",
+			"JLTS_weapons_E60R"
 		};
 		requiredVersion = 0.1;
 		units[] = {

addons - Copy/RD501_Droids/droid_inits.hpp

@@ -8,6 +8,13 @@ class Extended_Init_EventHandlers
 			init = [_this select 0]	spawn macro_fnc_name(b1_specop_apply_skill);
 		};
 	};
+	class macro_new_unit_class(opfor,BX)
+	{
+		class apply_skills
+		{
+			init = [_this select 0]	spawn macro_fnc_name(b1_specop_apply_skill);
+		};
+	};
 	class macro_new_unit_class(opfor,B1_jammer)
 	{
 		class rd501_jammer

addons - Copy/RD501_Droids/droid_macros.hpp

@@ -36,12 +36,12 @@
 #define macro_marksman_rifle_mag "RD501_30mw_x15_mag"
 #define macro_marksman_rifle_mags _10(macro_marksman_rifle_mag)
 
-#define macro_spec_ops_gun "RD501_e_22"
+#define macro_spec_ops_gun "RD501_e5_special"
 #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"
-#define macro_bx_gun_mag "SWOP_EE4BlasterRifle_Mag"
+#define macro_bx_gun "RD501_e5_special"
+#define macro_bx_gun_mag "JLTS_E5_mag"
 #define macro_bx_gun_mags _6(macro_bx_gun_mag)
 
 #define macro_grenade_launcher "212th_relbyv10"

addons - Copy/RD501_Helmets/aviation/config.cpp

@@ -21,10 +21,11 @@ class CfgPatches
 
 class CfgWeapons
 {
-	class itemCore;
-	class macro_new_helmet(pilot,base):itemCore
+	class H_HelmetB;
+	class macro_new_helmet(pilot,base):H_HelmetB
 	{
 		displayname = Clone Pilot Base Model;
+		scopeArsenal = 2;
 		hiddenSelectionsTextures[]=
         {
             "RD501_Helmets\_textures\aviation\clonePilotHelmet_co.paa"
@@ -117,6 +118,7 @@ class CfgWeapons
 	class macro_new_helmet(warden,501st):212th_Engineer_Helmet_501st
 	{
 		author="RD501"
+		scopeArsenal = 2;
 		DisplayName="[501st] WRDN HELM (Base)";
 		picture="RD501_Helmets\_textures\aviation\warden_ico.paa"
 		hiddenSelections[]=

addons - Copy/RD501_Helmets/config.cpp

@@ -12,20 +12,22 @@ class CfgPatches
 		};
 		requiredVersion=0.1;
 		units[]={};
-		weapons[]={};
+		weapons[]={
+			macro_new_helmet(infantry,jlts_recruit)
+		};
 	};
 };
 
 class CfgWeapons
 {
-	class itemCore;
 	class HeadgearItem;
-	class H_HelmetSpecB;
+	class H_HelmetB;
 	
 	//pilots
-	class macro_new_helmet(pilot,base): itemCore//RD501_501st_Pilot_Base
+	class macro_new_helmet(pilot,base): H_HelmetB//RD501_501st_Pilot_Base
 	{
 		scope = 2;
+		scopeArsenal = 2;
 		author = "RD501";
 		weaponPoolAvailable = 1;       
 		ace_hearing_protection = 0.85; 		
@@ -89,138 +91,10 @@ class CfgWeapons
 		};
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
 	};
-
-	class macro_new_helmet(pilot,gold): itemCore//RD501_501st_Pilot_Base
-	{
-		scope = 2;
-		author = "RD501";
-		weaponPoolAvailable = 1;       
-		ace_hearing_protection = 0.85; 		
-		ace_hearing_lowerVolume = 0;    
-		displayName = "Clone pilot helmet (501st legion) Gold";
-		picture = "\SWOP_clones\data\helmets\ico\ico_pilot.paa";
-		//model = "SWOP_clones\helmet\CloneHelmetPilot.p3d";
-		subItems[] = {"G_B_Diving","ItemcTabHCam"};
-		model = "\501st_helmets\AB\AB_helmet_p1.p3d";	
-		hiddenSelections[] = {
-			"camo1",
-			"mat"
-		};
-	
-		hiddenSelectionsTextures[] = {
-			macro_custom_helmet_textures\aviation\pilots\LordKrayt.paa
-		};
-		hiddenSelectionsMaterials[]=
-		{
-			"",
-			"swop_clones\data\helmpilot.rvmat"//"swop_clones\data\helmpilot.rvmat"//  \501st_Helmets\AB\data\white_glow.rvmat
-		};
-
-
-		class ItemInfo: HeadgearItem
-		{
-			mass = 30;
-			uniformmodel = "\501st_helmets\AB\AB_helmet_p1_gold.p3d";//"SWOP_clones\helmet\CloneHelmetPilot.p3d";
-			modelSides[] = {6};
-			hiddenSelections[] = {
-				"camo1",
-				"mat"
-			};
-			material = -1;
-			explosionShielding = 2.2;
-			minimalHit = 0.01;
-			passThrough = 0.01;
-			class HitpointsProtectionInfo
-			{
-				class Head
-				{
-					hitpointName = "HitHead";
-					armor = 50;
-					passThrough = 0.6;
-				};
-			};
-		};
-
-		subItems[] = {macro_new_weapon(nvg_integrated,pilot_test),"G_B_Diving"};
-	};
-
-
-	//inf,arc
-	class macro_new_helmet(infantry,base) : itemCore
-	{
-		scope = 2;
-		author = "RD501";
-		weaponPoolAvailable = 1;       
-		subItems[] = {"G_B_Diving","ItemcTabHCam"};
-		ace_hearing_protection = 0.85; 		
-		ace_hearing_lowerVolume = 0;   
-
-		displayName = "Clonetrooper helmet (501st 'Dino')";
-		picture = "\SWOP_clones\data\helmets\ico\Ico_helm_501.paa";
-		model = "SWOP_clones\helmet\cloneHelmet.p3d";
-		hiddenSelections[] = {"Camo1"};
-		hiddenSelectionsTextures[] = {"SWOP_clones\data\helmets\Helmet501dino_co.paa"};
-		class ItemInfo: HeadgearItem
-		{
-			mass = 30;
-			uniformmodel = "SWOP_clones\helmet\cloneHelmet.p3d";
-			modelSides[] = {6};
-			hiddenSelections[] = {"Camo1"};
-			material = -1;
-			explosionShielding = 2.2;
-			minimalHit = 0.01;
-			passThrough = 0.01;
-			class HitpointsProtectionInfo
-			{
-				class Head
-				{
-					hitpointName = "HitHead";
-					armor = 50;
-					passThrough = 0.6;
-				};
-			};
-		};
-	};
-
-	class macro_new_helmet(infantry,lum_base) : itemCore
-	{
-		scope = 0;
-		author = "RD501";
-		weaponPoolAvailable = 1;       
-		subItems[] = {"G_B_Diving","ItemcTabHCam"};
-		ace_hearing_protection = 0.85; 		
-		ace_hearing_lowerVolume = 0;    
-
-		displayName = "Clonetrooper helmet (501st)";
-		picture = "\SWOP_clones\data\helmets\ico\Ico_helm_501.paa";
-		model = "SWOP_clones\helmet\cloneHelmetLumVisor.p3d";//
-		hiddenSelections[] = {"Camo1"};
-		hiddenSelectionsTextures[] = {"SWOP_clones\data\helmets\Helmet501clutch_co.paa"};
-		class ItemInfo: HeadgearItem
-		{
-			mass = 30;
-			uniformmodel = "SWOP_clones\helmet\cloneHelmetLumVisor.p3d";//
-			modelSides[] = {6};
-			hiddenSelections[] = {"Camo1"};
-			material = -1;
-			explosionShielding = 2.2;
-			minimalHit = 0.01;
-			passThrough = 0.01;
-			class HitpointsProtectionInfo
-			{
-				class Head
-				{
-					hitpointName = "HitHead";
-					armor = 50;
-					passThrough = 0.6;
-				};
-			};
-		};
-	};
-	
-	class macro_new_helmet(empire_rg,boi) : itemCore
+	class macro_new_helmet(empire_rg,boi) : H_HelmetB
 	{
 		scope = 2;
+		scopeArsenal = 2;
 		author = "RD501";
 		weaponPoolAvailable = 1;       
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
@@ -253,9 +127,10 @@ class CfgWeapons
 			};
 		};
 	};
-	class macro_new_helmet(arc,base_jlts) : itemCore
+	class macro_new_helmet(arc,base_jlts) : H_HelmetB
 	{
 		scope = 2;
+		scopeArsenal = 2;
 		author = "RD501";
 		weaponPoolAvailable = 1;       
 		subItems[] = {"G_B_Diving"};
@@ -290,9 +165,10 @@ class CfgWeapons
 			};
 		};
 	};
-	class macro_new_helmet(arc,sgt_jlts) : itemCore
+	class macro_new_helmet(arc,sgt_jlts) : H_HelmetB
 	{
 		scope = 2;
+		scopeArsenal = 2;
 		author = "RD501";
 		weaponPoolAvailable = 1;       
 		subItems[] = {"G_B_Diving"};
@@ -329,10 +205,11 @@ class CfgWeapons
 	};
 
 	//AB
-	class macro_new_helmet(airborne,base): H_HelmetSpecB
+	class macro_new_helmet(airborne,base): H_HelmetB
 	{
 		author = "";
 		scope = 2;
+		scopeArsenal = 2;
 		displayName = "Clone airborne helmet";
 		model = "\501st_helmets\AB\AB_helmet.p3d";
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
@@ -375,7 +252,7 @@ class CfgWeapons
 		};
 	};
 
-	class macro_new_helmet(airborne,lum_base): macro_new_helmet(airborne,base)//H_HelmetSpecB
+	class macro_new_helmet(airborne,lum_base): macro_new_helmet(airborne,base)//H_HelmetB
 	{
 		author = "";
 		scope = 0;
@@ -392,9 +269,10 @@ class CfgWeapons
 		
 	};
 
-	class macro_new_helmet(infantry,jlts_recruit) : itemCore
+	class macro_new_helmet(infantry,jlts_recruit) : H_HelmetB
 	{
 		scope = 2;
+		scopeArsenal = 2;
 		author = "RD501";
 		weaponPoolAvailable = 1;       
 		ace_hearing_protection = 0.85; 		
@@ -427,9 +305,10 @@ class CfgWeapons
 			};
 		};
 	};
-	class macro_new_helmet(infantry,jlts_cadet) : itemCore
+	class macro_new_helmet(infantry,jlts_cadet) : H_HelmetB
 	{
 		scope = 2;
+		scopeArsenal = 2;
 		author = "RD501";
 		weaponPoolAvailable = 1;       
 		
@@ -463,9 +342,10 @@ class CfgWeapons
 			};
 		};
 	};
-	class macro_new_helmet(infantry,jlts_trooper) : itemCore
+	class macro_new_helmet(infantry,jlts_trooper) : H_HelmetB
 	{
 		scope = 2;
+		scopeArsenal = 2;
 		author = "RD501";
 		weaponPoolAvailable = 1;       
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
@@ -499,9 +379,10 @@ class CfgWeapons
 			};
 		};
 	};
-	class macro_new_helmet(infantry,jlts_sgt) : itemCore
+	class macro_new_helmet(infantry,jlts_sgt) : H_HelmetB
 	{
 		scope = 2;
+		scopeArsenal = 2;
 		author = "RD501";
 		weaponPoolAvailable = 1;       
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
@@ -535,10 +416,11 @@ class CfgWeapons
 			};
 		};
 	};			
-	class macro_new_helmet(airborne,jlts_trooper): H_HelmetSpecB
+	class macro_new_helmet(airborne,jlts_trooper): H_HelmetB
 	{
 		author = "RD501";
 		scope = 2;
+		scopeArsenal = 2;
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
 		displayName = "[501st] AB HELM 02 (Trooper)";
 		model="\MRC\JLTS\characters\CloneArmor\CloneHelmetAB.p3d";
@@ -566,10 +448,11 @@ class CfgWeapons
 			};
 		};
 	};
-	class macro_new_helmet(airborne,jlts_vtrooper): H_HelmetSpecB
+	class macro_new_helmet(airborne,jlts_vtrooper): H_HelmetB
 	{
 		author = "RD501";
 		scope = 2;
+		scopeArsenal = 2;
 		displayName = "[501st] AB HELM 03 (Vet. Trooper)";
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
 		model="\MRC\JLTS\characters\CloneArmor\CloneHelmetAB.p3d";
@@ -597,10 +480,11 @@ class CfgWeapons
 			};
 		};
 	};
-	class macro_new_helmet(airborne,jlts_base): H_HelmetSpecB
+	class macro_new_helmet(airborne,jlts_base): H_HelmetB
 	{
 		author = "RD501";
 		scope = 2;
+		scopeArsenal = 2;
 		displayName = "[501st] AB HELM 01 (Base)";
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
 		model="\MRC\JLTS\characters\CloneArmor\CloneHelmetAB.p3d";

addons - Copy/RD501_Main/config.cpp

@@ -14,7 +14,7 @@ class CfgPatches
 			//"sci_APC",
 			"A3_Data_F_Enoch_Loadorder",//Load all of arma first
 			cba_patches ,//cba stuff
-			cancer_pbos ,//all of swop pbos
+			//cancer_pbos ,//all of swop pbos
 			"212th_Engineer"
 		};
 		requiredVersion=0.1;

addons - Copy/RD501_Main/config_macros.hpp

@@ -79,7 +79,7 @@
 	#define macro_root_req macro_patch_name(main)
 	#define macro_lvl2_req macro_patch_name(weapons),macro_patch_name(jumppack),macro_patch_name(helmets),macro_patch_name(vehicle_weapons)
 	#define macro_lvl3_req macro_patch_name(units),macro_patch_name(vehicles),macro_patch_name(zeus)
-	#define macro_lvl1_req macro_patch_name(particle_effects),RD501_patch_Airborne_Helmet_Model,RD501_patch_VenatorMK2,macro_patch_name(emp)
+	#define macro_lvl1_req macro_patch_name(particle_effects),RD501_patch_VenatorMK2,macro_patch_name(emp)
 	#define macro_lvl4_req macro_patch_name(droids_config),macro_patch_name(laat_variants)
 	#define macro_lvl5_req macro_patch_name(legacy_classnames)
 	#define macro_end_patches macro_lvl5_req

addons - Copy/RD501_Main/functions/init/specops.sqf

@@ -6,13 +6,13 @@ if(isNull _unit) exitWith {
 	
 };
 
-_unit setUnitAbility 100; 
-_unit setskill ["aimingAccuracy",100]; 
-_unit setskill ["aimingShake",100]; 
-_unit setskill ["aimingSpeed",100]; 
-_unit setskill ["spotDistance",100]; 
-_unit setskill ["spotTime",100]; 
-_unit setskill ["courage",100]; 
-_unit setskill ["reloadSpeed",100]; 
-_unit setSkill ["general", 200]; 
+_unit setUnitAbility 75; 
+_unit setskill ["aimingAccuracy",80]; 
+_unit setskill ["aimingShake",80]; 
+_unit setskill ["aimingSpeed",80]; 
+_unit setskill ["spotDistance",80]; 
+_unit setskill ["spotTime",75]; 
+_unit setskill ["courage",70]; 
+_unit setskill ["reloadSpeed",70]; 
+_unit setSkill ["general", 170]; 
 _unit setAnimSpeedCoef 1.35; 

addons - Copy/RD501_Vehicle_Weapons/aircraft/generic/aircraft_laser_gun.hpp

@@ -9,7 +9,7 @@
 		//multiplier=1;
 		weaponLockSystem = 0;//changed
 		
-		magazines[] = {macro_new_mag(generic_aircraft_gun_blue,1000)};
+		magazines[] = {macro_new_mag(generic_aircraft_gun,1000)};
 		ballisticsComputer = 4;
 		class LowROF: LowROF
 		{
@@ -48,9 +48,9 @@
 			ffMagnitude=0.5;
 			ffFrequency=11;
 			ffCount=6;
-			burst=1;
 			showToPlayer=1;
-			reloadTime = 0.4;
+			burst = 1;
+			reloadTime=0.04; 
 			dispersion = 0.00001;
 			aiRateOfFire=1;
 			aiRateOfFireDistance=10;

addons - Copy/RD501_Vehicles/air/LAAT/common_stuff_tcw.hpp

@@ -11,6 +11,7 @@ forceInGarage = 1;
 faction = macro_republic_faction
 editorSubcategory = macro_editor_cat_air(Republic_heli)
 vehicleClass = macro_editor_vehicle_type_air(Republic)
+weaponLockSystem = "2+4+8";
 
 RD501_magclamp_small_forbidden=1;
 RD501_magclamp_large_offset[]={0.0,1.6,-7.3};

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

@@ -239,6 +239,7 @@ class CfgVehicles
 			class MainTurret: MainTurret
 			{
 				maxElev = 60;
+				canUseScanner = 1;
 				weapons[] = 
 				{
 					macro_new_weapon(generic,preatorian_gun_opfor),

addons - Copy/RD501_Vehicles/static/config.cpp

@@ -30,7 +30,11 @@ class CfgPatches
 class CfgVehicles
 {
 	class StaticMGWeapon;
-	class StaticWeapon;
+	class LandVehicle;
+	class StaticWeapon : LandVehicle
+	{
+		class Turrets;
+	};
 	class StaticAAWeapon:StaticWeapon
 	{
 		class Turrets;
@@ -58,16 +62,11 @@ class CfgVehicles
 			class MainTurret;
 		};
 	};
-	class LandVehicle;
-	class StaticWeapon : LandVehicle
-	{
-		class Turrets;
-	};
 	class OPTRE_Static_M41:StaticMGWeapon
 	{
 		class Turrets;
 	};
-	class OPTRE_Static_Gauss:OPTRE_Static_M41
+	class OPTRE_Static_Gauss : OPTRE_Static_M41
 	{
 		class Turrets: Turrets
 		{
@@ -165,6 +164,8 @@ class CfgVehicles
 			maxTurn = 360;
 			weapons[] = {macro_new_weapon(stat,aap4)};
 			magazines[] = {macro_new_mag(aap,4)};
+			//weapons[]={"ace_javelin_Titan_Static"};
+			//magazines[]={"1Rnd_GAT_missiles"};
 			turretInfoType = "ACE_RscOptics_javelin";
 			gunnerOpticsColor[] = {0,0,0,1};
 			gunnerOpticsEffect[] = {};
@@ -334,7 +335,7 @@ class CfgWeapons
         modelOptics = "\z\ace\addons\javelin\data\reticle_titan.p3d";  // Optics model
         canLock = 0;  // Disable vanilla locking (0-disabled, 1-enabled)
         lockingTargetSound[] = {"", 0, 1};  // Locking sound
-        lockedTargetSound[] = {"", 0, 1};  // Target acquired sound
+        lockedTargetSound[] = {"", 0, 1};  // Target acquired sound*/
 		hiddenSelectionsTextures[]=
 		{
 			"RD501_Vehicles\textures\static\warthog_addons_grey_co.paa"
@@ -393,7 +394,8 @@ class CfgMagazines
 		picture="\RD501_Vehicles\static\data\rd501_icon_mag_staticaap.paa";
 		displayName= "AAP4 'Striker' Pod"
 		count=4;
-		ammo=macro_new_ammo(striker)
+		ammo="ACE_Javelin_FGM148_Static";
+		//ammo=macro_new_ammo(striker)
 		weaponpoolavailable=1;
 	};
 		class macro_new_mag(mar,1): 3AS_500_Rnd_BlasterTurret_mag

addons - Copy/RD501_Vehicles/static/shields/bubble/model.cfg

@@ -23,7 +23,7 @@ class CfgModels {
 				selection = "shield";
 				memory = 1;
 				minValue = 0;
-				maxValue = 6;
+				maxValue = 48;
 				angle0 = 0;
 				angle1 = "rad 360";
 				axis = "shield_axis";

addons - Copy/RD501_Vehicles/static/shields/config.cpp

@@ -18,7 +18,8 @@ class CfgPatches
 		requiredVersion=0.1;
 		units[]=
 		{
-			"RD501_Squad_Shield"
+			"RD501_Squad_Shield",
+			"RD501_Squad_Shield_trench"
 		};
 		weapons[]=
 		{
@@ -53,4 +54,27 @@ class CfgVehicles
 		editorCategory =  macro_editor_cat(statics)
 		editorSubcategory = macro_editor_cat(static_msc)
 	};
+	class RD501_Squad_Shield_trench: Land_House_Small_03_V1_ruins_F
+	{
+		author="$STR_A3_Bohemia_Interactive";
+		mapSize=21.1;
+		class SimpleObject
+		{
+			eden=0;
+			animate[]={};
+			hide[]={};
+			verticalOffset=-0.023;
+			verticalOffsetWorld=0;
+			init="''";
+		};
+		editorPreview="\A3\EditorPreviews_F\Data\CfgVehicles\Land_House_Small_03_V1_ruins_F.jpg";
+		scope=2;
+		scopeCurator=2;
+		displayName="Trench Shield";
+		model="\RD501_Vehicles\static\shields\trench\trench.p3d";
+		icon="iconObject_1x1";
+		vehicleClass = macro_editor_vehicle_type(statics)
+		editorCategory =  macro_editor_cat(statics)
+		editorSubcategory = macro_editor_cat(static_msc)
+	};
 };

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

@@ -1,32 +0,0 @@
-#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/E5/config.cpp

@@ -17,43 +17,61 @@ class CfgPatches
 		requiredVersion=0.1;
 		units[]={};
 		weapons[]={
-			//macro_new_weapon(e5,c)
-			macro_new_weapon(e5,aqua)
+			macro_new_weapon(e5,special)
 		};
 	};
 };
+class Mode_SemiAuto;
 class Mode_FullAuto;
 class cfgWeapons 
 {
 	
-	class SWOP_BlasterRifle_Base;
-
-	class SWOP_E5:SWOP_BlasterRifle_Base
+	class Rifle_Base_F;
+	class arifle_MX_Base_F: Rifle_Base_F
+	{	};
+	class JLTS_E5: arifle_MX_Base_F
 	{
-		class GunParticles;
+		class Single: Mode_SemiAuto
+		{};
+		class FullAuto: Mode_FullAuto
+		{};
 	};
-	class macro_new_weapon(e5,aqua): SWOP_E5
+	class macro_new_weapon(e5,special): JLTS_E5
 	{
-		dlc = "rd501";
-		author = "RD501";
-		scope = 2;
-		displayname = "E5-A Blaster Rifle";
-		baseweapon = "E5-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";
-		selectionFireAnim = "muzzleFlash";
-		
-		magazines[]={macro_new_mag(E5_aqua,60)};
-		class GunParticles : GunParticles
-		{	class SecondEffect
-			{
-				effectName = "ShotUnderwater";
-				positionName = "barrel";
-				directionName = "Tip";
-			};
+		scope=2;
+        scopeArsenal=2;
+		JLTS_hasElectronics=0;
+		recoil="recoil_mxm"
+		baseWeapon=macro_new_weapon(e5,special)
+        displayName="CIS E5 Special";
+		ACE_Overheating_mrbs = 450000;
+		class Single: Single
+		{
+			reloadTime=0.055;
+			recoil="recoil_single_mx";
+			recoilProne="recoil_single_prone_mx";
+			dispersion=0.0010000001;
+			minRange=2;
+			minRangeProbab=0.5;
+			midRange=200;
+			midRangeProbab=0.69999999;
+			maxRange=400;
+			maxRangeProbab=0.30000001;
+		};
+		class FullAuto: FullAuto
+		{
+			reloadTime=0.07;
+			dispersion=0.0010000001;
+			recoil="recoil_auto_mx";
+			recoilProne="recoil_auto_prone_mx";
+			minRange=0;
+			minRangeProbab=0.89999998;
+			midRange=15;
+			midRangeProbab=0.69999999;
+			maxRange=30;
+			maxRangeProbab=0.1;
+			aiRateOfFire=1e-006;
 		};
 	};
-
 };
 

addons - Copy/RD501_Weapons/Grenades/config.cpp

@@ -98,7 +98,7 @@ class CfgWeapons
 	};
 	class Throw: GrenadeLauncher
 	{
-		muzzles[] += {"Shadow_Muzzle","Imploder_Muzzle","Thermaldet_Muzzle"};
+		muzzles[] += {"Shadow_Muzzle","Imploder_Muzzle","Thermaldet_Muzzle","Squad_Shield_Muzzle"};
 		class Shadow_Muzzle: ThrowMuzzle
 		{
 			magazines[] = {"RD501_BlueShadow_Grenade"};
@@ -111,5 +111,9 @@ class CfgWeapons
 		{
 			magazines[] = {macro_new_mag(thermaldet,1)};
 		};
+		class Squad_Shield_Muzzle: ThrowMuzzle
+		{
+			magazines[] = {macro_new_mag(squad_shield_sigma,1)};
+		};
 	};
 };

addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -27,8 +27,8 @@ class CfgAmmo
 	class 3AS_EC80_BluePlasma;
 	class JLTS_bullet_carbine_red;
 	class G_40mm_HE;
-	class SWOP_BCCKtermimploder;
-	class SWOP_termDet;
+	class 3AS_CoreDetonator_1RND;
+	class 3AS_Detonator_1RND;
 	class B_12Gauge_Pellets_Submunition;
 	class B_12Gauge_Pellets_Submunition_Deploy;
 	class FlareBase;
@@ -257,19 +257,30 @@ class CfgAmmo
 			power=0;
 		};
     };
-	class macro_new_ammo(imploder) : SWOP_BCCKtermimploder
+	class macro_new_ammo(imploder) : 3AS_CoreDetonator_1RND
 	{
 		hit=50;
 		indirectHit=45;
 		indirectHitRange=2;
 	}
-	class macro_new_ammo(thermaldet) : SWOP_termDet
+	class macro_new_ammo(thermaldet) : 3AS_Detonator_1RND
 	{
 		hit=18;
 		indirectHit=14;
 		indirectHitRange=8;
-		model="\RD501_Weapons\Grenades\data\icecream.p3d";
+
 	};
+	class macro_new_ammo(squad_shield_sigma) : 3AS_CoreDetonator_1RND
+	{
+		hit=0;
+		indirectHit=0;
+		indirectHitRange=0;
+		model="\RD501_Weapons\Grenades\data\icecream.p3d";
+		rd501_grenade_deployable = 1;
+        rd501_grenade_deployable_object = "RD501_Squad_Shield";
+        rd501_grenade_deployable_timeToLive = 30;
+		simulation="shotShell";
+	}
 ///////////////////////////////////////////////////////////////////////
 /////////////////////////Shotgun///////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
@@ -380,18 +391,18 @@ class CfgAmmo
 ///////////////////////////////////////////////////////////////////////
 /////////////////////////Rockets///////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
-	class M_Titan_AT;
+	class ACE_Javelin_FGM148_static;
 	class R_PG32V_F;
 	class Mo_cluster_AP;
-	class macro_new_ammo(striker):M_Titan_AT
+	class macro_new_ammo(striker):ACE_Javelin_FGM148_static
 	{
-		hit=115;
+		hit=1650;
 		effectsMissileInit="RocketBackEffectsStaticRPG";
 		initTime=0.1;
 		irLock = 1;
         laserLock = 0;
         airLock = 0;
-		class ace_missileguidance {
+		/*class ace_missileguidance {
             enabled = 1;
 
             minDeflection = 0.00005;      // Minium flap deflection for guidance
@@ -419,11 +430,12 @@ class CfgAmmo
             defaultAttackProfile = "JAV_TOP";
             attackProfiles[] = { "JAV_TOP", "JAV_DIR" };
             useModeForAttackProfile = 1;
-        };
+        };*/
 	};
 	class macro_new_ammo(rps4heat):R_PG32V_F
 	{
 		hit=150;
+		submunitionAmmo="ammo_Penetrator_Titan_AT";
 	};
 	class macro_new_ammo(rps4burst):R_PG32V_F
 	{

addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -24,8 +24,8 @@ class CfgMagazines
 	class 1Rnd_Smoke_Grenade_shell;
 	class UGL_FlareWhite_F;
 	class SWOP_DC15SA_Ammo;
-	class SWOP_termDet_Gm;
-	class SWOP_BCCKtermimploder_G;
+	class 3AS_ThermalDetonator;
+	class 3AS_BaridumCore;
 	class 2Rnd_12Gauge_Pellets;
 
 	////////////////////////////////////////////////////
@@ -319,24 +319,33 @@ class CfgMagazines
 	////////////////////////////////////////////////////
 	/////////////Grenades Magazines/////////////////////
 	////////////////////////////////////////////////////
-	class macro_new_mag(imploder,1):SWOP_BCCKtermimploder_G
+	class macro_new_mag(imploder,1):3AS_BaridumCore
 	{
 		scope=2;
 		displayName = "Republic Thermal Imploder";
-		displayNameShort = "Republic Thermal Imploder";
+		displayNameShort = "Thermal Imploder";
 		count=1;
 		ammo = macro_new_ammo(imploder)
 		descriptionShort = "Republic Thermal Imploder";
 	};
-	class macro_new_mag(thermaldet,1):SWOP_termDet_Gm
+	class macro_new_mag(thermaldet,1):3AS_ThermalDetonator
 	{
 		scope=2;
 		displayName = "Republic Thermal Detonator";
-		displayNameShort = "Republic Thermal Detonator";
+		displayNameShort = "Thermal Detonator";
 		count=1;
 		ammo = macro_new_ammo(thermaldet)
 		descriptionShort = "Republic Thermal Detonator";
 	};
+	class macro_new_mag(squad_shield_sigma,1):3AS_BaridumCore
+	{
+		scope=2;
+		displayName = "Republic Squad Shield Sigma";
+		displayNameShort = "Squad Shield Sigma";
+		count=1;
+		ammo = macro_new_ammo(squad_shield_sigma)
+		descriptionShort = "Republic Thermal Imploder";
+	};
 
 	////////////////////////////////////////////////////
 	/////////////Missile  Magazines/////////////////////