Western Sahara Civilians & Tura rebels templates

A3A/addons/config_fixes/Vanilla/air.hpp

@@ -1,3 +1,7 @@
+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 I_Heli_Transport_02_F;
 class B_Heli_Light_01_F;

A3A/addons/config_fixes/Vanilla/armor.hpp

@@ -2,6 +2,7 @@ class I_MRAP_03_F;
 class I_MRAP_03_gmg_F;
 class I_MRAP_03_hmg_F;
 class I_APC_Wheeled_03_cannon_F;
+
 class O_MBT_04_cannon_F; 
 class O_MBT_04_command_F;
 

A3A/addons/config_fixes/Vanilla/config.cpp

@@ -19,4 +19,4 @@ class CfgPatches {
 //#include "CfgMagazines.hpp"
 #include "CfgVehicles.hpp"
 //#include "CfgMarkers.hpp"
-//#include "CfgWeapons.hpp"
+//#include "CfgWeapons.hpp"

A3A/addons/config_fixes/Vanilla/sea.hpp

@@ -5,4 +5,4 @@ class a3a_Boat_Armed_01_hmg_blufor_F : O_Boat_Armed_01_hmg_F
     scope = 2;
     textureList[] = {"Blufor",1,"Indep",0,"Opfor",0};
     hiddenSelectionsTextures[] = {"a3\boat_f\boat_armed_01\data\boat_armed_01_ext_co.paa","a3\boat_f\boat_armed_01\data\boat_armed_01_int_co.paa","a3\boat_f\boat_armed_01\data\boat_armed_01_crows_blufor_co.paa"};
-};
+};

A3A/addons/config_fixes/Vanilla/soft.hpp

@@ -174,6 +174,41 @@ class a3a_LSV_01_AT_black_F : B_LSV_01_AT_F
     scope = 2;
     textureList[] = {"Black",1,"Olive",0,"Sand",0};
 };
+
+class a3a_Van_02_black_transport_F : C_Van_02_transport_F
+{
+    scope = 2;
+    textureList[] = {"Swifd",0,"IdapCargo",0,"IdapTransport",0,"IdapAmbulance",0,"CivAmbulance",0,"CivService",0,"Syndikat",0,"FIA3",0,"FIA2",0,"FIA1",0,"Daltgreen",0,"Vrana",0,"BluePearl",0,"Fuel",0,"BattleBus",0,"Green",0,"Black",1,"Red",0,"Blue",0,"Orange",0,"White",0};
+};
+class a3a_Van_02_black_vehicle_F : C_Van_02_vehicle_F
+{
+    scope = 2;
+    textureList[] = {"Swifd",0,"IdapCargo",0,"IdapTransport",0,"IdapAmbulance",0,"CivAmbulance",0,"CivService",0,"Syndikat",0,"FIA3",0,"FIA2",0,"FIA1",0,"Daltgreen",0,"Vrana",0,"BluePearl",0,"Fuel",0,"BattleBus",0,"Green",0,"Black",1,"Red",0,"Blue",0,"Orange",0,"White",0};
+};
+class a3a_Van_02_black_service_F : C_Van_02_service_F
+{
+    scope = 2;
+    textureList[] = {"Swifd",0,"IdapCargo",0,"IdapTransport",0,"IdapAmbulance",0,"CivAmbulance",0,"CivService",0,"Syndikat",0,"FIA3",0,"FIA2",0,"FIA1",0,"Daltgreen",0,"Vrana",0,"BluePearl",0,"Fuel",0,"BattleBus",0,"Green",0,"Black",1,"Red",0,"Blue",0,"Orange",0,"White",0};
+};
+class a3a_Van_02_black_medevac_F : C_Van_02_medevac_F
+{
+    scope = 2;
+    class TextureSources : TextureSources{
+        class Black{
+            author = "Bohemia Interactive";
+            displayName = "Black";
+            materials[] = {"\a3\Soft_F_Orange\Van_02\Data\van_body.rvmat","\A3\Soft_F_Orange\Van_02\Data\van_wheel.rvmat","","\a3\Data_f\Lights\Car_Beacon_Orange_emit.rvmat"};
+            textures[] = {"\a3\Soft_F_Orange\Van_02\Data\van_body_Black_CO.paa","\a3\soft_f_orange\van_02\data\van_wheel_co.paa","\a3\soft_f_orange\van_02\data\van_glass_utility_CA.paa","\a3\Soft_F_Orange\Van_02\Data\van_body_Black_CO.paa"};
+        };
+        class White{
+            author = "Bohemia Interactive";
+            displayName = "White";
+            materials[] = {"\a3\Soft_F_Orange\Van_02\Data\van_body.rvmat","\A3\Soft_F_Orange\Van_02\Data\van_wheel.rvmat","","\a3\Data_f\Lights\Car_Beacon_Orange_emit.rvmat"};
+            textures[] = {"\a3\Soft_F_Orange\Van_02\Data\van_body_White_CO.paa","\a3\soft_f_orange\van_02\data\van_wheel_co.paa","\a3\soft_f_orange\van_02\data\van_glass_utility_CA.paa","\a3\Soft_F_Orange\Van_02\Data\van_body_White_CO.paa"};
+        };
+    };
+    textureList[] = {"Black",1,"White",0,"CivAmbulance",0,"IdapAmbulance",0,"LDFAmbulance",0};
+};
 class a3a_Van_02_black_transport_F : C_Van_02_transport_F
 {
     scope = 2;

A3A/addons/config_fixes/WS/CfgVehicles.hpp

@@ -1,4 +1,3 @@
-
 class CfgVehicles
 {
     class O_Truck_02_Ammo_F;
@@ -22,7 +21,6 @@ class CfgVehicles
     class B_Tura_Offroad_armor_AT_lxWS;
     class B_Tura_Offroad_armor_armed_lxWS;
 
-
     #include "ws_ion.hpp"
 
     //Misc retextures
@@ -41,7 +39,7 @@ 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[] = {};
@@ -57,7 +55,7 @@ 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[] = {};
@@ -82,7 +80,7 @@ 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;
@@ -112,3 +110,4 @@ class CfgVehicles
         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"};
     };
 };
+

A3A/addons/core/Templates/Templates.hpp

@@ -126,6 +126,20 @@ class Templates
         forceDLC[] = {"ws"};
         climate[] = {"arid"};
     };
+	class WS_TURA : WS_Base
+	{
+        side = "Reb";
+        flagTexture = "a3\data_f\flags\flag_fia_co.paa";
+        name = "WS Tura";
+        file = "WS_Reb_TURA";
+	};
+	class WS_Civ : WS_Base
+	{
+        side = "Civ";
+        flagTexture = "\lxws\data_f_lxws\img\flags\flag_Argana_CO.paa";
+        name = "Western Sahara";
+        file = "WS_Civ";
+	};
 	class WS_NATO : WS_Base
 	{
         side = "Occ";

A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf

@@ -0,0 +1,229 @@
+//////////////////////////////
+//   Civilian Information   //
+//////////////////////////////
+
+//////////////////////////
+//       Vehicles       //
+//////////////////////////
+
+["vehiclesCivCar", [
+    "C_Quadbike_01_F", 0.15
+    ,"C_Hatchback_01_F", 1.0
+    ,"C_Hatchback_01_sport_F", 0.15
+    ,"C_Offroad_01_F", 1.5
+    ,"C_Offroad_lxWS", 1.5
+    ,"C_SUV_01_F", 0.75
+    ,"C_Van_02_vehicle_F", 1.0                // van from Orange
+    ,"C_Van_02_transport_F", 0.2            // minibus
+    ,"C_Offroad_02_unarmed_F", 1.5            // Apex 4WD
+    ,"C_Offroad_01_comms_F", 0.3            // Contact
+    ,"C_Offroad_01_covered_F", 0.3
+	]] call _fnc_saveToTemplate;
+
+["vehiclesCivIndustrial", [
+    "C_Van_01_transport_F", 1.0
+    ,"C_Van_01_box_F", 0.8
+    ,"C_Truck_02_transport_F", 0.5
+    ,"C_Truck_02_covered_F", 0.5
+    ,"C_Tractor_01_F", 0.3    
+    ,"C_Truck_02_racing_lxWS", 0.2
+	,"C_Truck_02_flatbed_lxWS", 0.5
+	,"C_Truck_02_cargo_lxWS", 0.5
+	]] call _fnc_saveToTemplate;
+
+["vehiclesCivBoat", [
+    "C_Boat_Civil_01_rescue_F", 0.1            // motorboats
+    ,"C_Boat_Civil_01_police_F", 0.1
+    ,"C_Boat_Civil_01_F", 1.0
+    ,"C_Rubberboat", 1.0                    // rescue boat
+    ,"C_Boat_Transport_02_F", 1.0            // RHIB
+    ,"C_Scooter_Transport_01_F", 0.5]] call _fnc_saveToTemplate;
+
+["vehiclesCivRepair", [
+    "C_Offroad_01_repair_F", 0.3
+    ,"C_Van_02_service_F", 0.3                // orange
+    ,"C_Truck_02_box_F", 0.1]] call _fnc_saveToTemplate;
+
+["vehiclesCivMedical", ["C_Van_02_medevac_F", 0.1]] call _fnc_saveToTemplate;
+
+["vehiclesCivFuel", [
+    "C_Van_01_fuel_F", 0.2
+    ,"C_Truck_02_fuel_F", 0.1]] call _fnc_saveToTemplate;
+
+/////////////////////
+///  Identities   ///
+/////////////////////
+
+["faces", ["PersianHead_A3_01","PersianHead_A3_02","PersianHead_A3_03",
+"lxWS_African_Head_Old","lxWS_African_Head_01","lxWS_African_Head_02",
+"lxWS_African_Head_03","lxWS_African_Head_04","lxWS_African_Head_05","lxWS_Said_Head",
+"lxWS_African_Head_Old_Bard"]] call _fnc_saveToTemplate;
+"lxWS_WSaharaMen" call _fnc_saveNames;
+
+//////////////////////////
+//       Loadouts       //
+//////////////////////////
+
+private _civUniforms = [
+    "U_lxWS_C_Djella_01",
+    "U_lxWS_C_Djella_02",
+    "U_lxWS_C_Djella_02a",
+    "U_lxWS_C_Djella_03",
+    "U_lxWS_C_Djella_04",
+    "U_lxWS_C_Djella_05",
+    "U_lxWS_C_Djella_06",
+    "U_lxWS_C_Djella_07",
+    "U_lxWS_Tak_01_A",
+    "U_lxWS_Tak_01_B",
+    "U_lxWS_Tak_01_C",
+    "U_lxWS_Tak_02_A",
+    "U_lxWS_Tak_02_B",
+    "U_lxWS_Tak_02_C",
+    "U_lxWS_Tak_03_A",
+    "U_lxWS_Tak_03_B",
+    "U_lxWS_Tak_03_C"
+];
+
+private _pressUniforms = [
+    "U_C_Journalist",
+    "U_Marshal"
+    ];
+
+private _workerUniforms = [
+    "U_C_WorkerCoveralls",
+    "U_C_Uniform_Farmer_01_F"
+    ];
+
+private _dlcUniforms = [];
+
+if (allowDLCOrange) then {
+  _dlcUniforms append [
+    "U_C_Paramedic_01_F",
+    "U_C_Mechanic_01_F"
+  ];
+};
+_workerUniforms append [
+"U_C_ConstructionCoverall_Black_F",
+"U_C_ConstructionCoverall_Blue_F",
+"U_C_ConstructionCoverall_Red_F",
+"U_C_ConstructionCoverall_Vrana_F"
+];
+
+["uniforms", _civUniforms + _pressUniforms + _workerUniforms + _dlcUniforms] call _fnc_saveToTemplate;
+
+private _civhats = [
+	"H_Bandanna_blu",
+	"H_Bandanna_cbr",
+	"H_Bandanna_gry",
+	"H_Bandanna_khk",
+	"H_Bandanna_sand",
+	"H_Bandanna_sgg",
+	"H_Bandanna_surfer",
+	"H_Bandanna_surfer_blk",
+	"H_Bandanna_surfer_grn",
+	"H_Cap_blk",
+	"H_Cap_blu",
+	"H_Cap_grn",
+	"H_Cap_grn_BI",
+	"H_Cap_oli",
+	"H_Cap_red",
+	"H_Cap_surfer",
+	"H_Cap_tan",
+	"H_StrawHat",
+	"H_StrawHat_dark",
+	"H_Hat_checker",
+	"H_ShemagOpen_khk",
+	"lxWS_H_cloth_5_A",
+	"lxWS_H_cloth_5_C",
+	"lxWS_H_cloth_5_B",
+
+	"lxWS_H_turban_01_black",
+	"lxWS_H_turban_01_blue",
+	"lxWS_H_turban_01_green",
+	"lxWS_H_turban_01_red",
+	"lxWS_H_turban_01_sand",
+	"lxWS_H_turban_01_gray",
+	"lxWS_H_turban_01_yellow",
+
+	"lxWS_H_turban_02_black",
+	"lxWS_H_turban_02_blue",
+	"lxWS_H_turban_02_green",
+	"lxWS_H_turban_02_orange",
+	"lxWS_H_turban_02_red",
+	"lxWS_H_turban_02_sand",
+	"lxWS_H_turban_02_gray",
+	"lxWS_H_turban_02_yellow",
+
+	"lxWS_H_turban_03_black",
+	"lxWS_H_turban_03_blue",
+	"lxWS_H_turban_03_green",
+	"lxWS_H_turban_03_orange",
+	"lxWS_H_turban_03_red",
+	"lxWS_H_turban_03_sand",
+	"lxWS_H_turban_03_gray",
+	"lxWS_H_turban_03_yellow",
+
+	"lxWS_H_turban_04_black",
+	"lxWS_H_turban_04_blue",
+	"lxWS_H_turban_04_green",
+	"lxWS_H_turban_04_red",
+	"lxWS_H_turban_04_sand",
+	"lxWS_H_turban_04_gray",
+	"lxWS_H_turban_04_yellow"
+];
+
+["headgear", _civHats] call _fnc_saveToTemplate;
+
+private _loadoutData = call _fnc_createLoadoutData;
+
+_loadoutData set ["uniforms", _civUniforms];
+_loadoutData set ["pressUniforms", _pressUniforms];
+_loadoutData set ["workerUniforms", _workerUniforms];
+_loadoutData set ["pressVests", ["V_Press_F"]];
+_loadoutData set ["helmets", _civHats];
+_loadoutData set ["pressHelmets", ["H_Cap_press", "H_PASGT_basic_blue_press_F","H_PASGT_neckprot_blue_press_F"]];
+
+_loadoutData set ["maps", ["ItemMap"]];
+_loadoutData set ["watches", ["ItemWatch"]];
+_loadoutData set ["compasses", ["ItemCompass"]];
+
+
+private _manTemplate = {
+    ["helmets"] call _fnc_setHelmet;
+    ["uniforms"] call _fnc_setUniform;
+
+    ["items_medical_standard"] call _fnc_addItemSet;
+
+    ["maps"] call _fnc_addMap;
+    ["watches"] call _fnc_addWatch;
+    ["compasses"] call _fnc_addCompass;
+};
+private _workerTemplate = {
+    ["helmets"] call _fnc_setHelmet;
+    ["workerUniforms"] call _fnc_setUniform;
+
+    ["items_medical_standard"] call _fnc_addItemSet;
+
+    ["maps"] call _fnc_addMap;
+    ["watches"] call _fnc_addWatch;
+    ["compasses"] call _fnc_addCompass;
+};
+private _pressTemplate = {
+    ["pressHelmets"] call _fnc_setHelmet;
+    ["pressVests"] call _fnc_setVest;
+    ["pressUniforms"] call _fnc_setUniform;
+
+    ["items_medical_standard"] call _fnc_addItemSet;
+
+    ["maps"] call _fnc_addMap;
+    ["watches"] call _fnc_addWatch;
+    ["compasses"] call _fnc_addCompass;
+};
+private _prefix = "militia";
+private _unitTypes = [
+    ["Press", _pressTemplate],
+    ["Worker", _workerTemplate],
+    ["Man", _manTemplate]
+];
+
+[_prefix, _unitTypes, _loadoutData] call _fnc_generateAndSaveUnitsToTemplate;