Retextures - Migrate to CUP Equipment

addons/retextures/CfgConditionalArsenalAccess.hpp

@@ -4,21 +4,21 @@ class cfgConditionalArsenalAcces
     {
         class medic
         {
-            condition = QUOTE( [player] call ace_medical_treatment_fnc_isMedic );  
+            condition = QUOTE([player] call ace_medical_treatment_fnc_isMedic);  
             items[]={
                 #define FINAL
-                #include "data\rhsusf\mich_covered\medic\weapons.hpp"
+                #include "data\cup\ech\medic\weapons.hpp"
                 #undef FINAL
             };
         };
-        class engineer
+/*         class engineer
         {
             condition = QUOTE( [player] call ace_common_fnc_isEngineer ); 
             items[]={
                 #define FINAL
                 #include "data\rhsusf\mich_covered\engineer\weapons.hpp"
                 #undef FINAL
             };
-        };
+        }; */
     };
 };

addons/retextures/CfgWFARArsenalAccess.hpp

@@ -11,11 +11,12 @@ class cfgWFARArsenalAccess
         };
         //Shark
         76561198053950415[]={
-            //#include "data\rhsusf\mich_covered\withStupid\weapons.hpp"
-            //#include "data\rhsusf\mich_covered\barker\weapons.hpp"
-            //#include "data\rhsusf\mich_covered\shark\weapons.hpp"
+            #include "data\cup\ech\withStupid\weapons.hpp"
+            #include "data\cup\ech\barker\weapons.hpp"
+            #include "data\cup\ech\libby\weapons.hpp"
+            #include "data\cup\ech\shark\weapons.hpp"
             #define FINAL
-            //#include "data\rhsusf\cvc\gecko\weapons.hpp"
+            #include "data\cfp\cvc\shark\weapons.hpp"
             #undef FINAL
         };
         //Brenn
@@ -27,13 +28,13 @@ class cfgWFARArsenalAccess
         //Libby
         76561198453933280[]={
             #define FINAL
-            //#include "data\rhsusf\mich_covered\libby\weapons.hpp"
+            #include "data\cup\ech\libby\weapons.hpp"
             #undef FINAL
         };
         //Barker
         76561198158672135[]={
             #define FINAL
-            //#include "data\rhsusf\mich_covered\barker\weapons.hpp"
+            #include "data\cup\ech\barker\weapons.hpp"
             #undef FINAL
         };
     };

addons/retextures/CfgWeapons.hpp

@@ -1,33 +1,27 @@
 class cfgWeapons {
-    //class rhsusf_mich_helmet_marpatwd;
-    //class rhsusf_mich_helmet_marpatwd_headset;
+    class CUP_H_USArmy_ECH_MARPAT;
+    class CUP_H_USArmy_ECH_ESS_MARPAT;
+    class CUP_H_USArmy_ECH_Headset_MARPAT;
+    class CUP_H_USArmy_ECH_ESS_Headset_MARPAT;
 
-    //class rhsusf_mich_helmet_marpatwd_alt;
-    //class rhsusf_mich_helmet_marpatwd_alt_headset;
-
-
-    //class rhsusf_mich_helmet_marpatwd_norotos;
-    //class rhsusf_mich_helmet_marpatwd_norotos_headset;
-
-    //class rhsusf_mich_helmet_marpatwd_norotos_arc;
-    //class rhsusf_mich_helmet_marpatwd_norotos_arc_headset;
+    class CUP_H_USArmy_ECH_MARPAT_des;
+    class CUP_H_USArmy_ECH_ESS_MARPAT_des;
+    class CUP_H_USArmy_ECH_Headset_MARPAT_des;
+    class CUP_H_USArmy_ECH_ESS_Headset_MARPAT_des;
 
     //Players
-    //#include "data\rhsusf\mich_covered\shark\CfgWeapons.hpp"
-    //#include "data\rhsusf\mich_covered\jews\CfgWeapons.hpp"
-    //#include "data\rhsusf\mich_covered\barker\CfgWeapons.hpp"
-    //#include "data\rhsusf\mich_covered\libby\CfgWeapons.hpp"
+    #include "data\cup\ech\shark\CfgWeapons.hpp"
+    #include "data\cup\ech\libby\CfgWeapons.hpp"
+    #include "data\cup\ech\barker\CfgWeapons.hpp"
 
     //General
     //#include "data\rhsusf\mich_covered\engineer\CfgWeapons.hpp"
-    //#include "data\rhsusf\mich_covered\medic\CfgWeapons.hpp"
-    //#include "data\rhsusf\mich_covered\withStupid\CfgWeapons.hpp"
+    #include "data\cup\ech\medic\CfgWeapons.hpp"
+    #include "data\cup\ech\withStupid\CfgWeapons.hpp"
 
     //Public
     //#include "data\rhsusf\mich_covered\un\CfgWeapons.hpp"
 
-    //class rhsusf_cvc_alt_helmet;
-    //class rhsusf_cvc_ess;
-
-    //#include "data\rhsusf\cvc\gecko\CfgWeapons.hpp"
+    class SP_CVCHelmet_Black;
+    #include "data\cfp\cvc\shark\CfgWeapons.hpp"
 };

addons/retextures/config.cpp

@@ -8,21 +8,22 @@ class CfgPatches
         author="Walthzer/Shark";
         url="https://whitefoxassaultreg.wixsite.com/wfar";
         requiredVersion=1.6;
-        requiredaddons[]={"WASHM_wfar_data"};
+        requiredaddons[]={"WASHM_wfar_data", "cfp_headgear", "CUP_Creatures_Military_USArmy"};
         units[]={};
         weapons[]={
-            // "wfar_un_mich_helmet_marpat",
-            // #include "data\rhsusf\cvc\gecko\weapons.hpp"
-            // #include "data\rhsusf\mich_covered\jews\weapons.hpp"
-            // #include "data\rhsusf\mich_covered\libby\weapons.hpp"
-            // #define FINAL
-            // #include "data\rhsusf\mich_covered\barker\weapons.hpp"
-            // #undef FINAL
+            #include "data\cup\ech\medic\weapons.hpp"
+            #include "data\cup\ech\withStupid\weapons.hpp"
+            #include "data\cup\ech\barker\weapons.hpp"
+            #include "data\cup\ech\libby\weapons.hpp"
+            #include "data\cup\ech\shark\weapons.hpp"
+            #define FINAL
+            #include "data\cfp\cvc\shark\weapons.hpp"
+            #undef FINAL
         };
     };
 };
 
-// #include "CfgEventHandlers.hpp"
-// #include "CfgWeapons.hpp"
-// #include "CfgWFARArsenalAccess.hpp"
-// #include "CfgConditionalArsenalAccess.hpp"
+#include "CfgEventHandlers.hpp"
+#include "CfgWeapons.hpp"
+#include "CfgWFARArsenalAccess.hpp"
+#include "CfgConditionalArsenalAccess.hpp"

addons/retextures/data/cfp/cvc/gecko/CfgWeapons.hpp

@@ -0,0 +1,48 @@
+class wfar_gecko_cvc_alt: rhsusf_cvc_alt_helmet
+{
+    author="Walthzer/Shark";
+    dlc="";
+    scopeArsenal=0;
+    picture="\rhsusf\addons\rhsusf_inventoryicons\data\headgear\rhsusf_cvc_alt_helmet_ca.paa";
+    displayName=QUOTE(ACVC-H MK-1697 Gecko (Tan));
+    hiddenSelectionsTextures[]=
+    {
+        QUOTE(z\wfar\addons\retextures\data\rhsusf\cvc\gecko\standard\rhs_cvc_alt_co.paa)
+    };
+};
+class wfar_gecko_cvc_green_alt: wfar_gecko_cvc_alt
+{
+    author="Walthzer/Shark";
+    dlc="";
+    scopeArsenal=0;
+    picture="\rhsusf\addons\rhsusf_inventoryicons\data\headgear\rhsusf_cvc_green_helmet_ca.paa";
+    displayName=QUOTE(ACVC-H MK-1697 Gecko);
+    hiddenSelectionsTextures[]=
+    {
+        QUOTE(z\wfar\addons\retextures\data\rhsusf\cvc\gecko\standard\rhs_cvc_green_alt_co.paa)
+    };
+};
+class wfar_gecko_cvc_ess: rhsusf_cvc_ess
+{
+    author="Walthzer/Shark";
+    dlc="";
+    scopeArsenal=0;
+    picture="\rhsusf\addons\rhsusf_inventoryicons\data\headgear\rhsusf_cvc_ess_ca.paa";
+    displayName=QUOTE(ACVC-H MK-1697 Gecko (Tan/ESS));
+    hiddenSelectionsTextures[]=
+    {
+        QUOTE(z\wfar\addons\retextures\data\rhsusf\cvc\gecko\standard\rhs_cvc_alt_co.paa)
+    };
+};
+class wfar_gecko_cvc_green_ess: wfar_gecko_cvc_ess
+{
+    author="Walthzer/Shark";
+    dlc="";
+    scopeArsenal=0;
+    picture="\rhsusf\addons\rhsusf_inventoryicons\data\headgear\rhsusf_cvc_ess_ca.paa";
+    displayName=QUOTE(ACVC-H MK-1697 Gecko (ESS));
+    hiddenSelectionsTextures[]=
+    {
+        QUOTE(z\wfar\addons\retextures\data\rhsusf\cvc\gecko\standard\rhs_cvc_green_alt_co.paa)
+    };
+};

addons/retextures/data/cfp/cvc/gecko/weapons.hpp

@@ -0,0 +1,8 @@
+"wfar_gecko_cvc_alt",
+"wfar_gecko_cvc_green_alt",
+"wfar_gecko_cvc_ess",
+#ifdef FINAL
+    "wfar_gecko_cvc_green_ess"
+#else
+    "wfar_gecko_cvc_green_ess",
+#endif

addons/retextures/data/cfp/cvc/shark/CfgWeapons.hpp

@@ -0,0 +1,24 @@
+class wfar_shark_helmet_cvc_black: SP_CVCHelmet_Black
+{
+    author="Walthzer/Shark";
+    dlc="";
+    scopeArsenal=0;
+    displayName=QUOTE(CVC BLACK Shark);
+    picture = QUOTE(z\wfar\addons\insignia\scripted\dev_team.paa);
+    hiddenSelectionsTextures[] = {QUOTE(z\wfar\addons\retextures\data\cfp\cvc\shark\standard\black.paa)};
+};
+class wfar_shark_helmet_cvc_blue: wfar_shark_helmet_cvc_black
+{
+    displayName=QUOTE(CVC BLUE Shark);
+    hiddenSelectionsTextures[] = {QUOTE(z\wfar\addons\retextures\data\cfp\cvc\shark\standard\blue.paa)};
+};
+class wfar_shark_helmet_cvc_green: wfar_shark_helmet_cvc_black
+{
+    displayName=QUOTE(CVC GREEN Shark);
+    hiddenSelectionsTextures[] = {QUOTE(z\wfar\addons\retextures\data\cfp\cvc\shark\standard\green.paa)};
+};
+class wfar_shark_helmet_cvc_tan: wfar_shark_helmet_cvc_black
+{
+    displayName=QUOTE(CVC TAN Shark);
+    hiddenSelectionsTextures[] = {QUOTE(z\wfar\addons\retextures\data\cfp\cvc\shark\standard\tan.paa)};
+};

addons/retextures/data/cfp/cvc/shark/weapons.hpp

@@ -0,0 +1,8 @@
+"wfar_shark_helmet_cvc_black",
+"wfar_shark_helmet_cvc_blue",
+"wfar_shark_helmet_cvc_green",
+#ifdef FINAL
+    "wfar_shark_helmet_cvc_tan"
+#else
+    "wfar_shark_helmet_cvc_tan",
+#endif

addons/retextures/data/cup/ech/barker/CfgWeapons.hpp

@@ -0,0 +1,108 @@
+class wfar_barker_helmet_ech_marpat_wd: CUP_H_USArmy_ECH_MARPAT
+{
+    author="Walthzer/shark";
+    dlc="";
+    scopeArsenal=0;
+    displayName=QUOTE(ECH Barker (Woodland));
+    picture = QUOTE(z\wfar\addons\insignia\scripted\dev_team.paa);
+    hiddenSelectionsTextures[]=
+    {
+        QUOTE(z\wfar\addons\retextures\data\cup\ech\barker\standard\ach_marpat_co.paa),
+        "\CUP\Creatures\People\Military\CUP_Creatures_People_Military_USArmy\data\h_gear_01_cb_co.paa"
+    };
+};
+class wfar_barker_helmet_ech_ess_marpat_wd: CUP_H_USArmy_ECH_ESS_MARPAT
+{
+    author="Walthzer/shark";
+    dlc="";
+    scopeArsenal=0;
+    displayName=QUOTE(ECH Barker (Woodland/Goggles));
+    picture = QUOTE(z\wfar\addons\insignia\scripted\dev_team.paa);
+    hiddenSelectionsTextures[]=
+    {
+        QUOTE(z\wfar\addons\retextures\data\cup\ech\barker\standard\ach_marpat_co.paa),
+        "\CUP\Creatures\People\Military\CUP_Creatures_People_Military_USArmy\data\h_gear_01_cb_co.paa"
+    };
+};
+class wfar_barker_helmet_ech_headset_marpat_wd: CUP_H_USArmy_ECH_Headset_MARPAT
+{
+    author="Walthzer/shark";
+    dlc="";
+    scopeArsenal=0;
+    displayName=QUOTE(ECH Barker (Woodland/Headset));
+    picture = QUOTE(z\wfar\addons\insignia\scripted\dev_team.paa);
+    hiddenSelectionsTextures[]=
+    {
+        QUOTE(z\wfar\addons\retextures\data\cup\ech\barker\standard\ach_marpat_co.paa),
+        "\CUP\Creatures\People\Military\CUP_Creatures_People_Military_USArmy\data\h_gear_01_cb_co.paa"
+    };
+};
+class wfar_barker_helmet_ech_ess_headset_marpat_wd: CUP_H_USArmy_ECH_ESS_Headset_MARPAT
+{
+    author="Walthzer/shark";
+    dlc="";
+    scopeArsenal=0;
+    displayName=QUOTE(ECH Barker (Woodland/Headset/Goggles));
+    picture = QUOTE(z\wfar\addons\insignia\scripted\dev_team.paa);
+    hiddenSelectionsTextures[]=
+    {
+        QUOTE(z\wfar\addons\retextures\data\cup\ech\barker\standard\ach_marpat_co.paa),
+        "\CUP\Creatures\People\Military\CUP_Creatures_People_Military_USArmy\data\h_gear_01_cb_co.paa"
+    };
+};
+
+//---------------------------------
+//-----------Desert---------------
+//---------------------------------
+class wfar_barker_helmet_ech_marpat_des: CUP_H_USArmy_ECH_MARPAT_des
+{
+    author="Walthzer/shark";
+    dlc="";
+    scopeArsenal=0;
+    displayName=QUOTE(ECH Barker (Desert));
+    picture = QUOTE(z\wfar\addons\insignia\scripted\dev_team.paa);
+    hiddenSelectionsTextures[]=
+    {
+        QUOTE(z\wfar\addons\retextures\data\cup\ech\barker\standard\ach_marpat_des_co.paa),
+        "\CUP\Creatures\People\Military\CUP_Creatures_People_Military_USArmy\data\h_gear_01_cb_co.paa"
+    };
+};
+class wfar_barker_helmet_ech_ess_marpat_des: CUP_H_USArmy_ECH_ESS_MARPAT_des
+{
+    author="Walthzer/shark";
+    dlc="";
+    scopeArsenal=0;
+    displayName=QUOTE(ECH Barker (Desert/Goggles));
+    picture = QUOTE(z\wfar\addons\insignia\scripted\dev_team.paa);
+    hiddenSelectionsTextures[]=
+    {
+        QUOTE(z\wfar\addons\retextures\data\cup\ech\barker\standard\ach_marpat_des_co.paa),
+        "\CUP\Creatures\People\Military\CUP_Creatures_People_Military_USArmy\data\h_gear_01_cb_co.paa"
+    };
+};
+class wfar_barker_helmet_ech_headset_marpat_des: CUP_H_USArmy_ECH_Headset_MARPAT_des
+{
+    author="Walthzer/shark";
+    dlc="";
+    scopeArsenal=0;
+    displayName=QUOTE(ECH Barker (Desert/Headset));
+    picture = QUOTE(z\wfar\addons\insignia\scripted\dev_team.paa);
+    hiddenSelectionsTextures[]=
+    {
+        QUOTE(z\wfar\addons\retextures\data\cup\ech\barker\standard\ach_marpat_des_co.paa),
+        "\CUP\Creatures\People\Military\CUP_Creatures_People_Military_USArmy\data\h_gear_01_cb_co.paa"
+    };
+};
+class wfar_barker_helmet_ech_ess_headset_marpat_des: CUP_H_USArmy_ECH_ESS_Headset_MARPAT_des
+{
+    author="Walthzer/shark";
+    dlc="";
+    scopeArsenal=0;
+    displayName=QUOTE(ECH Barker (Desert/Headset/Goggles));
+    picture = QUOTE(z\wfar\addons\insignia\scripted\dev_team.paa);
+    hiddenSelectionsTextures[]=
+    {
+        QUOTE(z\wfar\addons\retextures\data\cup\ech\barker\standard\ach_marpat_des_co.paa),
+        "\CUP\Creatures\People\Military\CUP_Creatures_People_Military_USArmy\data\h_gear_01_cb_co.paa"
+    };
+};

addons/retextures/data/cup/ech/barker/weapons.hpp

@@ -0,0 +1,12 @@
+"wfar_barker_helmet_ech_marpat_wd",
+"wfar_barker_helmet_ech_ess_marpat_wd",
+"wfar_barker_helmet_ech_headset_marpat_wd",
+"wfar_barker_helmet_ech_ess_headset_marpat_wd",
+"wfar_barker_helmet_ech_ess_marpat_des",
+"wfar_barker_helmet_ech_headset_marpat_des",
+"wfar_barker_helmet_ech_ess_headset_marpat_des",
+#ifdef FINAL
+    "wfar_barker_helmet_ech_marpat_des"
+#else
+    "wfar_barker_helmet_ech_marpat_des",
+#endif