fix b1 texture and teams

addons - Copy/RD501_Droids/B1/config.cpp

@@ -17,15 +17,20 @@ class CfgPatches
 			macro_new_unit_class(opfor,B1_green),
 			macro_new_unit_class(opfor,B1_red),
 			macro_new_unit_class(opfor,B1_yellow),
+			macro_new_unit_class(opfor,B1_blue),
 			macro_new_unit_class(opfor,B1_heavy),
-			macro_new_unit_class(opfor,B1_maaws),
+			macro_new_unit_class(opfor,B1_AT),
 			macro_new_unit_class(opfor,B1_marksmen),
+			macro_new_unit_class(opfor,B1_shotgun),
+			macro_new_unit_class(opfor,B1_leader),
+			macro_new_unit_class(opfor,B1_Medic),
+			macro_new_unit_class(opfor,B1_Pilot),
 		};
 		weapons[] = {
 			macro_new_uniform_class(opfor,B1),
 			macro_new_uniform_class(opfor,B1_red),
 			macro_new_uniform_class(opfor,B1_yellow),
-			macro_new_uniform_class(opfor,B1_green)
+			macro_new_uniform_class(opfor,B1_green),
 		};
 	};
 };
@@ -157,7 +162,7 @@ class CfgVehicles
 
 		hiddenSelections[] = {"camo1"};
 		hiddenSelectionsTextures[] = {
-			macro_b1_textures\Droid.paa
+			macro_b1_textures\b1_co.paa
 		};
 		uniformClass=macro_new_uniform_class(opfor,B1);
 
@@ -543,7 +548,7 @@ class CfgVehicles
 	{
 		displayName="B1 Battledroid Green";
 		hiddenSelectionsTextures[] = {
-			macro_b1_textures\Green.paa
+			macro_b1_textures\b1_crew_co.paa
 		};
 		uniformClass=macro_new_uniform_class(opfor,B1_green);
 	};
@@ -551,7 +556,7 @@ class CfgVehicles
 	{
 		displayName="B1 Battledroid Red";
 		hiddenSelectionsTextures[] = {
-			macro_b1_textures\Red.paa
+			macro_b1_textures\b1_security_co.paa
 		};
 		uniformClass=macro_new_uniform_class(opfor,B1_red);
 	};
@@ -559,7 +564,7 @@ class CfgVehicles
 	{
 		displayName="B1 Battledroid Yellow";
 		hiddenSelectionsTextures[] = {
-			macro_b1_textures\Yellow.paa
+			macro_b1_textures\b1_commander_co.paa
 		};
 		uniformClass=macro_new_uniform_class(opfor,B1_yellow);
 	};
@@ -567,7 +572,7 @@ class CfgVehicles
 	{
 		displayName="B1 Battledroid Blue";
 		hiddenSelectionsTextures[] = {
-			macro_b1_textures\Blue.paa
+			macro_b1_textures\b1_pilot_co.paa
 		};
 		uniformClass=macro_new_uniform_class(opfor,B1_blue);
 	};
@@ -609,15 +614,15 @@ class CfgVehicles
 	};
 	class macro_new_unit_class(opfor,B1_AT): macro_new_unit_class(opfor,B1_red)
 	{
-		displayName="B1 Battledroid AT";
+		displayName="B1 Battledroid (AT)";
 		weapons[]=
 		{
-			"SWOP_E5",
+			"JLTS_E5",
 			"JLTS_E60R_AT"
 		};
 		respawnWeapons[]=
 		{
-			"SWOP_E5",
+			"JLTS_E5",
 			"JLTS_E60R_AT"
 		};
 		magazines[]=
@@ -652,7 +657,7 @@ class CfgVehicles
 		};
 		backpack="\MRC\JLTS\characters\DroidArmor\DroidBackpackB1.p3d"
 	};
-	class macro_new_unit_class(opfor,B1_marksmen): macro_new_unit_class(opfor,B1_red)
+	class macro_new_unit_class(opfor,B1_marksmen): macro_new_unit_class(opfor,B1_green)
 	{
 		displayName="B1 Battledroid (Marksman)";
 		weapons[]=
@@ -690,9 +695,9 @@ class CfgVehicles
 			"JLTS_E5S_mag"
 		};
 	};
-	class macro_new_unit_class(opfor,B1_team_leader): macro_new_unit_class(opfor,B1)
+	class macro_new_unit_class(opfor,B1_shotgun): macro_new_unit_class(opfor,B1_red)
 	{
-		displayName="B1 Battledroid Team Lead";
+		displayName="B1 Battledroid (Shotgun)";
 		weapons[]=
 		{
 			"swop_CISShotgun"
@@ -759,7 +764,7 @@ class CfgVehicles
 	};
 	class macro_new_unit_class(opfor,B1_Medic): macro_new_unit_class(opfor,B1_green)
 	{
-		displayName="B1 Battledroid Squad Lead";
+		displayName="B1 Battledroid Medic";
 		weapons[]=
 		{
 			"JLTS_RG4D"
@@ -794,5 +799,42 @@ class CfgVehicles
 		};
 		uniformClass=macro_new_uniform_class(opfor, B1_green);
 	};
+	class macro_new_unit_class(opfor,B1_Pilot): macro_new_unit_class(opfor,B1_blue)
+	{
+		displayName="B1 Battledroid (Pilot)";
+		weapons[]=
+		{
+			"JLTS_RG4D"
+		};
+		respawnWeapons[]=
+		{
+			"JLTS_RG4D"
+		};
+		magazines[]=
+		{
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"FirstAidKit",
+			"FirstAidKit",
+			"FirstAidKit"
+		};
+		respawnMagazines[]=
+		{
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"JLTS_E5_mag",
+			"FirstAidKit",
+			"FirstAidKit",
+			"FirstAidKit"
+		};
+		uniformClass=macro_new_uniform_class(opfor, B1_blue);
+	};
 
 };

addons - Copy/RD501_Droids/config.cpp

@@ -28,7 +28,7 @@ class CfgGroups
 			class Infantry
 			{
 				name="Base Infantry Groups";
-				class RD501_Group_INF_LPB1_12
+				class RD501_Group_INF_B1_12
 				{
 					name="HMP Filler";
 					side=0;
@@ -38,30 +38,30 @@ class CfgGroups
 					class Unit0
 					{
 						position[]={0,0,0};
-						rank="SERGEANT";
+						rank="CAPTAIN";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_red);
+						vehicle=macro_new_unit_class(opfor,B1_leader);
 					};
 					class Unit1
 					{
 						position[]={.5,-.5,0};
 						rank="SERGEANT";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_red);
+						vehicle=macro_new_unit_class(opfor,B1_shotgun);
 					};
 					class Unit2
 					{
 						position[]={-.5,-.5,0};
-						rank="PRIVATE";
+						rank="SERGEANT";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1);
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
 					};
 					class Unit3
 					{
 						position[]={1,-1,0};
-						rank="PRIVATE";
+						rank="SERGEANT";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1);
+						vehicle=macro_new_unit_class(opfor,B1_AT);
 					};
 					class Unit4
 					{
@@ -120,9 +120,9 @@ class CfgGroups
 						vehicle=macro_new_unit_class(opfor,B1);
 					};
 				};
-				class RD501_Group_INF_LPB1_13
+				class RD501_Group_INF_B1_13
 				{
-					name="Low Poly L.I.T Filler";
+					name="L.I.T Filler";
 					side=0;
 					faction = macro_cis_faction
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
@@ -130,37 +130,37 @@ class CfgGroups
 					class Unit0
 					{
 						position[]={0,0,0};
-						rank="SERGEANT";
+						rank="CAPTAIN";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_red);
+						vehicle=macro_new_unit_class(opfor,B1_Pilot);
 					};
 					class Unit1
 					{
 						position[]={.5,-.5,0};
-						rank="SERGEANT";
+						rank="CAPTAIN";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_red);
+						vehicle=macro_new_unit_class(opfor,B1_leader);
 					};
 					class Unit2
 					{
 						position[]={-.5,-.5,0};
-						rank="PRIVATE";
+						rank="SERGEANT";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1);
+						vehicle=macro_new_unit_class(opfor,B1_shotgun);
 					};
 					class Unit3
 					{
 						position[]={1,-1,0};
-						rank="PRIVATE";
+						rank="SERGEANT";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1);
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
 					};
 					class Unit4
 					{
 						position[]={-1,-1,0};
-						rank="PRIVATE";
+						rank="SERGEANT";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1);
+						vehicle=macro_new_unit_class(opfor,B1_AT);
 					};
 					class Unit5
 					{
@@ -219,9 +219,9 @@ class CfgGroups
 						vehicle=macro_new_unit_class(opfor,B1);
 					};
 				};
-				class RD501_Group_INF_LPB1_8
+				class RD501_Group_INF_B1_8
 				{
-					name="Low Poly Marid Filler";
+					name="Trojan Filler";
 					side=0;
 					faction = macro_cis_faction
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
@@ -229,23 +229,23 @@ class CfgGroups
 					class Unit0
 					{
 						position[]={0,0,0};
-						rank="SERGEANT";
+						rank="CAPTAIN";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1);
+						vehicle=macro_new_unit_class(opfor,B1_Pilot);
 					};
 					class Unit1
 					{
 						position[]={.5,-.5,0};
-						rank="SERGEANT";
+						rank="CAPTAIN";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_red);
+						vehicle=macro_new_unit_class(opfor,B1_leader);
 					};
 					class Unit2
 					{
 						position[]={-.5,-.5,0};
-						rank="PRIVATE";
+						rank="SERGEANT";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1);
+						vehicle=macro_new_unit_class(opfor,B1_heavy);
 					};
 					class Unit3
 					{
@@ -283,9 +283,9 @@ class CfgGroups
 						vehicle=macro_new_unit_class(opfor,B1);
 					};
 				};
-				class RD501_Group_INF_LPB1_Squad
+				class RD501_Group_INF_B1_Squad
 				{
-					name="Low Poly Squad";
+					name="B1 Squad";
 					side=0;
 					faction = macro_cis_faction
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
@@ -295,40 +295,40 @@ class CfgGroups
 						position[]={0,0,0};
 						rank="CAPTAIN";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_team_leader);
+						vehicle=macro_new_unit_class(opfor,B1_leader);
 					};
 					class Unit1
 					{
 						position[]={.5,-.5,0};
 						rank="SERGEANT";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_team_leader);
+						vehicle=macro_new_unit_class(opfor,B1_shotgun);
 					};
 					class Unit2
 					{
 						position[]={-.5,-.5,0};
 						rank="SERGEANT";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1);
+						vehicle=macro_new_unit_class(opfor,B1_AT);
 					};
 					class Unit3
 					{
 						position[]={1,-1,0};
-						rank="PRIVATE";
+						rank="SERGEANT";
 						side=0;
 						vehicle=macro_new_unit_class(opfor,B1_heavy);
 					};
 					class Unit4
 					{
 						position[]={-1,-1,0};
-						rank="PRIVATE";
+						rank="SERGEANT";
 						side=0;
 						vehicle=macro_new_unit_class(opfor,B1_heavy);
 					};
 					class Unit5
 					{
 						position[]={1.5,-1.5,0};
-						rank="PRIVATE";
+						rank="SERGEANT";
 						side=0;
 						vehicle=macro_new_unit_class(opfor,B1_AT);
 					};
@@ -337,7 +337,7 @@ class CfgGroups
 						position[]={-1.5,-1.5,0};
 						rank="PRIVATE";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_AT);
+						vehicle=macro_new_unit_class(opfor,B1);
 					};
 					class Unit7
 					{
@@ -368,9 +368,9 @@ class CfgGroups
 						vehicle=macro_new_unit_class(opfor,B1);
 					};
 				};
-				class RD501_Group_INF_LPB1_Team
+				class RD501_Group_INF_B1_Team
 				{
-					name="Low Poly Fireteam";
+					name="B1 Fireteam";
 					side=0;
 					faction = macro_cis_faction
 					icon="\A3\ui_f\data\map\markers\nato\o_inf.paa";
@@ -380,7 +380,7 @@ class CfgGroups
 						position[]={0,0,0};
 						rank="SERGEANT";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B1_team_leader);
+						vehicle=macro_new_unit_class(opfor,B1_shotgun);
 					};
 					class Unit1
 					{
@@ -411,20 +411,19 @@ class CfgGroups
 						vehicle=macro_new_unit_class(opfor,B1);
 					};
 				};
-				name = "Droid Teams (3-4 droids)";
-				class RD501_Group_INF_HAT
+				class RD501_Group_INF_B1_HAT
 				{
 					name = "Heavy Asault Team";
 					side = 0;
 					faction = macro_cis_faction
-						icon = "\a3\ui_f\data\map\markers\nato\o_inf.paa";
+					icon = "\a3\ui_f\data\map\markers\nato\o_inf.paa";
 					rarityGroup = 1;
 					class Unit0
 					{
 						position[] = { 0,0,0 };
-						rank = "SERGEANT";
+						rank = "CAPTAIN";
 						side = 0;
-						vehicle = macro_new_unit_class(opfor, B1);
+						vehicle = macro_new_unit_class(opfor, B1_heavy);
 					};
 				};
 			};

addons - Copy/RD501_Main/config_macros.hpp

@@ -235,7 +235,7 @@
 //---textures
 	#define macro_unit_skin_textures RD501_Units\textures
 	#define macro_vehicle_textures RD501_Vehicles\textures
-	#define macro_b1_textures JPB_Player\Model\data
+	#define macro_b1_textures MRC\JLTS\characters\DroidArmor\data
 
 
 //---XEH prep---