From e58f66dad67eeb4641d10e3b4134ab207476db7d Mon Sep 17 00:00:00 2001 From: Bear Date: Mon, 30 Dec 2024 15:57:19 -0300 Subject: [PATCH] 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$ | 1 + addons/CUPcompat/addon.toml | 2 + .../characters}/CUP/config.cpp | 5 ++ .../characters}/CUP/thug_opfor_units_CUP.hpp | 42 ++++++++--------- addons/CUPcompat/config.cpp | 46 +++++++++++++++++++ .../functions/fn_thugsequippistolCUP.sqf | 0 .../functions/fn_thugsequiprifleCUP.sqf | 2 +- .../functions/fn_thugsequipshotgunCUP.sqf | 4 +- .../functions/fn_thugsequipsmgCUP.sqf | 0 .../functions/fn_thugsequipsniperCUP.sqf | 2 +- .../functions/fn_thugsequipvestCUP.sqf | 0 .../functions/fn_thugswearCUP.sqf | 0 .../functions/fn_thugswearbikerCUP.sqf | 0 addons/characters/units/thug_opfor_units.hpp | 2 +- addons/main/config.cpp | 24 ---------- 15 files changed, 80 insertions(+), 50 deletions(-) create mode 100644 addons/CUPcompat/$PBOPREFIX$ create mode 100644 addons/CUPcompat/addon.toml rename addons/{characters/units => CUPcompat/characters}/CUP/config.cpp (83%) rename addons/{characters/units => CUPcompat/characters}/CUP/thug_opfor_units_CUP.hpp (73%) create mode 100644 addons/CUPcompat/config.cpp rename addons/{main => CUPcompat}/functions/fn_thugsequippistolCUP.sqf (100%) rename addons/{main => CUPcompat}/functions/fn_thugsequiprifleCUP.sqf (97%) rename addons/{main => CUPcompat}/functions/fn_thugsequipshotgunCUP.sqf (90%) rename addons/{main => CUPcompat}/functions/fn_thugsequipsmgCUP.sqf (100%) rename addons/{main => CUPcompat}/functions/fn_thugsequipsniperCUP.sqf (94%) rename addons/{main => CUPcompat}/functions/fn_thugsequipvestCUP.sqf (100%) rename addons/{main => CUPcompat}/functions/fn_thugswearCUP.sqf (100%) rename addons/{main => CUPcompat}/functions/fn_thugswearbikerCUP.sqf (100%) diff --git a/addons/CUPcompat/$PBOPREFIX$ b/addons/CUPcompat/$PBOPREFIX$ new file mode 100644 index 0000000..2a282e6 --- /dev/null +++ b/addons/CUPcompat/$PBOPREFIX$ @@ -0,0 +1 @@ +braf\braf_factions\addons\CUPcompat \ No newline at end of file diff --git a/addons/CUPcompat/addon.toml b/addons/CUPcompat/addon.toml new file mode 100644 index 0000000..f28eeb2 --- /dev/null +++ b/addons/CUPcompat/addon.toml @@ -0,0 +1,2 @@ +[rapify] +enabled = false \ No newline at end of file diff --git a/addons/characters/units/CUP/config.cpp b/addons/CUPcompat/characters/CUP/config.cpp similarity index 83% rename from addons/characters/units/CUP/config.cpp rename to addons/CUPcompat/characters/CUP/config.cpp index 6840aab..ed99e9c 100644 --- a/addons/characters/units/CUP/config.cpp +++ b/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 + diff --git a/addons/characters/units/CUP/thug_opfor_units_CUP.hpp b/addons/CUPcompat/characters/CUP/thug_opfor_units_CUP.hpp similarity index 73% rename from addons/characters/units/CUP/thug_opfor_units_CUP.hpp rename to addons/CUPcompat/characters/CUP/thug_opfor_units_CUP.hpp index 0fc025d..14c9434 100644 --- a/addons/characters/units/CUP/thug_opfor_units_CUP.hpp +++ b/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; }; \ No newline at end of file diff --git a/addons/CUPcompat/config.cpp b/addons/CUPcompat/config.cpp new file mode 100644 index 0000000..18d7274 --- /dev/null +++ b/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 + + diff --git a/addons/main/functions/fn_thugsequippistolCUP.sqf b/addons/CUPcompat/functions/fn_thugsequippistolCUP.sqf similarity index 100% rename from addons/main/functions/fn_thugsequippistolCUP.sqf rename to addons/CUPcompat/functions/fn_thugsequippistolCUP.sqf diff --git a/addons/main/functions/fn_thugsequiprifleCUP.sqf b/addons/CUPcompat/functions/fn_thugsequiprifleCUP.sqf similarity index 97% rename from addons/main/functions/fn_thugsequiprifleCUP.sqf rename to addons/CUPcompat/functions/fn_thugsequiprifleCUP.sqf index 9e38910..b84f5dd 100644 --- a/addons/main/functions/fn_thugsequiprifleCUP.sqf +++ b/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]; \ No newline at end of file diff --git a/addons/main/functions/fn_thugsequipshotgunCUP.sqf b/addons/CUPcompat/functions/fn_thugsequipshotgunCUP.sqf similarity index 90% rename from addons/main/functions/fn_thugsequipshotgunCUP.sqf rename to addons/CUPcompat/functions/fn_thugsequipshotgunCUP.sqf index b560b58..a460d4e 100644 --- a/addons/main/functions/fn_thugsequipshotgunCUP.sqf +++ b/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]; \ No newline at end of file diff --git a/addons/main/functions/fn_thugsequipsmgCUP.sqf b/addons/CUPcompat/functions/fn_thugsequipsmgCUP.sqf similarity index 100% rename from addons/main/functions/fn_thugsequipsmgCUP.sqf rename to addons/CUPcompat/functions/fn_thugsequipsmgCUP.sqf diff --git a/addons/main/functions/fn_thugsequipsniperCUP.sqf b/addons/CUPcompat/functions/fn_thugsequipsniperCUP.sqf similarity index 94% rename from addons/main/functions/fn_thugsequipsniperCUP.sqf rename to addons/CUPcompat/functions/fn_thugsequipsniperCUP.sqf index 6c08cc0..d712f34 100644 --- a/addons/main/functions/fn_thugsequipsniperCUP.sqf +++ b/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]; diff --git a/addons/main/functions/fn_thugsequipvestCUP.sqf b/addons/CUPcompat/functions/fn_thugsequipvestCUP.sqf similarity index 100% rename from addons/main/functions/fn_thugsequipvestCUP.sqf rename to addons/CUPcompat/functions/fn_thugsequipvestCUP.sqf diff --git a/addons/main/functions/fn_thugswearCUP.sqf b/addons/CUPcompat/functions/fn_thugswearCUP.sqf similarity index 100% rename from addons/main/functions/fn_thugswearCUP.sqf rename to addons/CUPcompat/functions/fn_thugswearCUP.sqf diff --git a/addons/main/functions/fn_thugswearbikerCUP.sqf b/addons/CUPcompat/functions/fn_thugswearbikerCUP.sqf similarity index 100% rename from addons/main/functions/fn_thugswearbikerCUP.sqf rename to addons/CUPcompat/functions/fn_thugswearbikerCUP.sqf diff --git a/addons/characters/units/thug_opfor_units.hpp b/addons/characters/units/thug_opfor_units.hpp index f40fc77..8a1e007 100644 --- a/addons/characters/units/thug_opfor_units.hpp +++ b/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;};"; }; }; diff --git a/addons/main/config.cpp b/addons/main/config.cpp index dc7aca4..e088a49 100644 --- a/addons/main/config.cpp +++ b/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"; - }; }; }; };