Merge pull request #391 from maxcloutier13/Dev---Active

Migrate: uniforms to core
maxcloutier13 · Sep 4, 2023 · ab95935 · ab95935
2 parents 1f37af7 + 7b9dea0
commit ab95935
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 129 deletions.
diff --git a/cfg_aceaxCompats.cpp b/cfg_aceaxCompats.cpp
@@ -23,7 +23,7 @@ class XtdGearModels
 	class CfgWeapons
 	{
 		// Basic helmets ----------------------------
-		class CGQC_Helmets 
+		class CGQC_Helmets
 		{
 			options[] = {"Type", "Camo"};
 			label = "CGQC Helmets";
@@ -40,7 +40,7 @@ class XtdGearModels
 			};
 		};
 		// Tank helmets -----------------------------
-		class CGQC_Tank_Helmets 
+		class CGQC_Tank_Helmets
 		{
 			options[] = {"Type"};
 			label = "CGQC Tank Helmet";
@@ -420,33 +420,7 @@ class XtdGearInfos
             model = "CGQC_Tank_Helmets";
 			Type = "Cloutier";
         };
-
-		// Uniform ------------------------------------------------------------------
-		class cgqc_uniform_mk1_desert
-		{
-            model = "CGQC_Uniform";
-			Camo = "TAN";
-        };
-		class cgqc_uniform_mk1_mcam
-		{
-            model = "CGQC_Uniform";
-			Camo = "MC";
-        };
-		class cgqc_uniform_mk1_cadpat
-		{
-            model = "CGQC_Uniform";
-			Camo = "CADPAT";
-        };
-		class cgqc_uniform_mk1_black
-		{
-            model = "CGQC_Uniform";
-			Camo = "Blk";
-        };
-		class cgqc_uniform_mk1_white
-		{
-            model = "CGQC_Uniform";
-			Camo = "WHT";
-        };
+
 		// Vests ------------------------------------------------------------------------------
         class cgqc_vest_mk1_tan
         {

diff --git a/cfg_patches.cpp b/cfg_patches.cpp
@@ -184,9 +184,6 @@ class CfgPatches
 			"cgqc_helmet_kidnapping",
 			"cgqc_goggles_mk1_diver",
 			"cgqc_goggles_mk1_para",
-			"cgqc_uniform_mk1_jetpilot",
-			"cgqc_uniform_mk1_helipilot",
-			"cgqc_uniform_mk1_diver",
 			"cgqc_vest_mk1_belt",
 			"cgqc_vest_mk1_tan_lr",
 			"cgqc_vest_mk1_tan_rf",

diff --git a/cfg_uniforms.cpp b/cfg_uniforms.cpp
@@ -17,104 +17,7 @@ class cgqc_uniform_mk1 : U_mas_can_B_CombatUniform_S_NTOG
     displayName = "CGQC Uniforme mk1";
 };
 */
-// Desert
-class cgqc_uniform_mk1_desert : U_mas_can_B_CombatUniform_aor1
-{
-    author = "silent1";
-    _generalMacro = "cgqc_uniform_mk1_desert";
-    displayName = "CGQC Uniforme mk1 - Desert";
-    class ItemInfo: UniformItem
-    {
-        uniformModel = "-";
-        uniformClass = "B_mas_can_Soldier01_aor1_F";
-        containerClass = "Supply80";
-        mass = 20;
-    };
-};
-// Multicam
-class cgqc_uniform_mk1_mcam : U_mas_can_B_CombatUniform_multi
-{
-    author = "silent1";
-    _generalMacro = "cgqc_uniform_mk1_multicam";
-    displayName = "CGQC Uniforme mk1 - Multicam";
-    class ItemInfo: UniformItem
-    {
-        uniformModel = "-";
-        uniformClass = "B_mas_can_Soldier01_F";
-        containerClass = "Supply80";
-        mass = 20;
-    };
-};
-// Woodland
-class cgqc_uniform_mk1_cadpat : U_mas_can_B_CombatUniform_aor2
-{
-    author = "silent1";
-    _generalMacro = "cgqc_uniform_mk1_woodland";
-    displayName = "CGQC Uniforme mk1 - Cadpat";
-    class ItemInfo: UniformItem
-    {
-        uniformModel = "-";
-        uniformClass = "B_mas_can_Soldier01_aor2_F";
-        containerClass = "Supply80";
-        mass = 20;
-    };
-};
-// Black
-class cgqc_uniform_mk1_black : U_mas_can_B_suite_CQB
-{
-    author = "silent1";
-    _generalMacro = "cgqc_uniform_mk1_black";
-    displayName = "CGQC Uniforme mk1 - Black";
-    class ItemInfo: UniformItem
-    {
-        uniformModel = "-";
-        uniformClass = "B_mas_can_SoldierCQB_F";
-        containerClass = "Supply80";
-        mass = 20;
-    };
-};
-// Winter
-class cgqc_uniform_mk1_white : U_mas_can_B_suite_WINT
-{
-    author = "silent1";
-    _generalMacro = "cgqc_uniform_mk1_winter";
-    displayName = "CGQC Uniforme mk1 - Winter";
-    class ItemInfo: UniformItem
-    {
-        uniformModel = "-";
-        uniformClass = "B_mas_can_SoldierWINT_F";
-        containerClass = "Supply80";
-        mass = 20;
-    };
-};
 
-// Pilots
-class cgqc_uniform_mk1_jetpilot : U_I_pilotCoveralls
-{
-    author = "silent1";
-    _generalMacro = "cgqc_uniform_jetpilot";
-    displayName = "CGQC Pilote de jet mk1";
-    class ItemInfo: UniformItem
-    {
-        uniformModel = "-";
-        uniformClass = "cgqc_soldat_moderne";
-        containerClass = "Supply80";
-        mass = 20;
-    };
-};
-class cgqc_uniform_mk1_helipilot : U_mas_can_B_CombatUniform_S_SWAT
-{
-    author = "silent1";
-    _generalMacro = "cgqc_uniform_mk1_jetpilot";
-    displayName = "CGQC Pilote Hélicoptère mk1";
-    class ItemInfo: UniformItem
-    {
-        uniformModel = "-";
-        uniformClass = "B_mas_can_SoldierCQB_F";
-        containerClass = "Supply80";
-        mass = 20;
-    };
-};
 
 // Diver
 class cgqc_uniform_mk1_diver : U_mas_can_B_Wetsuit