Updated naming and added alpha

addons/infantry/script_macros.hpp

@@ -59,32 +59,80 @@
             vehicle = QUOTE(BSoldier3); \
         }; \
     }
-
-
-#define INFANTRY_GROUP_RANKED_1(classname,Soldier,SoldierRank) \
-    class classname {\
-        name = CSTRING(classname);\
-        icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa";\
-        faction = "BLU_USA_7CAV_F";\
-        side = 1;\
-        class Unit0 {\
-            position[] = {0, 0, 0};\
-            rank = QUOTE(SoldierRank);\
-            side = 1;\
-            vehicle = QUOTE(Soldier);\
-        };\
+#define INFANTRY_TEAM_PILOT_4(classname,soldier1,soldier2,soldier3,soldier4) \
+    class classname { \
+        name = CSTRING(classname); \
+        icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; \
+        faction = "cav_blu_usa_f"; \
+        side = 1; \
+        class Unit0 { \
+            position[] = {0, 0, 0}; \
+            rank = "CAPTAIN"; \
+            side = 1; \
+            vehicle = "soldier1"; \
+        }; \
+        class Unit1 { \
+            position[] = {1.0, 0.0, 0.0}; \
+            rank = "LIEUTENANT"; \
+            side = 1; \
+            vehicle = "soldier2"; \
+        }; \
+        class Unit2 { \
+            position[] = {0.0, -1.0, 0.0}; \
+            rank = "SERGEANT"; \
+            side = 1; \
+            vehicle = "soldier3"; \
+        }; \
+        class Unit3 { \
+            position[] = {1.0, -1.0, 0.0}; \
+            rank = "CORPORAL"; \
+            side = 1; \
+            vehicle = "soldier4"; \
+        }; \
     }
-#define INFANTRY_GROUP_MEDIC_1(classname,Soldier) \
-    class classname {\
-        name = CSTRING(classname);\
-        icon = "\A3\ui_f\data\map\markers\nato\b_med.paa";\
-        faction = "BLU_USA_7CAV_F";\
-        side = 1;\
-        class Unit0 {\
-            position[] = {0, 0, 0};\
-            rank = "SERGEANT";\
-            side = 1;\
-            vehicle = QUOTE(Soldier);\
+#define INFANTRY_TEAM_PILOT_2(classname,soldier1,soldier2) \
+    class Cav_B_A_Raider_2_Team { \
+        name = CSTRING(A_Team_Raider_2); \
+        icon = "\A3\ui_f\data\map\markers\nato\b_air.paa"; \
+        faction = "cav_blu_usa_f"; \
+        side = 1; \
+        class Unit0 { \
+            position[] = {0, 0, 0}; \
+            rank = "CAPTAIN"; \
+            side = 1; \
+            vehicle = "soldier1"; \
+        }; \
+        class Unit1 { \
+            position[] = {1.0, 0.0, 0.0}; \
+            rank = "LIEUTENANT"; \
+            side = 1; \
+            vehicle = "soldier2"; \
+        }; \
+    }
+#define INFANTRY_UNIT_RANKED_1(classname,Soldier,SoldierRank) \
+    class classname { \
+        name = CSTRING(classname); \
+        icon = "\A3\ui_f\data\map\markers\nato\b_hq.paa"; \
+        faction = "cav_blu_usa_f"; \
+        side = 1; \
+        class Unit0 { \
+            position[] = {0, 0, 0}; \
+            rank = QUOTE(SoldierRank); \
+            side = 1; \
+            vehicle = QUOTE(Soldier); \
+        }; \
+    }
+#define INFANTRY_UNIT_MEDIC_1(classname,Soldier) \
+    class classname { \
+        name = CSTRING(classname); \
+        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(Soldier); \
         };\
     }
 

addons/infantry_alpha/CfgGroups.hpp

@@ -0,0 +1,10 @@
+class CfgGroups {
+    class West {
+        class cav_blu_usa_f {
+            class cav_infantry_alpha_squads_f {
+                name = CSTRING(cav_infantry_alpha_squads_f);
+
+            };
+        };
+    };
+};

addons/infantry_alpha/script_component.hpp

@@ -3,3 +3,4 @@
 
 #include "\z\cav\addons\main\script_mod.hpp"
 #include "\z\cav\addons\main\script_macros.hpp"
+#include "\z\cav\addons\infantry\script_macros.hpp"

addons/infantry_alpha_labeled/CfgGroups.hpp

@@ -1,7 +1,9 @@
 class CfgGroups {
     class West {
         class cav_blu_usa_f {
-            name = ECSTRING(common,faction_display);
+            class cav_infantry_alpha_squads_f {
+                INFANTRY_TEAM_PILOT_4(classname,soldier1,soldier2,soldier3,soldier4);
+            };
         };
     };
 };

addons/infantry_alpha_labeled/config.cpp

@@ -17,4 +17,5 @@ class CfgPatches {
 };
 
 #include "CfgVehicles.hpp"
+#include "CfgGroups.hpp"
 #include "CfgEditorSubcategories.hpp"

addons/infantry_alpha_labeled/script_component.hpp

@@ -3,3 +3,6 @@
 
 #include "\z\cav\addons\main\script_mod.hpp"
 #include "\z\cav\addons\main\script_macros.hpp"
+#include "\z\cav\addons\infantry\script_macros.hpp"
+#include "script_macros.hpp"
+

addons/infantry_bravo_labeled/CfgGroups.hpp

@@ -3,9 +3,9 @@ class CfgGroups {
         class cav_blu_usa_f {
             class cav_infantry_bravo_squads_f {
 
-                INFANTRY_GROUP_RANKED_1(Cav_B_B_Group_2_5_F,Cav_B_B_PlatoonSergeant_2_5_F,LIEUTENANT);
-                INFANTRY_GROUP_RANKED_1(Cav_B_B_Group_2_6_F,Cav_B_B_PlatoonLeader_2_6_F,CAPTAIN);
-                INFANTRY_GROUP_MEDIC_1(Cav_B_B_Group_2_7_F,Cav_B_B_PlatoonMedic_2_7_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);

addons/infantry_charlie_labeled/CfgGroups.hpp

@@ -3,18 +3,18 @@ class CfgGroups {
         class cav_blu_usa_f {
             class cav_infantry_charlie_squads_f {
 
-                INFANTRY_GROUP_RANKED_1(Cav_B_C_Group_1_5_F,Cav_B_C_PlatoonSergeant_1_5_F,LIEUTENANT);
-                INFANTRY_GROUP_RANKED_1(Cav_B_C_Group_1_6_F,Cav_B_C_PlatoonLeader_1_6_F,CAPTAIN);
-                INFANTRY_GROUP_MEDIC_1(Cav_B_C_Group_1_7_F,Cav_B_C_PlatoonMedic_1_7_F);
+                INFANTRY_UNIT_RANKED_1(Cav_B_C_Group_1_5_F,Cav_B_C_PlatoonSergeant_1_5_F,LIEUTENANT);
+                INFANTRY_UNIT_RANKED_1(Cav_B_C_Group_1_6_F,Cav_B_C_PlatoonLeader_1_6_F,CAPTAIN);
+                INFANTRY_UNIT_MEDIC_1(Cav_B_C_Group_1_7_F,Cav_B_C_PlatoonMedic_1_7_F);
 
                 INFANTRY_GROUP_9(Cav_B_C_Group_1_1_F,Cav_B_C_SquadLeader_1_1_F,Cav_B_C_FireTeamLeader_1_1_A_F,Cav_B_C_AutomaticRifleman_1_1_A_F,Cav_B_C_Grenadier_1_1_A_F,Cav_B_C_Rifleman_1_1_A_F,Cav_B_C_FireTeamLeader_1_1_B_F,Cav_B_C_AutomaticRifleman_1_1_B_F,Cav_B_C_Grenadier_1_1_B_F,Cav_B_C_CombatLifeSaver_1_1_B_F);
                 INFANTRY_GROUP_9(Cav_B_C_Group_1_2_F,Cav_B_C_SquadLeader_1_2_F,Cav_B_C_FireTeamLeader_1_2_A_F,Cav_B_C_AutomaticRifleman_1_2_A_F,Cav_B_C_Grenadier_1_2_A_F,Cav_B_C_Rifleman_1_2_A_F,Cav_B_C_FireTeamLeader_1_2_B_F,Cav_B_C_AutomaticRifleman_1_2_B_F,Cav_B_C_Grenadier_1_2_B_F,Cav_B_C_CombatLifeSaver_1_2_B_F);
                 INFANTRY_GROUP_9(Cav_B_C_Group_1_3_F,Cav_B_C_SquadLeader_1_3_F,Cav_B_C_FireTeamLeader_1_3_A_F,Cav_B_C_AutomaticRifleman_1_3_A_F,Cav_B_C_Grenadier_1_3_A_F,Cav_B_C_Rifleman_1_3_A_F,Cav_B_C_FireTeamLeader_1_3_B_F,Cav_B_C_AutomaticRifleman_1_3_B_F,Cav_B_C_Grenadier_1_3_B_F,Cav_B_C_CombatLifeSaver_1_3_B_F);
                 INFANTRY_GROUP_9(Cav_B_C_Group_1_4_F,Cav_B_C_SquadLeader_1_4_F,Cav_B_C_FireTeamLeader_1_4_A_F,Cav_B_C_AutomaticRifleman_1_4_A_F,Cav_B_C_Grenadier_1_4_A_F,Cav_B_C_Rifleman_1_4_A_F,Cav_B_C_FireTeamLeader_1_4_B_F,Cav_B_C_AutomaticRifleman_1_4_B_F,Cav_B_C_Grenadier_1_4_B_F,Cav_B_C_CombatLifeSaver_1_4_B_F);
 
-                INFANTRY_GROUP_RANKED_1(Cav_B_C_Group_2_5_F,Cav_B_C_PlatoonSergeant_2_5_F,LIEUTENANT);
-                INFANTRY_GROUP_RANKED_1(Cav_B_C_Group_2_6_F,Cav_B_C_PlatoonLeader_2_6_F,CAPTAIN);
-                INFANTRY_GROUP_MEDIC_1(Cav_B_C_Group_2_7_F,Cav_B_C_PlatoonMedic_2_7_F);
+                INFANTRY_UNIT_RANKED_1(Cav_B_C_Group_2_5_F,Cav_B_C_PlatoonSergeant_2_5_F,LIEUTENANT);
+                INFANTRY_UNIT_RANKED_1(Cav_B_C_Group_2_6_F,Cav_B_C_PlatoonLeader_2_6_F,CAPTAIN);
+                INFANTRY_UNIT_MEDIC_1(Cav_B_C_Group_2_7_F,Cav_B_C_PlatoonMedic_2_7_F);
 
                 INFANTRY_GROUP_9(Cav_B_C_Group_2_1_F,Cav_B_C_SquadLeader_2_1_F,Cav_B_C_FireTeamLeader_2_1_A_F,Cav_B_C_AutomaticRifleman_2_1_A_F,Cav_B_C_Grenadier_2_1_A_F,Cav_B_C_Rifleman_2_1_A_F,Cav_B_C_FireTeamLeader_2_1_B_F,Cav_B_C_AutomaticRifleman_2_1_B_F,Cav_B_C_Grenadier_2_1_B_F,Cav_B_C_CombatLifeSaver_2_1_B_F);
                 INFANTRY_GROUP_9(Cav_B_C_Group_2_2_F,Cav_B_C_SquadLeader_2_2_F,Cav_B_C_FireTeamLeader_2_2_A_F,Cav_B_C_AutomaticRifleman_2_2_A_F,Cav_B_C_Grenadier_2_2_A_F,Cav_B_C_Rifleman_2_2_A_F,Cav_B_C_FireTeamLeader_2_2_B_F,Cav_B_C_AutomaticRifleman_2_2_B_F,Cav_B_C_Grenadier_2_2_B_F,Cav_B_C_CombatLifeSaver_2_2_B_F);

addons/infantry_hq/CfgGroups.hpp

@@ -1,7 +1,6 @@
 class CfgGroups {
     class West {
         class cav_blu_usa_f {
-            name = ECSTRING(common,faction_display);
         };
     };
 };

addons/infantry_hq/config.cpp

@@ -17,4 +17,5 @@ class CfgPatches {
 };
 
 #include "CfgVehicles.hpp"
+#include "CfgGroups.hpp"
 #include "CfgEditorSubcategories.hpp"