Edits to hopefully fix merge conflict

official-antistasi-community · Jun 12, 2022 · 4037662 · 4037662
1 parent 4e64963
commit 4037662
Show file tree

Hide file tree

Showing 32 changed files with 5,188 additions and 4,223 deletions.
diff --git a/A3A/addons/core/Templates/Templates.hpp b/A3A/addons/core/Templates/Templates.hpp
@@ -26,12 +26,15 @@ class Templates
                 class camo
                 { //template file name would follow: {path}\{Modset}_{Type}_{Faction}_{camo}.sqf
                 // note if `file` is set it becomes the following: {file}_{camo}.sqf
-                    tropical = "Tropical";
-                    temperate = "Enoch";
-                    Default = "Arid"; //default is the fallback if the climate is not in this class
+                    arid = "Arid";
+                    Default = "Temperate"; //default is the fallback if the climate is not in this class
                 };
             };
 
+            class CSAT_Apex {};
+
+            class CSAT_Enoch {};
+
             class LDF {};
 
             class NATO
@@ -44,6 +47,8 @@ class Templates
                 };
             };
 
+            class NATO_Apex {};
+
             class AAF {};
 
         };
@@ -75,12 +80,15 @@ class Templates
 
             class tanoa: Default
             {
+                Occ = "NATO_Apex";
+                Inv = "CSAT_Apex";
                 Reb = "SDK";
             };
 
             class enoch: Default
             {
                 Occ = "LDF";
+                Inv = "CSAT_Enoch";
             };
         };
 
@@ -153,6 +161,7 @@ class Templates
                 class camo
                 {
                     arid = "Arid";
+                    arctic = "Arctic";
                     Default = "Temperate";
                 };
             };
@@ -215,9 +224,13 @@ class Templates
             class TKA_East {};
             class TKA_Mix {};
             class TKA_West {};
+            class KRG {};
             class AAF {
                 displayName = "3CB AAF";
             };
+            class LDF {
+                displayname = "3CB LDF"
+            };
         };
 
         class Reb
@@ -250,6 +263,10 @@ class Templates
                 Reb = "TKM";
                 Civ = "TKC"
             };
+            class enoch
+            {
+                Occ = "LDF";
+            };
             class tem_anizay : kunduz {};
             class altis
             {
@@ -596,5 +613,4 @@ class Templates
 
         Nodes[] = {"AegisAtlas_Logistics_Nodes.sqf"};
     };
-
 };
diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_AAF.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_AAF.sqf
@@ -81,7 +81,7 @@ if (allowDLCTanks) then {
 		_APCs append ["I_LT_01_AT_F", "I_LT_01_cannon_F"];
 };
 //If Western Sahara DLC
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
 		_cargoTrucks = ["I_Truck_02_flatbed_lxWS", "I_Truck_02_cargo_lxWS"];
 		_AA append ["I_A_Truck_02_aa_lxWS"];
 };

diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_Argana.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_Argana.sqf
@@ -75,7 +75,7 @@ private _cargoTrucks = ["O_Truck_02_transport_F", "O_Truck_02_covered_F"];
 ["minefieldAPERS", ["APERSMine"]] call _fnc_saveToTemplate;
 
 //If Western Sahara DLC
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
 		_cargoTrucks = ["O_A_Truck_02_flatbed_F", "O_A_Truck_02_cargo_F"];
 };
 ["vehiclesCargoTrucks", _cargoTrucks] call _fnc_saveToTemplate;

diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_Belarus.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_Belarus.sqf
@@ -76,7 +76,7 @@ private _cargoTrucks = ["Atlas_O_W_Truck_03_transport_ghex_F","Atlas_O_W_Truck_0
 ["minefieldAPERS", ["APERSMine"]] call _fnc_saveToTemplate;
 
 //If Western Sahara DLC
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
 		_cargoTrucks = ["Atlas_O_W_Truck_02_cargo_F", "Atlas_O_W_Truck_02_flatbed_F"];
 };
 ["vehiclesCargoTrucks", _cargoTrucks] call _fnc_saveToTemplate;

diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_China.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_China.sqf
@@ -77,7 +77,7 @@ private _cargoTrucks = ["O_T_Truck_02_transport_F","O_T_Truck_02_F","O_T_Truck_0
 ["minefieldAPERS", ["APERSMine"]] call _fnc_saveToTemplate;
 
 //If Western Sahara DLC
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
 		_cargoTrucks = ["O_T_Truck_02_cargo_lxWS","O_T_Truck_02_flatbed_lxWS"];
 };
 ["vehiclesCargoTrucks", _cargoTrucks] call _fnc_saveToTemplate;

diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_HIMF.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_HIMF.sqf
@@ -80,7 +80,7 @@ private _APCs = ["B_T_APC_Wheeled_01_cannon_v2_F", "B_T_APC_Tracked_01_rcws_F"];
 ["minefieldAPERS", ["APERSMine"]] call _fnc_saveToTemplate;
 
 //If Western Sahara DLC
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
 		_APCs append ["B_T_APC_Wheeled_01_command_lxWS"];
 };
 ["vehiclesAPCs", _APCs] call _fnc_saveToTemplate;

diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_Iran.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_Iran.sqf
@@ -75,7 +75,7 @@ private _cargoTrucks = ["O_Truck_02_transport_F", "O_Truck_02_covered_F", "O_Tru
 ["minefieldAPERS", ["APERSMine"]] call _fnc_saveToTemplate;
 
 //If Western Sahara DLC
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
 		_cargoTrucks = ["O_Truck_02_cargo_lxWS","O_Truck_02_flatbed_lxWS"];
 };
 ["vehiclesCargoTrucks", _cargoTrucks] call _fnc_saveToTemplate;

diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_LDF.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_LDF.sqf
@@ -79,7 +79,7 @@ private _cargoTrucks = ["I_E_Truck_02_transport_F", "I_E_Truck_02_F"];
 ["minefieldAPERS", ["APERSMine"]] call _fnc_saveToTemplate;
 
 //If Western Sahara DLC
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
 		_cargoTrucks = ["I_E_Truck_02_cargo_lxWS","I_E_Truck_02_flatbed_lxWS"];
 };
 ["vehiclesCargoTrucks", _cargoTrucks] call _fnc_saveToTemplate;

diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_Legionnaires.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_Legionnaires.sqf
@@ -77,7 +77,7 @@ private _APCs = ["B_APC_Wheeled_01_cannon_v2_F"];
 ["minefieldAPERS", ["APERSMine"]] call _fnc_saveToTemplate;
 
 //If Western Sahara DLC
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
 		_APCs append ["APC_Wheeled_01_atgm_base_lxWS", "APC_Wheeled_01_command_base_lxWS"];
 };
 ["vehiclesAPCs", _APCs] call _fnc_saveToTemplate;

diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_Russia.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_Russia.sqf
@@ -77,7 +77,7 @@ private _cargoTrucks = ["O_R_Truck_03_transport_F","O_R_Truck_03_covered_F","O_R
 ["minefieldAPERS", ["APERSMine"]] call _fnc_saveToTemplate;
 
 //If Western Sahara DLC
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
 		_cargoTrucks = ["O_R_Truck_02_cargo_F","O_R_Truck_02_flatbed_F"];
 };
 ["vehiclesCargoTrucks", _cargoTrucks] call _fnc_saveToTemplate;

diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_Takistani.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_Takistani.sqf
@@ -76,7 +76,7 @@ private _cargoTrucks = ["Atlas_O_T_Truck_02_transport_F", "Atlas_O_T_Truck_02_F"
 ["minefieldAPERS", ["APERSMine"]] call _fnc_saveToTemplate;
 
 //If Western Sahara DLC
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
 		_cargoTrucks = ["Atlas_O_T_Truck_02_cargo_F","Atlas_O_T_Truck_02_flatbed_F"];
 };
 ["vehiclesCargoTrucks", _cargoTrucks] call _fnc_saveToTemplate;

diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_US_Arid.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_US_Arid.sqf
@@ -78,7 +78,7 @@ private _APCs = ["B_APC_Wheeled_01_cannon_v2_F", "B_APC_Tracked_01_rcws_F", "B_A
 ["minefieldAPERS", ["APERSMine"]] call _fnc_saveToTemplate;
 
 //If Western Sahara DLC
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
 		_APCs append ["APC_Wheeled_01_atgm_base_lxWS", "APC_Wheeled_01_command_base_lxWS"];
 };
 ["vehiclesAPCs", _APCs] call _fnc_saveToTemplate;

diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_US_Temperate.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_US_Temperate.sqf
@@ -78,7 +78,7 @@ private _APCs = ["B_W_APC_Wheeled_01_cannon_v2_F", "B_W_APC_Tracked_01_rcws_F",
 ["minefieldAPERS", ["APERSMine"]] call _fnc_saveToTemplate;
 
 //If Western Sahara DLC
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
 		_APCs append ["B_T_APC_Wheeled_01_atgm_lxWS_v2", "B_T_APC_Wheeled_01_command_lxWS"];
 };
 ["vehiclesAPCs", _APCs] call _fnc_saveToTemplate;

diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_US_Tropical.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_AI_US_Tropical.sqf
@@ -79,7 +79,7 @@ private _APCs = ["B_T_APC_Wheeled_01_cannon_v2_F", "B_T_APC_Tracked_01_rcws_F",
 ["minefieldAPERS", ["APERSMine"]] call _fnc_saveToTemplate;
 
 //If Western Sahara DLC
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
 		_APCs append ["B_T_APC_Wheeled_01_atgm_lxWS_v2", "B_T_APC_Wheeled_01_command_lxWS"];
 };
 ["vehiclesAPCs", _APCs] call _fnc_saveToTemplate;

diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_Civ.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_Civ.sqf
@@ -130,7 +130,7 @@ if (allowDLCOrange) then {
   ];
 };
 
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
   _dlcUniforms append [
     "U_lxWS_C_Djella_01",
     "U_lxWS_C_Djella_02",

diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_Reb_FIA.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_Reb_FIA.sqf
@@ -39,7 +39,7 @@ private _staticAA = "I_static_AA_F";
 ["breachingExplosivesAPC", [["DemoCharge_Remote_Mag", 1]]] call _fnc_saveToTemplate;
 ["breachingExplosivesTank", [["SatchelCharge_Remote_Mag", 1], ["DemoCharge_Remote_Mag", 2]]] call _fnc_saveToTemplate;
 
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
   _vehicleAA = "I_Tura_Truck_02_aa_lxWS";
   _staticAA = "B_G_ZU23_lxWS_F";
 };
@@ -112,7 +112,7 @@ if (allowDLCAoW) then {_dlcUniforms append [
 ];
 };
 
-if (allowDLCWS) then {_dlcUniforms append [
+if (allowDLCWS && A3A_hasWS) then {_dlcUniforms append [
     "U_lxWS_ION_Casual1",
     "U_lxWS_ION_Casual2",
     "U_lxWS_ION_Casual3",

diff --git a/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_Reb_SDK.sqf b/A3A/addons/core/Templates/Templates/AegisAtlas/AegisAtlas_Reb_SDK.sqf
@@ -39,7 +39,7 @@ private _staticAA = "I_static_AA_F";
 ["breachingExplosivesAPC", [["DemoCharge_Remote_Mag", 1]]] call _fnc_saveToTemplate;
 ["breachingExplosivesTank", [["SatchelCharge_Remote_Mag", 1], ["DemoCharge_Remote_Mag", 2]]] call _fnc_saveToTemplate;
 
-if (allowDLCWS) then {
+if (allowDLCWS && A3A_hasWS) then {
   _vehicleAA = "I_Tura_Truck_02_aa_lxWS";
   _staticAA = "B_G_ZU23_lxWS_F";
 };
@@ -108,7 +108,7 @@ if (allowDLCAoW) then {_dlcUniforms append [
 ];
 };
 
-if (allowDLCWS) then {_dlcUniforms append [
+if (allowDLCWS && A3A_hasWS) then {_dlcUniforms append [
     "U_lxWS_ION_Casual1",
     "U_lxWS_ION_Casual2",
     "U_lxWS_ION_Casual3",