Adding Atlas and Refining Bravo

7Cav · Jul 12, 2024 · d7a937a · d7a937a
1 parent c3f64c2
commit d7a937a
Show file tree

Hide file tree

Showing 13 changed files with 342 additions and 62 deletions.
diff --git a/addons/infantry/CfgVehicles.hpp b/addons/infantry/CfgVehicles.hpp
@@ -203,7 +203,6 @@ class CfgVehicles {
         displayName = CSTRING(Cav_B_Machinegunner_F);
         author = ECSTRING(Main,ModTeam);
 
-        icon = "iconManLeader";
         role = "MachineGunner";
 
         weapons[] = {"rhs_weap_m240B","Throw","Put"};
@@ -379,6 +378,42 @@ class CfgVehicles {
 
         trait = "Medic";
     };
+    class Cav_B_MedicTeamLeader_F: Cav_B_Rifleman_F {
+        _generalMacro = "Cav_B_Medic_F";
+        scope = 2;
+        scopeCurator = 2;
+        displayName = CSTRING(Cav_B_MedicTeamLeader_F);
+        author = ECSTRING(Main,ModTeam);
+
+        icon = "iconManLeader";
+        role = "CombatLifeSaver";
+
+        trait = "Medic";
+    };
+    class Cav_B_MedicTeamMember_F: Cav_B_Rifleman_F {
+        _generalMacro = "Cav_B_MedicTeamMember_F";
+        scope = 2;
+        scopeCurator = 2;
+        displayName = CSTRING(Cav_B_MedicTeamMember_F);
+        author = ECSTRING(Main,ModTeam);
+
+        icon = "iconManMedic";
+        role = "CombatLifeSaver";
+
+        trait = "Medic";
+    };
+    class Cav_B_Surgeon_F: Cav_B_Rifleman_F {
+        _generalMacro = "Cav_B_Surgeon_F";
+        scope = 2;
+        scopeCurator = 2;
+        displayName = CSTRING(Cav_B_Surgeon_F);
+        author = ECSTRING(Main,ModTeam);
+
+        icon = "iconManMedic";
+        role = "CombatLifeSaver";
+
+        trait = "Medic";
+    };
     class Cav_B_CombatLifeSaver_F: Cav_B_Rifleman_F {
         _generalMacro = "Cav_B_CombatLifeSaver_F";
         scope = 2;

diff --git a/addons/infantry/config.cpp b/addons/infantry/config.cpp
@@ -17,6 +17,6 @@ class CfgPatches {
     };
 };
 
-#include "CfgEventHandlers.hpp"
+// #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
 #include "CfgGroups.hpp"
diff --git a/addons/infantry/stringtable.xml b/addons/infantry/stringtable.xml
@@ -96,6 +96,15 @@
         <Key ID="STR_cav_Infantry_Cav_B_Medic_F">
             <English>Medic</English>
         </Key>
+        <Key ID="STR_cav_Infantry_Cav_B_MedicTeamLeader_F">
+            <English>Team Leader</English>
+        </Key>
+        <Key ID="STR_cav_Infantry_Cav_B_MedicTeamMember_F">
+            <English>Team Member</English>
+        </Key>
+        <Key ID="STR_cav_Infantry_Cav_B_Surgeon_F">
+            <English>Team Surgeon</English>
+        </Key>
         <Key ID="STR_cav_Infantry_Cav_B_CombatLifeSaver_F">
             <English>Combat Life Saver</English>
         </Key>

diff --git a/addons/infantry_bravo/CfgEditorSubcategories.hpp b/addons/infantry_bravo/CfgEditorSubcategories.hpp
@@ -2,4 +2,7 @@ class CfgEditorSubcategories {
     class Cav_EdSubcat_Infantry_Bravo {
         displayname = CSTRING(Cav_EdSubcat_Infantry_Bravo); 
     };
+    class Cav_EdSubcat_Medical_Bravo {
+        displayname = CSTRING(Cav_EdSubcat_Medical_Bravo); 
+    };
 };
diff --git a/addons/infantry_bravo/CfgGroups.hpp b/addons/infantry_bravo/CfgGroups.hpp
@@ -6,6 +6,10 @@ class CfgGroups {
                 INFANTRY_GROUP_9(Cav_B_B_Group_Mechnaized_F,Cav_B_B_SquadLeader_F,Cav_B_B_FireTeamLeader_F,Cav_B_B_AutomaticRifleman_F,Cav_B_B_Grenadier_F,Cav_B_B_Rifleman_F,Cav_B_B_FireTeamLeader_F,Cav_B_B_AutomaticRifleman_F,Cav_B_B_Grenadier_F,Cav_B_B_CombatLifeSaver_F);
                 INFANTRY_TEAM_IFVCREW_2(Cav_B_B_Group_Mechnaized_Crew_F,Cav_B_B_IFV_Driver_F,Cav_B_B_IFV_Commander_F);
             };
+            class Cav_medical_bravo_squads_f {
+                name = CSTRING(Cav_medical_bravo_squads_f);
+                MEDIC_GROUP_4(Cav_B_B_Group_Medical_F,Cav_B_B_MedicTeamLeader_F,Cav_B_B_MedicTeamMember_F,Cav_B_B_MedicTeamMember_F,Cav_B_B_Surgeon_F);
+            };
         };
     };
 };
diff --git a/addons/infantry_bravo/CfgVehicles.hpp b/addons/infantry_bravo/CfgVehicles.hpp
@@ -30,8 +30,7 @@ class CfgVehicles {
 
         cav_company = "bravo";
     };
-
-
+
     class Cav_B_Rifleman_F;
     class Cav_B_B_Rifleman_F: Cav_B_Rifleman_F {
         _generalMacro = "Cav_B_B_Rifleman_F";
@@ -218,6 +217,40 @@ class CfgVehicles {
 
         cav_company = "bravo";
     };
+
+    class Cav_B_MedicTeamLeader_F;
+    class Cav_B_B_MedicTeamLeader_F: Cav_B_MedicTeamLeader_F {
+        _generalMacro = "Cav_B_B_MedicTeamLeader_F";
+        scope = 2;
+        scopeCurator = 2;
+
+        editorSubcategory = "Cav_EdSubcat_Medical_Bravo";
+
+        cav_company = "bravo";
+    };
+
+    class Cav_B_MedicTeamMember_F;
+    class Cav_B_B_MedicTeamMember_F: Cav_B_MedicTeamMember_F {
+        _generalMacro = "Cav_B_B_MedicTeamMember_F";
+        scope = 2;
+        scopeCurator = 2;
+
+        editorSubcategory = "Cav_EdSubcat_Medical_Bravo";
+
+        cav_company = "bravo";
+    };
+
+    class Cav_B_Surgeon_F;
+    class Cav_B_B_Surgeon_F: Cav_B_Surgeon_F {
+        _generalMacro = "Cav_B_B_Surgeon_F";
+        scope = 2;
+        scopeCurator = 2;
+
+        editorSubcategory = "Cav_EdSubcat_Medical_Bravo";
+
+        cav_company = "bravo";
+    };
+
     class Cav_B_CombatLifeSaver_F;
     class Cav_B_B_CombatLifeSaver_F: Cav_B_CombatLifeSaver_F {
         _generalMacro = "Cav_B_B_CombatLifeSaver_F";

diff --git a/addons/infantry_bravo/script_macros.hpp b/addons/infantry_bravo/script_macros.hpp
@@ -77,4 +77,36 @@
             side = 1; \
             vehicle = QUOTE(soldier2); \
         }; \
+    }
+
+#define MEDIC_GROUP_4(classname,soldier1,soldier2,soldier3,soldier4) \
+    class classname { \
+        name = CSTRING(classname); \
+        icon = "\A3\ui_f\data\map\markers\nato\b_mech_inf.paa"; \
+        faction = "cav_blu_usa_f"; \
+        side = 1; \
+        class Unit0 { \
+            position[] = {0, 0, 0}; \
+            rank = "SERGEANT"; \
+            side = 1; \
+            vehicle = QUOTE(soldier1); \
+        }; \
+        class Unit1 { \
+            position[] = {0.0, -1.0, 0.0}; \
+            rank = "PRIVATE"; \
+            side = 1; \
+            vehicle = QUOTE(soldier2); \
+        }; \
+        class Unit2 { \
+            position[] = {1.0, 0, 0}; \
+            rank = "PRIVATE"; \
+            side = 1; \
+            vehicle = QUOTE(soldier1); \
+        }; \
+        class Unit3 { \
+            position[] = {1.0, -1.0, 0.0}; \
+            rank = "PRIVATE"; \
+            side = 1; \
+            vehicle = QUOTE(soldier2); \
+        }; \
     }
diff --git a/addons/infantry_bravo/stringtable.xml b/addons/infantry_bravo/stringtable.xml
@@ -1,13 +1,22 @@
 <Project name="cav">
     <Package name="Infantry_Bravo">
+        <Key ID="STR_cav_Infantry_Bravo_Cav_EdSubcat_Medical_Bravo">
+            <English>Men (Support)</English>
+        </Key>
         <Key ID="STR_cav_Infantry_Bravo_Cav_EdSubcat_Infantry_Bravo">
             <English>Men (Mechanized)</English>
         </Key>
 
         <!-- Groups -->
+        <Key ID="STR_cav_Infantry_Bravo_Cav_medical_bravo_squads_f">
+            <English>Men (Medical)</English>
+        </Key>
         <Key ID="STR_cav_Infantry_Bravo_Cav_infantry_bravo_squads_f">
             <English>Men (Mechanized)</English>
         </Key>
+        <Key ID="STR_cav_Infantry_Bravo_Cav_B_B_Group_Medical_F">
+            <English>Generic Medical Team</English>
+        </Key>
         <Key ID="STR_cav_Infantry_Bravo_Cav_B_B_Group_Mechnaized_F">
             <English>Generic Infantry Squad (Mec)</English>
         </Key>

diff --git a/addons/infantry_bravo_labeled/CfgEditorSubcategories.hpp b/addons/infantry_bravo_labeled/CfgEditorSubcategories.hpp
@@ -2,4 +2,7 @@ class CfgEditorSubcategories {
     class Cav_EdSubcat_Infantry_Bravo_Labeled {
         displayname = CSTRING(Cav_EdSubcat_Infantry_Bravo_Labeled); 
     };
+    class Cav_EdSubcat_Medical_Bravo_Labeled {
+        displayname = CSTRING(Cav_EdSubcat_Medical_Bravo_Labeled); 
+    };
 };
diff --git a/addons/infantry_bravo_labeled/CfgGroups.hpp b/addons/infantry_bravo_labeled/CfgGroups.hpp
@@ -2,24 +2,30 @@ class CfgGroups {
     class West {
         class cav_blu_usa_f {
             class cav_infantry_bravo_squads_f {
-
-                INFANTRY_UNIT_RANKED_1(Cav_B_B_Group_2_5_F,Cav_B_B_PlatoonSergeant_2_5_F,LIEUTENANT);
                 INFANTRY_UNIT_RANKED_1(Cav_B_B_Group_2_6_F,Cav_B_B_PlatoonLeader_2_6_F,CAPTAIN);
                 INFANTRY_UNIT_MEDIC_1(Cav_B_B_Group_2_7_F,Cav_B_B_PlatoonMedic_2_7_F);
 
                 INFANTRY_GROUP_9(Cav_B_B_Group_2_1_F,Cav_B_B_SquadLeader_2_1_F,Cav_B_B_FireTeamLeader_2_1_A_F,Cav_B_B_AutomaticRifleman_2_1_A_F,Cav_B_B_Grenadier_2_1_A_F,Cav_B_B_Rifleman_2_1_A_F,Cav_B_B_FireTeamLeader_2_1_B_F,Cav_B_B_AutomaticRifleman_2_1_B_F,Cav_B_B_Grenadier_2_1_B_F,Cav_B_B_CombatLifeSaver_2_1_B_F);
                 INFANTRY_GROUP_9(Cav_B_B_Group_2_2_F,Cav_B_B_SquadLeader_2_2_F,Cav_B_B_FireTeamLeader_2_2_A_F,Cav_B_B_AutomaticRifleman_2_2_A_F,Cav_B_B_Grenadier_2_2_A_F,Cav_B_B_Rifleman_2_2_A_F,Cav_B_B_FireTeamLeader_2_2_B_F,Cav_B_B_AutomaticRifleman_2_2_B_F,Cav_B_B_Grenadier_2_2_B_F,Cav_B_B_CombatLifeSaver_2_2_B_F);
                 INFANTRY_GROUP_9(Cav_B_B_Group_2_3_F,Cav_B_B_SquadLeader_2_3_F,Cav_B_B_FireTeamLeader_2_3_A_F,Cav_B_B_AutomaticRifleman_2_3_A_F,Cav_B_B_Grenadier_2_3_A_F,Cav_B_B_Rifleman_2_3_A_F,Cav_B_B_FireTeamLeader_2_3_B_F,Cav_B_B_AutomaticRifleman_2_3_B_F,Cav_B_B_Grenadier_2_3_B_F,Cav_B_B_CombatLifeSaver_2_3_B_F);
-                INFANTRY_GROUP_9(Cav_B_B_Group_2_4_F,Cav_B_B_SquadLeader_2_4_F,Cav_B_B_FireTeamLeader_2_4_A_F,Cav_B_B_AutomaticRifleman_2_4_A_F,Cav_B_B_Grenadier_2_4_A_F,Cav_B_B_Rifleman_2_4_A_F,Cav_B_B_FireTeamLeader_2_4_B_F,Cav_B_B_AutomaticRifleman_2_4_B_F,Cav_B_B_Grenadier_2_4_B_F,Cav_B_B_CombatLifeSaver_2_4_B_F);
+                // INFANTRY_GROUP_9(Cav_B_B_Group_2_4_F,Cav_B_B_SquadLeader_2_4_F,Cav_B_B_FireTeamLeader_2_4_A_F,Cav_B_B_AutomaticRifleman_2_4_A_F,Cav_B_B_Grenadier_2_4_A_F,Cav_B_B_Rifleman_2_4_A_F,Cav_B_B_FireTeamLeader_2_4_B_F,Cav_B_B_AutomaticRifleman_2_4_B_F,Cav_B_B_Grenadier_2_4_B_F,Cav_B_B_CombatLifeSaver_2_4_B_F);
+                INFANTRY_GROUP_9(Cav_B_B_Group_2_4_F,Cav_B_B_SquadLeader_2_4_F,Cav_B_B_FireTeamLeader_2_4_A_F,Cav_B_B_MachineGunner_2_4_A_F,Cav_B_B_AssistantMachineGunner_2_4_A_F,Cav_B_B_FireTeamLeader_2_4_B_F,Cav_B_B_MachineGunner_2_4_B_F,Cav_B_B_AssistantMachineGunner_2_4_B_F,Cav_B_B_RiflemanAT_2_4_C_F,Cav_B_B_RiflemanATAssistant_2_4_C_F);
 
-                INFANTRY_TEAM_IFVCREW_1(Cav_B_B_Group_Crew_2_5_F,Cav_B_B_IFV_Driver_2_5_F);
+                INFANTRY_TEAM_IFVSTAFF_2(Cav_B_B_Group_2_5_F,Cav_B_B_PlatoonSergeant_2_5_F,Cav_B_B_IFV_Driver_2_5_F,LIEUTENANT);
                 INFANTRY_TEAM_IFVSTAFF_2(Cav_B_B_Group_Crew_2_6_F,Cav_B_B_IFV_Commander_2_6_F,Cav_B_B_IFV_Driver_2_6_F,CAPTAIN);
 
                 INFANTRY_TEAM_IFVCREW_2(Cav_B_B_Group_Crew_2_1_F,Cav_B_B_IFV_Commander_2_1_F,Cav_B_B_IFV_Driver_2_1_F);
                 INFANTRY_TEAM_IFVCREW_2(Cav_B_B_Group_Crew_2_2_F,Cav_B_B_IFV_Commander_2_2_F,Cav_B_B_IFV_Driver_2_2_F);
                 INFANTRY_TEAM_IFVCREW_2(Cav_B_B_Group_Crew_2_3_F,Cav_B_B_IFV_Commander_2_3_F,Cav_B_B_IFV_Driver_2_3_F);
                 INFANTRY_TEAM_IFVCREW_2(Cav_B_B_Group_Crew_2_4_F,Cav_B_B_IFV_Commander_2_4_F,Cav_B_B_IFV_Driver_2_4_F);
             };
+            class cav_medical_bravo_squads_f {
+                INFANTRY_UNIT_RANKED_1(Cav_B_B_Group_1_5_F,Cav_B_B_PlatoonSergeant_1_5_F,LIEUTENANT);
+                INFANTRY_UNIT_RANKED_1(Cav_B_B_Group_1_6_F,Cav_B_B_PlatoonLeader_1_6_F,CAPTAIN);
+
+                INFANTRY_UNIT_MEDIC_4(Cav_B_B_Group_1_1_F,Cav_B_B_MedicTeamLeader_1_1_F,Cav_B_B_MedicTeamMember_1_1_F,Cav_B_B_MedicTeamMember_1_1_F,Cav_B_B_Surgeon_1_1_F);
+                INFANTRY_UNIT_MEDIC_4(Cav_B_B_Group_1_2_F,Cav_B_B_MedicTeamLeader_1_2_F,Cav_B_B_MedicTeamMember_1_2_F,Cav_B_B_MedicTeamMember_1_2_F,Cav_B_B_Surgeon_1_2_F);
+            };
         };
     };
 };