Browse Source

Revert "Merge in myncoh stuff from kestrel"

This reverts commit 8310f236a9c1d5041964b8d080c7b2dbd4eb55b9, reversing
changes made to f679425f528ec99dc43ff325b8ad7f4205cc982b.
Hobnob 3 years ago
parent
commit
68fe408eac

BIN
addons/RD501_Helmets/_textures/ARC/Aeon.paa


BIN
addons/RD501_Helmets/_textures/Infantry/Anta.paa


BIN
addons/RD501_Helmets/_textures/Infantry/Chimera.paa


BIN
addons/RD501_Helmets/_textures/Infantry/Deytow.paa


BIN
addons/RD501_Helmets/_textures/Infantry/Juggernaut.paa


BIN
addons/RD501_Helmets/_textures/Infantry/Peterson.paa


BIN
addons/RD501_Helmets/_textures/Mynock/501st_Tanker_CI-C.paa


BIN
addons/RD501_Helmets/_textures/Mynock/501st_Tanker_CI.paa


BIN
addons/RD501_Helmets/_textures/Mynock/501st_Tanker_CM-C.paa


BIN
addons/RD501_Helmets/_textures/Mynock/501st_Tanker_CM.paa


BIN
addons/RD501_Helmets/_textures/Mynock/501st_Tanker_CP.paa


BIN
addons/RD501_Helmets/_textures/Mynock/501st_Tanker_CS.paa


BIN
addons/RD501_Helmets/_textures/Mynock/501st_Tanker_CT.paa


+ 0 - 31
addons/RD501_Helmets/config.cpp

@@ -676,35 +676,4 @@ class CfgWeapons
 			};
 		};
 	};
-	class macro_new_helmet(mynock,3as_base): H_HelmetB
-	{
-		author = "RD501";
-		scope = 2;
-		scopeArsenal = 2;
-		displayName = "[501st] MYN HELM 01 (Base)";
-		subItems[] = {"G_B_Diving","ItemcTabHCam"};
-		model="\3AS\3AS_Characters\Clones\Headgear\3AS_P2_Clone_Helm_Tanker.p3d";
-		picture="3AS\3AS_Characters\Clones\Headgear\ui\phase1_ui_ca.paa";
-		ace_hearing_protection = 0.85; 		
-		ace_hearing_lowerVolume = 0;    
-		hiddenSelections[] = {"camo"};
-		hiddenSelectionsTextures[] = {"3AS\3AS_Characters\Clones\Headgear\Textures\Tanker\501st_co.paa"};
-		class ItemInfo: HeadgearItem
-		{
-			mass = 10;
-			uniformmodel="\3AS\3AS_Characters\Clones\Headgear\3AS_P2_Clone_Helm_Tanker.p3d";
-			allowedSlots[] = {801,901,701,605};
-			modelSides[] = {6};
-			hiddenSelections[] = {"camo"};
-			class HitpointsProtectionInfo
-			{
-				class Head
-				{
-					hitpointName = "HitHead";
-					armor = 60;
-					passThrough = 0.5;
-				};
-			};
-		};
-	};
 };

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

@@ -184,8 +184,6 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Kitti,Kitti,Kitti.paa)
 	NEW_501_Inf_Helm_JLTS(Defender,Defender,Defender.paa)
 	NEW_501_Inf_Helm_JLTS(Flak,Flak,Flak.paa)
-	NEW_501_Inf_Helm_JLTS(Chimera,Chimera,Chimera.paa)
-	NEW_501_Inf_Helm_JLTS(Peterson,Peterson,Peterson.paa)
 	NEW_501_ARC_Helm_JLTS(Rayne,Rayne,Rayne.paa)
 	NEW_501_ARC_Helm_JLTS(Archaic,Archaic,Archaic.paa)
 	NEW_501_ARC_Helm_JLTS(Duke,Duke,Duke.paa)
@@ -216,5 +214,4 @@ class CfgWeapons
     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_ARC_Helm_JLTS(Aeon,Aeon,Aeon.paa)
 };

+ 0 - 9
addons/RD501_Helmets/infantry/config_macros.cpp

@@ -52,15 +52,6 @@
 			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\jlts\inf\##texture};\
 		};
 
-//Mynock 3AS
-	#define NEW_501_MYN_Helm_JLTS(classname,displayname,texture)\
-		class macro_new_helmet(mynock,classname) : macro_new_helmet(mynock,base_3as)\
-		{\
-			scope = 2;\
-			displayName = [501st] MYN HELM ('##displayname##');\
-			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\Mynock\##texture};\
-		};
-
 //Lumanated Visor JLTS
 	#define NEW_501_Lumanated_Visor_Helm_JLTS(classname,displayname,texture)\
 		class macro_new_helmet(infantry_lumanated,classname) : macro_new_helmet(infantry,jlts_lum_base)\

+ 0 - 32
addons/RD501_Helmets/mynock/config.cpp

@@ -1,32 +0,0 @@
-#define COMPONENT aviation_helmets
-#define BASEHELMNAME MODNAME##_501st_Pilot_Base
-#include "../../RD501_main/config_macros.hpp"
-#include "config_macros.cpp"
-
-class CfgPatches
-{
-	class macro_patch_name(mynock_helmets)
-	{
-		author=DANKAUTHORS
-		addonRootClass= macro_patch_name(helmets)
-		requiredAddons[]=
-		{
-			macro_patch_name(helmets)
-		};
-		requiredVersion=0.1;
-		units[]={};
-		weapons[]={};
-	};
-};
-
-class CfgWeapons
-{
-	class macro_new_helmet(mynock,3as_base);
-	NEW_501_MYN_Helm_3AS(cic,CI-C,501st_Tanker_CI-C.paa)
-	NEW_501_MYN_Helm_3AS(ci,CI,501st_Tanker_CI.paa)
-	NEW_501_MYN_Helm_3AS(cmc,CM-C,501st_Tanker_CM-C.paa)
-	NEW_501_MYN_Helm_3AS(cm,CM,501st_Tanker_CM.paa)
-	NEW_501_MYN_Helm_3AS(ct,CT,501st_Tanker_CT.paa)
-	NEW_501_MYN_Helm_3AS(cp,CP,501st_Tanker_CP.paa)
-	NEW_501_MYN_Helm_3AS(cs,CS,501st_Tanker_CS.paa)
-};

+ 0 - 71
addons/RD501_Helmets/mynock/config_macros.cpp

@@ -1,71 +0,0 @@
-//Normal Infantry ones
-	#define NEW_501_Inf_Helm(classname,displayname,texture)\
-		class macro_new_helmet(infantry,classname) : macro_new_helmet(infantry,base)\
-		{\
-			scope = 2;\
-			displayName = Clonetrooper helmet (501st '##displayname##');\
-			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\infantry\##texture};\
-		};
-
-//ARC
-	#define NEW_501_ARC_Helm(classname,displayname,texture)\
-		class macro_new_helmet(arc,classname) : macro_new_helmet(arc,base_jlts)\
-		{\
-			scope = 2;\
-			displayName = Clonetrooper helmet (501st '##displayname##');\
-			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\arc\##texture};\
-		};	
-
-//Lumanated Visor
-	#define NEW_501_Lumanated_Visor_Helm(classname,displayname,texture)\
-		class macro_new_helmet(infantry_lumanated,classname) : macro_new_helmet(infantry,lum_base)\
-		{\
-			scope = 2;\
-			displayName = Clonetrooper helmet (501st '##displayname##');\
-			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\infantry\##texture};\
-		};
-		
-//Normal Infantry ones JLTS
-	#define NEW_501_Inf_Helm_JLTS(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##\infantry\##texture};\
-		};
-
-//ARC JLTS
-	#define NEW_501_ARC_Helm_JLTS(classname,displayname,texture)\
-		class macro_new_helmet(arc,classname) : macro_new_helmet(arc,base_jlts)\
-		{\
-			scope = 2;\
-			displayName = [501st] ARC HELM ('##displayname##');\
-			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\arc\##texture};\
-		};	
-
-//Mynock 3AS
-	#define NEW_501_MYN_Helm_JLTS(classname,displayname,texture)\
-		class macro_new_helmet(mynock,classname) : macro_new_helmet(mynock,base_3as)\
-		{\
-			scope = 2;\
-			displayName = [501st] MYN HELM ('##displayname##');\
-			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\Mynock\##texture};\
-		};
-
-//Lumanated Visor JLTS
-	#define NEW_501_Lumanated_Visor_Helm_JLTS(classname,displayname,texture)\
-		class macro_new_helmet(infantry_lumanated,classname) : macro_new_helmet(infantry,jlts_lum_base)\
-		{\
-			scope = 2;\
-			displayName = [501st] INF HELM ('##displayname##');\
-			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\infantry\##texture};\
-		};
-
-//Mynock 3AS
-	#define NEW_501_MYN_Helm_3AS(classname,displayname,texture)\
-		class macro_new_helmet(mynock,classname) : macro_new_helmet(mynock,base_3as)\
-		{\
-			scope = 2;\
-			displayName = [501st] MYN HELM ('##displayname##');\
-			hiddenSelectionsTextures[] = {macro_custom_helmet_textures##\Mynock\##texture};\
-		};