diff --git a/addons/CUPcompat/characters/CUP/config.cpp b/addons/CUPcompat/characters/CUP/config.cpp index 23e0385..5c6e141 100644 --- a/addons/CUPcompat/characters/CUP/config.cpp +++ b/addons/CUPcompat/characters/CUP/config.cpp @@ -29,6 +29,14 @@ class CfgVehicles #include "thug_opfor_units_CUP.hpp" }; +class CfgWeapons +{ + class Item_Base_F; + class U_I_C_Soldier_Bandit_4_F: Item_Base_F + { + modelSides[] = {3,2,1,0}; + }; +}; #endif diff --git a/addons/CUPcompat/functions/fn_thugsequiprifleCUP.sqf b/addons/CUPcompat/functions/fn_thugsequiprifleCUP.sqf index 1d26f09..0565b07 100644 --- a/addons/CUPcompat/functions/fn_thugsequiprifleCUP.sqf +++ b/addons/CUPcompat/functions/fn_thugsequiprifleCUP.sqf @@ -84,8 +84,9 @@ _currentMagazine = getArray ( configFile >> "CfgWeapons" >> primaryWeapon _unit _definedWeapon = (selectRandom _weapon); _unit addWeaponGlobal _definedWeapon; -_compatibleMagazines = _compatibleMagazines - magazineBlacklist; + _compatibleMagazines = compatibleMagazines _definedWeapon; +_compatibleMagazines = _compatibleMagazines - magazineBlacklist; _magazine = (selectRandom _compatibleMagazines); _unit addMagazines [_magazine, 6]; \ No newline at end of file diff --git a/addons/CUPcompat/functions/fn_thugsequipsniperCUP.sqf b/addons/CUPcompat/functions/fn_thugsequipsniperCUP.sqf index 3e44dcd..0f12a0e 100644 --- a/addons/CUPcompat/functions/fn_thugsequipsniperCUP.sqf +++ b/addons/CUPcompat/functions/fn_thugsequipsniperCUP.sqf @@ -38,8 +38,9 @@ _currentMagazine = getArray ( configFile >> "CfgWeapons" >> primaryWeapon _unit _definedWeapon = (selectRandom _sniper); _unit addWeaponGlobal _definedWeapon; -_compatibleMagazines = _compatibleMagazines - magazineBlacklist; + _compatibleMagazines = compatibleMagazines _definedWeapon; +_compatibleMagazines = _compatibleMagazines - magazineBlacklist; _magazine = (selectRandom _compatibleMagazines); diff --git a/addons/CUPcompat/functions/fn_thugsequipvestCUP.sqf b/addons/CUPcompat/functions/fn_thugsequipvestCUP.sqf index 4bd2706..c0b2074 100644 --- a/addons/CUPcompat/functions/fn_thugsequipvestCUP.sqf +++ b/addons/CUPcompat/functions/fn_thugsequipvestCUP.sqf @@ -106,4 +106,8 @@ Vests = [ "braf_ephod_vest" ]; -_unit addVest (selectRandom Vests); \ No newline at end of file +_randomVests = selectRandom Vests +if (((_randomVests) != "") || (!isNull(_randomVests))) then +{ + _unit addVest _randomVests; +}; // IF Statement criado para parar com erros no log \ No newline at end of file diff --git a/addons/CUPcompat/functions/fn_thugswearCUP.sqf b/addons/CUPcompat/functions/fn_thugswearCUP.sqf index fe62bd1..8179c8d 100644 --- a/addons/CUPcompat/functions/fn_thugswearCUP.sqf +++ b/addons/CUPcompat/functions/fn_thugswearCUP.sqf @@ -140,6 +140,20 @@ facewears = [ "CUP_G_WristWatch", "G_EyeProtectors_F" ]; -_unit forceAddUniform (selectRandom suits); -_unit addHeadgear (selectRandom headgears); -_unit addGoggles (selectRandom facewears); \ No newline at end of file +_randomSuit = selectRandom suits +if (((_randomSuit) != "") || (!isNull(_randomSuit))) then +{ + _unit forceAddUniform _randomSuit; +}; // IF Statement criado por que sim + +_randomHeadgear = selectRandom headgears +if (((_randomHeadgear) != "") || (!isNull(_randomHeadgear))) then +{ + _unit addHeadgear _randomHeadgear; +}; // IF Statement criado para parar com erros no log + +_randomFacewears = selectRandom facewears +if (((_randomFacewears) != "") || (!isNull(_randomFacewears))) then +{ + _unit addGoggles _randomFacewears; +}; // IF Statement criado para parar com erros no log \ No newline at end of file diff --git a/addons/CUPcompat/functions/fn_thugswearbikerCUP.sqf b/addons/CUPcompat/functions/fn_thugswearbikerCUP.sqf index 7c7ee69..465b1b7 100644 --- a/addons/CUPcompat/functions/fn_thugswearbikerCUP.sqf +++ b/addons/CUPcompat/functions/fn_thugswearbikerCUP.sqf @@ -26,6 +26,10 @@ suits = [ ]; headgears = [ + "", + "", + "", + "", "", "", "", @@ -101,6 +105,20 @@ facewears = [ "CUP_G_WristWatch", "G_EyeProtectors_F" ]; -_unit forceAddUniform (selectRandom suits); -_unit addHeadgear (selectRandom headgears); -_unit addGoggles (selectRandom facewears); \ No newline at end of file +_randomSuit = selectRandom suits +if (((_randomSuit) != "") || (!isNull(_randomSuit))) then +{ + _unit forceAddUniform _randomSuit; +}; // IF Statement criado por que sim + +_randomHeadgear = selectRandom headgears +if (((_randomHeadgear) != "") || (!isNull(_randomHeadgear))) then +{ + _unit addHeadgear _randomHeadgear; +}; // IF Statement criado para parar com erros no log + +_randomFacewears = selectRandom facewears +if (((_randomFacewears) != "") || (!isNull(_randomFacewears))) then +{ + _unit addGoggles _randomFacewears; +}; // IF Statement criado para parar com erros no log \ No newline at end of file