From 4c42ebc4cbe35d23a4cc807a33a4160a0078a549 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Tue, 5 Sep 2023 21:36:39 +0200 Subject: [PATCH 1/9] initial transfer --- A3A/addons/core/Templates/Templates.hpp | 28 +- .../core/Templates/Templates/WS/WS_Civ.sqf | 229 +++++++++++++++++ .../Templates/Templates/WS/WS_Reb_TURA.sqf | 241 ++++++++++++++++++ .../WS/WS_Reb_Vehicle_Attributes.sqf | 5 + 4 files changed, 501 insertions(+), 2 deletions(-) create mode 100644 A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf create mode 100644 A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf create mode 100644 A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf diff --git a/A3A/addons/core/Templates/Templates.hpp b/A3A/addons/core/Templates/Templates.hpp index 9d8931a1cb..efc33cf57a 100644 --- a/A3A/addons/core/Templates/Templates.hpp +++ b/A3A/addons/core/Templates/Templates.hpp @@ -116,6 +116,30 @@ class Templates file = "Vanilla_Civ"; }; + // ***************************** Western Sahara ***************************** + class WS_Base : Vanilla_Base + { + requiredAddons[] = {"Weapons_1_F_lxWS"}; + logo = "\lxWS\data_f_lxWS\Logos\arma3_lxws_logo_ca.paa"; + basepath = QPATHTOFOLDER(Templates\Templates\WS); //the path to the template folder + priority = 5; + 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"; + }; // ***************************** VN ***************************** class VN_Base @@ -410,7 +434,7 @@ class Templates { side = "Reb"; flagTexture = "uk3cb_factions\addons\uk3cb_factions_ion\flag\ion_flag_co.paa"; - name = "3CB ION"; + name = "3CB ION Rebells"; file = "3CB_Reb_ION"; }; class 3CBF_TKM : 3CBF_Base @@ -425,7 +449,7 @@ class Templates { side = "Reb"; flagTexture = "a3\data_f\flags\flag_fia_co.paa"; - name = "3CB FIA"; + name = "3CB FIA Rebells"; file = "3CB_Reb_FIA"; }; class 3CBF_CHC : 3CBF_Base diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Civ.sqf new file mode 100644 index 0000000000..f7d2155f64 --- /dev/null +++ b/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; diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf new file mode 100644 index 0000000000..2bfe6cfc37 --- /dev/null +++ b/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf @@ -0,0 +1,241 @@ +/////////////////////////// +// Rebel Information // +/////////////////////////// +["name", "Tura"] call _fnc_saveToTemplate; + +["flag", "Flag_FIA_F"] call _fnc_saveToTemplate; +["flagTexture", "a3\data_f\flags\flag_fia_co.paa"] call _fnc_saveToTemplate; +["flagMarkerType", "flag_FIA"] call _fnc_saveToTemplate; + + +["vehiclesBasic", ["I_G_Quadbike_01_F"]] call _fnc_saveToTemplate; +private _vehiclesLightUnarmed = ["O_SFIA_Offroad_lxWS","O_Tura_Offroad_armor_lxWS"]; +private _vehiclesLightArmed = ["O_SFIA_Offroad_armed_lxWS","O_Tura_Offroad_armor_armed_lxWS"]; +["vehiclesTruck", ["I_G_Van_01_transport_F"]] call _fnc_saveToTemplate; +private _vehiclesAT = ["O_SFIA_Offroad_AT_lxWS","O_Tura_Offroad_armor_AT_lxWS"]; +["vehiclesAA", ["I_Tura_Truck_02_aa_lxWS"]] call _fnc_saveToTemplate; + +["vehiclesBoat", ["I_C_Boat_Transport_02_F"]] call _fnc_saveToTemplate; + +["vehiclesPlane", ["I_C_Plane_Civil_01_F"]] call _fnc_saveToTemplate; + +private _vehiclesCivCar = ["C_Offroad_lxWS", "C_Hatchback_01_F", "C_Hatchback_01_sport_F", "C_SUV_01_F", "C_Offroad_01_F"]; +["vehiclesCivTruck", ["C_Van_01_transport_F", "C_Van_02_transport_F", "C_Van_02_vehicle_F","C_Truck_02_transport_F","C_Truck_02_covered_F","C_Truck_02_flatbed_lxWS","C_Truck_02_cargo_lxWS"]] call _fnc_saveToTemplate; +["vehiclesCivHeli", ["C_Heli_Light_01_civil_F", "a3a_C_Heli_Transport_02_F"]] call _fnc_saveToTemplate; +["vehiclesCivBoat", ["C_Boat_Civil_01_F", "C_Rubberboat"]] call _fnc_saveToTemplate; + +["staticMGs", ["I_G_HMG_02_high_F", "I_G_HMG_02_F"]] call _fnc_saveToTemplate; +["staticAT", ["I_static_AT_F"]] call _fnc_saveToTemplate; +["staticAA", ["I_Tura_ZU23_lxWS"]] call _fnc_saveToTemplate; +["staticMortars", ["I_G_Mortar_01_F"]] call _fnc_saveToTemplate; +["staticMortarMagHE", "8Rnd_82mm_Mo_shells"] call _fnc_saveToTemplate; +["staticMortarMagSmoke", "8Rnd_82mm_Mo_Smoke_white"] call _fnc_saveToTemplate; +["staticMortarMagFlare", "8Rnd_82mm_Mo_Flare_white"] call _fnc_saveToTemplate; + +["mineAT", "ATMine_Range_Mag"] call _fnc_saveToTemplate; +["mineAPERS", "APERSMine_Range_Mag"] call _fnc_saveToTemplate; + +["breachingExplosivesAPC", [["DemoCharge_Remote_Mag", 1]]] call _fnc_saveToTemplate; +["breachingExplosivesTank", [["SatchelCharge_Remote_Mag", 1], ["DemoCharge_Remote_Mag", 2]]] call _fnc_saveToTemplate; + +if ("expansion" in A3A_enabledDLC) then { + _vehiclesCivCar append ["C_Offroad_02_unarmed_F"]; + _vehiclesLightUnarmed append ["I_C_Offroad_02_unarmed_F"]; + _vehiclesLightArmed append ["I_C_Offroad_02_LMG_F"]; + _vehiclesAT append ["I_C_Offroad_02_AT_F"]; +}; +["vehiclesCivCar", _vehiclesCivCar] call _fnc_saveToTemplate; +["vehiclesLightUnarmed", _vehiclesLightUnarmed] call _fnc_saveToTemplate; +["vehiclesLightArmed", _vehiclesLightArmed] call _fnc_saveToTemplate; +["vehiclesAT", _vehiclesAT] call _fnc_saveToTemplate; + +#include "..\Vanilla\Vanilla_Reb_Vehicle_Attributes.sqf" +#include "WS_Reb_Vehicle_Attributes.sqf" + +/////////////////////////// +// Rebel Starting Gear // +/////////////////////////// + +private _initialRebelEquipment = [ +"hgun_Pistol_heavy_02_F","hgun_Rook40_F", +"hgun_PDW2000_F","SMG_02_F", +"6Rnd_45ACP_Cylinder","16Rnd_9x21_Mag","30Rnd_9x21_Mag_SMG_02","MiniGrenade","SmokeShell", +["IEDUrbanSmall_Remote_Mag", 10], ["IEDLandSmall_Remote_Mag", 10], ["IEDUrbanBig_Remote_Mag", 3], ["IEDLandBig_Remote_Mag", 3], +"B_FieldPack_oli","B_FieldPack_blk","B_FieldPack_ocamo","B_FieldPack_oucamo","B_FieldPack_cbr","B_FieldPack_khk", +"V_Chestrig_blk","V_Chestrig_rgr","V_Chestrig_khk","V_Chestrig_oli","V_BandollierB_blk","V_BandollierB_cbr","V_BandollierB_rgr", +"V_BandollierB_khk","V_BandollierB_oli","V_Rangemaster_belt", +"Binocular", "hgun_Pistol_Signal_F", "6Rnd_GreenSignal_F", "6Rnd_RedSignal_F", +"acc_flashlight","acc_flashlight_smg_01","acc_flashlight_pistol"]; + +if (allowDLCExpansion) then { + _initialRebelEquipment append [["launch_RPG7_F", 15], ["RPG7_F", 45], ["SMG_05_F"], ["hgun_Pistol_01_F"], ["10Rnd_9x21_Mag"]]; +} else { + _initialRebelEquipment append [["launch_RPG32_F", 15], ["RPG32_F", 30]]; +}; + +if (A3A_hasTFAR) then {_initialRebelEquipment append ["tf_microdagr","tf_anprc154"]}; +if (A3A_hasTFAR && startWithLongRangeRadio) then {_initialRebelEquipment append ["tf_anprc155","tf_anprc155_coyote"]}; +if (A3A_hasTFARBeta) then {_initialRebelEquipment append ["TFAR_microdagr","TFAR_anprc154"]}; +if (A3A_hasTFARBeta && startWithLongRangeRadio) then {_initialRebelEquipment append ["TFAR_anprc155","TFAR_anprc155_coyote"]}; +_initialRebelEquipment append ["Chemlight_blue","Chemlight_green","Chemlight_red","Chemlight_yellow"]; +["initialRebelEquipment", _initialRebelEquipment] call _fnc_saveToTemplate; + +private _rebUniforms = [ + "U_lxWS_Djella_02_Sand", + "U_lxWS_Djella_03_Green", + "U_lxWS_Djella_02_Grey", + "U_lxWS_Djella_02_Brown", + "U_SFIA_deserter_lxWS", + "U_lxWS_C_Djella_06", + "U_lxWS_C_Djella_02a", + "U_lxWS_C_Djella_05", + "U_lxWS_C_Djella_01" +]; + +private _dlcUniforms = [ + "U_IG_Guerilla1_1", + "U_IG_Guerilla2_1", + "U_IG_Guerilla2_2", + "U_IG_Guerilla2_3", + "U_IG_Guerilla3_1", + "U_IG_leader", + "U_IG_Guerrilla_6_1", + "U_I_G_resistanceLeader_F", + "U_I_L_Uniform_01_deserter_F" +]; + +if (allowDLCEnoch) then {_dlcUniforms append [ + "U_I_L_Uniform_01_camo_F" +]; +}; + +if (allowDLCExpansion) then {_dlcUniforms append [ + "U_I_C_Soldier_Bandit_4_F", + "U_I_C_Soldier_Bandit_1_F", + "U_I_C_Soldier_Bandit_2_F", + "U_I_C_Soldier_Bandit_5_F", + "U_I_C_Soldier_Bandit_3_F", + "U_I_C_Soldier_Para_2_F", + "U_I_C_Soldier_Para_3_F", + "U_I_C_Soldier_Para_5_F", + "U_I_C_Soldier_Para_4_F", + "U_I_C_Soldier_Para_1_F", + "U_I_C_Soldier_Camo_F" +]; +}; + +["uniforms", _rebUniforms + _dlcUniforms] call _fnc_saveToTemplate; + +["headgear", [ + "lxWS_H_turban_02_yellow", + "lxWS_H_turban_02_gray", + "lxWS_H_turban_02_sand", + "lxWS_H_turban_02_red", + "lxWS_H_turban_02_orange", + "lxWS_H_turban_02_green_pattern", + "lxWS_H_turban_02_green", + "lxWS_H_turban_02_blue", + "lxWS_H_turban_02_black", + "lxWS_H_turban_03_yellow", + "lxWS_H_turban_03_gray", + "lxWS_H_turban_03_sand", + "lxWS_H_turban_03_red", + "lxWS_H_turban_03_orange", + "lxWS_H_turban_03_green_pattern", + "lxWS_H_turban_03_green", + "lxWS_H_turban_03_blue", + "lxWS_H_turban_03_black", + "H_Booniehat_khk_hs", + "H_Booniehat_tan", + "H_Cap_tan", + "H_Cap_oli_hs", + "H_Cap_blk", + "H_Cap_headphones", + "H_ShemagOpen_tan", + "H_Shemag_olive_hs", + "H_Bandanna_khk_hs", + "H_Bandanna_sand", + "H_Bandanna_cbr" +]] 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; +["voices", ["male01fre", "male02fre", "male03fre"]] call _fnc_saveToTemplate; +"lxWS_WSaharaMen" call _fnc_saveNames; + +////////////////////////// +// Loadouts // +////////////////////////// + +private _loadoutData = call _fnc_createLoadoutData; +_loadoutData set ["maps", ["ItemMap"]]; +_loadoutData set ["watches", ["ItemWatch"]]; +_loadoutData set ["compasses", ["ItemCompass"]]; +_loadoutData set ["binoculars", ["Binocular"]]; + +_loadoutData set ["uniforms", _rebUniforms]; + +_loadoutData set ["glasses", ["G_Shades_Black", "G_Shades_Blue", "G_Shades_Green", "G_Shades_Red", "G_Aviator", "G_Spectacles", "G_Spectacles_Tinted", "G_Sport_BlackWhite", "G_Sport_Blackyellow", "G_Sport_Greenblack", "G_Sport_Checkered", "G_Sport_Red", "G_Squares", "G_Squares_Tinted"]]; +_loadoutData set ["goggles", ["G_Lowprofile"]]; +_loadoutData set ["facemask", ["G_Bandanna_blk", "G_Bandanna_oli", "G_Bandanna_khk", "G_Bandanna_tan", "G_Bandanna_beast", "G_Bandanna_shades", "G_Bandanna_sport", "G_Bandanna_aviator"]]; + +_loadoutData set ["items_medical_basic", ["BASIC"] call A3A_fnc_itemset_medicalSupplies]; +_loadoutData set ["items_medical_standard", ["STANDARD"] call A3A_fnc_itemset_medicalSupplies]; +_loadoutData set ["items_medical_medic", ["MEDIC"] call A3A_fnc_itemset_medicalSupplies]; +_loadoutData set ["items_miscEssentials", [] call A3A_fnc_itemset_miscEssentials]; + +//////////////////////// +// Rebel Unit Types // +///////////////////////. + +private _squadLeaderTemplate = { + ["uniforms"] call _fnc_setUniform; + [selectRandomWeighted [[], 1.25, "glasses", 1, "goggles", 0.75, "facemask", 1]] call _fnc_setFacewear; + + ["items_medical_standard"] call _fnc_addItemSet; + ["items_miscEssentials"] call _fnc_addItemSet; + + ["maps"] call _fnc_addMap; + ["watches"] call _fnc_addWatch; + ["compasses"] call _fnc_addCompass; + ["binoculars"] call _fnc_addBinoculars; +}; + +private _riflemanTemplate = { + ["uniforms"] call _fnc_setUniform; + [selectRandomWeighted [[], 1.25, "glasses", 1, "goggles", 0.75, "facemask", 1]] call _fnc_setFacewear; + + ["items_medical_standard"] call _fnc_addItemSet; + ["items_miscEssentials"] call _fnc_addItemSet; + + ["maps"] call _fnc_addMap; + ["watches"] call _fnc_addWatch; + ["compasses"] call _fnc_addCompass; +}; + +private _prefix = "militia"; +private _unitTypes = [ + ["Petros", _squadLeaderTemplate], + ["SquadLeader", _squadLeaderTemplate], + ["Rifleman", _riflemanTemplate], + ["staticCrew", _riflemanTemplate], + ["Medic", _riflemanTemplate, [["medic", true]]], + ["Engineer", _riflemanTemplate, [["engineer", true]]], + ["ExplosivesExpert", _riflemanTemplate, [["explosiveSpecialist", true]]], + ["Grenadier", _riflemanTemplate], + ["LAT", _riflemanTemplate], + ["AT", _riflemanTemplate], + ["AA", _riflemanTemplate], + ["MachineGunner", _riflemanTemplate], + ["Marksman", _riflemanTemplate], + ["Sniper", _riflemanTemplate], + ["Unarmed", _riflemanTemplate] +]; + +[_prefix, _unitTypes, _loadoutData] call _fnc_generateAndSaveUnitsToTemplate; diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf new file mode 100644 index 0000000000..efb30b367c --- /dev/null +++ b/A3A/addons/core/Templates/Templates/WS/WS_Reb_Vehicle_Attributes.sqf @@ -0,0 +1,5 @@ +(["attributesVehicles"] call _fnc_getFromTemplate) append [ + ["O_Tura_Offroad_armor_lxWS", ["rebCost", 300]], + ["O_Tura_Offroad_armor_armed_lxWS", ["rebCost", 800]], + ["O_Tura_Offroad_armor_AT_lxWS", ["rebCost", 800]] +]; \ No newline at end of file From 34963df444912ba92de599ece9202c0be8d2f503 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Tue, 5 Sep 2023 21:39:53 +0200 Subject: [PATCH 2/9] Vanilla + WS retextures --- .../config_fixes/Vanilla/CfgVehicles.hpp | 8 + A3A/addons/config_fixes/Vanilla/air.hpp | 78 +++++++ A3A/addons/config_fixes/Vanilla/armor.hpp | 35 +++ A3A/addons/config_fixes/Vanilla/config.cpp | 22 ++ A3A/addons/config_fixes/Vanilla/sea.hpp | 9 + A3A/addons/config_fixes/Vanilla/soft.hpp | 211 ++++++++++++++++++ A3A/addons/config_fixes/WS/CfgMarkers.hpp | 9 + A3A/addons/config_fixes/WS/CfgVehicles.hpp | 118 ++++++++++ A3A/addons/config_fixes/WS/config.cpp | 23 ++ A3A/addons/config_fixes/WS/ws_ion.hpp | 89 ++++++++ A3A/addons/config_fixes/WS/ws_una.hpp | 49 ++++ 11 files changed, 651 insertions(+) create mode 100644 A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp create mode 100644 A3A/addons/config_fixes/Vanilla/air.hpp create mode 100644 A3A/addons/config_fixes/Vanilla/armor.hpp create mode 100644 A3A/addons/config_fixes/Vanilla/config.cpp create mode 100644 A3A/addons/config_fixes/Vanilla/sea.hpp create mode 100644 A3A/addons/config_fixes/Vanilla/soft.hpp create mode 100644 A3A/addons/config_fixes/WS/CfgMarkers.hpp create mode 100644 A3A/addons/config_fixes/WS/CfgVehicles.hpp create mode 100644 A3A/addons/config_fixes/WS/config.cpp create mode 100644 A3A/addons/config_fixes/WS/ws_ion.hpp create mode 100644 A3A/addons/config_fixes/WS/ws_una.hpp diff --git a/A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp b/A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp new file mode 100644 index 0000000000..ce667d6a4b --- /dev/null +++ b/A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp @@ -0,0 +1,8 @@ +class CfgVehicles { + +#include "air.hpp" +#include "armor.hpp" +#include "sea.hpp" +#include "soft.hpp" + +}; \ No newline at end of file diff --git a/A3A/addons/config_fixes/Vanilla/air.hpp b/A3A/addons/config_fixes/Vanilla/air.hpp new file mode 100644 index 0000000000..28bc35e629 --- /dev/null +++ b/A3A/addons/config_fixes/Vanilla/air.hpp @@ -0,0 +1,78 @@ + +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_light_03_unarmed_F; +class I_Heli_light_03_dynamicLoadout_F; // + + +class O_Heli_Light_02_dynamicLoadout_F; +class O_Heli_Light_02_unarmed_F; + +class I_Plane_Fighter_03_dynamicLoadout_F; // +class I_Plane_Fighter_04_F; // + + +class a3a_Heli_Light_02_black_F : O_Heli_Light_02_dynamicLoadout_F +{ + class TextureSources{ + class Black{ + author = "Bohemia Interactive"; + displayName = "Black"; + textures[] = {"\A3\Air_F\Heli_Light_02\Data\Heli_Light_02_ext_CO.paa"}; + }; + class Blackcustom{ + author = "Bohemia Interactive"; + displayName = "Black Custom"; + textures[] = {"\A3\Air_F_Heli\Heli_Light_02\Data\Heli_Light_02_ext_OPFOR_V2_CO.paa"}; + }; + }; + textureList[] = {"Black",1,"Blackcustom",1}; + hiddenSelectionsTextures[] = {"\A3\Air_F\Heli_Light_02\Data\Heli_Light_02_ext_CO.paa"}; +}; +class a3a_Heli_Light_01_Stripped_ION_F : B_Heli_Light_01_stripped_F +{ + hiddenSelectionsTextures[] = {"a3\air_f\heli_light_01\data\heli_light_01_ext_ion_co.paa",""}; +}; +class a3a_Heli_Light_01_ION_F : B_Heli_Light_01_F +{ + hiddenSelectionsTextures[] = {"a3\air_f\heli_light_01\data\heli_light_01_ext_ion_co.paa",""}; +}; +class a3a_Heli_Light_01_dynamicLoadout_ION_F : B_Heli_Light_01_dynamicLoadout_F +{ + hiddenSelectionsTextures[] = {"a3\air_f\heli_light_01\data\heli_light_01_ext_ion_co.paa","a3\air_f\heli_light_01\data\heli_light_01_dot_ca.paa"}; +}; +class a3a_Heli_light_03_Camo_F : I_Heli_light_03_unarmed_F +{ + hiddenSelectionsTextures[] = {"\A3\Air_F_EPB\Heli_Light_03\data\Heli_Light_03_base_INDP_CO.paa","a3\weapons_f\ammoboxes\data\ammobox_co.paa","a3\weapons_f\ammoboxes\data\ammobox_signs_ca.paa"}; + textureList[] = {"Green",0,"Indep",1}; +}; +class a3a_Heli_light_03_green_CAS_F : I_Heli_light_03_dynamicLoadout_F +{ + hiddenSelectionsTextures[] = {"\A3\Air_F_EPB\Heli_Light_03\data\Heli_Light_03_base_CO.paa"}; + textureList[] = {"Green",1,"Indep",0}; +}; +class a3a_ION_Heli_Transport_02_F : I_Heli_Transport_02_F +{ + textureList[] = {"ION",1,"AAF",0,"IDAP",0,"Dahoman",0}; + hiddenSelectionsTextures[] = {"a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_1_ion_co.paa","a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_2_ion_co.paa","a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_3_ion_co.paa","a3\air_f_beta\heli_transport_02\data\heli_transport_02_int_02_co.paa"}; +}; +class a3a_C_Heli_Transport_02_F : I_Heli_Transport_02_F +{ + crew = "C_man_1_1_F"; + faction = "CIV_F"; + side = 3; + textureList[] = {"ION",0,"AAF",0,"IDAP",0,"Dahoman",1}; + hiddenSelectionsTextures[] = {"a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_1_dahoman_co.paa","a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_2_dahoman_co.paa","a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_3_dahoman_co.paa","a3\air_f_beta\heli_transport_02\data\heli_transport_02_int_02_co.paa"}; +}; +class a3a_Plane_Fighter_04_grey_F : I_Plane_Fighter_04_F +{ + textureList[] = {"CamoGrey",1,"DigitalCamoGreen",0,"DigitalCamoGrey",0}; + hiddenSelectionsTextures[] = {"a3\air_f_jets\plane_fighter_04\data\fighter_04_fuselage_01_co.paa","a3\air_f_jets\plane_fighter_04\data\fighter_04_fuselage_02_co.paa","a3\air_f_jets\plane_fighter_04\data\fighter_04_misc_01_co.paa","a3\air_f_jets\plane_fighter_04\data\numbers\fighter_04_number_04_ca.paa","a3\air_f_jets\plane_fighter_04\data\numbers\fighter_04_number_04_ca.paa","a3\air_f_jets\plane_fighter_04\data\numbers\fighter_04_number_08_ca.paa"}; +}; +class a3a_Plane_Fighter_03_grey_F : I_Plane_Fighter_03_dynamicLoadout_F +{ + textureList[] = {"Grey",1,"Green",0,"Hex",0}; + hiddenSelectionsTextures[] = {"a3\air_f_gamma\plane_fighter_03\data\plane_fighter_03_body_1_greyhex_co.paa","a3\air_f_gamma\plane_fighter_03\data\plane_fighter_03_body_2_greyhex_co.paa"}; +}; \ No newline at end of file diff --git a/A3A/addons/config_fixes/Vanilla/armor.hpp b/A3A/addons/config_fixes/Vanilla/armor.hpp new file mode 100644 index 0000000000..b437481bed --- /dev/null +++ b/A3A/addons/config_fixes/Vanilla/armor.hpp @@ -0,0 +1,35 @@ + +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; // + +class a3a_MRAP_03_grey_F : I_MRAP_03_F +{ + hiddenSelectionsTextures[] = {"a3\soft_f_beta\mrap_03\data\mrap_03_ext_co.paa","a3\data_f\vehicles\turret_co.paa"}; +}; +class a3a_MRAP_03_gmg_grey_F : I_MRAP_03_gmg_F +{ + hiddenSelectionsTextures[] = {"a3\soft_f_beta\mrap_03\data\mrap_03_ext_co.paa","a3\data_f\vehicles\turret_co.paa"}; +}; +class a3a_MRAP_03_hmg_grey_F : I_MRAP_03_hmg_F +{ + hiddenSelectionsTextures[] = {"a3\soft_f_beta\mrap_03\data\mrap_03_ext_co.paa","a3\data_f\vehicles\turret_co.paa"}; +}; +class a3a_APC_Wheeled_03_cannon_blufor_F : I_APC_Wheeled_03_cannon_F +{ + textureList[] = {}; + hiddenSelectionsTextures[] = {"a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext2_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\RCWS30_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext_alpha_CO.paa","a3\armor_f\data\camonet_aaf_fia_desert_co.paa","a3\armor_f\data\cage_sand_co.paa"}; +}; +class a3a_MBT_04_cannon_black_F : O_MBT_04_cannon_F +{ + textureList[] = {}; + hiddenSelectionsTextures[] = {"a3\armor_f_tank\mbt_04\data\mbt_04_exterior_1_co.paa","a3\armor_f_tank\mbt_04\data\mbt_04_exterior_2_co.paa","a3\armor_f\data\camonet_csat_stripe_desert_co.paa"}; +}; +class a3a_MBT_04_command_black_F : O_MBT_04_command_F +{ + textureList[] = {}; + hiddenSelectionsTextures[] = {"a3\armor_f_tank\mbt_04\data\mbt_04_exterior_1_co.paa","a3\armor_f_tank\mbt_04\data\mbt_04_exterior_2_co.paa","a3\armor_f\data\camonet_csat_stripe_desert_co.paa"}; +}; \ No newline at end of file diff --git a/A3A/addons/config_fixes/Vanilla/config.cpp b/A3A/addons/config_fixes/Vanilla/config.cpp new file mode 100644 index 0000000000..66e858b1b9 --- /dev/null +++ b/A3A/addons/config_fixes/Vanilla/config.cpp @@ -0,0 +1,22 @@ +#include "..\script_component.hpp" + + +class CfgPatches { + class PATCHNAME(A3) { + name = COMPONENT_NAME; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"A3_Data_F_AoW_Loadorder"}; + author = AUTHOR; + authors[] = { AUTHORS }; + authorUrl = ""; + VERSION_CONFIG; + }; +}; + +// Uncomment when needed +//#include "CfgMagazines.hpp" +#include "CfgVehicles.hpp" +//#include "CfgMarkers.hpp" +//#include "CfgWeapons.hpp" diff --git a/A3A/addons/config_fixes/Vanilla/sea.hpp b/A3A/addons/config_fixes/Vanilla/sea.hpp new file mode 100644 index 0000000000..37737c747f --- /dev/null +++ b/A3A/addons/config_fixes/Vanilla/sea.hpp @@ -0,0 +1,9 @@ + +class O_Boat_Armed_01_hmg_F; // + +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"}; +}; \ No newline at end of file diff --git a/A3A/addons/config_fixes/Vanilla/soft.hpp b/A3A/addons/config_fixes/Vanilla/soft.hpp new file mode 100644 index 0000000000..d4b9d0bfe9 --- /dev/null +++ b/A3A/addons/config_fixes/Vanilla/soft.hpp @@ -0,0 +1,211 @@ + + +class O_LSV_02_AT_F; // +class B_LSV_01_AT_F; // +class I_C_Offroad_02_unarmed_F; // +class I_C_Offroad_02_AT_F; // +class I_C_Offroad_02_LMG_F; // + +class C_Van_02_transport_F; +class C_Van_02_vehicle_F; +class C_Van_02_service_F; + +class Van_02_medevac_base_F; //external Root Class +class C_Van_02_medevac_F : Van_02_medevac_base_F{ + class TextureSources; //external Child Class +}; +//offroads +class B_G_Offroad_01_armed_F; +class B_G_Offroad_01_F; +class B_G_Offroad_01_AT_F; +class I_E_Offroad_01_comms_F; +class I_E_Offroad_01_covered_F; + +//Black - Any/ION +class a3a_Offroad_01_black_F : B_G_Offroad_01_F +{ + scope = 2; + hiddenSelectionsTextures[] = {"a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa","a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa"}; + textureList[] = {}; + animationList[] = {"HideDoor1",0,"HideDoor2",0,"HideDoor3",0.333333,"HideBumper1",0.5,"HideBumper2",0.5}; +}; +class a3a_Offroad_01_black_armed_F : B_G_Offroad_01_armed_F +{ + scope = 2; + hiddenSelectionsTextures[] = {"a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa","a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa"}; + textureList[] = {}; + animationList[] = {"HideDoor1",1,"HideDoor2",1,"HideDoor3",1,"HideBumper1",0.5,"HideBumper2",0.5}; +}; +class a3a_Offroad_01_black_AT_F : B_G_Offroad_01_AT_F +{ + scope = 2; + hiddenSelectionsTextures[] = {"a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa","a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa"}; + textureList[] = {}; + animationList[] = {"HideDoor1",1,"HideDoor2",1,"HideDoor3",1,"HideBumper1",0.5,"HideBumper2",0.5}; +}; + +//Jeep Wranglers - APEX +class a3a_Offroad_02_unarmed_black_F : I_C_Offroad_02_unarmed_F +{ + scope = 2; + textureList[] = {"Black",1,"Blue",0,"Green",0,"Orange",0,"Red",0,"White",0,"Brown",0,"Olive",0,"IDAP",0}; +}; +class a3a_Offroad_02_black_AT_F : I_C_Offroad_02_AT_F +{ + scope = 2; + textureList[] = {"Black",1,"Blue",0,"Green",0,"Orange",0,"Red",0,"White",0,"Brown",0,"Olive",0,"IDAP",0}; +}; +class a3a_Offroad_02_LMG_black_F : I_C_Offroad_02_LMG_F +{ + scope = 2; + textureList[] = {"Black",1,"Blue",0,"Green",0,"Orange",0,"Red",0,"White",0,"Brown",0,"Olive",0,"IDAP",0}; +}; + + +//Greens - Tropical NATO +class a3a_Offroad_01_green_F : B_G_Offroad_01_F +{ + scope = 2; + 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"}; + textureList[] = {"Green",1}; +}; +class a3a_Offroad_01_green_armed_F : B_G_Offroad_01_armed_F +{ + scope = 2; + 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"}; + textureList[] = {"Green",1}; +}; +class a3a_Offroad_01_green_AT_F : B_G_Offroad_01_AT_F +{ + scope = 2; + 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"}; + textureList[] = {"Green",1}; +}; +class a3a_Offroad_01_comms_green_F : I_E_Offroad_01_comms_F +{ + scope = 2; + 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","a3\soft_f_enoch\offroad_01\data\offroad_01_cover_grn_co.paa"}; + textureList[] = {"Green",1}; +}; +class a3a_Offroad_01_covered_green_F : I_E_Offroad_01_covered_F +{ + scope = 2; + 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","a3\soft_f_enoch\offroad_01\data\offroad_01_cover_grn_co.paa"}; + textureList[] = {"Green",1}; +}; + +//Tans - Arid NATO +class a3a_Offroad_01_tan_F : B_G_Offroad_01_F +{ + scope = 2; + textureList[] = {"Beige",1}; + 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"}; +}; +class a3a_Offroad_01_tan_armed_F : B_G_Offroad_01_armed_F +{ + scope = 2; + textureList[] = {"Beige",1}; + 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"}; +}; +class a3a_Offroad_01_tan_AT_F : B_G_Offroad_01_AT_F +{ + scope = 2; + textureList[] = {"Beige",1}; + 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"}; +}; +class a3a_Offroad_01_comms_tan_F : I_E_Offroad_01_comms_F +{ + scope = 2; + textureList[] = {"Beige",1}; + 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","a3\soft_f_enoch\offroad_01\data\offroad_01_cover_blk_co.paa"}; +}; +class a3a_Offroad_01_covered_tan_F : I_E_Offroad_01_covered_F +{ + scope = 2; + textureList[] = {"Beige",1}; + 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","a3\soft_f_enoch\offroad_01\data\offroad_01_cover_blk_co.paa"}; +}; + +//LDF Camo +class a3a_Offroad_01_ldf_armed_F : B_G_Offroad_01_armed_F +{ + crew = "I_E_Soldier_F"; + faction = "IND_E_F"; + 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"}; + textureList[] = {"EAF",1}; +}; +class a3a_Offroad_01_ldf_AT_F : B_G_Offroad_01_AT_F +{ + crew = "I_E_Soldier_F"; + faction = "IND_E_F"; + 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"}; + textureList[] = {"EAF",1}; +}; + +//Gendarmerie +class a3a_Offroad_01_GEN_armed_F : B_G_Offroad_01_armed_F +{ + crew = "B_GEN_Commander_F"; + faction = "BLU_GEN_F"; + side = 1; + hiddenSelectionsTextures[] = {"\A3\Soft_F_Exp\Offroad_01\Data\Offroad_01_ext_gen_CO.paa","\A3\Soft_F_Exp\Offroad_01\Data\Offroad_01_ext_gen_CO.paa"}; + textureList[] = {"Gendarmerie",1}; + animationList[] = {"HideDoor1",0,"HideDoor2",0,"HideDoor3",0.5,"HideBumper1",0.5,"HideBumper2",0.5}; +}; +class a3a_Offroad_01_GEN_AT_F : B_G_Offroad_01_AT_F +{ + crew = "B_GEN_Commander_F"; + faction = "BLU_GEN_F"; + side = 1; + hiddenSelectionsTextures[] = {"\A3\Soft_F_Exp\Offroad_01\Data\Offroad_01_ext_gen_CO.paa","\A3\Soft_F_Exp\Offroad_01\Data\Offroad_01_ext_gen_CO.paa"}; + textureList[] = {"Gendarmerie",1}; + animationList[] = {"HideDoor1",0,"HideDoor2",0,"HideDoor3",0.5,"HideBumper1",0.5,"HideBumper2",0.5}; +}; + +class a3a_LSV_02_AT_black_F : O_LSV_02_AT_F +{ + scope = 2; + textureList[] = {"Black",1,"GreenHex",0,"Arid",0}; +}; +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}; +}; diff --git a/A3A/addons/config_fixes/WS/CfgMarkers.hpp b/A3A/addons/config_fixes/WS/CfgMarkers.hpp new file mode 100644 index 0000000000..410aba8645 --- /dev/null +++ b/A3A/addons/config_fixes/WS/CfgMarkers.hpp @@ -0,0 +1,9 @@ + +class CfgMarkers { + class flag_NATO; + class a3a_flag_SIFA: flag_NATO { + name = "SIFA"; + icon = "\lxws\data_f_lxws\img\flags\flag_SFIA_CO.paa"; + texture = "\lxws\data_f_lxws\img\flags\flag_SFIA_CO.paa"; + }; +}; diff --git a/A3A/addons/config_fixes/WS/CfgVehicles.hpp b/A3A/addons/config_fixes/WS/CfgVehicles.hpp new file mode 100644 index 0000000000..0480d2b190 --- /dev/null +++ b/A3A/addons/config_fixes/WS/CfgVehicles.hpp @@ -0,0 +1,118 @@ + +class CfgVehicles { + + class O_Truck_02_Ammo_F; // + class O_Truck_02_Fuel_F; // + class O_Truck_02_box_F; // + class O_Truck_02_transport_F; // + class O_Truck_02_medical_F; // + + class I_Truck_02_MRL_F; + + class O_Truck_02_cargo_lxWS; + class O_Truck_02_flatbed_lxWS; + + class O_Tura_Truck_02_aa_lxWS; + class O_Tura_ZU23_lxWS; + + class B_MRAP_01_gmg_F; + class B_MRAP_01_hmg_F; + + class B_G_Offroad_01_armed_F; + class B_G_Offroad_01_AT_F; + + class B_Tura_Offroad_armor_lxWS; + class B_Tura_Offroad_armor_AT_lxWS; + class B_Tura_Offroad_armor_armed_lxWS; + + +#include "ws_ion.hpp" +#include "ws_una.hpp" + + //Misc retextures + class a3a_tan_Offroad_armor : B_Tura_Offroad_armor_lxWS + { + 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_tan_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS + { + 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_tan_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS + { + 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[] = {}; + 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_green_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS + { + 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_green_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS + { + 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[] = {}; + crew = "I_E_Soldier_F"; + faction = "IND_E_F"; + 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_ldf_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS + { + textureList[] = {}; + crew = "I_E_Soldier_F"; + faction = "IND_E_F"; + 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_ldf_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS + { + textureList[] = {}; + crew = "I_E_Soldier_F"; + faction = "IND_E_F"; + 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; + crew = "O_SFIA_soldier_lxWS"; + faction = "OPF_SFIA_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_sfia_co.paa","lxws\vehicles_f_lxws\data\truck_02\truck_02_kuz_africa_brown_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; + }; + class a3a_O_Truck_02_zu23_F : O_Tura_Truck_02_aa_lxWS + { + side = 0; + crew = "O_soldier_F"; + faction = "OPF_F"; + hiddenSelectionsTextures[] = {"a3\soft_f_beta\truck_02\data\truck_02_kab_opfor_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_opfor_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_base_sfia_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_sfia_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_1_hex_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_2_sfia_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"}; + }; + class a3a_O_T_Truck_02_zu23_F : O_Tura_Truck_02_aa_lxWS + { + side = 0; + crew = "O_T_Soldier_F"; + faction = "OPF_T_F"; + hiddenSelectionsTextures[] = {"a3\soft_f_exp\truck_02\data\truck_02_kab_ghex_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_base_sfia_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_sfia_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_1_hex_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_2_sfia_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"}; + }; + class a3a_I_E_Truck_02_zu23_F : O_Tura_Truck_02_aa_lxWS + { + side = 2; + crew = "I_E_Soldier_F"; + 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"}; + }; +}; \ No newline at end of file diff --git a/A3A/addons/config_fixes/WS/config.cpp b/A3A/addons/config_fixes/WS/config.cpp new file mode 100644 index 0000000000..741a4b0c61 --- /dev/null +++ b/A3A/addons/config_fixes/WS/config.cpp @@ -0,0 +1,23 @@ +#include "..\script_component.hpp" + +#if __has_include("\lxws\data_f_lxws\config.bin") + +class CfgPatches { + class PATCHNAME(WS) { + name = COMPONENT_NAME; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"A3_Data_F_AoW_Loadorder","Vehicles_F_lxWS"}; + author = AUTHOR; + authors[] = { AUTHORS }; + authorUrl = ""; + VERSION_CONFIG; + }; +}; + +// Uncomment when needed +#include "CfgVehicles.hpp" +#include "CfgMarkers.hpp" + +#endif // __has_include("\lxws\data_f_lxws\config.bin") \ No newline at end of file diff --git a/A3A/addons/config_fixes/WS/ws_ion.hpp b/A3A/addons/config_fixes/WS/ws_ion.hpp new file mode 100644 index 0000000000..a6f65fe25c --- /dev/null +++ b/A3A/addons/config_fixes/WS/ws_ion.hpp @@ -0,0 +1,89 @@ + +class a3a_ION_Truck_02_MRL_F : I_Truck_02_MRL_F +{ + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","a3\soft_f_gamma\truck_02\data\truck_02_mrl_co.paa"}; +}; +class a3a_ION_Truck_02_Ammo_F : O_Truck_02_Ammo_F +{ + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_repair_green_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; +}; +class a3a_ION_Truck_02_Fuel_F : O_Truck_02_Fuel_F +{ + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_fuel_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; +}; +class a3a_ION_Truck_02_repair_F : O_Truck_02_box_F +{ + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_repair_green_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; +}; +class a3a_ION_Truck_02_transport_F : O_Truck_02_transport_F +{ + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_kuz_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; +}; +class a3a_ION_Truck_02_medical_F : O_Truck_02_medical_F +{ + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_kuz_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; +}; +class a3a_ION_Truck_02_cargo_F : O_Truck_02_cargo_lxWS +{ + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"}; +}; +class a3a_ION_Truck_02_flatbed_F : O_Truck_02_flatbed_lxWS +{ + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"}; +}; +class a3a_ION_Truck_02_zu23_F : O_Tura_Truck_02_aa_lxWS +{ + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_base_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_1_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_2_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"}; +}; + +class a3a_ion_Offroad_armor : B_Tura_Offroad_armor_lxWS +{ + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + textureList[] = {}; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_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_black_co.paa"}; +}; +class a3a_ion_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS +{ + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + textureList[] = {}; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_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_black_co.paa"}; +}; +class a3a_ion_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS +{ + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + textureList[] = {}; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_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_black_co.paa"}; +}; diff --git a/A3A/addons/config_fixes/WS/ws_una.hpp b/A3A/addons/config_fixes/WS/ws_una.hpp new file mode 100644 index 0000000000..5bb7b07c18 --- /dev/null +++ b/A3A/addons/config_fixes/WS/ws_una.hpp @@ -0,0 +1,49 @@ + +class a3a_una_MRAP_01_gmg_F : B_MRAP_01_gmg_F +{ + side = 1; + crew = "B_UN_Soldier_lxWS"; + faction = "BLU_UN_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\mrap_01\mrap_01_un_base_co.paa","lxws\vehicles_f_lxws\data\mrap_01\mrap_01_un_adds_co.paa","a3\data_f\vehicles\turret_co.paa"}; +}; +class a3a_una_MRAP_01_hmg_F : B_MRAP_01_hmg_F +{ + side = 1; + crew = "B_UN_Soldier_lxWS"; + faction = "BLU_UN_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\mrap_01\mrap_01_un_base_co.paa","lxws\vehicles_f_lxws\data\mrap_01\mrap_01_un_adds_co.paa","a3\data_f\vehicles\turret_co.paa"}; +}; + +class a3a_una_Offroad_armed : B_G_Offroad_01_armed_F +{ + side = 1; + crew = "B_UN_Soldier_lxWS"; + faction = "BLU_UN_lxWS"; + textureList[] = {}; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_co.paa"}; + +}; +class a3a_una_Offroad_at : B_G_Offroad_01_AT_F +{ + side = 1; + crew = "B_UN_Soldier_lxWS"; + faction = "BLU_UN_lxWS"; + textureList[] = {}; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_co.paa"}; +}; +class a3a_una_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS +{ + side = 1; + crew = "B_UN_Soldier_lxWS"; + faction = "BLU_UN_lxWS"; + textureList[] = {}; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_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_whiteun_co.paa"}; +}; +class a3a_una_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS +{ + side = 1; + crew = "B_UN_Soldier_lxWS"; + faction = "BLU_UN_lxWS"; + textureList[] = {}; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_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_whiteun_co.paa"}; +}; From a590cfa7ba03911e3ac8c8261d6abd7b144fb967 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Tue, 5 Sep 2023 21:52:01 +0200 Subject: [PATCH 3/9] Update Templates.hpp --- A3A/addons/core/Templates/Templates.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/A3A/addons/core/Templates/Templates.hpp b/A3A/addons/core/Templates/Templates.hpp index efc33cf57a..28b1ae22f9 100644 --- a/A3A/addons/core/Templates/Templates.hpp +++ b/A3A/addons/core/Templates/Templates.hpp @@ -434,7 +434,7 @@ class Templates { side = "Reb"; flagTexture = "uk3cb_factions\addons\uk3cb_factions_ion\flag\ion_flag_co.paa"; - name = "3CB ION Rebells"; + name = "3CB ION"; file = "3CB_Reb_ION"; }; class 3CBF_TKM : 3CBF_Base @@ -449,7 +449,7 @@ class Templates { side = "Reb"; flagTexture = "a3\data_f\flags\flag_fia_co.paa"; - name = "3CB FIA Rebells"; + name = "3CB FIA"; file = "3CB_Reb_FIA"; }; class 3CBF_CHC : 3CBF_Base From 6af2d987e079ab07d3eb61660c2b6a1842f64543 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Fri, 8 Sep 2023 00:40:31 +0200 Subject: [PATCH 4/9] Update WS_Reb_TURA.sqf --- A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf index 2bfe6cfc37..a84065a422 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf @@ -89,7 +89,10 @@ private _rebUniforms = [ "U_lxWS_C_Djella_06", "U_lxWS_C_Djella_02a", "U_lxWS_C_Djella_05", - "U_lxWS_C_Djella_01" + "U_lxWS_C_Djella_01", + "U_lxWS_Tak_02_A", + "U_lxWS_Tak_02_B", + "U_lxWS_Tak_02_C" ]; private _dlcUniforms = [ From 1998b5e22904c980e5b3b97b239c5a82683d1179 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Fri, 8 Sep 2023 00:45:20 +0200 Subject: [PATCH 5/9] Update WS_Reb_TURA.sqf --- A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf b/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf index a84065a422..e751d203b8 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_Reb_TURA.sqf @@ -68,7 +68,7 @@ private _initialRebelEquipment = [ "acc_flashlight","acc_flashlight_smg_01","acc_flashlight_pistol"]; if (allowDLCExpansion) then { - _initialRebelEquipment append [["launch_RPG7_F", 15], ["RPG7_F", 45], ["SMG_05_F"], ["hgun_Pistol_01_F"], ["10Rnd_9x21_Mag"]]; + _initialRebelEquipment append [["launch_RPG7_F", 15], ["RPG7_F", 45], "SMG_05_F", "hgun_Pistol_01_F", "10Rnd_9x21_Mag"]; } else { _initialRebelEquipment append [["launch_RPG32_F", 15], ["RPG32_F", 30]]; }; From 861e241ec9e52ab6beda68b1fc66c9456b8588d6 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Fri, 8 Sep 2023 01:37:53 +0200 Subject: [PATCH 6/9] killing more UNA files --- A3A/addons/config_fixes/WS/CfgVehicles.hpp | 4 -- A3A/addons/config_fixes/WS/ws_una.hpp | 49 ---------------------- 2 files changed, 53 deletions(-) delete mode 100644 A3A/addons/config_fixes/WS/ws_una.hpp diff --git a/A3A/addons/config_fixes/WS/CfgVehicles.hpp b/A3A/addons/config_fixes/WS/CfgVehicles.hpp index 0480d2b190..5e2ad0fd55 100644 --- a/A3A/addons/config_fixes/WS/CfgVehicles.hpp +++ b/A3A/addons/config_fixes/WS/CfgVehicles.hpp @@ -15,9 +15,6 @@ class CfgVehicles { class O_Tura_Truck_02_aa_lxWS; class O_Tura_ZU23_lxWS; - class B_MRAP_01_gmg_F; - class B_MRAP_01_hmg_F; - class B_G_Offroad_01_armed_F; class B_G_Offroad_01_AT_F; @@ -27,7 +24,6 @@ class CfgVehicles { #include "ws_ion.hpp" -#include "ws_una.hpp" //Misc retextures class a3a_tan_Offroad_armor : B_Tura_Offroad_armor_lxWS diff --git a/A3A/addons/config_fixes/WS/ws_una.hpp b/A3A/addons/config_fixes/WS/ws_una.hpp deleted file mode 100644 index 5bb7b07c18..0000000000 --- a/A3A/addons/config_fixes/WS/ws_una.hpp +++ /dev/null @@ -1,49 +0,0 @@ - -class a3a_una_MRAP_01_gmg_F : B_MRAP_01_gmg_F -{ - side = 1; - crew = "B_UN_Soldier_lxWS"; - faction = "BLU_UN_lxWS"; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\mrap_01\mrap_01_un_base_co.paa","lxws\vehicles_f_lxws\data\mrap_01\mrap_01_un_adds_co.paa","a3\data_f\vehicles\turret_co.paa"}; -}; -class a3a_una_MRAP_01_hmg_F : B_MRAP_01_hmg_F -{ - side = 1; - crew = "B_UN_Soldier_lxWS"; - faction = "BLU_UN_lxWS"; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\mrap_01\mrap_01_un_base_co.paa","lxws\vehicles_f_lxws\data\mrap_01\mrap_01_un_adds_co.paa","a3\data_f\vehicles\turret_co.paa"}; -}; - -class a3a_una_Offroad_armed : B_G_Offroad_01_armed_F -{ - side = 1; - crew = "B_UN_Soldier_lxWS"; - faction = "BLU_UN_lxWS"; - textureList[] = {}; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_co.paa"}; - -}; -class a3a_una_Offroad_at : B_G_Offroad_01_AT_F -{ - side = 1; - crew = "B_UN_Soldier_lxWS"; - faction = "BLU_UN_lxWS"; - textureList[] = {}; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_co.paa"}; -}; -class a3a_una_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS -{ - side = 1; - crew = "B_UN_Soldier_lxWS"; - faction = "BLU_UN_lxWS"; - textureList[] = {}; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_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_whiteun_co.paa"}; -}; -class a3a_una_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS -{ - side = 1; - crew = "B_UN_Soldier_lxWS"; - faction = "BLU_UN_lxWS"; - textureList[] = {}; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_un_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_whiteun_co.paa"}; -}; From fadf2068019507f8e74a496dce2651b02dc4aeb9 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Fri, 8 Sep 2023 01:43:23 +0200 Subject: [PATCH 7/9] killed unused retextures --- A3A/addons/config_fixes/Vanilla/air.hpp | 20 ++++---------------- A3A/addons/config_fixes/Vanilla/soft.hpp | 11 ++++++----- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/A3A/addons/config_fixes/Vanilla/air.hpp b/A3A/addons/config_fixes/Vanilla/air.hpp index 28bc35e629..77c41179cd 100644 --- a/A3A/addons/config_fixes/Vanilla/air.hpp +++ b/A3A/addons/config_fixes/Vanilla/air.hpp @@ -1,17 +1,15 @@ -class I_Heli_Transport_02_F; // +class I_Heli_Transport_02_F; class B_Heli_Light_01_F; -class B_Heli_Light_01_stripped_F; // +class B_Heli_Light_01_stripped_F; class B_Heli_Light_01_dynamicLoadout_F; -class I_Heli_light_03_unarmed_F; -class I_Heli_light_03_dynamicLoadout_F; // class O_Heli_Light_02_dynamicLoadout_F; class O_Heli_Light_02_unarmed_F; -class I_Plane_Fighter_03_dynamicLoadout_F; // -class I_Plane_Fighter_04_F; // +class I_Plane_Fighter_03_dynamicLoadout_F; +class I_Plane_Fighter_04_F; class a3a_Heli_Light_02_black_F : O_Heli_Light_02_dynamicLoadout_F @@ -43,16 +41,6 @@ class a3a_Heli_Light_01_dynamicLoadout_ION_F : B_Heli_Light_01_dynamicLoadout_F { hiddenSelectionsTextures[] = {"a3\air_f\heli_light_01\data\heli_light_01_ext_ion_co.paa","a3\air_f\heli_light_01\data\heli_light_01_dot_ca.paa"}; }; -class a3a_Heli_light_03_Camo_F : I_Heli_light_03_unarmed_F -{ - hiddenSelectionsTextures[] = {"\A3\Air_F_EPB\Heli_Light_03\data\Heli_Light_03_base_INDP_CO.paa","a3\weapons_f\ammoboxes\data\ammobox_co.paa","a3\weapons_f\ammoboxes\data\ammobox_signs_ca.paa"}; - textureList[] = {"Green",0,"Indep",1}; -}; -class a3a_Heli_light_03_green_CAS_F : I_Heli_light_03_dynamicLoadout_F -{ - hiddenSelectionsTextures[] = {"\A3\Air_F_EPB\Heli_Light_03\data\Heli_Light_03_base_CO.paa"}; - textureList[] = {"Green",1,"Indep",0}; -}; class a3a_ION_Heli_Transport_02_F : I_Heli_Transport_02_F { textureList[] = {"ION",1,"AAF",0,"IDAP",0,"Dahoman",0}; diff --git a/A3A/addons/config_fixes/Vanilla/soft.hpp b/A3A/addons/config_fixes/Vanilla/soft.hpp index d4b9d0bfe9..3345a2d014 100644 --- a/A3A/addons/config_fixes/Vanilla/soft.hpp +++ b/A3A/addons/config_fixes/Vanilla/soft.hpp @@ -21,7 +21,7 @@ class B_G_Offroad_01_AT_F; class I_E_Offroad_01_comms_F; class I_E_Offroad_01_covered_F; -//Black - Any/ION +//Black - Any/WS ION class a3a_Offroad_01_black_F : B_G_Offroad_01_F { scope = 2; @@ -44,7 +44,7 @@ class a3a_Offroad_01_black_AT_F : B_G_Offroad_01_AT_F animationList[] = {"HideDoor1",1,"HideDoor2",1,"HideDoor3",1,"HideBumper1",0.5,"HideBumper2",0.5}; }; -//Jeep Wranglers - APEX +//Jeep Wranglers - APEX - used by WS ION class a3a_Offroad_02_unarmed_black_F : I_C_Offroad_02_unarmed_F { scope = 2; @@ -62,7 +62,7 @@ class a3a_Offroad_02_LMG_black_F : I_C_Offroad_02_LMG_F }; -//Greens - Tropical NATO +//Greens - Tropical/AAF class a3a_Offroad_01_green_F : B_G_Offroad_01_F { scope = 2; @@ -94,7 +94,7 @@ class a3a_Offroad_01_covered_green_F : I_E_Offroad_01_covered_F textureList[] = {"Green",1}; }; -//Tans - Arid NATO +//Tans - Arid class a3a_Offroad_01_tan_F : B_G_Offroad_01_F { scope = 2; @@ -144,7 +144,7 @@ class a3a_Offroad_01_ldf_AT_F : B_G_Offroad_01_AT_F textureList[] = {"EAF",1}; }; -//Gendarmerie +//Gendarmerie - keeping these class a3a_Offroad_01_GEN_armed_F : B_G_Offroad_01_armed_F { crew = "B_GEN_Commander_F"; @@ -164,6 +164,7 @@ class a3a_Offroad_01_GEN_AT_F : B_G_Offroad_01_AT_F animationList[] = {"HideDoor1",0,"HideDoor2",0,"HideDoor3",0.5,"HideBumper1",0.5,"HideBumper2",0.5}; }; +//Used by WS ION class a3a_LSV_02_AT_black_F : O_LSV_02_AT_F { scope = 2; From 25e42e5673dbf365186f0c0076e7360108edfb02 Mon Sep 17 00:00:00 2001 From: Bob-Murphy Date: Sun, 24 Sep 2023 16:19:53 +0200 Subject: [PATCH 8/9] tabs to spaces & space reduction in class entries --- A3A/addons/config_fixes/Vanilla/air.hpp | 59 +++-- A3A/addons/config_fixes/Vanilla/armor.hpp | 43 ++-- A3A/addons/config_fixes/Vanilla/sea.hpp | 9 +- A3A/addons/config_fixes/Vanilla/soft.hpp | 239 ++++++++++----------- A3A/addons/config_fixes/WS/CfgMarkers.hpp | 13 +- A3A/addons/config_fixes/WS/CfgVehicles.hpp | 217 ++++++++++--------- A3A/addons/config_fixes/WS/ws_ion.hpp | 121 ++++++----- 7 files changed, 347 insertions(+), 354 deletions(-) diff --git a/A3A/addons/config_fixes/Vanilla/air.hpp b/A3A/addons/config_fixes/Vanilla/air.hpp index 77c41179cd..5488e81333 100644 --- a/A3A/addons/config_fixes/Vanilla/air.hpp +++ b/A3A/addons/config_fixes/Vanilla/air.hpp @@ -1,4 +1,3 @@ - class I_Heli_Transport_02_F; class B_Heli_Light_01_F; class B_Heli_Light_01_stripped_F; @@ -14,53 +13,53 @@ class I_Plane_Fighter_04_F; class a3a_Heli_Light_02_black_F : O_Heli_Light_02_dynamicLoadout_F { - class TextureSources{ - class Black{ - author = "Bohemia Interactive"; - displayName = "Black"; - textures[] = {"\A3\Air_F\Heli_Light_02\Data\Heli_Light_02_ext_CO.paa"}; - }; - class Blackcustom{ - author = "Bohemia Interactive"; - displayName = "Black Custom"; - textures[] = {"\A3\Air_F_Heli\Heli_Light_02\Data\Heli_Light_02_ext_OPFOR_V2_CO.paa"}; - }; - }; - textureList[] = {"Black",1,"Blackcustom",1}; - hiddenSelectionsTextures[] = {"\A3\Air_F\Heli_Light_02\Data\Heli_Light_02_ext_CO.paa"}; + class TextureSources{ + class Black{ + author = "Bohemia Interactive"; + displayName = "Black"; + textures[] = {"\A3\Air_F\Heli_Light_02\Data\Heli_Light_02_ext_CO.paa"}; + }; + class Blackcustom{ + author = "Bohemia Interactive"; + displayName = "Black Custom"; + textures[] = {"\A3\Air_F_Heli\Heli_Light_02\Data\Heli_Light_02_ext_OPFOR_V2_CO.paa"}; + }; + }; + textureList[] = {"Black",1,"Blackcustom",1}; + hiddenSelectionsTextures[] = {"\A3\Air_F\Heli_Light_02\Data\Heli_Light_02_ext_CO.paa"}; }; -class a3a_Heli_Light_01_Stripped_ION_F : B_Heli_Light_01_stripped_F +class a3a_Heli_Light_01_Stripped_ION_F : B_Heli_Light_01_stripped_F { - hiddenSelectionsTextures[] = {"a3\air_f\heli_light_01\data\heli_light_01_ext_ion_co.paa",""}; + hiddenSelectionsTextures[] = {"a3\air_f\heli_light_01\data\heli_light_01_ext_ion_co.paa",""}; }; class a3a_Heli_Light_01_ION_F : B_Heli_Light_01_F { - hiddenSelectionsTextures[] = {"a3\air_f\heli_light_01\data\heli_light_01_ext_ion_co.paa",""}; + hiddenSelectionsTextures[] = {"a3\air_f\heli_light_01\data\heli_light_01_ext_ion_co.paa",""}; }; class a3a_Heli_Light_01_dynamicLoadout_ION_F : B_Heli_Light_01_dynamicLoadout_F { - hiddenSelectionsTextures[] = {"a3\air_f\heli_light_01\data\heli_light_01_ext_ion_co.paa","a3\air_f\heli_light_01\data\heli_light_01_dot_ca.paa"}; + hiddenSelectionsTextures[] = {"a3\air_f\heli_light_01\data\heli_light_01_ext_ion_co.paa","a3\air_f\heli_light_01\data\heli_light_01_dot_ca.paa"}; }; class a3a_ION_Heli_Transport_02_F : I_Heli_Transport_02_F { - textureList[] = {"ION",1,"AAF",0,"IDAP",0,"Dahoman",0}; - hiddenSelectionsTextures[] = {"a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_1_ion_co.paa","a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_2_ion_co.paa","a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_3_ion_co.paa","a3\air_f_beta\heli_transport_02\data\heli_transport_02_int_02_co.paa"}; + textureList[] = {"ION",1,"AAF",0,"IDAP",0,"Dahoman",0}; + hiddenSelectionsTextures[] = {"a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_1_ion_co.paa","a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_2_ion_co.paa","a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_3_ion_co.paa","a3\air_f_beta\heli_transport_02\data\heli_transport_02_int_02_co.paa"}; }; class a3a_C_Heli_Transport_02_F : I_Heli_Transport_02_F { - crew = "C_man_1_1_F"; - faction = "CIV_F"; - side = 3; - textureList[] = {"ION",0,"AAF",0,"IDAP",0,"Dahoman",1}; - hiddenSelectionsTextures[] = {"a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_1_dahoman_co.paa","a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_2_dahoman_co.paa","a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_3_dahoman_co.paa","a3\air_f_beta\heli_transport_02\data\heli_transport_02_int_02_co.paa"}; + crew = "C_man_1_1_F"; + faction = "CIV_F"; + side = 3; + textureList[] = {"ION",0,"AAF",0,"IDAP",0,"Dahoman",1}; + hiddenSelectionsTextures[] = {"a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_1_dahoman_co.paa","a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_2_dahoman_co.paa","a3\air_f_beta\heli_transport_02\data\skins\heli_transport_02_3_dahoman_co.paa","a3\air_f_beta\heli_transport_02\data\heli_transport_02_int_02_co.paa"}; }; class a3a_Plane_Fighter_04_grey_F : I_Plane_Fighter_04_F { - textureList[] = {"CamoGrey",1,"DigitalCamoGreen",0,"DigitalCamoGrey",0}; - hiddenSelectionsTextures[] = {"a3\air_f_jets\plane_fighter_04\data\fighter_04_fuselage_01_co.paa","a3\air_f_jets\plane_fighter_04\data\fighter_04_fuselage_02_co.paa","a3\air_f_jets\plane_fighter_04\data\fighter_04_misc_01_co.paa","a3\air_f_jets\plane_fighter_04\data\numbers\fighter_04_number_04_ca.paa","a3\air_f_jets\plane_fighter_04\data\numbers\fighter_04_number_04_ca.paa","a3\air_f_jets\plane_fighter_04\data\numbers\fighter_04_number_08_ca.paa"}; + textureList[] = {"CamoGrey",1,"DigitalCamoGreen",0,"DigitalCamoGrey",0}; + hiddenSelectionsTextures[] = {"a3\air_f_jets\plane_fighter_04\data\fighter_04_fuselage_01_co.paa","a3\air_f_jets\plane_fighter_04\data\fighter_04_fuselage_02_co.paa","a3\air_f_jets\plane_fighter_04\data\fighter_04_misc_01_co.paa","a3\air_f_jets\plane_fighter_04\data\numbers\fighter_04_number_04_ca.paa","a3\air_f_jets\plane_fighter_04\data\numbers\fighter_04_number_04_ca.paa","a3\air_f_jets\plane_fighter_04\data\numbers\fighter_04_number_08_ca.paa"}; }; class a3a_Plane_Fighter_03_grey_F : I_Plane_Fighter_03_dynamicLoadout_F { - textureList[] = {"Grey",1,"Green",0,"Hex",0}; - hiddenSelectionsTextures[] = {"a3\air_f_gamma\plane_fighter_03\data\plane_fighter_03_body_1_greyhex_co.paa","a3\air_f_gamma\plane_fighter_03\data\plane_fighter_03_body_2_greyhex_co.paa"}; + textureList[] = {"Grey",1,"Green",0,"Hex",0}; + hiddenSelectionsTextures[] = {"a3\air_f_gamma\plane_fighter_03\data\plane_fighter_03_body_1_greyhex_co.paa","a3\air_f_gamma\plane_fighter_03\data\plane_fighter_03_body_2_greyhex_co.paa"}; }; \ No newline at end of file diff --git a/A3A/addons/config_fixes/Vanilla/armor.hpp b/A3A/addons/config_fixes/Vanilla/armor.hpp index b437481bed..0823fa5d79 100644 --- a/A3A/addons/config_fixes/Vanilla/armor.hpp +++ b/A3A/addons/config_fixes/Vanilla/armor.hpp @@ -1,35 +1,34 @@ +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; -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; // - -class a3a_MRAP_03_grey_F : I_MRAP_03_F +class a3a_MRAP_03_grey_F : I_MRAP_03_F { - hiddenSelectionsTextures[] = {"a3\soft_f_beta\mrap_03\data\mrap_03_ext_co.paa","a3\data_f\vehicles\turret_co.paa"}; + hiddenSelectionsTextures[] = {"a3\soft_f_beta\mrap_03\data\mrap_03_ext_co.paa","a3\data_f\vehicles\turret_co.paa"}; }; -class a3a_MRAP_03_gmg_grey_F : I_MRAP_03_gmg_F +class a3a_MRAP_03_gmg_grey_F : I_MRAP_03_gmg_F { - hiddenSelectionsTextures[] = {"a3\soft_f_beta\mrap_03\data\mrap_03_ext_co.paa","a3\data_f\vehicles\turret_co.paa"}; + hiddenSelectionsTextures[] = {"a3\soft_f_beta\mrap_03\data\mrap_03_ext_co.paa","a3\data_f\vehicles\turret_co.paa"}; }; -class a3a_MRAP_03_hmg_grey_F : I_MRAP_03_hmg_F +class a3a_MRAP_03_hmg_grey_F : I_MRAP_03_hmg_F { - hiddenSelectionsTextures[] = {"a3\soft_f_beta\mrap_03\data\mrap_03_ext_co.paa","a3\data_f\vehicles\turret_co.paa"}; + hiddenSelectionsTextures[] = {"a3\soft_f_beta\mrap_03\data\mrap_03_ext_co.paa","a3\data_f\vehicles\turret_co.paa"}; }; -class a3a_APC_Wheeled_03_cannon_blufor_F : I_APC_Wheeled_03_cannon_F +class a3a_APC_Wheeled_03_cannon_blufor_F : I_APC_Wheeled_03_cannon_F { - textureList[] = {}; - hiddenSelectionsTextures[] = {"a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext2_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\RCWS30_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext_alpha_CO.paa","a3\armor_f\data\camonet_aaf_fia_desert_co.paa","a3\armor_f\data\cage_sand_co.paa"}; + textureList[] = {}; + hiddenSelectionsTextures[] = {"a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext2_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\RCWS30_CO.paa","a3\armor_f_gamma\APC_Wheeled_03\data\APC_Wheeled_03_Ext_alpha_CO.paa","a3\armor_f\data\camonet_aaf_fia_desert_co.paa","a3\armor_f\data\cage_sand_co.paa"}; }; -class a3a_MBT_04_cannon_black_F : O_MBT_04_cannon_F +class a3a_MBT_04_cannon_black_F : O_MBT_04_cannon_F { - textureList[] = {}; - hiddenSelectionsTextures[] = {"a3\armor_f_tank\mbt_04\data\mbt_04_exterior_1_co.paa","a3\armor_f_tank\mbt_04\data\mbt_04_exterior_2_co.paa","a3\armor_f\data\camonet_csat_stripe_desert_co.paa"}; + textureList[] = {}; + hiddenSelectionsTextures[] = {"a3\armor_f_tank\mbt_04\data\mbt_04_exterior_1_co.paa","a3\armor_f_tank\mbt_04\data\mbt_04_exterior_2_co.paa","a3\armor_f\data\camonet_csat_stripe_desert_co.paa"}; }; -class a3a_MBT_04_command_black_F : O_MBT_04_command_F +class a3a_MBT_04_command_black_F : O_MBT_04_command_F { - textureList[] = {}; - hiddenSelectionsTextures[] = {"a3\armor_f_tank\mbt_04\data\mbt_04_exterior_1_co.paa","a3\armor_f_tank\mbt_04\data\mbt_04_exterior_2_co.paa","a3\armor_f\data\camonet_csat_stripe_desert_co.paa"}; + textureList[] = {}; + hiddenSelectionsTextures[] = {"a3\armor_f_tank\mbt_04\data\mbt_04_exterior_1_co.paa","a3\armor_f_tank\mbt_04\data\mbt_04_exterior_2_co.paa","a3\armor_f\data\camonet_csat_stripe_desert_co.paa"}; }; \ No newline at end of file diff --git a/A3A/addons/config_fixes/Vanilla/sea.hpp b/A3A/addons/config_fixes/Vanilla/sea.hpp index 37737c747f..c163eb3ef2 100644 --- a/A3A/addons/config_fixes/Vanilla/sea.hpp +++ b/A3A/addons/config_fixes/Vanilla/sea.hpp @@ -1,9 +1,8 @@ - -class O_Boat_Armed_01_hmg_F; // +class O_Boat_Armed_01_hmg_F; 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"}; + 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"}; }; \ No newline at end of file diff --git a/A3A/addons/config_fixes/Vanilla/soft.hpp b/A3A/addons/config_fixes/Vanilla/soft.hpp index 3345a2d014..98e46a4b21 100644 --- a/A3A/addons/config_fixes/Vanilla/soft.hpp +++ b/A3A/addons/config_fixes/Vanilla/soft.hpp @@ -1,18 +1,17 @@ - - -class O_LSV_02_AT_F; // -class B_LSV_01_AT_F; // -class I_C_Offroad_02_unarmed_F; // -class I_C_Offroad_02_AT_F; // -class I_C_Offroad_02_LMG_F; // +class O_LSV_02_AT_F; +class B_LSV_01_AT_F; +class I_C_Offroad_02_unarmed_F; +class I_C_Offroad_02_AT_F; +class I_C_Offroad_02_LMG_F; class C_Van_02_transport_F; class C_Van_02_vehicle_F; class C_Van_02_service_F; class Van_02_medevac_base_F; //external Root Class -class C_Van_02_medevac_F : Van_02_medevac_base_F{ - class TextureSources; //external Child Class +class C_Van_02_medevac_F : Van_02_medevac_base_F +{ + class TextureSources; //external Child Class }; //offroads class B_G_Offroad_01_armed_F; @@ -22,191 +21,191 @@ class I_E_Offroad_01_comms_F; class I_E_Offroad_01_covered_F; //Black - Any/WS ION -class a3a_Offroad_01_black_F : B_G_Offroad_01_F +class a3a_Offroad_01_black_F : B_G_Offroad_01_F { - scope = 2; - hiddenSelectionsTextures[] = {"a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa","a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa"}; - textureList[] = {}; - animationList[] = {"HideDoor1",0,"HideDoor2",0,"HideDoor3",0.333333,"HideBumper1",0.5,"HideBumper2",0.5}; + scope = 2; + hiddenSelectionsTextures[] = {"a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa","a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa"}; + textureList[] = {}; + animationList[] = {"HideDoor1",0,"HideDoor2",0,"HideDoor3",0.333333,"HideBumper1",0.5,"HideBumper2",0.5}; }; -class a3a_Offroad_01_black_armed_F : B_G_Offroad_01_armed_F +class a3a_Offroad_01_black_armed_F : B_G_Offroad_01_armed_F { - scope = 2; - hiddenSelectionsTextures[] = {"a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa","a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa"}; - textureList[] = {}; - animationList[] = {"HideDoor1",1,"HideDoor2",1,"HideDoor3",1,"HideBumper1",0.5,"HideBumper2",0.5}; + scope = 2; + hiddenSelectionsTextures[] = {"a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa","a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa"}; + textureList[] = {}; + animationList[] = {"HideDoor1",1,"HideDoor2",1,"HideDoor3",1,"HideBumper1",0.5,"HideBumper2",0.5}; }; class a3a_Offroad_01_black_AT_F : B_G_Offroad_01_AT_F { - scope = 2; - hiddenSelectionsTextures[] = {"a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa","a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa"}; - textureList[] = {}; - animationList[] = {"HideDoor1",1,"HideDoor2",1,"HideDoor3",1,"HideBumper1",0.5,"HideBumper2",0.5}; + scope = 2; + hiddenSelectionsTextures[] = {"a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa","a3\soft_f_enoch\offroad_01\data\offroad_01_ext_blk_co.paa"}; + textureList[] = {}; + animationList[] = {"HideDoor1",1,"HideDoor2",1,"HideDoor3",1,"HideBumper1",0.5,"HideBumper2",0.5}; }; //Jeep Wranglers - APEX - used by WS ION -class a3a_Offroad_02_unarmed_black_F : I_C_Offroad_02_unarmed_F +class a3a_Offroad_02_unarmed_black_F : I_C_Offroad_02_unarmed_F { - scope = 2; - textureList[] = {"Black",1,"Blue",0,"Green",0,"Orange",0,"Red",0,"White",0,"Brown",0,"Olive",0,"IDAP",0}; + scope = 2; + textureList[] = {"Black",1,"Blue",0,"Green",0,"Orange",0,"Red",0,"White",0,"Brown",0,"Olive",0,"IDAP",0}; }; -class a3a_Offroad_02_black_AT_F : I_C_Offroad_02_AT_F +class a3a_Offroad_02_black_AT_F : I_C_Offroad_02_AT_F { - scope = 2; - textureList[] = {"Black",1,"Blue",0,"Green",0,"Orange",0,"Red",0,"White",0,"Brown",0,"Olive",0,"IDAP",0}; + scope = 2; + textureList[] = {"Black",1,"Blue",0,"Green",0,"Orange",0,"Red",0,"White",0,"Brown",0,"Olive",0,"IDAP",0}; }; -class a3a_Offroad_02_LMG_black_F : I_C_Offroad_02_LMG_F +class a3a_Offroad_02_LMG_black_F : I_C_Offroad_02_LMG_F { - scope = 2; - textureList[] = {"Black",1,"Blue",0,"Green",0,"Orange",0,"Red",0,"White",0,"Brown",0,"Olive",0,"IDAP",0}; + scope = 2; + textureList[] = {"Black",1,"Blue",0,"Green",0,"Orange",0,"Red",0,"White",0,"Brown",0,"Olive",0,"IDAP",0}; }; //Greens - Tropical/AAF -class a3a_Offroad_01_green_F : B_G_Offroad_01_F +class a3a_Offroad_01_green_F : B_G_Offroad_01_F { - scope = 2; - 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"}; - textureList[] = {"Green",1}; + scope = 2; + 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"}; + textureList[] = {"Green",1}; }; -class a3a_Offroad_01_green_armed_F : B_G_Offroad_01_armed_F +class a3a_Offroad_01_green_armed_F : B_G_Offroad_01_armed_F { - scope = 2; - 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"}; - textureList[] = {"Green",1}; + scope = 2; + 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"}; + textureList[] = {"Green",1}; }; class a3a_Offroad_01_green_AT_F : B_G_Offroad_01_AT_F { - scope = 2; - 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"}; - textureList[] = {"Green",1}; + scope = 2; + 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"}; + textureList[] = {"Green",1}; }; -class a3a_Offroad_01_comms_green_F : I_E_Offroad_01_comms_F +class a3a_Offroad_01_comms_green_F : I_E_Offroad_01_comms_F { - scope = 2; - 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","a3\soft_f_enoch\offroad_01\data\offroad_01_cover_grn_co.paa"}; - textureList[] = {"Green",1}; + scope = 2; + 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","a3\soft_f_enoch\offroad_01\data\offroad_01_cover_grn_co.paa"}; + textureList[] = {"Green",1}; }; class a3a_Offroad_01_covered_green_F : I_E_Offroad_01_covered_F { - scope = 2; - 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","a3\soft_f_enoch\offroad_01\data\offroad_01_cover_grn_co.paa"}; - textureList[] = {"Green",1}; + scope = 2; + 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","a3\soft_f_enoch\offroad_01\data\offroad_01_cover_grn_co.paa"}; + textureList[] = {"Green",1}; }; //Tans - Arid -class a3a_Offroad_01_tan_F : B_G_Offroad_01_F +class a3a_Offroad_01_tan_F : B_G_Offroad_01_F { - scope = 2; - textureList[] = {"Beige",1}; - 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"}; + scope = 2; + textureList[] = {"Beige",1}; + 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"}; }; -class a3a_Offroad_01_tan_armed_F : B_G_Offroad_01_armed_F +class a3a_Offroad_01_tan_armed_F : B_G_Offroad_01_armed_F { - scope = 2; - textureList[] = {"Beige",1}; - 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"}; + scope = 2; + textureList[] = {"Beige",1}; + 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"}; }; class a3a_Offroad_01_tan_AT_F : B_G_Offroad_01_AT_F { - scope = 2; - textureList[] = {"Beige",1}; - 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"}; + scope = 2; + textureList[] = {"Beige",1}; + 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"}; }; -class a3a_Offroad_01_comms_tan_F : I_E_Offroad_01_comms_F +class a3a_Offroad_01_comms_tan_F : I_E_Offroad_01_comms_F { - scope = 2; - textureList[] = {"Beige",1}; - 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","a3\soft_f_enoch\offroad_01\data\offroad_01_cover_blk_co.paa"}; + scope = 2; + textureList[] = {"Beige",1}; + 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","a3\soft_f_enoch\offroad_01\data\offroad_01_cover_blk_co.paa"}; }; class a3a_Offroad_01_covered_tan_F : I_E_Offroad_01_covered_F { - scope = 2; - textureList[] = {"Beige",1}; - 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","a3\soft_f_enoch\offroad_01\data\offroad_01_cover_blk_co.paa"}; + scope = 2; + textureList[] = {"Beige",1}; + 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","a3\soft_f_enoch\offroad_01\data\offroad_01_cover_blk_co.paa"}; }; //LDF Camo -class a3a_Offroad_01_ldf_armed_F : B_G_Offroad_01_armed_F +class a3a_Offroad_01_ldf_armed_F : B_G_Offroad_01_armed_F { - crew = "I_E_Soldier_F"; - faction = "IND_E_F"; - 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"}; - textureList[] = {"EAF",1}; + crew = "I_E_Soldier_F"; + faction = "IND_E_F"; + 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"}; + textureList[] = {"EAF",1}; }; class a3a_Offroad_01_ldf_AT_F : B_G_Offroad_01_AT_F { - crew = "I_E_Soldier_F"; - faction = "IND_E_F"; - 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"}; - textureList[] = {"EAF",1}; + crew = "I_E_Soldier_F"; + faction = "IND_E_F"; + 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"}; + textureList[] = {"EAF",1}; }; //Gendarmerie - keeping these -class a3a_Offroad_01_GEN_armed_F : B_G_Offroad_01_armed_F +class a3a_Offroad_01_GEN_armed_F : B_G_Offroad_01_armed_F { - crew = "B_GEN_Commander_F"; - faction = "BLU_GEN_F"; - side = 1; - hiddenSelectionsTextures[] = {"\A3\Soft_F_Exp\Offroad_01\Data\Offroad_01_ext_gen_CO.paa","\A3\Soft_F_Exp\Offroad_01\Data\Offroad_01_ext_gen_CO.paa"}; - textureList[] = {"Gendarmerie",1}; - animationList[] = {"HideDoor1",0,"HideDoor2",0,"HideDoor3",0.5,"HideBumper1",0.5,"HideBumper2",0.5}; + crew = "B_GEN_Commander_F"; + faction = "BLU_GEN_F"; + side = 1; + hiddenSelectionsTextures[] = {"\A3\Soft_F_Exp\Offroad_01\Data\Offroad_01_ext_gen_CO.paa","\A3\Soft_F_Exp\Offroad_01\Data\Offroad_01_ext_gen_CO.paa"}; + textureList[] = {"Gendarmerie",1}; + animationList[] = {"HideDoor1",0,"HideDoor2",0,"HideDoor3",0.5,"HideBumper1",0.5,"HideBumper2",0.5}; }; class a3a_Offroad_01_GEN_AT_F : B_G_Offroad_01_AT_F { - crew = "B_GEN_Commander_F"; - faction = "BLU_GEN_F"; - side = 1; - hiddenSelectionsTextures[] = {"\A3\Soft_F_Exp\Offroad_01\Data\Offroad_01_ext_gen_CO.paa","\A3\Soft_F_Exp\Offroad_01\Data\Offroad_01_ext_gen_CO.paa"}; - textureList[] = {"Gendarmerie",1}; - animationList[] = {"HideDoor1",0,"HideDoor2",0,"HideDoor3",0.5,"HideBumper1",0.5,"HideBumper2",0.5}; + crew = "B_GEN_Commander_F"; + faction = "BLU_GEN_F"; + side = 1; + hiddenSelectionsTextures[] = {"\A3\Soft_F_Exp\Offroad_01\Data\Offroad_01_ext_gen_CO.paa","\A3\Soft_F_Exp\Offroad_01\Data\Offroad_01_ext_gen_CO.paa"}; + textureList[] = {"Gendarmerie",1}; + animationList[] = {"HideDoor1",0,"HideDoor2",0,"HideDoor3",0.5,"HideBumper1",0.5,"HideBumper2",0.5}; }; //Used by WS ION -class a3a_LSV_02_AT_black_F : O_LSV_02_AT_F +class a3a_LSV_02_AT_black_F : O_LSV_02_AT_F { - scope = 2; - textureList[] = {"Black",1,"GreenHex",0,"Arid",0}; + scope = 2; + textureList[] = {"Black",1,"GreenHex",0,"Arid",0}; }; -class a3a_LSV_01_AT_black_F : B_LSV_01_AT_F +class a3a_LSV_01_AT_black_F : B_LSV_01_AT_F { - scope = 2; - textureList[] = {"Black",1,"Olive",0,"Sand",0}; + 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}; + 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}; + 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}; + 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}; + 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}; }; diff --git a/A3A/addons/config_fixes/WS/CfgMarkers.hpp b/A3A/addons/config_fixes/WS/CfgMarkers.hpp index 410aba8645..eac524974f 100644 --- a/A3A/addons/config_fixes/WS/CfgMarkers.hpp +++ b/A3A/addons/config_fixes/WS/CfgMarkers.hpp @@ -1,9 +1,8 @@ - class CfgMarkers { - class flag_NATO; - class a3a_flag_SIFA: flag_NATO { - name = "SIFA"; - icon = "\lxws\data_f_lxws\img\flags\flag_SFIA_CO.paa"; - texture = "\lxws\data_f_lxws\img\flags\flag_SFIA_CO.paa"; - }; + class flag_NATO; + class a3a_flag_SIFA: flag_NATO { + name = "SIFA"; + icon = "\lxws\data_f_lxws\img\flags\flag_SFIA_CO.paa"; + texture = "\lxws\data_f_lxws\img\flags\flag_SFIA_CO.paa"; + }; }; diff --git a/A3A/addons/config_fixes/WS/CfgVehicles.hpp b/A3A/addons/config_fixes/WS/CfgVehicles.hpp index 5e2ad0fd55..6f45443ce9 100644 --- a/A3A/addons/config_fixes/WS/CfgVehicles.hpp +++ b/A3A/addons/config_fixes/WS/CfgVehicles.hpp @@ -1,114 +1,113 @@ - class CfgVehicles { - class O_Truck_02_Ammo_F; // - class O_Truck_02_Fuel_F; // - class O_Truck_02_box_F; // - class O_Truck_02_transport_F; // - class O_Truck_02_medical_F; // - - class I_Truck_02_MRL_F; - - class O_Truck_02_cargo_lxWS; - class O_Truck_02_flatbed_lxWS; - - class O_Tura_Truck_02_aa_lxWS; - class O_Tura_ZU23_lxWS; - - class B_G_Offroad_01_armed_F; - class B_G_Offroad_01_AT_F; - - class B_Tura_Offroad_armor_lxWS; - class B_Tura_Offroad_armor_AT_lxWS; - class B_Tura_Offroad_armor_armed_lxWS; + class O_Truck_02_Ammo_F; + class O_Truck_02_Fuel_F; + class O_Truck_02_box_F; + class O_Truck_02_transport_F; + class O_Truck_02_medical_F; + + class I_Truck_02_MRL_F; + + class O_Truck_02_cargo_lxWS; + class O_Truck_02_flatbed_lxWS; + + class O_Tura_Truck_02_aa_lxWS; + class O_Tura_ZU23_lxWS; + + class B_G_Offroad_01_armed_F; + class B_G_Offroad_01_AT_F; + + class B_Tura_Offroad_armor_lxWS; + class B_Tura_Offroad_armor_AT_lxWS; + class B_Tura_Offroad_armor_armed_lxWS; - + #include "ws_ion.hpp" - - //Misc retextures - class a3a_tan_Offroad_armor : B_Tura_Offroad_armor_lxWS - { - 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_tan_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS - { - 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_tan_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS - { - 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[] = {}; - 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_green_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS - { - 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_green_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS - { - 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[] = {}; - crew = "I_E_Soldier_F"; - faction = "IND_E_F"; - 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_ldf_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS - { - textureList[] = {}; - crew = "I_E_Soldier_F"; - faction = "IND_E_F"; - 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_ldf_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS - { - textureList[] = {}; - crew = "I_E_Soldier_F"; - faction = "IND_E_F"; - 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; - crew = "O_SFIA_soldier_lxWS"; - faction = "OPF_SFIA_lxWS"; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_sfia_co.paa","lxws\vehicles_f_lxws\data\truck_02\truck_02_kuz_africa_brown_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; - }; - class a3a_O_Truck_02_zu23_F : O_Tura_Truck_02_aa_lxWS - { - side = 0; - crew = "O_soldier_F"; - faction = "OPF_F"; - hiddenSelectionsTextures[] = {"a3\soft_f_beta\truck_02\data\truck_02_kab_opfor_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_opfor_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_base_sfia_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_sfia_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_1_hex_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_2_sfia_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"}; - }; - class a3a_O_T_Truck_02_zu23_F : O_Tura_Truck_02_aa_lxWS - { - side = 0; - crew = "O_T_Soldier_F"; - faction = "OPF_T_F"; - hiddenSelectionsTextures[] = {"a3\soft_f_exp\truck_02\data\truck_02_kab_ghex_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_base_sfia_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_sfia_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_1_hex_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_2_sfia_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"}; - }; - class a3a_I_E_Truck_02_zu23_F : O_Tura_Truck_02_aa_lxWS - { - side = 2; - crew = "I_E_Soldier_F"; - 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"}; - }; + + //Misc retextures + class a3a_tan_Offroad_armor : B_Tura_Offroad_armor_lxWS + { + 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_tan_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS + { + 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_tan_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS + { + 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[] = {}; + 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_green_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS + { + 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_green_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS + { + 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[] = {}; + crew = "I_E_Soldier_F"; + faction = "IND_E_F"; + 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_ldf_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS + { + textureList[] = {}; + crew = "I_E_Soldier_F"; + faction = "IND_E_F"; + 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_ldf_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS + { + textureList[] = {}; + crew = "I_E_Soldier_F"; + faction = "IND_E_F"; + 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; + crew = "O_SFIA_soldier_lxWS"; + faction = "OPF_SFIA_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_sfia_co.paa","lxws\vehicles_f_lxws\data\truck_02\truck_02_kuz_africa_brown_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; + }; + class a3a_O_Truck_02_zu23_F : O_Tura_Truck_02_aa_lxWS + { + side = 0; + crew = "O_soldier_F"; + faction = "OPF_F"; + hiddenSelectionsTextures[] = {"a3\soft_f_beta\truck_02\data\truck_02_kab_opfor_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_opfor_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_base_sfia_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_sfia_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_1_hex_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_2_sfia_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"}; + }; + class a3a_O_T_Truck_02_zu23_F : O_Tura_Truck_02_aa_lxWS + { + side = 0; + crew = "O_T_Soldier_F"; + faction = "OPF_T_F"; + hiddenSelectionsTextures[] = {"a3\soft_f_exp\truck_02\data\truck_02_kab_ghex_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_base_sfia_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_sfia_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_1_hex_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_2_sfia_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"}; + }; + class a3a_I_E_Truck_02_zu23_F : O_Tura_Truck_02_aa_lxWS + { + side = 2; + crew = "I_E_Soldier_F"; + 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"}; + }; }; \ No newline at end of file diff --git a/A3A/addons/config_fixes/WS/ws_ion.hpp b/A3A/addons/config_fixes/WS/ws_ion.hpp index a6f65fe25c..2fcba66501 100644 --- a/A3A/addons/config_fixes/WS/ws_ion.hpp +++ b/A3A/addons/config_fixes/WS/ws_ion.hpp @@ -1,89 +1,88 @@ - -class a3a_ION_Truck_02_MRL_F : I_Truck_02_MRL_F +class a3a_ION_Truck_02_MRL_F : I_Truck_02_MRL_F { - side = 1; - crew = "B_ION_Soldier_lxWS"; - faction = "BLU_ION_lxWS"; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","a3\soft_f_gamma\truck_02\data\truck_02_mrl_co.paa"}; + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","a3\soft_f_gamma\truck_02\data\truck_02_mrl_co.paa"}; }; -class a3a_ION_Truck_02_Ammo_F : O_Truck_02_Ammo_F +class a3a_ION_Truck_02_Ammo_F : O_Truck_02_Ammo_F { - side = 1; - crew = "B_ION_Soldier_lxWS"; - faction = "BLU_ION_lxWS"; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_repair_green_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_repair_green_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; }; -class a3a_ION_Truck_02_Fuel_F : O_Truck_02_Fuel_F +class a3a_ION_Truck_02_Fuel_F : O_Truck_02_Fuel_F { - side = 1; - crew = "B_ION_Soldier_lxWS"; - faction = "BLU_ION_lxWS"; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_fuel_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_fuel_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; }; -class a3a_ION_Truck_02_repair_F : O_Truck_02_box_F +class a3a_ION_Truck_02_repair_F : O_Truck_02_box_F { - side = 1; - crew = "B_ION_Soldier_lxWS"; - faction = "BLU_ION_lxWS"; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_repair_green_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_repair_green_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; }; -class a3a_ION_Truck_02_transport_F : O_Truck_02_transport_F +class a3a_ION_Truck_02_transport_F : O_Truck_02_transport_F { - side = 1; - crew = "B_ION_Soldier_lxWS"; - faction = "BLU_ION_lxWS"; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_kuz_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_kuz_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; }; -class a3a_ION_Truck_02_medical_F : O_Truck_02_medical_F +class a3a_ION_Truck_02_medical_F : O_Truck_02_medical_F { - side = 1; - crew = "B_ION_Soldier_lxWS"; - faction = "BLU_ION_lxWS"; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_kuz_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","a3\soft_f_beta\truck_02\data\truck_02_kuz_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa"}; }; -class a3a_ION_Truck_02_cargo_F : O_Truck_02_cargo_lxWS +class a3a_ION_Truck_02_cargo_F : O_Truck_02_cargo_lxWS { - side = 1; - crew = "B_ION_Soldier_lxWS"; - faction = "BLU_ION_lxWS"; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"}; + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"}; }; -class a3a_ION_Truck_02_flatbed_F : O_Truck_02_flatbed_lxWS +class a3a_ION_Truck_02_flatbed_F : O_Truck_02_flatbed_lxWS { - side = 1; - crew = "B_ION_Soldier_lxWS"; - faction = "BLU_ION_lxWS"; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"}; + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"}; }; -class a3a_ION_Truck_02_zu23_F : O_Tura_Truck_02_aa_lxWS +class a3a_ION_Truck_02_zu23_F : O_Tura_Truck_02_aa_lxWS { - side = 1; - crew = "B_ION_Soldier_lxWS"; - faction = "BLU_ION_lxWS"; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_base_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_1_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_2_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"}; + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\truck_02\truck_02_kab_black_co.paa","lxws\vehicles_f_lxws\truck_02\data\truck_02_cargo_olive_co.paa","a3\soft_f_beta\truck_02\data\truck_02_int_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_base_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_1_co.paa","lxws\vehicles_f_lxws\zu23\data\zu23_addon_2_co.paa","lxws\vehicles_f_lxws\truck_02\data\addons_black_co.paa"}; }; class a3a_ion_Offroad_armor : B_Tura_Offroad_armor_lxWS { - side = 1; - crew = "B_ION_Soldier_lxWS"; - faction = "BLU_ION_lxWS"; - textureList[] = {}; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_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_black_co.paa"}; + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + textureList[] = {}; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_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_black_co.paa"}; }; class a3a_ion_Offroad_armor_at : B_Tura_Offroad_armor_AT_lxWS { - side = 1; - crew = "B_ION_Soldier_lxWS"; - faction = "BLU_ION_lxWS"; - textureList[] = {}; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_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_black_co.paa"}; + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + textureList[] = {}; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_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_black_co.paa"}; }; class a3a_ion_Offroad_armor_armed : B_Tura_Offroad_armor_armed_lxWS { - side = 1; - crew = "B_ION_Soldier_lxWS"; - faction = "BLU_ION_lxWS"; - textureList[] = {}; - hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_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_black_co.paa"}; + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + textureList[] = {}; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_co.paa","lxws\vehicles_f_lxws\data\offroad_01\offroad_01_ext_black_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_black_co.paa"}; }; From d165134e8cc38c841ec3861095950036fef3bf63 Mon Sep 17 00:00:00 2001 From: Bob-Murphy <50651578+Bob-Murphy@users.noreply.github.com> Date: Wed, 18 Oct 2023 17:44:22 +0200 Subject: [PATCH 9/9] Update Templates.hpp --- A3A/addons/core/Templates/Templates.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/A3A/addons/core/Templates/Templates.hpp b/A3A/addons/core/Templates/Templates.hpp index 435fb31637..e98fc51fd4 100644 --- a/A3A/addons/core/Templates/Templates.hpp +++ b/A3A/addons/core/Templates/Templates.hpp @@ -139,6 +139,7 @@ class Templates flagTexture = "\lxws\data_f_lxws\img\flags\flag_Argana_CO.paa"; name = "Western Sahara"; file = "WS_Civ"; + }; class WS_NATO : WS_Base { side = "Occ";