From 368ae82b7a7b6990a5b7f081fa960926341a4c36 Mon Sep 17 00:00:00 2001 From: Bear Date: Sat, 25 Jan 2025 03:31:51 -0300 Subject: [PATCH 1/5] adjustments to errors generated in the .rpt --- addons/CUPcompat/characters/CUP/config.cpp | 8 +++++++ .../functions/fn_thugsequiprifleCUP.sqf | 3 ++- .../functions/fn_thugsequipsniperCUP.sqf | 3 ++- .../functions/fn_thugsequipvestCUP.sqf | 6 ++++- .../CUPcompat/functions/fn_thugswearCUP.sqf | 20 +++++++++++++--- .../functions/fn_thugswearbikerCUP.sqf | 24 ++++++++++++++++--- 6 files changed, 55 insertions(+), 9 deletions(-) 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 From 4b947875dbfa952609a7ff271e9fc7f5af2ef260 Mon Sep 17 00:00:00 2001 From: Bear Date: Sat, 25 Jan 2025 03:32:27 -0300 Subject: [PATCH 2/5] correct mod name (not the Dev version) --- mod.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod.cpp b/mod.cpp index 7e7848c..610d45f 100644 --- a/mod.cpp +++ b/mod.cpp @@ -1,4 +1,4 @@ -name = "BRAF Faction Dev"; +name = "BRAF Faction"; picture = "picture.paa"; actionName = "website"; action = "https://discord.gg/BNgj6YwZ"; From 033a673e5739cfd4096fa9e47310c11232d8855b Mon Sep 17 00:00:00 2001 From: Bear Date: Sat, 25 Jan 2025 03:33:10 -0300 Subject: [PATCH 3/5] correct ID making so servers don't make people download BRAF dev instead they will download the normal BRAF Factions --- meta.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta.cpp b/meta.cpp index ec54777..c528bd9 100644 --- a/meta.cpp +++ b/meta.cpp @@ -1,4 +1,4 @@ protocol = 1; -publishedid = 2740442349; +publishedid = 2951736528; name = "BRAF Factions"; timestamp = 5249571359750490509; From 8617ec99be679ee2d6f20a923bff9f30525b6d62 Mon Sep 17 00:00:00 2001 From: Bear Date: Sat, 25 Jan 2025 03:48:44 -0300 Subject: [PATCH 4/5] adjusted syntax errors --- addons/CUPcompat/functions/fn_thugsequipvestCUP.sqf | 4 ++-- addons/CUPcompat/functions/fn_thugswearCUP.sqf | 12 ++++++------ addons/CUPcompat/functions/fn_thugswearbikerCUP.sqf | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/CUPcompat/functions/fn_thugsequipvestCUP.sqf b/addons/CUPcompat/functions/fn_thugsequipvestCUP.sqf index c0b2074..f39ee63 100644 --- a/addons/CUPcompat/functions/fn_thugsequipvestCUP.sqf +++ b/addons/CUPcompat/functions/fn_thugsequipvestCUP.sqf @@ -106,8 +106,8 @@ Vests = [ "braf_ephod_vest" ]; -_randomVests = selectRandom Vests -if (((_randomVests) != "") || (!isNull(_randomVests))) then +_randomVests = selectRandom Vests; +if (_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 8179c8d..7648d2d 100644 --- a/addons/CUPcompat/functions/fn_thugswearCUP.sqf +++ b/addons/CUPcompat/functions/fn_thugswearCUP.sqf @@ -140,20 +140,20 @@ facewears = [ "CUP_G_WristWatch", "G_EyeProtectors_F" ]; -_randomSuit = selectRandom suits -if (((_randomSuit) != "") || (!isNull(_randomSuit))) then +_randomSuit = selectRandom suits; +if (_randomSuit != "") then { _unit forceAddUniform _randomSuit; }; // IF Statement criado por que sim -_randomHeadgear = selectRandom headgears -if (((_randomHeadgear) != "") || (!isNull(_randomHeadgear))) then +_randomHeadgear = selectRandom headgears; +if (_randomHeadgear != "") then { _unit addHeadgear _randomHeadgear; }; // IF Statement criado para parar com erros no log -_randomFacewears = selectRandom facewears -if (((_randomFacewears) != "") || (!isNull(_randomFacewears))) then +_randomFacewears = selectRandom facewears; +if (_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 465b1b7..40e95f0 100644 --- a/addons/CUPcompat/functions/fn_thugswearbikerCUP.sqf +++ b/addons/CUPcompat/functions/fn_thugswearbikerCUP.sqf @@ -105,20 +105,20 @@ facewears = [ "CUP_G_WristWatch", "G_EyeProtectors_F" ]; -_randomSuit = selectRandom suits -if (((_randomSuit) != "") || (!isNull(_randomSuit))) then +_randomSuit = selectRandom suits; +if (_randomSuit != "") then { _unit forceAddUniform _randomSuit; }; // IF Statement criado por que sim -_randomHeadgear = selectRandom headgears -if (((_randomHeadgear) != "") || (!isNull(_randomHeadgear))) then +_randomHeadgear = selectRandom headgears; +if (_randomHeadgear != "") then { _unit addHeadgear _randomHeadgear; }; // IF Statement criado para parar com erros no log -_randomFacewears = selectRandom facewears -if (((_randomFacewears) != "") || (!isNull(_randomFacewears))) then +_randomFacewears = selectRandom facewears; +if (_randomFacewears != "") then { _unit addGoggles _randomFacewears; }; // IF Statement criado para parar com erros no log \ No newline at end of file From d5c4c41291000b6692615d981f7b14a70377bca4 Mon Sep 17 00:00:00 2001 From: Bear Date: Sat, 25 Jan 2025 04:04:22 -0300 Subject: [PATCH 5/5] adjusting inheritance --- addons/CUPcompat/characters/CUP/config.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/CUPcompat/characters/CUP/config.cpp b/addons/CUPcompat/characters/CUP/config.cpp index 5c6e141..159d37b 100644 --- a/addons/CUPcompat/characters/CUP/config.cpp +++ b/addons/CUPcompat/characters/CUP/config.cpp @@ -28,9 +28,6 @@ class CfgVehicles skipWhenMissingDependencies = 1; #include "thug_opfor_units_CUP.hpp" -}; -class CfgWeapons -{ class Item_Base_F; class U_I_C_Soldier_Bandit_4_F: Item_Base_F {