moved CUP files to it's own pbo so i can add the addon.toml to not rapify the pbo and allow for #if __has_include statements

addons/CUPcompat/$PBOPREFIX$

@@ -0,0 +1 @@
+braf\braf_factions\addons\CUPcompat

addons/CUPcompat/addon.toml

@@ -0,0 +1,2 @@
+[rapify]
+enabled = false

addons/CUPcompat/characters/CUP/config.cpp

@@ -15,10 +15,15 @@ class CfgPatches
     };
 };
 
+
+#if __has_include("\CUP\Weapons\CUP_Weapons_DynamicLoadout\mk82\CUP_mk82_pod.p3d")
 class DefaultEventHandlers;
 class CfgVehicles
 {
     skipWhenMissingDependencies = 1;
+    
     #include "thug_opfor_units_CUP.hpp"
 };
+#endif
+
 

addons/CUPcompat/characters/CUP/thug_opfor_units_CUP.hpp

@@ -7,12 +7,12 @@ class O_G_soldier_M_F:I_G_Soldier_base_F
 {
   class EventHandlers;
 };
-class braf_factions_thug_pistol: O_G_Soldier_F
+class braf_factions_CUP_thug_pistol: O_G_Soldier_F
 {
   scope = 2;
   scopeArsenal = 2;
   scopeCurator = 2;
-  _generalMacro = "braf_factions_thug_pistol";
+  _generalMacro = "braf_factions_CUP_thug_pistol";
   displayName = "Thug (Pistol)";
   faction = "BRAF_Thugs";
   uniformClass = "U_I_C_Soldier_Bandit_4_F";
@@ -28,19 +28,19 @@ class braf_factions_thug_pistol: O_G_Soldier_F
     "Head_Tanoan"
   };
   class EventHandlers : EventHandlers {
-  init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_fnc_thugswearCUP;[_this select 0] call braf_factions_fnc_thugsequippistolCUP;};[_this select 0] call braf_factions_fnc_thugsequipvestCUP;};";
+  init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_CUP_fnc_thugswearCUP;[_this select 0] call braf_factions_CUP_fnc_thugsequippistolCUP;};[_this select 0] call braf_factions_CUP_fnc_thugsequipvestCUP;};";
   };
   skipWhenMissingDependencies = 1;
 };
 
 
 
-class braf_factions_thug_marksman: O_G_soldier_M_F
+class braf_factions_CUP_thug_marksman: O_G_soldier_M_F
 {
   scope = 2;
   scopeArsenal = 2;
   scopeCurator = 2;
-  _generalMacro = "braf_factions_thug_marksman";
+  _generalMacro = "braf_factions_CUP_thug_marksman";
   displayName = "Thug (Marksman)";
   faction = "BRAF_Thugs";
   uniformClass = "U_I_C_Soldier_Bandit_4_F";
@@ -56,17 +56,17 @@ class braf_factions_thug_marksman: O_G_soldier_M_F
     "Head_Tanoan"
   };
   class EventHandlers : EventHandlers {
-  init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_fnc_thugswearCUP;[_this select 0] call braf_factions_fnc_thugsequipsniperCUP;[_this select 0] call braf_factions_fnc_thugsequipvestCUP;};";
+  init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_CUP_fnc_thugswearCUP;[_this select 0] call braf_factions_CUP_fnc_thugsequipsniperCUP;[_this select 0] call braf_factions_CUP_fnc_thugsequipvestCUP;};";
   };
   skipWhenMissingDependencies = 1;
 };
 
-class braf_factions_thug_rifleman: O_G_Soldier_F
+class braf_factions_CUP_thug_rifleman: O_G_Soldier_F
 {
   scope = 2;
   scopeArsenal = 2;
   scopeCurator = 2;
-  _generalMacro = "braf_factions_thug_marksman";
+  _generalMacro = "braf_factions_CUP_thug_marksman";
   displayName = "Thug (AKM)";
   faction = "BRAF_Thugs";
   uniformClass = "U_I_C_Soldier_Bandit_4_F";
@@ -82,17 +82,17 @@ class braf_factions_thug_rifleman: O_G_Soldier_F
     "Head_Tanoan"
   };
   class EventHandlers : EventHandlers {
-  init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_fnc_thugswearCUP;[_this select 0] call braf_factions_fnc_thugsequiprifleCUP;};[_this select 0] call braf_factions_fnc_thugsequipvestCUP;";
+  init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_CUP_fnc_thugswearCUP;[_this select 0] call braf_factions_CUP_fnc_thugsequiprifleCUP;};[_this select 0] call braf_factions_CUP_fnc_thugsequipvestCUP;";
   };
   skipWhenMissingDependencies = 1;
 };
 
-class braf_factions_thug_shotgun: O_G_Soldier_F
+class braf_factions_CUP_thug_shotgun: O_G_Soldier_F
 {
   scope = 2;
   scopeArsenal = 2;
   scopeCurator = 2;
-  _generalMacro = "braf_factions_thug_shotgun";
+  _generalMacro = "braf_factions_CUP_thug_shotgun";
   displayName = "Thug (Shotgun)";
   faction = "BRAF_Thugs";
   uniformClass = "U_I_C_Soldier_Bandit_4_F";
@@ -108,17 +108,17 @@ class braf_factions_thug_shotgun: O_G_Soldier_F
     "Head_Tanoan"
   };
   class EventHandlers : EventHandlers {
-  init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_fnc_thugswearCUP;[_this select 0] call braf_factions_fnc_thugsequipshotgunCUP;};[_this select 0] call braf_factions_fnc_thugsequipvestCUP;";
+  init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_CUP_fnc_thugswearCUP;[_this select 0] call braf_factions_CUP_fnc_thugsequipshotgunCUP;};[_this select 0] call braf_factions_CUP_fnc_thugsequipvestCUP;";
   };
   skipWhenMissingDependencies = 1;
 };
 
-class braf_factions_thug_smg: O_G_Soldier_F
+class braf_factions_CUP_thug_smg: O_G_Soldier_F
 {
   scope = 2;
   scopeArsenal = 2;
   scopeCurator = 2;
-  _generalMacro = "braf_factions_thug_smg";
+  _generalMacro = "braf_factions_CUP_thug_smg";
   displayName = "Thug (SMG)";
   faction = "BRAF_Thugs";
   uniformClass = "U_I_C_Soldier_Bandit_4_F";
@@ -134,17 +134,17 @@ class braf_factions_thug_smg: O_G_Soldier_F
     "Head_Tanoan"
   };
   class EventHandlers : EventHandlers {
-  init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_fnc_thugswearCUP;[_this select 0] call braf_factions_fnc_thugsequipsmgCUP;};[_this select 0] call braf_factions_fnc_thugsequipvestCUP;";
+  init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_CUP_fnc_thugswearCUP;[_this select 0] call braf_factions_CUP_fnc_thugsequipsmgCUP;};[_this select 0] call braf_factions_CUP_fnc_thugsequipvestCUP;";
   };
   skipWhenMissingDependencies = 1;
 };
 
-class braf_factions_thug_biker: O_G_Soldier_F
+class braf_factions_CUP_thug_biker: O_G_Soldier_F
 {
   scope = 2;
   scopeArsenal = 2;
   scopeCurator = 2;
-  _generalMacro = "braf_factions_thug_biker";
+  _generalMacro = "braf_factions_CUP_thug_biker";
   displayName = "Thug (Biker)";
   faction = "BRAF_Thugs";
   uniformClass = "U_I_C_Soldier_Bandit_4_F";
@@ -160,17 +160,17 @@ class braf_factions_thug_biker: O_G_Soldier_F
     "Head_Tanoan"
   };
   class EventHandlers : EventHandlers {
-  init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_fnc_thugswearbikerCUP;[_this select 0] call braf_factions_fnc_thugsequippistolCUP;};[_this select 0] call braf_factions_fnc_thugsequipvestCUP;};";
+  init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_CUP_fnc_thugswearbikerCUP;[_this select 0] call braf_factions_CUP_fnc_thugsequippistolCUP;};[_this select 0] call braf_factions_CUP_fnc_thugsequipvestCUP;};";
   };
   skipWhenMissingDependencies = 1;
 };
 
-class braf_factions_thug_at: O_G_Soldier_F
+class braf_factions_CUP_thug_at: O_G_Soldier_F
 {
   scope = 2;
   scopeArsenal = 2;
   scopeCurator = 2;
-  _generalMacro = "braf_factions_thug_at";
+  _generalMacro = "braf_factions_CUP_thug_at";
   displayName = "Thug (AT)";
   faction = "BRAF_Thugs";
   uniformClass = "U_I_C_Soldier_Bandit_4_F";
@@ -186,7 +186,7 @@ class braf_factions_thug_at: O_G_Soldier_F
     "Head_Tanoan"
   };
   class EventHandlers : EventHandlers {
-  init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_fnc_thugswearCUP;[_this select 0] call braf_factions_fnc_thugsequiprifleCUP;};[_this select 0] call braf_factions_fnc_thugsequipvestCUP;";
+  init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_CUP_fnc_thugswearCUP;[_this select 0] call braf_factions_CUP_fnc_thugsequiprifleCUP;};[_this select 0] call braf_factions_CUP_fnc_thugsequipvestCUP;";
   };
   skipWhenMissingDependencies = 1;
 };

addons/CUPcompat/config.cpp

@@ -0,0 +1,46 @@
+class CfgPatches {
+  class braf_factions_CUP_compat {
+    author = "BRAF Team";
+    requiredAddons[] = {
+      "braf_main",
+    };
+    requiredVersion = 0.1;
+    units[] = {};
+    weapons[] = {};
+  };
+};
+
+#if __has_include("\CUP\Weapons\CUP_Weapons_DynamicLoadout\mk82\CUP_mk82_pod.p3d")
+class CfgFunctions {
+    class braf_factions_CUP {
+        class functions {
+            class thugswearCUP {
+                file = "braf\braf_factions\addons\main\functions\fn_thugswearCUP.sqf";
+            };
+            class thugsequiprifleCUP {
+                file = "braf\braf_factions\addons\main\functions\fn_thugsequiprifleCUP.sqf";
+            };
+            class thugsequippistolCUP {
+                file = "braf\braf_factions\addons\main\functions\fn_thugsequippistolCUP.sqf";
+            };
+            class thugsequipsniperCUP {
+                file = "braf\braf_factions\addons\main\functions\fn_thugsequipsniperCUP.sqf";
+            };
+            class thugsequipvestCUP {
+                file = "braf\braf_factions\addons\main\functions\fn_thugsequipvestCUP.sqf";
+            };
+            class thugsequipshotgunCUP {
+                file = "braf\braf_factions\addons\main\functions\fn_thugsequipshotgunCUP.sqf";
+            };
+            class thugsequipsmgCUP {
+                file = "braf\braf_factions\addons\main\functions\fn_thugsequipsmgCUP.sqf";
+            };
+            class thugswearbikerCUP {
+                file = "braf\braf_factions\addons\main\functions\fn_thugswearbikerCUP.sqf";
+            };
+        };
+    };
+};
+#endif
+
+

addons/CUPcompat/functions/fn_thugsequiprifleCUP.sqf

@@ -85,6 +85,6 @@ _definedWeapon = (selectRandom _weapon);
 _unit addWeaponGlobal _definedWeapon;
 
 _compatibleMagazines = compatibleMagazines _definedWeapon;
-_compatibleMagazines = _compatibleMagazines - magazineBlacklist
+_compatibleMagazines = _compatibleMagazines - magazineBlacklist;
 _magazine = (selectRandom _compatibleMagazines);
 _unit addMagazines [_magazine, 6];

addons/CUPcompat/functions/fn_thugsequipshotgunCUP.sqf

@@ -1,6 +1,6 @@
 params["_unit"];
 
-magazineBlacklist = ["BRAF_Boito_5Rnd_riot","BRAF_Boito_7Rnd_riot"]
+magazineBlacklist = ["BRAF_Boito_5Rnd_riot","BRAF_Boito_7Rnd_riot"];
 
 _weapon = [
 	
@@ -21,7 +21,7 @@ _definedWeapon = (selectRandom _weapon);
 _unit addWeaponGlobal _definedWeapon;
 
 _compatibleMagazines = compatibleMagazines _definedWeapon;
-_compatibleMagazines = _compatibleMagazines - magazineBlacklist
+_compatibleMagazines = _compatibleMagazines - magazineBlacklist;
 
 _magazine = (selectRandom _compatibleMagazines);
 _unit addMagazines [_magazine, 6];

addons/CUPcompat/functions/fn_thugsequipsniperCUP.sqf

@@ -39,7 +39,7 @@ _definedWeapon = (selectRandom _sniper);
 _unit addWeaponGlobal _definedWeapon;
 
 _compatibleMagazines = compatibleMagazines _definedWeapon;
-_compatibleMagazines = _compatibleMagazines - magazineBlacklist
+_compatibleMagazines = _compatibleMagazines - magazineBlacklist;
 
 _magazine = (selectRandom _compatibleMagazines);
 _unit addMagazines [_magazine, 6];

addons/characters/units/thug_opfor_units.hpp

@@ -28,7 +28,7 @@ class braf_factions_thug_pistol: O_G_Soldier_F
     "Head_Tanoan"
   };
         class EventHandlers : EventHandlers {
-        init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_fnc_thugswear;[_this select 0] call braf_factions_fnc_thugsequippistolCUP;};";
+        init = "if (local (_this select 0)) then {[(_this select 0), [], nil] call BIS_fnc_unitHeadgear;[_this select 0] call braf_factions_fnc_thugswear;};";
         };
 
 };

addons/main/config.cpp

@@ -16,30 +16,6 @@ class CfgFunctions {
             class thugswear {
                 file = "braf\braf_factions\addons\main\functions\fn_thugswear.sqf";
             };
-            class thugswearCUP {
-                file = "braf\braf_factions\addons\main\functions\fn_thugswearCUP.sqf";
-            };
-            class thugsequiprifleCUP {
-                file = "braf\braf_factions\addons\main\functions\fn_thugsequiprifleCUP.sqf";
-            };
-            class thugsequippistolCUP {
-                file = "braf\braf_factions\addons\main\functions\fn_thugsequippistolCUP.sqf";
-            };
-            class thugsequipsniperCUP {
-                file = "braf\braf_factions\addons\main\functions\fn_thugsequipsniperCUP.sqf";
-            };
-            class thugsequipvestCUP {
-                file = "braf\braf_factions\addons\main\functions\fn_thugsequipvestCUP.sqf";
-            };
-            class thugsequipshotgunCUP {
-                file = "braf\braf_factions\addons\main\functions\fn_thugsequipshotgunCUP.sqf";
-            };
-            class thugsequipsmgCUP {
-                file = "braf\braf_factions\addons\main\functions\fn_thugsequipsmgCUP.sqf";
-            };
-            class thugswearbikerCUP {
-                file = "braf\braf_factions\addons\main\functions\fn_thugswearbikerCUP.sqf";
-            };
         };
     };
 };