Ajout: massive cleanup

maxcloutier13 · Sep 3, 2023 · 8aab8f7 · 8aab8f7
1 parent eb9a556
commit 8aab8f7
Show file tree

Hide file tree

Showing 80 changed files with 30 additions and 2,222 deletions.
diff --git a/cfg_containers.cpp b/cfg_containers.cpp
@@ -1997,18 +1997,3 @@ class cgqc_box_mk2_diving : Box_NATO_Equip_F
         init = "[_this, 'dive'] call CGQC_fnc_loadMk3Menu";
     };
 };
-// Mk2 Cargo container
-class cgqc_box_mk2_cargo : Land_Cargo10_military_green_F
-{
-    scope = 2;
-    author = "silent1";
-    _generalMacro = "cgqc_box_mk2_cargo";
-    displayName = "CGQC MK2 Cargo Container";
-    model = "\cgqc_2022\containers\cgqc_box_cargo.p3d";
-    ace_cargo_canLoad = 0;  // Enables the object to be loaded (1-yes, 0-no)
-    ace_cargo_noRename = 1;
-    class EventHandlers
-    {
-        init = "_this execVM '\CGQC_2022\loadouts\cgqc_box_mk2_cargo.sqf'";
-    };
-};
diff --git a/cfg_patches.cpp b/cfg_patches.cpp
@@ -41,8 +41,6 @@ class CfgPatches
 			"cgqc_box_mk2_arsenal_old",
 			"cgqc_box_mk2_parachute",
 			"cgqc_box_mk2_diving",
-			"cgqc_box_mk2_cargo",
-			"cgqc_box_mk1_cargo",
 			"cgqc_box_mk2_stash",
 			"CGQC_units_mk1_0_HQ_pack",
 			"CGQC_units_mk1_0_TeamLeader_Carbine_pack",
@@ -64,7 +62,7 @@ class CfgPatches
 			"CGQC_units_mk1_4_crew_heli_pack",
 			"cgqc_soldat_moderne",
 			"CGQC_officer_moderne",
-			"cgqc_officer_1_moderne",			
+			"cgqc_officer_1_moderne",
 			"cgqc_pack_mk1_kitbag",
 			"cgqc_pack_mk1_kitbag_desert",
 			"cgqc_pack_mk1_kitbag_mcam",

diff --git a/cfg_units_mk1.cpp b/cfg_units_mk1.cpp
@@ -20,6 +20,26 @@ class CGQC_units_mk1_0_HQ : cgqc_soldat_moderne
     backpack = "CGQC_units_mk1_0_HQ_pack";
     editorPreview = "\CGQC_2022\pics\CGQC_units_mk1_0_HQ.jpg";
 };
+class CGQC_units_mk1_0_SL : cgqc_soldat_moderne
+{
+    faction = "CGQC";
+    editorSubcategory = "EdSubcat_cgqc_mk1";
+    side = 1;
+    scope = 2;
+    scopeCurator = 2;
+    displayName = "Squad Lea";
+    uniformClass = "cgqc_uniform_mk1";
+    weapons[] = {"cgqc_gun_mk1_hq_m4a1", "cgqc_gun_glock19_wood", "Laserdesignator_01_khk_F", "Put", "Throw"};
+    respawnWeapons[] = {"cgqc_gun_mk1_hq_m4a1", "cgqc_gun_glock19_wood", "Laserdesignator_01_khk_F", "Put", "Throw"};
+    items[] = {};
+    respawnItems[] = {};
+    magazines[] = {};
+    respawnMagazines[] = {};
+    linkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "B_UavTerminal", "JAS_GPNVG18_blk", "Laserdesignator_01_khk_F", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan", "G_mas_can_shemag_gog_l"};
+    respawnLinkedItems[] = {"ItemMap", "ItemCompass", "ItemWatch", "B_UavTerminal", "JAS_GPNVG18_blk", "Laserdesignator_01_khk_F", "cgqc_helmet_mk1", "cgqc_vest_mk1_tan", "G_mas_can_shemag_gog_l"};
+    backpack = "CGQC_units_mk1_0_HQ_pack";
+    editorPreview = "\CGQC_2022\pics\CGQC_units_mk1_0_HQ.jpg";
+};
 class CGQC_units_mk1_0_TeamLeader_Carbine : cgqc_soldat_moderne
 {
     faction = "CGQC";
@@ -650,25 +670,25 @@ class CGQC_units_mk2_Tank_Crew_ai : cgqc_soldat_moderne
 class CGQC_units_mk1_5_Diver_TL : CGQC_units_mk1_0_TeamLeader_Carbine
 {
     editorSubcategory = "EdSubcat_cgqc_mk1";
-    displayName = "Plongeur (TL)";
+    displayName = "Diver (TL)";
     uniformClass = "cgqc_uniform_mk1";
 };
 class CGQC_units_mk1_5_Diver_sniper : CGQC_units_mk1_2_Sniper_ebr
 {
     editorSubcategory = "EdSubcat_cgqc_mk1";
-    displayName = "Plongeur (Sniper)";
+    displayName = "Diver (Sniper)";
     uniformClass = "cgqc_uniform_mk1";
 };
 class CGQC_units_mk1_5_Diver_Spotter : CGQC_units_mk1_2_Spotter
 {
     editorSubcategory = "EdSubcat_cgqc_mk1";
-    displayName = "Plongeur (Spotter)";
+    displayName = "Diver (Spotter)";
     uniformClass = "cgqc_uniform_mk1";
 };
 class CGQC_units_mk1_5_Diver_Engineer : CGQC_units_mk1_1_Engineer
 {
     editorSubcategory = "EdSubcat_cgqc_mk1";
-    displayName = "Plongeur (Saboteur)";
+    displayName = "Diver (Saboteur)";
     uniformClass = "cgqc_uniform_mk1";
 };
 

diff --git a/factions/init_player.sqf b/factions/init_player.sqf
@@ -1,4 +1,4 @@
-[] spawn { 
+[] spawn {
     // Wait until Core is finished initializing.
     waitUntil {sleep 1;cgqc_player_rank_found};
 
@@ -21,115 +21,10 @@
     cgqc_mk2_arsenal_4 = [];
     cgqc_mk2_arsenal_5 = [];
     cgqc_mk2_arsenal_8 = [];
-    
+
     // Prep les variables de l'arsenal dynamique
     #include "\cgqc_2022\loadouts\arsenal\init_arsenal.sqf";
 
-    _unit = typeOf player;
-    switch (_unit) do {
-        // == Training ================================================================
-        case "cgqc_soldat_moderne";
-        case "cgqc_officer_moderne": {
-            [] spawn CGQC_fnc_initTraining;
-        };
-        // == Command ================================================================
-        case "CGQC_units_mk1_0_HQ":{
-            ["hq", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_0_TeamLeader_Carbine":{
-            ["tl_carb", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_0_TeamLeader_CQB":{
-            ["tl_cqb", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_0_TeamLeader_noGL":{
-            ["tl_no_gl", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        // == Infantry ================================================================
-        case "CGQC_units_mk1_1_Rifleman_CQB":{
-            ["rifle_cqb", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_1_Rifleman_Carbine":{
-            ["rifle_carb", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_1_Rifleman_full":{
-            ["rifle_m16", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_1_Rifleman_grenadier":{
-            ["rifle_grenade", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        // == Specialists ================================================================
-        case "CGQC_units_mk1_3_AT_MAAWS":{
-            ["at_maaws", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_3_AT_Javelin":{
-            ["at_jav", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_2_LMG":{
-            ["lmg", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_2_HMG":{
-            ["hmg", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_1_Engineer":{
-            ["eng", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_1_Medic":{
-            ["med", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_2_Marksman":{
-            ["mrksm", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        // == Recon ================================================================
-        case "CGQC_units_mk1_0_Drone_operator":{
-            ["drone", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_0_JTAC":{
-            ["jtac", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_2_Sniper":{
-            ["sniper", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_2_Sniper_ebr":{
-            ["sniper_ebr", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_2_Spotter":{
-            ["spotter", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        // == Pilots ================================================================
-        case "CGQC_units_mk1_4_Pilot_heli":{
-            ["heli", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_4_crew_heli":{
-            ["heli_crew", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        //case "CGQC_units_mk1_4_Pilot_Jet":{
-        //    ["", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        //};
-        // == Drivers ================================================================
-        case "CGQC_units_mk1_4_Tank_Driver":{
-            ["driver", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        case "CGQC_units_mk1_4_Tank_Crew":{
-            ["tank_crew", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-        };
-        // == Divers ================================================================
-        case "CGQC_units_mk1_5_Diver_TL":{
-            ["tl_carb", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-            ["diver", true] execVM "\CGQC_2022\loadouts\mk1_camo_switch.sqf"
-        };
-        case "CGQC_units_mk1_5_Diver_sniper":{
-            ["sniper_ebr", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";            
-            ["diver", true] execVM "\CGQC_2022\loadouts\mk1_camo_switch.sqf"
-        };
-        case "CGQC_units_mk1_5_Diver_Spotter":{
-            ["spotter", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-            ["diver", true] execVM "\CGQC_2022\loadouts\mk1_camo_switch.sqf"
-        };
-        case "CGQC_units_mk1_5_Diver_Engineer":{
-            ["eng", 1, true] execVM "\CGQC_2022\loadouts\mk2_role_switch.sqf";
-            ["diver", true] execVM "\CGQC_2022\loadouts\mk1_camo_switch.sqf"
-        };
-    };
-};
-
+    // Check if loadout exists and loads it
+    [] call CGQC_fnc_checkLoadout;
+};