From 192fb638daeb4b67bbde0c7a5c580569c66b56d5 Mon Sep 17 00:00:00 2001 From: Saquesh <47530297+Saquesh@users.noreply.github.com> Date: Tue, 24 Jan 2023 17:48:40 +0000 Subject: [PATCH] Canteens and Spare Barrels Added Canteens and Spare Barrels to loadouts, where required the loadouts were adjusted to make sure gear could fit without throwing any TMF Autotest Errors --- addons/tmf_loadouts/loadouts/afr_militia.hpp | 21 +- addons/tmf_loadouts/loadouts/au_army_2018.hpp | 10 +- addons/tmf_loadouts/loadouts/bundeswehr.hpp | 215 ++++++++ addons/tmf_loadouts/loadouts/chdkz.hpp | 9 +- addons/tmf_loadouts/loadouts/cz_army_2020.hpp | 16 +- .../tmf_loadouts/loadouts/example_loadout.hpp | 515 ++++++++++++++++++ .../tmf_loadouts/loadouts/ger_army_2010.hpp | 20 +- .../loadouts/ger_army_trop_2010.hpp | 20 +- addons/tmf_loadouts/loadouts/hil.hpp | 18 +- .../tmf_loadouts/loadouts/idf_army_2010.hpp | 13 +- .../tmf_loadouts/loadouts/pla_army_2010.hpp | 9 +- addons/tmf_loadouts/loadouts/racs.hpp | 12 +- addons/tmf_loadouts/loadouts/ru_army_2010.hpp | 5 +- addons/tmf_loadouts/loadouts/sla.hpp | 4 +- addons/tmf_loadouts/loadouts/tk_army.hpp | 8 +- addons/tmf_loadouts/loadouts/tk_locals.hpp | 12 +- addons/tmf_loadouts/loadouts/uk_army_2005.hpp | 9 +- addons/tmf_loadouts/loadouts/uk_army_2010.hpp | 21 +- addons/tmf_loadouts/loadouts/uk_rm_1982.hpp | 11 +- addons/tmf_loadouts/loadouts/us_army_1970.hpp | 9 +- addons/tmf_loadouts/loadouts/us_army_1985.hpp | 13 +- addons/tmf_loadouts/loadouts/us_army_2003.hpp | 13 +- addons/tmf_loadouts/loadouts/us_army_2010.hpp | 11 +- addons/tmf_loadouts/loadouts/us_army_2018.hpp | 15 +- .../tmf_loadouts/loadouts/us_rangers_2010.hpp | 10 +- .../tmf_loadouts/loadouts/us_rangers_2020.hpp | 22 +- addons/tmf_loadouts/loadouts/us_usmc_1985.hpp | 15 +- addons/tmf_loadouts/loadouts/us_usmc_2003.hpp | 11 +- .../loadouts/us_usmc_2010_wdl.hpp | 10 +- .../tmf_loadouts/loadouts/ussr_army_1970.hpp | 14 +- .../tmf_loadouts/loadouts/ussr_army_1985.hpp | 11 +- addons/tmf_loadouts/loadouts/vietcong.hpp | 11 +- 32 files changed, 974 insertions(+), 139 deletions(-) create mode 100644 addons/tmf_loadouts/loadouts/bundeswehr.hpp create mode 100644 addons/tmf_loadouts/loadouts/example_loadout.hpp diff --git a/addons/tmf_loadouts/loadouts/afr_militia.hpp b/addons/tmf_loadouts/loadouts/afr_militia.hpp index 4c1580f..c455313 100644 --- a/addons/tmf_loadouts/loadouts/afr_militia.hpp +++ b/addons/tmf_loadouts/loadouts/afr_militia.hpp @@ -40,7 +40,7 @@ class baseMan {// Weaponless baseclass "cwr3_i_vest_lbv_olive", "cwr3_i_vest_lbv" }; - backpack[] = {}; + backpack[] = {"CUP_B_AlicePack_Khaki"}; headgear[] = {}; hmd[] = {}; // Leave empty to remove all. "Default" > leave original item. @@ -82,7 +82,9 @@ class baseMan {// Weaponless baseclass magazines[] = {}; items[] = { MEDICAL_R, - "ACE_WaterBottle" + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -309,7 +311,7 @@ class hmgg : car { "B_Carryall_khk", "B_Carryall_oli" }; - backpackItems[] = {LIST_6("ace_csw_50Rnd_127x108_mag")}; + backpackItems[] = {LIST_3("ace_csw_50Rnd_127x108_mag")}; }; class hmgac : r { @@ -320,7 +322,7 @@ class hmgac : r { "B_Carryall_khk", "B_Carryall_oli" }; - backpackItems[] = {LIST_6("ace_csw_50Rnd_127x108_mag")}; + backpackItems[] = {LIST_4("ace_csw_50Rnd_127x108_mag")}; }; class hmgtl : car { @@ -332,7 +334,7 @@ class hmgtl : car { "B_Carryall_oli" }; backpackItems[] = { - LIST_6("ace_csw_50Rnd_127x108_mag"), + LIST_4("ace_csw_50Rnd_127x108_mag"), "ACE_EntrenchingTool" }; items[] += {"ACE_MapTools"}; @@ -370,13 +372,13 @@ class mattl : car { class hatg : car { displayName = "HAT Gunner"; secondaryWeapon[] = {"CUP_SPG9_carry"}; + magazines[] += {"CUP_compats_PG9_M"}; backpack[] = { "B_Carryall_cbr", "B_Carryall_khk", "B_Carryall_oli" }; backpackItems[] = { - LIST_2("CUP_compats_PG9_M"), "CUP_compats_OG9_M" }; }; @@ -422,7 +424,7 @@ class mtrg : car { "B_Carryall_oli" }; backpackItems[] = { - LIST_4("ACE_1Rnd_82mm_Mo_HE"), + LIST_3("ACE_1Rnd_82mm_Mo_HE"), "ACE_1Rnd_82mm_Mo_Illum", "ACE_1Rnd_82mm_Mo_Smoke" }; @@ -586,4 +588,9 @@ class UAV : car { traits[] = {"UAVHacker"}; backpack[] = {"O_UAV_01_backpack_F"}; linkedItems[] += {"O_UavTerminal"}; + items[] = { + MEDICAL_R, + LIST_3("ACE_CableTie"), + "ACE_Canteen" + }; }; diff --git a/addons/tmf_loadouts/loadouts/au_army_2018.hpp b/addons/tmf_loadouts/loadouts/au_army_2018.hpp index 606d118..d973474 100644 --- a/addons/tmf_loadouts/loadouts/au_army_2018.hpp +++ b/addons/tmf_loadouts/loadouts/au_army_2018.hpp @@ -61,7 +61,10 @@ class baseMan {// Weaponless baseclass "ItemMap", "ItemCompass", "ItemRadio", - "ItemWatch" + "ItemWatch", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are put into the backpack @@ -207,7 +210,7 @@ class aar : r { backpack[] = {"B_Kitbag_rgr"}; backpackItems[] = { LIST_3("CUP_200Rnd_TE4_Red_Tracer_556x45_M249_Pouch"), - "ACE_EntrenchingTool" + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; @@ -262,7 +265,8 @@ class mmgtl : aar { "ItemGPS" }; backpackItems[] = { - LIST_3("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M") + LIST_3("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; }; diff --git a/addons/tmf_loadouts/loadouts/bundeswehr.hpp b/addons/tmf_loadouts/loadouts/bundeswehr.hpp new file mode 100644 index 0000000..c31a1da --- /dev/null +++ b/addons/tmf_loadouts/loadouts/bundeswehr.hpp @@ -0,0 +1,215 @@ +// If you want to base a loadout on an existing one, this repository contains them all: +// https://github.com/ARCOMM/arc_misc/tree/master/addons/tmf_loadouts + +class baseMan {// Weaponless baseclass + displayName = "Unarmed"; + // All randomized. + uniform[] = {"CUP_U_B_GER_Flecktarn_2"}; + vest[] = {"CUP_V_B_GER_PVest_Fleck_RFL"}; + backpack[] = {"CUP_B_GER_Pack_Flecktarn"}; + headgear[] = {"CUP_H_Ger_M92_Cover"}; + goggles[] = {"CUP_G_PMC_Facewrap_Black_Glasses_Dark"}; + + items[] = { MEDICAL_R }; + // These are added directly into their respective slots + linkedItems[] = { + "ItemMap", + "ItemCompass", + "ItemRadio", + "ItemWatch", + "ItemGPS" + }; +}; + +class r : baseMan { + displayName = "Rifleman"; + primaryWeapon[] = {"hlc_rifle_G36V"}; + attachment[] = {"cup_acc_flashlight"}; + scope[] = {"cup_optic_aimpoint_5000"}; + items[] += { + "ACE_EntrenchingTool", + "ACE_Flashlight_XL50", + "ACE_Canteen" + }; + magazines[] = { + LIST_11("CUP_30Rnd_556x45_G36"), + LIST_2("CUP_HandGrenade_M67"), + LIST_2("SmokeShell") + }; +}; + +class g : r { + displayName = "Grenadier"; + primaryWeapon[] = {"hlc_rifle_G36VAG36"}; + magazines[] += { + LIST_8("CUP_1Rnd_HEDP_M203"), + LIST_8("CUP_FlareRed_M203"), + LIST_5("CUP_1Rnd_Smoke_M203") + }; +}; + +class car : r { + displayName = "Carabinier"; +}; + +class cls : car { + displayName = "Combat Life Saver"; + traits[] = {"medic"}; + backpackItems[] = { MEDICAL_CLS }; +}; + +class m : cls { + displayName = "Medic"; + //backpack[] = {"B_Carryall_mcamo"}; + backpackItems[] = { MEDICAL_M }; +}; + +class ftl : g { + displayName = "Fireteam Leader"; + uniform[] = {"CUP_U_B_GER_Flecktarn_6"}; + vest[] = {"CUP_V_B_GER_PVest_Fleck_TL"}; + headgear[] = {"CUP_H_Ger_M92_Cover_GG_CB"}; + items[] += {"ACE_MapTools"}; + linkedItems[] += {"Rangefinder"}; +}; + +class sl : ftl { + displayName = "Squad Leader"; + headgear[] = {"CUP_H_Ger_Beret_INF_Grn"}; +}; + +class co : sl { + displayName = "Platoon Leader"; + //grey beret or smthing? +}; + +class ar : r { + displayName = "Automatic Rifleman"; + primaryWeapon[] = {"CUP_lmg_MG3_rail"}; + //bipod[] = {"bipod_01_F_snd"}; + attachment[] = {"cup_acc_flashlight"}; + scope[] = {"cup_optic_aimpoint_5000"}; + magazines[] = { + LIST_5("CUP_120Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + LIST_2("CUP_HandGrenade_M67"), + LIST_2("SmokeShell") + }; +}; + +class aar : r { + displayName = "Assistant Automatic Rifleman"; + backpackItems[] = { + LIST_3("CUP_120Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" + }; + linkedItems[] += {"Binocular"}; +}; + +class rat : car { + displayName = "Rifleman (AT)"; + secondaryWeapon[] = {"CUP_launch_PzF3"}; +}; + +class hmgg : car { + displayName = "HMG Gunner"; + secondaryWeapon[] = {"CUP_m2_carry"}; + backPack[] = {"B_Carryall_wdl_F"}; + backpackItems[] = { + LIST_3("ace_csw_100Rnd_127x99_mag_red") + }; +}; + +class hmgac : r { + displayName = "HMG Ammo Carrier"; + backPack[] = {"B_Carryall_wdl_F"}; + backpackItems[] = { + LIST_3("ace_csw_100Rnd_127x99_mag_red") + }; +}; + +class hmgtl : car { + displayName = "HMG Team Leader"; + secondaryWeapon[] = {"ace_csw_m3CarryTripod"}; + backPack[] = {"B_Carryall_wdl_F"}; + backpackItems[] = { + LIST_3("ace_csw_100Rnd_127x99_mag_red") + }; + items[] += {"ACE_MapTools"}; + linkedItems[] += {"Rangefinder"}; +}; + +class hatg : car { + displayName = "HAT Gunner"; + secondaryWeapon[] = {"CUP_TOW_carry"}; + backPack[] = {"B_Carryall_wdl_F"}; + backpackItems[] = {"CUP_compats_TOW_M"}; +}; + +class hatac : r { + displayName = "HAT Ammo Carrier"; + backPack[] = {"B_Carryall_wdl_F"}; + backpackItems[] = {"CUP_compats_TOW_M"}; +}; + +class hattl : car { + displayName = "HAT Team Leader"; + secondaryWeapon[] = {"ace_csw_m220CarryTripod"}; + backPack[] = {"B_Carryall_wdl_F"}; + items[] += {"ACE_MapTools"}; + linkedItems[] += {"Rangefinder"}; + backpackItems[] = {"CUP_compats_TOW_M"}; +}; + +class mtrg : car { + displayName = "Mortar Gunner"; + backpack[] = {"Redd_Tank_M120_Tampella_Barrel"}; +}; + +class mtrac : r { + displayName = "Mortar Ammo Carrier"; +}; + +class mtrtl : car { + displayName = "Mortar Team Leader"; + backpack[] = {"Redd_Tank_M120_Tampella_Tripod"}; + items[] += { + MTR_GEAR, + "ACE_artilleryTable" + }; + linkedItems[] += {"Rangefinder"}; +}; + +class eng : car { + displayName = "Combat Engineer (Explosives)"; + traits[] = {"engineer", "explosiveSpecialist"}; + sidearmWeapon[] = {"ACE_VMM3"}; + items[] += { + "ACE_wirecutter", + "ACE_Clacker", + "ACE_DefusalKit" + }; + backpackItems[] = { + "ToolKit", + LIST_2("DemoCharge_Remote_Mag"), + LIST_2("ClaymoreDirectionalMine_Remote_Mag"), + "SatchelCharge_Remote_Mag" + }; +}; + +class engm : car { + displayName = "Combat Engineer (Mines)"; + traits[] = {"engineer", "explosiveSpecialist"}; + backpack[] = {"B_Kitbag_rgr"}; + vest[] = {"V_PlateCarrier3_rgr"}; + sidearmWeapon[] = {"ACE_VMM3"}; + items[] += { + "ACE_wirecutter", + "ACE_DefusalKit", + "ACE_EntrenchingTool" + }; + backpackItems[] = { + "ToolKit", + LIST_8("APERSMine_Range_Mag"), + "ATMine_Range_Mag" + }; +}; \ No newline at end of file diff --git a/addons/tmf_loadouts/loadouts/chdkz.hpp b/addons/tmf_loadouts/loadouts/chdkz.hpp index 6fef49e..42bbfb9 100644 --- a/addons/tmf_loadouts/loadouts/chdkz.hpp +++ b/addons/tmf_loadouts/loadouts/chdkz.hpp @@ -53,7 +53,10 @@ class baseMan {// Weaponless baseclass items[] = { MEDICAL_R, "ACE_Flashlight_KSF1", - "ACE_HandFlare_Red" + "ACE_HandFlare_Red", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -204,7 +207,7 @@ class aar : r { backpack[] = {"B_FieldPack_khk"}; backpackItems[] = { LIST_4("CUP_75Rnd_TE4_LRT4_Green_Tracer_762x39_RPK_M"), - "ACE_EntrenchingTool" + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; @@ -253,7 +256,7 @@ class mmgtl : aar { linkedItems[] += {"ItemRadio"}; backpackItems[] = { LIST_3("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Yellow_M"), - "ACE_EntrenchingTool" + "ACE_SpareBarrel_Item" }; }; diff --git a/addons/tmf_loadouts/loadouts/cz_army_2020.hpp b/addons/tmf_loadouts/loadouts/cz_army_2020.hpp index df13c5d..c8c76af 100644 --- a/addons/tmf_loadouts/loadouts/cz_army_2020.hpp +++ b/addons/tmf_loadouts/loadouts/cz_army_2020.hpp @@ -48,7 +48,10 @@ class baseMan {// Weaponless baseclass items[] = { MEDICAL_R , "ACE_IR_Strobe_Item", - "ACE_Flashlight_XL50" + "ACE_Flashlight_XL50", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -206,10 +209,6 @@ class fac : ftl { FAC_GEAR, "ACRE_VHF30108" }; - magazines[] += { - LIST_2("CUP_1Rnd_SmokeGreen_M203"), - LIST_2("CUP_1Rnd_SmokeRed_M203"), - }; linkedItems[] = { "ItemMap", "ItemCompass", @@ -239,9 +238,9 @@ class aar : r { displayName = "Assistant Automatic Rifleman"; backpack[] = {"CUP_B_ACRPara_m95"}; backpackItems[] = { - LIST_4("CUP_200Rnd_TE4_Red_Tracer_556x45_M249_Pouch") + LIST_4("CUP_200Rnd_TE4_Red_Tracer_556x45_M249_Pouch"), + "ACE_SpareBarrel_Item" }; - items[] += {"ACE_EntrenchingTool"}; linkedItems[] += {"ACE_Yardage450"}; }; @@ -289,7 +288,8 @@ class mmgtl : aar { displayName = "MMG Team Leader"; items[] += {"ACE_MapTools"}; backpackItems[] = { - LIST_7("CUP_50Rnd_UK59_762x54R_Tracer") + LIST_6("CUP_50Rnd_UK59_762x54R_Tracer"), + "ACE_SpareBarrel_Item" }; linkedItems[] = { "ItemMap", diff --git a/addons/tmf_loadouts/loadouts/example_loadout.hpp b/addons/tmf_loadouts/loadouts/example_loadout.hpp new file mode 100644 index 0000000..55614dc --- /dev/null +++ b/addons/tmf_loadouts/loadouts/example_loadout.hpp @@ -0,0 +1,515 @@ +// If you want to base a loadout on an existing one, this repository contains them all: +// https://github.com/ARCOMM/arc_misc/tree/master/addons/tmf_loadouts + +class baseMan {// Weaponless baseclass + displayName = "Unarmed"; + // All randomized. + uniform[] = {"U_B_CombatUniform_mcam","U_B_CombatUniform_mcam_vest"}; + vest[] = {"V_PlateCarrier1_rgr","V_PlateCarrier2_rgr"}; + backpack[] = {"B_AssaultPack_mcamo"}; + headgear[] = {}; + hmd[] = {}; + // Leave empty to remove all. "Default" > leave original item. + goggles[] = {"default"}; + // Leave empty to not change faces. + faces[] = {"faceset:african", "faceset:caucasian"}; + // Leave empty to not change insignias + insignias[] = {"111thID"}; + + // All randomized + primaryWeapon[] = {}; + scope[] = {}; + bipod[] = {}; + attachment[] = {}; + silencer[] = {}; + // Leave empty to remove all. "Default" for primaryWeapon > leave original weapon. + + // Only *Weapons[] arrays are randomized + secondaryWeapon[] = {}; + secondaryAttachments[] = {}; + sidearmWeapon[] = {}; + sidearmAttachments[] = {}; + // Leave empty to remove all. "Default" for secondaryWeapon or sidearmWeapon > leave original weapon. + + // These are added to the uniform or vest + magazines[] = {}; + items[] = { + MEDICAL_R, + "ACE_EntrenchingTool", + LIST_3("ACE_CableTie") + }; + // These are added directly into their respective slots + linkedItems[] = { + "ItemMap", + "ItemCompass", + "ItemRadio", + "ItemWatch" + }; + + // These are put into the backpack + backpackItems[] = {}; + + // Unit traits, see https://community.bistudio.com/wiki/setUnitTrait + traits[] = {}; + + // This is executed after unit init is complete. argument: _this = _unit. + code = ""; +}; + +class r : baseMan { + displayName = "Rifleman"; + headgear[] = {"H_HelmetB","H_HelmetSpecB"}; + primaryWeapon[] = {"arifle_MX_F"}; + scope[] = {"optic_Holosight"}; + attachment[] = {"acc_pointer_IR"}; + magazines[] = { + LIST_9("30Rnd_65x39_caseless_mag"), + LIST_2("30Rnd_65x39_caseless_mag_Tracer"), + LIST_2("HandGrenade"), + LIST_2("SmokeShell") + }; +}; + +class g : r { + displayName = "Grenadier"; + primaryWeapon[] = {"arifle_MX_GL_F"}; + magazines[] += { + LIST_8("1Rnd_HE_Grenade_shell"), + LIST_4("1Rnd_Smoke_Grenade_shell") + }; +}; + +class car : r { + displayName = "Carabinier"; + primaryWeapon[] = {"arifle_MXC_F"}; +}; + +class cls : car { + displayName = "Combat Life Saver"; + traits[] = {"medic"}; + backpack[] = {"B_AssaultPack_mcamo"}; + backpackItems[] = { MEDICAL_CLS }; +}; + +class m : cls { + displayName = "Medic"; + backpack[] = {"B_Carryall_mcamo"}; + backpackItems[] = { MEDICAL_M }; + linkedItems[] += {"Binocular"}; +}; + +class smg : r { + displayName = "Submachinegunner"; + primaryWeapon[] = {"SMG_01_F"}; + magazines[] = { + LIST_10("30Rnd_45ACP_Mag_SMG_01"), + LIST_2("HandGrenade"), + LIST_2("SmokeShell") + }; + items[] = { MEDICAL_R }; +}; + +class ftl : g { + displayName = "Fireteam Leader"; + items[] += {"ACE_MapTools"}; + magazines[] += { + LIST_2("1Rnd_SmokeGreen_Grenade_shell") + }; + linkedItems[] += {"Binocular","ItemGPS"}; +}; + +class sl : ftl { + displayName = "Squad Leader"; + sidearmWeapon[] = {"hgun_Pistol_heavy_01_F"}; + magazines[] += { + LIST_4("11Rnd_45ACP_Mag") + }; + linkedItems[] = { + "ItemMap", + "ItemCompass", + "ItemRadio", + "ItemWatch", + "ACE_VectorDay", + "ItemGPS" + }; +}; + +class co : sl { + displayName = "Platoon Leader"; + headgear[] = {"H_MilCap_mcamo"}; +}; + +class fac : co { + displayName = "Forward Air Controller"; + backpack[] = {"B_Kitbag_mcamo"}; + backpackItems[] = { FAC_GEAR }; + linkedItems[] = { + "ItemMap", + "ItemCompass", + "ItemRadio", + "ItemWatch", + "Laserdesignator", + "ItemGPS" + }; +}; + +class ar : r { + displayName = "Automatic Rifleman"; + primaryWeapon[] = {"arifle_MX_SW_F"}; + bipod[] = {"bipod_01_F_snd"}; + sidearmWeapon[] = {"hgun_Pistol_heavy_01_F"}; + magazines[] = { + LIST_6("100Rnd_65x39_caseless_mag"), + LIST_2("100Rnd_65x39_caseless_mag_Tracer"), + "HandGrenade", + "SmokeShell", + LIST_4("11Rnd_45ACP_Mag") + }; +}; + +class aar : r { + displayName = "Assistant Automatic Rifleman"; + backpackItems[] = { + LIST_4("100Rnd_65x39_caseless_mag") + }; + linkedItems[] += {"Binocular"}; +}; + +class rat : car { + displayName = "Rifleman (AT)"; + secondaryWeapon[] = {"launch_NLAW_F"}; +}; + +class dm : r { + displayName = "Designated Marksman"; + primaryWeapon[] = {"srifle_DMR_03_tan_F"}; + scope[] = {"optic_MRCO"}; + bipod[] = {"bipod_01_F_snd"}; + magazines[] = { + LIST_11("20Rnd_762x51_Mag"), + LIST_2("HandGrenade"), + LIST_2("SmokeShell") + }; +}; + +class mmgg : ar { + displayName = "MMG Gunner"; + primaryWeapon[] = {"MMG_02_sand_F"}; + scope[] = {"optic_MRCO"}; + magazines[] = { + LIST_4("130Rnd_338_Mag"), + "HandGrenade", + "SmokeShell", + LIST_4("11Rnd_45ACP_Mag") + }; +}; + +class mmgac : r { + displayName = "MMG Ammo Carrier"; + backpack[] = {"B_Kitbag_rgr"}; + backpackItems[] = { + LIST_3("130Rnd_338_Mag") + }; +}; + +class mmgtl : aar { + displayName = "MMG Team Leader"; + items[] += {"ACE_MapTools"}; + linkedItems[] = { + "ItemMap", + "ItemCompass", + "ItemRadio", + "ItemWatch", + "ACE_Vector", + "ItemGPS" + }; + backpackItems[] = { + LIST_2("130Rnd_338_Mag"), + "ACE_EntrenchingTool" + }; +}; + +class hmgg : car { + displayName = "HMG Gunner"; + backPack[] = {"B_HMG_01_weapon_F"}; +}; + +class hmgac : r { + displayName = "HMG Ammo Carrier"; + backPack[] = {"B_HMG_01_weapon_F"}; +}; + +class hmgtl : car { + displayName = "HMG Team Leader"; + backPack[] = {"B_HMG_01_support_F"}; + items[] += {"ACE_MapTools"}; + linkedItems[] = { + "ItemMap", + "ItemCompass", + "ItemRadio", + "ItemWatch", + "ACE_Vector", + "ItemGPS" + }; +}; + +class matg : car { + displayName = "MAT Gunner"; + backpack[] = {"B_FieldPack_khk"}; + secondaryWeapon[] = {"launch_MRAWS_sand_F"}; + magazines[] += { + LIST_2("MRAWS_HEAT_F"), + "MRAWS_HE_F" + }; +}; + +class matac : r { + displayName = "MAT Ammo Carrier"; + backpack[] = {"B_Kitbag_rgr"}; + backpackItems[] = { + LIST_3("MRAWS_HEAT_F"), + LIST_2("MRAWS_HE_F") + }; +}; + +class mattl : car { + displayName = "MAT Team Leader"; + backpack[] = {"B_FieldPack_khk"}; + items[] += {"ACE_MapTools"}; + linkedItems[] = { + "ItemMap", + "ItemCompass", + "ItemRadio", + "ItemWatch", + "ACE_Vector", + "ItemGPS" + }; + backpackItems[] = { + LIST_2("MRAWS_HEAT_F"), + "MRAWS_HE_F" + }; +}; + +class hatg : car { + displayName = "HAT Gunner"; + backPack[] = {"B_AT_01_weapon_F"}; +}; + +class hatac : r { + displayName = "HAT Ammo Carrier"; + backPack[] = {"B_AT_01_weapon_F"}; +}; + +class hattl : car { + displayName = "HAT Team Leader"; + backPack[] = {"B_HMG_01_support_F"}; + items[] += {"ACE_MapTools"}; + linkedItems[] = { + "ItemMap", + "ItemCompass", + "ItemRadio", + "ItemWatch", + "ACE_Vector", + "ItemGPS" + }; +}; + +class mtrg : car { + displayName = "Mortar Gunner"; + secondaryWeapon[] = {"ace_csw_staticMortarCarry"}; + backPack[] = {"B_Carryall_mcamo"}; + backpackItems[] = { + LIST_4("ACE_1Rnd_82mm_Mo_HE"), + "ACE_1Rnd_82mm_Mo_Illum", + "ACE_1Rnd_82mm_Mo_Smoke" + }; +}; + +class mtrac : r { + displayName = "Mortar Ammo Carrier"; + backPack[] = {"B_Carryall_mcamo"}; + backpackItems[] = { + LIST_4("ACE_1Rnd_82mm_Mo_HE"), + "ACE_1Rnd_82mm_Mo_Illum", + "ACE_1Rnd_82mm_Mo_Smoke" + }; +}; + +class mtrtl : car { + displayName = "Mortar Team Leader"; + secondaryWeapon[] = {"ace_csw_carryMortarBaseplate"}; + items[] += { MTR_GEAR }; + backPack[] = {"B_Carryall_mcamo"}; + backpackItems[] = { + LIST_4("ACE_1Rnd_82mm_Mo_HE"), + "ACE_1Rnd_82mm_Mo_Illum", + "ACE_1Rnd_82mm_Mo_Smoke" + }; + + linkedItems[] = { + "ItemMap", + "ItemCompass", + "ItemRadio", + "ItemWatch", + "ACE_Vector", + "ItemGPS" + }; +}; + +class samg : car { + displayName = "AA Missile Specialist"; + backpack[] = {"B_Carryall_mcamo"}; + secondaryWeapon[] = {"launch_B_Titan_F"}; + magazines[] += { + LIST_3("Titan_AA") + }; +}; + +class samag : car { + displayName = "AA Assistant Missile Specialist"; + backpack[] = {"B_Carryall_mcamo"}; + linkedItems[] = { + "ItemMap", + "ItemCompass", + "ItemRadio", + "ItemWatch", + "Rangefinder", + "ItemGPS" + }; + backpackItems[] = { + LIST_2("Titan_AA") + }; +}; + +class sn : r { + displayName = "Sniper"; + uniform[] = {"U_B_GhillieSuit"}; + vest[] = {"V_Chestrig_rgr"}; + headgear[] = {}; + goggles[] = {"default"}; + primaryWeapon[] = {"srifle_LRR_F"}; + scope[] = {"optic_SOS"}; + sidearmWeapon[] = {"hgun_Pistol_heavy_01_F"}; + magazines[] = { + LIST_7("7Rnd_408_Mag"), + LIST_2("HandGrenade"), + LIST_4("11Rnd_45ACP_Mag") + }; +}; + +class sp : g { + displayName = "Spotter"; + uniform[] = {"U_B_GhillieSuit"}; + vest[] = {"V_Chestrig_rgr"}; + headgear[] = {}; + scope[] = {"optic_MRCO"}; + silencer[] = {"muzzle_snds_h"}; + items[] += { + "ACE_MapTools", + "ACE_RangeCard", + "ACE_Kestrel4500", + "ACE_ATragMX" + }; + linkedItems[] = { + "ItemMap", + "ItemCompass", + "ItemRadio", + "ItemWatch", + "Laserdesignator", + "ItemGPS" + }; +}; + +class vg : smg { + displayName = "Vehicle Gunner"; + uniform[] = {"U_B_CombatUniform_mcam_vest"}; + vest[] = {"V_TacVest_blk"}; + backpack[] = {}; + headgear[] = {"H_HelmetCrew_B"}; + magazines[] = { + LIST_6("30Rnd_45ACP_Mag_SMG_01"), + "SmokeShellPurple" + }; +}; + +class vc : vg { + displayName = "Vehicle Commander"; + linkedItems[] += {"Binocular","ItemGPS"}; +}; + +class vd : vg { + displayName = "Vehicle Driver"; + traits[] = {"engineer"}; + backpack[] = {"B_AssaultPack_mcamo"}; + linkedItems[] += {"ItemGPS"}; + backpackItems[] = {"ToolKit"}; +}; + +class hc : smg { + displayName = "Helicopter Crew"; + uniform[] = {"U_B_HeliPilotCoveralls"}; + vest[] = {"V_TacVest_blk"}; + backpack[] = {}; + headgear[] = {"H_PilotHelmetHeli_B"}; + items[] += {"ACE_MapTools"}; + magazines[] = { + LIST_6("30Rnd_45ACP_Mag_SMG_01"), + "SmokeShellPurple" + }; +}; + +class hp : hc { + displayName = "Helicopter Pilot"; + linkedItems[] += {"ItemGPS"}; +}; + +class hcc : hc { + displayName = "Helicopter Crew Chief"; + traits[] = {"engineer"}; + backpack[] = {"B_AssaultPack_mcamo"}; + linkedItems[] += {"ItemGPS"}; + backpackItems[] = {"ToolKit"}; +}; + +class jp : smg { + displayName = "Jet pilot"; + traits[] = {"engineer"}; + uniform[] = {"U_B_HeliPilotCoveralls"}; + vest[] = {"V_TacVest_blk"}; + backpack[] = {}; + headgear[] = {"H_PilotHelmetHeli_B"}; + goggles[] = {"default"}; + linkedItems[] += {"ItemGPS"}; + magazines[] = { + LIST_6("30Rnd_45ACP_Mag_SMG_01"), + "SmokeShellPurple" + }; +}; + +class logi : car { + displayName = "Logistics"; + traits[] = {"engineer"}; + backpack[] = {"B_Kitbag_rgr"}; + items[] += { + "ACE_wirecutter" + }; + linkedItems[] += {"ItemGPS"}; + backpackItems[] = {"ToolKit"}; +}; + +class eng : logi { + displayName = "Combat Engineer"; + traits[] += {"explosiveSpecialist"}; + sidearmWeapon[] = {"ACE_VMM3"}; + items[] += { + "ACE_Clacker", + "ACE_DefusalKit" + }; +}; + +class UAV : car { + displayName = "UAV Operator"; + traits[] = {"UAVHacker"}; + backpack[] = {"B_UAV_01_backpack_F"}; + linkedItems[] += {"B_UavTerminal"}; +}; diff --git a/addons/tmf_loadouts/loadouts/ger_army_2010.hpp b/addons/tmf_loadouts/loadouts/ger_army_2010.hpp index a0acd11..5fba571 100644 --- a/addons/tmf_loadouts/loadouts/ger_army_2010.hpp +++ b/addons/tmf_loadouts/loadouts/ger_army_2010.hpp @@ -49,7 +49,10 @@ class baseMan {// Weaponless baseclass MEDICAL_R, "ACE_Flashlight_XL50", "Chemlight_green", - "ACE_CableTie" + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" + }; // These are added directly into their respective slots linkedItems[] = { @@ -77,11 +80,11 @@ class r : baseMan { "CUP_H_Ger_M92_Cover_GG_CF", "CUP_H_Ger_M92_Cover_GG" }; - primaryWeapon[] = {"CUP_arifle_G36A"}; - scope[] = {"cup_optic_g36optics15x_3d"}; + primaryWeapon[] = {"hlc_rifle_G36V"}; + scope[] = {"cup_optic_eotech553_black"}; magazines[] = { - LIST_6("CUP_30Rnd_556x45_G36"), - LIST_2("CUP_30Rnd_TE1_Yellow_Tracer_556x45_G36"), + LIST_6("hlc_30rnd_556x45_EPR_G36"), + LIST_2("hlc_30rnd_556x45_M_G36"), LIST_2("HandGrenade"), LIST_2("SmokeShell") }; @@ -90,7 +93,7 @@ class r : baseMan { class g : r { displayName = "Grenadier"; vest[] = {"CUP_V_B_GER_PVest_Fleck_Gren"}; - primaryWeapon[] = {"CUP_arifle_AG36"}; + primaryWeapon[] = {"hlc_rifle_G36VAG36"}; magazines[] += { LIST_8("CUP_1Rnd_HEDP_M203"), LIST_4("CUP_1Rnd_Smoke_M203") @@ -99,7 +102,7 @@ class g : r { class car : r { displayName = "Carabinier"; - primaryWeapon[] = {"CUP_arifle_G36C_VFG_Carry"}; + primaryWeapon[] = {"hlc_rifle_G36C"}; }; class cls : car { @@ -192,7 +195,8 @@ class aar : r { displayName = "Assistant Automatic Rifleman"; backpack[] = {"B_FieldPack_green_F"}; backpackItems[] = { - LIST_3("CUP_120Rnd_TE4_LRT4_Yellow_Tracer_762x51_Belt_M") + LIST_2("CUP_120Rnd_TE4_LRT4_Yellow_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; diff --git a/addons/tmf_loadouts/loadouts/ger_army_trop_2010.hpp b/addons/tmf_loadouts/loadouts/ger_army_trop_2010.hpp index 5145bbe..e3eb3b3 100644 --- a/addons/tmf_loadouts/loadouts/ger_army_trop_2010.hpp +++ b/addons/tmf_loadouts/loadouts/ger_army_trop_2010.hpp @@ -49,7 +49,10 @@ class baseMan {// Weaponless baseclass MEDICAL_R, "ACE_Flashlight_XL50", "Chemlight_green", - "ACE_CableTie" + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" + }; // These are added directly into their respective slots linkedItems[] = { @@ -77,11 +80,11 @@ class r : baseMan { "CUP_H_Ger_M92_Cover_Trop_GG_CF", "CUP_H_Ger_M92_Cover_Trop_GG" }; - primaryWeapon[] = {"CUP_arifle_G36A"}; - scope[] = {"cup_optic_g36optics15x_3d"}; + primaryWeapon[] = {"hlc_rifle_G36V"}; + scope[] = {"cup_optic_eotech553_black"}; magazines[] = { - LIST_6("CUP_30Rnd_556x45_G36"), - LIST_2("CUP_30Rnd_TE1_Yellow_Tracer_556x45_G36"), + LIST_6("hlc_30rnd_556x45_EPR_G36"), + LIST_2("hlc_30rnd_556x45_M_G36"), LIST_2("HandGrenade"), LIST_2("SmokeShell") }; @@ -90,7 +93,7 @@ class r : baseMan { class g : r { displayName = "Grenadier"; vest[] = {"CUP_V_B_GER_PVest_Trop_Gren"}; - primaryWeapon[] = {"CUP_arifle_AG36"}; + primaryWeapon[] = {"hlc_rifle_G36VAG36"}; magazines[] += { LIST_8("CUP_1Rnd_HEDP_M203"), LIST_4("CUP_1Rnd_Smoke_M203") @@ -99,7 +102,7 @@ class g : r { class car : r { displayName = "Carabinier"; - primaryWeapon[] = {"CUP_arifle_G36C_VFG_Carry"}; + primaryWeapon[] = {"hlc_rifle_G36C"}; }; class cls : car { @@ -192,7 +195,8 @@ class aar : r { displayName = "Assistant Automatic Rifleman"; backpack[] = {"B_FieldPack_cbr"}; backpackItems[] = { - LIST_3("CUP_120Rnd_TE4_LRT4_Yellow_Tracer_762x51_Belt_M") + LIST_2("CUP_120Rnd_TE4_LRT4_Yellow_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; diff --git a/addons/tmf_loadouts/loadouts/hil.hpp b/addons/tmf_loadouts/loadouts/hil.hpp index 95e38e7..f27dbf7 100644 --- a/addons/tmf_loadouts/loadouts/hil.hpp +++ b/addons/tmf_loadouts/loadouts/hil.hpp @@ -49,7 +49,10 @@ class baseMan {// Weaponless baseclass items[] = { MEDICAL_R, "ACE_Flashlight_MX991", - LIST_2("Chemlight_green") + LIST_2("Chemlight_green"), + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -103,6 +106,12 @@ class g : r { class car : r { displayName = "Carabinier"; + magazines[] = { + LIST_6("CUP_25Rnd_556x45_Famas"), + LIST_2("CUP_25Rnd_556x45_Famas_Tracer_Red"), + LIST_2("HandGrenade"), + LIST_2("SmokeShell") + }; }; class cls : car { @@ -178,7 +187,7 @@ class ar : r { displayName = "Automatic Rifleman"; primaryWeapon[] = {"CUP_lmg_M249_E1"}; magazines[] = { - LIST_7("CUP_100Rnd_TE4_Red_Tracer_556x45_M249"), + LIST_6("CUP_100Rnd_TE4_Red_Tracer_556x45_M249"), "HandGrenade", "SmokeShell" }; @@ -187,8 +196,8 @@ class ar : r { class aar : r { displayName = "Assistant Automatic Rifleman"; backpackItems[] = { - LIST_4("CUP_100Rnd_TE4_Red_Tracer_556x45_M249"), - "ACE_EntrenchingTool" + LIST_2("CUP_100Rnd_TE4_Red_Tracer_556x45_M249"), + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; @@ -242,7 +251,6 @@ class mmgtl : aar { }; backpackItems[] = { LIST_2("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), - "ACE_EntrenchingTool", "ACE_SpareBarrel" }; }; diff --git a/addons/tmf_loadouts/loadouts/idf_army_2010.hpp b/addons/tmf_loadouts/loadouts/idf_army_2010.hpp index 92e77eb..d1dd885 100644 --- a/addons/tmf_loadouts/loadouts/idf_army_2010.hpp +++ b/addons/tmf_loadouts/loadouts/idf_army_2010.hpp @@ -47,8 +47,10 @@ class baseMan {// Weaponless baseclass items[] = { MEDICAL_R, "ACE_Flashlight_XL50", - "ACE_CableTie", - "Chemlight_green" + "Chemlight_green", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -195,7 +197,7 @@ class aar : r { backpack[] = {"CUP_B_IDF_Backpack"}; backpackItems[] = { LIST_4("CUP_100Rnd_TE4_Green_Tracer_556x45_M249"), - "ACE_EntrenchingTool" + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; @@ -252,9 +254,8 @@ class mmgtl : aar { "ItemGPS" }; backpackItems[] = { - LIST_2("150Rnd_762x54_Box"), LIST_2("150Rnd_762x54_Box_Tracer"), - "ACE_EntrenchingTool" + "ACE_SpareBarrel_Item" }; }; @@ -523,7 +524,7 @@ class jp : hc { displayName = "Jet pilot"; traits[] = {"engineer"}; uniform[] = {"U_I_pilotCoveralls"}; - vest[] = {}; + vest[] = {"CUP_V_B_PilotVest"}; headgear[] = {"H_PilotHelmetFighter_O"}; linkedItems[] += {"ItemGPS"}; }; diff --git a/addons/tmf_loadouts/loadouts/pla_army_2010.hpp b/addons/tmf_loadouts/loadouts/pla_army_2010.hpp index 2a8c4d3..de96b9d 100644 --- a/addons/tmf_loadouts/loadouts/pla_army_2010.hpp +++ b/addons/tmf_loadouts/loadouts/pla_army_2010.hpp @@ -44,7 +44,10 @@ class baseMan {// Weaponless baseclass items[] = { MEDICAL_R, "Chemlight_red", - "ACE_Flashlight_KSF1" + "ACE_Flashlight_KSF1", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -177,7 +180,7 @@ class aar : r { displayName = "Assistant Automatic Rifleman"; backpackItems[] = { LIST_4("100Rnd_580x42_Mag_F"), - "ACE_EntrenchingTool" + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; @@ -229,7 +232,7 @@ class mmgtl : aar { }; backpackItems[] = { LIST_2("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M"), - "ACE_EntrenchingTool" + "ACE_SpareBarrel_Item" }; }; diff --git a/addons/tmf_loadouts/loadouts/racs.hpp b/addons/tmf_loadouts/loadouts/racs.hpp index 41737d4..0789701 100644 --- a/addons/tmf_loadouts/loadouts/racs.hpp +++ b/addons/tmf_loadouts/loadouts/racs.hpp @@ -41,7 +41,9 @@ class baseMan {// Weaponless baseclass items[] = { MEDICAL_R, "ACE_Flashlight_MX991", - "ACE_CableTie" + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -168,8 +170,8 @@ class ar : r { class aar : r { displayName = "Assistant Automatic Rifleman"; backpackItems[] = { - LIST_3("CUP_200Rnd_TE4_Green_Tracer_556x45_M249_Pouch"), - "ACE_EntrenchingTool" + LIST_2("CUP_200Rnd_TE4_Green_Tracer_556x45_M249_Pouch"), + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; @@ -219,8 +221,8 @@ class mmgtl : aar { "ItemGPS" }; backpackItems[] = { - LIST_3("CUP_100Rnd_TE4_LRT4_Green_Tracer_762x51_Belt_M"), - "ACE_EntrenchingTool" + LIST_2("CUP_100Rnd_TE4_LRT4_Green_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; }; diff --git a/addons/tmf_loadouts/loadouts/ru_army_2010.hpp b/addons/tmf_loadouts/loadouts/ru_army_2010.hpp index 7b78f1d..155ea2c 100644 --- a/addons/tmf_loadouts/loadouts/ru_army_2010.hpp +++ b/addons/tmf_loadouts/loadouts/ru_army_2010.hpp @@ -45,8 +45,9 @@ class baseMan {// Weaponless baseclass items[] = { MEDICAL_R, "ACE_Flashlight_KSF1", - "ACE_CableTie", - "ACE_EntrenchingTool" + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { diff --git a/addons/tmf_loadouts/loadouts/sla.hpp b/addons/tmf_loadouts/loadouts/sla.hpp index bb07125..1c16625 100644 --- a/addons/tmf_loadouts/loadouts/sla.hpp +++ b/addons/tmf_loadouts/loadouts/sla.hpp @@ -218,7 +218,9 @@ class mmgac : r { vest[] = {"CUP_V_O_SLA_Flak_Vest03"}; backpack[] = {"CUP_B_AlicePack_Bedroll"}; backpackItems[] = { - LIST_5("130Rnd_338_Mag") + LIST_4("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Yellow_M"), + "ACE_SpareBarrel_Item" + }; }; diff --git a/addons/tmf_loadouts/loadouts/tk_army.hpp b/addons/tmf_loadouts/loadouts/tk_army.hpp index 8bda75f..36ea540 100644 --- a/addons/tmf_loadouts/loadouts/tk_army.hpp +++ b/addons/tmf_loadouts/loadouts/tk_army.hpp @@ -50,7 +50,10 @@ class baseMan {// Weaponless baseclass items[] = { MEDICAL_R, "ACE_Flashlight_KSF1", - "ACE_HandFlare_Red" + "ACE_HandFlare_Red", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -246,7 +249,8 @@ class mmgac : r { displayName = "MMG Ammo Carrier"; backpack[] = {"CUP_B_AlicePack_Khaki"}; backpackItems[] = { - LIST_6("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M") + LIST_5("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M"), + "ACE_SpareBarrel_Item" }; }; diff --git a/addons/tmf_loadouts/loadouts/tk_locals.hpp b/addons/tmf_loadouts/loadouts/tk_locals.hpp index 2d58ded..4e39fd0 100644 --- a/addons/tmf_loadouts/loadouts/tk_locals.hpp +++ b/addons/tmf_loadouts/loadouts/tk_locals.hpp @@ -104,7 +104,10 @@ class baseMan {// Weaponless baseclass magazines[] = {}; items[] = { MEDICAL_R, - "ACE_Flashlight_KSF1" + "ACE_Flashlight_KSF1", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -182,7 +185,7 @@ class m : cls { displayName = "Medic"; primaryWeapon[] = {"CUP_srifle_LeeEnfield"}; magazines[] = { - LIST_12("CUP_10x_303_M"), + LIST_10("CUP_10x_303_M"), "CUP_HandGrenade_RGD5", "SmokeShell" }; @@ -232,7 +235,8 @@ class co : sl { class fac : car { displayName = "Forward Air Controller"; - backpack[] = {"cwr3_o_backpack_rd54_r148"}; + backpack[] = {"CUP_B_AlicePack_Khaki"}; + hmd[] = {"antenna_long_one_nvg"}; items[] += {"ACE_MapTools"}; linkedItems[] += {"Binocular"}; backpackItems[] = { FAC_GEAR }; @@ -414,7 +418,7 @@ class mtrac : r { class mtrtl : car { displayName = "Mortar Team Leader"; - items[] += {"ACE_MapTools"}; + items[] += {MTR_GEAR}; backPack[] = {"CUP_B_AlicePack_Khaki"}; backpackItems[] = { LIST_6("potato_vz99_HE"), diff --git a/addons/tmf_loadouts/loadouts/uk_army_2005.hpp b/addons/tmf_loadouts/loadouts/uk_army_2005.hpp index ee32082..64e392b 100644 --- a/addons/tmf_loadouts/loadouts/uk_army_2005.hpp +++ b/addons/tmf_loadouts/loadouts/uk_army_2005.hpp @@ -53,7 +53,10 @@ class baseMan {// Weaponless baseclass magazines[] = {}; items[] = { MEDICAL_R, - "ACE_Flashlight_XL50" + "ACE_Flashlight_XL50", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -204,6 +207,7 @@ class aar : r { backPack[] = {"CUP_B_Bergen_BAF"}; backpackItems[] = { LIST_4("CUP_200Rnd_TE4_Red_Tracer_556x45_L110A1"), + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; @@ -260,7 +264,8 @@ class mmgtl : aar { "ItemGPS" }; backpackItems[] = { - LIST_3("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M") + LIST_3("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; }; diff --git a/addons/tmf_loadouts/loadouts/uk_army_2010.hpp b/addons/tmf_loadouts/loadouts/uk_army_2010.hpp index 5b84928..7c6e7c4 100644 --- a/addons/tmf_loadouts/loadouts/uk_army_2010.hpp +++ b/addons/tmf_loadouts/loadouts/uk_army_2010.hpp @@ -47,7 +47,9 @@ class baseMan {// Weaponless baseclass items[] = { MEDICAL_R, "ACE_Flashlight_XL50", - "ACE_CableTie" + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -64,13 +66,7 @@ class baseMan {// Weaponless baseclass traits[] = {}; // This is executed after unit init is complete. argument: _this = _unit. - code = QUOTE( \ - if (sunOrMoon != 1) then \ - { \ - _this linkItem 'CUP_NVG_HMNVS'; \ - _this addItem 'ACE_IR_Strobe_Item'; \ - }); - // Add NVGs if it is night + code = "" }; class r : baseMan { @@ -197,7 +193,8 @@ class aar : r { displayName = "Assistant Automatic Rifleman"; backpack[] = {"B_AssaultPack_khk"}; backpackItems[] = { - LIST_2("CUP_200Rnd_TE4_Red_Tracer_556x45_L110A1") + LIST_2("CUP_200Rnd_TE4_Red_Tracer_556x45_L110A1"), + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; @@ -253,7 +250,8 @@ class mmgtl : aar { "ItemGPS" }; backpackItems[] = { - LIST_4("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M") + LIST_4("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; }; @@ -322,7 +320,6 @@ class hatg : car { displayName = "HAT Gunner"; secondaryWeapon[] = {"CUP_launch_Javelin"}; - secondaryAttachments[] = {"CUP_Javelin_M"}; backpack[] = {"B_TacticalPack_mcamo"}; backpackItems[] = {"CUP_Javelin_M"}; @@ -481,6 +478,7 @@ class hc : smg { displayName = "Helicopter Crew"; uniform[] = {"U_BG_Guerrilla_6_1"}; vest[] = {"CUP_V_B_BAF_DPM_Osprey_Mk3_Pilot"}; + backpack[] = {"B_AssaultPack_rgr"}; headgear[] = {"H_CrewHelmetHeli_O"}; magazines[] = { LIST_6("CUP_30Rnd_9x19_MP5"), @@ -497,7 +495,6 @@ class hp : hc { class hcc : hc { displayName = "Helicopter Crew Chief"; traits[] = {"engineer"}; - backpack[] = {"B_AssaultPack_rgr"}; backpackItems[] = {"ToolKit"}; }; diff --git a/addons/tmf_loadouts/loadouts/uk_rm_1982.hpp b/addons/tmf_loadouts/loadouts/uk_rm_1982.hpp index 772a274..2ee5c91 100644 --- a/addons/tmf_loadouts/loadouts/uk_rm_1982.hpp +++ b/addons/tmf_loadouts/loadouts/uk_rm_1982.hpp @@ -50,8 +50,9 @@ class baseMan {// Weaponless baseclass magazines[] = {}; items[] = { MEDICAL_R, - "ACE_Canteen", - "ACE_EntrenchingTool", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen", "ACE_Flashlight_MX991" }; // These are added directly into their respective slots @@ -172,7 +173,8 @@ class ar : r { class aar : r { displayName = "Assistant Automatic Rifleman"; backpackItems[] = { - LIST_10("CUP_30Rnd_TE1_Red_Tracer_762x51_FNFAL_M") + LIST_10("CUP_30Rnd_TE1_Red_Tracer_762x51_FNFAL_M"), + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; @@ -216,7 +218,8 @@ class mmgtl : aar { "ItemRadio" }; backpackItems[] = { - LIST_6("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M") + LIST_4("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; }; diff --git a/addons/tmf_loadouts/loadouts/us_army_1970.hpp b/addons/tmf_loadouts/loadouts/us_army_1970.hpp index 0143c28..a8fcd67 100644 --- a/addons/tmf_loadouts/loadouts/us_army_1970.hpp +++ b/addons/tmf_loadouts/loadouts/us_army_1970.hpp @@ -17,7 +17,7 @@ class baseMan {// Weaponless baseclass "cwr3_b_uniform_og107_rolled_gloves" }; vest[] = {"cwr3_b_vest_alice"}; - backpack[] = {}; + backpack[] = {"CUP_B_SLA_Medicbag"}; headgear[] = {}; goggles[] = {}; hmd[] = {}; @@ -47,7 +47,9 @@ class baseMan {// Weaponless baseclass items[] = { MEDICAL_R, "ACE_Flashlight_MX991", - "ACE_EntrenchingTool" + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -201,7 +203,8 @@ class aar : r { displayName = "Assistant Automatic Rifleman"; backPack[] = {"cwr3_b_backpack_alice"}; backpackItems[] = { - LIST_6("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M") + LIST_4("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; diff --git a/addons/tmf_loadouts/loadouts/us_army_1985.hpp b/addons/tmf_loadouts/loadouts/us_army_1985.hpp index 28b827d..864e237 100644 --- a/addons/tmf_loadouts/loadouts/us_army_1985.hpp +++ b/addons/tmf_loadouts/loadouts/us_army_1985.hpp @@ -50,9 +50,10 @@ class baseMan {// Weaponless baseclass items[] = { MEDICAL_R, "ACE_Flashlight_MX991", - "ACE_CableTie", - "ACE_EntrenchingTool", - LIST_2("Chemlight_green") + LIST_2("Chemlight_green"), + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -185,7 +186,8 @@ class aar : r { displayName = "Assistant Automatic Rifleman"; backpack[] = {"cwr3_b_backpack_alice"}; backpackItems[] = { - LIST_8("CUP_100Rnd_TE4_Red_Tracer_556x45_M249") + LIST_6("CUP_100Rnd_TE4_Red_Tracer_556x45_M249"), + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; @@ -242,7 +244,8 @@ class mmgtl : aar { backpack[] = {"cwr3_b_backpack_radio"}; backpackItems[] = { - LIST_2("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M") + LIST_2("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; }; diff --git a/addons/tmf_loadouts/loadouts/us_army_2003.hpp b/addons/tmf_loadouts/loadouts/us_army_2003.hpp index bfd103f..574c6a6 100644 --- a/addons/tmf_loadouts/loadouts/us_army_2003.hpp +++ b/addons/tmf_loadouts/loadouts/us_army_2003.hpp @@ -55,7 +55,10 @@ class baseMan {// Weaponless baseclass magazines[] = {}; items[] = { MEDICAL_R , - "ACE_Flashlight_XL50" + "ACE_Flashlight_XL50", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -225,7 +228,8 @@ class aar : r { displayName = "Assistant Automatic Rifleman"; backPack[] = {"CUP_B_USMC_MOLLE_WDL"}; backpackItems[] = { - LIST_6("CUP_200Rnd_TE4_Red_Tracer_556x45_M249") + LIST_6("CUP_200Rnd_TE4_Red_Tracer_556x45_M249"), + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; @@ -272,9 +276,10 @@ class mmgac : r { class mmgtl : aar { displayName = "MMG Team Leader"; backPack[] = {"CUP_B_USMC_MOLLE_WDL"}; - backpackItems[] += { + backpackItems[] = { "ACE_MapTools", - LIST_3("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M") + LIST_3("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; linkedItems[] += { "ACE_Vector", diff --git a/addons/tmf_loadouts/loadouts/us_army_2010.hpp b/addons/tmf_loadouts/loadouts/us_army_2010.hpp index 7f95609..7e815ef 100644 --- a/addons/tmf_loadouts/loadouts/us_army_2010.hpp +++ b/addons/tmf_loadouts/loadouts/us_army_2010.hpp @@ -53,7 +53,10 @@ class baseMan {// Weaponless baseclass items[] = { MEDICAL_R, "ACE_Flashlight_XL50", - LIST_2("Chemlight_green") + LIST_2("Chemlight_green"), + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -212,7 +215,8 @@ class aar : r { displayName = "Assistant Automatic Rifleman"; backpack[] = {"CUP_B_US_Assault_UCP"}; backpackItems[] = { - LIST_2("CUP_200Rnd_TE4_Red_Tracer_556x45_M249") + LIST_2("CUP_200Rnd_TE4_Red_Tracer_556x45_M249"), + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; @@ -264,7 +268,8 @@ class mmgtl : aar { "ItemGPS" }; backpackItems[] = { - LIST_2("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M") + LIST_2("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; }; diff --git a/addons/tmf_loadouts/loadouts/us_army_2018.hpp b/addons/tmf_loadouts/loadouts/us_army_2018.hpp index 6c5b377..a176523 100644 --- a/addons/tmf_loadouts/loadouts/us_army_2018.hpp +++ b/addons/tmf_loadouts/loadouts/us_army_2018.hpp @@ -43,7 +43,10 @@ class baseMan { MEDICAL_R , "ACE_Flashlight_XL50", "ACE_IR_Strobe_Item", - "ACE_microDAGR" + "ACE_microDAGR", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; linkedItems[] = { "ItemMap", @@ -177,8 +180,8 @@ class fac : ftl { backpack[] = {"CUP_B_US_IIID_OCP"}; backpackItems[] = { FAC_GEAR }; magazines[] += { - LIST_2("CUP_1Rnd_SmokeRed_M203"), - LIST_2("CUP_1Rnd_SmokeGreen_M203"), + "CUP_1Rnd_SmokeRed_M203", + "CUP_1Rnd_SmokeGreen_M203", "Laserbatteries" }; linkedItems[] = { @@ -211,7 +214,8 @@ class aar : r { displayName = "Assistant Automatic Rifleman"; backPack[] = {"CUP_B_US_IIID_OCP"}; backpackItems[] = { - LIST_4("CUP_200Rnd_TE4_Red_Tracer_556x45_M249") + LIST_4("CUP_200Rnd_TE4_Red_Tracer_556x45_M249"), + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; @@ -258,7 +262,8 @@ class mmgtl : aar { items[] += {"ACE_MapTools"}; backPack[] = {"CUP_B_US_IIID_OCP"}; backpackItems[] = { - LIST_4("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M") + LIST_4("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; linkedItems[] = { "ItemMap", diff --git a/addons/tmf_loadouts/loadouts/us_rangers_2010.hpp b/addons/tmf_loadouts/loadouts/us_rangers_2010.hpp index 9553754..a786618 100644 --- a/addons/tmf_loadouts/loadouts/us_rangers_2010.hpp +++ b/addons/tmf_loadouts/loadouts/us_rangers_2010.hpp @@ -50,7 +50,10 @@ class baseMan {// Weaponless baseclass MEDICAL_R, "ACE_IR_Strobe_Item", "ACE_Flashlight_XL50", - "ACE_microDAGR" + "ACE_microDAGR", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -225,7 +228,7 @@ class aar : r { backpack[] = {"B_Kitbag_rgr"}; backpackItems[] = { LIST_3("CUP_200Rnd_TE4_Red_Tracer_556x45_M249_Pouch"), - "ACE_EntrenchingTool" + "ACE_SpareBarrel_Item" }; linkedItems[] += {"ACE_Yardage450"}; }; @@ -279,7 +282,8 @@ class mmgtl : aar { "ACE_Vector" }; backpackItems[] = { - LIST_2("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M") + LIST_2("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; }; diff --git a/addons/tmf_loadouts/loadouts/us_rangers_2020.hpp b/addons/tmf_loadouts/loadouts/us_rangers_2020.hpp index cc7db22..042fba9 100644 --- a/addons/tmf_loadouts/loadouts/us_rangers_2020.hpp +++ b/addons/tmf_loadouts/loadouts/us_rangers_2020.hpp @@ -38,7 +38,10 @@ class baseMan { MEDICAL_R , "ACE_IR_Strobe_Item", "ACE_Flashlight_XL50", - "ACE_microDAGR" + "ACE_microDAGR", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; linkedItems[] = { "ItemMap", @@ -127,6 +130,12 @@ class car : r { "CUP_arifle_Mk17_CQC_FG", "CUP_arifle_Mk17_CQC_SFG" }; + magazines[] = { + LIST_6("CUP_20Rnd_762x51_B_SCAR"), + LIST_2("CUP_20Rnd_TE1_Red_Tracer_762x51_SCAR"), + "HandGrenade", + LIST_2("SmokeShell") + }; }; class cls : car { @@ -242,9 +251,9 @@ class aar : r { displayName = "Assistant Automatic Rifleman"; backpack[] = {"B_Kitbag_mcamo"}; backpackItems[] = { - LIST_3("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M") + LIST_3("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; - items[] += {"ACE_EntrenchingTool"}; linkedItems[] += {"ACE_Yardage450"}; }; @@ -305,7 +314,7 @@ class mmgac : r { displayName = "MMG Ammo Carrier"; backPack[] = {"B_Carryall_mcamo"}; backpackItems[] = { - LIST_6("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + LIST_6("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M") }; }; @@ -314,7 +323,8 @@ class mmgtl : aar { items[] += {"ACE_MapTools"}; backPack[] = {"B_Carryall_mcamo"}; backpackItems[] = { - LIST_6("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + LIST_4("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; linkedItems[] = { "ItemMap", @@ -428,7 +438,7 @@ class mtrac : r { displayName = "Mortar Ammo Carrier"; backPack[] = {"B_Carryall_mcamo"}; backpackItems[] = { - LIST_4("ACE_1Rnd_82mm_Mo_HE"), + LIST_3("ACE_1Rnd_82mm_Mo_HE"), "ACE_1Rnd_82mm_Mo_Illum", "ACE_1Rnd_82mm_Mo_Smoke" }; diff --git a/addons/tmf_loadouts/loadouts/us_usmc_1985.hpp b/addons/tmf_loadouts/loadouts/us_usmc_1985.hpp index 1ba10cf..4327f8a 100644 --- a/addons/tmf_loadouts/loadouts/us_usmc_1985.hpp +++ b/addons/tmf_loadouts/loadouts/us_usmc_1985.hpp @@ -39,7 +39,13 @@ class baseMan {// Weaponless baseclass // These are added to the uniform or vest magazines[] = {}; - items[] = { MEDICAL_R ,"ACE_Flashlight_MX991"}; + items[] = { + MEDICAL_R , + "ACE_Flashlight_MX991", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" + }; // These are added directly into their respective slots linkedItems[] = { "ItemMap", @@ -178,9 +184,9 @@ class aar : r { displayName = "Assistant Automatic Rifleman"; backpack[] = {"usm_pack_200rnd_556_bandoliers"}; backpackItems[] = { - LIST_4("CUP_200Rnd_TE4_Red_Tracer_556x45_M249") + LIST_4("CUP_200Rnd_TE4_Red_Tracer_556x45_M249"), + "ACE_SpareBarrel_Item" }; - Items[] += {"ACE_EntrenchingTool"}; linkedItems[] += {"Binocular"}; }; @@ -226,7 +232,8 @@ class mmgtl : aar { items[] += {"ACE_MapTools"}; backPack[] = {"usm_pack_762x51_bandoliers"}; backpackItems[] = { - LIST_4("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M") + LIST_4("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; linkedItems[] += {"ItemRadio"}; }; diff --git a/addons/tmf_loadouts/loadouts/us_usmc_2003.hpp b/addons/tmf_loadouts/loadouts/us_usmc_2003.hpp index f2e8987..ed4d50e 100644 --- a/addons/tmf_loadouts/loadouts/us_usmc_2003.hpp +++ b/addons/tmf_loadouts/loadouts/us_usmc_2003.hpp @@ -52,7 +52,10 @@ class baseMan {// Weaponless baseclass magazines[] = {}; items[] = { MEDICAL_R , - "ACE_Flashlight_XL50" + "ACE_Flashlight_XL50", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -203,7 +206,8 @@ class ar : r { class aar : r { displayName = "Assistant Automatic Rifleman"; backpackItems[] = { - LIST_3("CUP_200Rnd_TE4_Red_Tracer_556x45_M249") + LIST_3("CUP_200Rnd_TE4_Red_Tracer_556x45_M249"), + "ACE_SpareBarrel_Item" }; linkedItems[] += {"Binocular"}; }; @@ -246,7 +250,8 @@ class mmgac : r { class mmgtl : aar { displayName = "MMG Team Leader"; backpackItems[] = { - LIST_3("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M") + LIST_3("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; linkedItems[] = {"ItemGPS"}; items[] += {"ACE_MapTools"}; diff --git a/addons/tmf_loadouts/loadouts/us_usmc_2010_wdl.hpp b/addons/tmf_loadouts/loadouts/us_usmc_2010_wdl.hpp index 6b61cae..5053285 100644 --- a/addons/tmf_loadouts/loadouts/us_usmc_2010_wdl.hpp +++ b/addons/tmf_loadouts/loadouts/us_usmc_2010_wdl.hpp @@ -41,7 +41,10 @@ class baseMan { items[] = { MEDICAL_R , "ACE_Flashlight_XL50", - "ACE_SpraypaintGreen" + "ACE_SpraypaintGreen", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; linkedItems[] = { "ItemMap", @@ -221,7 +224,7 @@ class aar : r { backpack[] = {"B_Kitbag_cbr"}; backpackItems[] = { LIST_3("CUP_200Rnd_TE4_Red_Tracer_556x45_M249"), - "ACE_EntrenchingTool" + "ACE_SpareBarrel_Item" }; linkedItems[] += {"ACE_Yardage450"}; }; @@ -276,7 +279,8 @@ class mmgtl : aar { "ItemGPS" }; backpackItems[] = { - LIST_3("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M") + LIST_3("CUP_100Rnd_TE4_LRT4_Red_Tracer_762x51_Belt_M"), + "ACE_SpareBarrel_Item" }; }; diff --git a/addons/tmf_loadouts/loadouts/ussr_army_1970.hpp b/addons/tmf_loadouts/loadouts/ussr_army_1970.hpp index 4d8f388..79f9b42 100644 --- a/addons/tmf_loadouts/loadouts/ussr_army_1970.hpp +++ b/addons/tmf_loadouts/loadouts/ussr_army_1970.hpp @@ -41,7 +41,10 @@ class baseMan {// Weaponless baseclass magazines[] = {}; items[] = { MEDICAL_R, - "ACE_Flashlight_KSF1" + "ACE_Flashlight_KSF1", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -159,12 +162,11 @@ class co : sl { class cor : co { displayName = "Platoon Leader (Radio)"; - radio[] = {"CUP_B_Kombat_Radio_Olive"}; }; class fac : sl { displayName = "Forward Air Controller"; - backpack[] = {"cwr3_o_backpack_rd54_r148"}; + backPack[] = {"cwr3_o_backpack_veshmeshok"}; backpackItems[] = { FAC_GEAR }; linkedItems[] += {"CUP_SOFLAM"}; }; @@ -181,8 +183,7 @@ class ar : r { class aar : r { displayName = "Assistant Automatic Rifleman"; backpackItems[] = { - LIST_6("CUP_40Rnd_TE4_LRT4_Green_Tracer_762x39_RPK_M"), - "ACE_EntrenchingTool" + LIST_6("CUP_40Rnd_TE4_LRT4_Green_Tracer_762x39_RPK_M") }; linkedItems[] += {"Binocular"}; }; @@ -229,8 +230,7 @@ class mmgtl : aar { backpack[] = {"cwr3_o_backpack_veshmeshok"}; items[] += {"ACE_MapTools"}; backpackItems[] = { - LIST_6("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Yellow_M"), - "ACE_EntrenchingTool" + LIST_6("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Yellow_M") }; }; diff --git a/addons/tmf_loadouts/loadouts/ussr_army_1985.hpp b/addons/tmf_loadouts/loadouts/ussr_army_1985.hpp index 19d02d0..85615ac 100644 --- a/addons/tmf_loadouts/loadouts/ussr_army_1985.hpp +++ b/addons/tmf_loadouts/loadouts/ussr_army_1985.hpp @@ -41,7 +41,10 @@ class baseMan {// Weaponless baseclass linkedItems[] = { "ItemMap", "ItemCompass", - "ItemWatch" + "ItemWatch", + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are put into the backpack @@ -166,8 +169,7 @@ class ar : r { class aar : r { displayName = "Assistant Automatic Rifleman"; backpackItems[] = { - LIST_6("CUP_45Rnd_TE4_LRT4_Green_Tracer_545x39_RPK_M"), - "ACE_EntrenchingTool" + LIST_6("CUP_45Rnd_TE4_LRT4_Green_Tracer_545x39_RPK_M") }; linkedItems[] += {"Binocular"}; }; @@ -214,8 +216,7 @@ class mmgtl : aar { backpack[] = {"cwr3_o_backpack_veshmeshok"}; items[] += {"ACE_MapTools"}; backpackItems[] = { - LIST_6("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Yellow_M"), - "ACE_EntrenchingTool" + LIST_6("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Yellow_M") }; }; diff --git a/addons/tmf_loadouts/loadouts/vietcong.hpp b/addons/tmf_loadouts/loadouts/vietcong.hpp index 763bbc6..39a5d60 100644 --- a/addons/tmf_loadouts/loadouts/vietcong.hpp +++ b/addons/tmf_loadouts/loadouts/vietcong.hpp @@ -52,7 +52,10 @@ class baseMan {// Weaponless baseclass items[] = { MEDICAL_R, "ACE_Flashlight_KSF1", - LIST_2("ACE_HandFlare_Red") + LIST_2("ACE_HandFlare_Red"), + LIST_3("ACE_CableTie"), + "ACE_EntrenchingTool", + "ACE_Canteen" }; // These are added directly into their respective slots linkedItems[] = { @@ -204,8 +207,7 @@ class ar : r { class aar : r { displayName = "Assistant Automatic Rifleman"; backpackItems[] = { - LIST_3("CUP_75Rnd_TE4_LRT4_Green_Tracer_762x39_RPK_M"), - "ACE_EntrenchingTool" + LIST_3("CUP_75Rnd_TE4_LRT4_Green_Tracer_762x39_RPK_M") }; linkedItems[] += {"Binocular"}; }; @@ -256,8 +258,7 @@ class mmgtl : aar { backpack[] = {"cwr3_o_backpack_veshmeshok"}; items[] += {"ACE_MapTools"}; backpackItems[] = { - LIST_6("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M"), - "ACE_EntrenchingTool" + LIST_6("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M") }; };