Switch to CBA Facewear (#24)

* Initial commit - Replaced `TACU_allowedFacewear` with `CBA_facewearList` - Replaced `"None"` entries with `""` * Removed TACU facewear function - Removed TACU facewear function and all related files, as they're no longer needed
Theseus-Aegis · Sep 24, 2019 · 7f4bb6b · 7f4bb6b
1 parent ea8745d
commit 7f4bb6b
Show file tree

Hide file tree

Showing 28 changed files with 56 additions and 104 deletions.
diff --git a/addons/cartel/CfgVehicles_Sicarios.hpp b/addons/cartel/CfgVehicles_Sicarios.hpp
@@ -23,7 +23,7 @@ class TACU_Cartel_U_O_Sicario_Rifleman_01: TACU_Main_U_OPFOR_Soldier_Base {
     headgearList[] = {
         "", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "G_Aviator", 1
     };
     editorPreview = QPATHTOF(ui\Cartel_U_O_Sicario_Rifleman_01.jpg);

diff --git a/addons/cartel/CfgVehicles_Soldados.hpp b/addons/cartel/CfgVehicles_Soldados.hpp
@@ -28,8 +28,8 @@ class TACU_Cartel_U_O_Soldado_Rifleman: TACU_Main_U_OPFOR_Soldier_Base {
         "H_Bandanna_khk", 0.30,
         "", 0.30
     };
-    TACU_allowedFacewear[] = {
-        "None", 1
+    CBA_facewearList[] = {
+        "", 1
     };
 };
 

diff --git a/addons/main/CfgEventHandlers.hpp b/addons/main/CfgEventHandlers.hpp
diff --git a/addons/main/CfgFunctions.hpp b/addons/main/CfgFunctions.hpp
diff --git a/addons/main/CfgVehicles.hpp b/addons/main/CfgVehicles.hpp
@@ -33,8 +33,8 @@ class CfgVehicles {
         headgearList[] = {
             "", 1
         };
-        TACU_allowedFacewear[] = {
-            "None", 1
+        CBA_facewearList[] = {
+            "", 1
         };
     };
 
@@ -67,8 +67,8 @@ class CfgVehicles {
         headgearList[] = {
             "", 1
         };
-        TACU_allowedFacewear[] = {
-            "None", 1
+        CBA_facewearList[] = {
+            "", 1
         };
     };
 
@@ -101,8 +101,8 @@ class CfgVehicles {
         headgearList[] = {
             "", 1
         };
-        TACU_allowedFacewear[] = {
-            "None", 1
+        CBA_facewearList[] = {
+            "", 1
         };
     };
 };

diff --git a/addons/main/XEH_preInit.sqf b/addons/main/XEH_preInit.sqf
diff --git a/addons/main/config.cpp b/addons/main/config.cpp
@@ -110,7 +110,5 @@ class CfgPatches {
     };
 };
 
-#include "CfgEventHandlers.hpp"
-#include "CfgFunctions.hpp"
 #include "CfgMods.hpp"
 #include "CfgVehicles.hpp"
diff --git a/addons/main/functions/fn_randomizeFacewear.sqf b/addons/main/functions/fn_randomizeFacewear.sqf
diff --git a/addons/msf/CfgVehicles_DDogs_Black.hpp b/addons/msf/CfgVehicles_DDogs_Black.hpp
@@ -27,7 +27,7 @@ class TACU_MSF_U_I_DDogs_Black_Rifleman_01: TACU_Main_U_INDEP_Soldier_Base {
     headgearList[] = {
         "tacs_Helmet_Enc_Ballistic_DarkBlack", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "G_Balaclava_TI_blk_F", 1,
     };
     editorSubcategory = "TACU_MSF_EdSubCat_DDogs_Black";

diff --git a/addons/msf/CfgVehicles_Foxhound.hpp b/addons/msf/CfgVehicles_Foxhound.hpp
@@ -27,7 +27,7 @@ class TACU_MSF_U_I_Foxhound_Rifleman_01: TACU_Main_U_INDEP_Soldier_Base {
     headgearList[] = {
         "TACU_MSF_Helmet_LightCombat_Foxhound", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "G_Balaclava_TI_blk_F", 1,
     };
     editorSubcategory = "TACU_MSF_EdSubCat_Foxhound";

diff --git a/addons/msf/CfgVehicles_Regular_Black.hpp b/addons/msf/CfgVehicles_Regular_Black.hpp
@@ -27,7 +27,7 @@ class TACU_MSF_U_I_Regular_Black_Rifleman_01: TACU_Main_U_INDEP_Soldier_Base {
     headgearList[] = {
         "", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "G_Balaclava_TI_blk_F", 1,
     };
     editorSubcategory = "TACU_MSF_EdSubCat_Regular_Black";

diff --git a/addons/plr/CfgVehicles_Insurgents.hpp b/addons/plr/CfgVehicles_Insurgents.hpp
@@ -26,7 +26,7 @@ class TACU_PLR_U_O_Insurgent_Rifleman_01: TACU_Main_U_OPFOR_Soldier_Base {
         "H_Shemag_olive", 0.1,
         "CUP_H_SLA_Helmet_BLK", 0.25
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "CUP_FR_NeckScarf5", 1,
         "CUP_FR_NeckScarf2", 0.2,
         "CUP_FR_NeckScarf", 0.2,
@@ -53,7 +53,7 @@ class TACU_PLR_U_O_Insurgent_Rifleman_02: TACU_PLR_U_O_Insurgent_Rifleman_01 {
         "H_Shemag_olive", 0.1,
         "CUP_H_SLA_Helmet_BLK", 0.5
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "CUP_FR_NeckScarf5", 1,
         "CUP_FR_NeckScarf2", 0.2,
         "CUP_FR_NeckScarf", 0.2,
@@ -76,7 +76,7 @@ class TACU_PLR_U_O_Insurgent_Rifleman_03: TACU_PLR_U_O_Insurgent_Rifleman_01 {
     headgearList[] = {
         "", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "G_Balaclava_blk", 1,
         "G_Balaclava_oli", 0.2
     };
@@ -97,7 +97,7 @@ class TACU_PLR_U_O_Insurgent_Rifleman_04: TACU_PLR_U_O_Insurgent_Rifleman_01 {
     headgearList[] = {
         "", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "G_Balaclava_blk", 1,
         "G_Balaclava_oli", 0.2
     };
@@ -121,7 +121,7 @@ class TACU_PLR_U_O_Insurgent_Rifleman_05: TACU_PLR_U_O_Insurgent_Rifleman_01 {
         "H_Shemag_olive", 0.1,
         "CUP_H_SLA_Helmet_BLK", 0.4
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "CUP_FR_NeckScarf5", 1,
         "CUP_FR_NeckScarf2", 0.2,
         "CUP_FR_NeckScarf", 0.2,
@@ -145,7 +145,7 @@ class TACU_PLR_U_O_Insurgent_Rifleman_AT: TACU_PLR_U_O_Insurgent_Rifleman_01 {
     headgearList[] = {
         "", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "G_Balaclava_blk", 1,
         "G_Balaclava_oli", 0.2
     };
@@ -166,7 +166,7 @@ class TACU_PLR_U_O_Insurgent_TeamLeader: TACU_PLR_U_O_Insurgent_Rifleman_01 {
     headgearList[] = {
         "CUP_H_SLA_BeretRed", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "CUP_FR_NeckScarf5", 1
     };
     editorPreview = QPATHTOF(ui\PLR_U_O_Insurgent_TeamLeader.jpg);
@@ -186,7 +186,7 @@ class TACU_PLR_U_O_Insurgent_Autorifleman: TACU_PLR_U_O_Insurgent_Rifleman_01 {
     headgearList[] = {
         "", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "G_Balaclava_blk", 1,
         "G_Balaclava_oli", 0.1
     };
@@ -209,7 +209,7 @@ class TACU_PLR_U_O_Insurgent_Sniper: TACU_PLR_U_O_Insurgent_Rifleman_01 {
         "H_ShemagOpen_tan", 0.2,
         "H_Shemag_olive", 0.2
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "CUP_FR_NeckScarf5", 1,
         "CUP_FR_NeckScarf4", 0.1,
         "CUP_FR_NeckScarf2", 0.1,

diff --git a/addons/plr/CfgVehicles_Paramilitary.hpp b/addons/plr/CfgVehicles_Paramilitary.hpp
@@ -23,7 +23,7 @@ class TACU_PLR_U_O_Paramilitary_Rifleman_01: TACU_Main_U_OPFOR_Soldier_Base {
     headgearList[] = {
         "CUP_H_RUS_6B27_olive", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "milgp_f_face_shield_goggles_RGR", 1
     };
     editorPreview = QPATHTOF(ui\PLR_U_O_Paramilitary_Rifleman_01.jpg);

diff --git a/addons/police/CfgVehicles_B.hpp b/addons/police/CfgVehicles_B.hpp
@@ -20,7 +20,7 @@ class TACU_Police_U_B_CT_Rifleman: TACU_Main_U_BLUFOR_Soldier_Base {
         "BWA3_OpsCore", 0.50,
         "BWA3_OpsCore_Camera", 0.50
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "CUP_G_PMC_Facewrap_Black_Glasses_Dark", 0.30,
         "CUP_G_PMC_Facewrap_Black_Glasses_Dark_Headset", 0.30,
         "CUP_G_PMC_Facewrap_Black_Glasses_Ember", 0.30
@@ -82,7 +82,7 @@ class TACU_Police_U_B_Enforcer_Rifleman: TACU_Main_U_BLUFOR_Soldier_Base {
         "BWA3_OpsCore", 0.25,
         "BWA3_OpsCore_Camera", 0.25
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "CUP_G_Oakleys_Drk", 0.20,
         "CUP_G_Oakleys_Embr", 0.20,
         "CUP_G_Oakleys_Clr", 0.20

diff --git a/addons/police/CfgVehicles_I.hpp b/addons/police/CfgVehicles_I.hpp
@@ -21,7 +21,7 @@ class TACU_Police_U_I_CT_Rifleman: TACU_Main_U_INDEP_Soldier_Base {
     headgearList[] = {
         "TACU_Police_Helmet_PASGT_Neck_PoliceBlack", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "G_Balaclava_blk", 0.70,
         "G_Balaclava_combat", 0.30
     };
@@ -81,7 +81,7 @@ class TACU_Police_U_I_Enforcer_Rifleman: TACU_Main_U_INDEP_Soldier_Base {
         "CUP_H_USArmy_Helmet_Pro", 0.10,
         "CUP_H_USArmy_Helmet_Pro_gog", 0.10
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "CUP_G_Oakleys_Drk", 0.20,
         "CUP_G_Oakleys_Embr", 0.20,
         "CUP_G_Oakleys_Clr", 0.20,

diff --git a/addons/police/CfgVehicles_O.hpp b/addons/police/CfgVehicles_O.hpp
@@ -23,7 +23,7 @@ class TACU_Police_U_O_CT_Rifleman: TACU_Main_U_OPFOR_Soldier_Base {
     headgearList[] = {
         "TACU_Police_Helmet_PASGT_Neck_PoliceGreen", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "CUP_RUS_Balaclava_grn", 0.30,
         "CUP_RUS_Balaclava_blk", 0.30,
         "G_Balaclava_TI_G_blk_F", 0.30
@@ -85,7 +85,7 @@ class TACU_Police_U_O_Enforcer_SMG_1: TACU_Police_U_O_CT_Rifleman {
         "CUP_H_SLA_BeanieGreen", 0.20,
         "CUP_H_PMC_Beanie_Black", 0.20,
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "CUP_G_Oakleys_Drk", 0.25,
         "CUP_G_Oakleys_Embr", 0.25,
         "CUP_G_Oakleys_Clr", 0.25,

diff --git a/addons/revolutionaries/CfgVehicles_I_Russian.hpp b/addons/revolutionaries/CfgVehicles_I_Russian.hpp
@@ -26,8 +26,8 @@ class TACU_Revolutionaries_U_I_Russian_Rifleman01: TACU_Main_U_INDEP_Soldier_Bas
     headgearList[] = {
         "", 1
     };
-    TACU_allowedFacewear[] = {
-        "None", 1
+    CBA_facewearList[] = {
+        "", 1
     };
 };
 

diff --git a/addons/revolutionaries/CfgVehicles_I_Tanoan.hpp b/addons/revolutionaries/CfgVehicles_I_Tanoan.hpp
@@ -26,8 +26,8 @@ class TACU_Revolutionaries_U_I_Tanoan_Rifleman01: TACU_Main_U_INDEP_Soldier_Base
     headgearList[] = {
         "", 1
     };
-    TACU_allowedFacewear[] = {
-        "None", 1
+    CBA_facewearList[] = {
+        "", 1
     };
 };
 

diff --git a/addons/revolutionaries/CfgVehicles_O_Russian.hpp b/addons/revolutionaries/CfgVehicles_O_Russian.hpp
@@ -26,7 +26,7 @@ class TACU_Revolutionaries_U_O_Russian_Rifleman01: TACU_Main_U_OPFOR_Soldier_Bas
     headgearList[] = {
         "", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "G_Balaclava_blk", 1
     };
 };

diff --git a/addons/revolutionaries/CfgVehicles_O_Tanoan.hpp b/addons/revolutionaries/CfgVehicles_O_Tanoan.hpp
@@ -26,7 +26,7 @@ class TACU_Revolutionaries_U_O_Tanoan_Rifleman01: TACU_Main_U_OPFOR_Soldier_Base
     headgearList[] = {
         "", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "G_Balaclava_blk", 1
     };
 };

diff --git a/addons/takistansf/CfgVehicles.hpp b/addons/takistansf/CfgVehicles.hpp
@@ -36,8 +36,8 @@ class CfgVehicles {
             "CUP_H_TKI_Lungee_06", 0.75,
             "CUP_H_TKI_Lungee_04", 0.75
         };
-        TACU_allowedFacewear[] = {
-            "None", 1,
+        CBA_facewearList[] = {
+            "", 1,
             "G_Shades_Black", 0.1
         };
         editorSubcategory = "TACU_TakistanSF_EdSubCat_TakistanSF";
@@ -78,7 +78,7 @@ class CfgVehicles {
             "CUP_H_TKI_Lungee_05", 1,
             "CUP_H_TKI_Lungee_06", 1
         };
-        TACU_allowedFacewear[] = {
+        CBA_facewearList[] = {
             "CUP_FR_NeckScarf", 1,
             "CUP_FR_NeckScarf2", 1,
             "CUP_FR_NeckScarf3", 1,
@@ -116,8 +116,8 @@ class CfgVehicles {
             "H_Shemag_olive_hs", 1,
             "H_Shemag_olive", 1
         };
-        TACU_allowedFacewear[] = {
-            "None", 1,
+        CBA_facewearList[] = {
+            "", 1,
             "G_Shades_Black", 1
         };
     };

diff --git a/addons/vanguard/CfgVehicles_Contractors_Green.hpp b/addons/vanguard/CfgVehicles_Contractors_Green.hpp
@@ -22,7 +22,7 @@ class TACU_Vanguard_U_Contractor_Green_Rifleman_01: TACU_Main_U_INDEP_Soldier_Ba
     headgearList[] = {
         "H_HelmetSpecB", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "CUP_FR_NeckScarf", 1
     };
     editorSubcategory = "TACU_Vanguard_EdSubCat_Contractors_Green";
@@ -280,4 +280,4 @@ class TACU_Vanguard_V_Qilin: O_T_LSV_02_unarmed_black_F {
     crew = "TACU_Vanguard_U_Specialist_Driver";
     typicalCargo[] = {"TACU_Vanguard_U_Contractor_Green_Engineer"};
     editorPreview = QPATHTOF(ui\Vanguard_V_Qilin.jpg);
-};
+};
diff --git a/addons/vanguard/CfgVehicles_Contractors_Sand.hpp b/addons/vanguard/CfgVehicles_Contractors_Sand.hpp
@@ -22,7 +22,7 @@ class TACU_Vanguard_U_Contractor_Sand_Rifleman_01: TACU_Main_U_INDEP_Soldier_Bas
     headgearList[] = {
         "H_HelmetSpecB_sand", 1
     };
-    TACU_allowedFacewear[] = {
+    CBA_facewearList[] = {
         "CUP_FR_NeckScarf2", 1
     };
     editorSubcategory = "TACU_Vanguard_EdSubCat_Contractors_Sand";
@@ -119,4 +119,4 @@ class TACU_Vanguard_U_Contractor_Sand_Engineer: TACU_Vanguard_U_Contractor_Sand_
     magazines[] = {mag_4("30Rnd_580x42_Mag_F"), mag_2("11Rnd_45ACP_Mag"), "SmokeShell"};
     respawnMagazines[] = {mag_4("30Rnd_580x42_Mag_F"), mag_2("11Rnd_45ACP_Mag"), "SmokeShell"};
     editorPreview = QPATHTOF(ui\Vanguard_U_Contractor_Sand_Engineer.jpg);
-};
+};