Merge branch 'main' of https://github.com/7Cav/cScripts into DEVGRU-V…

…iking
7Cav · May 28, 2024 · 1427404 · 1427404
2 parents 11fd607 + 3ab0d6d
commit 1427404
Show file tree

Hide file tree

Showing 64 changed files with 4,172 additions and 3,715 deletions.
diff --git a/Compositions/1.Cav_Viking_Platoon/composition.sqe b/Compositions/1.Cav_Viking_Platoon/composition.sqe
diff --git a/Compositions/2.Cav_Bandit_Platoon/composition.sqe b/Compositions/2.Cav_Bandit_Platoon/composition.sqe
diff --git a/Compositions/3.Cav_Misfit_Platoon/composition.sqe b/Compositions/3.Cav_Misfit_Platoon/composition.sqe
diff --git a/Compositions/4.ATLAS_Platoon/composition.sqe b/Compositions/4.ATLAS_Platoon/composition.sqe
diff --git a/Compositions/6.Cav_Rotary_Aviation/composition.sqe b/Compositions/6.Cav_Rotary_Aviation/composition.sqe
diff --git a/Compositions/7.Cav_Fixed_Wing_Aviation/composition.sqe b/Compositions/7.Cav_Fixed_Wing_Aviation/composition.sqe
diff --git a/cScripts/CfgFunctions.hpp b/cScripts/CfgFunctions.hpp
@@ -10,6 +10,7 @@ class cScripts {
         class init_staging {};
 
         class init_logistics {};
+        class init_pylons {};
 
         class init_diary {};
         class init_message {};
@@ -39,6 +40,7 @@ class cScripts {
     class logistics {
         file = "cScripts\functions\logistics";
         class addCargo {};
+        class setCargo {};
         class setCargoAttributes {};
         class checkItemValidity {};
         class createCargoCrate {};
@@ -79,8 +81,10 @@ class cScripts {
         class setRadioChannel {};
         class setActiveRadio {};
 
+        class player_getOrganization {};
         class player_getCompany {};
-        class player_setCompany {};
+        class player_getPlatoon {};
+        class player_setOrganization {};
 
         // Other Functions
         class unit_getVariables {};
@@ -186,7 +190,10 @@ class cScripts {
 
         class vehicle_applyLoadout {};
         class vehicle_addDefaultLoadout {};
-        class vehicle_getPylon {};
+
+        class vehicle_getPylonName {};
+        class vehicle_getPylonLoadout {};
+        class vehicle_getPylonIcon {};
 
         // Other
         class vehicle_reset {};
@@ -251,4 +258,4 @@ class cScripts {
         class testing_loadoutArrays {};
         class testing_equipmentUsed {};
     };
-};
+};
diff --git a/cScripts/Loadouts/CfgLoadouts_Alpha.hpp b/cScripts/Loadouts/CfgLoadouts_Alpha.hpp
@@ -2,23 +2,23 @@ class Cav_B_A_Officer_F: Cav_B_Alpha_base_F {
     displayName = "PEGASUS-6";
     category[] += {"cScripts_Loadout_Cat_Alpha_Leadership"};
     scope = 2;
-    loadout = [["rhs_weap_m4a1_blockII_grip2_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14],["kat_chestSeal",2],["kat_guedel",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",1,30]]],["USP_CRYE_JPC_ASLTB",[["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",8,30],["SmokeShell",4,1],["SmokeShellBlue",2,1],["HandGrenade",2,1]]],["USP_TACTICAL_PACK_CCT7",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["SmokeShellPurple",1,1],["SmokeShellRed",2,1],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
+    loadout = [["rhs_weap_m4a1_blockII_grip2_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x19_17Rnd",17],[],""],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14],["kat_chestSeal",2],["kat_guedel",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",1,30]]],["USP_CRYE_JPC_ASLTB",[["UK3CB_P320_9x19_17Rnd",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",8,30],["SmokeShell",4,1],["SmokeShellBlue",2,1],["HandGrenade",2,1]]],["USP_TACTICAL_PACK",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["SmokeShellPurple",1,1],["SmokeShellRed",2,1],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
     role = "officer";
 };
 
 class Cav_B_A_PltSgt_Local: Cav_B_Alpha_base_F {
     displayName = "PEGASUS-5";
     category[] += {"cScripts_Loadout_Cat_Alpha_Leadership"};
     scope = 2;
-    loadout = [["rhs_weap_m4a1_blockII_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14],["kat_chestSeal",2],["kat_guedel",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10]]],["USP_CRYE_JPC_ASLTB",[["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["SmokeShell",4,1],["SmokeShellBlue",2,1],["HandGrenade",2,1]]],["USP_TACTICAL_PACK_CCT7",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["SmokeShellPurple",1,1],["SmokeShellRed",2,1],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
+    loadout = [["rhs_weap_m4a1_blockII_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x19_17Rnd",17],[],""],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14],["kat_chestSeal",2],["kat_guedel",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10]]],["USP_CRYE_JPC_ASLTB",[["UK3CB_P320_9x19_17Rnd",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["SmokeShell",4,1],["SmokeShellBlue",2,1],["HandGrenade",2,1]]],["USP_TACTICAL_PACK",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["SmokeShellPurple",1,1],["SmokeShellRed",2,1],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
     role = "officer";
 };
 
 class Cav_B_A_AirController_F: Cav_B_Alpha_base_F {
     displayName = "FAC";
     category[] += {"cScripts_Loadout_Cat_Alpha_TACP"};
     scope = 2;
-    loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhs_weap_M320","","","",["ACE_HuntIR_M203",1],[],""],["USP_G3C_RS2_MC",[["ACE_tourniquet",4],["ItemcTabHCam",1],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_microDAGR",1],["ACE_splint",4],["ACE_Flashlight_XL50",1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["Laserbatteries",1,1]]],["rhsusf_plateframe_grenadier",[["ACE_packingBandage",20],["ACE_IR_Strobe_Item",2],["ItemAndroid",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["rhs_mag_M664_red_cluster",2,1],["1Rnd_SmokeRed_Grenade_shell",2,1],["1Rnd_SmokeBlue_Grenade_shell",2,1],["ACE_HuntIR_M203",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],["SmokeShellRed",2,1]]],["USP_TACTICAL_PACK_CCT2",[["Rev_darter_item",1],["ACE_HuntIR_monitor",1],["ACE_EntrenchingTool",1],["ACE_UAVBattery",1],[["ACE_Vector","","","",[],[],""],1]]],"rhsusf_opscore_mc_cover_pelt_cam","rhsusf_oakley_goggles_clr",["Laserdesignator","","","",["Laserbatteries",1],[],""],["ItemMap","B_UavTerminal","","ItemCompass","ItemWatch","USP_PVS15"]];
+    loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhs_weap_M320","","","",["ACE_HuntIR_M203",1],[],""],["USP_G3C_RS2_MC",[["ACE_tourniquet",4],["ItemcTabHCam",1],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_microDAGR",1],["ACE_splint",4],["ACE_Flashlight_XL50",1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["Laserbatteries",1,1]]],["rhsusf_plateframe_grenadier",[["ACE_packingBandage",20],["ACE_IR_Strobe_Item",2],["ItemAndroid",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["rhs_mag_M664_red_cluster",2,1],["1Rnd_SmokeRed_Grenade_shell",2,1],["1Rnd_SmokeBlue_Grenade_shell",2,1],["ACE_HuntIR_M203",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],["SmokeShellRed",2,1]]],["USP_TACTICAL_PACK",[["Rev_darter_item",1],["ACE_HuntIR_monitor",1],["ACE_EntrenchingTool",1],["ACE_UAVBattery",1],[["ACE_Vector","","","",[],[],""],1]]],"rhsusf_opscore_mc_cover_pelt_cam","rhsusf_oakley_goggles_clr",["Laserdesignator","","","",["Laserbatteries",1],[],""],["ItemMap","B_UavTerminal","","ItemCompass","ItemWatch","USP_PVS15"]];
     role = "officer";
 };
 
@@ -27,14 +27,14 @@ class Cav_B_A_DroneOperator_F: Cav_B_Alpha_base_F {
     category[] += {"cScripts_Loadout_Cat_Alpha_Leadership"};
     scope = 2;
     abilityEngineer = 1;
-    loadout = [["rhs_weap_m4a1_blockII_grip_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_tourniquet",4],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_microDAGR",1],["ACE_splint",4],["ACE_Flashlight_XL50",1],["ACE_Banana",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["Laserbatteries",1,1]]],["rhsusf_plateframe_teamleader",[["ACE_packingBandage",20],["ACE_IR_Strobe_Item",2],["ItemAndroid",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",8,30],["ACE_HandFlare_Green",2,1],["SmokeShell",4,1],["rhsusf_mag_17Rnd_9x19_JHP",1,17],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_EntrenchingTool",1],["ToolKit",1]]],"rhsusf_opscore_mc_cover_pelt_cam","rhsusf_oakley_goggles_clr",["ACE_Vector","","","",[],[],""],["ItemMap","B_UavTerminal","","ItemCompass","ItemWatch","NVGogglesB_blk_F"]];
+    loadout = [["rhs_weap_m4a1_blockII_grip_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x19_17Rnd",17],[],""],["USP_G3C_RS2_MC",[["ACE_tourniquet",4],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_microDAGR",1],["ACE_splint",4],["ACE_Flashlight_XL50",1],["ACE_Banana",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["Laserbatteries",1,1]]],["rhsusf_plateframe_teamleader",[["ACE_packingBandage",20],["ACE_IR_Strobe_Item",2],["ItemAndroid",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",8,30],["ACE_HandFlare_Green",2,1],["SmokeShell",4,1],["UK3CB_P320_9x19_17Rnd",1,17],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_EntrenchingTool",1],["ToolKit",1]]],"rhsusf_opscore_mc_cover_pelt_cam","rhsusf_oakley_goggles_clr",["ACE_Vector","","","",[],[],""],["ItemMap","B_UavTerminal","","ItemCompass","ItemWatch","NVGogglesB_blk_F"]];
     role = "officer";
 };
 // class Cav_B_A_JFO_F: Cav_B_Alpha_base_F {
 //     displayName = "Forward Air Controller";
 //     category[] += {"cScripts_Loadout_Cat_Alpha_Leadership"};
 //     scope = 2;
-//     loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhs_weap_M320","","","",["ACE_HuntIR_M203",1],[],""],["USP_G3C_RS2_MC",[["ACE_tourniquet",4],["ItemcTabHCam",1],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_microDAGR",1],["ACE_splint",4],["ACE_Flashlight_XL50",1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["Laserbatteries",1,1]]],["rhsusf_plateframe_grenadier",[["ACE_packingBandage",20],["ACE_IR_Strobe_Item",2],["rhs_mag_M664_red_cluster",2,1],["1Rnd_SmokeRed_Grenade_shell",2,1],["1Rnd_SmokeBlue_Grenade_shell"],2,1],["ACE_HuntIR_M203",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],["SmokeShellRed",2,1]]],["USP_TACTICAL_PACK_CCT7"],[["Rev_darter_item",1],["ACE_HuntIR_monitor",1],["ACE_EntrenchingTool",1],["ACE_UAVBattery",1],["Laserbatteries",1,1],[["ACE_Vector","","","",[],[],""],1]]],"rhsusf_opscore_mc_cover_pelt_cam","rhsusf_shemagh2_gogg_grn",["Laserdesignator","","","",["Laserbatteries",1],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS15"]];
+//     loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhs_weap_M320","","","",["ACE_HuntIR_M203",1],[],""],["USP_G3C_RS2_MC",[["ACE_tourniquet",4],["ItemcTabHCam",1],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_microDAGR",1],["ACE_splint",4],["ACE_Flashlight_XL50",1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["Laserbatteries",1,1]]],["rhsusf_plateframe_grenadier",[["ACE_packingBandage",20],["ACE_IR_Strobe_Item",2],["rhs_mag_M664_red_cluster",2,1],["1Rnd_SmokeRed_Grenade_shell",2,1],["1Rnd_SmokeBlue_Grenade_shell"],2,1],["ACE_HuntIR_M203",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],["SmokeShellRed",2,1]]],["USP_TACTICAL_PACK"],[["Rev_darter_item",1],["ACE_HuntIR_monitor",1],["ACE_EntrenchingTool",1],["ACE_UAVBattery",1],["Laserbatteries",1,1],[["ACE_Vector","","","",[],[],""],1]]],"rhsusf_opscore_mc_cover_pelt_cam","rhsusf_shemagh2_gogg_grn",["Laserdesignator","","","",["Laserbatteries",1],[],""],["ItemMap","ItemcTab","","ItemCompass","ItemWatch","USP_PVS15"]];
 //     role = "officer";
 // };