finish droid compositions

set crew of cis vehicles to new droids

addons - Copy/RD501_Droids/B1/b1_common.hpp

@@ -4,8 +4,6 @@ scope = 2;
 faction = macro_cis_faction
 editorSubcategory = macro_editor_cat(B1)
 
-cost = 700000;
-
 linkeditems[]=
 {
 	"ItemGPS",

addons - Copy/RD501_Droids/B1/config.cpp

@@ -59,6 +59,7 @@ class CfgVehicles
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1);
+		cost=1;
 	};
 	class macro_new_unit_class(opfor,B1_marine): JLTS_Droid_B1_Marine
 	{
@@ -66,6 +67,7 @@ class CfgVehicles
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1);
+		cost=1;
 	};
 	class macro_new_unit_class(opfor,B1_security): JLTS_Droid_B1_Security
 	{
@@ -73,6 +75,7 @@ class CfgVehicles
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1);
+		cost=1;
 	};
 	class macro_new_unit_class(opfor,B1_commander): JLTS_Droid_B1_Commander
 	{
@@ -80,6 +83,7 @@ class CfgVehicles
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1_antenna);
+		cost=5;
 	};
 	class macro_new_unit_class(opfor,B1_pilot): JLTS_Droid_B1_Pilot
 	{
@@ -87,6 +91,7 @@ class CfgVehicles
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1);
+		cost=2;
 	};
 	class macro_new_unit_class(opfor,B1_crew): JLTS_Droid_B1_Crew
 	{
@@ -94,10 +99,12 @@ class CfgVehicles
 		#include "b1_common.hpp"
 		macro_e5_loadout
 		backpack=macro_new_backpack_class(opfor,B1);
+		cost=1;
 	};
 	class macro_new_unit_class(opfor,B1_prototype): JLTS_Droid_B1_Prototype
 	{
 		displayName="B1 Battledroid (SpecOps)";
+		editorSubcategory = macro_editor_cat(CIS_SpecOps)
 		#include "b1_common.hpp"
 		weapons[]=
 		{
@@ -119,7 +126,8 @@ class CfgVehicles
 			macro_smoke,
 			macro_smoke,
 			macro_flashbang,
-			macro_flashbang
+			macro_flashbang,
+			macro_dioxis_grenade
 		};
 		respawnMagazines[]=
 		{
@@ -129,9 +137,17 @@ class CfgVehicles
 			macro_smoke,
 			macro_smoke,
 			macro_flashbang,
-			macro_flashbang
+			macro_flashbang,
+			macro_dioxis_grenade
+		};
+		items[]={
+			_3(macro_zip_tie)
+		};
+		respawnItems[]={
+			_3(macro_zip_tie)
 		};
 		backpack=macro_new_backpack_class(opfor,B1_prototype);
+		cost=3;
 	};
 
 	// fancy droids
@@ -164,10 +180,12 @@ class CfgVehicles
 			macro_thermal_det,
 			macro_smoke
 		};
+		cost=2;
 	};
-	class macro_new_unit_class(opfor,B1_AT_heavy): macro_new_unit_class(opfor,B1_security)
+	class macro_new_unit_class(opfor,B1_AT_heavy): macro_new_unit_class(opfor,B1_pilot)
 	{
 		displayName="B1 Battledroid (AT heavy)";
+		threat[]={0.2,1,0.3};
 		weapons[]=
 		{
 			macro_e5,
@@ -197,10 +215,12 @@ class CfgVehicles
 			macro_smoke
 		};
 		backpack=macro_new_backpack_class(opfor,B1_AT_heavy);
+		cost=2;
 	};
-	class macro_new_unit_class(opfor,B1_AT_light): macro_new_unit_class(opfor,B1_security)
+	class macro_new_unit_class(opfor,B1_AT_light): macro_new_unit_class(opfor,B1_pilot)
 	{
 		displayName="B1 Battledroid (AT light)";
+		threat[]={0.6,1,0.3};
 		weapons[]=
 		{
 			macro_e5,
@@ -230,11 +250,13 @@ class CfgVehicles
 			macro_smoke
 		};
 		backpack=macro_new_backpack_class(opfor,B1_AT_light);
+		cost=2;
 	};
-	class macro_new_unit_class(opfor,B1_AA): macro_new_unit_class(opfor,B1_security)
+	class macro_new_unit_class(opfor,B1_AA): macro_new_unit_class(opfor,B1_pilot)
 	{
 		displayName="B1 Battledroid (AA)";
-		threat[] = {0.2, 0.1,1};
+		cost=2;
+		threat[]={0.2,0.1,1};
 		weapons[]=
 		{
 			macro_e5,
@@ -264,6 +286,7 @@ class CfgVehicles
 			macro_smoke
 		};
 		backpack=macro_new_backpack_class(opfor,B1_AA);
+		cost=2;
 	};
 	class macro_new_unit_class(opfor,B1_shotgun): macro_new_unit_class(opfor,B1_security)
 	{
@@ -294,6 +317,7 @@ class CfgVehicles
 			macro_thermal_det,
 			macro_smoke
 		};
+		cost=2;
 	};
 	class macro_new_unit_class(opfor,B1_marksman): macro_new_unit_class(opfor,B1_marine)
 	{
@@ -322,16 +346,19 @@ class CfgVehicles
 			macro_thermal_det,
 			macro_smoke
 		};
+		cost=2;
 	};
 	class macro_new_unit_class(opfor,B1_jammer): macro_new_unit_class(opfor,B1)
 	{
 		displayName="B1 Battledroid (Jammer)";
 		backpack=macro_backpack_jammer;
+		cost=3;
 	}
 	class macro_new_unit_class(opfor,B1_E_Web): macro_new_unit_class(opfor,B1)
 	{
 		displayName="B1 Battledroid (E-Web Carrier)";
 		backpack = macro_backpack_eweb;
+		cost=3;
 	}
 	class macro_new_unit_class(opfor,B1_grenadier): macro_new_unit_class(opfor,B1_security)
 	{
@@ -354,5 +381,6 @@ class CfgVehicles
 			macro_grenade_launcher_mags,
 			macro_grenade_launcher_grenades
 		};
+		cost=2;
 	}
 };

addons - Copy/RD501_Droids/BX/config.cpp

@@ -0,0 +1,87 @@
+#include "../../RD501_Main/config_macros.hpp"
+#include "../droid_macros.hpp"
+
+class CfgPatches
+{
+    class macro_patch_name(BX)
+    {
+        addonRootClass=macro_patch_name(droids_config);
+        requiredAddons[] = {
+            macro_patch_name(droids_config)
+        };
+        requiredVersion = 0.1;
+        units[] = {
+            macro_new_unit_class(opfor,BX),
+        };
+    };
+};
+
+class CfgVehicles
+{
+    class 3AS_BX_DROID_F;
+    class macro_new_unit_class(opfor,BX): 3AS_BX_DROID_F
+    {
+        displayName = "BX Commando Droid";
+		author = "RD501";
+		scope = 2;
+		faction = macro_cis_faction
+		editorSubcategory = macro_editor_cat(CIS_SpecOps)cost = 4
+
+		weapons[]=
+		{
+			macro_bx_gun,
+			"Throw",
+			"Put"
+		};
+		respawnWeapons[]=
+		{
+			macro_bx_gun,
+			"Throw",
+			"Put"
+		};
+		magazines[]=
+		{
+			macro_bx_gun_mags,
+			macro_thermal_imp,
+			macro_thermal_imp,
+			macro_smoke,
+			macro_smoke,
+			macro_flashbang,
+			macro_flashbang,
+			macro_dioxis_grenade
+		};
+		respawnMagazines[]=
+		{
+			macro_bx_gun_mags,
+			macro_thermal_imp,
+			macro_thermal_imp,
+			macro_smoke,
+			macro_smoke,
+			macro_flashbang,
+			macro_flashbang,
+			macro_dioxis_grenade
+		};
+		linkeditems[]=
+		{
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink"
+		};
+		respawnlinkeditems[]=
+		{
+			"ItemGPS",
+			"ItemMap",
+			"ItemCompass",
+			"ItemWatch",
+			"JLTS_droid_comlink"
+		};
+		items[]={
+			_3(macro_zip_tie)
+		};
+		respawnItems[]={
+			_3(macro_zip_tie)
+		};
+    };
+}

addons - Copy/RD501_Droids/config.cpp

@@ -1069,29 +1069,26 @@ class CfgGroups
 					faction = macro_cis_faction
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup=1;
-					// should be BX Commando
 					class Unit0
 					{
 						position[]={0,0,0};
 						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+						vehicle=macro_new_unit_class(opfor,BX);
 					};
-					// should be BX Commando
 					class Unit1
 					{
 						position[]={.5,-.5,0};
 						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+						vehicle=macro_new_unit_class(opfor,BX);
 					};
-					// should be BX Commando
 					class Unit2
 					{
 						position[]={-.5,-.5,0};
 						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+						vehicle=macro_new_unit_class(opfor,BX);
 					};
 					class Unit3
 					{
@@ -1206,7 +1203,7 @@ class CfgGroups
 						position[]={0,0,0};
 						rank="LIEUTENANT";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+						vehicle=macro_new_unit_class(opfor,Tactical_Droid);
 					};
 					class Unit1
 					{
@@ -1628,14 +1625,14 @@ class CfgGroups
 						position[]={0,0,0};
 						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,Tactical_Droid);
+						vehicle=macro_new_unit_class(opfor,BX);
 					};
 					class Unit1
 					{
 						position[]={.5,-.5,0};
 						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,Tactical_Droid);
+						vehicle=macro_new_unit_class(opfor,BX);
 					};
 					class Unit2
 					{
@@ -1719,7 +1716,7 @@ class CfgGroups
 				};
 				class macro_new_composition(opfor,regiment_command_team)
 				{
-					name="Heavy Assault Section";
+					name="Regiment/Division Command Team";
 					side=0;
 					faction = macro_cis_faction
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";

addons - Copy/RD501_Droids/droid_macros.hpp

@@ -36,10 +36,14 @@
 #define macro_marksman_rifle_mag "JLTS_E5S_mag"
 #define macro_marksman_rifle_mags _10(macro_marksman_rifle_mag)
 
-#define macro_spec_ops_gun "SWOP_EE4BlasterRifle"
-#define macro_spec_ops_gun_mag "SWOP_EE4BlasterRifle_Mag"
+#define macro_spec_ops_gun "SWOP_E22"
+#define macro_spec_ops_gun_mag "SWOP_E22BlasterRifle_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_mags _6(macro_bx_gun_mag)
+
 #define macro_grenade_launcher "212th_relbyv10"
 #define macro_grenade_launcher_mag "212th_E5P_Mag"
 #define macro_grenade_launcher_mags _8(macro_grenade_launcher_mag)
@@ -50,6 +54,9 @@
 #define macro_thermal_imp "SWOP_BCCKtermimploder_G"
 #define macro_smoke "swop_SmokeShell"
 #define macro_flashbang "swop_mag_flashbang"
+#define macro_dioxis_grenade "SWOP_SCAR_DioxisGM"
+
+#define macro_zip_tie "ACE_CableTie"
 
 #define macro_backpack_jammer "SWOP_B_CARGOBACKPACK"
 #define macro_backpack_eweb macro_new_backpack_class(opfor,eweb_bag_depr)

addons - Copy/RD501_Units/config.cpp

@@ -44,14 +44,6 @@ class Extended_Init_EventHandlers
 		}
     };
 
-    class macro_new_unit_class(opfor,B1_spec_op)
-    {	
-        class apply_skills 
-        {
-            init = [_this select 0] spawn macro_fnc_name(b1_specop_apply_skill);
-        };
-    };
-
     class macro_new_unit_class(opfor,IG_88)
     {	
         class apply_skills 
@@ -67,14 +59,6 @@ class Extended_Init_EventHandlers
             init = [_this select 0] spawn macro_fnc_name(magna_apply_skill);
         };
     };
-
-    class macro_new_unit_class(opfor,B1_Jammer_depr)//
-    {	
-        class jammer 
-        {
-            init = [_this select 0] spawn macro_fnc_name(apply_jammer);
-        };
-    };
 };
 
 class Extended_Respawn_EventHandlers 
@@ -147,34 +131,6 @@ class CfgVehicles
 
 	#include "_backpacks/b1_aa.hpp"
 
-	
-	class macro_new_backpack_class(opfor,Spec_Op_Droid_Bag): macro_new_backpack_class(opfor,B1_AT_Droid_Bag_Base) //RD501_cis_backpacks_Spec_Op_Droid_Bag
-	{
-		scope = 2;
-		hiddenSelectionsTextures[] = {macro_unit_skin_textures\CIS\B1\special_forces\S_Droids_Back_Pack_co.paa};
-		displayName = "Droid control backpack (Spec ops)";
-	};
-
-	class macro_new_backpack_class(opfor,eweb_bag_depr): EWEB_Bag
-	{
-		scope = 2;
-		displayName = "[deprecated] E-WEB Bag";
-		descriptionShort = "[deprecated] E-WEB Bag";
-		side = 0;
-		//faction = "RD501FactionOpfor";
-		picture = "\A3\Supplies_F_Orange\Bags\Data\UI\icon_C_IDAP_UAV_06_antimine_ca";
-		model = "\A3\Supplies_F_Orange\Bags\B_UAV_06_antimine_F.p3d";
-		hiddenSelectionsTextures[] = {"\A3\Supplies_F_Orange\Bags\Data\UAV_backpack_IDAP_co.paa", "a3\air_f_orange\uav_06\data\C_IDAP_UAV_06_antimine_CO.paa"};
-		maximumLoad = 0;
-		mass = 300;
-		class assembleInfo: assembleInfo
-		{
-			base = "";
-			displayName = "E-WEB";
-			assembleTo = "RD501_E_Web_cis";
-		};
-	};
-	
 	class macro_new_backpack_class(blufor,eweb_bag): EWEB_Bag
 	{
 		scope = 2;
@@ -208,18 +164,5 @@ class CfgVehicles
 		mass = 30;
 	};
 
-	// class macro_new_backpack_class(factionless,invsible): Bag_Base
-	// {
-	// 	scope = 2;
-	// 	author = "RD501";
-	// 	picture = "SWOP_clones\data\backpack\ico\Ico_backpack.paa";
-	// 	model = "CAA_InvisBag\CAA_InvisBag.p3d";
-	// 	hiddenSelections[] = {"Camo1"};
-	// 	hiddenSelectionsTextures[] = {""};
-	// 	displayName = "Clonetrooper backpack Invisible #1";
-	// 	maximumload = 600;
-	// 	mass = 30;
-	// };
-
 	#include "_backpacks/legacy_backpacks.hpp"
 };

addons - Copy/RD501_Units/opfor/B1/aa_reskin.hpp

@@ -1,40 +0,0 @@
-
-class macro_new_uniform_skin_class(opfor,B1_AA_Forest_v1): SWOP_CIS_Base
-{ 
-	author = "SWOP";
-	scope = 1;
-	model = "\SWOP_Droids\B1.p3d";
-	modelSides[] = {6};
-	nakedUniform = "U_BasicBody";
-	hiddenSelections[] = {"Camo1", "Camo2", "Camo3"};
-	hiddenSelectionsTextures[] = {"SWOP_Droids\data\B1_camo_head_co.paa", "SWOP_Droids\data\B1_camo_hand_co.paa",macro_unit_skin_textures\CIS\B1\AT\at_droid_camo_chest.paa};
-
-};
-
-class macro_new_uniform_skin_class(opfor,B1_AA_Geon): macro_new_uniform_skin_class(opfor,B1_AA_Forest_v1)
-{
-    
-    hiddenSelectionsTextures[] = {
-        macro_unit_skin_textures\CIS\B1\geonosis\AA\AA_droid_geo_head.paa,
-        macro_unit_skin_textures\CIS\B1\geonosis\AA\AA_droid_geo_limbs.paa,
-        macro_unit_skin_textures\CIS\B1\geonosis\AA\AA_droid_geo_torso.paa
-    };
-
-};
-
-
-class macro_new_uniform_class(opfor,B1_AA): macro_new_uniform_skin_class(opfor,B1_AA_Forest_v1)
-{
-    author = "SWOP + RD501";
-    scope = 1;
-    model = "\SWOP_Droids\B1.p3d";
-    modelSides[] = {6};
-    nakedUniform = "U_BasicBody";
-    hiddenSelections[] = {"Camo1", "Camo2", "Camo3"};
-    hiddenSelectionsTextures[] = {
-        macro_unit_skin_textures\CIS\B1\AA\aa_Droids_Head_co.paa,
-        macro_unit_skin_textures\CIS\B1\AA\aa_Droids_Limbs_co.paa, 
-        macro_unit_skin_textures\CIS\B1\AA\aa_Droids_Assault_Torso_co.paa};
-            
-
-};

addons - Copy/RD501_Units/opfor/B1/at_reskin.hpp

@@ -1,28 +0,0 @@
-class macro_new_uniform_skin_class(opfor,B1_camo_AT): SWOP_CIS_Base
-{
-	author = "SWOP";
-	scope = 1;
-	model = "\SWOP_Droids\B1.p3d";
-	modelSides[] = {6};
-	nakedUniform = "U_BasicBody";
-	hiddenSelections[] = {"Camo1", "Camo2", "Camo3"};
-	hiddenSelectionsTextures[] = {"SWOP_Droids\data\B1_camo_head_co.paa", "SWOP_Droids\data\B1_camo_hand_co.paa",macro_unit_skin_textures\CIS\B1\AT\at_droid_camo_chest.paa};
-
-};
-
-class macro_new_uniform_skin_class(opfor,B1_geon_AT): macro_new_uniform_skin_class(opfor,B1_camo_AT)
-{
-	hiddenSelectionsTextures[] = {
-		macro_unit_skin_textures\CIS\B1\geonosis\AT\AT_droid_geo_head.paa,
-		macro_unit_skin_textures\CIS\B1\geonosis\AT\AT_droid_geo_limbs.paa,
-		macro_unit_skin_textures\CIS\B1\geonosis\AT\AT_droid_geo_torso.paa
-		};
-};
-
-class macro_new_uniform_skin_class(opfor,B1_AT): macro_new_uniform_skin_class(opfor,B1_camo_AT)
-{
-	hiddenSelectionsTextures[] = {
-		macro_unit_skin_textures\CIS\B1\AT\at_Droids_Head_co.paa, 
-		macro_unit_skin_textures\CIS\B1\AT\at_Droids_Limbs_co.paa, 
-		macro_unit_skin_textures\CIS\B1\AT\at_Droids_Assault Torso_co.paa};
-};

addons - Copy/RD501_Units/opfor/B1/b1_aa_uniform.hpp

@@ -1,67 +0,0 @@
-//weapons
-
-class macro_new_uniform_class(opfor,B1_AA_Forest_v1): Uniform_Base
-{
-    author = "SWOP + RD501";
-    scope = 2;
-    displayName = "B1 AA Droid Uniform (Forest v1)";
-    picture = "\SWOP_droids\data\ico\Ico_body.paa";
-    nakedUniform = "U_BasicBody";
-    model = "\A3\Characters_F\Common\Suitpacks\suitpack_blufor_diver";
-    
-    class ItemInfo: ItemInfo
-    {
-        uniformModel = "-";
-        uniformClass = macro_new_uniform_skin_class(opfor,B1_AA_Forest_v1);
-       
-        macro_b1_armor_standard
-
-        modelSides[] = {6};
-        containerClass = "Supply100";
-        mass = 100;
-    };
-};
-
-
-class macro_new_uniform_class(opfor,B1_AA_Geon): Uniform_Base
-{
-    author = "RD501";
-    scope = 2;
-    displayName = "B1 AA Droid Uniform (Geon v1)";
-    picture = "\SWOP_droids\data\ico\Ico_body.paa";
-    nakedUniform = "U_BasicBody";
-    model = "\A3\Characters_F\Common\Suitpacks\suitpack_blufor_diver";
-    class ItemInfo: ItemInfo
-    {
-        uniformModel = "-";
-        uniformClass = macro_new_uniform_skin_class(opfor,B1_AA_Geon)
-
-        macro_b1_armor_standard
-
-        modelSides[] = {6};
-        containerClass = "Supply100";
-        mass = 100;
-    };
-};
-
-
-class macro_new_uniform_class(opfor,B1_AA): Uniform_Base
-{
-    author = "RD501";
-    scope = 2;
-    displayName = "B1 AA Droid Uniform";
-    picture = "\SWOP_droids\data\ico\Ico_body.paa";
-    nakedUniform = "U_BasicBody";
-    model = "\A3\Characters_F\Common\Suitpacks\suitpack_blufor_diver";
-    class ItemInfo: ItemInfo
-    {
-        uniformModel = "-";
-        uniformClass = macro_new_uniform_class(opfor,B1_AA)
-
-        macro_b1_armor_standard
-
-        modelSides[] = {6};
-        containerClass = "Supply100";
-        mass = 100;
-    };
-};

addons - Copy/RD501_Units/opfor/B1/b1_aa_unit.hpp

@@ -1,63 +0,0 @@
-//vehicles
-
-class SWOP_CIS_camo_droid_AA: SWOP_CIS_B1_Base
-{
-    scope=0;
-}
-
-class macro_new_unit_class(opfor,B1_forest_v1_droid_AA) : SWOP_CIS_camo_droid_AA
-{
-    scope = 2;
-
-    faction = macro_cis_faction
-	editorSubcategory = macro_editor_cat(B1)
-
-    author = "SWOP";
-    vehicleClass = "Men";
-   
-
-    backpack = macro_new_backpack_class(opfor,B1_AA_Forest_Bag)
-    displayName = "[deprecated] B1 battledroid (Forest v1)(AA)";
-    identityTypes[] = {"B1Droids"};
-
-    uniformClass = macro_new_uniform_class(opfor,B1_AA_Forest_v1);
-    icon = "iconManAT";
-
-    linkeditems[] = {"ItemMap", "ItemCompass", "ItemWatch", "ItemRadio"};
-    respawnlinkeditems[] = {"ItemMap", "ItemCompass", "ItemWatch", "ItemRadio"};
-    weapons[] = {"SWOP_E5", "SWOP_E5_HoloScope", "launch_I_Titan_F", "Throw", "Put"};
-    respawnWeapons[] = {"SWOP_E5", "SWOP_E5_HoloScope", "launch_I_Titan_F", "Throw", "Put"};
-    magazines[] = {"SWOP_E5_Mag", "SWOP_E5_Mag", "SWOP_E5_Mag", "SWOP_E5_Mag", "SWOP_E5_Mag"};
-    respawnMagazines[] = {"SWOP_E5_Mag", "SWOP_E5_Mag", "SWOP_E5_Mag", "SWOP_E5_Mag", "SWOP_E5_Mag"};
-    threat[] = {0.2, 0.1,1};
-    cost = 700000;
-
-    class EventHandlers : DefaultEventhandlers {};
-
-};
-
-
-
-class macro_new_unit_class(opfor,B1_geonosis_droid_AA): macro_new_unit_class(opfor,B1_forest_v1_droid_AA)
-{
-    scope = 2;
-    backpack = macro_new_backpack_class(opfor,B1_AA_Geon_Bag)
-	displayName = "[deprecated] B1 battledroid Geo (AA)";
-    uniformClass = macro_new_uniform_class(opfor,B1_AA_Geon);
-
-
-  
-};
-
-class macro_new_unit_class(opfor,B1_droid_AA): macro_new_unit_class(opfor,B1_forest_v1_droid_AA)
-{
-    scope = 2;
-    backpack = macro_new_backpack_class(opfor,B1_AA_Bag)
-	displayName = "[deprecated] B1 battledroid (AA)";
-    uniformClass = macro_new_uniform_class(opfor,B1_AA);
-
-
-  
-};
-
-

addons - Copy/RD501_Units/opfor/B1/b1_at_uniform.hpp

@@ -1,65 +0,0 @@
-//weapons
-
-
-class macro_new_uniform_class(opfor,B1_AT_camo) : Uniform_Base
-{
-    author = "RD501";
-    scope = 2;
-    picture = "\SWOP_droids\data\ico\Ico_body.paa";
-    nakedUniform = "U_BasicBody";
-    model = "\A3\Characters_F\Common\Suitpacks\suitpack_blufor_diver";
-    displayName="B1 AT Droid Uniform (Forest v1)";
-    class ItemInfo: ItemInfo
-    {
-        uniformModel = "-";
-        uniformClass = macro_new_uniform_skin_class(opfor,B1_camo_AT)
-        
-        macro_b1_armor_standard
-
-        modelSides[] = {6};
-        containerClass = "Supply100";
-        mass = 100;
-    };
-};
-
-class macro_new_uniform_class(opfor,B1_AT_Geon): Uniform_Base
-{
-    author = "SWOP + RD501";
-    scope = 2;
-    displayName = "B1 AT Droid Uniform (Geon)";
-    picture = "\SWOP_droids\data\ico\Ico_body.paa";
-    nakedUniform = "U_BasicBody";
-    model = "\A3\Characters_F\Common\Suitpacks\suitpack_blufor_diver";
-    class ItemInfo: ItemInfo
-    {
-        uniformModel = "-";
-        uniformClass = macro_new_uniform_skin_class(opfor,B1_geon_AT);
-       
-        macro_b1_armor_standard
-
-        modelSides[] = {6};
-        containerClass = "Supply100";
-        mass = 100;
-    };
-};
-
-class macro_new_uniform_class(opfor,B1_AT) : Uniform_Base
-{
-    author = "SWOP + RD501";
-    scope = 2;
-    displayName = "B1 AT Droid Uniform";
-    picture = "\SWOP_droids\data\ico\Ico_body.paa";
-    nakedUniform = "U_BasicBody";
-    model = "\A3\Characters_F\Common\Suitpacks\suitpack_blufor_diver";
-    class ItemInfo: ItemInfo
-    {
-        uniformModel = "-";
-        uniformClass = macro_new_uniform_skin_class(opfor,B1_AT);
-       
-        macro_b1_armor_standard
-
-        modelSides[] = {6};
-        containerClass = "Supply100";
-        mass = 100;
-    };
-};

addons - Copy/RD501_Units/opfor/B1/b1_at_unit.hpp

@@ -1,54 +0,0 @@
-//vehicles
-
-class SWOP_CIS_camo_droid_AT: SWOP_CIS_B1_Base
-{
-    scope=0;
-}
-
-
-class macro_new_unit_class(opfor,B1_camo_droid_AT): SWOP_CIS_camo_droid_AT
-{
-    scope = 2;
-    backpack = macro_new_backpack_class(opfor,B1_AT_Camo_Bag)
-    displayName = "[deprecated] B1 battledroid Camo (AT)";
-    uniformClass = macro_new_uniform_class(opfor,B1_AT_camo);	
-    author = "RD501";
-    vehicleClass = "Men";
-  
-
-    faction = macro_cis_faction
-	editorSubcategory = macro_editor_cat(B1)
-
-    linkeditems[] = {"ItemMap", "ItemCompass", "ItemWatch", "ItemRadio"};
-    respawnlinkeditems[] = {"ItemMap", "ItemCompass", "ItemWatch", "ItemRadio"};
-    weapons[] = {"SWOP_E5", "SWOP_E5_HoloScope", "launch_MRAWS_green_F", "Throw", "Put"};
-    respawnWeapons[] = {"SWOP_E5", "SWOP_E5_HoloScope", "launch_MRAWS_green_F", "Throw", "Put"};//no mags?
-    magazines[] = {"SWOP_E5_Mag", "SWOP_E5_Mag", "SWOP_E5_Mag", "SWOP_E5_Mag", "SWOP_E5_Mag"};
-    respawnMagazines[] = {"SWOP_E5_Mag", "SWOP_E5_Mag", "SWOP_E5_Mag", "SWOP_E5_Mag", "SWOP_E5_Mag"};
-    class EventHandlers : DefaultEventhandlers{};
-};
-
-
-class macro_new_unit_class(opfor,B1_camo_geonosis_droid_AT): macro_new_unit_class(opfor,B1_camo_droid_AT)
-{
-    scope = 2;
-    backpack = macro_new_backpack_class(opfor,B1_AT_Geon_Bag)
-    displayName = "[deprecated] B1 battledroid Geo (AT)";
-    uniformClass = macro_new_uniform_class(opfor,B1_AT_Geon);
-
-    
-  
-};
-
-
-class macro_new_unit_class(opfor,B1_droid_AT): macro_new_unit_class(opfor,B1_camo_droid_AT)
-{
-    scope = 2;
-    
-    backpack = macro_new_backpack_class(opfor,B1_AT_Bag)
-    displayName = "[deprecated] B1 battledroid (AT)";
-    
-    uniformClass = macro_new_uniform_class(opfor,B1_AT);
-
-    
-};

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

@@ -6,10 +6,6 @@
 #define patch_name MODNAME##unit_addon##_Patches
 #define unit_classname MODNAME##_##unit_addon
 
-// #define macro_new_opfor_class(name) MODNAME##_##name
-// #define macro_new_opfor_uniform_class(name) MODNAME##_uniform_##name
-// #define macro_new_opfor_item_skin_class(name) MODNAME##_item_skin_##name
-
 #define macro_b1_armor_standard\
 		armor = 60;\
         armorStructural = 10;\
@@ -27,29 +23,12 @@ class CfgPatches
 		};
 		requiredVersion=0.1;
 		units[]={
-			
-			macro_new_unit_class(opfor,B1_camo_droid_AT),
-			macro_new_unit_class(opfor,B1_camo_geonosis_droid_AT),
-			macro_new_unit_class(opfor,B1_droid_AT),
-			macro_new_unit_class(opfor,B1_forest_v1_droid_AA),
-			macro_new_unit_class(opfor,B1_droid_AA),
-			macro_new_unit_class(opfor,B1_geonosis_droid_AA),
-
-			macro_new_unit_class(opfor,B1_Jammer_depr),
-			macro_new_unit_class(opfor,B1_E_Web_depr),
 			macro_new_unit_class(opfor,B1_Aqua),
 			macro_new_unit_class(opfor,B1_Heavy_Aqua)
 		};
 		weapons[]=
 		{
-			macro_new_uniform_class(opfor,B1_AT_camo),
-			macro_new_uniform_class(opfor,B1_AT_Geon),
-			macro_new_uniform_class(opfor,B1_AT),
-			macro_new_uniform_class(opfor,B1_AA),
-			macro_new_uniform_class(opfor,B1_AA_Geon),
-			macro_new_uniform_class(opfor,B1_AA_Forest_v1),
 			macro_new_uniform_class(opfor,B1_Aqua)
-			
 		};
 	};
 };
@@ -62,20 +41,12 @@ class cfgWeapons
 		class ItemInfo;
 	};
 	class VestItem;
-	//class UniformItem;
-	
-
-	
-	#include "b1_at_uniform.hpp"
-	#include "b1_aa_uniform.hpp"
 
 	class SWOP_B1_droid_pilot_F_standart:Uniform_Base
 	{
-		class ItemInfo:ItemInfo
-		{
-
-		};
+		class ItemInfo:ItemInfo{};
 	};
+
 	class macro_new_uniform_class(opfor,B1_Aqua): SWOP_B1_droid_pilot_F_standart
 	{
 		scope=2;
@@ -89,22 +60,14 @@ class cfgWeapons
 				mass = 20;
 		};
 	};
-	
-
-
 };
 
 class DefaultEventhandlers;
 class CfgVehicles
 {
-	class SWOP_CIS_B1_Base;
 	class SWOP_CIS_Base;
 	class SWOP_501;
 
-	#include "at_reskin.hpp"
-	#include "aa_reskin.hpp"
-
-
 	class macro_new_uniform_skin_class(opfor,B1_Aqua): SWOP_CIS_Base
 	{
 		author = "SWOP";
@@ -120,64 +83,6 @@ class CfgVehicles
     	};
 	};
 
-
-	
-	//-------------------------------------------------------------------
-	//hide vinilla ones
-	#include "b1_at_unit.hpp"
-	#include "b1_aa_unit.hpp"
-
-	class macro_new_unit_class(opfor,B1_E_Web_depr): SWOP_CIS_B1_Base
-	{
-		scope = 2;
-		
-		author = "SWOP";
-		vehicleClass = "Men";
-	
-		backpack = macro_new_backpack_class(opfor,eweb_bag_depr)
-		displayName = "[deprecated] B1 Gunner (E-Web)";
-		identityTypes[] = {"B1Droids"};
-		model = "\A3\characters_F\BLUFOR\b_soldier_01.p3d";
-		uniformClass = "SWOP_B1_droid_heavy_F_standart";
-		icon = "iconManMG";
-		linkeditems[] = {"SWOP_STbron", "ItemGPS", "ItemMap", "ItemCompass", "ItemWatch", "ItemRadio"};
-		respawnlinkeditems[] = {"SWOP_STbron", "ItemGPS", "ItemMap", "ItemCompass", "ItemWatch", "ItemRadio"};
-		weapons[] = {"SWOP_E5C", "Throw", "Put"};
-		respawnWeapons[] = {"SWOP_E5C", "Throw", "Put"};
-		magazines[] = {"SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_termDet_G", "SWOP_termDet_G"};
-		respawnMagazines[] = {"SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_termDet_G", "SWOP_termDet_G"};
-		cost = 700000;
-
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(B1)
-	};
-
-	class macro_new_unit_class(opfor,B1_Jammer_depr): SWOP_CIS_B1_Base
-	{
-		scope = 2;
-		
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(B1)
-
-		author = "SWOP";
-		vehicleClass = "Men";
-		
-		backpack = "SWOP_B_CARGOBACKPACK";
-		displayName = "[deprecated] B1 Gunner (Radio Jammer)";
-		identityTypes[] = {"B1Droids"};
-		model = "\A3\characters_F\BLUFOR\b_soldier_01.p3d";
-		uniformClass = "SWOP_B1_droid_heavy_F_standart";
-		icon = "iconManMG";
-		linkeditems[] = {"SWOP_STbron", "ItemGPS", "ItemMap", "ItemCompass", "ItemWatch", "ItemRadio"};
-		respawnlinkeditems[] = {"SWOP_STbron", "ItemGPS", "ItemMap", "ItemCompass", "ItemWatch", "ItemRadio"};
-		weapons[] = {"SWOP_E5C", "Throw", "Put"};
-		respawnWeapons[] = {"SWOP_E5C", "Throw", "Put"};
-		magazines[] = {"SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_termDet_G", "SWOP_termDet_G"};
-		respawnMagazines[] = {"SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_E5C_Mag", "SWOP_termDet_G", "SWOP_termDet_G"};
-		cost = 700000;
-		
-	};
-
 	class macro_new_unit_class(opfor,B1_Aqua): SWOP_501
 	{
 		displayname = "Underwater B1";
@@ -199,7 +104,6 @@ class CfgVehicles
 		weapons[] = {macro_new_weapon(e5,aqua),"Throw","Put"};
 		linkedItems[] = {"g_diving","ItemMap","ItemCompass","ItemWatch","ItemRadio",macro_new_weapon(equipment,Water_Filtration),"NVGoggles"};
 		backpack = macro_new_backpack_class(opfor,b1_aqua_bag)
-	
 	};
 
 	class macro_new_unit_class(opfor,B1_Heavy_Aqua): macro_new_unit_class(opfor,B1_Aqua)
@@ -220,6 +124,5 @@ class CfgVehicles
 		weapons[] = {macro_new_weapon(e5,C_aqua),"Throw","Put"};
 		
 		linkedItems[] = {"g_diving","ItemMap","ItemCompass","ItemWatch","ItemRadio",macro_new_weapon(equipment,Water_Filtration),"NVGoggles"};
-
 	};
 };

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

@@ -1,32 +0,0 @@
-#include "../../../RD501_main/config_macros.hpp"
-
-class CfgPatches
-{
-    class macro_patch_name(BX)
-    {
-        addonRootClass=macro_patch_name(droids_config);
-        requiredAddons[] = {
-            macro_patch_name(units)
-        };
-        requiredVersion = 0.1;
-        units[] = {
-            macro_new_unit_class(opfor,BX),
-        };
-    };
-};
-
-class CfgVehicles
-{
-
-    class 3AS_BX_DROID_F;
-
-
-    class macro_new_unit_class(opfor,BX): 3AS_BX_DROID_F
-    {
-        displayName = "Commando Droid";
-		author = "RD501";
-		scope = 2;
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(CIS_SpecOps)
-    };
-}

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

@@ -27,5 +27,6 @@ class CfgVehicles
 		scope = 2;
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat(CIS_SpecOps)
+		cost = 10;
 	};
 }

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

@@ -155,91 +155,6 @@ class CfgVehicles
 		class EventHandlers :DefaultEventhandlers {};
 	};
 
-	// class macro_new_uniform_skin_class(opfor,Magna_white): macro_new_uniform_skin_class(opfor,Magna_Blackops)
-	// {
-	// 	hiddenSelectionsTextures[] = {macro_unit_skin_textures\CIS\magna\white.paa};
-	// };
-
-	// class macro_new_uniform_skin_class(opfor,Magna_blue): macro_new_uniform_skin_class(opfor,Magna_Blackops)
-	// {
-	// 	hiddenSelectionsTextures[] = {macro_unit_skin_textures\CIS\magna\blue.paa};
-	// };
-
-	// class macro_new_uniform_skin_class(opfor,Magna_purple): macro_new_uniform_skin_class(opfor,Magna_Blackops)
-	// {
-	// 	hiddenSelectionsTextures[] = {macro_unit_skin_textures\CIS\magna\purple.paa};
-	// };
-
-	// class macro_new_uniform_skin_class(opfor,Magna_red): macro_new_uniform_skin_class(opfor,Magna_Blackops)
-	// {
-	// 	hiddenSelectionsTextures[] = {macro_unit_skin_textures\CIS\magna\red.paa};
-	// };
-
-	// class macro_new_uniform_skin_class(opfor,Magna_yellow): macro_new_uniform_skin_class(opfor,Magna_Blackops)
-	// {
-	// 	hiddenSelectionsTextures[] = {macro_unit_skin_textures\CIS\magna\yellow.paa};
-	// };
-
-	class macro_new_uniform_skin_class(opfor,B1_Spec_Ops): SWOP_CIS_Base
-	{
-		scope = 1;
-		author = "RD501";
-		model = "\SWOP_Droids\B1.p3d";
-		modelSides[] = {6};
-		nakedUniform = "U_BasicBody";
-		hiddenSelections[] = {"Camo1", "Camo2", "Camo3"};
-		hiddenSelectionsTextures[] = {
-			macro_unit_skin_textures\CIS\B1\special_forces\S_Droids_Head_co.paa, 
-			macro_unit_skin_textures\CIS\B1\special_forces\S_Droids_Limbs_co.paa,
-			macro_unit_skin_textures\CIS\B1\special_forces\S_Droids_Assault_Torso_co.paa
-		};
-
-		class EventHandlers :DefaultEventhandlers {};
-	};
-
-	// Units
-	class macro_new_unit_class(opfor,B1_spec_op): SWOP_CIS_B1_Base
-	{
-		scope = 2;
-
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(CIS_SpecOps)
-		
-		author = "RD501";
-		
-		backpack = macro_new_backpack_class(opfor,Spec_Op_Droid_Bag);
-		displayName = "[deprecated] B1 battledroid (Spec Ops)";
-		identityTypes[] = {"B1Droids"};
-		model = "\A3\characters_F\BLUFOR\b_soldier_01.p3d";
-		uniformClass = macro_new_uniform_class(opfor,B1_Spec_Op)//"RD501_B1_Specops_F_standart";
-		icon = "iconManAT";
-		linkeditems[] = {"H_HelmetO_ViperSP_ghex_F","SWOP_Clonetrooper_Katarn_armor","SWOP_STbron", "ItemGPS", "ItemMap", "ItemCompass", "ItemWatch", "ItemRadio"};
-		respawnlinkeditems[] = {"H_HelmetO_ViperSP_ghex_F","SWOP_Clonetrooper_Katarn_armor","SWOP_STbron", "ItemGPS", "ItemMap", "ItemCompass", "ItemWatch", "ItemRadio"};
-		weapons[] = {"SWOP_EE4BlasterRifle", "ElectroBinocularsB_F", "Throw", "Put"};
-		respawnWeapons[] = {"SWOP_EE4BlasterRifle", "ElectroBinocularsB_F", "Throw", "Put"};
-		magazines[] = {"SWOP_EE4BlasterRifle_Mag", "SWOP_EE4BlasterRifle_Mag","SWOP_EE4BlasterRifle_Mag","SWOP_EE4BlasterRifle_Mag","SWOP_EE4BlasterRifle_Mag","SWOP_EE4BlasterRifle_Mag", "SWOP_BCCKtermimploder_G", "SWOP_BCCKtermimploder_G","swop_SmokeShell","swop_SmokeShell","swop_mag_flashbang","swop_mag_flashbang"};
-		respawnMagazines[] = {"SWOP_EE4BlasterRifle_Mag",  "SWOP_EE4BlasterRifle_Mag","SWOP_EE4BlasterRifle_Mag","SWOP_EE4BlasterRifle_Mag","SWOP_EE4BlasterRifle_Mag","SWOP_EE4BlasterRifle_Mag", "SWOP_BCCKtermimploder_G", "SWOP_BCCKtermimploder_G","swop_SmokeShell","swop_SmokeShell","swop_mag_flashbang","swop_mag_flashbang"};
-
-		class EventHandlers :DefaultEventhandlers {};
-	};
-	class macro_new_unit_class(opfor,B1_shotgun) : SWOP_CIS_droid_mg 
-	{
-		author = "RD501";
-		vehicleClass = "Men";
-		
-		displayName = "[deprecated] B1-S Heavy battledroid";
-
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(B1)
-
-		weapons[] = {"swop_RepShotgun", "ElectroBinocularsB_F", "Throw", "Put"};
-		respawnWeapons[] = {"swop_RepShotgun", "ElectroBinocularsB_F", "Throw", "Put"};
-		magazines[] = {"swop_RepShotgun_Mag", "swop_RepShotgun_Mag","swop_RepShotgun_Mag","swop_RepShotgun_Mag","swop_RepShotgun_Mag"};
-		respawnMagazines[] = {"swop_RepShotgun_Mag", "swop_RepShotgun_Mag","swop_RepShotgun_Mag","swop_RepShotgun_Mag","swop_RepShotgun_Mag"};
-		class EventHandlers :DefaultEventhandlers {};
-	};
-
-	
 	class macro_new_unit_class(opfor,IG_88) : SWOP_CIS_B1_Base
 	{
 		scope = 2;
@@ -287,34 +202,4 @@ class CfgVehicles
 		cost = 800000;
 		//class EventHandlers :DefaultEventhandlers {};
 	};
-
-	// class macro_new_unit_class(opfor,magna_guard_snow): macro_new_unit_class(opfor,magna_guard_blackop)
-	// {
-	// 	displayName = "IG-101 MagnaGuard (Snow Leopard)";
-	// 	uniformClass = macro_new_uniform_class(opfor,Manga_Snow);
-	// };
-
-	// class macro_new_unit_class(opfor,magna_guard_aqua): macro_new_unit_class(opfor,magna_guard_blackop)
-	// {
-	// 	displayName = "IG-101 MagnaGuard (Aqua)";
-	// 	uniformClass = macro_new_uniform_class(opfor,Manga_Aqua);
-	// };
-
-	// class macro_new_unit_class(opfor,magna_guard_royal): macro_new_unit_class(opfor,magna_guard_blackop)
-	// {
-	// 	displayName = "IG-101 Royal MagnaGuard ";
-	// 	uniformClass = macro_new_uniform_class(opfor,Manga_Royal);
-	// };
-
-	// class macro_new_unit_class(opfor,magna_guard_medic): macro_new_unit_class(opfor,magna_guard_blackop)
-	// {
-	// 	displayName = "IG-101 MagnaGuard Medic";
-	// 	uniformClass = macro_new_uniform_class(opfor,Manga_Medic);
-	// };
-
-	// class macro_new_unit_class(opfor,magna_guard_blitz): macro_new_unit_class(opfor,magna_guard_blackop)
-	// {
-	// 	displayName = "IG-101 Blitzkrieger MagnaGuard";
-	// 	uniformClass = macro_new_uniform_class(opfor,Manga_Blitz);
-	// };
 };

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

@@ -58,7 +58,8 @@ class CfgVehicles
 		altFullForce = 6000;
 	    altNoForce = 9000;
 		armor = 650;
-		
+
+		crew=macro_new_unit_class(opfor,B1_pilot)
 
 		#include "common.hpp"
 
@@ -89,6 +90,8 @@ class CfgVehicles
 		scope=2;
 		scopeCurator=2;
 
+		crew=macro_new_unit_class(opfor,B1_pilot)
+
 		#include "common.hpp"
 		
 		weapons[] = {

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

@@ -53,6 +53,8 @@ class CfgVehicles
 	    altNoForce = 9000;
 		armor = 500;
 		forceInGarage=1;
+
+		crew=macro_new_unit_class(opfor,B1_pilot)
 		
 		airBrakeFrictionCoef = 80.4;
 		faction = macro_cis_faction

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

@@ -51,7 +51,9 @@ class CfgVehicles
 	    altFullForce = 6000;
 	    altNoForce = 9000;
 		armor = 400;
-		
+
+		crew=macro_new_unit_class(opfor,B1_pilot)
+
 		airBrakeFrictionCoef = 80.4;
 
 		faction = macro_cis_faction

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

@@ -59,9 +59,11 @@ class CfgVehicles
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat_air(CIS)
 		vehicleClass = macro_editor_vehicle_type_air(CIS)
+
+		crew=macro_new_unit_class(opfor,B1_pilot)
+
 		class ACE_SelfActions:ACE_SelfActions
-		{		
-			
+		{
 			#include "../../common/universal_hud_color_changer.hpp"
 		};
 		class UserActions

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

@@ -68,6 +68,8 @@ class CfgVehicles
 			macro_new_mag(a2a,4)
 		};
 
+		crew=macro_new_unit_class(opfor,B1_pilot)
+
 		class UserActions
 		{
 			class AfterburnerOn

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

@@ -94,6 +94,8 @@ class CfgVehicles
 		editorSubcategory = macro_editor_cat(tank)
 		vehicleClass = macro_editor_vehicle_type(tank)
 
+		crew=macro_new_unit_class(opfor,B1_crew)
+
 		class Turrets:Turrets
 		{
 			class MainTurret:MainTurret
@@ -133,6 +135,8 @@ class CfgVehicles
 		armor = 500;
 		maxSpeed = 75;
 
+		crew=macro_new_unit_class(opfor,B1_crew)
+
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat(tank)
 		vehicleClass = macro_editor_vehicle_type(tank)
@@ -182,6 +186,8 @@ class CfgVehicles
 		//enginePower = 4;//405
 		maxSpeed = 30;//75
 
+		crew=macro_new_unit_class(opfor,B1_crew)
+
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat(tank)
 		vehicleClass = macro_editor_vehicle_type(tank)

addons - Copy/RD501_Vehicles/land/CIS Vanilla/config.cpp

@@ -51,7 +51,7 @@ class CfgVehicles
 		scopeCurator=2;
 		forceInGarage = 1;
 		displayName="CIS Archer AA"
-		crew = "SWOP_CIS_droid_crew";
+		crew=macro_new_unit_class(opfor,B1_crew)
 		visualTarget = 0; 
 		visualTargetSize = 0;
 		reportOwnPosition = true;
@@ -280,7 +280,8 @@ class CfgVehicles
 		scopeCurator=2;
 		forceInGarage = 1;
 		displayName="CIS Scorpion IFV"
-		crew = "SWOP_CIS_droid_crew";
+
+		crew=macro_new_unit_class(opfor,B1_crew)
 		
 		hiddenSelections[] = {"Camo1", "Camo2", "Camo3", "Camo4", "Camo5", "CamoSlat"};
 		textureList[] = {};
@@ -524,7 +525,8 @@ class CfgVehicles
 		scopeCurator=2;
 		forceInGarage = 1;
 		displayName="CIS Tarantula AA"
-		crew = "SWOP_CIS_droid_crew";
+
+		crew=macro_new_unit_class(opfor,B1_crew)
 		
 		hiddenSelections[] = {"Camo1", "Camo2", "Camo3", "Camo4", "Camo5", "CamoSlat"};
 		textureList[] = {};

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

@@ -79,7 +79,7 @@ class CfgVehicles
 		editorSubcategory = macro_editor_cat(turrets)
 		vehicleClass = macro_editor_vehicle_type(turrets)
 
-		crew = "SWOP_CIS_droid_crew";
+		crew=macro_new_unit_class(opfor,B1_crew)
 		typicalCargo[] = {"SWOP_CIS_droid_crew"};
 
 		
@@ -125,7 +125,8 @@ class CfgVehicles
 		displayname =" E-WEB (CIS)";
 		scopeCurator = 2;
 		mapSize = 4;
-		crew = "SWOP_CIS_droid_crew";
+
+		crew=macro_new_unit_class(opfor,B1_crew)
 		
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat(turrets)

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

@@ -45,7 +45,7 @@ class CfgVehicles
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat(APC)
 		vehicleClass = macro_editor_vehicle_type(APC)
-		crew = "SWOP_CIS_droid_crew";
+		crew=macro_new_unit_class(opfor,B1_crew)
         displayname = "Hailfire Droid";
 		init = "[_this select 0] execVM 'RD501_Vehicles\land\Hailfire\hailfire_mass.sqf';";
     };

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

@@ -55,8 +55,9 @@ class CfgVehicles
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat(arty)
 		vehicleClass = macro_editor_cat(arty)
-		
-	    crew = "SWOP_CIS_droid_crew";
+
+		crew=macro_new_unit_class(opfor,B1_crew)
+
 	    typicalCargo[] = {"SWOP_CIS_droid_crew"};
 	    side=0;
 	   	attenuationEffectType = "TankAttenuation";

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

@@ -90,7 +90,7 @@ class CfgVehicles
 	{
 		side = 0;
 		displayname = "Portable CIS Field Gun";
-		crew = "SWOP_CIS_droid_crew";
+		crew=macro_new_unit_class(opfor,B1_crew)
 		faction = macro_cis_faction
 	};
 };

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

@@ -146,7 +146,7 @@ class CfgVehicles
 	class macro_new_vehicle(heavy_ordinance_tank,CIS) : macro_new_vehicle(heavy_ordinance_tank,Mynock)
 	{
 		displayName = "CIS Trebuchet";
-		crew = "SWOP_CIS_droid_crew";
+		crew=macro_new_unit_class(opfor,B1_crew)
 		scope = 2;
 		side=0;
 		scopeCurator=2;

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

@@ -50,7 +50,7 @@ class CfgVehicles
 		scopeCurator=2;
 		forceInGarage = 1;
 		displayName="CIS Tempest"
-		crew = "SWOP_CIS_droid_crew";
+		crew=macro_new_unit_class(opfor,B1_crew)
 		
 		hiddenSelections[] = {"Camo1", "Camo2", "Camo3", "Camo4"};
 		textureList[] = {};

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

@@ -51,7 +51,7 @@ class CfgVehicles
 		hiddenSelections[] = {"camo1", "camo2", "camo3", "CamoNet", "CamoSlat"};
 		forceInGarage = 1;
 
-		crew = "SWOP_CIS_droid_crew";
+		crew=macro_new_unit_class(opfor,B1_crew)
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat(APC)
 		vehicleClass = macro_editor_vehicle_type(APC)

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

@@ -62,7 +62,7 @@ class CfgVehicles
 	class macro_new_vehicle(mortar,cis):macro_new_vehicle(mortar,republic)
 	{
 		displayname = "C.I.S Plasma Mortar";
-		crew = "swop_cis_droid_crew";
+		crew=macro_new_unit_class(opfor,B1_crew)
 		forceInGarage = 1;
 		side=0;
 		faction = macro_cis_faction

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

@@ -54,6 +54,8 @@ class CfgVehicles
 		editorSubcategory = macro_editor_cat(arty)
 		vehicleClass = macro_editor_vehicle_type(arty)
 
+		crew=macro_new_unit_class(opfor,B1_crew)
+
 		class EventHandlers :DefaultEventhandlers {};
 		class Turrets: Turrets
 		{

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

@@ -92,7 +92,7 @@ class CfgVehicles
 	class macro_new_vehicle(rocket_ordinance_tank,CIS) : macro_new_vehicle(rocket_ordinance_tank,Mynock)
 	{
 		displayName = "CIS Catapult";
-		crew = "SWOP_CIS_droid_crew";
+		crew=macro_new_unit_class(opfor,B1_crew)
 		//scope = 2;
 		side = 0;
 

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

@@ -64,7 +64,7 @@ class CfgVehicles
 		model = "\SW_SpeederBike\SW_SpeederBike";
 		displayName = "CIS Combat speeder MK2";
 		author = "Rexi";
-		crew = "SWOP_CIS_droid_mg";
+		crew=macro_new_unit_class(opfor,B1_crew)
 		typicalCargo[] = {"SWOP_CIS_droid_mg","SWOP_CIS_droid_mg"};
 		side = 0;
 		//faction = "RD501FactionOpfor";

addons - Copy/RD501_Vehicles/sea/speed_boat/config.cpp

@@ -64,7 +64,7 @@ class CfgVehicles
 		// editorSubcategory = macro_editor_cat(tank)
 		// vehicleClass = macro_editor_vehicle_type(tank)
 		side=0;
-		crew = "SWOP_CIS_droid_crew";
+		crew=macro_new_unit_class(opfor,B1_crew)
 		class Turrets: Turrets
 		{
 			class FrontTurret: FrontTurret