Merge branch 'unstable' into ProjInf_Arms_Dealer

SilenceIsFatto · Oct 6, 2024 · 1e8f16f · 1e8f16f
2 parents d29d9a0 + 07579a2
commit 1e8f16f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/A3A/addons/core/Templates/Templates/CSA38/CSA_Reb_CZE.sqf b/A3A/addons/core/Templates/Templates/CSA38/CSA_Reb_CZE.sqf
@@ -94,7 +94,7 @@ private _dlcUniforms = [];
 
 ["faces", ["LIB_aleksei_IF","LIB_boyartsev_IF","LIB_bykov_IF",
 "LIB_Otto_IF","LIB_Volker_IF", "LIB_Walter_IF", "LIB_Wolf_IF"]] call _fnc_saveToTemplate;
-["voices", ["Male01PL", "Male02PL", "Male03PL"]] call _fnc_saveToTemplate;
+["voices", ["Male01CZ", "Male02CZ", "Male03CZ", "Male04CZ", "Male05CZ"]] call _fnc_saveToTemplate;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/CW/templates.hpp b/A3A/addons/core/Templates/Templates/CW/templates.hpp
@@ -70,7 +70,7 @@
     {
         side = "Occ";
         flagTexture = QPATHTOFOLDER(Templates\Templates\CW\flag_Empire.paa);
-        name = "Empire";
+        name = "JMs Empire";
         file = "EMP_AI_EMP";
     };
 
@@ -79,15 +79,15 @@
         requiredAddons[] = {"3AS_Characters", "442_equipment", "SWLB_clones", "JLTS_core", "CWDependencies", "JMSLLTE_empire_mod", "WBK_Lightsabers"};
         side = "Occ";
         flagTexture = QPATHTOFOLDER(Templates\Templates\CW\flag_Empire.paa);
-        name = "Empire (WBK)";
+        name = "JMs Empire (WBK)";
         file = "EMP_AI_EMP_WBK";
     };
 
     class EMP_RIV_GP : EMP_Base
     {
         side = "Riv";
 		flagTexture = QPATHTOFOLDER(Templates\Templates\CW\flag_partisans.paa);
-        name = "EMP Partisans";
+        name = "JMs EMP Partisans";
         file = "EMP_Riv_GP";
         description = "Saw Gerrera's Partisans are an extremely militant, anti-imperial group, willing to use any and all tactics against their enemies.";
     };
@@ -96,7 +96,7 @@
     {
         side = "Civ";
         flagTexture = QPATHTOFOLDER(Templates\Templates\CW\flag_Empire.paa);
-        name = "EMP Civ";
+        name = "JMs EMP Civ";
         file = "EMP_Civ";
     };
 
@@ -112,12 +112,12 @@
     {
         side = "Occ";
         flagTexture = QPATHTOFOLDER(Templates\Templates\CW\flag_Empire.paa);
-        name = "Empire";
+        name = "WM Empire";
         file = "WM_AI_EMP";
     };
     class WM_EMP_Arctic : WM_EMP
     {
-        name = "Empire (Arctic)";
+        name = "WM Empire (Arctic)";
         file = "WM_AI_EMP_Arctic";
         climate[] = {"arctic"};
     };

diff --git a/A3A/addons/core/Templates/Templates/NFtS/NFtS_Reb_FIN_Arctic.sqf b/A3A/addons/core/Templates/Templates/NFtS/NFtS_Reb_FIN_Arctic.sqf
@@ -93,7 +93,7 @@ private _dlcUniforms = [];
 
 ["faces", ["LIB_aleksei_IF","LIB_boyartsev_IF","LIB_bykov_IF",
 "LIB_Otto_IF","LIB_Volker_IF", "LIB_Walter_IF", "LIB_Wolf_IF"]] call _fnc_saveToTemplate;
-["voices", ["Male01PL", "Male02PL", "Male03PL"]] call _fnc_saveToTemplate;
+["voices", ["Male01FIN", "Male02FIN", "Male03FIN", "Male04FIN"]] call _fnc_saveToTemplate;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/NFtS/NFtS_Reb_FIN_Temperate.sqf b/A3A/addons/core/Templates/Templates/NFtS/NFtS_Reb_FIN_Temperate.sqf
@@ -93,7 +93,7 @@ private _dlcUniforms = [];
 
 ["faces", ["LIB_aleksei_IF","LIB_boyartsev_IF","LIB_bykov_IF",
 "LIB_Otto_IF","LIB_Volker_IF", "LIB_Walter_IF", "LIB_Wolf_IF"]] call _fnc_saveToTemplate;
-["voices", ["Male01PL", "Male02PL", "Male03PL"]] call _fnc_saveToTemplate;
+["voices", ["Male01FIN", "Male02FIN", "Male03FIN", "Male04FIN"]] call _fnc_saveToTemplate;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/NFtS/NFtS_Reb_NOR_Arctic.sqf b/A3A/addons/core/Templates/Templates/NFtS/NFtS_Reb_NOR_Arctic.sqf
@@ -8,7 +8,7 @@
 
 ["flag", "Flag_FIA_F"] call _fnc_saveToTemplate;
 ["flagTexture", QPATHTOFOLDER(Templates\Templates\NFtS\flag_norway.paa)] call _fnc_saveToTemplate;
-["flagMarkerType", "NORTH_Flag_FIN"] call _fnc_saveToTemplate;
+["flagMarkerType", "flag_Norway"] call _fnc_saveToTemplate;
 
 ["vehiclesBasic", ["NORTH_FIN_41_R75"]] call _fnc_saveToTemplate;
 ["vehiclesLightUnarmed", ["LIB_Kfz1_w"]] call _fnc_saveToTemplate;
@@ -95,7 +95,7 @@ private _dlcUniforms = [];
 
 ["faces", ["LIB_aleksei_IF","LIB_boyartsev_IF","LIB_bykov_IF",
 "LIB_Otto_IF","LIB_Volker_IF", "LIB_Walter_IF", "LIB_Wolf_IF"]] call _fnc_saveToTemplate;
-["voices", ["Male01PL", "Male02PL", "Male03PL"]] call _fnc_saveToTemplate;
+["voices", ["Male01FIN", "Male02FIN", "Male03FIN", "Male04FIN"]] call _fnc_saveToTemplate;
 
 //////////////////////////
 //       Loadouts       //

diff --git a/A3A/addons/core/Templates/Templates/NFtS/NFtS_Reb_NOR_Temperate.sqf b/A3A/addons/core/Templates/Templates/NFtS/NFtS_Reb_NOR_Temperate.sqf
@@ -8,7 +8,7 @@
 
 ["flag", "Flag_FIA_F"] call _fnc_saveToTemplate;
 ["flagTexture", QPATHTOFOLDER(Templates\Templates\NFtS\flag_norway.paa)] call _fnc_saveToTemplate;
-["flagMarkerType", "NORTH_Flag_FIN"] call _fnc_saveToTemplate;
+["flagMarkerType", "flag_Norway"] call _fnc_saveToTemplate;
 
 ["vehiclesBasic", ["NORTH_FIN_41_R75"]] call _fnc_saveToTemplate;
 ["vehiclesLightUnarmed", ["LIB_Kfz1_sernyt"]] call _fnc_saveToTemplate;
@@ -91,7 +91,7 @@ private _dlcUniforms = [];
 
 ["faces", ["LIB_aleksei_IF","LIB_boyartsev_IF","LIB_bykov_IF",
 "LIB_Otto_IF","LIB_Volker_IF", "LIB_Walter_IF", "LIB_Wolf_IF"]] call _fnc_saveToTemplate;
-["voices", ["Male01PL", "Male02PL", "Male03PL"]] call _fnc_saveToTemplate;
+["voices", ["Male01FIN", "Male02FIN", "Male03FIN", "Male04FIN"]] call _fnc_saveToTemplate;
 
 //////////////////////////
 //       Loadouts       //