diff --git a/addons/air2/a29_base.hpp b/addons/air2/a29_base.hpp index e6d4892..66776e3 100644 --- a/addons/air2/a29_base.hpp +++ b/addons/air2/a29_base.hpp @@ -395,6 +395,7 @@ class braf_A29B_Equador: BRAF_A29B // HIAF class braf_A29_canopy_HIAF1: braf_A29_canopy { + faction = "BRAF_HIAF"; hiddenSelections[]= { "camo1" @@ -406,6 +407,7 @@ class braf_A29_canopy_HIAF1: braf_A29_canopy }; class braf_A29B_HIAF1: BRAF_A29B { + faction = "BRAF_HIAF"; _generalmacro="BRAF_A29B_HIAF1"; scope=2; scopeCurator=2; @@ -459,6 +461,7 @@ class braf_A29B_HIAF1: BRAF_A29B }; class braf_A29_canopy_HIAF2: braf_A29_canopy { + faction = "BRAF_HIAF"; hiddenSelections[]= { "camo1" @@ -470,6 +473,7 @@ class braf_A29_canopy_HIAF2: braf_A29_canopy }; class braf_A29B_HIAF2: BRAF_A29B { + faction = "BRAF_HIAF"; _generalmacro="BRAF_A29B_HIAF2"; scope=2; scopeCurator=2; diff --git a/addons/characters/units/thug_opfor_units.hpp b/addons/characters/units/thug_opfor_units.hpp index c3e706c..d5921d4 100644 --- a/addons/characters/units/thug_opfor_units.hpp +++ b/addons/characters/units/thug_opfor_units.hpp @@ -20,9 +20,15 @@ class braf_factions_thug_pistol: O_G_Soldier_F "LanguageFRE_F", "Head_Tanoan" }; + #if _has_include("\CUP\Weapons\CUP_Weapons_DynamicLoadout\mk82\CUP_mk82_pod.p3d") 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;};"; - }; + 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;};"; + }; + #else + 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;};"; + }; + #endif }; class O_G_soldier_M_F; diff --git a/addons/main/config.cpp b/addons/main/config.cpp index e088a49..4a958b9 100644 --- a/addons/main/config.cpp +++ b/addons/main/config.cpp @@ -16,6 +16,21 @@ 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"; + }; }; }; }; diff --git a/addons/main/functions/fn_thugsequippistolCUP.sqf b/addons/main/functions/fn_thugsequippistolCUP.sqf new file mode 100644 index 0000000..18f421d --- /dev/null +++ b/addons/main/functions/fn_thugsequippistolCUP.sqf @@ -0,0 +1,28 @@ +params["_unit"]; + +Pistol = [ + "hgun_ACPC2_F", + "hgun_Rook40_F", + "hgun_P07_blk_F", + "braf_imbel_m973", + "braf_PT92", + "CUP_hgun_Browning_HP", + "CUP_hgun_CZ75", + "CUP_hgun_Compact", + "CUP_hgun_Phantom", + "CUP_hgun_Deagle", + "CUP_hgun_Glock17_blk", + "CUP_hgun_M17_Black", + "CUP_hgun_Colt1911", + "CUP_hgun_M9", + "CUP_hgun_M9A1", + "CUP_hgun_P30L_Match_blk", + "CUP_hgun_SWM327MP", + "CUP_hgun_TaurusTracker455", + "CUP_hgun_TEC9", + "CUP_hgun_TT" + +]; + +_unit addSecondaryWeaponItem (selectRandom Pistol); +_unit [Pistol] call BIS_fnc_compatibleMagazines; diff --git a/addons/main/functions/fn_thugsequiprifleCUP.sqf b/addons/main/functions/fn_thugsequiprifleCUP.sqf new file mode 100644 index 0000000..8e2fe05 --- /dev/null +++ b/addons/main/functions/fn_thugsequiprifleCUP.sqf @@ -0,0 +1,74 @@ +params["_unit"]; + +Weapon = [ + "Braf_MT12", + "braf_boito_14_oldstock", + "braf_boito_14_nostock", + "braf_boito_20_oldstock", + "Braf_m16a1_carbine_9mm", + "Braf_m16a1_carbine", + "Braf_m16a1e1", + "braf_m16a2_mod", + "Braf_m4a1", + "braf_hk33A3", + "braf_hk33", + "braf_HK416_short", + "braf_HK417", + "Braf_Fal", + "Braf_md1", + "Braf_md1_Grip", + "Braf_md1a1", + "Braf_md1a1_Grip", + "Braf_ParaFal", + "braf_MD97LC", + "Braf_Lapa", + "braf_factions_lapa_Desert", + "braf_factions_lapa_green", + "Braf_Lapa", + "Braf_Mekanika_URU_v1", + "braf_factions_md1_hiaf", + "braf_factions_fal_hiaf", + "CUP_arifle_ACR_blk_556", + "CUP_arifle_AK47_Early", + "CUP_arifle_AK12_black", + "CUP_arifle_AK74M", + "CUP_arifle_AK74", + "CUP_arifle_AKM", + "CUP_arifle_AKMS_Early", + "CUP_arifle_AK47", + "CUP_arifle_AKS_top_rail", + "CUP_arifle_AKS74", + "CUP_arifle_AKS74U", + "CUP_arifle_FNFAL5060_railed", + "CUP_arifle_FNFAL5060_railed_woodland", + "CUP_arifle_FNFAL5061", + "CUP_arifle_FNFAL5061_wooden", + "CUP_arifle_FNFAL_OSW", + "CUP_arifle_Gewehr1", + "CUP_arifle_G3A3_ris_black", + "CUP_arifle_G3A3_ris_vfg", + "CUP_arifle_G3A3_ris_vfg_black", + "CUP_arifle_G3A3_modern_ris", + "CUP_arifle_G3A3_modern_ris_black", + "CUP_arifle_Galil_SAR_black", + "CUP_arifle_HK416_CQB_Black", + "CUP_sgun_M1014", + "CUP_sgun_M1014_vfg", + "CUP_smg_M3A1", + "CUP_smg_M3A1_blk", + "CUP_arifle_M4A1_black", + "CUP_arifle_M4A3_black", + "CUP_smg_Mac10", + "CUP_smg_MP5A5_Rail", + "CUP_smg_MP5A5_Rail_VFG", + "CUP_smg_MP7", + "CUP_smg_vityaz", + "CUP_arifle_Sa58s", + "CUP_smg_SA61", + "CUP_arifle_SR3M_Vikhr", + "CUP_smg_UZI", + "CUP_arifle_xm29_ke_blk" +]; + +_unit addPrimaryWeaponItem (selectRandom Weapon); +_unit [Weapon] call BIS_fnc_compatibleMagazines; \ No newline at end of file diff --git a/addons/main/functions/fn_thugsequipsniperCUP.sqf b/addons/main/functions/fn_thugsequipsniperCUP.sqf new file mode 100644 index 0000000..5aa5f51 --- /dev/null +++ b/addons/main/functions/fn_thugsequipsniperCUP.sqf @@ -0,0 +1,15 @@ +params["_unit"]; + +Sniper = [ + "Braf_aglc_scope", + "braf_factions_aglc_verde_scope", + "CUP_srifle_M14_DMR", + "CUP_Weapon_srifle_Remington700_scoped", + "braf_fal_scope", + "Braf_md1a1_Scope", + "Braf_msr_308_scope" + +]; + +_unit addSecondaryWeaponItem (selectRandom Sniper); +_unit [Sniper] call BIS_fnc_compatibleMagazines; diff --git a/addons/main/functions/fn_thugsequipvestCUP.sqf b/addons/main/functions/fn_thugsequipvestCUP.sqf new file mode 100644 index 0000000..4bd2706 --- /dev/null +++ b/addons/main/functions/fn_thugsequipvestCUP.sqf @@ -0,0 +1,109 @@ +params["_unit"]; + +Vests = [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "CUP_V_I_RACS_Carrier_Rig_wdl_3", + "CUP_V_I_Carrier_Belt", + "CUP_V_C_Police_Holster", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "CUP_V_OI_TKI_Jacket5_04", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "CUP_V_OI_TKI_Jacket5_05", + "CUP_V_OI_TKI_Jacket5_01", + "CUP_V_OI_TKI_Jacket3_04", + "CUP_V_OI_TKI_Jacket3_05", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "CUP_V_OI_TKI_Jacket3_01", + "CUP_V_OI_TKI_Jacket2_01", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "V_TacChestrig_grn_F", + "V_TacChestrig_oli_F", + "V_LegStrapBag_black_F", + "V_LegStrapBag_coyote_F", + "braf_ephod_vest" +]; + +_unit addVest (selectRandom Vests); \ No newline at end of file diff --git a/addons/main/functions/fn_thugswearCUP.sqf b/addons/main/functions/fn_thugswearCUP.sqf new file mode 100644 index 0000000..9190905 --- /dev/null +++ b/addons/main/functions/fn_thugswearCUP.sqf @@ -0,0 +1,149 @@ +params["_unit"]; + +suits = [ + "U_C_Poloshirt_blue", + "U_C_Poloshirt_burgundy", + "U_C_Poloshirt_salmon", + "U_C_Poloshirt_tricolour", + "U_BG_Guerilla2_1", + "U_I_C_Soldier_Bandit_4_F", + "U_I_C_Soldier_Bandit_1_F", + "U_I_C_Soldier_Bandit_2_F", + "U_I_C_Soldier_Bandit_5_F", + "U_I_C_Soldier_Bandit_3_F", + "U_I_C_Soldier_Para_4_F", + "U_C_man_sport_2_F", + "U_C_Man_casual_5_F", + "U_C_ArtTShirt_01_v4_F", + "U_C_Uniform_Farmer_01_F", + "U_I_L_Uniform_01_tshirt_olive_F", + "CUP_U_I_GUE_Anorak_03", + "CUP_U_I_GUE_Anorak_02", + "CUP_U_I_GUE_Anorak_01", + "CUP_U_I_GUE_Flecktarn3" + +]; + +headgears = [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "H_Cap_blk", + 'H_Cap_blu', + "H_Cap_red", + "H_Cap_oli", + "CUP_H_PMC_Cap_Burberry", + "CUP_H_PMC_Cap_Back_Burberry", + "CUP_H_PMC_Cap_Back_PRR_Burberry", + "CUP_H_PMC_Cap_Back_Grey", + "CUP_H_PMC_Cap_Back_Tan", + "CUP_H_USA_Cap_M81", + "CUP_H_PMC_Beanie_Black", + "CUP_H_PMC_Beanie_Khaki", + "CUP_H_FR_BandanaWdl", + "CUP_H_FR_BandanaGreen", + "H_Shemag_olive", + "H_Bandanna_surfer_blk", + "H_Bandanna_blu", + "H_Bandanna_blu", + "H_RacingHelmet_1_black_F", + "H_RacingHelmet_1_white_F", + "H_RacingHelmet_1_red_F", + "H_RacingHelmet_1_orange_F", + "H_RacingHelmet_1_blue_F" +]; + +facewears = [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "G_Aviator", + "G_Shades_Black", + "G_Shades_Blue", + "G_Shades_Green", + "G_Shades_Red", + "G_Spectacles", + "G_Sport_Blackred", + "G_Squares_Tinted", + "G_Squares", + "G_Spectacles_Tinted", + "G_Bandanna_shades", + "G_Bandanna_aviator", + "G_Bandanna_blk", + "G_Bandanna_CandySkull", + "G_Bandanna_Skull1", + "G_Bandanna_Syndikat1", + "G_Bandanna_Skull2", + "G_Bandanna_Syndikat2", + "CUP_G_RUS_Ratnik_Balaclava_Green_2", + "CUP_G_RUS_Ratnik_Balaclava_Olive_1", + "CUP_G_PMC_Facewrap_Tropical_Glasses_Ember", + "CUP_G_Scarf_Face_Grn", + "CUP_G_Scarf_Face_Red", + "CUP_G_Scarf_Face_Tan", + "CUP_G_Oakleys_Embr", + "CUP_G_TK_RoundGlasses_blk", + "CUP_FR_NeckScarf", + "CUP_G_WristWatch", + "G_EyeProtectors_F" +]; +_unit forceAddUniform (selectRandom suits); +_unit addHeadgear (selectRandom headgears); +_unit addGoggles (selectRandom facewears); \ No newline at end of file