Merge branch 'klinger/project-landing-pad-fixes' of 501st-Aux-Team/501st-Aux-Mod into master

addons/RD501_Helmets/config.cpp

@@ -109,10 +109,10 @@ class CfgWeapons
 		ace_hearing_protection = 0.85; 		
 		ace_hearing_lowerVolume = 0;    
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
-		displayName = "[501st] BARC HELM (Base)";
+		displayName = "[501st] INF MED HELM 06 (CM-C)";
 		picture = "\MRC\JLTS\characters\CloneArmor2\data\ui\CloneHelmetBARC_ui_ca.paa";
         hiddenSelections[] = {"camo1"};
-        hiddenSelectionsTextures[] = {"MRC\JLTS\characters\CloneArmor2\data\Clone_helmet_BARC_co.paa"};
+        hiddenSelectionsTextures[] = {"\RD501_Helmets\_textures\jlts\inf\cm_c_barc_helmet.paa"};
         model = "\MRC\JLTS\characters\CloneArmor2\CloneHelmetBARC.p3d";
         hiddenSelectionsMaterials[]= {"mrc\jlts\characters\clonearmor2\data\clone_helmet_barc.rvmat"};
 		class ItemInfo: HeadgearItem
@@ -249,41 +249,6 @@ class CfgWeapons
 			};
 		};
 	};
-	class macro_new_helmet(infantry,p1_trooper): H_HelmetB
-	{
-		scope = 2;
-		scopeArsenal = 2;
-		author = "RD501";
-		weaponPoolAvailable = 1;       
-		ace_hearing_protection = 0.85; 		
-		ace_hearing_lowerVolume = 0;   
-		subItems[] = {"G_B_Diving","ItemcTabHCam"};
-		displayName = "[501st] INF P1 HELM 01";
-		picture = "3AS\3AS_Characters\Clones\Headgear\ui\phase1_ui_ca.paa";
-		model = "\3AS\3AS_Characters\Clones\Headgear\3AS_Clone_Standard_P1.p3d";
-		hiddenSelections[] = {"camo"};
-		hiddenSelectionsTextures[] = {"3AS\3AS_Characters\Clones\Headgear\Textures\Phase1\Phase1_Unmarked_CO.paa"};
-		class ItemInfo: HeadgearItem
-		{
-			mass = 30;
-			uniformModel = "\3AS\3AS_Characters\Clones\Headgear\3AS_Clone_Standard_P1.p3d";
-			hiddenSelections[] = {"camo"};
-			modelSides[] = {3,1};
-			material = -1;
-			explosionShielding = 2.2;
-			minimalHit = 0.01;
-			passThrough = 0.01;
-			class HitpointsProtectionInfo
-			{
-				class Head
-				{
-					hitpointName = "HitHead";
-					armor = 50;
-					passThrough = 0.5;
-				};
-			};
-		};
-	};
 	class macro_new_helmet(infantry,jlts_trooper) : H_HelmetB
 	{
 		scope = 2;
@@ -501,11 +466,11 @@ class CfgWeapons
 		ace_hearing_protection = 0.85; 		
 		ace_hearing_lowerVolume = 0;   
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
-		displayName = "[501st] INF HELM LS 01 (Base)";
+		displayName = "[501st] INF RTO HELM 01 (Alt)";
 		model = "SWLB_CEE\data\SWLB_P2_SpecOps_Helmet.p3d";
         picture="\MRC\JLTS\characters\CloneArmor\data\ui\CloneHelmetP2_ui_ca.paa";
 		hiddenSelections[] = {"Camo1"};
-		hiddenSelectionsTextures[] = {"swlb_cee\data\SWLB_P2_SpecOps_CO.paa"};
+		hiddenSelectionsTextures[] = {"\RD501_Helmets\_textures\LS\rto_alt_helmet.paa"};
 		hiddenSelectionsMaterials[]= {"swlb_cee\data\SWLB_P2_SpecOps.rvmat"};
 		class ItemInfo: HeadgearItem
 		{
@@ -538,9 +503,9 @@ class CfgWeapons
 		ace_hearing_protection = 0.85; 		
 		ace_hearing_lowerVolume = 0;   
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
-		displayName = "[501st] INF SNOW HELM 01";
+		displayName = "[501st] INF SNOW HELM 01 (Trooper)";
         hiddenSelections[] = {"Helmet"};
-		hiddenSelectionsTextures[] = {"armor_unit\21\helmet\21_Helmet_co.paa"};
+		hiddenSelectionsTextures[] = {"\RD501_Helmets\_textures\LF\snow_trooper_helmet.paa"};
         hiddenSelectionsMaterials[]= {"armor_unit\21\helmet\helm.rvmat"};
 		model = "\armor_unit\21\HelmetP2_21.p3d";
         picture="\MRC\JLTS\characters\CloneArmor\data\ui\CloneHelmetP2_ui_ca.paa";
@@ -566,8 +531,13 @@ class CfgWeapons
 			};
 		};
 	};
+	class macro_new_helmet(infantry,snow_nco) : macro_new_helmet(infantry,lf_base)
+	{
+		displayName = "[501st] INF SNOW HELM 02 (NCO)";
+		hiddenSelectionsTextures[] = {"\RD501_Helmets\_textures\LF\snow_nco_helmet.paa"};
+	};
     //3as
-    class macro_new_helmet(infantry,3AS_base) : 3as_P1_Base
+    class macro_new_helmet(infantry,p1_trooper): H_HelmetB
 	{
 		scope = 2;
 		scopeArsenal = 2;
@@ -576,18 +546,52 @@ class CfgWeapons
 		ace_hearing_protection = 0.85; 		
 		ace_hearing_lowerVolume = 0;   
 		subItems[] = {"G_B_Diving","ItemcTabHCam"};
-		displayName = "[501st] INF HELM 3AS P1 01 (base)";
-        hiddenSelections[] = {"Camo1"};
+		displayName = "[501st] INF P1 HELM 01 (Trooper)";
+		picture = "3AS\3AS_Characters\Clones\Headgear\ui\phase1_ui_ca.paa";
+		model = "\3AS\3AS_Characters\Clones\Headgear\3AS_Clone_Standard_P1.p3d";
+		hiddenSelections[] = {"camo"};
 		hiddenSelectionsTextures[] = {"3AS\3AS_Characters\Clones\Headgear\Textures\Phase1\Phase1_Unmarked_CO.paa"};
+		class ItemInfo: HeadgearItem
+		{
+			mass = 30;
+			uniformModel = "\3AS\3AS_Characters\Clones\Headgear\3AS_Clone_Standard_P1.p3d";
+			hiddenSelections[] = {"camo"};
+			modelSides[] = {3,1};
+			material = -1;
+			explosionShielding = 2.2;
+			minimalHit = 0.01;
+			passThrough = 0.01;
+			class HitpointsProtectionInfo
+			{
+				class Head
+				{
+					hitpointName = "HitHead";
+					armor = 50;
+					passThrough = 0.5;
+				};
+			};
+		};
+	};
+	class macro_new_helmet(infantry,p1_trooper_nco): macro_new_helmet(infantry,p1_trooper)
+	{
+		scope = 2;
+		scopeArsenal = 2;
+		author = "RD501";
+		weaponPoolAvailable = 1;       
+		ace_hearing_protection = 0.85; 		
+		ace_hearing_lowerVolume = 0;   
+		subItems[] = {"G_B_Diving","ItemcTabHCam"};
+		displayName = "[501st] INF P1 HELM 02 (NCO)";
+		picture = "3AS\3AS_Characters\Clones\Headgear\ui\phase1_ui_ca.paa";
 		model = "\3AS\3AS_Characters\Clones\Headgear\3AS_Clone_Standard_P1.p3d";
-        picture="\MRC\JLTS\characters\CloneArmor\data\ui\CloneHelmetP2_ui_ca.paa";
-        hiddenSelectionsMaterials[]= {"3AS\3AS_Characters\Clones\Headgear\Textures\Phase1\Phase1.rvmat"};
+		hiddenSelections[] = {"camo"};
+		hiddenSelectionsTextures[] = {"\RD501_Helmets\_textures\3AS\p1_nco_helmet.paa"};
 		class ItemInfo: HeadgearItem
 		{
 			mass = 30;
 			uniformModel = "\3AS\3AS_Characters\Clones\Headgear\3AS_Clone_Standard_P1.p3d";
-			modelSides[] = {6};
-			hiddenSelections[] = {"Camo1"};
+			hiddenSelections[] = {"camo"};
+			modelSides[] = {3,1};
 			material = -1;
 			explosionShielding = 2.2;
 			minimalHit = 0.01;
@@ -598,7 +602,7 @@ class CfgWeapons
 				{
 					hitpointName = "HitHead";
 					armor = 50;
-					passThrough = 0.6;
+					passThrough = 0.5;
 				};
 			};
 		};

addons/RD501_Helmets/infantry/config.cpp

@@ -208,13 +208,8 @@ class CfgWeapons
 	NEW_501_ARC_Helm_JLTS(Scruff,Scruff,Scruff.paa)
 	NEW_501_ARC_Helm_JLTS(Dalton,Dalton,Dalton.paa)
 	NEW_501_ARC_Helm_JLTS(Blythe,Blythe,Blythe.paa)
-    NEW_501_Inf_Helm_LS(RTO_Alt,INF RTO HELM 01 (Alt),rto_alt_helmet.paa)
-    NEW_501_Inf_Helm_LF(Snow_NCO,INF SNOW HELM 02,snow_nco_helmet.paa)
-    NEW_501_Inf_Helm_LF(Snow_CT,INF SNOW HELM 01,snow_trooper_helmet.paa)
-    NEW_501_Inf_Helm_3AS(P1_NCO,INF P1 HELM 02,p1_nco_helmet.paa)
-    NEW_501_Inf_Helm_JLTS2(CMC_03,INF HELM 03 (CM-C),cm_c_trooper_helmet.paa)
-    NEW_501_Inf_Helm_JLTS2(CM_03,INF HELM 03 (CM),cm_trooper_helmet.paa)
-    NEW_501_BARC_Helm_JLTS(BARC_CMC,INF HELM 06 (CM-C),cm_barc_helmet.paa)
-    NEW_501_BARC_Helm_JLTS(BARC_CM,INF HELM 06 (CM),cm_c_barc_helmet.paa)
+    NEW_501_Inf_Helm_JLTS2(CMC_03,CM-C,cm_c_trooper_helmet.paa)
+    NEW_501_Inf_Helm_JLTS2(CM_03,CM,cm_trooper_helmet.paa)
+    NEW_501_BARC_Helm_JLTS(BARC_CMC,CM,cm_barc_helmet.paa)
 	NEW_501_ARC_Helm_JLTS(Aeon,Aeon,Aeon.paa)
 };

addons/RD501_Helmets/infantry/config_macros.cpp

@@ -48,7 +48,7 @@
 		class macro_new_helmet(arc,classname) : macro_new_helmet(barc,base_jlts)\
 		{\
 			scope = 2;\
-			displayName = [501st] BARC HELM ('##displayname##');\
+			displayName = [501st] INF MED HELM 06 (##displayname##);\
 			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\jlts\inf\##texture};\
 		};
 
@@ -74,7 +74,7 @@
 		class macro_new_helmet(infantry,classname) : macro_new_helmet(infantry,ls_base)\
 		{\
 			scope = 2;\
-			displayName = Clonetrooper helmet (501st '##displayname##');\
+			displayName = [501st] INF RTO HELM ('##displayname##');\
 			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\LS\##texture};\
 		};
 //LF helms
@@ -82,7 +82,7 @@
 		class macro_new_helmet(infantry,classname) : macro_new_helmet(infantry,lf_base)\
 		{\
 			scope = 2;\
-			displayName = Clonetrooper helmet (501st '##displayname##');\
+			displayName = [501st] INF SNOW HELM (##displayname##);\
 			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\LF\##texture};\
 		};
 //3AS helms
@@ -98,6 +98,6 @@
 		class macro_new_helmet(infantry,classname) : macro_new_helmet(infantry,jlts_recruit)\
 		{\
 			scope = 2;\
-			displayName = [501st] INF HELM ('##displayname##');\
+			displayName = [501st] INF MED HELM 03 (##displayname##);\
 			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\jlts\inf\##texture};\
 		};

addons/RD501_Units/other/config.cpp

@@ -80,4 +80,152 @@ class CfgGlasses
 		picture = "\RD501_Units\textures\icons\no_green.paa";
 		ace_color[] = {0.0,-100.0,0.0};
 	};
+	class 501st_inf_acc_01_a
+	{
+		ACE_Overlay = "RD501_Units\textures\glasses\phase2.paa";
+		ACE_OverlayCracked = "RD501_Units\textures\glasses\phase2crack.paa";
+		ace_overlayDirt = "RD501_Units\textures\glasses\phase2dirt.paa";
+		ACE_Resistance = 2;
+		displayname = "[501st] INF ACC 01 A";
+		identityTypes[] = {};
+		mass = 4;
+		model = "\MRC\JLTS\characters\CloneArmor\CloneVestRecon.p3d";
+		hiddenSelections[] = {"camo1"};
+		hiddenSelectionsTextures[] = {TEXTUREPATH\Republic\clones\Infantry\acc\sr_nco_acc.paa};
+		name = "None";
+		scope = 2;
+		picture = "\MRC\JLTS\characters\CloneArmor\data\ui\CloneVestHeavy_ui_ca.paa";
+	};
+	class 501st_inf_acc_01_b
+	{
+		ACE_Overlay = "RD501_Units\textures\glasses\phase2.paa";
+		ACE_OverlayCracked = "RD501_Units\textures\glasses\phase2crack.paa";
+		ace_overlayDirt = "RD501_Units\textures\glasses\phase2dirt.paa";
+		ACE_Resistance = 2;
+		displayname = "[501st] INF ACC 01 B";
+		identityTypes[] = {};
+		mass = 4;
+		model = "\MRC\JLTS\characters\CloneArmor\CloneVestSuspender.p3d";
+		hiddenSelections[] = {"camo1"};
+		hiddenSelectionsMaterials[]= {"\MRC\JLTS\characters\CloneArmor\data\Clone_vest_suspender.rvmat","\MRC\JLTS\characters\CloneArmor\data\Clone_vest_suspender_cloth.rvmat"};
+		hiddenSelectionsTextures[] = {"\MRC\JLTS\characters\CloneArmor\data\Clone_vest_suspender_co.paa"};
+		name = "None";
+		scope = 2;
+		picture = "\MRC\JLTS\characters\CloneArmor\data\ui\CloneVestSuspender_ui_ca.paa";
+	};
+	class 501st_inf_acc_01_c
+	{
+		ACE_Overlay = "RD501_Units\textures\glasses\phase2.paa";
+		ACE_OverlayCracked = "RD501_Units\textures\glasses\phase2crack.paa";
+		ace_overlayDirt = "RD501_Units\textures\glasses\phase2dirt.paa";
+		ACE_Resistance = 2;
+		displayname = "[501st] INF ACC 01 C";
+		identityTypes[] = {};
+		mass = 4;
+		model = "\MRC\JLTS\characters\CloneArmor\CloneVestAirborne.p3d";
+		hiddenSelections[] = {"camo1","camo2"};
+		hiddenSelectionsTextures[] = {"", TEXTUREPATH\Republic\clones\Infantry\acc\trooper_heavy_acc.paa};
+		hiddenSelectionsMaterials[]= {""};
+		name = "None";
+		scope = 2;
+		picture = "\MRC\JLTS\characters\CloneArmor\data\ui\CloneVestHeavy_ui_ca.paa";
+	};
+	class 501st_inf_acc_01_c_medic
+	{
+		ACE_Overlay = "RD501_Units\textures\glasses\phase2.paa";
+		ACE_OverlayCracked = "RD501_Units\textures\glasses\phase2crack.paa";
+		ace_overlayDirt = "RD501_Units\textures\glasses\phase2dirt.paa";
+		ACE_Resistance = 2;
+		displayname = "[501st] INF ACC 01 C (Medic)";
+		identityTypes[] = {};
+		mass = 4;
+		model = "\MRC\JLTS\characters\CloneArmor\CloneVestAirborne.p3d";
+		hiddenSelections[] = {"camo1","camo2"};
+		hiddenSelectionsTextures[] = {"",TEXTUREPATH\Republic\clones\Infantry\acc\medic_heavy_acc.paa};
+		hiddenSelectionsMaterials[]= {""};
+		name = "None";
+		scope = 2;
+		picture = "\MRC\JLTS\characters\CloneArmor\data\ui\CloneVestHeavy_ui_ca.paa";
+	};
+	class 501st_inf_acc_01_c_rto
+	{
+		ACE_Overlay = "RD501_Units\textures\glasses\phase2.paa";
+		ACE_OverlayCracked = "RD501_Units\textures\glasses\phase2crack.paa";
+		ace_overlayDirt = "RD501_Units\textures\glasses\phase2dirt.paa";
+		ACE_Resistance = 2;
+		displayname = "[501st] INF ACC 01 C (RTO)";
+		identityTypes[] = {};
+		mass = 4;
+		model = "\MRC\JLTS\characters\CloneArmor\CloneVestAirborne.p3d";
+		hiddenSelections[] = {"camo1","camo2"};
+		hiddenSelectionsTextures[] = {"",TEXTUREPATH\Republic\clones\Infantry\acc\rto_heavy_acc.paa};
+		hiddenSelectionsMaterials[]= {""};
+		name = "None";
+		scope = 2;
+		picture = "\MRC\JLTS\characters\CloneArmor\data\ui\CloneVestHeavy_ui_ca.paa";
+	};
+	class 501st_inf_acc_02
+	{
+		ACE_Overlay = "RD501_Units\textures\glasses\phase2.paa";
+		ACE_OverlayCracked = "RD501_Units\textures\glasses\phase2crack.paa";
+		ace_overlayDirt = "RD501_Units\textures\glasses\phase2dirt.paa";
+		ACE_Resistance = 2;
+		displayname = "[501st] INF ACC 02";
+		identityTypes[] = {};
+		mass = 4;
+		model = "\MRC\JLTS\characters\CloneArmor\CloneVestReconNCO.p3d";
+		hiddenSelections[] = {"Camo1"};
+		hiddenSelectionsTextures[] = {"MRC\JLTS\characters\CloneArmor\data\Clone_vest_heavy_co.paa"};
+		name = "None";
+		scope = 2;
+		picture = "\MRC\JLTS\characters\CloneArmor\data\ui\CloneVestHeavy_ui_ca.paa";
+	};
+	class 501st_inf_acc_03
+	{
+		ACE_Overlay = "RD501_Units\textures\glasses\phase2.paa";
+		ACE_OverlayCracked = "RD501_Units\textures\glasses\phase2crack.paa";
+		ace_overlayDirt = "RD501_Units\textures\glasses\phase2dirt.paa";
+		ACE_Resistance = 2;
+		displayname = "[501st] INF ACC 03";
+		identityTypes[] = {};
+		mass = 4;
+		model = "\MRC\JLTS\characters\CloneArmor\CloneVestReconNCO.p3d";
+		hiddenSelections[] = {"camo2"};
+		hiddenSelectionsTextures[] = {TEXTUREPATH\Republic\clones\Infantry\acc\sr_nco_acc.paa};
+		name = "None";
+		scope = 2;
+		picture = "\MRC\JLTS\characters\CloneArmor\data\ui\CloneVestHeavy_ui_ca.paa";
+	};
+	class 501st_inf_acc_03_b
+	{
+		ACE_Overlay = "RD501_Units\textures\glasses\phase2.paa";
+		ACE_OverlayCracked = "RD501_Units\textures\glasses\phase2crack.paa";
+		ace_overlayDirt = "RD501_Units\textures\glasses\phase2dirt.paa";
+		ACE_Resistance = 2;
+		displayname = "[501st] INF ACC 03 Medic";
+		identityTypes[] = {};
+		mass = 4;
+		model = "\MRC\JLTS\characters\CloneArmor\CloneVestReconNCO.p3d";
+		hiddenSelections[] = {"camo2"};
+		hiddenSelectionsTextures[] = {TEXTUREPATH\Republic\clones\Infantry\acc\inf_medic_nco.paa};
+		name = "None";
+		scope = 2;
+		picture = "\MRC\JLTS\characters\CloneArmor\data\ui\CloneVestHeavy_ui_ca.paa";
+	};
+	class 501st_inf_acc_03_c
+	{
+		ACE_Overlay = "RD501_Units\textures\glasses\phase2.paa";
+		ACE_OverlayCracked = "RD501_Units\textures\glasses\phase2crack.paa";
+		ace_overlayDirt = "RD501_Units\textures\glasses\phase2dirt.paa";
+		ACE_Resistance = 2;
+		displayname = "[501st] INF ACC 03 RTO ";
+		identityTypes[] = {};
+		mass = 4;
+		model = "\MRC\JLTS\characters\CloneArmor\CloneVestReconNCO.p3d";
+		hiddenSelections[] = {"camo2"};
+		hiddenSelectionsTextures[] = {TEXTUREPATH\Republic\clones\Infantry\acc\inf_rto_nco.paa};
+		name = "None";
+		scope = 2;
+		picture = "\MRC\JLTS\characters\CloneArmor\data\ui\CloneVestHeavy_ui_ca.paa";
+	};
 };