Set unit names according to their faction (#2804)

* save names in faction config * set names for vanilla, RHS and CUP factions * add createRandomIdentity * setIdentityLocal receives hashMap * createUnit receives identity or sets random identity * fix calls setting identity * update setIdentity header * set default faces, voices and names for all factions * fix civilian identity in the punishment mission * Formatting fixes Co-authored-by: Jouni Järvinen <[email protected]> --------- Co-authored-by: Artyom Vasilyev <[email protected]> Co-authored-by: Lazejun <[email protected]> Co-authored-by: Jouni Järvinen <[email protected]>
official-antistasi-community · Aug 19, 2023 · cddec7c · cddec7c
1 parent c64f9f3
commit cddec7c
Show file tree

Hide file tree

Showing 70 changed files with 218 additions and 103 deletions.
diff --git a/A3A/addons/core/CfgFunctions.hpp b/A3A/addons/core/CfgFunctions.hpp
@@ -743,6 +743,7 @@ class CfgFunctions
             class setIdentity {};
             class setIdentityLocal {};
             class setPos {};
+            class createRandomIdentity {};
             class vehicleTextureSync {};
             class vehicleWillCollideAtPosition {};
             class getRoadDirection {};

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_ACR_Arid.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_ACR_Arid.sqf
@@ -81,6 +81,7 @@
 "WhiteHead_14","WhiteHead_15","WhiteHead_16","WhiteHead_17","WhiteHead_18",
 "WhiteHead_19","WhiteHead_21","WhiteHead_30"]] call _fnc_saveToTemplate;
 ["voices", ["CUP_D_Male01_CZ_ACR","CUP_D_Male02_CZ_ACR","CUP_D_Male03_CZ_ACR","CUP_D_Male04_CZ_ACR","CUP_D_Male05_CZ_ACR"]] call _fnc_saveToTemplate;
+"CUP_Names_CzechMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_ACR_Temperate.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_ACR_Temperate.sqf
@@ -81,6 +81,7 @@
 "WhiteHead_14","WhiteHead_15","WhiteHead_16","WhiteHead_17","WhiteHead_18",
 "WhiteHead_19","WhiteHead_21","WhiteHead_30"]] call _fnc_saveToTemplate;
 ["voices", ["CUP_D_Male01_CZ_ACR","CUP_D_Male02_CZ_ACR","CUP_D_Male03_CZ_ACR","CUP_D_Male04_CZ_ACR","CUP_D_Male05_CZ_ACR"]] call _fnc_saveToTemplate;
+"CUP_Names_CzechMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_AFRF_Arctic.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_AFRF_Arctic.sqf
@@ -82,6 +82,7 @@
 "WhiteHead_13","WhiteHead_14","WhiteHead_17","WhiteHead_18",
 "WhiteHead_21","WhiteHead_30"]] call _fnc_saveToTemplate;
 ["voices", ["Male01RUS","Male02RUS","Male03RUS"]] call _fnc_saveToTemplate;
+"CUP_Names_RussianMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_AFRF_Arid.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_AFRF_Arid.sqf
@@ -82,6 +82,7 @@
 "WhiteHead_13","WhiteHead_14","WhiteHead_17","WhiteHead_18",
 "WhiteHead_21","WhiteHead_30"]] call _fnc_saveToTemplate;
 ["voices", ["Male01RUS","Male02RUS","Male03RUS"]] call _fnc_saveToTemplate;
+"CUP_Names_RussianMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_AFRF_Temperate.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_AFRF_Temperate.sqf
@@ -82,6 +82,7 @@
 "WhiteHead_13","WhiteHead_14","WhiteHead_17","WhiteHead_18",
 "WhiteHead_21","WhiteHead_30"]] call _fnc_saveToTemplate;
 ["voices", ["Male01RUS","Male02RUS","Male03RUS"]] call _fnc_saveToTemplate;
+"CUP_Names_RussianMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_BAF_Arid.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_BAF_Arid.sqf
@@ -82,6 +82,7 @@
 "WhiteHead_14","WhiteHead_15","WhiteHead_16","WhiteHead_17","WhiteHead_18",
 "WhiteHead_19","WhiteHead_20","WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["CUP_D_Male01_GB_BAF","CUP_D_Male02_GB_BAF","CUP_D_Male03_GB_BAF","CUP_D_Male04_GB_BAF","CUP_D_Male05_GB_BAF"]] call _fnc_saveToTemplate;
+"CUP_Names_BritishMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_BAF_Temperate.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_BAF_Temperate.sqf
@@ -82,6 +82,7 @@
 "WhiteHead_14","WhiteHead_15","WhiteHead_16","WhiteHead_17","WhiteHead_18",
 "WhiteHead_19","WhiteHead_20","WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["CUP_D_Male01_GB_BAF","CUP_D_Male02_GB_BAF","CUP_D_Male03_GB_BAF","CUP_D_Male04_GB_BAF","CUP_D_Male05_GB_BAF"]] call _fnc_saveToTemplate;
+"CUP_Names_BritishMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_BW_Arid.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_BW_Arid.sqf
@@ -82,6 +82,7 @@
 "WhiteHead_11","WhiteHead_12","WhiteHead_13","WhiteHead_14","WhiteHead_16",
 "WhiteHead_17","WhiteHead_18","WhiteHead_19","WhiteHead_20"]] call _fnc_saveToTemplate;
 ["voices", ["Male01ENG","Male02ENG","Male03ENG","Male04ENG","Male06ENG","Male07ENG","Male08ENG","Male09ENG","Male10ENG","Male11ENG","Male12ENG"]] call _fnc_saveToTemplate;
+"CUP_Names_GermanMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_BW_Temperate.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_BW_Temperate.sqf
@@ -82,6 +82,7 @@
 "WhiteHead_11","WhiteHead_12","WhiteHead_13","WhiteHead_14","WhiteHead_16",
 "WhiteHead_17","WhiteHead_18","WhiteHead_19","WhiteHead_20"]] call _fnc_saveToTemplate;
 ["voices", ["Male01ENG","Male02ENG","Male03ENG","Male04ENG","Male06ENG","Male07ENG","Male08ENG","Male09ENG","Male10ENG","Male11ENG","Male12ENG"]] call _fnc_saveToTemplate;
+"CUP_Names_GermanMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_CDF_Arctic.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_CDF_Arctic.sqf
@@ -85,6 +85,7 @@
 "WhiteHead_15","WhiteHead_16","WhiteHead_17","WhiteHead_19","WhiteHead_20",
 "WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["CUP_D_Male01_CZ_ACR","CUP_D_Male02_CZ_ACR","CUP_D_Male03_CZ_ACR","CUP_D_Male04_CZ_ACR","CUP_D_Male05_CZ_ACR"]] call _fnc_saveToTemplate;
+"CUP_Names_CzechMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_CDF_Temperate.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_CDF_Temperate.sqf
@@ -85,6 +85,7 @@
 "WhiteHead_15","WhiteHead_16","WhiteHead_17","WhiteHead_19","WhiteHead_20",
 "WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["CUP_D_Male01_CZ_ACR","CUP_D_Male02_CZ_ACR","CUP_D_Male03_CZ_ACR","CUP_D_Male04_CZ_ACR","CUP_D_Male05_CZ_ACR"]] call _fnc_saveToTemplate;
+"CUP_Names_CzechMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_HIL.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_HIL.sqf
@@ -92,6 +92,8 @@
 
 ["voices", ["Male01FRE","Male02FRE","Male03FRE"]] call _fnc_saveToTemplate;
 
+"TanoanMen" call _fnc_saveNames;
+
 //////////////////////////
 //       Loadouts       //
 //////////////////////////

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_ION_Arctic.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_ION_Arctic.sqf
@@ -83,6 +83,7 @@
 "WhiteHead_09","WhiteHead_10","WhiteHead_12","WhiteHead_13",
 "WhiteHead_17","WhiteHead_18","WhiteHead_19","WhiteHead_20"]] call _fnc_saveToTemplate;
 ["voices", ["Male01ENG","Male02ENG","Male03ENG","Male04ENG","Male05ENG","Male06ENG","Male07ENG","Male08ENG","Male09ENG","Male10ENG","Male11ENG","Male12ENG"]] call _fnc_saveToTemplate;
+"NATOMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_ION_Arid.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_ION_Arid.sqf
@@ -83,6 +83,7 @@
 "WhiteHead_09","WhiteHead_10","WhiteHead_12","WhiteHead_13",
 "WhiteHead_17","WhiteHead_18","WhiteHead_19","WhiteHead_20"]] call _fnc_saveToTemplate;
 ["voices", ["Male01ENG","Male02ENG","Male03ENG","Male04ENG","Male05ENG","Male06ENG","Male07ENG","Male08ENG","Male09ENG","Male10ENG","Male11ENG","Male12ENG"]] call _fnc_saveToTemplate;
+"NATOMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_RACS_Arid.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_RACS_Arid.sqf
@@ -80,6 +80,7 @@
 "WhiteHead_15","WhiteHead_16","WhiteHead_17","WhiteHead_18","WhiteHead_19",
 "WhiteHead_20","WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["Male01ENG","Male02ENG","Male03ENG","Male04ENG","Male05ENG","Male06ENG","Male07ENG","Male08ENG","Male09ENG","Male10ENG","Male11ENG","Male12ENG"]] call _fnc_saveToTemplate;
+"SahraniNames" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_RACS_Tropical.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_RACS_Tropical.sqf
@@ -80,6 +80,7 @@
 "WhiteHead_15","WhiteHead_16","WhiteHead_17","WhiteHead_18","WhiteHead_19",
 "WhiteHead_20","WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["Male01ENG","Male02ENG","Male03ENG","Male04ENG","Male05ENG","Male06ENG","Male07ENG","Male08ENG","Male09ENG","Male10ENG","Male11ENG","Male12ENG"]] call _fnc_saveToTemplate;
+"SahraniNames" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_SLA_Temperate.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_SLA_Temperate.sqf
@@ -81,6 +81,7 @@
 "WhiteHead_14","WhiteHead_15","WhiteHead_16","WhiteHead_17",
 "WhiteHead_19","WhiteHead_20","WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["Male01GRE","Male02GRE","Male03GRE","Male04GRE","Male05GRE","Male06GRE"]] call _fnc_saveToTemplate;
+"SahraniNames" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_TKA_Arid.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_TKA_Arid.sqf
@@ -75,6 +75,7 @@
 
 ["faces", ["PersianHead_A3_01","PersianHead_A3_02","PersianHead_A3_03"]] call _fnc_saveToTemplate;
 ["voices", ["CUP_D_Male01_TK","CUP_D_Male02_TK","CUP_D_Male03_TK","CUP_D_Male04_TK","CUP_D_Male05_TK"]] call _fnc_saveToTemplate;
+"TakistaniMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_US_Army_Arid.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_US_Army_Arid.sqf
@@ -81,6 +81,7 @@
 "WhiteHead_15","WhiteHead_17","WhiteHead_18","WhiteHead_19",
 "WhiteHead_20","WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["Male01ENG","Male02ENG","Male03ENG","Male04ENG","Male06ENG","Male07ENG","Male08ENG","Male09ENG","Male10ENG","Male11ENG","Male12ENG"]] call _fnc_saveToTemplate;
+"NATOMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_US_Army_Temperate.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_US_Army_Temperate.sqf
@@ -81,6 +81,7 @@
 "WhiteHead_15","WhiteHead_17","WhiteHead_18","WhiteHead_19",
 "WhiteHead_20","WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["Male01ENG","Male02ENG","Male03ENG","Male04ENG","Male06ENG","Male07ENG","Male08ENG","Male09ENG","Male10ENG","Male11ENG","Male12ENG"]] call _fnc_saveToTemplate;
+"NATOMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_US_Marine_Arid.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_US_Marine_Arid.sqf
@@ -84,6 +84,7 @@
 "WhiteHead_15","WhiteHead_17","WhiteHead_18","WhiteHead_19",
 "WhiteHead_20","WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["Male01ENG","Male02ENG","Male03ENG","Male04ENG","Male06ENG","Male07ENG","Male08ENG","Male09ENG","Male10ENG","Male11ENG","Male12ENG"]] call _fnc_saveToTemplate;
+"NATOMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_AI_US_Marine_Temperate.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_AI_US_Marine_Temperate.sqf
@@ -84,6 +84,7 @@
 "WhiteHead_15","WhiteHead_17","WhiteHead_18","WhiteHead_19",
 "WhiteHead_20","WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["Male01ENG","Male02ENG","Male03ENG","Male04ENG","Male06ENG","Male07ENG","Male08ENG","Male09ENG","Male10ENG","Male11ENG","Male12ENG"]] call _fnc_saveToTemplate;
+"NATOMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_Civ_CHC.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_Civ_CHC.sqf
@@ -48,6 +48,7 @@
 "WhiteHead_05","WhiteHead_07","WhiteHead_08","WhiteHead_09","WhiteHead_10","WhiteHead_11","WhiteHead_12",
 "WhiteHead_14","WhiteHead_15","WhiteHead_16","WhiteHead_17","WhiteHead_18","WhiteHead_19","WhiteHead_20",
 "WhiteHead_21"]] call _fnc_saveToTemplate;
+"CUP_Names_CzechMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_Civ_TKC.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_Civ_TKC.sqf
@@ -45,6 +45,7 @@
 /////////////////////
 
 ["faces", ["PersianHead_A3_01","PersianHead_A3_02","PersianHead_A3_03"]] call _fnc_saveToTemplate;
+"TakistaniMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_Reb_NAPA.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_Reb_NAPA.sqf
@@ -138,6 +138,7 @@ private _rebUniformsAI = [
 "WhiteHead_15","WhiteHead_16","WhiteHead_17","WhiteHead_19","WhiteHead_20",
 "WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["CUP_D_Male01_CZ_ACR","CUP_D_Male02_CZ_ACR","CUP_D_Male03_CZ_ACR","CUP_D_Male04_CZ_ACR","CUP_D_Male05_CZ_ACR"]] call _fnc_saveToTemplate;
+"CUP_Names_CzechMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CUP/CUP_Reb_TKM.sqf b/A3A/addons/core/Templates/Templates/CUP/CUP_Reb_TKM.sqf
@@ -140,6 +140,7 @@ private _rebUniformsAI = [
 
 ["faces", ["PersianHead_A3_01","PersianHead_A3_02","PersianHead_A3_03"]] call _fnc_saveToTemplate;
 ["voices", ["CUP_D_Male01_TK","CUP_D_Male02_TK","CUP_D_Male03_TK","CUP_D_Male04_TK","CUP_D_Male05_TK"]] call _fnc_saveToTemplate;
+"TakistaniMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/FactionDefaults/CivilianDefaults.sqf b/A3A/addons/core/Templates/Templates/FactionDefaults/CivilianDefaults.sqf
@@ -9,3 +9,8 @@
 ["faces", ["GreekHead_A3_02", "GreekHead_A3_03", "GreekHead_A3_04", "GreekHead_A3_05", "GreekHead_A3_06",
 "GreekHead_A3_07", "GreekHead_A3_08", "GreekHead_A3_09", "Ioannou", "Barklem", "AfricanHead_02",
 "AsianHead_A3_02", "AsianHead_A3_03", "WhiteHead_05"]] call _fnc_saveToTemplate;
+
+// prevents civilians from shouting out commands
+["voices", ["NoVoice"]] call _fnc_saveToTemplate;
+
+"CivMen" call _fnc_saveNames;
diff --git a/A3A/addons/core/Templates/Templates/FactionDefaults/EnemyDefaults.sqf b/A3A/addons/core/Templates/Templates/FactionDefaults/EnemyDefaults.sqf
@@ -11,4 +11,8 @@
 ["placeIntel_itemMedium", ["Land_Document_01_F",-155,false]] call _fnc_saveToTemplate;  // [classname,azimuth,isComputer].
 ["placeIntel_itemLarge", ["Land_Laptop_unfolded_F",-25,true]] call _fnc_saveToTemplate;  // [classname,azimuth,isComputer].
 
-["attributesVehicles", []] call _fnc_saveToTemplate;
+["attributesVehicles", []] call _fnc_saveToTemplate;
+
+["faces", ["GreekHead_A3_02","GreekHead_A3_03","GreekHead_A3_04","GreekHead_A3_05","GreekHead_A3_06","GreekHead_A3_07","GreekHead_A3_08","GreekHead_A3_09","Ioannou","Mavros"]] call _fnc_saveToTemplate;
+["voices", ["Male01GRE","Male02GRE","Male03GRE","Male04GRE","Male05GRE","Male06GRE"]] call _fnc_saveToTemplate;
+"GreekMen" call _fnc_saveNames;
diff --git a/A3A/addons/core/Templates/Templates/FactionDefaults/RebelDefaults.sqf b/A3A/addons/core/Templates/Templates/FactionDefaults/RebelDefaults.sqf
@@ -35,4 +35,5 @@ if(A3A_hasACE) then {
 
 //FIA Rebells as Example
 ["faces", ["GreekHead_A3_02","GreekHead_A3_03","GreekHead_A3_04","GreekHead_A3_05","GreekHead_A3_06","GreekHead_A3_07","GreekHead_A3_08","GreekHead_A3_09","Ioannou","Mavros"]] call _fnc_saveToTemplate;
-["voices", ["Male01GRE", "Male02GRE", "Male03GRE", "Male04GRE", "Male05GRE", "Male06GRE"]] call _fnc_saveToTemplate;
+["voices", ["Male01GRE", "Male02GRE", "Male03GRE", "Male04GRE", "Male05GRE", "Male06GRE"]] call _fnc_saveToTemplate;
+"GreekMen" call _fnc_saveNames;
diff --git a/A3A/addons/core/Templates/Templates/RHS/RHS_AI_AFRF_Arid.sqf b/A3A/addons/core/Templates/Templates/RHS/RHS_AI_AFRF_Arid.sqf
@@ -83,6 +83,7 @@
 
 ["faces", ["AsianHead_A3_01", "AsianHead_A3_02", "AsianHead_A3_03", "AsianHead_A3_04", "AsianHead_A3_05", "AsianHead_A3_06", "AsianHead_A3_07", "Mason_v2", "Oakes_v2", "RHS_GreekHead_A3_08", "RHS_GreekHead_A3_09", "RHS_LivonianHead_1", "RHS_LivonianHead_10", "RHS_LivonianHead_2", "RHS_LivonianHead_3", "RHS_LivonianHead_4", "RHS_LivonianHead_5", "RHS_LivonianHead_6", "RHS_LivonianHead_7", "RHS_RussianHead_1", "RHS_WhiteHead_01", "RHS_WhiteHead_04", "RHS_WhiteHead_05", "RHS_WhiteHead_06", "RHS_WhiteHead_07", "RHS_WhiteHead_08", "RHS_WhiteHead_09", "RHS_WhiteHead_10", "RHS_WhiteHead_11", "RHS_WhiteHead_14", "RHS_WhiteHead_15", "RHS_WhiteHead_16", "RHS_WhiteHead_25", "RHS_WhiteHead_27", "RHS_WhiteHead_28", "RHS_WhiteHead_32", "RussianHead_1", "RussianHead_2", "RussianHead_3", "RussianHead_4", "RussianHead_5", "Smith_v2"]] call _fnc_saveToTemplate;
 ["voices", ["RHS_Male01RUS", "RHS_Male02RUS", "RHS_Male03RUS", "RHS_Male04RUS", "RHS_Male05RUS"]] call _fnc_saveToTemplate;
+"RussianMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/RHS/RHS_AI_AFRF_Temperate.sqf b/A3A/addons/core/Templates/Templates/RHS/RHS_AI_AFRF_Temperate.sqf
@@ -83,6 +83,7 @@
 
 ["faces", ["AsianHead_A3_01", "AsianHead_A3_02", "AsianHead_A3_03", "AsianHead_A3_04", "AsianHead_A3_05", "AsianHead_A3_06", "AsianHead_A3_07", "Mason_v2", "Oakes_v2", "RHS_GreekHead_A3_08", "RHS_GreekHead_A3_09", "RHS_LivonianHead_1", "RHS_LivonianHead_10", "RHS_LivonianHead_2", "RHS_LivonianHead_3", "RHS_LivonianHead_4", "RHS_LivonianHead_5", "RHS_LivonianHead_6", "RHS_LivonianHead_7", "RHS_RussianHead_1", "RHS_WhiteHead_01", "RHS_WhiteHead_04", "RHS_WhiteHead_05", "RHS_WhiteHead_06", "RHS_WhiteHead_07", "RHS_WhiteHead_08", "RHS_WhiteHead_09", "RHS_WhiteHead_10", "RHS_WhiteHead_11", "RHS_WhiteHead_14", "RHS_WhiteHead_15", "RHS_WhiteHead_16", "RHS_WhiteHead_25", "RHS_WhiteHead_27", "RHS_WhiteHead_28", "RHS_WhiteHead_32", "RussianHead_1", "RussianHead_2", "RussianHead_3", "RussianHead_4", "RussianHead_5", "Smith_v2"]] call _fnc_saveToTemplate;
 ["voices", ["RHS_Male01RUS", "RHS_Male02RUS", "RHS_Male03RUS", "RHS_Male04RUS", "RHS_Male05RUS"]] call _fnc_saveToTemplate;
+"RussianMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/RHS/RHS_AI_CDF.sqf b/A3A/addons/core/Templates/Templates/RHS/RHS_AI_CDF.sqf
@@ -86,6 +86,7 @@
 "WhiteHead_13", "WhiteHead_15", "WhiteHead_16", "WhiteHead_17", "WhiteHead_18",
 "WhiteHead_19", "WhiteHead_20", "WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["RHS_Male01CZ", "RHS_Male02CZ", "RHS_Male03CZ", "RHS_Male04CZ", "RHS_Male05CZ"]] call _fnc_saveToTemplate;
+"CzechMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/RHS/RHS_AI_SAF.sqf b/A3A/addons/core/Templates/Templates/RHS/RHS_AI_SAF.sqf
@@ -83,6 +83,7 @@
 
 ["faces", ["RHS_LivonianHead_1", "RHS_LivonianHead_10", "RHS_LivonianHead_2", "RHS_LivonianHead_3", "RHS_LivonianHead_4", "RHS_LivonianHead_5", "RHS_LivonianHead_6", "RHS_LivonianHead_7", "RHS_RussianHead_1", "RHS_WhiteHead_01", "RHS_WhiteHead_04", "RHS_WhiteHead_05", "RHS_WhiteHead_06", "RHS_WhiteHead_07", "RHS_WhiteHead_08", "RHS_WhiteHead_09", "RHS_WhiteHead_10", "RHS_WhiteHead_11", "RHS_WhiteHead_14", "RHS_WhiteHead_15", "RHS_WhiteHead_16", "RHS_WhiteHead_25", "RHS_WhiteHead_27", "RHS_WhiteHead_28", "RHS_WhiteHead_32"]] call _fnc_saveToTemplate;
 ["voices", ["male01gre","male02gre","male03gre","male04gre","male05gre","male06gre"]] call _fnc_saveToTemplate;
+"SerbianMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/RHS/RHS_AI_USAF_Army_Arctic.sqf b/A3A/addons/core/Templates/Templates/RHS/RHS_AI_USAF_Army_Arctic.sqf
@@ -83,6 +83,7 @@
 
 ["faces", ["AfricanHead_01", "AfricanHead_02", "AfricanHead_03", "Barklem", "GreekHead_A3_05", "GreekHead_A3_06", "GreekHead_A3_07", "GreekHead_A3_08", "GreekHead_A3_09", "Sturrock", "WhiteHead_01", "WhiteHead_02", "WhiteHead_03", "WhiteHead_04", "WhiteHead_05", "WhiteHead_06", "WhiteHead_08", "WhiteHead_09", "WhiteHead_10", "WhiteHead_11", "WhiteHead_12", "WhiteHead_13", "WhiteHead_14", "WhiteHead_15", "WhiteHead_16", "WhiteHead_17", "WhiteHead_18", "WhiteHead_19", "WhiteHead_20", "WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["Male01ENG", "Male02ENG", "Male03ENG", "Male04ENG", "Male05ENG", "Male06ENG", "Male07ENG", "Male08ENG", "Male09ENG", "Male10ENG", "Male11ENG", "Male12ENG"]] call _fnc_saveToTemplate;
+"NATOMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/RHS/RHS_AI_USAF_Army_Arid.sqf b/A3A/addons/core/Templates/Templates/RHS/RHS_AI_USAF_Army_Arid.sqf
@@ -83,6 +83,7 @@
 
 ["faces", ["AfricanHead_01", "AfricanHead_02", "AfricanHead_03", "Barklem", "GreekHead_A3_05", "GreekHead_A3_06", "GreekHead_A3_07", "GreekHead_A3_08", "GreekHead_A3_09", "Sturrock", "WhiteHead_01", "WhiteHead_02", "WhiteHead_03", "WhiteHead_04", "WhiteHead_05", "WhiteHead_06", "WhiteHead_08", "WhiteHead_09", "WhiteHead_10", "WhiteHead_11", "WhiteHead_12", "WhiteHead_13", "WhiteHead_14", "WhiteHead_15", "WhiteHead_16", "WhiteHead_17", "WhiteHead_18", "WhiteHead_19", "WhiteHead_20", "WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["Male01ENG", "Male02ENG", "Male03ENG", "Male04ENG", "Male05ENG", "Male06ENG", "Male07ENG", "Male08ENG", "Male09ENG", "Male10ENG", "Male11ENG", "Male12ENG"]] call _fnc_saveToTemplate;
+"NATOMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/RHS/RHS_AI_USAF_Army_Temperate.sqf b/A3A/addons/core/Templates/Templates/RHS/RHS_AI_USAF_Army_Temperate.sqf
@@ -83,6 +83,7 @@
 
 ["faces", ["AfricanHead_01", "AfricanHead_02", "AfricanHead_03", "Barklem", "GreekHead_A3_05", "GreekHead_A3_06", "GreekHead_A3_07", "GreekHead_A3_08", "GreekHead_A3_09", "Sturrock", "WhiteHead_01", "WhiteHead_02", "WhiteHead_03", "WhiteHead_04", "WhiteHead_05", "WhiteHead_06", "WhiteHead_08", "WhiteHead_09", "WhiteHead_10", "WhiteHead_11", "WhiteHead_12", "WhiteHead_13", "WhiteHead_14", "WhiteHead_15", "WhiteHead_16", "WhiteHead_17", "WhiteHead_18", "WhiteHead_19", "WhiteHead_20", "WhiteHead_21"]] call _fnc_saveToTemplate;
 ["voices", ["Male01ENG", "Male02ENG", "Male03ENG", "Male04ENG", "Male05ENG", "Male06ENG", "Male07ENG", "Male08ENG", "Male09ENG", "Male10ENG", "Male11ENG", "Male12ENG"]] call _fnc_saveToTemplate;
+"NATOMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/RHS/RHS_AI_USAF_Marines_Arid.sqf b/A3A/addons/core/Templates/Templates/RHS/RHS_AI_USAF_Marines_Arid.sqf
@@ -84,6 +84,7 @@
 ["faces", ["AfricanHead_03", "Barklem", "GreekHead_A3_05", "GreekHead_A3_06", "GreekHead_A3_07", "GreekHead_A3_08", "GreekHead_A3_09", "Sturrock", "WhiteHead_02", "WhiteHead_03", "WhiteHead_04", "WhiteHead_05", "WhiteHead_06", "WhiteHead_07", "WhiteHead_09", "WhiteHead_10", "WhiteHead_11", "WhiteHead_12", "WhiteHead_14", "WhiteHead_15", "WhiteHead_16", "WhiteHead_18", "WhiteHead_19", "WhiteHead_20"]] call _fnc_saveToTemplate;
 ["voices", ["Male01ENG", "Male02ENG", "Male03ENG", "Male04ENG", "Male05ENG", "Male06ENG", "Male07ENG", "Male08ENG", "Male09ENG", "Male10ENG", "Male11ENG", "Male12ENG"]] call _fnc_saveToTemplate;
 ["sfFaces", ["AfricanHead_01", "AfricanHead_03", "Barklem", "CamoHead_White_01_F", "CamoHead_White_09_F", "CamoHead_White_10_F", "CamoHead_White_11_F", "CamoHead_White_16_F", "CamoHead_White_17_F", "CamoHead_White_19_F", "GreekHead_A3_06", "GreekHead_A3_07", "GreekHead_A3_08", "GreekHead_A3_09", "Sturrock", "WhiteHead_02", "WhiteHead_03", "WhiteHead_04", "WhiteHead_05", "WhiteHead_07", "WhiteHead_08", "WhiteHead_09", "WhiteHead_10", "WhiteHead_12", "WhiteHead_14", "WhiteHead_15", "WhiteHead_16", "WhiteHead_17", "WhiteHead_18", "WhiteHead_19", "WhiteHead_20", "WhiteHead_21"]] call _fnc_saveToTemplate;
+"NATOMen" call _fnc_saveNames;
 
 //////////////////////////
 //       Loadouts       //