Renames and added engineers

7Cav · Jul 12, 2024 · 1a00913 · 1a00913
1 parent 6b21ae0
commit 1a00913
Show file tree

Hide file tree

Showing 14 changed files with 225 additions and 69 deletions.
diff --git a/addons/infantry/CfgVehicles.hpp b/addons/infantry/CfgVehicles.hpp
@@ -452,6 +452,16 @@ class CfgVehicles {
         author = ECSTRING(Main,ModTeam);
     };
 
+    // Engineers
+    class Cav_B_Engineer_F: Cav_B_Rifleman_F {
+        _generalMacro = "Cav_B_Engineer_F";
+        scope = 2;
+        scopeCurator = 2;
+        displayName = CSTRING(Cav_B_Engineer_F);
+        author = ECSTRING(Main,ModTeam);
+
+        icon = "iconManEngineer";
+    };
 
     // Medical personal
     class Cav_B_PlatoonMedic_F: Cav_B_Officer_F {

diff --git a/addons/infantry_alpha_labeled/stringtable.xml b/addons/infantry_alpha_labeled/stringtable.xml
@@ -5,13 +5,13 @@
         </Key>
 
         <Key ID="STR_cav_Infantry_Alpha_Labeled_Cav_B_A_JTAC_1_F">
-            <English>JTAC (CALLSIGN-1)</English>
+            <English>Alpha JTAC (CALLSIGN-1)</English>
         </Key>
         <Key ID="STR_cav_Infantry_Alpha_Labeled_Cav_B_A_JTAC_2_F">
-            <English>JTAC (CALLSIGN-2)</English>
+            <English>Alpha JTAC (CALLSIGN-2)</English>
         </Key>
         <Key ID="STR_cav_Infantry_Alpha_Labeled_Cav_B_A_TACP_1_F">
-            <English>TACP (CALLSIGN-1)</English>
+            <English>Alpha TACP (CALLSIGN-1)</English>
         </Key>
 
     </Package>

diff --git a/addons/infantry_bravo/CfgEditorSubcategories.hpp b/addons/infantry_bravo/CfgEditorSubcategories.hpp
@@ -2,7 +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); 
+    class Cav_EdSubcat_Support_Bravo {
+        displayname = CSTRING(Cav_EdSubcat_Support_Bravo); 
     };
 };
diff --git a/addons/infantry_bravo/CfgGroups.hpp b/addons/infantry_bravo/CfgGroups.hpp
@@ -6,9 +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_Commander_F,Cav_B_B_IFV_Driver_F);
             };
-            class Cav_medical_bravo_squads_f {
-                name = CSTRING(Cav_medical_bravo_squads_f);
+            class Cav_support_bravo_squads_f {
+                name = CSTRING(Cav_support_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);
+                ENGINEER_GROUP_4(Cav_B_B_Group_Engineer_F,Cav_B_B_EngineerTeamLeader_F,Cav_B_B_EngineerTeamMember_F,Cav_B_B_EngineerTeamMember_F,Cav_B_B_EngineerTeamMember_F);
             };
         };
     };

diff --git a/addons/infantry_bravo/CfgVehicles.hpp b/addons/infantry_bravo/CfgVehicles.hpp
@@ -195,6 +195,38 @@ class CfgVehicles {
         cav_company = "bravo";
     };
 
+    // Engineers
+    class Cav_B_Engineer_F;
+    class Cav_B_B_Engineer_F: Cav_B_Engineer_F {
+        _generalMacro = "Cav_B_B_Engineer_F";
+        scope = 2;
+        scopeCurator = 2;
+
+        editorSubcategory = "Cav_EdSubcat_Infantry_Bravo";
+
+        cav_company = "bravo";
+    };
+    class Cav_B_B_EngineerTeamLeader_F: Cav_B_B_Engineer_F {
+        _generalMacro = "Cav_B_B_EngineerTeamLeader_F";
+        scope = 2;
+        scopeCurator = 2;
+        displayName = CSTRING(Cav_B_B_EngineerTeamLeader_F);
+
+        editorSubcategory = "Cav_EdSubcat_Support_Bravo";
+
+        cav_company = "bravo";
+    };
+    class Cav_B_B_EngineerTeamMember_F: Cav_B_B_Engineer_F {
+        _generalMacro = "Cav_B_B_EngineerTeamMember_F";
+        scope = 2;
+        scopeCurator = 2;
+        displayName = CSTRING(Cav_B_B_EngineerTeamMember_F);
+
+        editorSubcategory = "Cav_EdSubcat_Support_Bravo";
+
+        cav_company = "bravo";
+    };
+
 
     // Medical personal
     class Cav_B_PlatoonMedic_F;
@@ -222,8 +254,9 @@ class CfgVehicles {
         _generalMacro = "Cav_B_B_MedicTeamLeader_F";
         scope = 2;
         scopeCurator = 2;
+        displayName = CSTRING(Cav_B_B_MedicTeamLeader_F);
 
-        editorSubcategory = "Cav_EdSubcat_Medical_Bravo";
+        editorSubcategory = "Cav_EdSubcat_Support_Bravo";
 
         cav_company = "bravo";
     };
@@ -232,8 +265,9 @@ class CfgVehicles {
         _generalMacro = "Cav_B_B_MedicTeamMember_F";
         scope = 2;
         scopeCurator = 2;
+        displayName = CSTRING(Cav_B_B_MedicTeamMember_F);
 
-        editorSubcategory = "Cav_EdSubcat_Medical_Bravo";
+        editorSubcategory = "Cav_EdSubcat_Support_Bravo";
 
         cav_company = "bravo";
     };
@@ -244,7 +278,7 @@ class CfgVehicles {
         scope = 2;
         scopeCurator = 2;
 
-        editorSubcategory = "Cav_EdSubcat_Medical_Bravo";
+        editorSubcategory = "Cav_EdSubcat_Support_Bravo";
 
         cav_company = "bravo";
     };

diff --git a/addons/infantry_bravo/script_macros.hpp b/addons/infantry_bravo/script_macros.hpp
@@ -82,7 +82,38 @@
 #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"; \
+        icon = "\A3\ui_f\data\map\markers\nato\b_med.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); \
+        }; \
+    }
+#define ENGINEER_GROUP_4(classname,soldier1,soldier2,soldier3,soldier4) \
+    class classname { \
+        name = CSTRING(classname); \
+        icon = "\A3\ui_f\data\map\markers\nato\b_maint.paa"; \
         faction = "cav_blu_usa_f"; \
         side = 1; \
         class Unit0 { \

diff --git a/addons/infantry_bravo/stringtable.xml b/addons/infantry_bravo/stringtable.xml
@@ -1,27 +1,47 @@
 <Project name="cav">
     <Package name="Infantry_Bravo">
-        <Key ID="STR_cav_Infantry_Bravo_Cav_EdSubcat_Medical_Bravo">
+        <Key ID="STR_cav_Infantry_Bravo_Cav_EdSubcat_Support_Bravo">
             <English>Men (Support)</English>
         </Key>
         <Key ID="STR_cav_Infantry_Bravo_Cav_EdSubcat_Infantry_Bravo">
             <English>Men (Mechanized)</English>
         </Key>
 
+        <!-- Units -->
+        <Key ID="STR_cav_Infantry_Bravo_Cav_B_B_EngineerTeamLeader_F">
+            <English>Engineer Team Leader</English>
+        </Key>
+        <Key ID="STR_cav_Infantry_Bravo_Cav_B_B_EngineerTeamMember_F">
+            <English>Engineer Team Member</English>
+        </Key>
+        <Key ID="STR_cav_Infantry_Bravo_Cav_B_B_MedicTeamLeader_F">
+            <English>Medic Team Leader</English>
+        </Key>
+        <Key ID="STR_cav_Infantry_Bravo_Cav_B_B_MedicTeamMember_F">
+            <English>Medic Team Member</English>
+        </Key>
+
+
         <!-- Groups -->
-        <Key ID="STR_cav_Infantry_Bravo_Cav_medical_bravo_squads_f">
-            <English>Men (Medical)</English>
+        <Key ID="STR_cav_Infantry_Bravo_Cav_support_bravo_squads_f">
+            <English>Men (Support)</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>
+            <English>Medical Team</English>
+        </Key>
+        <Key ID="STR_cav_Infantry_Bravo_Cav_B_B_Group_Engineer_F">
+            <English>Engineer Team</English>
         </Key>
         <Key ID="STR_cav_Infantry_Bravo_Cav_B_B_Group_Mechnaized_F">
-            <English>Generic Infantry Squad (Mec)</English>
+            <English>Infantry Squad (Mec)</English>
         </Key>
         <Key ID="STR_cav_Infantry_Bravo_Cav_B_B_Group_Mechnaized_Crew_F">
-            <English>Generic Crew (Mec)</English>
+            <English>IFV Crew (Mec)</English>
         </Key>
 
     </Package>

diff --git a/addons/infantry_bravo_labeled/CfgEditorSubcategories.hpp b/addons/infantry_bravo_labeled/CfgEditorSubcategories.hpp
@@ -2,7 +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); 
+    class Cav_EdSubcat_Support_Bravo_Labeled {
+        displayname = CSTRING(Cav_EdSubcat_Support_Bravo_Labeled); 
     };
 };
diff --git a/addons/infantry_bravo_labeled/CfgGroups.hpp b/addons/infantry_bravo_labeled/CfgGroups.hpp
@@ -19,12 +19,15 @@ class CfgGroups {
                 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 {
+
+            class Cav_support_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);
+                INFANTRY_UNIT_ENGINEER_4(Cav_B_B_Group_1_3_F,Cav_B_B_EngineerTeamLeader_1_3_F,Cav_B_B_EngineerTeamMember_1_3_F,Cav_B_B_EngineerTeamMember_1_3_F,Cav_B_B_EngineerTeamMember_1_3_F);
+                INFANTRY_UNIT_ENGINEER_4(Cav_B_B_Group_1_4_F,Cav_B_B_EngineerTeamLeader_1_4_F,Cav_B_B_EngineerTeamMember_1_4_F,Cav_B_B_EngineerTeamMember_1_4_F,Cav_B_B_EngineerTeamMember_1_4_F);
             };
         };
     };

diff --git a/addons/infantry_bravo_labeled/CfgVehicles.hpp b/addons/infantry_bravo_labeled/CfgVehicles.hpp
@@ -2,6 +2,9 @@ class CfgVehicles {
     class Cav_B_B_MedicTeamLeader_F;
     class Cav_B_B_MedicTeamMember_F;
     class Cav_B_B_Surgeon_F;
+
+    class Cav_B_B_EngineerTeamLeader_F;
+    class Cav_B_B_EngineerTeamMember_F;
 
     class Cav_B_B_PlatoonSergeant_F;
     class Cav_B_B_PlatoonLeader_F;
@@ -25,18 +28,27 @@ class CfgVehicles {
     class Cav_B_B_IFV_Driver_F;
 
     // First Platoon
-    UNIT_BRAVO_MEDICAL(Cav_B_B_PlatoonSergeant_1_5_F,Cav_B_B_PlatoonSergeant_F,1,5);
-    UNIT_BRAVO_MEDICAL(Cav_B_B_PlatoonLeader_1_6_F,Cav_B_B_PlatoonLeader_F,1,6);
+    UNIT_BRAVO_SUPPORT(Cav_B_B_PlatoonSergeant_1_5_F,Cav_B_B_PlatoonSergeant_F,1,5);
+    UNIT_BRAVO_SUPPORT(Cav_B_B_PlatoonLeader_1_6_F,Cav_B_B_PlatoonLeader_F,1,6);
 
-    // Squad 3-1-B-1/7
-    UNIT_BRAVO_MEDICAL(Cav_B_B_MedicTeamLeader_1_1_F,Cav_B_B_MedicTeamLeader_F,1,1);
-    UNIT_BRAVO_MEDICAL(Cav_B_B_MedicTeamMember_1_1_F,Cav_B_B_MedicTeamMember_F,1,1);
-    UNIT_BRAVO_MEDICAL(Cav_B_B_Surgeon_1_1_F,Cav_B_B_Surgeon_F,1,1);
+    // Squad 1-1-B-1/7
+    UNIT_BRAVO_SUPPORT(Cav_B_B_MedicTeamLeader_1_1_F,Cav_B_B_MedicTeamLeader_F,1,1);
+    UNIT_BRAVO_SUPPORT(Cav_B_B_MedicTeamMember_1_1_F,Cav_B_B_MedicTeamMember_F,1,1);
+    UNIT_BRAVO_SUPPORT(Cav_B_B_Surgeon_1_1_F,Cav_B_B_Surgeon_F,1,1);
+
+    // Squad 2-1-B-1/7
+    UNIT_BRAVO_SUPPORT(Cav_B_B_MedicTeamLeader_1_2_F,Cav_B_B_MedicTeamLeader_F,1,2);
+    UNIT_BRAVO_SUPPORT(Cav_B_B_MedicTeamMember_1_2_F,Cav_B_B_MedicTeamMember_F,1,2);
+    UNIT_BRAVO_SUPPORT(Cav_B_B_Surgeon_1_2_F,Cav_B_B_Surgeon_F,1,2);
 
+    // Squad 3-1-B-1/7
+    UNIT_BRAVO_SUPPORT(Cav_B_B_EngineerTeamLeader_1_3_F,Cav_B_B_EngineerTeamLeader_F,1,3);
+    UNIT_BRAVO_SUPPORT(Cav_B_B_EngineerTeamMember_1_3_F,Cav_B_B_EngineerTeamMember_F,1,3);
+
     // Squad 4-1-B-1/7
-    UNIT_BRAVO_MEDICAL(Cav_B_B_MedicTeamLeader_1_2_F,Cav_B_B_MedicTeamLeader_F,1,2);
-    UNIT_BRAVO_MEDICAL(Cav_B_B_MedicTeamMember_1_2_F,Cav_B_B_MedicTeamMember_F,1,2);
-    UNIT_BRAVO_MEDICAL(Cav_B_B_Surgeon_1_2_F,Cav_B_B_Surgeon_F,1,2);
+    UNIT_BRAVO_SUPPORT(Cav_B_B_EngineerTeamLeader_1_4_F,Cav_B_B_EngineerTeamLeader_F,1,4);
+    UNIT_BRAVO_SUPPORT(Cav_B_B_EngineerTeamMember_1_4_F,Cav_B_B_EngineerTeamMember_F,1,4);
+
 
     // Second Platoon
     UNIT_BRAVO_MECH(Cav_B_B_PlatoonSergeant_2_5_F,Cav_B_B_PlatoonSergeant_F,2,5);
@@ -105,15 +117,10 @@ class CfgVehicles {
 
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Commander_2_1_F,Cav_B_B_IFV_Commander_F,2,1);
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Driver_2_1_F,Cav_B_B_IFV_Driver_F,2,1);
-    //UNIT_BRAVO_MECH(Cav_B_B_IFV_Gunner_2_1_F,Cav_B_B_IFV_Gunner_F,2,1);
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Commander_2_2_F,Cav_B_B_IFV_Commander_F,2,2);
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Driver_2_2_F,Cav_B_B_IFV_Driver_F,2,2);
-    //UNIT_BRAVO_MECH(Cav_B_B_IFV_Gunner_2_2_F,Cav_B_B_IFV_Gunner_F,2,2);
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Commander_2_3_F,Cav_B_B_IFV_Commander_F,2,3);
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Driver_2_3_F,Cav_B_B_IFV_Driver_F,2,3);
-    //UNIT_BRAVO_MECH(Cav_B_B_IFV_Gunner_2_3_F,Cav_B_B_IFV_Gunner_F,2,3);
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Commander_2_4_F,Cav_B_B_IFV_Commander_F,2,4);
     UNIT_BRAVO_MECH(Cav_B_B_IFV_Driver_2_4_F,Cav_B_B_IFV_Driver_F,2,4);
-    ///UNIT_BRAVO_MECH(Cav_B_B_IFV_Gunner_2_4_F,Cav_B_B_IFV_Gunner_F,2,4);
-
 };
diff --git a/addons/infantry_bravo_labeled/script_macros.hpp b/addons/infantry_bravo_labeled/script_macros.hpp
@@ -10,13 +10,13 @@
         cav_squad = var4; \
     }
 
-#define UNIT_BRAVO_MEDICAL(var1,var2,var3,var4) class var1: var2 {\
+#define UNIT_BRAVO_SUPPORT(var1,var2,var3,var4) class var1: var2 {\
         _generalMacro = QUOTE(var1); \
         scope = 2; \
         scopeCurator = 0; \
         displayName = CSTRING(var1); \
         author = ECSTRING(Main,ModTeam); \
-        editorSubcategory = "Cav_EdSubcat_Medical_Bravo_Labeled"; \
+        editorSubcategory = "Cav_EdSubcat_Support_Bravo_Labeled"; \
         cav_company = "bravo"; \
         cav_platoon = var3; \
         cav_squad = var4; \
@@ -192,4 +192,35 @@
             side = 1; \
             vehicle = QUOTE(soldier4); \
         };\
+    }
+#define INFANTRY_UNIT_ENGINEER_4(classname,soldier1,soldier2,soldier3,soldier4) \
+    class classname { \
+        name = CSTRING(classname); \
+        icon = "\A3\ui_f\data\map\markers\nato\b_maint.paa"; \
+        faction = "cav_blu_usa_f"; \
+        side = 1; \
+        class Unit0 { \
+            position[] = {0, 0, 0}; \
+            rank = "SERGEANT"; \
+            side = 1; \
+            vehicle = QUOTE(soldier1); \
+        };\
+        class Unit1 { \
+            position[] = {-1.0, 0, 0}; \
+            rank = "PRIVATE"; \
+            side = 1; \
+            vehicle = QUOTE(soldier2); \
+        };\
+        class Unit2 { \
+            position[] = {0, -1.0, 0}; \
+            rank = "PRIVATE"; \
+            side = 1; \
+            vehicle = QUOTE(soldier3); \
+        };\
+        class Unit3 { \
+            position[] = {-1.0, -1.0, 0}; \
+            rank = "PRIVATE"; \
+            side = 1; \
+            vehicle = QUOTE(soldier4); \
+        };\
     }