From ba2078e94d0e60011f07e14b94ec745ff5d1c28c Mon Sep 17 00:00:00 2001 From: ColdEvul Date: Fri, 8 May 2020 16:31:51 +0200 Subject: [PATCH 1/2] Added Blake TU --- cScripts/Loadouts/CfgLoadouts_Training.hpp | 237 +++++++++++++++++- .../Loadouts/CfgLoadouts_TrainingClass.hpp | 6 + 2 files changed, 236 insertions(+), 7 deletions(-) diff --git a/cScripts/Loadouts/CfgLoadouts_Training.hpp b/cScripts/Loadouts/CfgLoadouts_Training.hpp index 4c4a78012..13ebb6f6b 100644 --- a/cScripts/Loadouts/CfgLoadouts_Training.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Training.hpp @@ -31,6 +31,56 @@ class Cav_B_Unarmed_Local : CommonBlufor { class CAV_SOI_INSTR : Cav_B_Charlie_base_F { + uniform[] = {"LOP_U_ISTS_Fatigue_19"}; + headgear[] = {"DAR_Beret_blk"}; + goggles[] = {""}; + vest[] = {"V_TacVest_khk"}; + backpack[] = {"B_Carryall_mcamo"}; + binoculars[] = {"ACE_Vector"}; + + magazines[] = { + "rhs_mag_30Rnd_556x45_M855A1_Stanag",6, + + "rhs_mag_m67",2, + + "SmokeShell",2, + "SmokeShellBlue",1, + "SmokeShellGreen",1, + "SmokeShellRed",1, + "SmokeShellYellow",1 + }; + + items[] = { + // Radios + "ACRE_PRC343", + "ACRE_PRC152", + "ACRE_PRC152", + + // Standard + "ACE_EarPlugs", + "ACE_MapTools", + "ACE_CableTie", + "H_Cap_tan_specops_US", + + // Electronics + "ACE_microDAGR", + "ACE_HuntIR_monitor", + + // Tools + "ACE_SpraypaintRed", + "ACE_EntrenchingTool" + }; + + gps[] = {"ItemAndroid"}; + + insignia[] = {""}; + + preLoadout = "[(_this select 0), 'training', 2, 2] call cScripts_fnc_setPreInitPlayerSettings; \ + (_this select 0) allowDamage false;"; +}; + +class CAV_SOI_BAS_INSTR : Cav_B_Charlie_base_F { + uniform[] = {"LOP_U_ISTS_Fatigue_19"}; headgear[] = {"DAR_Beret_Mar"}; goggles[] = {""}; @@ -52,6 +102,7 @@ class CAV_SOI_INSTR : Cav_B_Charlie_base_F { items[] = { // Radios + "ACRE_PRC343", "ACRE_PRC152", "ACRE_PRC152", @@ -72,7 +123,107 @@ class CAV_SOI_INSTR : Cav_B_Charlie_base_F { gps[] = {"ItemAndroid"}; - insignia[] = {"Follow_Me"}; + insignia[] = {""}; + + preLoadout = "[(_this select 0), 'training', 2, 2] call cScripts_fnc_setPreInitPlayerSettings; \ + (_this select 0) allowDamage false;"; +}; + +class CAV_SOI_C1_INSTR : Cav_B_Charlie_base_F { + + uniform[] = {"LOP_U_ISTS_Fatigue_19"}; + headgear[] = {"DAR_Beret_Mar"}; + goggles[] = {""}; + vest[] = {"V_TacVest_khk"}; + backpack[] = {"B_Carryall_mcamo"}; + binoculars[] = {"ACE_Vector"}; + + magazines[] = { + "rhs_mag_30Rnd_556x45_M855A1_Stanag",6, + + "rhs_mag_m67",2, + + "SmokeShell",2, + "SmokeShellBlue",1, + "SmokeShellGreen",1, + "SmokeShellRed",1, + "SmokeShellYellow",1 + }; + + items[] = { + // Radios + "ACRE_PRC343", + "ACRE_PRC152", + "ACRE_PRC152", + + // Standard + "ACE_EarPlugs", + "ACE_MapTools", + "ACE_CableTie", + "H_Cap_tan_specops_US", + + // Electronics + "ACE_microDAGR", + "ACE_HuntIR_monitor", + + // Tools + "ACE_SpraypaintRed", + "ACE_EntrenchingTool" + }; + + gps[] = {"ItemAndroid"}; + + insignia[] = {""}; + + preLoadout = "[(_this select 0), 'training', 2, 2] call cScripts_fnc_setPreInitPlayerSettings; \ + (_this select 0) allowDamage false;"; +}; + +class CAV_SOI_C2_INSTR : Cav_B_Charlie_base_F { + + uniform[] = {"LOP_U_ISTS_Fatigue_19"}; + headgear[] = {"DAR_Beret_blk"}; + goggles[] = {""}; + vest[] = {"V_TacVest_khk"}; + backpack[] = {"B_Carryall_mcamo"}; + binoculars[] = {"ACE_Vector"}; + + magazines[] = { + "rhs_mag_30Rnd_556x45_M855A1_Stanag",6, + + "rhs_mag_m67",2, + + "SmokeShell",2, + "SmokeShellBlue",1, + "SmokeShellGreen",1, + "SmokeShellRed",1, + "SmokeShellYellow",1 + }; + + items[] = { + // Radios + "ACRE_PRC343", + "ACRE_PRC152", + "ACRE_PRC152", + + // Standard + "ACE_EarPlugs", + "ACE_MapTools", + "ACE_CableTie", + "H_Cap_tan_specops_US", + + // Electronics + "ACE_microDAGR", + "ACE_HuntIR_monitor", + + // Tools + "ACE_SpraypaintRed", + "ACE_EntrenchingTool" + }; + + gps[] = {"ItemAndroid"}; + + insignia[] = {""}; preLoadout = "[(_this select 0), 'training', 2, 2] call cScripts_fnc_setPreInitPlayerSettings; \ (_this select 0) allowDamage false;"; @@ -101,6 +252,7 @@ class CAV_JM_INSTR : Cav_B_Charlie_base_F { items[] = { // Radios + "ACRE_PRC343", "ACRE_PRC152", // Standard @@ -120,12 +272,12 @@ class CAV_JM_INSTR : Cav_B_Charlie_base_F { gps[] = {"ItemAndroid"}; - insignia[] = {"Cav_Insignia_Specialized_CAG"}; + insignia[] = {""}; preLoadout = "[(_this select 0), 'training', 2, 2] call cScripts_fnc_setPreInitPlayerSettings; \ (_this select 0) allowDamage false;"; }; -class CAV_SOI_STUD : Cav_B_Bravo_base_F { +class CAV_SOI_STUD : Cav_B_Charlie_base_F { vest[] = {"rhsusf_iotv_ocp_Rifleman"}; backpack[] = {"B_Carryall_mcamo"}; @@ -133,15 +285,82 @@ class CAV_SOI_STUD : Cav_B_Bravo_base_F { magazines[] = { "rhs_mag_30Rnd_556x45_M855A1_Stanag",10, - "rhs_mag_m67",6, + "rhs_mag_m67",2, "SmokeShell",6, - "rhs_200rnd_556x45_M_SAW",2 + "rhsusf_200Rnd_556x45_soft_pouch",2 + }; + + items[] = { + "ACRE_PRC343", + "ACE_MapTools", + "ACE_quikclot",12, + "ACE_tourniquet",2, + "ACE_EntrenchingTool" }; preLoadout = "[(_this select 0), 'training', 2, 2] call cScripts_fnc_setPreInitPlayerSettings; \ - (_this select 0) allowDamage false;"; + (_this select 0) allowDamage true;"; +}; + +class CAV_SOI_BAS_STUD : Cav_B_Charlie_base_F { + company = "charlie"; + primary[] = {"rhs_weap_m4a1"}; + vest[] = {"rhsusf_iotv_ocp_Rifleman"}; + backpack[] = {"B_Carryall_mcamo"}; + + magazines[] = {""}; + + items[] = { + "ACRE_PRC343", + "ACE_MapTools", + "ACE_quikclot",12, + "ACE_tourniquet",2 + }; + + + preLoadout = "[(_this select 0), 'training', 2, 2] call cScripts_fnc_setPreInitPlayerSettings; \ + (_this select 0) allowDamage true;"; +}; + +class CAV_SOI_C1_STUD : Cav_B_Charlie_base_F { + company = "charlie"; + primary[] = {"rhs_weap_m4a1"}; + vest[] = {"rhsusf_iotv_ocp_Rifleman"}; + backpack[] = {"B_Carryall_mcamo"}; + + magazines[] = {""}; + + items[] = { + "ACRE_PRC343", + "ACE_MapTools", + "ACE_quikclot",12, + "ACE_tourniquet",2 + }; + + + preLoadout = "[(_this select 0), 'training', 2, 2] call cScripts_fnc_setPreInitPlayerSettings; \ + (_this select 0) allowDamage true;"; +}; + +class CAV_SOI_C2_STUD : Cav_B_Charlie_base_F { + primary[] = {"rhs_weap_m4a1"}; + vest[] = {"rhsusf_iotv_ocp_Rifleman"}; + backpack[] = {"B_Carryall_mcamo"}; + + magazines[] = {""}; + + items[] = { + "ACRE_PRC343", + "ACE_MapTools", + "ACE_quikclot",12, + "ACE_tourniquet",2 + }; + + + preLoadout = "[(_this select 0), 'training', 2, 2] call cScripts_fnc_setPreInitPlayerSettings; \ + (_this select 0) allowDamage true;"; }; // THE ARMOR SCHOOL @@ -179,9 +398,10 @@ class CAV_TAS_INSTR : Cav_B_Bravo_base_F { // Radios "ACRE_PRC152", "ACRE_PRC152", + "ACRE_PRC343", // Personal Medical Equipment - "ACE_quikclot",6, + "ACE_quikclot",12, "ACE_tourniquet",2, // Standard @@ -221,6 +441,7 @@ class CAV_TAS_STUD : Cav_B_Bravo_base_F { items[] = { // Radios "ACRE_PRC152", + "ACRE_PRC343", // Personal Medical Equipment "ACE_quikclot",10, @@ -300,6 +521,7 @@ class CAV_ACE_FIXED_INSTR : Cav_B_Alpha_base_F { items[] = { // Radios "ACRE_PRC152", + "ACRE_PRC343", // Personal Medical Equipment "ACE_quikclot",5, @@ -349,6 +571,7 @@ class CAV_ACE_FIXED_STUD : Cav_B_Alpha_base_F { items[] = { // Radios "ACRE_PRC152", + "ACRE_PRC343", // Personal Medical Equipment "ACE_quikclot",5, diff --git a/cScripts/Loadouts/CfgLoadouts_TrainingClass.hpp b/cScripts/Loadouts/CfgLoadouts_TrainingClass.hpp index fc913e7d4..c21a50ce5 100644 --- a/cScripts/Loadouts/CfgLoadouts_TrainingClass.hpp +++ b/cScripts/Loadouts/CfgLoadouts_TrainingClass.hpp @@ -3,6 +3,9 @@ // Instructors class rhsusf_usmc_marpat_wd_officer : CAV_SOI_INSTR {}; +class rhsusf_usmc_marpat_wd_machinegunner_ass : CAV_SOI_C2_INSTR {}; +class rhsusf_usmc_marpat_wd_squadleader : CAV_SOI_C1_INSTR {}; +class rhsusf_usmc_marpat_wd_gunner : CAV_SOI_BAS_INSTR {}; class rhsusf_usmc_marpat_d_officer : CAV_JM_INSTR {}; class rhsusf_usmc_marpat_wd_crewman : CAV_TAS_INSTR {}; class rhsusf_usmc_marpat_wd_helipilot : CAV_ACE_ROTARY_INSTR {}; @@ -11,6 +14,9 @@ class rhsusf_airforce_jetpilot : CAV_ACE_FIXED_INSTR {}; // Students class rhsusf_usmc_marpat_wd_rifleman_m4 : CAV_SOI_STUD {}; +class rhsusf_usmc_marpat_wd_rifleman_light : CAV_SOI_C1_STUD {}; +class rhsusf_usmc_marpat_wd_rifleman_law : CAV_SOI_C2_STUD {}; +class rhsusf_usmc_marpat_wd_riflemanat : CAV_SOI_BAS_STUD {}; class rhsusf_usmc_marpat_wd_combatcrewman : CAV_TAS_STUD {}; class rhsusf_usmc_marpat_wd_helicrew : CAV_ACE_ROTARY_STUD {}; class rhsusf_airforce_pilot : CAV_ACE_FIXED_STUD {}; From b22f596fcb8e88d21e2822752a10bbdce28c36dd Mon Sep 17 00:00:00 2001 From: ColdEvul Date: Sun, 17 May 2020 22:05:58 +0200 Subject: [PATCH 2/2] Fixerd tabs in config --- cScripts/Loadouts/CfgLoadouts_Training.hpp | 84 +++++++++++----------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/cScripts/Loadouts/CfgLoadouts_Training.hpp b/cScripts/Loadouts/CfgLoadouts_Training.hpp index 13ebb6f6b..0fefdbbcd 100644 --- a/cScripts/Loadouts/CfgLoadouts_Training.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Training.hpp @@ -52,7 +52,7 @@ class CAV_SOI_INSTR : Cav_B_Charlie_base_F { items[] = { // Radios - "ACRE_PRC343", + "ACRE_PRC343", "ACRE_PRC152", "ACRE_PRC152", @@ -102,7 +102,7 @@ class CAV_SOI_BAS_INSTR : Cav_B_Charlie_base_F { items[] = { // Radios - "ACRE_PRC343", + "ACRE_PRC343", "ACRE_PRC152", "ACRE_PRC152", @@ -152,7 +152,7 @@ class CAV_SOI_C1_INSTR : Cav_B_Charlie_base_F { items[] = { // Radios - "ACRE_PRC343", + "ACRE_PRC343", "ACRE_PRC152", "ACRE_PRC152", @@ -202,7 +202,7 @@ class CAV_SOI_C2_INSTR : Cav_B_Charlie_base_F { items[] = { // Radios - "ACRE_PRC343", + "ACRE_PRC343", "ACRE_PRC152", "ACRE_PRC152", @@ -252,7 +252,7 @@ class CAV_JM_INSTR : Cav_B_Charlie_base_F { items[] = { // Radios - "ACRE_PRC343", + "ACRE_PRC343", "ACRE_PRC152", // Standard @@ -290,13 +290,13 @@ class CAV_SOI_STUD : Cav_B_Charlie_base_F { "SmokeShell",6, "rhsusf_200Rnd_556x45_soft_pouch",2 - }; - - items[] = { - "ACRE_PRC343", - "ACE_MapTools", - "ACE_quikclot",12, - "ACE_tourniquet",2, + }; + + items[] = { + "ACRE_PRC343", + "ACE_MapTools", + "ACE_quikclot",12, + "ACE_tourniquet",2, "ACE_EntrenchingTool" }; @@ -305,40 +305,40 @@ class CAV_SOI_STUD : Cav_B_Charlie_base_F { }; class CAV_SOI_BAS_STUD : Cav_B_Charlie_base_F { - company = "charlie"; + company = "charlie"; primary[] = {"rhs_weap_m4a1"}; vest[] = {"rhsusf_iotv_ocp_Rifleman"}; backpack[] = {"B_Carryall_mcamo"}; magazines[] = {""}; - - items[] = { - "ACRE_PRC343", - "ACE_MapTools", - "ACE_quikclot",12, - "ACE_tourniquet",2 - }; - + + items[] = { + "ACRE_PRC343", + "ACE_MapTools", + "ACE_quikclot",12, + "ACE_tourniquet",2 + }; + preLoadout = "[(_this select 0), 'training', 2, 2] call cScripts_fnc_setPreInitPlayerSettings; \ (_this select 0) allowDamage true;"; }; class CAV_SOI_C1_STUD : Cav_B_Charlie_base_F { - company = "charlie"; + company = "charlie"; primary[] = {"rhs_weap_m4a1"}; vest[] = {"rhsusf_iotv_ocp_Rifleman"}; backpack[] = {"B_Carryall_mcamo"}; magazines[] = {""}; - - items[] = { - "ACRE_PRC343", - "ACE_MapTools", - "ACE_quikclot",12, - "ACE_tourniquet",2 - }; - + + items[] = { + "ACRE_PRC343", + "ACE_MapTools", + "ACE_quikclot",12, + "ACE_tourniquet",2 + }; + preLoadout = "[(_this select 0), 'training', 2, 2] call cScripts_fnc_setPreInitPlayerSettings; \ (_this select 0) allowDamage true;"; @@ -350,14 +350,14 @@ class CAV_SOI_C2_STUD : Cav_B_Charlie_base_F { backpack[] = {"B_Carryall_mcamo"}; magazines[] = {""}; - - items[] = { - "ACRE_PRC343", - "ACE_MapTools", - "ACE_quikclot",12, - "ACE_tourniquet",2 - }; - + + items[] = { + "ACRE_PRC343", + "ACE_MapTools", + "ACE_quikclot",12, + "ACE_tourniquet",2 + }; + preLoadout = "[(_this select 0), 'training', 2, 2] call cScripts_fnc_setPreInitPlayerSettings; \ (_this select 0) allowDamage true;"; @@ -398,7 +398,7 @@ class CAV_TAS_INSTR : Cav_B_Bravo_base_F { // Radios "ACRE_PRC152", "ACRE_PRC152", - "ACRE_PRC343", + "ACRE_PRC343", // Personal Medical Equipment "ACE_quikclot",12, @@ -441,7 +441,7 @@ class CAV_TAS_STUD : Cav_B_Bravo_base_F { items[] = { // Radios "ACRE_PRC152", - "ACRE_PRC343", + "ACRE_PRC343", // Personal Medical Equipment "ACE_quikclot",10, @@ -521,7 +521,7 @@ class CAV_ACE_FIXED_INSTR : Cav_B_Alpha_base_F { items[] = { // Radios "ACRE_PRC152", - "ACRE_PRC343", + "ACRE_PRC343", // Personal Medical Equipment "ACE_quikclot",5, @@ -571,7 +571,7 @@ class CAV_ACE_FIXED_STUD : Cav_B_Alpha_base_F { items[] = { // Radios "ACRE_PRC152", - "ACRE_PRC343", + "ACRE_PRC343", // Personal Medical Equipment "ACE_quikclot",5,