From 504c458abbd28f911f563137543fbeb056e5e6b6 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Mon, 13 Nov 2023 22:31:37 +0100 Subject: [PATCH 01/18] Update armor.hpp --- A3A/addons/config_fixes/Vanilla/armor.hpp | 70 ++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/A3A/addons/config_fixes/Vanilla/armor.hpp b/A3A/addons/config_fixes/Vanilla/armor.hpp index d65c8466d0..c456438ce5 100644 --- a/A3A/addons/config_fixes/Vanilla/armor.hpp +++ b/A3A/addons/config_fixes/Vanilla/armor.hpp @@ -1,6 +1,74 @@ //Vanilla - armor.hpp -class I_APC_Wheeled_03_cannon_F; +class Wheeled_APC_F; +class Tank_F; +class APC_Wheeled_02_base_F; +class APC_Wheeled_03_base_F; +class O_APC_Tracked_02_base_F; + +//Slat Cages +class APC_Wheeled_02_base_v2_F : APC_Wheeled_02_base_F +{ + animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; +class APC_Wheeled_01_base_F : Wheeled_APC_F +{ + animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; +class AFV_Wheeled_01_base_F : Wheeled_APC_F +{ + animationList[] = {"showCamonetHull",0,"showCamonetCannon",0,"showCamonetTurret",0,"showSLATHull",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; +class O_APC_Tracked_02_cannon_F : O_APC_Tracked_02_base_F +{ + animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; +class I_APC_Wheeled_03_base_F : APC_Wheeled_03_base_F +{ + animationList[] = {"showCamonetHull",0,"showBags",0.3,"showBags2",0.3,"showTools",0.3,"showSLATHull",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; +class APC_Tracked_03_base_F : Tank_F +{ + animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; + +class I_APC_Wheeled_03_cannon_F; // !! class I_MRAP_03_F; class I_MRAP_03_gmg_F; class I_MRAP_03_hmg_F; From 68e1e162ae4f62a07f226bff6f02567badf6e13d Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Mon, 13 Nov 2023 22:33:50 +0100 Subject: [PATCH 02/18] NATO --- .../core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf | 2 +- .../core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf | 2 +- .../Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf | 2 +- .../Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf index 04f3b51481..80e097eee2 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf @@ -85,7 +85,7 @@ if ("enoch" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Offroad_01_comms_F","B_GEN_Offroad_01_covered_F"]; }; if ("tanks" in A3A_enabledDLC) then { - _Tanks append ["B_T_AFV_Wheeled_01_cannon_F","B_T_AFV_Wheeled_01_up_cannon_F"]; //Wheeled tank destroyers + ["vehiclesLightTanks", ["B_T_AFV_Wheeled_01_cannon_F","B_T_AFV_Wheeled_01_up_cannon_F"]] call _fnc_saveToTemplate; }; if ("heli" in A3A_enabledDLC) then { _HelisTransport append ["B_Heli_Transport_03_F", "B_Heli_Transport_03_unarmed_green_F"]; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf index 90bcc8fc8a..b1f2c9507e 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf @@ -86,7 +86,7 @@ if ("enoch" in A3A_enabledDLC) then { _vehiclesMilitiaCars append ["a3a_Offroad_01_comms_tan_F", "a3a_Offroad_01_covered_tan_F"]; }; if ("tanks" in A3A_enabledDLC) then { - _Tanks append ["B_AFV_Wheeled_01_cannon_F","B_AFV_Wheeled_01_up_cannon_F"]; //Wheeled tank destroyers + ["vehiclesLightTanks", ["B_AFV_Wheeled_01_cannon_F","B_AFV_Wheeled_01_up_cannon_F"]] call _fnc_saveToTemplate; }; if ("expansion" in A3A_enabledDLC) then { _LightUnarmed append ["B_MRAP_01_F","B_LSV_01_unarmed_F"]; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf index d258d57ceb..d21afbd542 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf @@ -85,7 +85,7 @@ if ("enoch" in A3A_enabledDLC) then { _vehiclesMilitiaCars append ["C_Offroad_01_comms_F", "C_Offroad_01_covered_F"]; }; if ("tanks" in A3A_enabledDLC) then { - _Tanks append ["B_T_AFV_Wheeled_01_cannon_F","B_T_AFV_Wheeled_01_up_cannon_F"]; //Wheeled tank destroyers + ["vehiclesLightTanks", ["B_T_AFV_Wheeled_01_cannon_F","B_T_AFV_Wheeled_01_up_cannon_F"]] call _fnc_saveToTemplate; }; if ("expansion" in A3A_enabledDLC) then { _LightUnarmed append ["B_T_MRAP_01_F", "B_T_LSV_01_unarmed_F"]; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf index fd9142e196..860cdcee58 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf @@ -86,7 +86,7 @@ if ("enoch" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Offroad_01_comms_F","B_GEN_Offroad_01_covered_F"]; }; if ("tanks" in A3A_enabledDLC) then { - _Tanks append ["B_T_AFV_Wheeled_01_cannon_F","B_T_AFV_Wheeled_01_up_cannon_F"]; //Wheeled tank destroyers + ["vehiclesLightTanks", ["B_T_AFV_Wheeled_01_cannon_F","B_T_AFV_Wheeled_01_up_cannon_F"]] call _fnc_saveToTemplate; }; if ("expansion" in A3A_enabledDLC) then { _LightUnarmed append ["B_T_MRAP_01_F", "B_T_LSV_01_unarmed_F"]; From 59a9982ce48b0144809f2de0f512882aaebc7d70 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Mon, 13 Nov 2023 22:43:44 +0100 Subject: [PATCH 03/18] CSAT --- .../Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf | 8 ++++---- .../Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf | 8 ++++---- .../Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf | 8 ++++---- .../Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf index 56060dea92..ff2ce69d5d 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf @@ -27,8 +27,8 @@ private _cargoTrucks = ["O_T_Truck_02_transport_F","O_T_Truck_02_F","O_T_Truck_0 ["vehiclesFuelTrucks", ["O_T_Truck_02_fuel_F","O_T_Truck_03_fuel_ghex_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["O_T_Truck_03_medical_ghex_F","O_T_Truck_02_Medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -["vehiclesAPCs", ["O_T_APC_Tracked_02_cannon_ghex_F","O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate; -["vehiclesIFVs", []] call _fnc_saveToTemplate; +["vehiclesAPCs", ["O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate; +["vehiclesIFVs", ["O_T_APC_Tracked_02_cannon_ghex_F"]] call _fnc_saveToTemplate; private _Tanks = ["O_T_MBT_02_cannon_ghex_F"]; ["vehiclesAA", ["O_T_APC_Tracked_02_AA_ghex_F"]] call _fnc_saveToTemplate; @@ -55,7 +55,7 @@ private _Tanks = ["O_T_MBT_02_cannon_ghex_F"]; //Config special vehicles - militia vehicles are mostly used in the early game, police cars are being used by troops around cities -- Example: ["vehiclesMilitiaLightArmed", ["O_T_LSV_02_armed_F","O_T_LSV_02_AT_F"]] call _fnc_saveToTemplate; -["vehiclesMilitiaTrucks", ["O_T_Truck_02_transport_F","O_T_Truck_02_F","O_T_Truck_03_transport_ghex_F","O_T_Truck_03_covered_ghex_F"]] call _fnc_saveToTemplate; +["vehiclesMilitiaTrucks", ["O_T_Truck_02_F"]] call _fnc_saveToTemplate; ["vehiclesMilitiaCars", ["O_T_LSV_02_unarmed_F"]] call _fnc_saveToTemplate; private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; @@ -75,7 +75,7 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; //If Western Sahara DLC if ("ws" in A3A_enabledDLC) then { - _cargoTrucks = ["O_T_Truck_02_cargo_lxWS","O_T_Truck_02_flatbed_lxWS"]; + _cargoTrucks append ["O_T_Truck_02_cargo_lxWS","O_T_Truck_02_flatbed_lxWS"]; ["uavsPortable", ["O_UAV_01_F", "O_UAV_02_lxWS"]] call _fnc_saveToTemplate; }; if ("enoch" in A3A_enabledDLC) then { diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf index a0944ec1fe..439e927138 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf @@ -27,8 +27,8 @@ private _cargoTrucks = ["O_Truck_02_transport_F", "O_Truck_02_covered_F", "O_Tru ["vehiclesFuelTrucks", ["O_Truck_03_fuel_F", "O_Truck_02_fuel_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["O_Truck_02_medical_F", "O_Truck_03_medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -["vehiclesAPCs", ["O_APC_Tracked_02_cannon_F", "O_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; -["vehiclesIFVs", []] call _fnc_saveToTemplate; +["vehiclesAPCs", ["O_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; +["vehiclesIFVs", ["O_APC_Tracked_02_cannon_F"]] call _fnc_saveToTemplate; private _Tanks = ["O_MBT_02_cannon_F"]; ["vehiclesAA", ["O_APC_Tracked_02_AA_F"]] call _fnc_saveToTemplate; @@ -54,7 +54,7 @@ private _Tanks = ["O_MBT_02_cannon_F"]; //Config special vehicles - militia vehicles are mostly used in the early game, police cars are being used by troops around cities -- Example: private _vehiclesMilitiaLightArmed = ["a3a_Offroad_01_tan_armed_F", "a3a_Offroad_01_tan_AT_F"]; -["vehiclesMilitiaTrucks", ["O_Truck_02_transport_F", "O_Truck_02_covered_F", "O_Truck_03_covered_F", "O_Truck_03_transport_F"]] call _fnc_saveToTemplate; +["vehiclesMilitiaTrucks", ["O_Truck_02_covered_F"]] call _fnc_saveToTemplate; private _vehiclesMilitiaCars = ["a3a_Offroad_01_tan_F"]; private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; @@ -74,7 +74,7 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; //If Western Sahara DLC if ("ws" in A3A_enabledDLC) then { - _cargoTrucks = ["O_Truck_02_cargo_lxWS","O_Truck_02_flatbed_lxWS"]; + _cargoTrucks append ["O_Truck_02_cargo_lxWS","O_Truck_02_flatbed_lxWS"]; ["uavsPortable", ["O_UAV_01_F", "O_UAV_02_lxWS"]] call _fnc_saveToTemplate; }; if ("enoch" in A3A_enabledDLC) then { diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf index b992ace175..c26d53a91e 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf @@ -27,8 +27,8 @@ private _cargoTrucks = ["O_T_Truck_02_transport_F", "O_T_Truck_02_F", "O_T_Truck ["vehiclesFuelTrucks", ["O_T_Truck_02_fuel_F","O_T_Truck_03_fuel_ghex_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["O_T_Truck_03_medical_ghex_F","O_T_Truck_02_Medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -["vehiclesAPCs", ["O_T_APC_Tracked_02_cannon_ghex_F","O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate; -["vehiclesIFVs", []] call _fnc_saveToTemplate; +["vehiclesAPCs", ["O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate; +["vehiclesIFVs", ["O_T_APC_Tracked_02_cannon_ghex_F"]] call _fnc_saveToTemplate; private _Tanks = ["O_T_MBT_02_cannon_ghex_F"]; ["vehiclesAA", ["O_T_APC_Tracked_02_AA_ghex_F"]] call _fnc_saveToTemplate; @@ -55,7 +55,7 @@ private _Tanks = ["O_T_MBT_02_cannon_ghex_F"]; //Config special vehicles - militia vehicles are mostly used in the early game, police cars are being used by troops around cities -- Example: private _vehiclesMilitiaLightArmed = ["a3a_Offroad_01_green_armed_F", "a3a_Offroad_01_green_AT_F"]; -["vehiclesMilitiaTrucks", ["O_Truck_02_transport_F", "O_Truck_02_covered_F", "O_Truck_03_covered_F", "O_Truck_03_transport_F"]] call _fnc_saveToTemplate; +["vehiclesMilitiaTrucks", ["O_T_Truck_02_F"]] call _fnc_saveToTemplate; private _vehiclesMilitiaCars = ["a3a_Offroad_01_tan_F"]; private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; @@ -75,7 +75,7 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; //If Western Sahara DLC if ("ws" in A3A_enabledDLC) then { - _cargoTrucks = ["O_T_Truck_02_cargo_lxWS","O_T_Truck_02_flatbed_lxWS"]; + _cargoTrucks append ["O_T_Truck_02_cargo_lxWS","O_T_Truck_02_flatbed_lxWS"]; ["uavsPortable", ["O_UAV_01_F", "O_UAV_02_lxWS"]] call _fnc_saveToTemplate; }; if ("enoch" in A3A_enabledDLC) then { diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf index da090c62aa..62cb292810 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf @@ -27,8 +27,8 @@ private _cargoTrucks = ["O_T_Truck_02_transport_F", "O_T_Truck_02_F", "O_T_Truck ["vehiclesFuelTrucks", ["O_T_Truck_02_fuel_F","O_T_Truck_03_fuel_ghex_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["O_T_Truck_03_medical_ghex_F","O_T_Truck_02_Medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -["vehiclesAPCs", ["O_T_APC_Tracked_02_cannon_ghex_F","O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate; -["vehiclesIFVs", []] call _fnc_saveToTemplate; +["vehiclesAPCs", ["O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate; +["vehiclesIFVs", ["O_T_APC_Tracked_02_cannon_ghex_F"]] call _fnc_saveToTemplate; private _Tanks = ["O_T_MBT_02_cannon_ghex_F"]; ["vehiclesAA", ["O_T_APC_Tracked_02_AA_ghex_F"]] call _fnc_saveToTemplate; @@ -55,7 +55,7 @@ private _Tanks = ["O_T_MBT_02_cannon_ghex_F"]; //Config special vehicles - militia vehicles are mostly used in the early game, police cars are being used by troops around cities -- Example: private _vehiclesMilitiaLightArmed = ["a3a_Offroad_01_black_armed_F", "a3a_Offroad_01_black_AT_F"]; -["vehiclesMilitiaTrucks", ["O_T_Truck_02_transport_F","O_T_Truck_02_F","O_T_Truck_03_transport_ghex_F","O_T_Truck_03_covered_ghex_F"]] call _fnc_saveToTemplate; +["vehiclesMilitiaTrucks", ["O_T_Truck_02_F"]] call _fnc_saveToTemplate; private _vehiclesMilitiaCars = ["a3a_Offroad_01_black_F"]; private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; @@ -75,7 +75,7 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; //If Western Sahara DLC if ("ws" in A3A_enabledDLC) then { - _cargoTrucks = ["O_T_Truck_02_cargo_lxWS","O_T_Truck_02_flatbed_lxWS"]; + _cargoTrucks append ["O_T_Truck_02_cargo_lxWS","O_T_Truck_02_flatbed_lxWS"]; ["uavsPortable", ["O_UAV_01_F", "O_UAV_02_lxWS"]] call _fnc_saveToTemplate; }; if ("enoch" in A3A_enabledDLC) then { From 793a974d5c00ded863c13a065dc9277025192393 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Mon, 13 Nov 2023 23:16:54 +0100 Subject: [PATCH 04/18] AAF LDF --- .../Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf | 8 ++++---- .../Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf index 9496afa9ee..a14bad21df 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf @@ -27,8 +27,8 @@ private _cargoTrucks = ["I_Truck_02_transport_F", "I_Truck_02_covered_F"]; ["vehiclesFuelTrucks", ["I_Truck_02_fuel_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["I_Truck_02_medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -["vehiclesAPCs", ["I_APC_tracked_03_cannon_F", "I_APC_Wheeled_03_cannon_F"]] call _fnc_saveToTemplate; -["vehiclesIFVs", []] call _fnc_saveToTemplate; +["vehiclesAPCs", ["I_APC_Wheeled_03_cannon_F"]] call _fnc_saveToTemplate; +["vehiclesIFVs", ["I_APC_tracked_03_cannon_F"]] call _fnc_saveToTemplate; ["vehiclesTanks", ["I_MBT_03_cannon_F"]] call _fnc_saveToTemplate; private _AA = ["I_LT_01_AA_F"]; @@ -56,7 +56,7 @@ private _AA = ["I_LT_01_AA_F"]; //Config special vehicles - militia vehicles are mostly used in the early game, police cars are being used by troops around cities -- Example: private _vehiclesMilitiaLightArmed = ["a3a_Offroad_01_green_armed_F", "a3a_Offroad_01_green_AT_F"]; -["vehiclesMilitiaTrucks", ["I_Truck_02_transport_F", "I_Truck_02_covered_F"]] call _fnc_saveToTemplate; +["vehiclesMilitiaTrucks", ["I_C_Van_01_transport_F"]] call _fnc_saveToTemplate; private _vehiclesMilitiaCars = ["a3a_Offroad_01_green_F"]; private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; @@ -81,7 +81,7 @@ if ("tanks" in A3A_enabledDLC) then { }; //If Western Sahara DLC if ("ws" in A3A_enabledDLC) then { - _cargoTrucks = ["I_Truck_02_flatbed_lxWS", "I_Truck_02_cargo_lxWS"]; + _cargoTrucks append ["I_Truck_02_flatbed_lxWS", "I_Truck_02_cargo_lxWS"]; _AA append ["I_A_Truck_02_aa_lxWS"]; ["uavsPortable", ["I_UAV_01_F", "I_UAV_02_lxWS"]] call _fnc_saveToTemplate; }; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf index 813f1c19f9..2f5d4cab5f 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf @@ -27,8 +27,8 @@ private _cargoTrucks = ["I_E_Truck_02_transport_F", "I_E_Truck_02_F"]; ["vehiclesFuelTrucks", ["I_E_Truck_02_fuel_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["I_E_Truck_02_Medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -["vehiclesAPCs", ["I_E_APC_tracked_03_cannon_F", "B_T_APC_Wheeled_01_cannon_F", "B_T_APC_Tracked_01_rcws_F"]] call _fnc_saveToTemplate; -["vehiclesIFVs", []] call _fnc_saveToTemplate; +["vehiclesAPCs", ["B_T_APC_Wheeled_01_cannon_F", "B_T_APC_Tracked_01_rcws_F"]] call _fnc_saveToTemplate; +["vehiclesIFVs", ["I_E_APC_tracked_03_cannon_F"]] call _fnc_saveToTemplate; private _Tanks = ["B_T_MBT_01_TUSK_F", "B_T_MBT_01_cannon_F"]; ["vehiclesAA", ["B_T_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate; @@ -56,7 +56,7 @@ private _HelisTransport = ["B_Heli_Transport_01_camo_F"]; //Config special vehicles private _vehiclesMilitiaLightArmed = ["a3a_Offroad_01_ldf_armed_F", "a3a_Offroad_01_ldf_AT_F"]; -["vehiclesMilitiaTrucks", ["I_E_Truck_02_F", "I_E_Truck_02_transport_F"]] call _fnc_saveToTemplate; +["vehiclesMilitiaTrucks", ["I_E_Van_02_transport_F", "I_E_Van_02_vehicle_F"]] call _fnc_saveToTemplate; private _vehiclesMilitiaCars = ["I_E_Offroad_01_F", "I_E_Offroad_01_comms_F", "I_E_Offroad_01_covered_F"]; private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F","B_GEN_Offroad_01_comms_F","B_GEN_Offroad_01_covered_F"]; @@ -77,11 +77,11 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F","B_GEN_Offroad_01_comms_F"," //If Western Sahara DLC if ("ws" in A3A_enabledDLC) then { - _cargoTrucks = ["I_E_Truck_02_cargo_lxWS","I_E_Truck_02_flatbed_lxWS"]; + _cargoTrucks append ["I_E_Truck_02_cargo_lxWS","I_E_Truck_02_flatbed_lxWS"]; ["uavsPortable", ["I_E_UAV_01_F", "I_UAV_02_lxWS"]] call _fnc_saveToTemplate; }; if ("tanks" in A3A_enabledDLC) then { - _Tanks append ["B_T_AFV_Wheeled_01_cannon_F","B_T_AFV_Wheeled_01_up_cannon_F"]; //Wheeled tank destroyers + ["vehiclesLightTanks", ["B_T_AFV_Wheeled_01_cannon_F","B_T_AFV_Wheeled_01_up_cannon_F"]] call _fnc_saveToTemplate; }; if ("expansion" in A3A_enabledDLC) then { _LightUnarmed append ["B_T_MRAP_01_F", "B_T_LSV_01_unarmed_F"]; @@ -91,7 +91,7 @@ if ("heli" in A3A_enabledDLC) then { _HelisTransport append ["B_Heli_Transport_03_F", "B_Heli_Transport_03_unarmed_green_F"] }; if ("orange" in A3A_enabledDLC) then { - _vehiclesPolice append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; + _vehiclesPolice append ["I_E_Van_02_transport_MP_F"]; }; ["vehiclesPolice", _vehiclesPolice] call _fnc_saveToTemplate; From b0169be67c77cf8c072d57f4d0abc46a8e37aead Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Tue, 14 Nov 2023 18:03:14 +0100 Subject: [PATCH 05/18] corrected T140 variant used by non-arid CSAT --- .../core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf | 2 +- .../core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf | 2 +- .../Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf index ff2ce69d5d..c3a293919f 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf @@ -82,7 +82,7 @@ if ("enoch" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Offroad_01_comms_F","B_GEN_Offroad_01_covered_F"]; }; if ("tanks" in A3A_enabledDLC) then { - _Tanks append ["O_MBT_04_cannon_F","O_MBT_04_command_F"]; + _Tanks append ["O_T_MBT_04_cannon_F","O_T_MBT_04_command_F"]; }; if ("orange" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Van_02_vehicle_F","B_GEN_Van_02_transport_F"]; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf index c26d53a91e..ea43aa0ce4 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf @@ -83,7 +83,7 @@ if ("enoch" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Offroad_01_comms_F","B_GEN_Offroad_01_covered_F"]; }; if ("tanks" in A3A_enabledDLC) then { - _Tanks append ["O_MBT_04_cannon_F","O_MBT_04_command_F"]; + _Tanks append ["O_T_MBT_04_cannon_F","O_T_MBT_04_command_F"]; }; if ("expansion" in A3A_enabledDLC) then { _LightUnarmed append ["O_T_MRAP_02_ghex_F", "O_T_LSV_02_unarmed_F"]; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf index 62cb292810..33c40c75db 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf @@ -83,8 +83,9 @@ if ("enoch" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Offroad_01_comms_F","B_GEN_Offroad_01_covered_F"]; }; if ("tanks" in A3A_enabledDLC) then { - _Tanks append ["O_MBT_04_cannon_F","O_MBT_04_command_F"]; + _Tanks append ["O_T_MBT_04_cannon_F","O_T_MBT_04_command_F"]; }; + if ("expansion" in A3A_enabledDLC) then { _LightUnarmed append ["O_T_MRAP_02_ghex_F", "O_T_LSV_02_unarmed_F"]; _LightArmed append ["O_T_LSV_02_AT_F", "O_T_LSV_02_armed_F"]; From 9fb124a4eb97b5ce7689b53a48623e69a6f4a29a Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Tue, 14 Nov 2023 18:03:54 +0100 Subject: [PATCH 06/18] created 11 more classes --- .../config_fixes/Vanilla/CfgVehicles.hpp | 1 + A3A/addons/config_fixes/Vanilla/armor.hpp | 3 +- A3A/addons/config_fixes/Vanilla/ifv.hpp | 134 ++++++++++++++++++ 3 files changed, 136 insertions(+), 2 deletions(-) create mode 100644 A3A/addons/config_fixes/Vanilla/ifv.hpp diff --git a/A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp b/A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp index e75ee26179..9f21ba4cdf 100644 --- a/A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp +++ b/A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp @@ -3,6 +3,7 @@ class CfgVehicles { #include "air.hpp" +#include "ifv.hpp" #include "armor.hpp" #include "sea.hpp" #include "soft.hpp" diff --git a/A3A/addons/config_fixes/Vanilla/armor.hpp b/A3A/addons/config_fixes/Vanilla/armor.hpp index c456438ce5..e205685f5c 100644 --- a/A3A/addons/config_fixes/Vanilla/armor.hpp +++ b/A3A/addons/config_fixes/Vanilla/armor.hpp @@ -68,7 +68,6 @@ class APC_Tracked_03_base_F : Tank_F }; }; -class I_APC_Wheeled_03_cannon_F; // !! class I_MRAP_03_F; class I_MRAP_03_gmg_F; class I_MRAP_03_hmg_F; @@ -90,7 +89,7 @@ class a3a_MRAP_03_hmg_grey_F : I_MRAP_03_hmg_F }; //Olive -class a3a_APC_Wheeled_03_cannon_blufor_F : I_APC_Wheeled_03_cannon_F +class a3a_APC_Wheeled_03_cannon_blufor_F : a3a_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"}; diff --git a/A3A/addons/config_fixes/Vanilla/ifv.hpp b/A3A/addons/config_fixes/Vanilla/ifv.hpp new file mode 100644 index 0000000000..f9a0042323 --- /dev/null +++ b/A3A/addons/config_fixes/Vanilla/ifv.hpp @@ -0,0 +1,134 @@ +//Vanilla - ifv.hpp + +//Marshall +class B_APC_Wheeled_01_cannon_F; +class B_T_APC_Wheeled_01_cannon_F; +class a3a_B_APC_Wheeled_01_cannon_F : B_APC_Wheeled_01_cannon_F +{ + animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; +class a3a_B_T_APC_Wheeled_01_cannon_F : B_T_APC_Wheeled_01_cannon_F +{ + animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; + +//Rhino +class B_AFV_Wheeled_01_cannon_F; +class B_T_AFV_Wheeled_01_cannon_F; +class a3a_AFV_Wheeled_01_cannon_F : B_AFV_Wheeled_01_cannon_F +{ + animationList[] = {"showCamonetHull",0,"showCamonetCannon",0,"showCamonetTurret",0,"showSLATHull",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; +class a3a_T_AFV_Wheeled_01_cannon_F : B_T_AFV_Wheeled_01_cannon_F +{ + animationList[] = {"showCamonetHull",0,"showCamonetCannon",0,"showCamonetTurret",0,"showSLATHull",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; + +//Gorgon +class I_APC_Wheeled_03_cannon_F; +class a3a_APC_Wheeled_03_cannon_F : I_APC_Wheeled_03_cannon_F +{ + animationList[] = {"showCamonetHull",0,"showBags",0.3,"showBags2",0.3,"showTools",0.3,"showSLATHull",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; + +//Mora +class I_APC_tracked_03_cannon_F; +class I_E_APC_tracked_03_cannon_F; +class a3a_APC_tracked_03_cannon_F : I_APC_tracked_03_cannon_F +{ + animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; +class a3a_E_APC_tracked_03_cannon_F : I_E_APC_tracked_03_cannon_F +{ + animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; + +//Marid +class O_APC_Wheeled_02_rcws_v2_F; +class O_T_APC_Wheeled_02_rcws_v2_F; +class a3a_APC_Wheeled_02_rcws_v2_F : O_APC_Wheeled_02_rcws_v2_F +{ + animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; +class a3a_T_APC_Wheeled_02_rcws_v2_F : O_T_APC_Wheeled_02_rcws_v2_F +{ + animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; + +//Kamysh +class O_APC_Tracked_02_cannon_F; +class O_T_APC_Tracked_02_cannon_F; +class a3a_APC_Tracked_02_cannon_F : O_APC_Tracked_02_cannon_F +{ + animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; +class a3a_T_APC_Tracked_02_cannon_F : O_T_APC_Tracked_02_cannon_F +{ + animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; \ No newline at end of file From 08fe64bdaccbf4b1de9ddd337252e3bac1cfdd0a Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Tue, 14 Nov 2023 20:27:23 +0100 Subject: [PATCH 07/18] FIX --- A3A/addons/config_fixes/Vanilla/armor.hpp | 68 ----------------------- A3A/addons/config_fixes/Vanilla/ifv.hpp | 8 +-- 2 files changed, 4 insertions(+), 72 deletions(-) diff --git a/A3A/addons/config_fixes/Vanilla/armor.hpp b/A3A/addons/config_fixes/Vanilla/armor.hpp index e205685f5c..8df316e7f9 100644 --- a/A3A/addons/config_fixes/Vanilla/armor.hpp +++ b/A3A/addons/config_fixes/Vanilla/armor.hpp @@ -1,73 +1,5 @@ //Vanilla - armor.hpp -class Wheeled_APC_F; -class Tank_F; -class APC_Wheeled_02_base_F; -class APC_Wheeled_03_base_F; -class O_APC_Tracked_02_base_F; - -//Slat Cages -class APC_Wheeled_02_base_v2_F : APC_Wheeled_02_base_F -{ - animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1}; - class EventHandlers - { - fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; - init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; - killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; - }; -}; -class APC_Wheeled_01_base_F : Wheeled_APC_F -{ - animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1}; - class EventHandlers - { - fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; - init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; - killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; - }; -}; -class AFV_Wheeled_01_base_F : Wheeled_APC_F -{ - animationList[] = {"showCamonetHull",0,"showCamonetCannon",0,"showCamonetTurret",0,"showSLATHull",1}; - class EventHandlers - { - fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; - init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; - killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; - }; -}; -class O_APC_Tracked_02_cannon_F : O_APC_Tracked_02_base_F -{ - animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1}; - class EventHandlers - { - fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; - init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; - killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; - }; -}; -class I_APC_Wheeled_03_base_F : APC_Wheeled_03_base_F -{ - animationList[] = {"showCamonetHull",0,"showBags",0.3,"showBags2",0.3,"showTools",0.3,"showSLATHull",1}; - class EventHandlers - { - fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; - init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; - killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; - }; -}; -class APC_Tracked_03_base_F : Tank_F -{ - animationList[] = {"showBags",0.3,"showBags2",0.3,"showCamonetHull",0,"showCamonetTurret",0,"showTools",0.3,"showSLATHull",1,"showSLATTurret",1}; - class EventHandlers - { - fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; - init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; - killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; - }; -}; - class I_MRAP_03_F; class I_MRAP_03_gmg_F; class I_MRAP_03_hmg_F; diff --git a/A3A/addons/config_fixes/Vanilla/ifv.hpp b/A3A/addons/config_fixes/Vanilla/ifv.hpp index f9a0042323..e98f27306a 100644 --- a/A3A/addons/config_fixes/Vanilla/ifv.hpp +++ b/A3A/addons/config_fixes/Vanilla/ifv.hpp @@ -87,7 +87,7 @@ class a3a_E_APC_tracked_03_cannon_F : I_E_APC_tracked_03_cannon_F //Marid class O_APC_Wheeled_02_rcws_v2_F; -class O_T_APC_Wheeled_02_rcws_v2_F; +class O_T_APC_Wheeled_02_rcws_v2_ghex_F; class a3a_APC_Wheeled_02_rcws_v2_F : O_APC_Wheeled_02_rcws_v2_F { animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1}; @@ -98,7 +98,7 @@ class a3a_APC_Wheeled_02_rcws_v2_F : O_APC_Wheeled_02_rcws_v2_F killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; }; }; -class a3a_T_APC_Wheeled_02_rcws_v2_F : O_T_APC_Wheeled_02_rcws_v2_F +class a3a_T_APC_Wheeled_02_rcws_v2_F : O_T_APC_Wheeled_02_rcws_v2_ghex_F { animationList[] = {"showBags",0.2,"showCanisters",0.2,"showTools",0.2,"showCamonetHull",0,"showSLATHull",1}; class EventHandlers @@ -111,7 +111,7 @@ class a3a_T_APC_Wheeled_02_rcws_v2_F : O_T_APC_Wheeled_02_rcws_v2_F //Kamysh class O_APC_Tracked_02_cannon_F; -class O_T_APC_Tracked_02_cannon_F; +class O_T_APC_Tracked_02_cannon_ghex_F; class a3a_APC_Tracked_02_cannon_F : O_APC_Tracked_02_cannon_F { animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1}; @@ -122,7 +122,7 @@ class a3a_APC_Tracked_02_cannon_F : O_APC_Tracked_02_cannon_F killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; }; }; -class a3a_T_APC_Tracked_02_cannon_F : O_T_APC_Tracked_02_cannon_F +class a3a_T_APC_Tracked_02_cannon_F : O_T_APC_Tracked_02_cannon_ghex_F { animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1}; class EventHandlers From 7652b1e21dad604753f17101d7aa9a12cb0a25cf Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Wed, 15 Nov 2023 16:21:55 +0100 Subject: [PATCH 08/18] CSAT LDF AAF --- .../Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf | 4 ++-- .../Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf | 9 +++++---- .../Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf | 9 +++++---- .../Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf | 10 ++++++---- .../Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf | 9 +++++---- .../Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf | 7 ++++--- 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf index a14bad21df..e22824e550 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf @@ -27,8 +27,8 @@ private _cargoTrucks = ["I_Truck_02_transport_F", "I_Truck_02_covered_F"]; ["vehiclesFuelTrucks", ["I_Truck_02_fuel_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["I_Truck_02_medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -["vehiclesAPCs", ["I_APC_Wheeled_03_cannon_F"]] call _fnc_saveToTemplate; -["vehiclesIFVs", ["I_APC_tracked_03_cannon_F"]] call _fnc_saveToTemplate; +["vehiclesAPCs", ["a3a_APC_Wheeled_03_cannon_F", "a3a_APC_Wheeled_03_cannon_F", "I_APC_tracked_03_cannon_F"]] call _fnc_saveToTemplate; +["vehiclesIFVs", ["a3a_APC_tracked_03_cannon_F"]] call _fnc_saveToTemplate; ["vehiclesTanks", ["I_MBT_03_cannon_F"]] call _fnc_saveToTemplate; private _AA = ["I_LT_01_AA_F"]; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf index c3a293919f..512bbe2168 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf @@ -27,14 +27,14 @@ private _cargoTrucks = ["O_T_Truck_02_transport_F","O_T_Truck_02_F","O_T_Truck_0 ["vehiclesFuelTrucks", ["O_T_Truck_02_fuel_F","O_T_Truck_03_fuel_ghex_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["O_T_Truck_03_medical_ghex_F","O_T_Truck_02_Medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -["vehiclesAPCs", ["O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate; -["vehiclesIFVs", ["O_T_APC_Tracked_02_cannon_ghex_F"]] call _fnc_saveToTemplate; +["vehiclesAPCs", ["a3a_T_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; +private _vehiclesIFVs = ["a3a_T_APC_Tracked_02_cannon_F"]; private _Tanks = ["O_T_MBT_02_cannon_ghex_F"]; ["vehiclesAA", ["O_T_APC_Tracked_02_AA_ghex_F"]] call _fnc_saveToTemplate; ["vehiclesTransportBoats", ["O_T_Boat_Transport_01_F"]] call _fnc_saveToTemplate; ["vehiclesGunBoats", ["O_T_Boat_Armed_01_hmg_F"]] call _fnc_saveToTemplate; -["vehiclesAmphibious", ["O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate; +["vehiclesAmphibious", ["a3a_T_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["O_Plane_CAS_02_dynamicLoadout_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesAA", ["O_Plane_Fighter_02_F"]] call _fnc_saveToTemplate; @@ -89,7 +89,8 @@ if ("orange" in A3A_enabledDLC) then { }; ["vehiclesPolice", _vehiclesPolice] call _fnc_saveToTemplate; -["vehiclesTanks", _Tanks] call _fnc_saveToTemplate; +["vehiclesTanks", _Tanks] call _fnc_saveToTemplate; +["vehiclesIFVs", _vehiclesIFVs] call _fnc_saveToTemplate; ["vehiclesCargoTrucks", _cargoTrucks] call _fnc_saveToTemplate; #include "Vanilla_Vehicle_Attributes.sqf" diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf index 439e927138..e995ffbf07 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf @@ -27,14 +27,14 @@ private _cargoTrucks = ["O_Truck_02_transport_F", "O_Truck_02_covered_F", "O_Tru ["vehiclesFuelTrucks", ["O_Truck_03_fuel_F", "O_Truck_02_fuel_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["O_Truck_02_medical_F", "O_Truck_03_medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -["vehiclesAPCs", ["O_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; -["vehiclesIFVs", ["O_APC_Tracked_02_cannon_F"]] call _fnc_saveToTemplate; +["vehiclesAPCs", ["a3a_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; +private _vehiclesIFVs = ["a3a_APC_Tracked_02_cannon_F"]; private _Tanks = ["O_MBT_02_cannon_F"]; ["vehiclesAA", ["O_APC_Tracked_02_AA_F"]] call _fnc_saveToTemplate; ["vehiclesTransportBoats", ["O_Boat_Transport_01_F"]] call _fnc_saveToTemplate; ["vehiclesGunBoats", ["O_Boat_Armed_01_hmg_F"]] call _fnc_saveToTemplate; -["vehiclesAmphibious", ["O_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; +["vehiclesAmphibious", ["a3a_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["O_Plane_CAS_02_dynamicLoadout_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesAA", ["O_Plane_Fighter_02_F"]] call _fnc_saveToTemplate; @@ -96,7 +96,8 @@ if ("orange" in A3A_enabledDLC) then { ["vehiclesLightUnarmed", _LightUnarmed] call _fnc_saveToTemplate; ["vehiclesLightArmed", _LightArmed] call _fnc_saveToTemplate; -["vehiclesTanks", _Tanks] call _fnc_saveToTemplate; +["vehiclesTanks", _Tanks] call _fnc_saveToTemplate; +["vehiclesIFVs", _vehiclesIFVs] call _fnc_saveToTemplate; ["vehiclesCargoTrucks", _cargoTrucks] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf index ea43aa0ce4..2d077d4d31 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf @@ -27,14 +27,14 @@ private _cargoTrucks = ["O_T_Truck_02_transport_F", "O_T_Truck_02_F", "O_T_Truck ["vehiclesFuelTrucks", ["O_T_Truck_02_fuel_F","O_T_Truck_03_fuel_ghex_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["O_T_Truck_03_medical_ghex_F","O_T_Truck_02_Medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -["vehiclesAPCs", ["O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate; -["vehiclesIFVs", ["O_T_APC_Tracked_02_cannon_ghex_F"]] call _fnc_saveToTemplate; +["vehiclesAPCs", ["a3a_T_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; +private _vehiclesIFVs = ["a3a_T_APC_Tracked_02_cannon_F"]; private _Tanks = ["O_T_MBT_02_cannon_ghex_F"]; ["vehiclesAA", ["O_T_APC_Tracked_02_AA_ghex_F"]] call _fnc_saveToTemplate; ["vehiclesTransportBoats", ["O_T_Boat_Transport_01_F"]] call _fnc_saveToTemplate; ["vehiclesGunBoats", ["O_T_Boat_Armed_01_hmg_F"]] call _fnc_saveToTemplate; -["vehiclesAmphibious", ["O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate; +["vehiclesAmphibious", ["a3a_T_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["O_Plane_CAS_02_dynamicLoadout_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesAA", ["O_Plane_Fighter_02_F"]] call _fnc_saveToTemplate; @@ -96,7 +96,9 @@ if ("orange" in A3A_enabledDLC) then { ["vehiclesLightUnarmed", _LightUnarmed] call _fnc_saveToTemplate; ["vehiclesLightArmed", _LightArmed] call _fnc_saveToTemplate; -["vehiclesTanks", _Tanks] call _fnc_saveToTemplate; +["vehiclesTanks", _Tanks] call _fnc_saveToTemplate; +["vehiclesIFVs", _vehiclesIFVs] call _fnc_saveToTemplate; + ["vehiclesCargoTrucks", _cargoTrucks] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf index 33c40c75db..40e9cd51e4 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf @@ -27,14 +27,14 @@ private _cargoTrucks = ["O_T_Truck_02_transport_F", "O_T_Truck_02_F", "O_T_Truck ["vehiclesFuelTrucks", ["O_T_Truck_02_fuel_F","O_T_Truck_03_fuel_ghex_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["O_T_Truck_03_medical_ghex_F","O_T_Truck_02_Medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -["vehiclesAPCs", ["O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate; -["vehiclesIFVs", ["O_T_APC_Tracked_02_cannon_ghex_F"]] call _fnc_saveToTemplate; +["vehiclesAPCs", ["a3a_T_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; +private _vehiclesIFVs = ["a3a_T_APC_Tracked_02_cannon_F"]; private _Tanks = ["O_T_MBT_02_cannon_ghex_F"]; ["vehiclesAA", ["O_T_APC_Tracked_02_AA_ghex_F"]] call _fnc_saveToTemplate; ["vehiclesTransportBoats", ["O_T_Boat_Transport_01_F"]] call _fnc_saveToTemplate; ["vehiclesGunBoats", ["O_T_Boat_Armed_01_hmg_F"]] call _fnc_saveToTemplate; -["vehiclesAmphibious", ["O_T_APC_Wheeled_02_rcws_v2_ghex_F"]] call _fnc_saveToTemplate; +["vehiclesAmphibious", ["a3a_T_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["O_Plane_CAS_02_dynamicLoadout_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesAA", ["O_Plane_Fighter_02_F"]] call _fnc_saveToTemplate; @@ -98,7 +98,8 @@ if ("orange" in A3A_enabledDLC) then { ["vehiclesLightUnarmed", _LightUnarmed] call _fnc_saveToTemplate; ["vehiclesLightArmed", _LightArmed] call _fnc_saveToTemplate; -["vehiclesTanks", _Tanks] call _fnc_saveToTemplate; +["vehiclesTanks", _Tanks] call _fnc_saveToTemplate; +["vehiclesIFVs", _vehiclesIFVs] call _fnc_saveToTemplate; ["vehiclesCargoTrucks", _cargoTrucks] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf index 2f5d4cab5f..78d4bc7e94 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf @@ -27,8 +27,8 @@ private _cargoTrucks = ["I_E_Truck_02_transport_F", "I_E_Truck_02_F"]; ["vehiclesFuelTrucks", ["I_E_Truck_02_fuel_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["I_E_Truck_02_Medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -["vehiclesAPCs", ["B_T_APC_Wheeled_01_cannon_F", "B_T_APC_Tracked_01_rcws_F"]] call _fnc_saveToTemplate; -["vehiclesIFVs", ["I_E_APC_tracked_03_cannon_F"]] call _fnc_saveToTemplate; +["vehiclesAPCs", ["I_E_APC_tracked_03_cannon_F", "B_T_APC_Wheeled_01_cannon_F", "B_T_APC_Tracked_01_rcws_F"]] call _fnc_saveToTemplate; +["vehiclesIFVs", ["a3a_E_APC_tracked_03_cannon_F"]] call _fnc_saveToTemplate; private _Tanks = ["B_T_MBT_01_TUSK_F", "B_T_MBT_01_cannon_F"]; ["vehiclesAA", ["B_T_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate; @@ -101,7 +101,8 @@ if ("orange" in A3A_enabledDLC) then { ["vehiclesCargoTrucks", _cargoTrucks] call _fnc_saveToTemplate; -["vehiclesTanks", _Tanks] call _fnc_saveToTemplate; +["vehiclesTanks", _Tanks] call _fnc_saveToTemplate; +["vehiclesIFVs", _vehiclesIFVs] call _fnc_saveToTemplate; ["vehiclesHelisTransport", _HelisTransport] call _fnc_saveToTemplate; ["vehiclesMilitiaCars", _vehiclesMilitiaCars] call _fnc_saveToTemplate; From 37454bb1431063d8eb721ee21b4f8bf4101f813a Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Wed, 15 Nov 2023 16:41:54 +0100 Subject: [PATCH 09/18] Create ws_ifv.hpp --- A3A/addons/config_fixes/WS/ws_ifv.hpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 A3A/addons/config_fixes/WS/ws_ifv.hpp diff --git a/A3A/addons/config_fixes/WS/ws_ifv.hpp b/A3A/addons/config_fixes/WS/ws_ifv.hpp new file mode 100644 index 0000000000..1f5eb1c754 --- /dev/null +++ b/A3A/addons/config_fixes/WS/ws_ifv.hpp @@ -0,0 +1,18 @@ +//WS - ws_ifv.hpp + +//Marshall +//Ion +class B_ION_APC_Wheeled_01_command_lxWS; +class B_ION_APC_Wheeled_01_cannon_lxWS; +//NATO +class APC_Wheeled_01_command_base_lxWS; +class B_T_APC_Wheeled_01_command_lxWS; + +//Iskatel/Kamysh +//Arid +class O_APC_Tracked_02_30mm_lxWS; +//Tropical +class O_T_APC_Tracked_02_30mm_lxWS; +//SFIA +class O_SFIA_APC_Tracked_02_30mm_lxWS; +class O_SFIA_APC_Tracked_02_cannon_lxWS; \ No newline at end of file From 55455a3eaf5ac1951bd3363f5fd0538330419a46 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Wed, 15 Nov 2023 16:49:59 +0100 Subject: [PATCH 10/18] Update ws_ifv.hpp --- A3A/addons/config_fixes/WS/ws_ifv.hpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/A3A/addons/config_fixes/WS/ws_ifv.hpp b/A3A/addons/config_fixes/WS/ws_ifv.hpp index 1f5eb1c754..4735180e8d 100644 --- a/A3A/addons/config_fixes/WS/ws_ifv.hpp +++ b/A3A/addons/config_fixes/WS/ws_ifv.hpp @@ -15,4 +15,20 @@ class O_APC_Tracked_02_30mm_lxWS; class O_T_APC_Tracked_02_30mm_lxWS; //SFIA class O_SFIA_APC_Tracked_02_30mm_lxWS; -class O_SFIA_APC_Tracked_02_cannon_lxWS; \ No newline at end of file +class O_SFIA_APC_Tracked_02_cannon_lxWS; +//ION +class a3a_ION_APC_Tracked_02_30mm : O_APC_Tracked_02_30mm_lxWS +{ + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + animationList[] = {"showTracks",1,"showCamonetHull",0,"showBags",0.2,"showSLATHull",1}; + textureList[] = {"Grey", 1}; + hiddenSelectionsTextures[] = {"lxWS\vehicles_1_f_lxws\APC_Tracked_02\data\APC_Tracked_02_ext_01_black_CO.paa","lxWS\vehicles_1_f_lxws\APC_Tracked_02\data\APC_Tracked_02_ext_02_black_CO.paa","lxWS\vehicles_1_f_lxws\APC_Tracked_02\data\APC_Tracked_02_ext_03_black_CO.paa","lxWS\vehicles_1_f_lxws\APC_Tracked_02\data\APC_Tracked_02_30mm_black_co.paa","A3\Armor_F\Data\camonet_CSAT_Stripe_Desert_CO.paa","lxWS\vehicles_1_f_lxws\APC_Tracked_02\data\cage_black_CO.paa"}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; From e6dc6ecf84c76c4148d2186d875b18c4172a7e52 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Wed, 15 Nov 2023 16:53:01 +0100 Subject: [PATCH 11/18] WS armour --- A3A/addons/config_fixes/WS/CfgVehicles.hpp | 1 + A3A/addons/config_fixes/WS/ws_ifv.hpp | 80 ++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/A3A/addons/config_fixes/WS/CfgVehicles.hpp b/A3A/addons/config_fixes/WS/CfgVehicles.hpp index bf9d710a6c..8742beb51a 100644 --- a/A3A/addons/config_fixes/WS/CfgVehicles.hpp +++ b/A3A/addons/config_fixes/WS/CfgVehicles.hpp @@ -18,6 +18,7 @@ class CfgVehicles class O_Tura_Truck_02_aa_lxWS; class O_Tura_ZU23_lxWS; + #include "ws_ifv.hpp" #include "ws_ion.hpp" //Tan diff --git a/A3A/addons/config_fixes/WS/ws_ifv.hpp b/A3A/addons/config_fixes/WS/ws_ifv.hpp index 4735180e8d..48f1cc260f 100644 --- a/A3A/addons/config_fixes/WS/ws_ifv.hpp +++ b/A3A/addons/config_fixes/WS/ws_ifv.hpp @@ -4,18 +4,98 @@ //Ion class B_ION_APC_Wheeled_01_command_lxWS; class B_ION_APC_Wheeled_01_cannon_lxWS; +class B_ION_APC_Wheeled_01_command_lxWS : B_ION_APC_Wheeled_01_command_lxWS +{ + animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; +class B_ION_APC_Wheeled_01_cannon_lxWS : B_ION_APC_Wheeled_01_cannon_lxWS +{ + animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; //NATO class APC_Wheeled_01_command_base_lxWS; class B_T_APC_Wheeled_01_command_lxWS; +class a3a_APC_Wheeled_01_command_lxWS : APC_Wheeled_01_command_base_lxWS +{ + animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; +class a3a_T_APC_Wheeled_01_command_lxWS : B_T_APC_Wheeled_01_command_lxWS +{ + animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; //Iskatel/Kamysh //Arid class O_APC_Tracked_02_30mm_lxWS; +class a3a_APC_Tracked_02_30mm_lxWS : O_APC_Tracked_02_30mm_lxWS +{ + animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; //Tropical class O_T_APC_Tracked_02_30mm_lxWS; +class a3a_T_APC_Tracked_02_30mm_lxWS : O_T_APC_Tracked_02_30mm_lxWS +{ + animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; //SFIA class O_SFIA_APC_Tracked_02_30mm_lxWS; class O_SFIA_APC_Tracked_02_cannon_lxWS; +class a3a_SFIA_APC_Tracked_02_30mm_lxWS : O_SFIA_APC_Tracked_02_30mm_lxWS +{ + animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; +class a3a_SFIA_APC_Tracked_02_cannon_lxWS : O_SFIA_APC_Tracked_02_cannon_lxWS +{ + animationList[] = {"showTracks",0.5,"showCamonetHull",0,"showBags",0.5,"showSLATHull",1}; + class EventHandlers + { + fired = "_this call (uinamespace getvariable 'BIS_fnc_effectFired');"; + init = "if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle;};"; + killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; + }; +}; //ION class a3a_ION_APC_Tracked_02_30mm : O_APC_Tracked_02_30mm_lxWS { From 5e2794b85cd77cdd41a19ea14e57a95ba391757c Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Wed, 15 Nov 2023 17:01:23 +0100 Subject: [PATCH 12/18] NATO APCs --- .../Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf | 6 +++--- .../Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf | 6 +++--- .../Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf | 6 +++--- .../Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf | 6 +++--- A3A/addons/core/Templates/Templates/WS/WS_AI_ADF.sqf | 4 ++-- .../core/Templates/Templates/WS/WS_AI_NATO_Desert.sqf | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf index 80e097eee2..8e1143a2d5 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Apex.sqf @@ -27,14 +27,14 @@ ["vehiclesFuelTrucks", ["B_T_Truck_01_fuel_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["B_T_Truck_01_medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -private _APCs = ["B_T_APC_Wheeled_01_cannon_F", "B_T_APC_Tracked_01_rcws_F"]; // CRV has no cargo: "B_T_APC_Tracked_01_CRV_F" +private _APCs = ["a3a_B_T_APC_Wheeled_01_cannon_F", "B_T_APC_Tracked_01_rcws_F"]; // CRV has no cargo: "B_T_APC_Tracked_01_CRV_F" ["vehiclesIFVs", []] call _fnc_saveToTemplate; private _Tanks = ["B_T_MBT_01_TUSK_F", "B_T_MBT_01_cannon_F"]; ["vehiclesAA", ["B_T_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate; ["vehiclesTransportBoats", ["B_T_Boat_Transport_01_F"]] call _fnc_saveToTemplate; ["vehiclesGunBoats", ["B_T_Boat_Armed_01_minigun_F"]] call _fnc_saveToTemplate; -["vehiclesAmphibious", ["B_T_APC_Wheeled_01_cannon_F"]] call _fnc_saveToTemplate; +["vehiclesAmphibious", ["a3a_B_T_APC_Wheeled_01_cannon_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["B_Plane_CAS_01_dynamicLoadout_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesAA", ["B_Plane_Fighter_01_F"]] call _fnc_saveToTemplate; @@ -77,7 +77,7 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; //If Western Sahara DLC if ("ws" in A3A_enabledDLC) then { - _APCs append ["B_T_APC_Wheeled_01_atgm_lxWS", "B_T_APC_Wheeled_01_command_lxWS"]; + _APCs append ["B_T_APC_Wheeled_01_atgm_lxWS", "a3a_T_APC_Wheeled_01_command_lxWS"]; ["uavsPortable", ["B_UAV_01_F", "B_UAV_02_lxWS"]] call _fnc_saveToTemplate; }; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf index b1f2c9507e..74ad5697aa 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf @@ -27,14 +27,14 @@ private _LightArmed = ["B_MRAP_01_hmg_F", "B_MRAP_01_hmg_F", "B_MRAP_01_gmg_F"]; ["vehiclesFuelTrucks", ["B_Truck_01_fuel_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["B_Truck_01_medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -private _APCs = ["B_APC_Wheeled_01_cannon_F", "B_APC_Tracked_01_rcws_F"]; // CRV has no cargo: "B_APC_Tracked_01_CRV_F" +private _APCs = ["a3a_B_APC_Wheeled_01_cannon_F", "B_APC_Tracked_01_rcws_F"]; // CRV has no cargo: "B_APC_Tracked_01_CRV_F" ["vehiclesIFVs", []] call _fnc_saveToTemplate; private _Tanks = ["B_MBT_01_TUSK_F", "B_MBT_01_cannon_F"]; ["vehiclesAA", ["B_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate; ["vehiclesTransportBoats", ["B_Boat_Transport_01_F"]] call _fnc_saveToTemplate; ["vehiclesGunBoats", ["B_Boat_Armed_01_minigun_F"]] call _fnc_saveToTemplate; -["vehiclesAmphibious", ["B_APC_Wheeled_01_cannon_F"]] call _fnc_saveToTemplate; +["vehiclesAmphibious", ["a3a_B_APC_Wheeled_01_cannon_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["B_Plane_CAS_01_dynamicLoadout_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesAA", ["B_Plane_Fighter_01_F"]] call _fnc_saveToTemplate; @@ -78,7 +78,7 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; //If Western Sahara DLC if ("ws" in A3A_enabledDLC) then { - _APCs append ["APC_Wheeled_01_atgm_base_lxWS", "APC_Wheeled_01_command_base_lxWS"]; + _APCs append ["APC_Wheeled_01_atgm_base_lxWS", "a3a_APC_Wheeled_01_command_lxWS"]; ["uavsPortable", ["B_UAV_01_F", "B_UAV_02_lxWS"]] call _fnc_saveToTemplate; }; if ("enoch" in A3A_enabledDLC) then { diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf index d21afbd542..39c1799c21 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf @@ -27,14 +27,14 @@ private _LightArmed = ["B_T_MRAP_01_hmg_F", "B_T_MRAP_01_hmg_F", "B_T_MRAP_01_gm ["vehiclesFuelTrucks", ["B_T_Truck_01_fuel_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["B_T_Truck_01_medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -private _APCs = ["B_T_APC_Wheeled_01_cannon_F", "B_T_APC_Tracked_01_rcws_F"]; //, "B_T_APC_Tracked_01_CRV_F"]; +private _APCs = ["a3a_B_T_APC_Wheeled_01_cannon_F", "B_T_APC_Tracked_01_rcws_F"]; //, "B_T_APC_Tracked_01_CRV_F"]; ["vehiclesIFVs", []] call _fnc_saveToTemplate; private _Tanks = ["B_T_MBT_01_TUSK_F", "B_T_MBT_01_cannon_F"]; ["vehiclesAA", ["B_T_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate; ["vehiclesTransportBoats", ["B_Boat_Transport_01_F"]] call _fnc_saveToTemplate; ["vehiclesGunBoats", ["B_Boat_Armed_01_minigun_F"]] call _fnc_saveToTemplate; -["vehiclesAmphibious", ["B_T_APC_Wheeled_01_cannon_F"]] call _fnc_saveToTemplate; +["vehiclesAmphibious", ["a3a_B_T_APC_Wheeled_01_cannon_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["B_Plane_CAS_01_dynamicLoadout_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesAA", ["B_Plane_Fighter_01_F"]] call _fnc_saveToTemplate; @@ -76,7 +76,7 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; //If Western Sahara DLC if ("ws" in A3A_enabledDLC) then { - _APCs append ["B_T_APC_Wheeled_01_atgm_lxWS", "B_T_APC_Wheeled_01_command_lxWS"]; + _APCs append ["B_T_APC_Wheeled_01_atgm_lxWS", "a3a_T_APC_Wheeled_01_command_lxWS"]; ["uavsPortable", ["B_UAV_01_F", "B_UAV_02_lxWS"]] call _fnc_saveToTemplate; }; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf index 860cdcee58..ccd740f42a 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf @@ -27,14 +27,14 @@ private _LightArmed = ["B_T_MRAP_01_hmg_F", "B_T_MRAP_01_hmg_F", "B_T_MRAP_01_gm ["vehiclesFuelTrucks", ["B_T_Truck_01_fuel_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["B_T_Truck_01_medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -private _APCs = ["B_T_APC_Wheeled_01_cannon_F", "B_T_APC_Tracked_01_rcws_F"]; //, "B_T_APC_Tracked_01_CRV_F"]; +private _APCs = ["a3a_B_T_APC_Wheeled_01_cannon_F", "B_T_APC_Tracked_01_rcws_F"]; //, "B_T_APC_Tracked_01_CRV_F"]; ["vehiclesIFVs", []] call _fnc_saveToTemplate; private _Tanks = ["B_T_MBT_01_TUSK_F", "B_T_MBT_01_cannon_F"]; ["vehiclesAA", ["B_T_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate; ["vehiclesTransportBoats", ["B_T_Boat_Transport_01_F"]] call _fnc_saveToTemplate; ["vehiclesGunBoats", ["B_T_Boat_Armed_01_minigun_F"]] call _fnc_saveToTemplate; -["vehiclesAmphibious", ["B_T_APC_Wheeled_01_cannon_F"]] call _fnc_saveToTemplate; +["vehiclesAmphibious", ["a3a_B_T_APC_Wheeled_01_cannon_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["B_Plane_CAS_01_dynamicLoadout_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesAA", ["B_Plane_Fighter_01_F"]] call _fnc_saveToTemplate; @@ -78,7 +78,7 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; //If Western Sahara DLC if ("ws" in A3A_enabledDLC) then { - _APCs append ["B_T_APC_Wheeled_01_atgm_lxWS", "B_T_APC_Wheeled_01_command_lxWS"]; + _APCs append ["B_T_APC_Wheeled_01_atgm_lxWS", "a3a_T_APC_Wheeled_01_command_lxWS"]; ["uavsPortable", ["B_UAV_01_F", "B_UAV_02_lxWS"]] call _fnc_saveToTemplate; }; if ("enoch" in A3A_enabledDLC) then { diff --git a/A3A/addons/core/Templates/Templates/WS/WS_AI_ADF.sqf b/A3A/addons/core/Templates/Templates/WS/WS_AI_ADF.sqf index a6e789bedb..08a038f811 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_AI_ADF.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_AI_ADF.sqf @@ -29,14 +29,14 @@ private _LightArmed = ["a3a_MRAP_03_gmg_grey_F", "a3a_MRAP_03_hmg_grey_F"]; ["vehiclesFuelTrucks", ["B_Truck_01_fuel_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["B_Truck_01_medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -["vehiclesAPCs", ["a3a_APC_Wheeled_03_cannon_blufor_F","B_APC_Wheeled_01_cannon_F", "B_APC_Tracked_01_rcws_F", "APC_Wheeled_01_atgm_base_lxWS", "APC_Wheeled_01_command_base_lxWS"]] call _fnc_saveToTemplate; +["vehiclesAPCs", ["a3a_APC_Wheeled_03_cannon_blufor_F","a3a_B_APC_Wheeled_01_cannon_F", "B_APC_Tracked_01_rcws_F", "APC_Wheeled_01_atgm_base_lxWS", "a3a_APC_Wheeled_01_command_lxWS"]] call _fnc_saveToTemplate; ["vehiclesIFVs", []] call _fnc_saveToTemplate; private _Tanks = ["B_MBT_01_TUSK_F", "B_MBT_01_cannon_F"]; ["vehiclesAA", ["B_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate; ["vehiclesTransportBoats", ["B_Boat_Transport_01_F"]] call _fnc_saveToTemplate; ["vehiclesGunBoats", ["B_Boat_Armed_01_minigun_F", "a3a_Boat_Armed_01_hmg_blufor_F"]] call _fnc_saveToTemplate; -["vehiclesAmphibious", ["a3a_APC_Wheeled_03_cannon_blufor_F","B_APC_Wheeled_01_cannon_F", "APC_Wheeled_01_atgm_base_lxWS", "APC_Wheeled_01_command_base_lxWS"]] call _fnc_saveToTemplate; +["vehiclesAmphibious", ["a3a_APC_Wheeled_03_cannon_blufor_F","a3a_B_APC_Wheeled_01_cannon_F", "APC_Wheeled_01_atgm_base_lxWS", "a3a_APC_Wheeled_01_command_lxWS"]] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["B_D_Plane_CAS_01_dynamicLoadout_lxWS", "a3a_Plane_Fighter_03_grey_F"]] call _fnc_saveToTemplate; // Will be used with CAS script, must be defined in setPlaneLoadout. Needs fixed gun and either rockets or missiles ["vehiclesPlanesAA", ["a3a_Plane_Fighter_04_grey_F"]] call _fnc_saveToTemplate; // diff --git a/A3A/addons/core/Templates/Templates/WS/WS_AI_NATO_Desert.sqf b/A3A/addons/core/Templates/Templates/WS/WS_AI_NATO_Desert.sqf index 01ab8064c0..b03ef3c6b6 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_AI_NATO_Desert.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_AI_NATO_Desert.sqf @@ -27,7 +27,7 @@ private _LightArmed = ["B_MRAP_01_gmg_F", "B_MRAP_01_hmg_F"]; ["vehiclesFuelTrucks", ["B_Truck_01_fuel_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["B_Truck_01_medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -private _APCs = ["B_APC_Wheeled_01_cannon_F", "B_APC_Tracked_01_rcws_F", "APC_Wheeled_01_atgm_base_lxWS", "APC_Wheeled_01_command_base_lxWS"]; +private _APCs = ["a3a_B_APC_Wheeled_01_cannon_F", "B_APC_Tracked_01_rcws_F", "APC_Wheeled_01_atgm_base_lxWS", "a3a_APC_Wheeled_01_command_lxWS"]; ["vehiclesIFVs", []] call _fnc_saveToTemplate; private _Tanks = ["B_MBT_01_TUSK_F", "B_MBT_01_cannon_F"]; ["vehiclesAA", ["B_APC_Tracked_01_AA_F"]] call _fnc_saveToTemplate; From 571cfaa30de8df31a0ba429b5d7492b21f376d22 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Wed, 15 Nov 2023 17:06:30 +0100 Subject: [PATCH 13/18] csat sfia ion --- A3A/addons/config_fixes/WS/ws_ifv.hpp | 4 ++-- .../core/Templates/Templates/WS/WS_AI_CSAT_NAfrica.sqf | 8 ++++---- A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf | 4 ++-- A3A/addons/core/Templates/Templates/WS/WS_AI_SFIA.sqf | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/A3A/addons/config_fixes/WS/ws_ifv.hpp b/A3A/addons/config_fixes/WS/ws_ifv.hpp index 48f1cc260f..f199a51c04 100644 --- a/A3A/addons/config_fixes/WS/ws_ifv.hpp +++ b/A3A/addons/config_fixes/WS/ws_ifv.hpp @@ -4,7 +4,7 @@ //Ion class B_ION_APC_Wheeled_01_command_lxWS; class B_ION_APC_Wheeled_01_cannon_lxWS; -class B_ION_APC_Wheeled_01_command_lxWS : B_ION_APC_Wheeled_01_command_lxWS +class a3a_ION_APC_Wheeled_01_command_lxWS : B_ION_APC_Wheeled_01_command_lxWS { animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1}; class EventHandlers @@ -14,7 +14,7 @@ class B_ION_APC_Wheeled_01_command_lxWS : B_ION_APC_Wheeled_01_command_lxWS killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; }; }; -class B_ION_APC_Wheeled_01_cannon_lxWS : B_ION_APC_Wheeled_01_cannon_lxWS +class a3a_ION_APC_Wheeled_01_cannon_lxWS : B_ION_APC_Wheeled_01_cannon_lxWS { animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1}; class EventHandlers diff --git a/A3A/addons/core/Templates/Templates/WS/WS_AI_CSAT_NAfrica.sqf b/A3A/addons/core/Templates/Templates/WS/WS_AI_CSAT_NAfrica.sqf index 18fbc5c757..1791419eee 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_AI_CSAT_NAfrica.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_AI_CSAT_NAfrica.sqf @@ -26,15 +26,15 @@ private _cargoTrucks = ["O_Truck_02_transport_F", "O_Truck_02_covered_F", "O_Tru ["vehiclesRepairTrucks", ["O_Truck_02_box_F", "O_Truck_03_repair_F"]] call _fnc_saveToTemplate; ["vehiclesFuelTrucks", ["O_Truck_03_fuel_F", "O_Truck_02_fuel_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["O_Truck_02_medical_F", "O_Truck_03_medical_F"]] call _fnc_saveToTemplate; -["vehiclesLightAPCs", []] call _fnc_saveToTemplate; -["vehiclesAPCs", ["O_APC_Tracked_02_cannon_F", "O_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; -["vehiclesIFVs", []] call _fnc_saveToTemplate; +["vehiclesLightAPCs", ["O_APC_Wheeled_02_hmg_lxWS"]] call _fnc_saveToTemplate; +["vehiclesAPCs", ["a3a_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; +["vehiclesIFVs", ["a3a_APC_Tracked_02_cannon_F", "a3a_APC_Tracked_02_30mm_lxWS"]] call _fnc_saveToTemplate; private _Tanks = ["O_MBT_02_cannon_F"]; ["vehiclesAA", ["O_APC_Tracked_02_AA_F"]] call _fnc_saveToTemplate; ["vehiclesTransportBoats", ["O_Boat_Transport_01_F"]] call _fnc_saveToTemplate; ["vehiclesGunBoats", ["O_Boat_Armed_01_hmg_F"]] call _fnc_saveToTemplate; -["vehiclesAmphibious", ["O_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; +["vehiclesAmphibious", ["a3a_APC_Wheeled_02_rcws_v2_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["O_Plane_CAS_02_dynamicLoadout_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesAA", ["O_Plane_Fighter_02_F"]] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf b/A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf index de8d6af245..0d28b617b3 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf @@ -28,7 +28,7 @@ private _vehiclesLightArmed = ["a3a_ION_Offroad_armor_armed","a3a_ION_Offroad_ar ["vehiclesFuelTrucks", ["a3a_ION_Truck_02_Fuel_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["a3a_Van_02_black_medevac_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", ["B_ION_APC_Wheeled_02_hmg_lxWS"]] call _fnc_saveToTemplate; -["vehiclesAPCs", ["B_ION_APC_Wheeled_01_command_lxWS","B_ION_APC_Wheeled_01_cannon_lxWS", "a3a_APC_Wheeled_03_cannon_blufor_F"]] call _fnc_saveToTemplate; +["vehiclesAPCs", ["a3a_ION_APC_Wheeled_01_command_lxWS","a3a_ION_APC_Wheeled_01_cannon_lxWS", "a3a_APC_Wheeled_03_cannon_blufor_F"]] call _fnc_saveToTemplate; ["vehiclesIFVs", []] call _fnc_saveToTemplate; private _Tanks = ["B_MBT_01_TUSK_F", "B_MBT_01_cannon_F"]; ["vehiclesAA", ["a3a_ION_Truck_02_zu23_F"]] call _fnc_saveToTemplate; @@ -36,7 +36,7 @@ private _Tanks = ["B_MBT_01_TUSK_F", "B_MBT_01_cannon_F"]; ["vehiclesTransportBoats", ["B_Boat_Transport_01_F"]] call _fnc_saveToTemplate; ["vehiclesGunBoats", ["B_Boat_Armed_01_minigun_F", "a3a_Boat_Armed_01_hmg_blufor_F"]] call _fnc_saveToTemplate; -["vehiclesAmphibious", ["B_ION_APC_Wheeled_01_command_lxWS","B_ION_APC_Wheeled_01_cannon_lxWS", "a3a_APC_Wheeled_03_cannon_blufor_F"]] call _fnc_saveToTemplate; +["vehiclesAmphibious", ["a3a_ION_APC_Wheeled_01_command_lxWS","a3a_ION_APC_Wheeled_01_cannon_lxWS", "a3a_APC_Wheeled_03_cannon_blufor_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["a3a_Plane_Fighter_03_grey_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesAA", ["a3a_Plane_Fighter_04_grey_F"]] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/WS/WS_AI_SFIA.sqf b/A3A/addons/core/Templates/Templates/WS/WS_AI_SFIA.sqf index e480d23a95..ce446ac367 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_AI_SFIA.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_AI_SFIA.sqf @@ -26,8 +26,8 @@ ["vehiclesFuelTrucks", ["O_SFIA_Truck_02_fuel_lxWS"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["a3a_SIFA_Truck_02_medical_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", ["O_SFIA_APC_Wheeled_02_hmg_lxWS"]] call _fnc_saveToTemplate; -["vehiclesAPCs", ["O_SFIA_APC_Tracked_02_cannon_lxWS", "O_SFIA_APC_Tracked_02_30mm_lxWS"]] call _fnc_saveToTemplate; -["vehiclesIFVs", []] call _fnc_saveToTemplate; +["vehiclesAPCs", []] call _fnc_saveToTemplate; +["vehiclesIFVs", ["a3a_SFIA_APC_Tracked_02_30mm_lxWS", "a3a_SFIA_APC_Tracked_02_cannon_lxWS"]] call _fnc_saveToTemplate; ["vehiclesTanks", ["O_SFIA_MBT_02_cannon_lxWS"]] call _fnc_saveToTemplate; ["vehiclesAA", ["O_SFIA_APC_Tracked_02_AA_lxWS"]] call _fnc_saveToTemplate; From c2e461d9e9865405c6435eef84134e00c65cb320 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Wed, 15 Nov 2023 17:10:02 +0100 Subject: [PATCH 14/18] ion atgm --- A3A/addons/config_fixes/WS/ws_ifv.hpp | 8 ++++++++ A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/A3A/addons/config_fixes/WS/ws_ifv.hpp b/A3A/addons/config_fixes/WS/ws_ifv.hpp index f199a51c04..416eb0f6c1 100644 --- a/A3A/addons/config_fixes/WS/ws_ifv.hpp +++ b/A3A/addons/config_fixes/WS/ws_ifv.hpp @@ -4,6 +4,7 @@ //Ion class B_ION_APC_Wheeled_01_command_lxWS; class B_ION_APC_Wheeled_01_cannon_lxWS; +class B_D_APC_Wheeled_01_atgm_lxWS; class a3a_ION_APC_Wheeled_01_command_lxWS : B_ION_APC_Wheeled_01_command_lxWS { animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1}; @@ -24,6 +25,13 @@ class a3a_ION_APC_Wheeled_01_cannon_lxWS : B_ION_APC_Wheeled_01_cannon_lxWS killed = "_this call (uinamespace getvariable 'BIS_fnc_effectKilled');"; }; }; +class a3a_ION_APC_Wheeled_01_atgm : B_D_APC_Wheeled_01_atgm_lxWS{ + side = 1; + crew = "B_ION_Soldier_lxWS"; + faction = "BLU_ION_lxWS"; + textureList[] = {"ION_BLACK", 1}; + hiddenSelectionsTextures[] = {"lxws\vehicles_f_lxws\data\APC_Wheeled_01\APC_Wheeled_ion_base_CO.paa","lxws\vehicles_f_lxws\data\APC_Wheeled_01\apc_wheeled_ion_adds_co.paa","lxws\vehicles_f_lxws\data\APC_Wheeled_01\apc_wheeled_ion_tows_co.paa","a3\armor_f\Data\camonet_AAF_stripe_desert_CO.paa","lxws\vehicles_f_lxws\data\APC_Wheeled_01\cage_black_CO.paa","lxws\vehicles_f_lxws\data\APC_Wheeled_01\APC_Wheeled_ion_lxws_CO.paa"}; +}; //NATO class APC_Wheeled_01_command_base_lxWS; class B_T_APC_Wheeled_01_command_lxWS; diff --git a/A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf b/A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf index 0d28b617b3..84c3284a89 100644 --- a/A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf +++ b/A3A/addons/core/Templates/Templates/WS/WS_AI_ION.sqf @@ -28,7 +28,7 @@ private _vehiclesLightArmed = ["a3a_ION_Offroad_armor_armed","a3a_ION_Offroad_ar ["vehiclesFuelTrucks", ["a3a_ION_Truck_02_Fuel_F"]] call _fnc_saveToTemplate; ["vehiclesMedical", ["a3a_Van_02_black_medevac_F"]] call _fnc_saveToTemplate; ["vehiclesLightAPCs", ["B_ION_APC_Wheeled_02_hmg_lxWS"]] call _fnc_saveToTemplate; -["vehiclesAPCs", ["a3a_ION_APC_Wheeled_01_command_lxWS","a3a_ION_APC_Wheeled_01_cannon_lxWS", "a3a_APC_Wheeled_03_cannon_blufor_F"]] call _fnc_saveToTemplate; +["vehiclesAPCs", ["a3a_ION_APC_Wheeled_01_command_lxWS","a3a_ION_APC_Wheeled_01_cannon_lxWS", "a3a_ION_APC_Wheeled_01_atgm"]] call _fnc_saveToTemplate; ["vehiclesIFVs", []] call _fnc_saveToTemplate; private _Tanks = ["B_MBT_01_TUSK_F", "B_MBT_01_cannon_F"]; ["vehiclesAA", ["a3a_ION_Truck_02_zu23_F"]] call _fnc_saveToTemplate; @@ -36,7 +36,7 @@ private _Tanks = ["B_MBT_01_TUSK_F", "B_MBT_01_cannon_F"]; ["vehiclesTransportBoats", ["B_Boat_Transport_01_F"]] call _fnc_saveToTemplate; ["vehiclesGunBoats", ["B_Boat_Armed_01_minigun_F", "a3a_Boat_Armed_01_hmg_blufor_F"]] call _fnc_saveToTemplate; -["vehiclesAmphibious", ["a3a_ION_APC_Wheeled_01_command_lxWS","a3a_ION_APC_Wheeled_01_cannon_lxWS", "a3a_APC_Wheeled_03_cannon_blufor_F"]] call _fnc_saveToTemplate; +["vehiclesAmphibious", ["a3a_ION_APC_Wheeled_01_command_lxWS","a3a_ION_APC_Wheeled_01_cannon_lxWS", "a3a_ION_APC_Wheeled_01_atgm"]] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["a3a_Plane_Fighter_03_grey_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesAA", ["a3a_Plane_Fighter_04_grey_F"]] call _fnc_saveToTemplate; From fd3dc897ada640ce95215cde62ac82ae6a4162bc Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Wed, 15 Nov 2023 17:12:42 +0100 Subject: [PATCH 15/18] CSAT fin --- .../core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf | 2 ++ .../core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf | 2 ++ .../core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf | 2 ++ .../Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf | 2 ++ 4 files changed, 8 insertions(+) diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf index 512bbe2168..39466a2762 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Apex.sqf @@ -77,6 +77,8 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; if ("ws" in A3A_enabledDLC) then { _cargoTrucks append ["O_T_Truck_02_cargo_lxWS","O_T_Truck_02_flatbed_lxWS"]; ["uavsPortable", ["O_UAV_01_F", "O_UAV_02_lxWS"]] call _fnc_saveToTemplate; + ["vehiclesLightAPCs", ["O_T_APC_Wheeled_02_hmg_lxWS"]] call _fnc_saveToTemplate; + _vehiclesIFVs append ["a3a_T_APC_Tracked_02_30mm_lxWS"]; }; if ("enoch" in A3A_enabledDLC) then { _vehiclesPolice append ["B_GEN_Offroad_01_comms_F","B_GEN_Offroad_01_covered_F"]; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf index e995ffbf07..c5362ab1fd 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf @@ -76,6 +76,8 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; if ("ws" in A3A_enabledDLC) then { _cargoTrucks append ["O_Truck_02_cargo_lxWS","O_Truck_02_flatbed_lxWS"]; ["uavsPortable", ["O_UAV_01_F", "O_UAV_02_lxWS"]] call _fnc_saveToTemplate; + ["vehiclesLightAPCs", ["O_APC_Wheeled_02_hmg_lxWS"]] call _fnc_saveToTemplate; + _vehiclesIFVs append ["a3a_APC_Tracked_02_30mm_lxWS"]; }; if ("enoch" in A3A_enabledDLC) then { _vehiclesMilitiaCars append ["a3a_Offroad_01_comms_tan_F", "a3a_Offroad_01_covered_tan_F"]; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf index 2d077d4d31..2e9087c3d5 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Enoch.sqf @@ -77,6 +77,8 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; if ("ws" in A3A_enabledDLC) then { _cargoTrucks append ["O_T_Truck_02_cargo_lxWS","O_T_Truck_02_flatbed_lxWS"]; ["uavsPortable", ["O_UAV_01_F", "O_UAV_02_lxWS"]] call _fnc_saveToTemplate; + ["vehiclesLightAPCs", ["O_T_APC_Wheeled_02_hmg_lxWS"]] call _fnc_saveToTemplate; + _vehiclesIFVs append ["a3a_T_APC_Tracked_02_30mm_lxWS"]; }; if ("enoch" in A3A_enabledDLC) then { _vehiclesMilitiaCars append ["a3a_Offroad_01_comms_green_F", "a3a_Offroad_01_covered_green_F"]; diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf index 40e9cd51e4..4d077281c9 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf @@ -77,6 +77,8 @@ private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F"]; if ("ws" in A3A_enabledDLC) then { _cargoTrucks append ["O_T_Truck_02_cargo_lxWS","O_T_Truck_02_flatbed_lxWS"]; ["uavsPortable", ["O_UAV_01_F", "O_UAV_02_lxWS"]] call _fnc_saveToTemplate; + ["vehiclesLightAPCs", ["O_T_APC_Wheeled_02_hmg_lxWS"]] call _fnc_saveToTemplate; + _vehiclesIFVs append ["a3a_T_APC_Tracked_02_30mm_lxWS"]; }; if ("enoch" in A3A_enabledDLC) then { _vehiclesMilitiaCars append ["C_Offroad_01_comms_F", "C_Offroad_01_covered_F"]; From 654277ba4f65510032f0b05c9599a99589249fea Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Wed, 15 Nov 2023 17:20:25 +0100 Subject: [PATCH 16/18] Update ws_ifv.hpp --- A3A/addons/config_fixes/WS/ws_ifv.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/A3A/addons/config_fixes/WS/ws_ifv.hpp b/A3A/addons/config_fixes/WS/ws_ifv.hpp index 416eb0f6c1..7c236e0369 100644 --- a/A3A/addons/config_fixes/WS/ws_ifv.hpp +++ b/A3A/addons/config_fixes/WS/ws_ifv.hpp @@ -17,6 +17,7 @@ class a3a_ION_APC_Wheeled_01_command_lxWS : B_ION_APC_Wheeled_01_command_lxWS }; class a3a_ION_APC_Wheeled_01_cannon_lxWS : B_ION_APC_Wheeled_01_cannon_lxWS { + scope = 2; animationList[] = {"showBags",0.5,"showCamonetHull",0,"showCamonetTurret",0,"showSLATHull",1,"showSLATTurret",1}; class EventHandlers { From 67e7f0f8f9adbefdb9fc73cdb1e0138d4ad61834 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Sat, 23 Dec 2023 16:26:41 +0100 Subject: [PATCH 17/18] Update Vanilla_AI_LDF.sqf --- .../core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf index 78d4bc7e94..e2b997d4e0 100644 --- a/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf +++ b/A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf @@ -20,7 +20,7 @@ ["vehiclesBasic", ["I_E_Quadbike_01_F"]] call _fnc_saveToTemplate; private _LightUnarmed = ["B_T_MRAP_01_F"]; private _LightArmed = ["B_T_MRAP_01_hmg_F", "B_T_MRAP_01_hmg_F", "B_T_MRAP_01_gmg_F"]; -["vehiclesTrucks", ["I_E_Truck_02_transport_F", "I_E_Truck_02_F"]] call _fnc_saveToTemplate; +["vehiclesTrucks", ["I_E_Truck_02_transport_F"]] call _fnc_saveToTemplate; private _cargoTrucks = ["I_E_Truck_02_transport_F", "I_E_Truck_02_F"]; ["vehiclesAmmoTrucks", ["I_E_Truck_02_Ammo_F"]] call _fnc_saveToTemplate; ["vehiclesRepairTrucks", ["I_E_Truck_02_Box_F"]] call _fnc_saveToTemplate; @@ -56,7 +56,7 @@ private _HelisTransport = ["B_Heli_Transport_01_camo_F"]; //Config special vehicles private _vehiclesMilitiaLightArmed = ["a3a_Offroad_01_ldf_armed_F", "a3a_Offroad_01_ldf_AT_F"]; -["vehiclesMilitiaTrucks", ["I_E_Van_02_transport_F", "I_E_Van_02_vehicle_F"]] call _fnc_saveToTemplate; +["vehiclesMilitiaTrucks", ["I_E_Truck_02_F"]] call _fnc_saveToTemplate; private _vehiclesMilitiaCars = ["I_E_Offroad_01_F", "I_E_Offroad_01_comms_F", "I_E_Offroad_01_covered_F"]; private _vehiclesPolice = ["B_GEN_Offroad_01_gen_F","B_GEN_Offroad_01_comms_F","B_GEN_Offroad_01_covered_F"]; @@ -92,6 +92,7 @@ if ("heli" in A3A_enabledDLC) then { }; if ("orange" in A3A_enabledDLC) then { _vehiclesPolice append ["I_E_Van_02_transport_MP_F"]; + ["vehiclesMilitiaTrucks", ["I_E_Van_02_transport_F", "I_E_Van_02_vehicle_F"]] call _fnc_saveToTemplate; }; ["vehiclesPolice", _vehiclesPolice] call _fnc_saveToTemplate; From e0e882090aca581e5ae615781f70a638da249848 Mon Sep 17 00:00:00 2001 From: ante <49555217+ante185@users.noreply.github.com> Date: Sat, 23 Dec 2023 16:27:48 +0100 Subject: [PATCH 18/18] Update CfgVehicles.hpp --- A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp b/A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp index 9f21ba4cdf..a5090b7cbb 100644 --- a/A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp +++ b/A3A/addons/config_fixes/Vanilla/CfgVehicles.hpp @@ -3,8 +3,8 @@ class CfgVehicles { #include "air.hpp" -#include "ifv.hpp" #include "armor.hpp" +#include "ifv.hpp" #include "sea.hpp" #include "soft.hpp" }; \ No newline at end of file