Browse Source

"aaeaeeaeaeeeaeeaeouuuu" merge

Mark 3 years ago
parent
commit
1fb89f2b1d
23 changed files with 204 additions and 1 deletions
  1. BIN
      @501st Community Auxiliary Mod/addons/501RDStretcher.pbo.RD501_Aux_Mod.bisign
  2. BIN
      @501st Community Auxiliary Mod/addons/501st_Helmets.pbo.RD501_Aux_Mod.bisign
  3. BIN
      @501st Community Auxiliary Mod/addons/RD501_Droids.pbo.Zatama.bisign
  4. BIN
      @501st Community Auxiliary Mod/addons/RD501_End.pbo.Zatama.bisign
  5. BIN
      @501st Community Auxiliary Mod/addons/RD501_Helmets.pbo.Zatama.bisign
  6. BIN
      @501st Community Auxiliary Mod/addons/RD501_Jumppack.pbo.Zatama.bisign
  7. BIN
      @501st Community Auxiliary Mod/addons/RD501_Laat.pbo.Zatama.bisign
  8. BIN
      @501st Community Auxiliary Mod/addons/RD501_Leagacy_Classnames.pbo.Zatama.bisign
  9. BIN
      @501st Community Auxiliary Mod/addons/RD501_Main.pbo.Zatama.bisign
  10. BIN
      @501st Community Auxiliary Mod/addons/RD501_Particle_Effects.pbo.Zatama.bisign
  11. BIN
      @501st Community Auxiliary Mod/addons/RD501_Prototype.pbo.Zatama.bisign
  12. BIN
      @501st Community Auxiliary Mod/addons/RD501_Stretcher.pbo.Zatama.bisign
  13. BIN
      @501st Community Auxiliary Mod/addons/RD501_Units.pbo.Zatama.bisign
  14. BIN
      @501st Community Auxiliary Mod/addons/RD501_Vehicle_Weapons.pbo.Zatama.bisign
  15. BIN
      @501st Community Auxiliary Mod/addons/RD501_Vehicles.pbo.Zatama.bisign
  16. BIN
      @501st Community Auxiliary Mod/addons/RD501_Weapons.pbo.Zatama.bisign
  17. BIN
      @501st Community Auxiliary Mod/addons/RD501_Zeus.pbo.Zatama.bisign
  18. 0 0
      addons/RD501_Helmets/_textures/LF/snow_nco_helmet.paa
  19. 0 0
      addons/RD501_Helmets/_textures/LF/snow_trooper_helmet.paa
  20. 0 0
      addons/RD501_Helmets/_textures/aviation/utc_cadet_helmet_co.paa
  21. 154 0
      addons/RD501_Helmets/config.cpp
  22. 8 0
      addons/RD501_Helmets/infantry/config.cpp
  23. 42 1
      addons/RD501_Helmets/infantry/config_macros.cpp

BIN
@501st Community Auxiliary Mod/addons/501RDStretcher.pbo.RD501_Aux_Mod.bisign


BIN
@501st Community Auxiliary Mod/addons/501st_Helmets.pbo.RD501_Aux_Mod.bisign


BIN
@501st Community Auxiliary Mod/addons/RD501_Droids.pbo.Zatama.bisign


BIN
@501st Community Auxiliary Mod/addons/RD501_End.pbo.Zatama.bisign


BIN
@501st Community Auxiliary Mod/addons/RD501_Helmets.pbo.Zatama.bisign


BIN
@501st Community Auxiliary Mod/addons/RD501_Jumppack.pbo.Zatama.bisign


BIN
@501st Community Auxiliary Mod/addons/RD501_Laat.pbo.Zatama.bisign


BIN
@501st Community Auxiliary Mod/addons/RD501_Leagacy_Classnames.pbo.Zatama.bisign


BIN
@501st Community Auxiliary Mod/addons/RD501_Main.pbo.Zatama.bisign


BIN
@501st Community Auxiliary Mod/addons/RD501_Particle_Effects.pbo.Zatama.bisign


BIN
@501st Community Auxiliary Mod/addons/RD501_Prototype.pbo.Zatama.bisign


BIN
@501st Community Auxiliary Mod/addons/RD501_Stretcher.pbo.Zatama.bisign


BIN
@501st Community Auxiliary Mod/addons/RD501_Units.pbo.Zatama.bisign


BIN
@501st Community Auxiliary Mod/addons/RD501_Vehicle_Weapons.pbo.Zatama.bisign


BIN
@501st Community Auxiliary Mod/addons/RD501_Vehicles.pbo.Zatama.bisign


BIN
@501st Community Auxiliary Mod/addons/RD501_Weapons.pbo.Zatama.bisign


BIN
@501st Community Auxiliary Mod/addons/RD501_Zeus.pbo.Zatama.bisign


+ 0 - 0
addons/RD501_Helmets/_textures/last force/snow_nco_helmet.paa → addons/RD501_Helmets/_textures/LF/snow_nco_helmet.paa


+ 0 - 0
addons/RD501_Helmets/_textures/last force/snow_trooper_helmet.paa → addons/RD501_Helmets/_textures/LF/snow_trooper_helmet.paa


+ 0 - 0
addons/RD501_Helmets/_textures/kobra/utc_cadet_helmet_co.paa → addons/RD501_Helmets/_textures/aviation/utc_cadet_helmet_co.paa


+ 154 - 0
addons/RD501_Helmets/config.cpp

@@ -22,6 +22,9 @@ class CfgWeapons
 {
 	class HeadgearItem;
 	class H_HelmetB;
+    class SWLB_P2_SpecOps_Helmet;
+    class 21st_clone_P2_helmet;
+    class 3as_P1_Base;
 	
 	//pilots
 	class macro_new_helmet(pilot,base): H_HelmetB//RD501_501st_Pilot_Base
@@ -115,6 +118,7 @@ class CfgWeapons
 			};
 		};
 	};
+    //jlts
 	class macro_new_helmet(arc,base_jlts) : H_HelmetB
 	{
 		scope = 2;
@@ -153,6 +157,44 @@ class CfgWeapons
 			};
 		};
 	};
+    class macro_new_helmet(barc,base_jlts) : H_HelmetB
+	{
+		scope = 2;
+		scopeArsenal = 2;
+		author = "RD501";
+		weaponPoolAvailable = 1;       
+		subItems[] = {"G_B_Diving"};
+		ace_hearing_protection = 0.85; 		
+		ace_hearing_lowerVolume = 0;    
+		subItems[] = {"G_B_Diving","ItemcTabHCam"};
+		displayName = "[501st] BARC HELM (Base)";
+		picture = "\MRC\JLTS\characters\CloneArmor\data\ui\CloneHelmetP2_ui_ca.paa";
+        hiddenSelections[] = {"camo1"};
+        hiddenSelectionsTextures[] = {"MRC\JLTS\characters\CloneArmor\data\Clone_Helmet_P2_co.paa"};
+        model = "\MRC\JLTS\characters\CloneArmor\CloneHelmetP2.p3d";
+        hiddenSelectionsMaterials[]= {"mrc\jlts\characters\clonearmor2\data\clone_helmet_barc.rvmat"};
+		class ItemInfo: HeadgearItem
+		{
+			mass = 30;
+			uniformModel = "\MRC\JLTS\characters\CloneArmor\CloneHelmetP2.p3d";
+			hiddenSelectionsMaterials[]= {"mrc\jlts\characters\clonearmor2\data\clone_helmet_barc.rvmat"};
+			modelSides[] = {6};
+			hiddenSelections[] = {"Camo1"};
+			material = -1;
+			explosionShielding = 2.2;
+			minimalHit = 0.01;
+			passThrough = 0.01;
+			class HitpointsProtectionInfo
+			{
+				class Head
+				{
+					hitpointName = "HitHead";
+					armor = 50;
+					passThrough = 0.6;
+				};
+			};
+		};
+	};
 	class macro_new_helmet(arc,sgt_jlts) : H_HelmetB
 	{
 		scope = 2;
@@ -508,6 +550,118 @@ class CfgWeapons
 			};
 		};
 	};
+    //legion
+    class macro_new_helmet(infantry,ls_base) : SWLB_P2_SpecOps_Helmet
+	{
+		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 HELM LS 01 (Base)";
+		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"};
+		hiddenSelectionsMaterials[]= {"swlb_cee\data\SWLB_P2_SpecOps.rvmat"};
+		class ItemInfo: HeadgearItem
+		{
+			mass = 30;
+			uniformModel = "SWLB_CEE\data\SWLB_P2_SpecOps_Helmet.p3d";
+			modelSides[] = {6};
+			hiddenSelections[] = {"Camo1"};
+			material = -1;
+			explosionShielding = 2.2;
+			minimalHit = 0.01;
+			passThrough = 0.01;
+			class HitpointsProtectionInfo
+			{
+				class Head
+				{
+					hitpointName = "HitHead";
+					armor = 50;
+					passThrough = 0.6;
+				};
+			};
+		};
+	};
+    //lost force/last force
+    class macro_new_helmet(infantry,lf_base) : 21st_clone_P2_helmet
+	{
+		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 SNOW HELM 01";
+        hiddenSelections[] = {"Camo1"};
+		hiddenSelectionsTextures[] = {"armor_unit\21\helmet\21_Helmet_co.paa"};
+        hiddenSelectionsMaterials[]= {"armor_unit\armor_unit\21\helmet\helm.rvmat"};
+		model = "\armor_unit\21\HelmetP2_21.p3d";
+        picture="\MRC\JLTS\characters\CloneArmor\data\ui\CloneHelmetP2_ui_ca.paa";
+		class ItemInfo: HeadgearItem
+		{
+			mass = 30;
+			uniformModel = "\armor_unit\21\HelmetP2_21.p3d";
+			picture = "armor_unit\21\ui\21_Armor.paa";
+			modelSides[] = {6};
+			hiddenSelections[] = {"Camo1"};
+			material = -1;
+			explosionShielding = 2.2;
+			minimalHit = 0.01;
+			passThrough = 0.01;
+			class HitpointsProtectionInfo
+			{
+				class Head
+				{
+					hitpointName = "HitHead";
+					armor = 50;
+					passThrough = 0.6;
+				};
+			};
+		};
+	};
+    //3as
+    class macro_new_helmet(infantry,3AS_base) : 3as_P1_Base
+	{
+		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 HELM 3AS P1 01 (base)";
+        hiddenSelections[] = {"Camo1"};
+		hiddenSelectionsTextures[] = {"3AS\3AS_Characters\Clones\Headgear\Textures\Phase1\Phase1_Unmarked_CO.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"};
+		class ItemInfo: HeadgearItem
+		{
+			mass = 30;
+			uniformModel = "\3AS\3AS_Characters\Clones\Headgear\3AS_Clone_Standard_P1.p3d";
+			modelSides[] = {6};
+			hiddenSelections[] = {"Camo1"};
+			material = -1;
+			explosionShielding = 2.2;
+			minimalHit = 0.01;
+			passThrough = 0.01;
+			class HitpointsProtectionInfo
+			{
+				class Head
+				{
+					hitpointName = "HitHead";
+					armor = 50;
+					passThrough = 0.6;
+				};
+			};
+		};
+	};
 	class macro_new_helmet(arc,p1_trooper): H_HelmetB
 	{
 		scope = 2;

+ 8 - 0
addons/RD501_Helmets/infantry/config.cpp

@@ -210,4 +210,12 @@ 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)
 };

+ 42 - 1
addons/RD501_Helmets/infantry/config_macros.cpp

@@ -41,7 +41,16 @@
 			scope = 2;\
 			displayName = [501st] ARC HELM ('##displayname##');\
 			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\arc\##texture};\
-		};	
+		};
+
+//BARC JLTS
+	#define NEW_501_BARC_Helm_JLTS(classname,displayname,texture)\
+		class macro_new_helmet(arc,classname) : macro_new_helmet(barc,base_jlts)\
+		{\
+			scope = 2;\
+			displayName = [501st] BARC HELM ('##displayname##');\
+			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\jlts\inf\##texture};\
+		};
 
 //Lumanated Visor JLTS
 	#define NEW_501_Lumanated_Visor_Helm_JLTS(classname,displayname,texture)\
@@ -50,4 +59,36 @@
 			scope = 2;\
 			displayName = [501st] INF HELM ('##displayname##');\
 			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\infantry\##texture};\
+		};
+//LS shit
+	#define NEW_501_Inf_Helm_LS(classname,displayname,texture)\
+		class macro_new_helmet(infantry,classname) : macro_new_helmet(infantry,ls_base)\
+		{\
+			scope = 2;\
+			displayName = Clonetrooper helmet (501st '##displayname##');\
+			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\LS\##texture};\
+		};
+//LF helms
+	#define NEW_501_Inf_Helm_LF(classname,displayname,texture)\
+		class macro_new_helmet(infantry,classname) : macro_new_helmet(infantry,lf_base)\
+		{\
+			scope = 2;\
+			displayName = Clonetrooper helmet (501st '##displayname##');\
+			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\LF\##texture};\
+		};
+//3AS helms
+	#define NEW_501_Inf_Helm_3AS(classname,displayname,texture)\
+		class macro_new_helmet(infantry,classname) : macro_new_helmet(infantry,3AS_base)\
+		{\
+			scope = 2;\
+			displayName = Clonetrooper helmet (501st '##displayname##');\
+			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\3AS\##texture};\
+		};
+//JLTSv2
+	#define NEW_501_Inf_Helm_JLTS2(classname,displayname,texture)\
+		class macro_new_helmet(infantry,classname) : macro_new_helmet(infantry,jlts_recruit)\
+		{\
+			scope = 2;\
+			displayName = [501st] INF HELM ('##displayname##');\
+			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\jlts\inf\##texture};\
 		};