add jammer, make spec ops good

addons - Copy/RD501_Droids/B1/config.cpp

@@ -9,9 +9,12 @@ class CfgPatches
 		addonRootClass=macro_patch_name(droids_config);
 		requiredAddons[] = {
 			macro_patch_name(droids_config),
-			"JLTS_characters_DroidArmor"
+			"JLTS_characters_DroidArmor",
+   			"JLTS_weapons_RPS6",
+			"JLTS_weapons_E5",
+			"JLTS_weapons_E5S",
+			"JLTS_weapons_E60R",
 		};
-
 		requiredVersion = 0.1;
 		units[] = {
 			macro_new_unit_class(opfor,B1),
@@ -27,7 +30,8 @@ class CfgPatches
 			macro_new_unit_class(opfor,B1_AT_light),
 			macro_new_unit_class(opfor,B1_AA),
 			macro_new_unit_class(opfor,B1_shotgun),
-			macro_new_unit_class(opfor,B1_marksmen)
+			macro_new_unit_class(opfor,B1_marksmen),
+			macro_new_unit_class(opfor,B1_jammer)
 		};
 	};
 };
@@ -47,49 +51,49 @@ class CfgVehicles
 	// base droids
 	class macro_new_unit_class(opfor,B1): JLTS_Droid_B1_E5
 	{
-		displayName = "B1 Battle Droid";
+		displayName = "B1 Battledroid";
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1);
 	};
 	class macro_new_unit_class(opfor,B1_marine): JLTS_Droid_B1_Marine
 	{
-		displayName="B1 Battledroid Marine";
+		displayName="B1 Battledroid (Marine)";
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1);
 	};
 	class macro_new_unit_class(opfor,B1_security): JLTS_Droid_B1_Security
 	{
-		displayName="B1 Battledroid Security";
+		displayName="B1 Battledroid (Security)";
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1);
 	};
 	class macro_new_unit_class(opfor,B1_commander): JLTS_Droid_B1_Commander
 	{
-		displayName="B1 Battledroid Commander";
+		displayName="B1 Battledroid (Commander)";
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1_antenna);
 	};
 	class macro_new_unit_class(opfor,B1_pilot): JLTS_Droid_B1_Pilot
 	{
-		displayName="B1 Battledroid Pilot";
+		displayName="B1 Battledroid (Pilot)";
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1);
 	};
 	class macro_new_unit_class(opfor,B1_crew): JLTS_Droid_B1_Crew
 	{
-		displayName="B1 Battledroid Crew";
+		displayName="B1 Battledroid (Crew)";
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1);
 	};
 	class macro_new_unit_class(opfor,B1_prototype): JLTS_Droid_B1_Prototype
 	{
-		displayName="B1 Battledroid Spec-Ops";
+		displayName="B1 Battledroid (SpecOps)";
 		#include "b1_common.hpp"
 		weapons[]=
 		{
@@ -314,4 +318,9 @@ class CfgVehicles
 			macro_smoke
 		};
 	};
+	class macro_new_unit_class(opfor,B1_jammer): macro_new_unit_class(opfor,B1)
+	{
+		displayName="B1 Battledroid (Jammer)";
+		backpack=macro_backpack_jammer;
+	}
 };

addons - Copy/RD501_Droids/config.cpp

@@ -18,6 +18,9 @@ class CfgPatches
 		};
 	};
 };
+
+#include "droid_inits.hpp"
+
 class CfgGroups
 {
 	class EAST

addons - Copy/RD501_Droids/droid_inits.hpp

@@ -0,0 +1,18 @@
+
+class Extended_Init_EventHandlers
+{
+	class macro_new_unit_class(opfor,B1_prototype)
+	{
+		class apply_skills
+		{
+			init = [_this select 0]	spawn macro_fnc_name(b1_specop_apply_skill);
+		};
+	};
+	class macro_new_unit_class(opfor,B1_jammer)
+	{
+		class jammer
+		{
+			init = [_this select 0] spawn macro_fnc_name(apply_jammer);
+		};
+	};
+}

addons - Copy/RD501_Droids/droid_macros.hpp

@@ -45,6 +45,8 @@
 #define macro_smoke "swop_SmokeShell"
 #define macro_flashbang "swop_mag_flashbang"
 
+#define macro_backpack_jammer "SWOP_B_CARGOBACKPACK"
+
 #define macro_e5_loadout \
 weapons[]={macro_e5,"Throw","Put"};\
 respawnWeapons[]={macro_e5,"Throw","Put"};\

addons - Copy/RD501_Units/config.cpp

@@ -68,7 +68,7 @@ class Extended_Init_EventHandlers
         };
     };
 
-    class macro_new_unit_class(opfor,B1_Jammer)//
+    class macro_new_unit_class(opfor,B1_Jammer_depr)//
     {	
         class jammer 
         {

addons - Copy/RD501_Units/opfor/B1/config.cpp

@@ -35,7 +35,7 @@ class CfgPatches
 			macro_new_unit_class(opfor,B1_droid_AA),
 			macro_new_unit_class(opfor,B1_geonosis_droid_AA),
 
-			macro_new_unit_class(opfor,B1_Jammer),
+			macro_new_unit_class(opfor,B1_Jammer_depr),
 			macro_new_unit_class(opfor,B1_E_Web),
 			macro_new_unit_class(opfor,B1_Aqua),
 			macro_new_unit_class(opfor,B1_Heavy_Aqua)
@@ -152,7 +152,7 @@ class CfgVehicles
 		editorSubcategory = macro_editor_cat(B1)
 	};
 
-	class macro_new_unit_class(opfor,B1_Jammer): SWOP_CIS_B1_Base
+	class macro_new_unit_class(opfor,B1_Jammer_depr): SWOP_CIS_B1_Base
 	{
 		scope = 2;
 		
@@ -163,7 +163,7 @@ class CfgVehicles
 		vehicleClass = "Men";
 		
 		backpack = "SWOP_B_CARGOBACKPACK";
-		displayName = "B1 Gunner (Radio Jammer)";
+		displayName = "[deprecated] B1 Gunner (Radio Jammer)";
 		identityTypes[] = {"B1Droids"};
 		model = "\A3\characters_F\BLUFOR\b_soldier_01.p3d";
 		uniformClass = "SWOP_B1_droid_heavy_F_standart";