Western Sahara ION Services template (#2939)

* Vanilla + WS retextures * Create WS_Vehicle_Attributes.sqf * change transfer * ION Marker * APEX Expansion * killing more UNA files * killed unused retextures * Update WS_AI_ION.sqf * Update WS_AI_ION.sqf * Update WS_AI_ION.sqf * Update WS_AI_ION.sqf * tabs to spaces & space reduction in class entries --------- Co-authored-by: Bob-Murphy <Bob-Murphy@users.noreply.github.com> Co-authored-by: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com>
official-antistasi-community · Oct 18, 2023 · 4da7329 · 4da7329
1 parent b38c80a
commit 4da7329
Show file tree

Hide file tree

Showing 6 changed files with 1,053 additions and 28 deletions.
diff --git a/A3A/addons/config_fixes/Vanilla/air.hpp b/A3A/addons/config_fixes/Vanilla/air.hpp
@@ -1,7 +1,9 @@
+
 class I_Heli_Transport_02_F;
 class B_Heli_Light_01_F;
 class B_Heli_Light_01_stripped_F;
 class B_Heli_Light_01_dynamicLoadout_F;
+
 class O_Heli_Light_02_dynamicLoadout_F;
 class O_Heli_Light_02_unarmed_F;
 

diff --git a/A3A/addons/config_fixes/Vanilla/soft.hpp b/A3A/addons/config_fixes/Vanilla/soft.hpp
@@ -211,4 +211,4 @@ class a3a_Van_02_black_medevac_F : C_Van_02_medevac_F
         };
     };
     textureList[] = {"Black",1,"White",0,"CivAmbulance",0,"IdapAmbulance",0,"LDFAmbulance",0};
-};
+};
diff --git a/A3A/addons/config_fixes/WS/CfgVehicles.hpp b/A3A/addons/config_fixes/WS/CfgVehicles.hpp
@@ -39,7 +39,6 @@ class CfgVehicles
         textureList[] = {};
         hiddenSelectionsTextures[] = {"a3\soft_f\offroad_01\data\offroad_01_ext_base01_co.paa","a3\soft_f\offroad_01\data\offroad_01_ext_base01_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_adds_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_armor_sfia2_co.paa"};
     };
-
     class a3a_green_Offroad_armor : B_Tura_Offroad_armor_lxWS
     {
         textureList[] = {};
@@ -55,7 +54,6 @@ class CfgVehicles
         textureList[] = {};
         hiddenSelectionsTextures[] = {"a3\soft_f_enoch\offroad_01\data\offroad_01_ext_grn_co.paa","a3\soft_f_enoch\offroad_01\data\offroad_01_ext_grn_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_adds_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_armor_rust_co.paa"};
     };
-
     class a3a_ldf_Offroad_armor : B_Tura_Offroad_armor_lxWS
     {
         textureList[] = {};
@@ -80,7 +78,6 @@ class CfgVehicles
         side = 2;
         hiddenSelectionsTextures[] = {"a3\soft_f_enoch\offroad_01\data\offroad_01_ext_eaf_co.paa","a3\soft_f_enoch\offroad_01\data\offroad_01_ext_eaf_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_adds_black_co.paa","lxws\vehicles_f_lxws\offroad_01\data\offroad_01_armor_rust_co.paa"};
     };
-
     class a3a_SIFA_Truck_02_medical_F : O_Truck_02_medical_F
     {
         side = 0;
@@ -109,4 +106,4 @@ class CfgVehicles
         faction = "IND_E_F";
         hiddenSelectionsTextures[] = {"a3\soft_f_enoch\truck_02\data\truck_02_kab_eaf_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_eaf_co.paa","a3\soft_f_enoch\truck_02\data\truck_02_int_eaf_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_base_green_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_green_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_1_green_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_2_green_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"};
     };
-};
+};
diff --git a/A3A/addons/core/CfgMarkers.hpp b/A3A/addons/core/CfgMarkers.hpp
@@ -1,26 +1,37 @@
-class CfgMarkers {
-	class flag_NATO;
+class CfgMarkers
+{
+    class flag_NATO;
 
-	class a3a_flag_cdf: flag_NATO {
-		name = "CDF";
-		icon = QPATHTOFOLDER(Pictures\Markers\cdf_ca.paa);
-		texture = QPATHTOFOLDER(Pictures\Markers\cdf_ca.paa);
-	};
+    class a3a_flag_cdf : flag_NATO 
+    {
+        name = "CDF";
+        icon = QPATHTOFOLDER(Pictures\Markers\cdf_ca.paa);
+        texture = QPATHTOFOLDER(Pictures\Markers\cdf_ca.paa);
+    };
 
-	class a3a_flag_napa: flag_NATO {
-		name = "NAPA";
-		icon = QPATHTOFOLDER(Pictures\Markers\napa_ca.paa);
-		texture = QPATHTOFOLDER(Pictures\Markers\napa_ca.paa);
-	};
-
-	class a3a_flag_serbia: flag_NATO {
-		name = "Serbia";
-		icon = QPATHTOFOLDER(Pictures\Markers\serbia_ca.paa);
-		texture = QPATHTOFOLDER(Pictures\Markers\serbia_ca.paa);
-	};
-	class a3a_flag_chdkz: flag_NATO {
-		name = "ChDKZ";
-		icon = QPATHTOFOLDER(Pictures\Markers\chdkz_co.paa);
-		texture = QPATHTOFOLDER(Pictures\Markers\chdkz_co.paa);
-	};
+    class a3a_flag_napa : flag_NATO 
+    {
+        name = "NAPA";
+        icon = QPATHTOFOLDER(Pictures\Markers\napa_ca.paa);
+        texture = QPATHTOFOLDER(Pictures\Markers\napa_ca.paa);
+    };
+
+    class a3a_flag_serbia : flag_NATO 
+    {
+        name = "Serbia";
+        icon = QPATHTOFOLDER(Pictures\Markers\serbia_ca.paa);
+        texture = QPATHTOFOLDER(Pictures\Markers\serbia_ca.paa);
+    };
+    class a3a_flag_chdkz : flag_NATO 
+    {
+        name = "ChDKZ";
+        icon = QPATHTOFOLDER(Pictures\Markers\chdkz_co.paa);
+        texture = QPATHTOFOLDER(Pictures\Markers\chdkz_co.paa);
+    };
+    class a3a_flag_ION : flag_NATO 
+    {
+        name = "ION";
+        icon = "\A3\Data_F\Flags\flag_ion_CO.paa";
+        texture = "\A3\Data_F\Flags\flag_ion_CO.paa"; //TODO: rectangularize marker texture
+    };
 };
diff --git a/A3A/addons/core/Templates/Templates.hpp b/A3A/addons/core/Templates/Templates.hpp
@@ -126,6 +126,13 @@ class Templates
         forceDLC[] = {"ws"};
         climate[] = {"arid"};
     };
+    class WS_ION : WS_Base
+    {
+        side = "Inv";
+        flagTexture = "\A3\Data_F\Flags\flag_ion_CO.paa";
+        name = "WS ION";
+        file = "WS_AI_ION";
+    };
     class WS_SIFA : WS_Base
     {
         side = "Inv";
-Original file line number
+Diff line change
@@ Expand Up / @@ -211,4 +211,4 @@ class a3a_Van_02_black_medevac_F : C_Van_02_medevac_F @@
             };
         };
         textureList[] = {"Black",1,"White",0,"CivAmbulance",0,"IdapAmbulance",0,"LDFAmbulance",0};
-    };
+    };