Merge pull request #17 from deBearN/WIP/CUPFactions

Wip/cup factions

addons/CUPcompat/characters/CUP/config.cpp

@@ -28,6 +28,11 @@ class CfgVehicles
     skipWhenMissingDependencies = 1;
     
     #include "thug_opfor_units_CUP.hpp"
+    class Item_Base_F;
+    class U_I_C_Soldier_Bandit_4_F: Item_Base_F
+    {
+        modelSides[] = {3,2,1,0};
+    };
 };
 #endif
 

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];

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);

addons/CUPcompat/functions/fn_thugsequipvestCUP.sqf

@@ -106,4 +106,8 @@ Vests = [
 	"braf_ephod_vest"
 ];
 
-_unit addVest (selectRandom Vests);
+_randomVests = selectRandom Vests;
+if (_randomVests != "") then
+{
+	_unit addVest _randomVests;
+}; // IF Statement criado para parar com erros no log

addons/CUPcompat/functions/fn_thugswearCUP.sqf

@@ -140,6 +140,20 @@ facewears = [
 	"CUP_G_WristWatch",
 	"G_EyeProtectors_F"
 ];
-_unit forceAddUniform (selectRandom suits);
+_randomSuit = selectRandom suits;
-_unit addHeadgear (selectRandom headgears);
+if (_randomSuit != "") then
-_unit addGoggles (selectRandom facewears);
+{
+	_unit forceAddUniform _randomSuit;
+}; // IF Statement criado por que sim
+
+_randomHeadgear = selectRandom headgears;
+if (_randomHeadgear != "") then
+{
+	_unit addHeadgear _randomHeadgear;
+}; // IF Statement criado para parar com erros no log
+
+_randomFacewears = selectRandom facewears;
+if (_randomFacewears != "") then
+{
+	_unit addGoggles _randomFacewears;
+}; // IF Statement criado para parar com erros no log

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);
+_randomSuit = selectRandom suits;
-_unit addHeadgear (selectRandom headgears);
+if (_randomSuit != "") then
-_unit addGoggles (selectRandom facewears);
+{
+	_unit forceAddUniform _randomSuit;
+}; // IF Statement criado por que sim
+
+_randomHeadgear = selectRandom headgears;
+if (_randomHeadgear != "") then
+{
+	_unit addHeadgear _randomHeadgear;
+}; // IF Statement criado para parar com erros no log
+
+_randomFacewears = selectRandom facewears;
+if (_randomFacewears != "") then
+{
+	_unit addGoggles _randomFacewears;
+}; // IF Statement criado para parar com erros no log

meta.cpp

@@ -1,4 +1,4 @@
 protocol = 1;
-publishedid = 2740442349;
+publishedid = 2951736528;
 name = "BRAF Factions";
 timestamp = 5249571359750490509;

mod.cpp

@@ -1,4 +1,4 @@
-name = "BRAF Faction Dev";
+name = "BRAF Faction";
 picture = "picture.paa";
 actionName = "website";
 action = "https://discord.gg/BNgj6YwZ";