add e-web droid,

add grenadier droid,
add b1 compositions

addons - Copy/RD501_Droids/B1/backpacks.hpp

@@ -19,6 +19,7 @@ class macro_new_backpack_class(opfor,B1_antenna): JLTS_B1_antenna
 };
 class macro_new_backpack_class(opfor,B1_AT_heavy): JLTS_B1_backpack
 {
+	author = "RD501";
 	scope=1;
 	class TransportMagazines
 	{
@@ -31,6 +32,7 @@ class macro_new_backpack_class(opfor,B1_AT_heavy): JLTS_B1_backpack
 };
 class macro_new_backpack_class(opfor,B1_AT_light): JLTS_B1_backpack
 {
+	author = "RD501";
 	scope=1;
 	class TransportMagazines
 	{
@@ -48,6 +50,7 @@ class macro_new_backpack_class(opfor,B1_AT_light): JLTS_B1_backpack
 };
 class macro_new_backpack_class(opfor,B1_AA): JLTS_B1_backpack
 {
+	author = "RD501";
 	scope=1;
 	class TransportMagazines
 	{
@@ -57,4 +60,31 @@ class macro_new_backpack_class(opfor,B1_AA): JLTS_B1_backpack
 			magazine=macro_aa_mag;
 		};
 	};
+};
+
+class B_UAV_01_backpack_F;
+class EWEB_Bag: B_UAV_01_backpack_F
+{
+
+	class assembleInfo;
+
+};
+class macro_new_backpack_class(opfor,eweb_bag): EWEB_Bag
+{
+	scope = 2;
+	displayName = "E-WEB Bag";
+	descriptionShort = "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 = macro_new_vehicle(e_web,cis);
+	};
 };

addons - Copy/RD501_Droids/B1/config.cpp

@@ -9,11 +9,13 @@ class CfgPatches
 		addonRootClass=macro_patch_name(droids_config);
 		requiredAddons[] = {
 			macro_patch_name(droids_config),
+			macro_patch_name(E_Web),
 			"JLTS_characters_DroidArmor",
    			"JLTS_weapons_RPS6",
 			"JLTS_weapons_E5",
 			"JLTS_weapons_E5S",
 			"JLTS_weapons_E60R",
+			"212th_swop_weapons",
 		};
 		requiredVersion = 0.1;
 		units[] = {
@@ -30,8 +32,10 @@ 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_jammer)
+			macro_new_unit_class(opfor,B1_marksman),
+			macro_new_unit_class(opfor,B1_jammer),
+			macro_new_unit_class(opfor,B1_E_Web),
+			macro_new_unit_class(opfor,B1_grenadier)
 		};
 	};
 };
@@ -290,7 +294,7 @@ class CfgVehicles
 			macro_smoke
 		};
 	};
-	class macro_new_unit_class(opfor,B1_marksmen): macro_new_unit_class(opfor,B1_marine)
+	class macro_new_unit_class(opfor,B1_marksman): macro_new_unit_class(opfor,B1_marine)
 	{
 		displayName="B1 Battledroid (Marksman)";
 		weapons[]=
@@ -323,4 +327,31 @@ class CfgVehicles
 		displayName="B1 Battledroid (Jammer)";
 		backpack=macro_backpack_jammer;
 	}
+	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;
+	}
+	class macro_new_unit_class(opfor,B1_grenadier): macro_new_unit_class(opfor,B1_security)
+	{
+		displayName="B1 Battledroid (Grenadier)";
+		weapons[]=
+		{
+			macro_grenade_launcher
+		};
+		respawnWeapons[]=
+		{
+			macro_grenade_launcher
+		};
+		magazines[]=
+		{
+			macro_grenade_launcher_mags,
+			macro_grenade_launcher_grenades
+		};
+		respawnMagazines[]=
+		{
+			macro_grenade_launcher_mags,
+			macro_grenade_launcher_grenades
+		};
+	}
 };

addons - Copy/RD501_Droids/config.cpp

@@ -28,10 +28,10 @@ class CfgGroups
 		class macro_cis_faction
 		{
 			name="RD501 C.I.S Faction";
-			class Infantry
+			class Fillers
 			{
-				name="Base Infantry Groups";
-				class RD501_Group_INF_B1_12
+				name="Vehicle Fillers";
+				class macro_new_composition(opfor,hmp_filler)
 				{
 					name="HMP Filler";
 					side=0;
@@ -41,30 +41,30 @@ class CfgGroups
 					class Unit0
 					{
 						position[]={0,0,0};
-						rank="CAPTAIN";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_commander);
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
 					};
 					class Unit1
 					{
 						position[]={.5,-.5,0};
-						rank="SERGEANT";
+						rank="CORPORAL";
 						side=0;
 						vehicle=macro_new_unit_class(opfor,B1_shotgun);
 					};
 					class Unit2
 					{
 						position[]={-.5,-.5,0};
-						rank="SERGEANT";
+						rank="CORPORAL";
 						side=0;
 						vehicle=macro_new_unit_class(opfor,B1_heavy);
 					};
 					class Unit3
 					{
 						position[]={1,-1,0};
-						rank="SERGEANT";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_AT);
+						vehicle=macro_new_unit_class(opfor,B1_AT_light);
 					};
 					class Unit4
 					{
@@ -123,7 +123,7 @@ class CfgGroups
 						vehicle=macro_new_unit_class(opfor,B1);
 					};
 				};
-				class RD501_Group_INF_B1_13
+				class macro_new_composition(opfor,lit_filler)
 				{
 					name="L.I.T Filler";
 					side=0;
@@ -133,37 +133,37 @@ class CfgGroups
 					class Unit0
 					{
 						position[]={0,0,0};
-						rank="SERGEANT";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_crew);
+						vehicle=macro_new_unit_class(opfor,B1_shotgun);
 					};
 					class Unit1
 					{
 						position[]={.5,-.5,0};
-						rank="CAPTAIN";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_commander);
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
 					};
 					class Unit2
 					{
 						position[]={-.5,-.5,0};
-						rank="SERGEANT";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_shotgun);
+						vehicle=macro_new_unit_class(opfor,B1_grenadier);
 					};
 					class Unit3
 					{
 						position[]={1,-1,0};
-						rank="SERGEANT";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_heavy);
+						vehicle=macro_new_unit_class(opfor,B1_AT_heavy);
 					};
 					class Unit4
 					{
 						position[]={-1,-1,0};
-						rank="SERGEANT";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_AT);
+						vehicle=macro_new_unit_class(opfor,B1_AT_light);
 					};
 					class Unit5
 					{
@@ -222,7 +222,7 @@ class CfgGroups
 						vehicle=macro_new_unit_class(opfor,B1);
 					};
 				};
-				class RD501_Group_INF_B1_8
+				class macro_new_composition(opfor,trojan_filler)
 				{
 					name="Trojan Filler";
 					side=0;
@@ -232,23 +232,23 @@ class CfgGroups
 					class Unit0
 					{
 						position[]={0,0,0};
-						rank="SERGEANT";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_crew);
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
 					};
 					class Unit1
 					{
 						position[]={.5,-.5,0};
-						rank="CAPTAIN";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_commander);
+						vehicle=macro_new_unit_class(opfor,B1_shotgun);
 					};
 					class Unit2
 					{
 						position[]={-.5,-.5,0};
-						rank="SERGEANT";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_heavy);
+						vehicle=macro_new_unit_class(opfor,B1_AT_light);
 					};
 					class Unit3
 					{
@@ -286,9 +286,13 @@ class CfgGroups
 						vehicle=macro_new_unit_class(opfor,B1);
 					};
 				};
-				class RD501_Group_INF_B1_Squad
+			};
+			class Sections
+			{
+				name="Droid Sections (10-13)"
+				class macro_new_composition(opfor,heavy_assault_section)
 				{
-					name="B1 Squad";
+					name="Heavy Assault Section";
 					side=0;
 					faction = macro_cis_faction
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
@@ -296,58 +300,58 @@ class CfgGroups
 					class Unit0
 					{
 						position[]={0,0,0};
-						rank="CAPTAIN";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_commander);
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
 					};
 					class Unit1
 					{
 						position[]={.5,-.5,0};
-						rank="SERGEANT";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_shotgun);
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
 					};
 					class Unit2
 					{
 						position[]={-.5,-.5,0};
-						rank="SERGEANT";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_AT);
+						vehicle=macro_new_unit_class(opfor,B1_grenadier);
 					};
 					class Unit3
 					{
 						position[]={1,-1,0};
-						rank="SERGEANT";
+						rank="CORPORAL";
 						side=0;
 						vehicle=macro_new_unit_class(opfor,B1_heavy);
 					};
 					class Unit4
 					{
 						position[]={-1,-1,0};
-						rank="SERGEANT";
+						rank="CORPORAL";
 						side=0;
 						vehicle=macro_new_unit_class(opfor,B1_heavy);
 					};
 					class Unit5
 					{
 						position[]={1.5,-1.5,0};
-						rank="SERGEANT";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_AT);
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
 					};
 					class Unit6
 					{
 						position[]={-1.5,-1.5,0};
-						rank="PRIVATE";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1);
+						vehicle=macro_new_unit_class(opfor,B1_AT_heavy);
 					};
 					class Unit7
 					{
 						position[]={2,-2,0};
-						rank="PRIVATE";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1);
+						vehicle=macro_new_unit_class(opfor,B1_AT_light);
 					};
 					class Unit8
 					{
@@ -371,9 +375,9 @@ class CfgGroups
 						vehicle=macro_new_unit_class(opfor,B1);
 					};
 				};
-				class RD501_Group_INF_B1_Team
+				class macro_new_composition(opfor,light_assault_section)
 				{
-					name="B1 Fireteam";
+					name="Light Assault Section";
 					side=0;
 					faction = macro_cis_faction
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
@@ -381,39 +385,1380 @@ class CfgGroups
 					class Unit0
 					{
 						position[]={0,0,0};
-						rank="SERGEANT";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_shotgun);
+						vehicle=macro_new_unit_class(opfor,B1_grenadier);
 					};
 					class Unit1
 					{
 						position[]={.5,-.5,0};
-						rank="PRIVATE";
+						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_AT);
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
 					};
 					class Unit2
 					{
 						position[]={-.5,-.5,0};
-						rank="PRIVATE";
+						rank="CORPORAL";
 						side=0;
 						vehicle=macro_new_unit_class(opfor,B1_heavy);
 					};
 					class Unit3
 					{
 						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AT_light);
+					};
+					class Unit4
+					{
+						position[]={-1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_shotgun);
+					};
+					class Unit5
+					{
+						position[]={1.5,-1.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit6
+					{
+						position[]={-1.5,-1.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit7
+					{
+						position[]={2,-2,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit8
+					{
+						position[]={-2,-2,0};
 						rank="PRIVATE";
 						side=0;
 						vehicle=macro_new_unit_class(opfor,B1);
 					};
+					class Unit9
+					{
+						position[]={2.5,-2.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+				};
+				class macro_new_composition(opfor,weapons_section)
+				{
+					name="Weapons Section";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_grenadier);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_grenadier);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit4
+					{
+						position[]={-1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit5
+					{
+						position[]={1.5,-1.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AT_light);
+					};
+					class Unit6
+					{
+						position[]={-1.5,-1.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AT_heavy);
+					};
+					class Unit7
+					{
+						position[]={2,-2,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_marksman);
+					};
+					class Unit8
+					{
+						position[]={-2,-2,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_marksman);
+					};
+					class Unit9
+					{
+						position[]={2.5,-2.5,0};
+						rank="SERGEANT";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AA);
+					};
+					class Unit10
+					{
+						position[]={-2.5,-2.5,0};
+						rank="SERGEANT";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_shotgun);
+					};
+					class Unit11
+					{
+						position[]={3,-3,0};
+						rank="SERGEANT";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_shotgun);
+					};
+				};
+			};
+			class Squads
+			{
+				name="Droid Squads (6-8)"
+				class macro_new_composition(opfor,heavy_defense_squad)
+				{
+					name="Heavy Defense Squad";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit4
+					{
+						position[]={-1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit5
+					{
+						position[]={1.5,-1.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_marksman);
+					};
+				};
+				class macro_new_composition(opfor,heavy_assault_squad)
+				{
+					name="Heavy Assault Squad";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_grenadier);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
 					class Unit4
 					{
 						position[]={-1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit5
+					{
+						position[]={1.5,-1.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit6
+					{
+						position[]={-1.5,-1.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit7
+					{
+						position[]={2,-2,0};
 						rank="PRIVATE";
 						side=0;
 						vehicle=macro_new_unit_class(opfor,B1);
 					};
 				};
+				class macro_new_composition(opfor,AT_squad)
+				{
+					name="AT Squad";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AT_heavy);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AT_heavy);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AT_light);
+					};
+					class Unit4
+					{
+						position[]={-1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AT_light);
+					};
+					class Unit5
+					{
+						position[]={1.5,-1.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit6
+					{
+						position[]={-1.5,-1.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+				};
+				class macro_new_composition(opfor,AA_squad)
+				{
+					name="AA Squad";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AA);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AA);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit4
+					{
+						position[]={-1,-1,0};
+						rank="PPRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit5
+					{
+						position[]={1.5,-1.5,0};
+						rank="PPRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit6
+					{
+						position[]={-1.5,-1.5,0};
+						rank="PPRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+				};
+				class macro_new_composition(opfor,weapons_squad)
+				{
+					name="Weapons Squad";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AT_heavy);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AT_light);
+					};
+					class Unit4
+					{
+						position[]={-1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_marksman);
+					};
+					class Unit5
+					{
+						position[]={1.5,-1.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_grenadier);
+					};
+					class Unit6
+					{
+						position[]={-1.5,-1.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_shotgun);
+					};
+				};
+				class macro_new_composition(opfor,B1_squad)
+				{
+					name="B1 Squad";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit4
+					{
+						position[]={-1,-1,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit5
+					{
+						position[]={1.5,-1.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit6
+					{
+						position[]={-1.5,-1.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit7
+					{
+						position[]={2,-2,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+				};
+				class macro_new_composition(opfor,B2_squad)
+				{
+					name="B2 Squad";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit4
+					{
+						position[]={-1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit5
+					{
+						position[]={1.5,-1.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+				};
+				class macro_new_composition(opfor,light_defense_squad)
+				{
+					name="Light Defense Squad";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_marksman);
+					};
+					class Unit4
+					{
+						position[]={-1,-1,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit5
+					{
+						position[]={1.5,-1.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit6
+					{
+						position[]={-1.5,-1.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+				};
+				class macro_new_composition(opfor,light_assault_squad)
+				{
+					name="Light Assault Squad";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_grenadier);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit4
+					{
+						position[]={-1,-1,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit5
+					{
+						position[]={1.5,-1.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit6
+					{
+						position[]={-1.5,-1.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+				};
+				class macro_new_composition(opfor,spec_ops_squad)
+				{
+					name="Spec Ops Infiltration Squad";
+					side=0;
+					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);
+					};
+					// should be BX Commando
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					// should be BX Commando
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_prototype);
+					};
+					class Unit4
+					{
+						position[]={-1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_prototype);
+					};
+					class Unit5
+					{
+						position[]={1.5,-1.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_prototype);
+					};
+					class Unit6
+					{
+						position[]={-1.5,-1.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_prototype);
+					};
+					class Unit7
+					{
+						position[]={2,-2,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_prototype);
+					};
+				};
+				class macro_new_composition(opfor,company_command_squad)
+				{
+					name="Company/Battalion Command Squad";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="SERGEANT";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_commander);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="SERGEANT";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_commander);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit4
+					{
+						position[]={-1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,magna_guard_blackop);
+					};
+					class Unit5
+					{
+						position[]={1.5,-1.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,magna_guard_blackop);
+					};
+					class Unit6
+					{
+						position[]={-1.5,-1.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,magna_guard_blackop);
+					};
+					class Unit7
+					{
+						position[]={2,-2,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,magna_guard_blackop);
+					};
+				};
+				class macro_new_composition(opfor,regiment_command_squad)
+				{
+					name="Regiment/Division Command Squad";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					// should be T-Series
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="LIEUTENANT";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="SERGEANT";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_commander);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit4
+					{
+						position[]={-1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,magna_guard_blackop);
+					};
+					class Unit5
+					{
+						position[]={1.5,-1.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,magna_guard_blackop);
+					};
+					class Unit6
+					{
+						position[]={-1.5,-1.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,magna_guard_blackop);
+					};
+					class Unit7
+					{
+						position[]={2,-2,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,magna_guard_blackop);
+					};
+				};
+			};
+			class Teams
+			{
+				name="Droid Teams (3-4)"
+				class macro_new_composition(opfor,heavy_assault_team)
+				{
+					name="Heavy Assault Team";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_grenadier);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+				};
+				class macro_new_composition(opfor,light_assault_team)
+				{
+					name="Light Assault Team";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+				};
+				class macro_new_composition(opfor,super_team)
+				{
+					name="Super Team";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+				};
+				class macro_new_composition(opfor,B1_team)
+				{
+					name="B1 Team";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+				};
+				class macro_new_composition(opfor,cqc_team)
+				{
+					name="CQC Team";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_shotgun);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+				};
+				class macro_new_composition(opfor,AT_team)
+				{
+					name="AT Team";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AT_heavy);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AT_light);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+				};
+				class macro_new_composition(opfor,AA_team)
+				{
+					name="AA Team";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AA);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AA);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+				};
+				class macro_new_composition(opfor,weapons_team)
+				{
+					name="Weapons Team";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_AT_light);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_grenadier);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_shotgun);
+					};
+				};
+				class macro_new_composition(opfor,marksmen_team)
+				{
+					name="Marksmen Team";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_marksman);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_marksman);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+				};
+				class macro_new_composition(opfor,defense_team)
+				{
+					name="Defense Team";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="PRIVATE";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1);
+					};
+				};
+				class macro_new_composition(opfor,light_infiltration_team)
+				{
+					name="Spec Ops Light Infiltration Team";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_prototype);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_prototype);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_prototype);
+					};
+				};
+				class macro_new_composition(opfor,infiltration_team)
+				{
+					name="Spec Ops Infiltration Team";
+					side=0;
+					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);
+					};
+					// should be BX Commando
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_prototype);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_prototype);
+					};
+				};
+				class macro_new_composition(opfor,strike_team)
+				{
+					name="Spec Ops Strike Team";
+					side=0;
+					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);
+					};
+					// should be BX Commando
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					// should be BX Commando
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+				};
+				class macro_new_composition(opfor,company_command_team)
+				{
+					name="Company/Battalion Command Team";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="SERGEANT";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B1_commander);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,magna_guard_blackop);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,magna_guard_blackop);
+					};
+				};
+				class macro_new_composition(opfor,regiment_command_team)
+				{
+					name="Heavy Assault Section";
+					side=0;
+					faction = macro_cis_faction
+					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
+					rarityGroup=1;
+					// should be T-Series
+					class Unit0
+					{
+						position[]={0,0,0};
+						rank="LIEUTENANT";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit1
+					{
+						position[]={.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+					};
+					class Unit2
+					{
+						position[]={-.5,-.5,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,magna_guard_blackop);
+					};
+					class Unit3
+					{
+						position[]={1,-1,0};
+						rank="CORPORAL";
+						side=0;
+						vehicle=macro_new_unit_class(opfor,magna_guard_blackop);
+					};
+				};
 			};
 		};
 	};

addons - Copy/RD501_Droids/droid_macros.hpp

@@ -40,12 +40,19 @@
 #define macro_spec_ops_gun_mag "SWOP_EE4BlasterRifle_Mag"
 #define macro_spec_ops_gun_mags _6(macro_spec_ops_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)
+#define macro_grenade_launcher_grenade "1Rnd_HE_Grenade_shell"
+#define macro_grenade_launcher_grenades _7(macro_grenade_launcher_grenade)
+
 #define macro_thermal_det "swop_termDetDT_G"
 #define macro_thermal_imp "SWOP_BCCKtermimploder_G"
 #define macro_smoke "swop_SmokeShell"
 #define macro_flashbang "swop_mag_flashbang"
 
 #define macro_backpack_jammer "SWOP_B_CARGOBACKPACK"
+#define macro_backpack_eweb macro_new_backpack_class(opfor,eweb_bag_depr)
 
 #define macro_e5_loadout \
 weapons[]={macro_e5,"Throw","Put"};\

addons - Copy/RD501_Main/config_macros.hpp

@@ -128,6 +128,8 @@
 	#define macro_new_unit_class(side,name) MODNAME##_##side##_unit_##name
 	//backpak
 	#define macro_new_backpack_class(side,name)MODNAME##_##side##_##name##_backpack
+	//compositions
+	#define macro_new_composition(side,name) MODNAME##_##side##_composition_##name
 
 	//backpack presets
 	#define macro_b1_at_backpack_inv \

addons - Copy/RD501_Units/config.cpp

@@ -155,11 +155,11 @@ class CfgVehicles
 		displayName = "Droid control backpack (Spec ops)";
 	};
 
-	class macro_new_backpack_class(opfor,eweb_bag): EWEB_Bag
+	class macro_new_backpack_class(opfor,eweb_bag_depr): EWEB_Bag
 	{
 		scope = 2;
-		displayName = "E-WEB Bag";
-		descriptionShort = "E-WEB Bag";
+		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";
@@ -175,7 +175,7 @@ class CfgVehicles
 		};
 	};
 	
-	class macro_new_backpack_class(blufor,eweb_bag): macro_new_backpack_class(opfor,eweb_bag)
+	class macro_new_backpack_class(blufor,eweb_bag): EWEB_Bag
 	{
 		scope = 2;
 		displayName = "[PROTOTYPE] E-WEB Cannon Bag";
@@ -222,52 +222,4 @@ class CfgVehicles
 	// };
 
 	#include "_backpacks/legacy_backpacks.hpp"
-};
-
-class CfgGroups 
-{
-    class EAST 
-	{
-        class macro_cis_faction 
-		{
-            name = "RD501 C.I.S Faction";
-            class Infantry 
-			{
-                name = "Infantry";
-                class infantry_spec_ops_droid 
-				{
-                    name = "Spec Ops Fireteam";
-                    side = 0;
-                    faction = macro_cis_faction;
-                    icon = "\A3\ui_f\data\map\markers\nato\o_inf.paa";
-                    rarityGroup = 0.5;
-                    class Unit0 {
-                        position[] = {0,0,0};
-                        rank = "SERGEANT";
-                        side = 0;
-                        vehicle = macro_new_unit_class(opfor,B1_spec_op);
-                    };
-                    class Unit1 {
-                        position[] = {5,-5,0};
-                        rank = "PRIVATE";
-                        side = 0;
-                        vehicle = macro_new_unit_class(opfor,B1_spec_op);
-                    };
-                    class Unit2 {
-                        position[] = {-5,-5,0};
-                        rank = "PRIVATE";
-                        side = 0;
-                        vehicle = macro_new_unit_class(opfor,B1_spec_op);
-                    };
-                    class Unit3 {
-                        position[] = {10,-10,0};
-                        rank = "PRIVATE";
-                        side = 0;
-                        vehicle = macro_new_unit_class(opfor,B1_spec_op);
-                    };
-                };
-              
-			};
-		};
-	};
- };
+};

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

@@ -36,7 +36,7 @@ class CfgPatches
 			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),
+			macro_new_unit_class(opfor,B1_E_Web_depr),
 			macro_new_unit_class(opfor,B1_Aqua),
 			macro_new_unit_class(opfor,B1_Heavy_Aqua)
 		};
@@ -127,15 +127,15 @@ class CfgVehicles
 	#include "b1_at_unit.hpp"
 	#include "b1_aa_unit.hpp"
 
-	class macro_new_unit_class(opfor,B1_E_Web): SWOP_CIS_B1_Base
+	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)
-		displayName = "B1 Gunner (E-Web)";
+		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";