projectbraf/braf_factions
1
0
Fork 0
mirror of https://github.com/projectbraf/braf_factions.git synced 2026-06-13 13:53:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

feitos mais alguns ajustes

Browse Source
This commit is contained in:
Bear
2024-12-30 18:43:45 -03:00
parent e58f66dad6
commit 89a5e00ce2
6 changed files with 55 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
addons/CUPcompat/characters/CUP/config.cpp
View File

@@ -10,7 +10,12 @@ class CfgPatches
"CUP_BaseConfigs"
};
requiredVersion = 0.1;
units[] = {};
units[] = {
#if __has_include("\CUP\Weapons\CUP_Weapons_DynamicLoadout\mk82\CUP_mk82_pod.p3d")
"braf_factions_thug_biker"
#endif
};
weapons[] = {};
};
};

50
addons/CUPcompat/characters/CUP/thug_opfor_units_CUP.hpp
View File

@@ -7,12 +7,12 @@ class O_G_soldier_M_F:I_G_Soldier_base_F
{
class EventHandlers;
};
class braf_factions_CUP_thug_pistol: O_G_Soldier_F
class braf_factions_thug_pistol: O_G_Soldier_F
{
scope = 2;
scopeArsenal = 2;
scopeCurator = 2;
_generalMacro = "braf_factions_CUP_thug_pistol";
_generalMacro = "braf_factions_thug_pistol";
displayName = "Thug (Pistol)";
faction = "BRAF_Thugs";
uniformClass = "U_I_C_Soldier_Bandit_4_F";
@@ -28,19 +28,19 @@ class braf_factions_CUP_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_CUP_fnc_thugswearCUP;[_this select 0] call braf_factions_CUP_fnc_thugsequippistolCUP;};[_this select 0] call braf_factions_CUP_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_CUP_thug_marksman: O_G_soldier_M_F
class braf_factions_thug_marksman: O_G_soldier_M_F
{
scope = 2;
scopeArsenal = 2;
scopeCurator = 2;
_generalMacro = "braf_factions_CUP_thug_marksman";
_generalMacro = "braf_factions_thug_marksman";
displayName = "Thug (Marksman)";
faction = "BRAF_Thugs";
uniformClass = "U_I_C_Soldier_Bandit_4_F";
@@ -61,12 +61,12 @@ class braf_factions_CUP_thug_marksman: O_G_soldier_M_F
skipWhenMissingDependencies = 1;
};
class braf_factions_CUP_thug_rifleman: O_G_Soldier_F
class braf_factions_thug_rifleman: O_G_Soldier_F
{
scope = 2;
scopeArsenal = 2;
scopeCurator = 2;
_generalMacro = "braf_factions_CUP_thug_marksman";
_generalMacro = "braf_factions_thug_marksman";
displayName = "Thug (AKM)";
faction = "BRAF_Thugs";
uniformClass = "U_I_C_Soldier_Bandit_4_F";
@@ -82,17 +82,17 @@ class braf_factions_CUP_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_CUP_fnc_thugswearCUP;[_this select 0] call braf_factions_CUP_fnc_thugsequiprifleCUP;};[_this select 0] call braf_factions_CUP_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_CUP_thug_shotgun: O_G_Soldier_F
class braf_factions_thug_shotgun: O_G_Soldier_F
{
scope = 2;
scopeArsenal = 2;
scopeCurator = 2;
_generalMacro = "braf_factions_CUP_thug_shotgun";
_generalMacro = "braf_factions_thug_shotgun";
displayName = "Thug (Shotgun)";
faction = "BRAF_Thugs";
uniformClass = "U_I_C_Soldier_Bandit_4_F";
@@ -108,17 +108,17 @@ class braf_factions_CUP_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_CUP_fnc_thugswearCUP;[_this select 0] call braf_factions_CUP_fnc_thugsequipshotgunCUP;};[_this select 0] call braf_factions_CUP_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_CUP_thug_smg: O_G_Soldier_F
class braf_factions_thug_smg: O_G_Soldier_F
{
scope = 2;
scopeArsenal = 2;
scopeCurator = 2;
_generalMacro = "braf_factions_CUP_thug_smg";
_generalMacro = "braf_factions_thug_smg";
displayName = "Thug (SMG)";
faction = "BRAF_Thugs";
uniformClass = "U_I_C_Soldier_Bandit_4_F";
@@ -134,23 +134,23 @@ class braf_factions_CUP_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_CUP_fnc_thugswearCUP;[_this select 0] call braf_factions_CUP_fnc_thugsequipsmgCUP;};[_this select 0] call braf_factions_CUP_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_CUP_thug_biker: O_G_Soldier_F
class braf_factions_thug_biker: O_G_Soldier_F
{
scope = 2;
scopeArsenal = 2;
scopeCurator = 2;
_generalMacro = "braf_factions_CUP_thug_biker";
_generalMacro = "braf_factions_thug_biker";
displayName = "Thug (Biker)";
faction = "BRAF_Thugs";
uniformClass = "U_I_C_Soldier_Bandit_4_F";
backpack = "";
weapons[] = {"Braf_MT12", "Throw", "Put"};
magazines[] = {"30Rnd_9x21_Mag", "30Rnd_9x21_Mag", "30Rnd_9x21_Mag", "braf_Igla_missile"};
weapons[] = {"Throw", "Put"};
magazines[] = {};
items[] = {"FirstAidKit"};
linkedItems[] = {};
genericNames = "braf_brazilian_names";
@@ -160,17 +160,17 @@ class braf_factions_CUP_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_CUP_fnc_thugswearbikerCUP;[_this select 0] call braf_factions_CUP_fnc_thugsequippistolCUP;};[_this select 0] call braf_factions_CUP_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_CUP_thug_at: O_G_Soldier_F
class braf_factions_thug_at: O_G_Soldier_F
{
scope = 2;
scopeArsenal = 2;
scopeCurator = 2;
_generalMacro = "braf_factions_CUP_thug_at";
_generalMacro = "braf_factions_thug_at";
displayName = "Thug (AT)";
faction = "BRAF_Thugs";
uniformClass = "U_I_C_Soldier_Bandit_4_F";
@@ -186,7 +186,13 @@ class braf_factions_CUP_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_CUP_fnc_thugswearCUP;[_this select 0] call braf_factions_CUP_fnc_thugsequiprifleCUP;};[_this select 0] call braf_factions_CUP_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_aa: O_G_Soldier_F
{
scope = 1;
scopeArsenal = 1;
scopeCurator = 1;
};

16
addons/CUPcompat/config.cpp
View File

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

3
addons/CUPcompat/functions/fn_thugsequiprifleCUP.sqf
View File

@@ -84,7 +84,8 @@ _currentMagazine = getArray ( configFile >> "CfgWeapons" >> primaryWeapon _unit
_definedWeapon = (selectRandom _weapon);
_unit addWeaponGlobal _definedWeapon;
_compatibleMagazines = compatibleMagazines _definedWeapon;
_compatibleMagazines = _compatibleMagazines - magazineBlacklist;
_compatibleMagazines = compatibleMagazines _definedWeapon;
_magazine = (selectRandom _compatibleMagazines);
_unit addMagazines [_magazine, 6];

3
addons/CUPcompat/functions/fn_thugsequipsniperCUP.sqf
View File

@@ -38,8 +38,9 @@ _currentMagazine = getArray ( configFile >> "CfgWeapons" >> primaryWeapon _unit
_definedWeapon = (selectRandom _sniper);
_unit addWeaponGlobal _definedWeapon;
_compatibleMagazines = compatibleMagazines _definedWeapon;
_compatibleMagazines = _compatibleMagazines - magazineBlacklist;
_compatibleMagazines = compatibleMagazines _definedWeapon;
_magazine = (selectRandom _compatibleMagazines);
_unit addMagazines [_magazine, 6];

10
addons/characters/config.cpp
View File

@@ -95,11 +95,19 @@ class CfgPatches
"braf_cra_eng_jungle",
"braf_cra_hmg_jungle",
"braf_cra_hmg_a_jungle",
// Thugs
"braf_thug_shirt_black",
"braf_thug_shirt_blue",
"braf_thug_shirt_green",
"braf_thug_shirt_tan",
"braf_thug_shirt_nike"
"braf_thug_shirt_nike",
"braf_factions_thug_at",
"braf_factions_thug_aa",
"braf_factions_thug_smg",
"braf_factions_thug_shotgun",
"braf_factions_thug_rifleman",
"braf_factions_thug_marksman",
"braf_factions_thug_pistol"
};
weapons[] = {
// BDU