diff --git a/cScripts/CavFnc/CfgFunctions.hpp b/cScripts/CavFnc/CfgFunctions.hpp
index 53ef967a0..85110d088 100644
--- a/cScripts/CavFnc/CfgFunctions.hpp
+++ b/cScripts/CavFnc/CfgFunctions.hpp
@@ -56,6 +56,9 @@ class cScripts {
class getPlayerRank {};
class setPlayerRank {};
+
+ class getPlayerRole {};
+
class getPlayerName {};
class doPlayerAnnouncement {};
diff --git a/cScripts/CavFnc/functions/documents/fn_Doc_Info.sqf b/cScripts/CavFnc/functions/documents/fn_Doc_Info.sqf
index 0605a075a..e11a5422e 100644
--- a/cScripts/CavFnc/functions/documents/fn_Doc_Info.sqf
+++ b/cScripts/CavFnc/functions/documents/fn_Doc_Info.sqf
@@ -15,13 +15,7 @@ private _playerName = [player, 'PROFILE'] call FUNC(getPlayerName);
private _playerRank = [player, 'CAV'] call FUNC(getPlayerRank);
private _playerRankFormal = [player, 'FORMAL'] call FUNC(getPlayerRank);
-private _playerRole = "trooper";
-if (isMultiplayer) then {
- _playerRole = roleDescription player;
- _playerRole = _playerRole splitString "@";
- _playerRole = _playerRole select 0;
- if (_playerRole == "") then {_playerRole = "trooper"};
-};
+private _playerRole = call FUNC(getPlayerRole);
private _playerGroup = call FUNC(getCavSquadName);
diff --git a/cScripts/CavFnc/functions/init/fn_initStartupHint.sqf b/cScripts/CavFnc/functions/init/fn_initStartupHint.sqf
index f1b26a465..f7dd32963 100644
--- a/cScripts/CavFnc/functions/init/fn_initStartupHint.sqf
+++ b/cScripts/CavFnc/functions/init/fn_initStartupHint.sqf
@@ -29,13 +29,8 @@ params [
private _player_name = [player,'PROFILE'] call FUNC(getPlayerName);
private _player_rankFormal = [player,'FORMAL'] call FUNC(getPlayerRank);
-private _player_role = "trooper";
-if (isMultiplayer) then {
- _player_role = roleDescription player;
- _player_role = _player_role splitString "@";
- _player_role = _player_role select 0;
- if (_player_role == "") then {_player_role = "trooper"};
-};
+private _player_role = call FUNC(getPlayerRole);
+
private _player_group = groupId (group player);
if (_player_group == "") then { _player_group = "in your squad" } else { _player_group = format["under the callsign %1", _player_group]};
diff --git a/cScripts/CavFnc/functions/players/fn_getPlayerRole.sqf b/cScripts/CavFnc/functions/players/fn_getPlayerRole.sqf
new file mode 100644
index 000000000..b05638b85
--- /dev/null
+++ b/cScripts/CavFnc/functions/players/fn_getPlayerRole.sqf
@@ -0,0 +1,37 @@
+#include "..\script_component.hpp";
+/*
+ * Author: CPL.Brostrom.A
+ * This function fetches your rank based on your name prefix.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * Role name
+ *
+ * Example:
+ * call cScripts_fnc_getPlayerRole
+ *
+ */
+
+private _return = "Trooper";
+
+if !(isMultiplayer) exitWith { _return };
+
+private _playerRole = roleDescription player;
+
+if !(_playerRole == "") then {
+ _playerRole = _playerRole splitString "@";
+ _playerRole = _playerRole select 0;
+
+} else {
+ _playerRole = getText (configFile >> "CfgVehicles" >> typeOf player >> "displayName");
+ _playerRole = _playerRole splitString " ";
+ if (_playerRole select 0 in ["Platoon", "Squad"]) then {
+ _return = [_playerRole select 0, _playerRole select 1] joinString " ";
+ } else {
+ _return = _playerRole joinString " ";
+ };
+};
+
+_return;
\ No newline at end of file
diff --git a/cScripts/CfgLoadouts.hpp b/cScripts/CfgLoadouts.hpp
index e75ed0453..3635c11d8 100644
--- a/cScripts/CfgLoadouts.hpp
+++ b/cScripts/CfgLoadouts.hpp
@@ -3,25 +3,22 @@ class CfgLoadouts {
#include "Loadouts\CfgLoadouts_Common.hpp"
#include "Loadouts\CfgLoadouts_Alpha.hpp"
- #include "Loadouts\CfgLoadouts_AlphaClass.hpp"
-
#include "Loadouts\CfgLoadouts_Bravo.hpp"
- #include "Loadouts\CfgLoadouts_BravoClass.hpp"
-
#include "Loadouts\CfgLoadouts_Charlie.hpp"
- #include "Loadouts\CfgLoadouts_CharlieClass.hpp"
- #include "Loadouts\CfgLoadouts_Medical.hpp"
- #include "Loadouts\CfgLoadouts_MedicalClass.hpp"
+ #include "Loadouts\CfgLoadouts_Ranger.hpp" // Not compleeted
- #include "Loadouts\CfgLoadouts_Ranger.hpp"
- #include "Loadouts\CfgLoadouts_RangerClass.hpp"
-
- #include "Loadouts\CfgLoadouts_Training.hpp"
- #include "Loadouts\CfgLoadouts_TrainingClass.hpp"
+ #include "Loadouts\CfgLoadouts_Training.hpp" // Not compleeted
#include "Loadouts\CfgLoadouts_S3.hpp"
#include "Loadouts\CfgLoadouts_S5.hpp"
+
+ #include "Loadouts\CfgLoadouts_AlphaClass.hpp"
+ #include "Loadouts\CfgLoadouts_BravoClass.hpp"
+ #include "Loadouts\CfgLoadouts_CharlieClass.hpp"
+ #include "Loadouts\CfgLoadouts_RangerClass.hpp" // Not compleeted
+ #include "Loadouts\CfgLoadouts_TrainingClass.hpp" // Not compleeted
+
#include "Loadouts\CfgLoadouts_UserCustom.hpp"
};
diff --git a/cScripts/Loadouts/CfgLoadouts_Alpha.hpp b/cScripts/Loadouts/CfgLoadouts_Alpha.hpp
index 9d31bfd2a..7625c5104 100644
--- a/cScripts/Loadouts/CfgLoadouts_Alpha.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_Alpha.hpp
@@ -1,14 +1,19 @@
-/* Gear Date 180930 */
-// P E G A S U S A N D H E L I C O P T E R C R E W
+// A L P H A C O M P A N Y
-class CAV_Alpha_Helo_PILOT : CAV_Alpha_Base { // Use for Helo pilots and Pegasus
+class Cav_B_A_AirController_F : Cav_B_Alpha_base_F {
backpack[] = {"B_Kitbag_mcamo"};
nvgs[] = {"rhsusf_ANPVS_15"};
gps[] = {"ItemcTab"};
};
-class CAV_Alpha_Helo_COPILOT : CAV_Alpha_Base { // Use for CoPilots
+
+class Cav_B_A_Helicopter_Tra_Pilot_F : Cav_B_Alpha_base_F {
+ backpack[] = {"B_Kitbag_mcamo"};
+ nvgs[] = {"rhsusf_ANPVS_15"};
+ gps[] = {"ItemcTab"};
+};
+class Cav_B_A_Helicopter_Tra_coPilot_F : Cav_B_Alpha_base_F {
backpack[] = {"B_Kitbag_mcamo"};
magazines[] = {
@@ -64,8 +69,7 @@ class CAV_Alpha_Helo_COPILOT : CAV_Alpha_Base { // Use for CoPilots
nvgs[] = {"rhsusf_ANPVS_15"};
gps[] = {"ItemAndroid"};
};
-
-class CAV_Alpha_Helo_CHIEF : CAV_Alpha_Base { // Crew Chief
+class Cav_B_A_Helicopter_Tra_CrewChief_F : Cav_B_Alpha_base_F {
headgear[] = {"rhsusf_hgu56p_visor_mask_black"};
backpack[] = {"B_Carryall_cbr"};
vest[] = {"rhsusf_mbav_mg"};
@@ -121,8 +125,7 @@ class CAV_Alpha_Helo_CHIEF : CAV_Alpha_Base { // Crew Chief
preLoadout = "[(_this select 0), 'alpha', 0, 1] call cScripts_fnc_setPreInitPlayerSettings;";
};
-
-class CAV_Alpha_Helo_GNR : CAV_Alpha_Base { // Door Gunner
+class Cav_B_A_Helicopter_Tra_DoorGunner_F : Cav_B_Alpha_base_F {
headgear[] = {"rhsusf_hgu56p_visor_mask_black"};
backpack[] = {"B_Kitbag_mcamo"};
@@ -161,14 +164,14 @@ class CAV_Alpha_Helo_GNR : CAV_Alpha_Base { // Door Gunner
gps[] = {"ItemAndroid"};
};
-class CAV_Alpha_Helo_PILOT_ATT : CAV_Alpha_Base { // Use for Attack Rotary
+
+class Cav_B_A_Helicopter_Att_Pilot_F : Cav_B_Alpha_base_F {
headgear[] = {"rhsusf_ihadss"};
backpack[] = {"B_Kitbag_mcamo"};
gps[] = {"ItemAndroid"};
};
-
-class CAV_Alpha_Helo_COPILOT_ATT : CAV_Alpha_Base { // Use for Attack Rotary
+class Cav_B_A_Helicopter_Att_coPilot_F : Cav_B_Alpha_base_F {
headgear[] = {"rhsusf_ihadss"};
backpack[] = {"B_Kitbag_mcamo"};
@@ -227,12 +230,10 @@ class CAV_Alpha_Helo_COPILOT_ATT : CAV_Alpha_Base { // Use for Attack Rotary
};
-// F I X E D W I N G
-
-class CAV_Alpha_Fixed_PILOT : CAV_Alpha_Base {
+class Cav_B_A_Plane_Fighter_Pilot_F : Cav_B_Alpha_base_F {
nvgs[] = {""};
backpack[] = {"B_AssaultPack_mcamo"};
- headgear[] = {"H_PilotHelmetFighter_B"}; // This has been tested by CPT.Blackburn.J
+ headgear[] = {"H_PilotHelmetFighter_B"};
uniform[] = {"U_B_PilotCoveralls"};
vest[] = {""};
@@ -279,3 +280,15 @@ class CAV_Alpha_Fixed_PILOT : CAV_Alpha_Base {
preLoadout = "[(_this select 0), 'alpha', 0, 1] call cScripts_fnc_setPreInitPlayerSettings;";
};
+
+
+class Cav_B_A_Plane_Transport_Pilot_F : Cav_B_Alpha_base_F {
+ backpack[] = {"B_Kitbag_mcamo"};
+ nvgs[] = {"rhsusf_ANPVS_15"};
+ gps[] = {"ItemcTab"};
+};
+class Cav_B_A_Plane_Transport_coPilot_F : Cav_B_Alpha_base_F {
+ backpack[] = {"B_Kitbag_mcamo"};
+ nvgs[] = {"rhsusf_ANPVS_15"};
+ gps[] = {"ItemcTab"};
+};
\ No newline at end of file
diff --git a/cScripts/Loadouts/CfgLoadouts_AlphaClass.hpp b/cScripts/Loadouts/CfgLoadouts_AlphaClass.hpp
index 1c04ead56..a287df4b0 100644
--- a/cScripts/Loadouts/CfgLoadouts_AlphaClass.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_AlphaClass.hpp
@@ -1,15 +1,59 @@
+
// A L P H A C O M P A N Y
-// Helo Crew
+class Cav_B_A_AirController_Pegasus_1_F : Cav_B_A_AirController_F {};
+class Cav_B_A_AirController_Pegasus_2_F : Cav_B_A_AirController_F {};
+
+class Cav_B_A_Helicopter_Tra_Pilot_B1_F : Cav_B_A_Helicopter_Tra_Pilot_F {};
+class Cav_B_A_Helicopter_Tra_Pilot_B2_F : Cav_B_A_Helicopter_Tra_Pilot_F {};
+class Cav_B_A_Helicopter_Tra_Pilot_B3_F : Cav_B_A_Helicopter_Tra_Pilot_F {};
+class Cav_B_A_Helicopter_Tra_Pilot_B4_F : Cav_B_A_Helicopter_Tra_Pilot_F {};
+class Cav_B_A_Helicopter_Tra_Pilot_B5_F : Cav_B_A_Helicopter_Tra_Pilot_F {};
+class Cav_B_A_Helicopter_Tra_Pilot_B6_F : Cav_B_A_Helicopter_Tra_Pilot_F {};
+
+class Cav_B_A_Helicopter_Att_Pilot_Raider_1_F : Cav_B_A_Helicopter_Att_Pilot_F {};
+class Cav_B_A_Helicopter_Att_Pilot_Raider_2_F : Cav_B_A_Helicopter_Att_Pilot_F {};
+class Cav_B_A_Helicopter_Att_Pilot_Raider_3_F : Cav_B_A_Helicopter_Att_Pilot_F {};
+class Cav_B_A_Helicopter_Att_Pilot_Raider_4_F : Cav_B_A_Helicopter_Att_Pilot_F {};
+class Cav_B_A_Helicopter_Att_Pilot_Raven_1_F : Cav_B_A_Helicopter_Att_Pilot_F {};
+class Cav_B_A_Helicopter_Att_Pilot_Raven_2_F : Cav_B_A_Helicopter_Att_Pilot_F {};
+class Cav_B_A_Helicopter_Att_Pilot_Raven_3_F : Cav_B_A_Helicopter_Att_Pilot_F {};
+class Cav_B_A_Helicopter_Att_Pilot_Raven_4_F : Cav_B_A_Helicopter_Att_Pilot_F {};
+
+class Cav_B_A_Plane_Fighter_Pilot_Hog_1_F : Cav_B_A_Plane_Transport_Pilot_F {};
+class Cav_B_A_Plane_Fighter_Pilot_Hog_2_F : Cav_B_A_Plane_Transport_Pilot_F {};
+class Cav_B_A_Plane_Fighter_Pilot_Hog_3_F : Cav_B_A_Plane_Transport_Pilot_F {};
+class Cav_B_A_Plane_Fighter_Pilot_Hog_4_F : Cav_B_A_Plane_Transport_Pilot_F {};
+class Cav_B_A_Plane_Fighter_Pilot_Hog_5_F : Cav_B_A_Plane_Transport_Pilot_F {};
+class Cav_B_A_Plane_Fighter_Pilot_Hog_6_F : Cav_B_A_Plane_Transport_Pilot_F {};
+class Cav_B_A_Plane_Fighter_Pilot_Hog_7_F : Cav_B_A_Plane_Transport_Pilot_F {};
+class Cav_B_A_Plane_Fighter_Pilot_Hog_8_F : Cav_B_A_Plane_Transport_Pilot_F {};
+class Cav_B_A_Plane_Fighter_Pilot_Hog_9_F : Cav_B_A_Plane_Transport_Pilot_F {};
+
+class Cav_B_A_Plane_Transport_Pilot_Titan_1_F : Cav_B_A_Plane_Transport_Pilot_F {};
+class Cav_B_A_Plane_Transport_Pilot_Titan_2_F : Cav_B_A_Plane_Transport_Pilot_F {};
+class Cav_B_A_Plane_Transport_Pilot_Titan_3_F : Cav_B_A_Plane_Transport_Pilot_F {};
+class Cav_B_A_Plane_Transport_Pilot_Titan_4_F : Cav_B_A_Plane_Transport_Pilot_F {};
+
+// L E G A C Y
+// Saved for backwards compability
+
+// Old class definitions to New class definition
+class CAV_Alpha_Helo_PILOT : Cav_B_A_Helicopter_Tra_Pilot_F {};
+class CAV_Alpha_Helo_COPILOT : Cav_B_A_Helicopter_Tra_coPilot_F {};
+class CAV_Alpha_Helo_CHIEF : Cav_B_A_Helicopter_Tra_CrewChief_F {};
+class CAV_Alpha_Helo_GNR : Cav_B_A_Helicopter_Tra_DoorGunner_F {};
+class CAV_Alpha_Helo_PILOT_ATT : Cav_B_A_Helicopter_Att_Pilot_F {};
+class CAV_Alpha_Fixed_PILOT : Cav_B_A_Plane_Fighter_Pilot_F {};
+
+
+// Older class structure
class B_Helipilot_F : CAV_Alpha_Helo_PILOT {};
class rhsusf_army_ocp_helipilot : CAV_Alpha_Helo_COPILOT {};
class B_T_Helicrew_F : CAV_Alpha_Helo_CHIEF {};
class B_Helicrew_F : CAV_Alpha_Helo_GNR {};
class B_T_Helipilot_F : CAV_Alpha_Helo_PILOT_ATT {};
-//class undefinedClass : CAV_Alpha_Helo_COPILOT_ATT {};
-
-// Fixed-Wing
class B_Fighter_Pilot_F : CAV_Alpha_Fixed_PILOT {};
diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo.hpp
index 00077f4e3..bb25be818 100644
--- a/cScripts/Loadouts/CfgLoadouts_Bravo.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_Bravo.hpp
@@ -1,8 +1,7 @@
-/* Gear Date 07 FEB 18 */
-// O F F I C E R A N D C R E W
+// B R A V O C O M P A N Y
-class CAV_Bravo_OFFCR : CAV_Bravo_Base { // Leadership positions PSG and up
+class Cav_B_B_PlatoonSergeant_F : Cav_B_Bravo_base_F {
//goggles[] = {"rhsusf_shemagh_gogg_tan"};
vest[] = {"rhsusf_iotv_ocp_Teamleader"};
@@ -53,8 +52,123 @@ class CAV_Bravo_OFFCR : CAV_Bravo_Base { // Leadership positions PSG and up
gps[] = {"ItemcTab"};
preLoadout = "[(_this select 0), 'bravo', 0, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
};
+class Cav_B_B_PlatoonLeader_F : Cav_B_Bravo_base_F {
-class CAV_Bravo_Crew_CDR : CAV_Bravo_Base { // Crew Commander
+ //goggles[] = {"rhsusf_shemagh_gogg_tan"};
+ vest[] = {"rhsusf_iotv_ocp_Teamleader"};
+ backpack[] = {"B_Carryall_mcamo"};
+ binoculars[] = {"ACE_Vector"};
+
+ magazines[] = {
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag",8,
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag_Tracer_Red",2,
+
+ "rhs_mag_m67",2,
+
+ "SmokeShell",6,
+ "SmokeShellBlue",1,
+ "SmokeShellGreen",1,
+ "SmokeShellRed",1,
+ "SmokeShellYellow",1
+ };
+
+ items[] = {
+ // Radios
+ "ACRE_PRC152",
+ "ACRE_PRC152",
+
+ // Personal Medical Equipment
+ "ACE_quikclot",10,
+ "ACE_tourniquet",2,
+ "ACE_personalAidKit",
+
+ // Standard
+ "ACE_Canteen",
+ "ACE_EarPlugs",
+ "ACE_MapTools",
+ "ACE_CableTie",
+
+ // Electronics
+ "ACE_microDAGR",
+ "ACE_HuntIR_monitor",
+
+ // Clothing
+ "rhsusf_shemagh_gogg_tan",
+
+ // Tools
+ "ACE_SpraypaintRed",
+ "ACE_EntrenchingTool"
+ };
+
+ gps[] = {"ItemcTab"};
+ preLoadout = "[(_this select 0), 'bravo', 0, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
+};
+class Cav_B_B_PlatoonMedic_F : Cav_B_Bravo_base_F {
+ backpack[] = {"B_Carryall_mcamo"};
+ //goggles[] = {"rhs_googles_clear"};
+ headgear[] = {"rhsusf_ach_helmet_headset_ocp"};
+ uniform[] = {"LOP_U_ISTS_Fatigue_19"};
+ vest[] = {"rhsusf_mbav_medic"};
+ binoculars[] = {"ACE_Vector"};
+
+ primary[] = {"rhs_weap_m4a1_grip","rhsusf_acc_anpeq15side","rhsusf_acc_compm4","rhsusf_acc_grip3"};
+ secondary[] = {"rhsusf_weap_m9"};
+ launcher[] = {""};
+
+ magazines[] = {
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag",5,
+ "rhsusf_mag_15Rnd_9x19_JHP",2,
+
+ "rhs_mag_m67",2,
+
+ "SmokeShell",4,
+ "SmokeShellGreen",
+ "SmokeShellRed",
+ "SmokeShellYellow"
+ };
+ items[] = {
+ // Radios
+ "ACRE_PRC152",
+
+ // Medical Equipment
+ "ACE_personalAidKit",2,
+ "ACE_surgicalKit",
+ "ACE_quikclot",35,
+ "ACE_tourniquet",2,
+ "ACE_salineIV",8,
+ "ACE_morphine",20 ,
+ "ACE_epinephrine",20,
+
+ // Personal Medical Equipment
+ "ACE_quikclot",10,
+ "ACE_tourniquet",2,
+
+ // Standard
+ "ACE_Canteen",
+ "ACE_EarPlugs",
+ "ACE_MapTools",
+ "ACE_CableTie",
+
+ // Electronics
+ "ACE_MicroDAGR",
+
+ // Tools
+ "ACE_EntrenchingTool"
+ };
+
+ compass[] = {"ItemCompass"};
+ gps[] = {"ItemAndroid"};
+ map[] = {"ItemMap"};
+ nvgs[] = {""};
+ watch[] = {"ItemWatch"};
+
+ insignia[] = {"Cav_Insignia_Specialized_CLS"};
+ preLoadout = "[(_this select 0), 'bravo', 1, 0] call cScripts_fnc_setPreInitPlayerSettings;";
+ postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
+};
+
+// C R E W
+class Cav_B_B_Tank_Commander_F : Cav_B_Bravo_Crew_base_F {
headgear[] = {"rhsusf_cvc_green_helmet"};
//goggles[] = {"rhsusf_shemagh_gogg_tan"};
@@ -110,8 +224,156 @@ class CAV_Bravo_Crew_CDR : CAV_Bravo_Base { // Crew Commander
gps[] = {"ItemAndroid"};
preLoadout = "[(_this select 0), 'bravo', 0, 1] call cScripts_fnc_setPreInitPlayerSettings;";
};
+class Cav_B_B_Tank_Gunner_F : Cav_B_Bravo_Crew_base_F {
+
+ headgear[] = {"rhsusf_cvc_green_helmet"};
+ //goggles[] = {"rhsusf_shemagh_gogg_tan"};
+ vest[] = {"rhsusf_iotv_ocp_Repair"};
+ backpack[] = {"B_AssaultPack_mcamo"};
+
+ primary[] = {"rhs_weap_m4a1_carryhandle","rhsusf_acc_anpeq15side","rhsusf_acc_compm4"};
+
+ magazines[] = {
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag",6,
+
+ "rhs_mag_m67",2,
+
+ "SmokeShell",2,
+ "SmokeShellBlue",1,
+ "SmokeShellYellow",1
+ };
+
+ items[] = {
+ // Radios
+ "ACRE_PRC152",
+
+ // Medical Equipment
+ "ACE_personalAidKit",
+ "ACE_quikclot",20,
+ "ACE_tourniquet",6,
+ "ACE_morphine",6,
+
+ // Personal Medical Equipment
+ "ACE_quikclot",10,
+ "ACE_tourniquet",2,
+
+ // Standard
+ "ACE_Canteen",
+ "ACE_MapTools",
+ "ACE_CableTie",
+
+ // Clothing
+ "rhsusf_shemagh_gogg_tan",
+
+ // Electronics
+ "ACE_microDAGR"
+ };
+
+ gps[] = {"ItemAndroid"};
+};
+class Cav_B_B_Tank_Driver_F : Cav_B_Bravo_Crew_base_F {
+
+ headgear[] = {"rhsusf_cvc_green_helmet"};
+ //goggles[] = {"rhsusf_shemagh_gogg_tan"};
+ vest[] = {"rhsusf_iotv_ocp_Repair"};
+ backpack[] = {"B_AssaultPack_mcamo"};
+
+ primary[] = {"rhs_weap_m4a1_carryhandle","rhsusf_acc_anpeq15side","rhsusf_acc_compm4"};
+
+ magazines[] = {
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag",6,
+
+ "rhs_mag_m67",2,
+
+ "SmokeShell",2,
+ "SmokeShellBlue",1,
+ "SmokeShellYellow",1
+ };
+
+ items[] = {
+ // Radios
+ "ACRE_PRC152",
+
+ // Personal Medical Equipment
+ "ACE_quikclot",10,
+ "ACE_tourniquet",2,
+
+ // Standard
+ "ACE_Canteen",
+ "ACE_MapTools",
+ "ACE_CableTie",
+ "ToolKit",
+
+ // Clothing
+ "rhsusf_shemagh_gogg_tan",
+
+ // Electronics
+ "ACE_microDAGR"
+ };
+
+ gps[] = {"ItemAndroid"};
+};
+class Cav_B_B_Tank_Loader_F : Cav_B_B_Tank_Driver_F {
+};
-class CAV_Bravo_Crew_GNR : CAV_Bravo_Base { // Crew Gunner (acts as CLS also)
+
+class Cav_B_B_Ifv_Commander_F : Cav_B_Bravo_Crew_base_F {
+
+ headgear[] = {"rhsusf_cvc_green_helmet"};
+ //goggles[] = {"rhsusf_shemagh_gogg_tan"};
+ vest[] = {"rhsusf_iotv_ocp_Repair"};
+ backpack[] = {"B_Carryall_mcamo"};
+ binoculars[] = {"ACE_Vector"};
+
+ primary[] = {"rhs_weap_m4a1_m320","rhsusf_acc_anpeq15side","rhsusf_acc_compm4"};
+
+ secondary[] = {"rhsusf_weap_m9"};
+
+ magazines[] = {
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag",4,
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag_Tracer_Red",2,
+ "rhsusf_mag_15Rnd_9x19_JHP",4,
+
+ "rhs_mag_m714_White",
+ "rhs_mag_m713_Red",
+ "rhs_mag_m715_Green",
+ "rhs_mag_m662_red",
+ "rhs_mag_m661_green",
+
+ "rhs_mag_m67",2,
+
+ "SmokeShell",2,
+ "SmokeShellBlue",1,
+ "SmokeShellYellow",1
+ };
+
+ items[] = {
+ // Radios
+ "ACRE_PRC152",
+ "ACRE_PRC152",
+
+ // Personal Medical Equipment
+ "ACE_quikclot",6,
+ "ACE_tourniquet",2,
+
+
+ // Standard
+ "ACE_Canteen",
+ "ACE_MapTools",
+ "ACE_CableTie",
+ "ToolKit",
+
+ // Clothing
+ "rhsusf_shemagh_gogg_tan",
+
+ // Electronics
+ "ACE_microDAGR"
+ };
+
+ gps[] = {"ItemAndroid"};
+ preLoadout = "[(_this select 0), 'bravo', 0, 1] call cScripts_fnc_setPreInitPlayerSettings;";
+};
+class Cav_B_B_Ifv_Driver_F : Cav_B_Bravo_Crew_base_F {
headgear[] = {"rhsusf_cvc_green_helmet"};
//goggles[] = {"rhsusf_shemagh_gogg_tan"};
@@ -160,8 +422,7 @@ class CAV_Bravo_Crew_GNR : CAV_Bravo_Base { // Crew Gunner (acts as CLS also)
gps[] = {"ItemAndroid"};
};
-
-class CAV_Bravo_Crew_CREW : CAV_Bravo_Base { // Driver-Loader (acts as Engineer also)
+class Cav_B_B_Ifv_Gunner_F : Cav_B_Bravo_Crew_base_F {
headgear[] = {"rhsusf_cvc_green_helmet"};
//goggles[] = {"rhsusf_shemagh_gogg_tan"};
@@ -201,14 +462,13 @@ class CAV_Bravo_Crew_CREW : CAV_Bravo_Base { // Driver-Loader (acts as Engineer
"ACE_microDAGR"
};
- insignia[] = {"CLS_Insignia"};
gps[] = {"ItemAndroid"};
- preLoadout = "[(_this select 0), 'bravo', 0, 1] call cScripts_fnc_setPreInitPlayerSettings;";
+ preLoadout = "[(_this select 0), 'bravo', 0, 0] call cScripts_fnc_setPreInitPlayerSettings;";
};
-// I N F A N T R Y S Q U A D
-class CAV_Bravo_SL : CAV_Bravo_Base { // Squad Leader
+// S Q U A D
+class Cav_B_B_SquadLeader_F : Cav_B_Bravo_base_F {
backpack[] = {"B_Carryall_mcamo"};
binoculars[] = {"ACE_Vector"};
@@ -254,7 +514,7 @@ class CAV_Bravo_SL : CAV_Bravo_Base { // Squad Leader
gps[] = {"ItemAndroid"};
};
-class CAV_Bravo_TL : CAV_Bravo_Base { // Fire Team Leader
+class Cav_B_B_Alpha_FireTeamLeader_F : Cav_B_Bravo_base_F {
backpack[] = {"B_Carryall_mcamo"};
binoculars[] = {"ACE_Vector"};
@@ -304,8 +564,7 @@ class CAV_Bravo_TL : CAV_Bravo_Base { // Fire Team Leader
};
gps[] = {"ItemAndroid"};
};
-
-class CAV_Bravo_AR : CAV_Bravo_Base { // Automatic Rifleman
+class Cav_B_B_Alpha_AutomaticRifleman_F : Cav_B_Bravo_base_F {
vest[] = {"rhsusf_iotv_ocp_SAW"};
primary[] = {"rhs_weap_m249_pip_S","rhsusf_acc_anpeq15side","rhsusf_acc_ACOG_RMR"};
@@ -318,8 +577,7 @@ class CAV_Bravo_AR : CAV_Bravo_Base { // Automatic Rifleman
"SmokeShell",4
};
};
-
-class CAV_Bravo_GR : CAV_Bravo_Base { // Grenadier
+class Cav_B_B_Alpha_Grenadier_F : Cav_B_Bravo_base_F {
primary[] = {"rhs_weap_m4a1_m320","rhsusf_acc_anpeq15side","rhsusf_acc_ACOG_RMR"};
@@ -358,8 +616,22 @@ class CAV_Bravo_GR : CAV_Bravo_Base { // Grenadier
};
};
+class Cav_B_B_Alpha_Rifleman_F : Cav_B_Bravo_base_F {
-class CAV_Bravo_RM : CAV_Bravo_Base { // Rifleman
+ backpack[] = {"B_Carryall_mcamo"};
+ vest[] = {"rhsusf_iotv_ocp_Rifleman"};
+
+ magazines[] = {
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag",10,
+
+ "rhs_mag_m67",6,
+
+ "SmokeShell",6,
+
+ "rhs_200rnd_556x45_M_SAW",2
+ };
+};
+class Cav_B_B_Alpha_RiflemanAT_F : Cav_B_Bravo_base_F {
backpack[] = {"B_Carryall_mcamo"};
vest[] = {"rhsusf_iotv_ocp_Rifleman"};
@@ -374,8 +646,22 @@ class CAV_Bravo_RM : CAV_Bravo_Base { // Rifleman
"rhs_200rnd_556x45_M_SAW",2
};
};
+class Cav_B_B_Alpha_RiflemanLAT_F : Cav_B_Bravo_base_F {
+
+ backpack[] = {"B_Carryall_mcamo"};
+ vest[] = {"rhsusf_iotv_ocp_Rifleman"};
+
+ magazines[] = {
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag",10,
+
+ "rhs_mag_m67",6,
-class CAV_Bravo_CLS : CAV_Bravo_Base { // Combat Life Saver 24.3kg
+ "SmokeShell",6,
+
+ "rhs_200rnd_556x45_M_SAW",2
+ };
+};
+class Cav_B_B_Alpha_CombatLifeSaver_F : Cav_B_Bravo_base_F {
backpack[] = {"B_Carryall_mcamo"};
vest[] = {"rhsusf_iotv_ocp_Rifleman"};
@@ -419,21 +705,44 @@ class CAV_Bravo_CLS : CAV_Bravo_Base { // Combat Life Saver 24.3kg
insignia[] = {"Cav_Insignia_Specialized_CLS"};
};
-// W E A P O N S T E A M
+class Cav_B_B_Bravo_FireTeamLeader_F : Cav_B_B_Alpha_FireTeamLeader_F {
+};
+class Cav_B_B_Bravo_AutomaticRifleman_F : Cav_B_B_Alpha_AutomaticRifleman_F {
+};
+class Cav_B_B_Bravo_Grenadier_F : Cav_B_B_Alpha_Grenadier_F {
+};
+class Cav_B_B_Bravo_Rifleman_F : Cav_B_B_Alpha_Rifleman_F {
+};
+class Cav_B_B_Bravo_RiflemanAT_F : Cav_B_B_Alpha_RiflemanAT_F {
+};
+class Cav_B_B_Bravo_RiflemanLAT_F : Cav_B_B_Alpha_RiflemanLAT_F {
+};
+class Cav_B_B_Bravo_CombatLifeSaver_F : Cav_B_B_Alpha_CombatLifeSaver_F {
+};
+
-class CAV_Bravo_Weapons_TL : CAV_Bravo_Base { // Team Leader
+class Cav_B_B_TeamLeader_Mustang_F : Cav_B_Bravo_Logi_base_F {
+ backpack[] = {"B_Carryall_mcamo"};
- vest[] = {"rhsusf_iotv_ocp_SAW"};
+ headgear[] = {"rhsusf_ach_bare_tan_headset"};
+ uniform[] = {"LOP_U_ISTS_Fatigue_19"};
+ vest[] = {"rhsusf_mbav_medic"};
binoculars[] = {"ACE_Vector"};
+ primary[] = {"rhs_weap_m4a1_grip","rhsusf_acc_anpeq15side","rhsusf_acc_compm4","rhsusf_acc_grip3"};
+ secondary[] = {"rhsusf_weap_m9"};
+ launcher[] = {""};
+
magazines[] = {
"rhs_mag_30Rnd_556x45_M855A1_Stanag",8,
+ "rhsusf_mag_15Rnd_9x19_JHP",2,
- "rhs_mag_m67",5,
+ "rhs_mag_m67",
- "SmokeShell",5,
-
- "rhsusf_100Rnd_762x51_m80a1epr",4
+ "ACE_Chemlight_HiOrange",2,
+ "SmokeShell",2,
+ "SmokeShellBlue",2,
+ "SmokeShellOrange",2
};
items[] = {
@@ -441,10 +750,19 @@ class CAV_Bravo_Weapons_TL : CAV_Bravo_Base { // Team Leader
"ACRE_PRC152",
"ACRE_PRC152",
- // Personal Medical Equipment
- "ACE_quikclot",10,
- "ACE_tourniquet",2,
- "ACE_personalAidKit",
+ // Medical Equipment
+ "ACE_personalAidKit",6,
+ "ACE_surgicalKit",
+ "ACE_tourniquet",10,
+
+ "ACE_quikclot",25,
+ "ACE_elasticBandage",20,
+
+ "ACE_adenosine",5,
+ "ACE_epinephrine",20,
+ "ACE_morphine",20,
+
+ "ACE_salineIV",6,
// Standard
"ACE_Canteen",
@@ -456,41 +774,88 @@ class CAV_Bravo_Weapons_TL : CAV_Bravo_Base { // Team Leader
"ACE_microDAGR",
// Tools
- "ACE_SpraypaintRed",
"ACE_EntrenchingTool"
};
+ compass[] = {"ItemCompass"};
gps[] = {"ItemAndroid"};
+ map[] = {"ItemMap"};
+ nvgs[] = {""};
+ watch[] = {"ItemWatch"};
+
+ insignia[] = {"Cav_Insignia_Specialized_CLS"};
+ preLoadout = "[(_this select 0), 'medical', 2, 0] call cScripts_fnc_setPreInitPlayerSettings;";
+ postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
};
-class CAV_Bravo_Weapons_MG : CAV_Bravo_Base { // HW Machine Gunner
- vest[] = {"rhsusf_iotv_ocp_SAW"};
+class Cav_B_B_Mustang_CombatMedic_F : Cav_B_Bravo_Logi_base_F {
+ backpack[] = {"B_Carryall_mcamo"};
+
+ headgear[] = {"rhsusf_ach_bare_tan_headset"};
+ uniform[] = {"LOP_U_ISTS_Fatigue_19"};
+ vest[] = {"rhsusf_mbav_medic"};
+ binoculars[] = {"ACE_Vector"};
- primary[] = {"rhs_weap_m240B","rhsusf_acc_anpeq15side","rhsusf_acc_ACOG_MDO"};
+ primary[] = {"rhs_weap_m4a1_grip","rhsusf_acc_anpeq15side","rhsusf_acc_compm4","rhsusf_acc_grip3"};
+ secondary[] = {"rhsusf_weap_m9"};
+ launcher[] = {""};
magazines[] = {
- "rhsusf_100Rnd_762x51_m62_tracer",3,
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag",8,
+ "rhsusf_mag_15Rnd_9x19_JHP",2,
- "rhs_mag_m67",2,
- "SmokeShell",4
+ "rhs_mag_m67",
+
+ "ACE_Chemlight_HiOrange",2,
+ "SmokeShell",2,
+ "SmokeShellBlue",2,
+ "SmokeShellOrange",2
};
-};
-class CAV_Bravo_Weapons_GNR : CAV_Bravo_Base { // Gunner AND Assistant Gunner
- backpack[] = {"B_Carryall_mcamo"};
- binoculars[] = {"ACE_Vector"};
- vest[] = {"rhsusf_iotv_ocp_SAW"};
+ items[] = {
+ // Radios
+ "ACRE_PRC152",
+ "ACRE_PRC152",
- magazines[] = {
- "rhs_mag_30Rnd_556x45_M855A1_Stanag",8,
+ // Medical Equipment
+ "ACE_personalAidKit",6,
+ "ACE_surgicalKit",
+ "ACE_tourniquet",10,
- "rhs_mag_m67",2,
+ "ACE_quikclot",25,
+ "ACE_elasticBandage",20,
+
+ "ACE_adenosine",5,
+ "ACE_epinephrine",20,
+ "ACE_morphine",20,
+
+ "ACE_salineIV",6,
+
+ // Standard
+ "ACE_Canteen",
+ "ACE_EarPlugs",
+ "ACE_MapTools",
+ "ACE_CableTie",
- "SmokeShell",3
+ // Electronics
+ "ACE_microDAGR",
+
+ // Tools
+ "ACE_EntrenchingTool"
};
+
+ compass[] = {"ItemCompass"};
+ gps[] = {"ItemAndroid"};
+ map[] = {"ItemMap"};
+ nvgs[] = {""};
+ watch[] = {"ItemWatch"};
+
+ insignia[] = {"Cav_Insignia_Specialized_CLS"};
+ preLoadout = "[(_this select 0), 'medical', 2, 0] call cScripts_fnc_setPreInitPlayerSettings;";
+ postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
};
-// Logistics Team
-class CAV_LOGI_OFFCR : CAV_Logistics_Base { // Leadership positions PSG and up
+
+class Cav_B_B_LogisticsOpsOfficer_F : Cav_B_Bravo_Logi_base_F {
//goggles[] = {"rhsusf_shemagh_gogg_tan"};
backpack[] = {"B_Carryall_mcamo"};
@@ -546,8 +911,7 @@ class CAV_LOGI_OFFCR : CAV_Logistics_Base { // Leadership positions PSG and up
gps[] = {"ItemcTab"};
};
-
-class CAV_LOGI_TL : CAV_Logistics_Base { // Logistics Team Leaders
+class Cav_B_B_LogisticsOpsNCO_F : Cav_B_Bravo_Logi_base_F {
//goggles[] = {"rhsusf_shemagh_gogg_tan"};
backpack[] = {"B_Carryall_mcamo"};
@@ -600,25 +964,23 @@ class CAV_LOGI_TL : CAV_Logistics_Base { // Logistics Team Leaders
"ACE_Fortify",
"ACE_EntrenchingTool"
};
+
+ gps[] = {"ItemcTab"};
};
-class CAV_LOGI_GR : CAV_Logistics_Base { // Logistics Team Leaders
+class Cav_B_B_LogisticTeamLeader_F : Cav_B_Bravo_Logi_base_F {
//goggles[] = {"rhsusf_shemagh_gogg_tan"};
backpack[] = {"B_Carryall_mcamo"};
binoculars[] = {"ACE_Vector"};
- primary[] = {"rhs_weap_m4a1_m320","rhsusf_acc_anpeq15side","rhsusf_acc_acog3"};
-
magazines[] = {
"rhs_mag_30Rnd_556x45_M855A1_Stanag",5,
- "rhs_mag_M441_HE",6,
- "rhs_mag_M716_yellow",4,
- "rhs_mag_M662_red",4,
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag_Tracer_Red",2,
"rhs_mag_m67",2,
- "SmokeShell",4,
+ "SmokeShell",8,
"SmokeShellBlue",4,
"SmokeShellGreen",4,
"SmokeShellRed",2,
@@ -660,18 +1022,19 @@ class CAV_LOGI_GR : CAV_Logistics_Base { // Logistics Team Leaders
"ACE_EntrenchingTool"
};
};
-
-class CAV_LOGI_MG : CAV_Logistics_Base { // Logistics Team Leaders
+class Cav_B_B_LogisticsTeamMember_F : Cav_B_Bravo_Logi_base_F {
//goggles[] = {"rhsusf_shemagh_gogg_tan"};
backpack[] = {"B_Carryall_mcamo"};
binoculars[] = {"ACE_Vector"};
- primary[] = {"rhs_weap_m249_pip_S","rhsusf_acc_anpeq15side","rhsusf_acc_ELCAN_ARD"};
+ primary[] = {"rhs_weap_m4a1_m320","rhsusf_acc_anpeq15side","rhsusf_acc_acog3"};
magazines[] = {
- "rhsusf_200rnd_556x45_mixed_box",3,
- "rhsusf_200rnd_556x45_box",2,
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag",5,
+ "rhs_mag_M441_HE",6,
+ "rhs_mag_M716_yellow",4,
+ "rhs_mag_M662_red",4,
"rhs_mag_m67",2,
diff --git a/cScripts/Loadouts/CfgLoadouts_BravoClass.hpp b/cScripts/Loadouts/CfgLoadouts_BravoClass.hpp
index 47ba4b8c6..76f4e0da7 100644
--- a/cScripts/Loadouts/CfgLoadouts_BravoClass.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_BravoClass.hpp
@@ -1,14 +1,74 @@
+
// B R A V O C O M P A N Y
-// Officers and Crew
+class Cav_B_B_PlatoonSergeant_2_5_F : Cav_B_B_PlatoonSergeant_F {};
+class Cav_B_B_PlatoonLeader_2_6_F : Cav_B_B_PlatoonLeader_F {};
+class Cav_B_B_PlatoonMedic_2_7_F : Cav_B_B_PlatoonMedic_F {};
+
+class Cav_B_B_SquadLeader_1_1_F : Cav_B_B_SquadLeader_F {};
+class Cav_B_B_SquadLeader_1_2_F : Cav_B_B_SquadLeader_F {};
+class Cav_B_B_SquadLeader_1_3_F : Cav_B_B_SquadLeader_F {};
+class Cav_B_B_SquadLeader_1_4_F : Cav_B_B_SquadLeader_F {};
+
+class Cav_B_B_SquadLeader_2_1_F : Cav_B_B_SquadLeader_F {};
+class Cav_B_B_SquadLeader_2_2_F : Cav_B_B_SquadLeader_F {};
+class Cav_B_B_SquadLeader_2_3_F : Cav_B_B_SquadLeader_F {};
+class Cav_B_B_SquadLeader_2_4_F : Cav_B_B_SquadLeader_F {};
+
+class Cav_B_B_Tank_Commander_Saber_1_F : Cav_B_B_Tank_Commander_F {};
+class Cav_B_B_Tank_Commander_Saber_2_F : Cav_B_B_Tank_Commander_F {};
+class Cav_B_B_Tank_Commander_Saber_3_F : Cav_B_B_Tank_Commander_F {};
+class Cav_B_B_Tank_Commander_Saber_4_F : Cav_B_B_Tank_Commander_F {};
+
+class Cav_B_B_Ifv_Commander_B_1_F : Cav_B_B_Ifv_Commander_F {};
+class Cav_B_B_Ifv_Commander_B_2_F : Cav_B_B_Ifv_Commander_F {};
+class Cav_B_B_Ifv_Commander_B_3_F : Cav_B_B_Ifv_Commander_F {};
+class Cav_B_B_Ifv_Commander_B_4_F : Cav_B_B_Ifv_Commander_F {};
+
+class Cav_B_B_TeamLeader_Mustang_1_F : Cav_B_B_TeamLeader_Mustang_F {};
+class Cav_B_B_TeamLeader_Mustang_2_F : Cav_B_B_TeamLeader_Mustang_F {};
+
+class Cav_B_B_LogisticsOpsOfficer_Apollo_6_F : Cav_B_B_LogisticsOpsOfficer_F {};
+class Cav_B_B_LogisticsOpsNCO_Apollo_5_F : Cav_B_B_LogisticsOpsNCO_F {};
+class Cav_B_B_LogisticTeamLeader_Apollo_1_F : Cav_B_B_LogisticTeamLeader_F {};
+class Cav_B_B_LogisticTeamLeader_Apollo_2_F : Cav_B_B_LogisticTeamLeader_F {};
+
+
+// L E G A C Y
+// Saved for backwards compability
+
+// Old class definitions to New class definition
+class CAV_Bravo_OFFCR : Cav_B_B_PlatoonSergeant_F {};
+class CAV_Bravo_Crew_CDR : Cav_B_B_Tank_Driver_F {};
+class CAV_Bravo_Crew_GNR : Cav_B_B_Tank_Gunner_F {};
+class CAV_Bravo_Crew_CREW : Cav_B_B_Ifv_Driver_F {};
+
+class CAV_Bravo_SL : Cav_B_B_SquadLeader_F {};
+class CAV_Bravo_TL : Cav_B_B_Alpha_FireTeamLeader_F {};
+class CAV_Bravo_AR : Cav_B_B_Alpha_AutomaticRifleman_F {};
+class CAV_Bravo_GR : Cav_B_B_Alpha_Grenadier_F {};
+class CAV_Bravo_RM : Cav_B_B_Alpha_Rifleman_F {};
+class CAV_Bravo_CLS : Cav_B_B_Alpha_CombatLifeSaver_F {};
+
+class CAV_Bravo_Weapons_TL : Cav_B_C_Weap_Alpha_FireTeamLeader_F {};
+class CAV_Bravo_Weapons_MG : Cav_B_C_Weap_Alpha_AutomaticRifleman_F {};
+class CAV_Bravo_Weapons_GNR : Cav_B_C_Weap_Alpha_Rifleman_F {};
+
+class CAV_Medical_OFFCR : Cav_B_B_TeamLeader_Mustang_F {};
+class CAV_Medical_BONESAW : Cav_B_B_Mustang_CombatMedic_F {};
+class CAV_Medical_PLMEDIC : Cav_B_B_PlatoonMedic_F {};
+
+// Older class structure
+class CAV_LOGI_OFFCR : Cav_B_B_LogisticsOpsOfficer_F {};
+class CAV_LOGI_TL : Cav_B_B_LogisticTeamLeader_F {};
+class CAV_LOGI_GR : Cav_B_B_LogisticsTeamMember_F {};
+class CAV_LOGI_MG : CAV_LOGI_GR {};
class rhsusf_army_ocp_officer : CAV_Bravo_OFFCR {};
class rhsusf_army_ocp_combatcrewman : CAV_Bravo_Crew_CDR {};
class rhsusf_army_ocp_crewman : CAV_Bravo_Crew_GNR {};
class rhsusf_army_ocp_driver : CAV_Bravo_Crew_CREW {};
-// Infantry
-
class rhsusf_army_ocp_squadleader : CAV_Bravo_SL {};
class rhsusf_army_ocp_teamleader : CAV_Bravo_TL {};
class rhsusf_army_ocp_autorifleman : CAV_Bravo_AR {};
@@ -16,15 +76,15 @@ class rhsusf_army_ocp_grenadier : CAV_Bravo_GR {};
class rhsusf_army_ocp_rifleman : CAV_Bravo_RM {};
class rhsusf_army_ocp_medic : CAV_Bravo_CLS {};
-// Heavy Weapons
-
class rhsusf_army_ocp_machinegunnera : CAV_Bravo_Weapons_TL {};
class rhsusf_army_ocp_machinegunner : CAV_Bravo_Weapons_MG {};
class rhsusf_army_ocp_javelin : CAV_Bravo_Weapons_GNR {};
-// Logistics
-
class rhsusf_usmc_marpat_wd_engineer : CAV_LOGI_OFFCR {};
class rhsusf_usmc_marpat_wd_rifleman_m590 : CAV_LOGI_TL {};
class rhsusf_usmc_marpat_wd_grenadier : CAV_LOGI_GR {};
class rhsusf_usmc_marpat_wd_machinegunner : CAV_LOGI_MG {};
+
+class B_medic_F : CAV_Medical_OFFCR {};
+class rhsusf_navy_marpat_wd_medic : CAV_Medical_BONESAW {};
+class rhsusf_navy_marpat_d_medic : CAV_Medical_PLMEDIC {};
diff --git a/cScripts/Loadouts/CfgLoadouts_Charlie.hpp b/cScripts/Loadouts/CfgLoadouts_Charlie.hpp
index 6a5759b73..6f0954fd5 100644
--- a/cScripts/Loadouts/CfgLoadouts_Charlie.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_Charlie.hpp
@@ -1,6 +1,7 @@
-/* Gear Date 07 FEB 18 */
-class CAV_Charlie_OFFCR : CAV_Charlie_Base { // Leadership positions PSG and up
+// C H A R L I E C O M P A N Y
+
+class Cav_B_C_PlatoonSergeant_F : Cav_B_Charlie_base_F {
//backpack[] = {"B_AssaultPack_mcamo"};
headgear[] = {"rhsusf_ach_helmet_headset_ocp"};
@@ -52,35 +53,26 @@ class CAV_Charlie_OFFCR : CAV_Charlie_Base { // Leadership positions PSG and up
preLoadout = "[(_this select 0), 'charlie', 0, 2, true] call cScripts_fnc_setPreInitPlayerSettings;";
};
+class Cav_B_C_PlatoonLeader_F : Cav_B_Charlie_base_F {
-class CAV_Charlie_JFO : CAV_Charlie_Base { // Joint Fires Observer 36.3kg
-
- backpack[] = {"B_Carryall_mcamo"};
+ //backpack[] = {"B_AssaultPack_mcamo"};
headgear[] = {"rhsusf_ach_helmet_headset_ocp"};
- nvgs[] = {""};
vest[] = {"rhsusf_spcs_ocp_squadleader"};
- binoculars[] = {"Laserdesignator"};
+ binoculars[] = {"ACE_Vector"};
- primary[] = {"rhs_weap_m4a1_m320","rhsusf_acc_anpeq15A","rhsusf_acc_ACOG_RMR"};
+ primary[] = {"rhs_weap_m4a1_carryhandle","rhsusf_acc_anpeq15A","rhsusf_acc_ACOG_RMR"};
magazines[] = {
- "rhs_mag_30Rnd_556x45_M855A1_Stanag",4,
- "rhs_mag_30Rnd_556x45_M855A1_Stanag_Tracer_Red",2,
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag",6,
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag_Tracer_Red",4,
- "rhs_mag_m67",2,
+ "rhs_mag_m67",4,
+ "ACE_HandFlare_Red",4,
- "B_IR_Grenade",2,
- "SmokeShell",2,
+ "SmokeShell",4,
"SmokeShellGreen",1,
- "SmokeShellOrange",1,
- "SmokeShellRed",2,
- "SmokeShellYellow",1,
-
- "rhs_mag_M441_HE",4,
- "rhs_mag_m713_Red",2,
- "UGL_FlareCIR_F",2,
- "rhs_mag_m662_red",2,
- "ACE_HuntIR_M203",4
+ "SmokeShellRed",1,
+ "SmokeShellYellow",1
};
items[] = {
@@ -91,33 +83,94 @@ class CAV_Charlie_JFO : CAV_Charlie_Base { // Joint Fires Observer 36.3kg
// Personal Medical Equipment
"ACE_quikclot",10,
"ACE_tourniquet",2,
+ "ACE_personalAidKit",
// Standard
"ACE_Canteen",
"ACE_EarPlugs",
"ACE_MapTools",
- "ACE_Flashlight_MX991",
+ "ACE_CableTie",
// Electronics
- "ACE_IR_Strobe_Item",
"ACE_microDAGR",
"ACE_HuntIR_monitor",
- "Laserbatteries",2,
- "ACE_Vector",
- "ItemcTabHCam",
- "ACE_MX2A",
- "rhsusf_ANPVS_15",
+ "ItemAndroid",
// Tools
+ "ACE_SpraypaintRed",
"ACE_EntrenchingTool"
};
gps[] = {"ItemcTab"};
- preLoadout = "[(_this select 0), 'charlie', 0, 1] call cScripts_fnc_setPreInitPlayerSettings;";
+ preLoadout = "[(_this select 0), 'charlie', 0, 2, true] call cScripts_fnc_setPreInitPlayerSettings;";
+};
+class Cav_B_C_PlatoonMedic_F : Cav_B_Charlie_base_F {
+ backpack[] = {"B_Carryall_mcamo"};
+ //goggles[] = {"rhs_googles_clear"};
+ headgear[] = {"rhsusf_ach_helmet_headset_ocp"};
+ uniform[] = {"LOP_U_ISTS_Fatigue_19"};
+ vest[] = {"rhsusf_mbav_medic"};
+ binoculars[] = {"ACE_Vector"};
+
+ primary[] = {"rhs_weap_m4a1_grip","rhsusf_acc_anpeq15side","rhsusf_acc_compm4","rhsusf_acc_grip3"};
+ secondary[] = {"rhsusf_weap_m9"};
+ launcher[] = {""};
+
+ magazines[] = {
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag",5,
+ "rhsusf_mag_15Rnd_9x19_JHP",2,
+
+ "rhs_mag_m67",2,
+
+ "SmokeShell",4,
+ "SmokeShellGreen",
+ "SmokeShellRed",
+ "SmokeShellYellow"
+ };
+ items[] = {
+ // Radios
+ "ACRE_PRC152",
+
+ // Medical Equipment
+ "ACE_personalAidKit",2,
+ "ACE_surgicalKit",
+ "ACE_quikclot",35,
+ "ACE_tourniquet",2,
+ "ACE_salineIV",8,
+ "ACE_morphine",20 ,
+ "ACE_epinephrine",20,
+
+ // Personal Medical Equipment
+ "ACE_quikclot",10,
+ "ACE_tourniquet",2,
+
+ // Standard
+ "ACE_Canteen",
+ "ACE_EarPlugs",
+ "ACE_MapTools",
+ "ACE_CableTie",
+
+ // Electronics
+ "ACE_MicroDAGR",
+
+ // Tools
+ "ACE_EntrenchingTool"
+ };
+
+ compass[] = {"ItemCompass"};
+ gps[] = {"ItemAndroid"};
+ map[] = {"ItemMap"};
+ nvgs[] = {""};
+ watch[] = {"ItemWatch"};
+
+ insignia[] = {"Cav_Insignia_Specialized_CLS"};
+ preLoadout = "[(_this select 0), 'charlie', 1, 0] call cScripts_fnc_setPreInitPlayerSettings;";
+ postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
};
-class CAV_Charlie_SL : CAV_Charlie_Base { // Squad Leader
+// S Q U A D
+class Cav_B_C_SquadLeader_F : Cav_B_Charlie_base_F {
headgear[] = {"rhsusf_ach_helmet_headset_ess_ocp"};
//backpack[] = {"B_AssaultPack_mcamo"};
@@ -166,7 +219,7 @@ class CAV_Charlie_SL : CAV_Charlie_Base { // Squad Leader
gps[] = {"ItemAndroid"};
};
-class CAV_Charlie_TL : CAV_Charlie_Base { // Fire Team Leader
+class Cav_B_C_Alpha_FireTeamLeader_F : Cav_B_Charlie_base_F {
headgear[] = {"rhsusf_ach_helmet_headset_ocp"};
vest[] = {"rhsusf_spcs_ocp_grenadier"};
@@ -217,8 +270,7 @@ class CAV_Charlie_TL : CAV_Charlie_Base { // Fire Team Leader
};
gps[] = {"ItemAndroid"};
};
-
-class CAV_Charlie_AR : CAV_Charlie_Base { // Automatic Rifleman 31.9kg
+class Cav_B_C_Alpha_AutomaticRifleman_F : Cav_B_Charlie_base_F {
headgear[] = {"rhsusf_ach_helmet_camo_ocp"};
vest[] = {"rhsusf_spcs_ocp_saw"};
@@ -232,8 +284,7 @@ class CAV_Charlie_AR : CAV_Charlie_Base { // Automatic Rifleman 31.9kg
"SmokeShell",4
};
};
-
-class CAV_Charlie_GR : CAV_Charlie_Base { // Grenadier 28.4kg
+class Cav_B_C_Alpha_Grenadier_F : Cav_B_Charlie_base_F {
headgear[] = {"rhsusf_ach_helmet_ocp_norotos"};
vest[] = {"rhsusf_spcs_ocp_grenadier"};
@@ -276,8 +327,22 @@ class CAV_Charlie_GR : CAV_Charlie_Base { // Grenadier 28.4kg
};
};
+class Cav_B_C_Alpha_Rifleman_F : Cav_B_Charlie_base_F {
+
+ headgear[] = {"rhsusf_ach_helmet_ocp_norotos"};
+ vest[] = {"rhsusf_spcs_ocp_rifleman_alt"};
+
+ primary[] = {"rhs_weap_m4a1_carryhandle","rhsusf_acc_anpeq15A","rhsusf_acc_ACOG_RMR"};
+
+ magazines[] = {
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag",12,
+
+ "rhs_mag_m67",6,
-class CAV_Charlie_RM : CAV_Charlie_Base { // Rifleman
+ "SmokeShell",6
+ };
+};
+class Cav_B_C_Alpha_RiflemanAT_F : Cav_B_Charlie_base_F {
headgear[] = {"rhsusf_ach_helmet_ocp_norotos"};
vest[] = {"rhsusf_spcs_ocp_rifleman_alt"};
@@ -292,8 +357,22 @@ class CAV_Charlie_RM : CAV_Charlie_Base { // Rifleman
"SmokeShell",6
};
};
+class Cav_B_C_Alpha_RiflemanLAT_F : Cav_B_Charlie_base_F {
+
+ headgear[] = {"rhsusf_ach_helmet_ocp_norotos"};
+ vest[] = {"rhsusf_spcs_ocp_rifleman_alt"};
+
+ primary[] = {"rhs_weap_m4a1_carryhandle","rhsusf_acc_anpeq15A","rhsusf_acc_ACOG_RMR"};
+
+ magazines[] = {
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag",12,
-class CAV_Charlie_CLS : CAV_Charlie_Base { // Combat Life Saver 24.3kg
+ "rhs_mag_m67",6,
+
+ "SmokeShell",6
+ };
+};
+class Cav_B_C_Alpha_CombatLifeSaver_F : Cav_B_Charlie_base_F {
headgear[] = {"rhsusf_ach_helmet_ESS_ocp"};
vest[] = {"rhsusf_spcs_ocp_medic"};
@@ -337,8 +416,23 @@ class CAV_Charlie_CLS : CAV_Charlie_Base { // Combat Life Saver 24.3kg
insignia[] = {"Cav_Insignia_Specialized_CLS"};
};
+class Cav_B_C_Bravo_FireTeamLeader_F : Cav_B_C_Alpha_FireTeamLeader_F {
+};
+class Cav_B_C_Bravo_AutomaticRifleman_F : Cav_B_C_Alpha_AutomaticRifleman_F {
+};
+class Cav_B_C_Bravo_Grenadier_F : Cav_B_C_Alpha_Grenadier_F {
+};
+class Cav_B_C_Bravo_Rifleman_F : Cav_B_C_Alpha_Rifleman_F {
+};
+class Cav_B_C_Bravo_RiflemanAT_F : Cav_B_C_Alpha_RiflemanAT_F {
+};
+class Cav_B_C_Bravo_RiflemanLAT_F : Cav_B_C_Alpha_RiflemanLAT_F {
+};
+class Cav_B_C_Bravo_CombatLifeSaver_F : Cav_B_C_Alpha_CombatLifeSaver_F {
+};
-class CAV_Charlie_Weapons_SL : CAV_Charlie_Base { // Squad Leader 35.3kg
+// W E A P O N S S Q U A D
+class Cav_B_C_Weap_SquadLeader_F : Cav_B_Charlie_Weap_base_F {
backpack[] = {"B_Carryall_mcamo"};
binoculars[] = {"ACE_Vector"};
@@ -393,7 +487,7 @@ class CAV_Charlie_Weapons_SL : CAV_Charlie_Base { // Squad Leader 35.3kg
preLoadout = "[(_this select 0), 'charlie', 0, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
};
-class CAV_Charlie_Weapons_TL : CAV_Charlie_Base { // Team Leader 32.4kg, 38.3kg with Mortar Bipod, 39.2kg with M2 Minitripod, 36.4 with Mk19/TOW tripod
+class Cav_B_C_Weap_Alpha_FireTeamLeader_F : Cav_B_Charlie_Weap_base_F {
primary[] = {"rhs_weap_m4a1_m320","rhsusf_acc_anpeq15A","rhsusf_acc_ACOG_RMR"};
launcher[] = {"rhs_weap_M136_hp"};
@@ -440,7 +534,7 @@ class CAV_Charlie_Weapons_TL : CAV_Charlie_Base { // Team Leader 32.4kg, 38.3kg
preLoadout = "[(_this select 0), 'charlie', 0, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
};
-class CAV_Charlie_Weapons_AR : CAV_Charlie_Base { // Automatic Rifleman 30.1kg, 36.0 with Mortar Bipod, 36.9kg with M2 Minitripod, 34.1 with Mk19/TOW tripod
+class Cav_B_C_Weap_Alpha_AutomaticRifleman_F : Cav_B_Charlie_Weap_base_F {
binoculars[] = {"ACE_Vector"};
@@ -476,7 +570,7 @@ class CAV_Charlie_Weapons_AR : CAV_Charlie_Base { // Automatic Rifleman 30.1kg
gps[] = {"ItemAndroid"};
preLoadout = "[(_this select 0), 'charlie', 0, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
};
-class CAV_Charlie_Weapons_GR : CAV_Charlie_Base { // Grenadier 24.9kg, 39.9kg with Mortar Tube, 40.0kg with M2 Gun Bag, 36.3kg with Mk19/TOW Gun Bag
+class Cav_B_C_Weap_Alpha_Grenadier_F : Cav_B_Charlie_Weap_base_F {
backpack[] = {"B_Kitbag_cbr"};
binoculars[] = {"ACE_Vector"};
primary[] = {"rhs_weap_m4a1_m320","rhsusf_acc_anpeq15A","rhsusf_acc_ACOG_RMR"};
@@ -514,7 +608,7 @@ class CAV_Charlie_Weapons_GR : CAV_Charlie_Base { // Grenadier 24.9kg, 39.9kg w
gps[] = {"ItemAndroid"};
preLoadout = "[(_this select 0), 'charlie', 0, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
};
-class CAV_Charlie_Weapons_RM : CAV_Charlie_Base { // Rifleman 22.8kg, 37.8kg with Mortar Tube, 37.9kg with M2 Gun Bag, 34.3kg with Mk19/TOW Gun Bag
+class Cav_B_C_Weap_Alpha_Rifleman_F : Cav_B_Charlie_Weap_base_F {
primary[] = {"rhs_weap_m4a1_carryhandle","rhsusf_acc_anpeq15A","rhsusf_acc_ACOG_RMR"};
backpack[] = {"B_Kitbag_cbr"};
binoculars[] = {"ACE_Vector"};
@@ -550,7 +644,79 @@ class CAV_Charlie_Weapons_RM : CAV_Charlie_Base { // Rifleman 22.8kg, 37.8kg wi
gps[] = {"ItemAndroid"};
preLoadout = "[(_this select 0), 'charlie', 0, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
};
-class CAV_Charlie_Weapons_CLS : CAV_Charlie_Base { // Combat Life Saver 23.0kg, 37.9kg with Mortar Tube, 38.0kg with M2 Gun Bag, 34.4kg with Mk19/TOW Gun Bag
+class Cav_B_C_Weap_Alpha_RiflemanAT_F : Cav_B_Charlie_Weap_base_F {
+ primary[] = {"rhs_weap_m4a1_carryhandle","rhsusf_acc_anpeq15A","rhsusf_acc_ACOG_RMR"};
+ backpack[] = {"B_Kitbag_cbr"};
+ binoculars[] = {"ACE_Vector"};
+
+ magazines[] = {
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag",8,
+
+ "rhs_mag_m67",4,
+ "SmokeShell",4
+ };
+
+ items[] = {
+ // Radios
+ "ACRE_PRC152",
+
+ // Personal Medical Equipment
+ "ACE_quikclot",10,
+ "ACE_tourniquet",2,
+
+ // Standard
+ "ACE_Canteen",
+ "ACE_EarPlugs",
+ "ACE_MapTools",
+ "Ace_M26_Clacker",
+ "ACE_DefusalKit",
+
+ // Electronics
+ "ACE_microDAGR",
+
+ // Tools
+ "ACE_EntrenchingTool"
+ };
+ gps[] = {"ItemAndroid"};
+ preLoadout = "[(_this select 0), 'charlie', 0, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
+};
+class Cav_B_C_Weap_Alpha_RiflemanLAT_F : Cav_B_Charlie_Weap_base_F {
+ primary[] = {"rhs_weap_m4a1_carryhandle","rhsusf_acc_anpeq15A","rhsusf_acc_ACOG_RMR"};
+ backpack[] = {"B_Kitbag_cbr"};
+ binoculars[] = {"ACE_Vector"};
+
+ magazines[] = {
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag",8,
+
+ "rhs_mag_m67",4,
+ "SmokeShell",4
+ };
+
+ items[] = {
+ // Radios
+ "ACRE_PRC152",
+
+ // Personal Medical Equipment
+ "ACE_quikclot",10,
+ "ACE_tourniquet",2,
+
+ // Standard
+ "ACE_Canteen",
+ "ACE_EarPlugs",
+ "ACE_MapTools",
+ "Ace_M26_Clacker",
+ "ACE_DefusalKit",
+
+ // Electronics
+ "ACE_microDAGR",
+
+ // Tools
+ "ACE_EntrenchingTool"
+ };
+ gps[] = {"ItemAndroid"};
+ preLoadout = "[(_this select 0), 'charlie', 0, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
+};
+class Cav_B_C_Weap_Alpha_CombatLifeSaver_F : Cav_B_Charlie_Weap_base_F {
primary[] = {"rhs_weap_m4a1_carryhandle","rhsusf_acc_anpeq15A","rhsusf_acc_ACOG_RMR"};
backpack[] = {"B_Kitbag_cbr"};
binoculars[] = {"ACE_Vector"};
@@ -598,3 +764,17 @@ class CAV_Charlie_Weapons_CLS : CAV_Charlie_Base { // Combat Life Saver 23.0kg,
gps[] = {"ItemAndroid"};
preLoadout = "[(_this select 0), 'charlie', 0, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
};
+class Cav_B_C_Weap_Bravo_FireTeamLeader_F : Cav_B_C_Weap_Alpha_FireTeamLeader_F {
+};
+class Cav_B_C_Weap_Bravo_AutomaticRifleman_F : Cav_B_C_Weap_Alpha_AutomaticRifleman_F {
+};
+class Cav_B_C_Weap_Bravo_Grenadier_F : Cav_B_C_Weap_Alpha_Grenadier_F {
+};
+class Cav_B_C_Weap_Bravo_Rifleman_F : Cav_B_C_Weap_Alpha_Rifleman_F {
+};
+class Cav_B_C_Weap_Bravo_RiflemanAT_F : Cav_B_C_Weap_Alpha_RiflemanAT_F {
+};
+class Cav_B_C_Weap_Bravo_RiflemanLAT_F : Cav_B_C_Weap_Alpha_RiflemanLAT_F {
+};
+class Cav_B_C_Weap_Bravo_CombatLifeSaver_F : Cav_B_C_Weap_Alpha_CombatLifeSaver_F {
+};
diff --git a/cScripts/Loadouts/CfgLoadouts_CharlieClass.hpp b/cScripts/Loadouts/CfgLoadouts_CharlieClass.hpp
index cdca14a2f..3f46cdc4c 100644
--- a/cScripts/Loadouts/CfgLoadouts_CharlieClass.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_CharlieClass.hpp
@@ -1,8 +1,53 @@
+
// C H A R L I E C O M P A N Y
-// Infantry
-class rhsusf_army_ocp_arb_riflemanl : CAV_Charlie_OFFCR {}; // Use for all leadership positions from PSG up
-class rhsusf_army_ocp_jfo : CAV_Charlie_JFO {}; // Joint Fires Observer
+class Cav_B_C_PlatoonSergeant_Bandit_5_F : Cav_B_C_PlatoonSergeant_F {};
+class Cav_B_C_PlatoonLeader_Bandit_6_F : Cav_B_C_PlatoonLeader_F {};
+class Cav_B_C_PlatoonMedic_Bandit_7_F : Cav_B_C_PlatoonMedic_F {};
+
+class Cav_B_C_SquadLeader_Bandit_1_F : Cav_B_C_SquadLeader_F {};
+class Cav_B_C_SquadLeader_Bandit_2_F : Cav_B_C_SquadLeader_F {};
+class Cav_B_C_SquadLeader_Bandit_3_F : Cav_B_C_SquadLeader_F {};
+class Cav_B_C_SquadLeader_Bandit_4_F : Cav_B_C_SquadLeader_F {};
+
+
+class Cav_B_C_PlatoonSergeant_Misfit_5_F : Cav_B_C_PlatoonSergeant_F {};
+class Cav_B_C_PlatoonLeader_Misfit_6_F : Cav_B_C_PlatoonLeader_F {};
+class Cav_B_C_PlatoonMedic_Misfit_7_F : Cav_B_C_PlatoonMedic_F {};
+
+class Cav_B_C_SquadLeader_Misfit_1_F : Cav_B_C_SquadLeader_F {};
+class Cav_B_C_SquadLeader_Misfit_2_F : Cav_B_C_SquadLeader_F {};
+class Cav_B_C_SquadLeader_Misfit_3_F : Cav_B_C_SquadLeader_F {};
+class Cav_B_C_SquadLeader_Misfit_4_F : Cav_B_C_SquadLeader_F {};
+
+class Cav_B_C_Weap_SquadLeader_Havoc_1_F : Cav_B_C_Weap_SquadLeader_F {};
+
+
+// L E G A C Y
+// Saved for backwards compability
+
+// Old class definitions to New class definition
+class CAV_Charlie_OFFCR : Cav_B_C_PlatoonSergeant_F {};
+class CAV_Charlie_JFO : Cav_B_C_PlatoonSergeant_F {};
+
+class CAV_Charlie_SL : Cav_B_Charlie_base_F {};
+class CAV_Charlie_TL : Cav_B_C_Alpha_FireTeamLeader_F {};
+class CAV_Charlie_AR : Cav_B_C_Alpha_AutomaticRifleman_F {};
+class CAV_Charlie_GR : Cav_B_C_Alpha_Grenadier_F {};
+class CAV_Charlie_RM : Cav_B_C_Alpha_Rifleman_F {};
+class CAV_Charlie_CLS : Cav_B_C_Alpha_CombatLifeSaver_F {};
+
+class CAV_Charlie_Weapons_SL : Cav_B_C_Weap_SquadLeader_F {};
+class CAV_Charlie_Weapons_TL : Cav_B_C_Weap_Alpha_FireTeamLeader_F {};
+class CAV_Charlie_Weapons_AR : Cav_B_C_Weap_Alpha_AutomaticRifleman_F {};
+class CAV_Charlie_Weapons_GR : Cav_B_C_Weap_Alpha_Grenadier_F {};
+class CAV_Charlie_Weapons_RM : Cav_B_C_Weap_Alpha_Rifleman_F {};
+class CAV_Charlie_Weapons_CLS : Cav_B_C_Weap_Alpha_CombatLifeSaver_F {};
+
+
+// Older class structure
+class rhsusf_army_ocp_arb_riflemanl : CAV_Charlie_OFFCR {};
+class rhsusf_army_ocp_jfo : CAV_Charlie_JFO {};
class rhsusf_army_ocp_arb_squadleader : CAV_Charlie_SL {};
class rhsusf_army_ocp_arb_teamleader : CAV_Charlie_TL {};
class rhsusf_army_ocp_arb_autorifleman : CAV_Charlie_AR {};
@@ -10,8 +55,6 @@ class rhsusf_army_ocp_arb_grenadier : CAV_Charlie_GR {};
class rhsusf_army_ocp_arb_rifleman : CAV_Charlie_RM {};
class rhsusf_army_ocp_arb_medic : CAV_Charlie_CLS {};
-// Weapons - use for either HW or Mortars
-
class B_T_Soldier_SL_F : CAV_Charlie_Weapons_SL {};
class B_T_Soldier_TL_F : CAV_Charlie_Weapons_TL {};
class B_T_Engineer_F : CAV_Charlie_Weapons_AR {};
diff --git a/cScripts/Loadouts/CfgLoadouts_Common.hpp b/cScripts/Loadouts/CfgLoadouts_Common.hpp
index 78fd46371..3e4b3f420 100644
--- a/cScripts/Loadouts/CfgLoadouts_Common.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_Common.hpp
@@ -1,55 +1,32 @@
-/* Gear Date 180930 */
-
-/* R E A D T H I S B E F O R E M A K I N G C H A N G E S
-
-HOW CSCRIPTS WORKS FOR DUMMIES:
-
-1. When you load into the server, cscripts does the following:
-
-- checks the classname of the player unit against the list of classes in CfgLoadouts_AlphaClass.hpp (Bravo, Charlie etc).
-
-- applies the loadout per the common loadout in CfgLoadouts_Common.hpp (base items) Runs any preloadout and postloadout instructions.
-
-- applies the loadout per the loadout in CfgLoadouts_Alpha.hpp (Bravo, Charlie etc) Runs any preloadout and postloadout instructions, over-writing any previous instructions.
-
-2. Important to know:
-
-- Companies have their own loadouts.
-
-- each class of item (backpack, goggles, etc) is overwritten completely if you change it at any stage, i.e. CommonBlufor, Alpha_Base, or in the actual loadout. So if you need to change an item in the actual loadout, you have to include all the items you want in there or the only thing that will appear is the one thing you added.
-
-- CommonBlufor is used to give a loadout to units that may not have a class defined in the list of classes in CfgLoadouts_AlphaClass.hpp (Bravo, Charlie etc). i.e. if the mission maker used a unit type by mistake that has no defined class or loadout. It also defines every single class to ensure that it clears the inventory of any vanilla items inherited from those classes.
-
-*/
class CommonBlufor {
- backpack[] = {""};
- //goggles[] = {"rhs_googles_clear"};
- headgear[] = {"rhsusf_ach_helmet_headset_ocp"};
- uniform[] = {"rhs_uniform_cu_ocp_1stcav"};
- vest[] = {""};
-
- primary[] = {""};
- secondary[] = {""};
- launcher[] = {""};
-
- binoculars[] = {""};
-
- magazines[] = {""};
- items[] = {""};
-
- compass[] = {"ItemCompass"};
- gps[] = {""};
- map[] = {"ItemMap"};
- nvgs[] = {""};
- watch[] = {"itemWatch"};
-
- insignia[] = {""};
- preLoadout = "[(_this select 0),'', 0, 0] call cScripts_fnc_setPreInitPlayerSettings;";
- postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
+ // backpack[] = {""};
+ // goggles[] = {"rhs_googles_clear"};
+ // headgear[] = {"rhsusf_ach_helmet_headset_ocp"};
+ // uniform[] = {"rhs_uniform_cu_ocp_1stcav"};
+ // vest[] = {""};
+
+ // primary[] = {""};
+ // secondary[] = {""};
+ // launcher[] = {""};
+
+ // binoculars[] = {""};
+
+ // magazines[] = {""};
+ // items[] = {""};
+
+ // compass[] = {"ItemCompass"};
+ // gps[] = {""};
+ // map[] = {"ItemMap"};
+ // nvgs[] = {""};
+ // watch[] = {"itemWatch"};
+
+ // insignia[] = {""};
+ //preLoadout = "";
+ //postLoadout = "";
};
-class CAV_Alpha_Base : CommonBlufor {
+class Cav_B_Alpha_base_F : CommonBlufor {
backpack[] = {""};
//goggles[] = {""};
headgear[] = {"rhsusf_hgu56p_visor_green"};
@@ -112,7 +89,7 @@ class CAV_Alpha_Base : CommonBlufor {
postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
};
-class CAV_Bravo_Base : CommonBlufor {
+class Cav_B_Bravo_base_F : CommonBlufor {
backpack[] = {"B_Carryall_mcamo"};
//goggles[] = {"rhs_googles_clear"};
headgear[] = {"rhsusf_ach_helmet_headset_ocp"};
@@ -154,22 +131,20 @@ class CAV_Bravo_Base : CommonBlufor {
preLoadout = "[(_this select 0), 'bravo', 0, 0] call cScripts_fnc_setPreInitPlayerSettings;";
postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
};
-
-class CAV_Charlie_Base : CommonBlufor {
- backpack[] = {"B_AssaultPack_mcamo"};
+class Cav_B_Bravo_Crew_base_F : Cav_B_Bravo_base_F {
+ backpack[] = {"B_Carryall_mcamo"};
//goggles[] = {"rhs_googles_clear"};
- headgear[] = {"rhsusf_ach_helmet_ocp"};
- uniform[] = {"LOP_U_ISTS_Fatigue_19"};
- vest[] = {"rhsusf_spcs_ocp"};
+ headgear[] = {"rhsusf_ach_helmet_headset_ocp"};
+ uniform[] = {"rhs_uniform_cu_ocp_1stcav"};
+ vest[] = {"rhsusf_iotv_ocp_Squadleader"};
- primary[] = {"rhs_weap_m4a1_carryhandle","rhsusf_acc_anpeq15A","rhsusf_acc_ACOG_RMR"};
+ primary[] = {"rhs_weap_m4a1_grip","rhsusf_acc_anpeq15side","rhsusf_acc_ACOG_RMR","rhsusf_acc_grip1"};
secondary[] = {""};
launcher[] = {""};
binoculars[] = {""};
- magazines[] = {};
-
+ magazines[] = {""};
items[] = {
// Personal Medical Equipment
"ACE_quikclot",10,
@@ -180,9 +155,9 @@ class CAV_Charlie_Base : CommonBlufor {
"ACE_MapTools",
"ACE_CableTie",
- //Electronics
- "ACE_DAGR",
-
+ // Electronics
+ "ACE_microDAGR",
+
// Tools
"ACE_Canteen",
"ACE_EntrenchingTool"
@@ -191,90 +166,150 @@ class CAV_Charlie_Base : CommonBlufor {
compass[] = {"ItemCompass"};
gps[] = {""};
map[] = {"ItemMap"};
- nvgs[] = {""};
+ nvgs[] = {"rhsusf_ANPVS_14"};
watch[] = {"ItemWatch"};
insignia[] = {""};
- preLoadout = "[(_this select 0), 'charlie', 0, 0] call cScripts_fnc_setPreInitPlayerSettings;";
+ preLoadout = "[(_this select 0), 'bravo', 0, 0] call cScripts_fnc_setPreInitPlayerSettings;";
postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
};
-
-class CAV_Ranger_Base : CommonBlufor {
- backpack[] = {""};
+class Cav_B_Bravo_Logi_base_F : Cav_B_Bravo_base_F {
+ backpack[] = {"B_Carryall_mcamo"};
//goggles[] = {"rhs_googles_clear"};
- headgear[] = {"rhsusf_mich_bare_norotos_alt"};
- uniform[] = {"rhs_uniform_g3_mc"};
- vest[] = {"rhsusf_mbav_rifleman"};
+ headgear[] = {"rhsusf_ach_bare_headset"};
+ uniform[] = {"LOP_U_ISTS_Fatigue_19"};
+ vest[] = {"rhsusf_spcs_ocp_saw"};
+ binoculars[] = {"ACE_Vector"};
- primary[] = {""};
+ primary[] = {"rhs_weap_m4a1","rhsusf_acc_anpeq15side","rhsusf_acc_compm4","rhsusf_acc_grip1"};
secondary[] = {""};
launcher[] = {""};
- binoculars[] = {""};
+ magazines[] = {};
- magazines[] = {""};
- items[] = {""};
+ items[] = {};
compass[] = {"ItemCompass"};
gps[] = {"ItemAndroid"};
map[] = {"ItemMap"};
nvgs[] = {""};
- watch[] = {"ACE_Altimeter"};
+ watch[] = {"ItemWatch"};
- insignia[] = {"Cav_Insignia_Specialized_Ranger"};
- preLoadout = "[(_this select 0), 'ranger', 1, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
+ preLoadout = "[(_this select 0), 'bravo', 2, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
};
-class CAV_Medical_Base : CommonBlufor {
- backpack[] = {""};
+class Cav_B_Charlie_base_F : CommonBlufor {
+ backpack[] = {"B_AssaultPack_mcamo"};
//goggles[] = {"rhs_googles_clear"};
- headgear[] = {"rhsusf_ach_bare_tan_headset"};
+ headgear[] = {"rhsusf_ach_helmet_ocp"};
uniform[] = {"LOP_U_ISTS_Fatigue_19"};
- vest[] = {"rhsusf_mbav_medic"};
- binoculars[] = {"ACE_Vector"};
+ vest[] = {"rhsusf_spcs_ocp"};
- primary[] = {"rhs_weap_m4a1_grip","rhsusf_acc_anpeq15side","rhsusf_acc_compm4","rhsusf_acc_grip3"};
- secondary[] = {"rhsusf_weap_m9"};
+ primary[] = {"rhs_weap_m4a1_carryhandle","rhsusf_acc_anpeq15A","rhsusf_acc_ACOG_RMR"};
+ secondary[] = {""};
launcher[] = {""};
+ binoculars[] = {""};
+
magazines[] = {};
- items[] = {};
+ items[] = {
+ // Personal Medical Equipment
+ "ACE_quikclot",10,
+ "ACE_tourniquet",2,
+
+ // Standard
+ "ACE_EarPlugs",
+ "ACE_MapTools",
+ "ACE_CableTie",
+
+ //Electronics
+ "ACE_DAGR",
+
+ // Tools
+ "ACE_Canteen",
+ "ACE_EntrenchingTool"
+ };
compass[] = {"ItemCompass"};
- gps[] = {"ItemAndroid"};
+ gps[] = {""};
map[] = {"ItemMap"};
nvgs[] = {""};
watch[] = {"ItemWatch"};
- insignia[] = {"Cav_Insignia_Specialized_CLS"};
- preLoadout = "[(_this select 0), 'medical', 2, 0] call cScripts_fnc_setPreInitPlayerSettings;";
+ insignia[] = {""};
+ preLoadout = "[(_this select 0), 'charlie', 0, 0] call cScripts_fnc_setPreInitPlayerSettings;";
postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
};
-
-class CAV_Logistics_Base : CommonBlufor {
- backpack[] = {"B_Carryall_mcamo"};
+class Cav_B_Charlie_Weap_base_F : Cav_B_Charlie_base_F {
+ backpack[] = {"B_AssaultPack_mcamo"};
//goggles[] = {"rhs_googles_clear"};
- headgear[] = {"rhsusf_ach_bare_headset"};
+ headgear[] = {"rhsusf_ach_helmet_ocp"};
uniform[] = {"LOP_U_ISTS_Fatigue_19"};
- vest[] = {"rhsusf_spcs_ocp_saw"};
- binoculars[] = {"ACE_Vector"};
+ vest[] = {"rhsusf_spcs_ocp"};
- primary[] = {"rhs_weap_m4a1","rhsusf_acc_anpeq15side","rhsusf_acc_compm4","rhsusf_acc_grip1"};
+ primary[] = {"rhs_weap_m4a1_carryhandle","rhsusf_acc_anpeq15A","rhsusf_acc_ACOG_RMR"};
secondary[] = {""};
launcher[] = {""};
+ binoculars[] = {""};
+
magazines[] = {};
- items[] = {};
+ items[] = {
+ // Personal Medical Equipment
+ "ACE_quikclot",10,
+ "ACE_tourniquet",2,
+
+ // Standard
+ "ACE_EarPlugs",
+ "ACE_MapTools",
+ "ACE_CableTie",
+
+ //Electronics
+ "ACE_DAGR",
+
+ // Tools
+ "ACE_Canteen",
+ "ACE_EntrenchingTool"
+ };
compass[] = {"ItemCompass"};
- gps[] = {"ItemAndroid"};
+ gps[] = {""};
map[] = {"ItemMap"};
nvgs[] = {""};
watch[] = {"ItemWatch"};
- preLoadout = "[(_this select 0), 'bravo', 2, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
+ insignia[] = {""};
+ preLoadout = "[(_this select 0), 'charlie', 0, 0] call cScripts_fnc_setPreInitPlayerSettings;";
+ postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
+};
+
+// Not created yet
+class CAV_Ranger_Base : CommonBlufor {
+ backpack[] = {""};
+ //goggles[] = {"rhs_googles_clear"};
+ headgear[] = {"rhsusf_mich_bare_norotos_alt"};
+ uniform[] = {"rhs_uniform_g3_mc"};
+ vest[] = {"rhsusf_mbav_rifleman"};
+
+ primary[] = {""};
+ secondary[] = {""};
+ launcher[] = {""};
+
+ binoculars[] = {""};
+
+ magazines[] = {""};
+ items[] = {""};
+
+ compass[] = {"ItemCompass"};
+ gps[] = {"ItemAndroid"};
+ map[] = {"ItemMap"};
+ nvgs[] = {""};
+ watch[] = {"ACE_Altimeter"};
+
+ insignia[] = {"Cav_Insignia_Specialized_Ranger"};
+ preLoadout = "[(_this select 0), 'ranger', 1, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
};
diff --git a/cScripts/Loadouts/CfgLoadouts_Common.old.hpp b/cScripts/Loadouts/CfgLoadouts_Common.old.hpp
new file mode 100644
index 000000000..2e7e95a67
--- /dev/null
+++ b/cScripts/Loadouts/CfgLoadouts_Common.old.hpp
@@ -0,0 +1,280 @@
+/* Gear Date 180930 */
+
+/* R E A D T H I S B E F O R E M A K I N G C H A N G E S
+
+HOW CSCRIPTS WORKS FOR DUMMIES:
+
+1. When you load into the server, cscripts does the following:
+
+- checks the classname of the player unit against the list of classes in CfgLoadouts_AlphaClass.hpp (Bravo, Charlie etc).
+
+- applies the loadout per the common loadout in CfgLoadouts_Common.hpp (base items) Runs any preloadout and postloadout instructions.
+
+- applies the loadout per the loadout in CfgLoadouts_Alpha.hpp (Bravo, Charlie etc) Runs any preloadout and postloadout instructions, over-writing any previous instructions.
+
+2. Important to know:
+
+- Companies have their own loadouts.
+
+- each class of item (backpack, goggles, etc) is overwritten completely if you change it at any stage, i.e. CommonBlufor, Alpha_Base, or in the actual loadout. So if you need to change an item in the actual loadout, you have to include all the items you want in there or the only thing that will appear is the one thing you added.
+
+- CommonBlufor is used to give a loadout to units that may not have a class defined in the list of classes in CfgLoadouts_AlphaClass.hpp (Bravo, Charlie etc). i.e. if the mission maker used a unit type by mistake that has no defined class or loadout. It also defines every single class to ensure that it clears the inventory of any vanilla items inherited from those classes.
+
+*/
+
+class CommonBlufor {
+ // backpack[] = {""};
+ // goggles[] = {"rhs_googles_clear"};
+ // headgear[] = {"rhsusf_ach_helmet_headset_ocp"};
+ // uniform[] = {"rhs_uniform_cu_ocp_1stcav"};
+ // vest[] = {""};
+
+ // primary[] = {""};
+ // secondary[] = {""};
+ // launcher[] = {""};
+
+ // binoculars[] = {""};
+
+ // magazines[] = {""};
+ // items[] = {""};
+
+ // compass[] = {"ItemCompass"};
+ // gps[] = {""};
+ // map[] = {"ItemMap"};
+ // nvgs[] = {""};
+ // watch[] = {"itemWatch"};
+
+ // insignia[] = {""};
+ preLoadout = "[(_this select 0),'', 0, 0] call cScripts_fnc_setPreInitPlayerSettings;";
+ postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
+};
+
+class CAV_Alpha_Base : CommonBlufor {
+ backpack[] = {""};
+ //goggles[] = {""};
+ headgear[] = {"rhsusf_hgu56p_visor_green"};
+ uniform[] = {"rhs_uniform_cu_ocp_1stcav"};
+ vest[] = {"rhsusf_mbav_light"};
+
+ primary[] = {"rhs_weap_m4","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR"};
+ secondary[] = {"rhsusf_weap_m9"};
+ launcher[] = {""};
+
+ binoculars[] = {"Binocular"};
+
+ magazines[] = {
+ "rhs_mag_30Rnd_556x45_M855A1_Stanag_Tracer_Red",4,
+ "rhsusf_mag_15Rnd_9x19_JHP",3,
+
+ "B_IR_Grenade",1,
+ "SmokeShell",2,
+ "SmokeShellBlue",2,
+ "SmokeShellRed",2,
+ "SmokeShellGreen",2,
+
+ "Chemlight_green",2,
+ "ACE_Chemlight_HiRed",2,
+ "Chemlight_blue",2
+ };
+
+ items[] = {
+ // Radios
+ "ACRE_PRC152",
+ "ACRE_PRC117F",
+
+ // Personal Medical Equipment
+ "ACE_quikclot",10,
+ "ACE_morphine",2,
+ "ACE_epinephrine",2,
+ "ACE_tourniquet",2,
+
+ // Standard
+ "ACE_Canteen",
+ "ACE_EntrenchingTool",
+ "ACE_MapTools",
+ "ACE_Flashlight_MX991",
+
+ // Electronics
+ "ACE_microDAGR",
+
+ // Misc
+ "H_Cap_tan",
+ "rhsusf_shemagh_tan"
+ };
+
+ //compass[] = {"ItemCompass"};
+ //gps[] = {""};
+ //map[] = {"ItemMap"};
+ watch[] = {"ACE_Altimeter"};
+
+ insignia[] = {""};
+ preLoadout = "[(_this select 0), 'alpha', 0, 0] call cScripts_fnc_setPreInitPlayerSettings;";
+ postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
+};
+
+class CAV_Bravo_Base : CommonBlufor {
+ backpack[] = {"B_Carryall_mcamo"};
+ //goggles[] = {"rhs_googles_clear"};
+ headgear[] = {"rhsusf_ach_helmet_headset_ocp"};
+ uniform[] = {"rhs_uniform_cu_ocp_1stcav"};
+ vest[] = {"rhsusf_iotv_ocp_Squadleader"};
+
+ primary[] = {"rhs_weap_m4a1_grip","rhsusf_acc_anpeq15side","rhsusf_acc_ACOG_RMR","rhsusf_acc_grip1"};
+ secondary[] = {""};
+ launcher[] = {""};
+
+ binoculars[] = {""};
+
+ magazines[] = {""};
+ items[] = {
+ // Personal Medical Equipment
+ "ACE_quikclot",10,
+ "ACE_tourniquet",2,
+
+ // Standard
+ "ACE_EarPlugs",
+ "ACE_MapTools",
+ "ACE_CableTie",
+
+ // Electronics
+ "ACE_microDAGR",
+
+ // Tools
+ "ACE_Canteen",
+ "ACE_EntrenchingTool"
+ };
+
+ compass[] = {"ItemCompass"};
+ gps[] = {""};
+ map[] = {"ItemMap"};
+ nvgs[] = {"rhsusf_ANPVS_14"};
+ watch[] = {"ItemWatch"};
+
+ insignia[] = {""};
+ preLoadout = "[(_this select 0), 'bravo', 0, 0] call cScripts_fnc_setPreInitPlayerSettings;";
+ postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
+};
+
+class CAV_Charlie_Base : CommonBlufor {
+ backpack[] = {"B_AssaultPack_mcamo"};
+ //goggles[] = {"rhs_googles_clear"};
+ headgear[] = {"rhsusf_ach_helmet_ocp"};
+ uniform[] = {"LOP_U_ISTS_Fatigue_19"};
+ vest[] = {"rhsusf_spcs_ocp"};
+
+ primary[] = {"rhs_weap_m4a1_carryhandle","rhsusf_acc_anpeq15A","rhsusf_acc_ACOG_RMR"};
+ secondary[] = {""};
+ launcher[] = {""};
+
+ binoculars[] = {""};
+
+ magazines[] = {};
+
+ items[] = {
+ // Personal Medical Equipment
+ "ACE_quikclot",10,
+ "ACE_tourniquet",2,
+
+ // Standard
+ "ACE_EarPlugs",
+ "ACE_MapTools",
+ "ACE_CableTie",
+
+ //Electronics
+ "ACE_DAGR",
+
+ // Tools
+ "ACE_Canteen",
+ "ACE_EntrenchingTool"
+ };
+
+ compass[] = {"ItemCompass"};
+ gps[] = {""};
+ map[] = {"ItemMap"};
+ nvgs[] = {""};
+ watch[] = {"ItemWatch"};
+
+ insignia[] = {""};
+ preLoadout = "[(_this select 0), 'charlie', 0, 0] call cScripts_fnc_setPreInitPlayerSettings;";
+ postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
+};
+
+class CAV_Ranger_Base : CommonBlufor {
+ backpack[] = {""};
+ //goggles[] = {"rhs_googles_clear"};
+ headgear[] = {"rhsusf_mich_bare_norotos_alt"};
+ uniform[] = {"rhs_uniform_g3_mc"};
+ vest[] = {"rhsusf_mbav_rifleman"};
+
+ primary[] = {""};
+ secondary[] = {""};
+ launcher[] = {""};
+
+ binoculars[] = {""};
+
+ magazines[] = {""};
+ items[] = {""};
+
+ compass[] = {"ItemCompass"};
+ gps[] = {"ItemAndroid"};
+ map[] = {"ItemMap"};
+ nvgs[] = {""};
+ watch[] = {"ACE_Altimeter"};
+
+ insignia[] = {"Cav_Insignia_Specialized_Ranger"};
+ preLoadout = "[(_this select 0), 'ranger', 1, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
+ postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
+};
+
+class CAV_Medical_Base : CommonBlufor {
+ backpack[] = {""};
+ //goggles[] = {"rhs_googles_clear"};
+ headgear[] = {"rhsusf_ach_bare_tan_headset"};
+ uniform[] = {"LOP_U_ISTS_Fatigue_19"};
+ vest[] = {"rhsusf_mbav_medic"};
+ binoculars[] = {"ACE_Vector"};
+
+ primary[] = {"rhs_weap_m4a1_grip","rhsusf_acc_anpeq15side","rhsusf_acc_compm4","rhsusf_acc_grip3"};
+ secondary[] = {"rhsusf_weap_m9"};
+ launcher[] = {""};
+
+ magazines[] = {};
+
+ items[] = {};
+
+ compass[] = {"ItemCompass"};
+ gps[] = {"ItemAndroid"};
+ map[] = {"ItemMap"};
+ nvgs[] = {""};
+ watch[] = {"ItemWatch"};
+
+ insignia[] = {"Cav_Insignia_Specialized_CLS"};
+ preLoadout = "[(_this select 0), 'medical', 2, 0] call cScripts_fnc_setPreInitPlayerSettings;";
+ postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
+};
+
+class CAV_Logistics_Base : CommonBlufor {
+ backpack[] = {"B_Carryall_mcamo"};
+ //goggles[] = {"rhs_googles_clear"};
+ headgear[] = {"rhsusf_ach_bare_headset"};
+ uniform[] = {"LOP_U_ISTS_Fatigue_19"};
+ vest[] = {"rhsusf_spcs_ocp_saw"};
+ binoculars[] = {"ACE_Vector"};
+
+ primary[] = {"rhs_weap_m4a1","rhsusf_acc_anpeq15side","rhsusf_acc_compm4","rhsusf_acc_grip1"};
+ secondary[] = {""};
+ launcher[] = {""};
+
+ magazines[] = {};
+
+ items[] = {};
+
+ compass[] = {"ItemCompass"};
+ gps[] = {"ItemAndroid"};
+ map[] = {"ItemMap"};
+ nvgs[] = {""};
+ watch[] = {"ItemWatch"};
+
+ preLoadout = "[(_this select 0), 'bravo', 2, 1, true] call cScripts_fnc_setPreInitPlayerSettings;";
+ postLoadout = "[(_this select 0),true,true] call cScripts_fnc_setPostInitPlayerSettings;";
+};
diff --git a/cScripts/Loadouts/CfgLoadouts_Medical.hpp b/cScripts/Loadouts/CfgLoadouts_Medical.hpp
deleted file mode 100644
index c36ec2443..000000000
--- a/cScripts/Loadouts/CfgLoadouts_Medical.hpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Gear Date 15 NOV 17 */
-
-// M E D I C A L P L A T O O N
-
-class CAV_Medical_OFFCR : CAV_Medical_Base { // Medical Team Leader or SL and up leadership positions
-
- backpack[] = {"B_Carryall_mcamo"};
-
- magazines[] = {
- "rhs_mag_30Rnd_556x45_M855A1_Stanag",8,
- "rhsusf_mag_15Rnd_9x19_JHP",2,
-
- "rhs_mag_m67",
-
- "ACE_Chemlight_HiOrange",2,
- "SmokeShell",2,
- "SmokeShellBlue",2,
- "SmokeShellOrange",2
- };
-
- items[] = {
- // Radios
- "ACRE_PRC152",
- "ACRE_PRC152",
-
- // Medical Equipment
- "ACE_personalAidKit",6,
- "ACE_surgicalKit",
- "ACE_tourniquet",10,
-
- "ACE_quikclot",25,
- "ACE_elasticBandage",20,
-
- "ACE_adenosine",5,
- "ACE_epinephrine",20,
- "ACE_morphine",20,
-
- "ACE_salineIV",6,
-
- // Standard
- "ACE_Canteen",
- "ACE_EarPlugs",
- "ACE_MapTools",
- "ACE_CableTie",
-
- // Electronics
- "ACE_microDAGR",
-
- // Tools
- "ACE_EntrenchingTool"
- };
-};
-
-class CAV_Medical_BONESAW : CAV_Medical_Base { // Medical Team Member
-
- backpack[] = {"B_Carryall_mcamo"};
-
- magazines[] = {
- "rhs_mag_30Rnd_556x45_M855A1_Stanag",8,
- "rhsusf_mag_15Rnd_9x19_JHP",2,
-
- "rhs_mag_m67",
-
- "ACE_Chemlight_HiOrange",2,
- "SmokeShell",2,
- "SmokeShellBlue",2,
- "SmokeShellOrange",2
- };
-
- items[] = {
- // Radios
- "ACRE_PRC152",
- "ACRE_PRC152",
-
- // Medical Equipment
- "ACE_personalAidKit",6,
- "ACE_surgicalKit",
- "ACE_tourniquet",10,
-
- "ACE_quikclot",25,
- "ACE_elasticBandage",20,
-
- "ACE_adenosine",5,
- "ACE_epinephrine",20,
- "ACE_morphine",20,
-
- "ACE_salineIV",6,
-
- // Standard
- "ACE_Canteen",
- "ACE_EarPlugs",
- "ACE_MapTools",
- "ACE_CableTie",
-
- // Electronics
- "ACE_microDAGR",
-
- // Tools
- "ACE_EntrenchingTool"
- };
-};
-
-class CAV_Medical_PLMEDIC : CAV_Medical_Base { // Platoon Medics
- backpack[] = {"B_Carryall_mcamo"};
- headgear[] = {"rhsusf_ach_helmet_headset_ocp"};
-
- magazines[] = {
- "rhs_mag_30Rnd_556x45_M855A1_Stanag",5,
- "rhsusf_mag_15Rnd_9x19_JHP",2,
-
- "rhs_mag_m67",2,
-
- "SmokeShell",4,
- "SmokeShellGreen",
- "SmokeShellRed",
- "SmokeShellYellow"
- };
- items[] = {
- // Radios
- "ACRE_PRC152",
-
- // Medical Equipment
- "ACE_personalAidKit",2,
- "ACE_surgicalKit",
- "ACE_quikclot",35,
- "ACE_tourniquet",2,
- "ACE_salineIV",8,
- "ACE_morphine",20 ,
- "ACE_epinephrine",20,
-
- // Personal Medical Equipment
- "ACE_quikclot",10,
- "ACE_tourniquet",2,
-
- // Standard
- "ACE_Canteen",
- "ACE_EarPlugs",
- "ACE_MapTools",
- "ACE_CableTie",
-
- // Electronics
- "ACE_MicroDAGR",
-
- // Tools
- "ACE_EntrenchingTool"
- };
-
- preLoadout = "[(_this select 0), 'medical', 1, 0] call cScripts_fnc_setPreInitPlayerSettings;";
-};
diff --git a/cScripts/Loadouts/CfgLoadouts_MedicalClass.hpp b/cScripts/Loadouts/CfgLoadouts_MedicalClass.hpp
deleted file mode 100644
index b69471738..000000000
--- a/cScripts/Loadouts/CfgLoadouts_MedicalClass.hpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// M E D I C A L P L A T O O N
-
-// Medics
-
-class B_medic_F : CAV_Medical_OFFCR {}; // Use for PL/PSG/Bonesaw Team Leader
-class rhsusf_navy_marpat_d_medic : CAV_Medical_PLMEDIC {}; // Platoon Medics
-class rhsusf_navy_marpat_wd_medic : CAV_Medical_BONESAW {}; // Bonesaw Team Medic
diff --git a/cScripts/Loadouts/CfgLoadouts_S3.hpp b/cScripts/Loadouts/CfgLoadouts_S3.hpp
index bd1dfaccf..80f2a51b9 100644
--- a/cScripts/Loadouts/CfgLoadouts_S3.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_S3.hpp
@@ -2,7 +2,7 @@
GearVersionDate: 160801
*/
-class CAV_S3_Base : CAV_Bravo_OFFCR {
+class CAV_S3_Base : Cav_B_B_PlatoonSergeant_F {
gps[] = {""};
insignia[] = {"Curator"};
diff --git a/cScripts/Loadouts/CfgLoadouts_Training.hpp b/cScripts/Loadouts/CfgLoadouts_Training.hpp
index ff086cba4..c23806059 100644
--- a/cScripts/Loadouts/CfgLoadouts_Training.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_Training.hpp
@@ -2,7 +2,7 @@
// SCHOOL OF INFANTRY
-class CAV_SOI_INSTR : CAV_Charlie_Base { // Instructor
+class CAV_SOI_INSTR : Cav_B_Charlie_base_F {
uniform[] = {"LOP_U_ISTS_Fatigue_19"};
headgear[] = {"DAR_Beret_Mar"};
@@ -51,7 +51,7 @@ class CAV_SOI_INSTR : CAV_Charlie_Base { // Instructor
(_this select 0) allowDamage false;";
};
-class CAV_JM_INSTR : CAV_Charlie_Base { // Instructor
+class CAV_JM_INSTR : Cav_B_Charlie_base_F {
uniform[] = {"LOP_U_ISTS_Fatigue_19"};
headgear[] = {"DAR_JMCap_Blk"};
@@ -98,7 +98,7 @@ class CAV_JM_INSTR : CAV_Charlie_Base { // Instructor
(_this select 0) allowDamage false;";
};
-class CAV_SOI_STUD : CAV_Bravo_Base { // Rifleman
+class CAV_SOI_STUD : Cav_B_Bravo_base_F {
vest[] = {"rhsusf_iotv_ocp_Rifleman"};
backpack[] = {"B_Carryall_mcamo"};
@@ -119,7 +119,7 @@ class CAV_SOI_STUD : CAV_Bravo_Base { // Rifleman
// THE ARMOR SCHOOL
-class CAV_TAS_INSTR : CAV_Bravo_Base { // Instructor
+class CAV_TAS_INSTR : Cav_B_Bravo_base_F {
headgear[] = {"H_Cap_usblack"};
goggles[] = {"rhsusf_shemagh_od"};
@@ -173,7 +173,7 @@ class CAV_TAS_INSTR : CAV_Bravo_Base { // Instructor
(_this select 0) allowDamage false;";
};
-class CAV_TAS_STUD : CAV_Bravo_Base { // Crewman
+class CAV_TAS_STUD : Cav_B_Bravo_base_F {
headgear[] = {"rhsusf_cvc_green_helmet"};
goggles[] = {"rhsusf_shemagh_gogg_tan"};
vest[] = {"rhsusf_iotv_ocp_Repair"};
@@ -218,7 +218,7 @@ class CAV_TAS_STUD : CAV_Bravo_Base { // Crewman
// AVIATION CENTER OF EXCELLENCE
-class CAV_ACE_ROTARY_INSTR : CAV_Alpha_Base { // Rotary Instructor Pilots
+class CAV_ACE_ROTARY_INSTR : Cav_B_Alpha_base_F {
goggles[] = {"rhsusf_shemagh_od"};
backpack[] = {"B_Carryall_mcamo"};
@@ -231,7 +231,7 @@ class CAV_ACE_ROTARY_INSTR : CAV_Alpha_Base { // Rotary Instructor Pilots
(_this select 0) allowDamage false;";
};
-class CAV_ACE_ROTARY_STUD : CAV_Alpha_Base { // Rotary Instructor Pilots
+class CAV_ACE_ROTARY_STUD : Cav_B_Alpha_base_F {
backpack[] = {"B_Carryall_mcamo"};
headgear[] = {"rhsusf_hgu56p_visor_green"};
@@ -243,7 +243,7 @@ class CAV_ACE_ROTARY_STUD : CAV_Alpha_Base { // Rotary Instructor Pilots
(_this select 0) allowDamage false;";
};
-class CAV_ACE_FIXED_INSTR : CAV_Alpha_Base {
+class CAV_ACE_FIXED_INSTR : Cav_B_Alpha_base_F {
nvgs[] = {""};
backpack[] = {""};
@@ -292,7 +292,7 @@ class CAV_ACE_FIXED_INSTR : CAV_Alpha_Base {
(_this select 0) allowDamage false;";
};
-class CAV_ACE_FIXED_STUD : CAV_Alpha_Base {
+class CAV_ACE_FIXED_STUD : Cav_B_Alpha_base_F {
nvgs[] = {""};
backpack[] = {""};
diff --git a/cScripts/Loadouts/CfgLoadouts_UserCustom.hpp b/cScripts/Loadouts/CfgLoadouts_UserCustom.hpp
index 61f00b50e..410f1d7df 100644
--- a/cScripts/Loadouts/CfgLoadouts_UserCustom.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_UserCustom.hpp
@@ -1,4 +1,34 @@
/* This file is for mission makers to set up Custom Loadouts for players.
If you need help setting up the loadout vissit the link provided:
https://github.com/BaerMitUmlaut/Poppy#creating-basic-loadouts
+
+ Here is a copy paste friendly empty template:
+
+class My_Soldier_Classname_or_VariableName : CommonBlufor {
+ backpack[] = {""};
+ goggles[] = {""};
+ headgear[] = {""};
+ uniform[] = {""};
+ vest[] = {""};
+
+ primary[] = {""};
+ secondary[] = {""};
+ launcher[] = {""};
+
+ binoculars[] = {""};
+
+ magazines[] = {""};
+ items[] = {""};
+
+ compass[] = {"ItemCompass"};
+ gps[] = {""};
+ map[] = {"ItemMap"};
+ nvgs[] = {""};
+ watch[] = {"itemWatch"};
+
+ insignia[] = {""};
+ preLoadout = "";
+ postLoadout = "";
+};
+
*/