From 251b45c70407f96315fe025114e33337fdff6ba3 Mon Sep 17 00:00:00 2001
From: AndreasBrostrom <andreas.brostrom.ce@gmail.com>
Date: Mon, 20 May 2024 14:02:29 +0200
Subject: [PATCH] Updated charlie to mirror mod updates

---
 cScripts/Loadouts/CfgLoadouts_Charlie.hpp     | 46 +++++++++----------
 .../Loadouts/CfgLoadouts_Charlie_Labeled.hpp  | 16 ++++---
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/cScripts/Loadouts/CfgLoadouts_Charlie.hpp b/cScripts/Loadouts/CfgLoadouts_Charlie.hpp
index 93b1dedfa..30a5d82bd 100644
--- a/cScripts/Loadouts/CfgLoadouts_Charlie.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_Charlie.hpp
@@ -2,17 +2,17 @@ class Cav_B_C_Officer_F: Cav_B_Charlie_base_F { // Not used (scope 0)
     scope = 0;
     category[] += {"cScripts_Loadout_Cat_Charlie_Leadership"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
-    equipmentTags[] += {"coll_weapons_sidearms"};
+    equipmentTags[] += {};
 };
 class Cav_B_C_PlatoonSergeant_F: Cav_B_C_Officer_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Leadership"};
+    //category[] += {"cScripts_Loadout_Cat_Charlie_Leadership"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] += {};
 };
 class Cav_B_C_PlatoonLeader_F: Cav_B_C_Officer_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Leadership"};
+    //category[] += {"cScripts_Loadout_Cat_Charlie_Leadership"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] += {};
 };
@@ -49,33 +49,33 @@ class Cav_B_C_AssistantAutomaticRifleman_F: Cav_B_Charlie_base_F { // Not used (
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] += {};
 };
-class Cav_B_C_Grenadier_F: Cav_B_Charlie_base_F {
+class Cav_B_C_MachineGunner_F: Cav_B_Charlie_base_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
+    category[] += {"cScripts_Loadout_Cat_Charlie_Weapons"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] += {};
 };
-class Cav_B_C_RiflemanLAT_F: Cav_B_Charlie_base_F {
+class Cav_B_C_AssistantMachineGunner_F: Cav_B_Charlie_base_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
+    category[] += {"cScripts_Loadout_Cat_Charlie_Weapons"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] += {};
 };
-
-class Cav_B_C_MachineGunner_F: Cav_B_Charlie_base_F {
+class Cav_B_C_Grenadier_F: Cav_B_Charlie_base_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Weapons"};
+    category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] += {};
 };
-class Cav_B_C_AssistantMachineGunner_F: Cav_B_Charlie_base_F {
+class Cav_B_C_RiflemanLAT_F: Cav_B_Charlie_base_F {
     scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Weapons"};
+    category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] += {};
 };
-class Cav_B_C_RiflemanAT_F: Cav_B_Charlie_base_F {
-    scope = 2;
+
+class Cav_B_C_RiflemanAT_F: Cav_B_Charlie_base_F { // Not used (scope 0)
+    scope = 0;
     category[] += {"cScripts_Loadout_Cat_Charlie_Weapons"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
     equipmentTags[] += {};
@@ -119,24 +119,24 @@ class Cav_B_C_Marksman_F: Cav_B_Charlie_base_F {
 };
 
 
+class Cav_B_C_PlatoonMedic_F: Cav_B_Charlie_base_F {
+    scope = 2;
+    category[] += {"cScripts_Loadout_Cat_Charlie_Leadership"};
+    loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
+    equipmentTags[] += {};
+    abilityMedic = 2;
+};
 class Cav_B_C_Medic_F: Cav_B_Charlie_base_F { // Not used (scope 0)
     scope = 0;
     category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
-    equipmentTags[] += {"equ_medical_level_2"};
+    equipmentTags[] += {};
     abilityMedic = 3;
 };
-class Cav_B_C_PlatoonMedic_F: Cav_B_Charlie_base_F {
-    scope = 2;
-    category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
-    loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
-    equipmentTags[] += {"equ_medical_level_2"};
-    abilityMedic = 2;
-};
 class Cav_B_C_CombatLifeSaver_F: Cav_B_Charlie_base_F {
     scope = 2;
     category[] += {"cScripts_Loadout_Cat_Charlie_Squad"};
     loadout = [[],[],[],[],[],[],"","",[],["","","","","",""]];
-    equipmentTags[] += {"equ_medical_level_1"};
+    equipmentTags[] += {};
     abilityMedic = 1;
 };
\ No newline at end of file
diff --git a/cScripts/Loadouts/CfgLoadouts_Charlie_Labeled.hpp b/cScripts/Loadouts/CfgLoadouts_Charlie_Labeled.hpp
index ebe659631..0f49899ba 100644
--- a/cScripts/Loadouts/CfgLoadouts_Charlie_Labeled.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_Charlie_Labeled.hpp
@@ -249,9 +249,8 @@ class Cav_B_C_AssistantMachineGunner_1_4_A_F: Cav_B_C_AssistantMachineGunner_F {
 class Cav_B_C_FireTeamLeader_1_4_B_F: Cav_B_C_FireTeamLeader_F {
     scope = 1;
     platoon = 1;
-    squad = 4;
-    team = "alpha";
-    insignia = "cav_insignia_charlie_1_4";
+    squad = 5;
+    insignia = "cav_insignia_charlie_1";
 };
 class Cav_B_C_MachineGunner_1_4_B_F: Cav_B_C_MachineGunner_F {
     scope = 1;
@@ -264,7 +263,14 @@ class Cav_B_C_AssistantMachineGunner_1_4_B_F: Cav_B_C_AssistantMachineGunner_F {
     scope = 1;
     platoon = 1;
     squad = 4;
-    team = "bravo";
+    team = "charlie";
+    insignia = "cav_insignia_charlie_1_4";
+};
+class Cav_B_C_RiflemanATAssistant_1_4_C_F: Cav_B_C_RiflemanATAssistant_F {
+    scope = 1;
+    platoon = 1;
+    squad = 4;
+    team = "charlie";
     insignia = "cav_insignia_charlie_1_4";
 };
 
@@ -284,8 +290,6 @@ class Cav_B_C_RiflemanATAssistant_1_4_C_F: Cav_B_C_RiflemanATAssistant_F {
 };
 
 
-
-
 // Second Platoon
 class Cav_B_C_PlatoonSergeant_2_5_F: Cav_B_C_PlatoonSergeant_F {
     scope = 1;