diff --git a/A3A/addons/core/Templates/Templates/CW/CW_AI_CIS.sqf b/A3A/addons/core/Templates/Templates/CW/CW_AI_CIS.sqf index 4a20e09605..cf76b17768 100644 --- a/A3A/addons/core/Templates/Templates/CW/CW_AI_CIS.sqf +++ b/A3A/addons/core/Templates/Templates/CW/CW_AI_CIS.sqf @@ -17,10 +17,10 @@ ["surrenderCrate", "Box_IND_Wps_F"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type ["equipmentBox", "Box_NATO_Equip_F"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type -["vehiclesBasic", ["lsd_car_ast"]] call _fnc_saveToTemplate; //this line determines basic vehicles, the lightest kind available. -- Example: ["vehiclesBasic", ["B_Quadbike_01_F"]] -- Array, can contain multiple assets +["vehiclesBasic", ["3AS_Fliknot_F"]] call _fnc_saveToTemplate; //this line determines basic vehicles, the lightest kind available. -- Example: ["vehiclesBasic", ["B_Quadbike_01_F"]] -- Array, can contain multiple assets ["vehiclesLightUnarmed", ["3AS_ISP_Transport"]] call _fnc_saveToTemplate; ["vehiclesLightArmed",["3AS_ISP", "3AS_ISP", "lsd_car_ast"]] call _fnc_saveToTemplate; -["vehiclesTrucks", ["442_argon_covered_cis", "442_argon_transport_cis"]] call _fnc_saveToTemplate; +["vehiclesTrucks", ["442_argon_covered_cis"]] call _fnc_saveToTemplate; ["vehiclesCargoTrucks", ["442_argon_covered_cis", "442_argon_transport_cis"]] call _fnc_saveToTemplate; ["vehiclesAmmoTrucks", ["442_argon_ammo_cis"]] call _fnc_saveToTemplate; ["vehiclesRepairTrucks", ["3AS_SAC_Repair_F"]] call _fnc_saveToTemplate; @@ -30,16 +30,18 @@ ["vehiclesAirborne", ["3AS_Advanced_DSD", "3AS_ISP", "3AS_PAC_F"]] call _fnc_saveToTemplate; ["vehiclesAPCs", ["3AS_PAC_F"]] call _fnc_saveToTemplate; ["vehiclesIFVs", ["3AS_AAT_CIS"]] call _fnc_saveToTemplate; -["vehiclesLightTanks", ["3AS_n99","3AS_Advanced_DSD"]] call _fnc_saveToTemplate; -["vehiclesTanks", ["3AS_AAT_CIS", "3AS_GAT", "3AS_n99"]] call _fnc_saveToTemplate; +["vehiclesLightTanks", ["3AS_N99","3AS_Advanced_DSD"]] call _fnc_saveToTemplate; +["vehiclesTanks", ["3AS_AAT_CIS", "3AS_GAT", "3AS_N99"]] call _fnc_saveToTemplate; ["vehiclesAA", ["3AS_GAT_Light"]] call _fnc_saveToTemplate; ["vehiclesTransportBoats", ["B_Boat_Transport_01_F"]] call _fnc_saveToTemplate; ["vehiclesGunBoats", ["442_boat_armed"]] call _fnc_saveToTemplate; ["vehiclesAmphibious", []] call _fnc_saveToTemplate; -["vehiclesPlanesCAS", ["3AS_Tri_Fighter_DynamicLoadout"]] call _fnc_saveToTemplate; +["vehiclesPlanesCAS", ["3AS_BTLB_Bomber_Shadow"]] call _fnc_saveToTemplate; +["vehiclesPlanesLargeCAS", ["3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesAA", ["3AS_Z95_Blue"]] call _fnc_saveToTemplate; +["vehiclesPlanesLargeAA", ["3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesTransport", ["3AS_Civilian_Transport_01"]] call _fnc_saveToTemplate; ["vehiclesPlanesGunship", ["ls_cis_hmp","3AS_HMP_Gunship"]] call _fnc_saveToTemplate; @@ -58,14 +60,14 @@ ["uavsPortable", ["3as_CIS_ScavDroid"]] call _fnc_saveToTemplate; //Config special vehicles - militia vehicles are mostly used in the early game, police cars are being used by troops around cities -- Example: -["vehiclesMilitiaLightArmed", ["lsd_car_ast"]] call _fnc_saveToTemplate; -["vehiclesMilitiaTrucks", ["442_argon_covered_cis", "442_argon_transport_cis"]] call _fnc_saveToTemplate; +["vehiclesMilitiaLightArmed", ["3AS_ISP"]] call _fnc_saveToTemplate; +["vehiclesMilitiaTrucks", ["442_argon_transport_cis"]] call _fnc_saveToTemplate; ["vehiclesMilitiaCars", ["3AS_ISP_Transport"]] call _fnc_saveToTemplate; -["vehiclesMilitiaAPCs", ["3as_SAC_Trade"]] call _fnc_saveToTemplate; +["vehiclesMilitiaAPCs", ["3AS_SAC_F"]] call _fnc_saveToTemplate; ["vehiclesPolice", ["3AS_ISP_Transport"]] call _fnc_saveToTemplate; -["staticMGs", ["3AS_HeavyRepeater_Unarmoured"]] call _fnc_saveToTemplate; +["staticMGs", ["3AS_J10s_F"]] call _fnc_saveToTemplate; ["staticAT", ["3as_ParticleCannon"]] call _fnc_saveToTemplate; ["staticAA", ["AA_Turret"]] call _fnc_saveToTemplate; ["staticMortars", ["3AS_CIS_Mortar"]] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/CW/CW_AI_CIS_WBK.sqf b/A3A/addons/core/Templates/Templates/CW/CW_AI_CIS_WBK.sqf index 610818e4ff..74541ba66c 100644 --- a/A3A/addons/core/Templates/Templates/CW/CW_AI_CIS_WBK.sqf +++ b/A3A/addons/core/Templates/Templates/CW/CW_AI_CIS_WBK.sqf @@ -17,10 +17,10 @@ ["surrenderCrate", "Box_IND_Wps_F"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type ["equipmentBox", "Box_NATO_Equip_F"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type -["vehiclesBasic", ["lsd_car_ast"]] call _fnc_saveToTemplate; //this line determines basic vehicles, the lightest kind available. -- Example: ["vehiclesBasic", ["B_Quadbike_01_F"]] -- Array, can contain multiple assets +["vehiclesBasic", ["3AS_Fliknot_F"]] call _fnc_saveToTemplate; //this line determines basic vehicles, the lightest kind available. -- Example: ["vehiclesBasic", ["B_Quadbike_01_F"]] -- Array, can contain multiple assets ["vehiclesLightUnarmed", ["3AS_ISP_Transport"]] call _fnc_saveToTemplate; ["vehiclesLightArmed",["3AS_ISP", "3AS_ISP", "lsd_car_ast"]] call _fnc_saveToTemplate; -["vehiclesTrucks", ["442_argon_covered_cis", "442_argon_transport_cis"]] call _fnc_saveToTemplate; +["vehiclesTrucks", ["442_argon_covered_cis"]] call _fnc_saveToTemplate; ["vehiclesCargoTrucks", ["442_argon_covered_cis", "442_argon_transport_cis"]] call _fnc_saveToTemplate; ["vehiclesAmmoTrucks", ["442_argon_ammo_cis"]] call _fnc_saveToTemplate; ["vehiclesRepairTrucks", ["3AS_SAC_Repair_F"]] call _fnc_saveToTemplate; @@ -30,8 +30,8 @@ ["vehiclesAirborne", ["3AS_Advanced_DSD", "3AS_ISP", "3AS_PAC_F"]] call _fnc_saveToTemplate; ["vehiclesAPCs", ["3AS_PAC_F"]] call _fnc_saveToTemplate; ["vehiclesIFVs", ["3AS_AAT_CIS"]] call _fnc_saveToTemplate; -["vehiclesLightTanks", ["3AS_n99","3AS_Advanced_DSD"]] call _fnc_saveToTemplate; -["vehiclesTanks", ["3AS_AAT_CIS", "3AS_GAT", "3AS_n99"]] call _fnc_saveToTemplate; +["vehiclesLightTanks", ["3AS_N99","3AS_Advanced_DSD"]] call _fnc_saveToTemplate; +["vehiclesTanks", ["3AS_AAT_CIS", "3AS_GAT", "3AS_N99"]] call _fnc_saveToTemplate; ["vehiclesAA", ["3AS_GAT_Light"]] call _fnc_saveToTemplate; ["vehiclesTransportBoats", ["B_Boat_Transport_01_F"]] call _fnc_saveToTemplate; @@ -39,7 +39,9 @@ ["vehiclesAmphibious", []] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["3AS_BTLB_Bomber_Shadow"]] call _fnc_saveToTemplate; +["vehiclesPlanesLargeCAS", ["3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F","3AS_CIS_Vulture_CAS_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesAA", ["3AS_Z95_Blue"]] call _fnc_saveToTemplate; +["vehiclesPlanesLargeAA", ["3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F","3AS_CIS_Vulture_AA_F"]] call _fnc_saveToTemplate; ["vehiclesPlanesTransport", ["3AS_Civilian_Transport_01"]] call _fnc_saveToTemplate; ["vehiclesPlanesGunship", ["ls_cis_hmp","3AS_HMP_Gunship"]] call _fnc_saveToTemplate; @@ -47,7 +49,7 @@ ["vehiclesHelisLight", ["3AS_Patrol_LAAT_Police"]] call _fnc_saveToTemplate; //this line determines light helis -- Example: ["vehiclesHelisLight", ["B_Heli_Light_01_F"]] -- Array, can contain multiple assets ["vehiclesHelisTransport", ["3AS_HMP_Transport", "3AS_MAF_Transport_F"]] call _fnc_saveToTemplate; //this line determines transport helis -- Example: ["vehiclesHelisTransport", ["B_Heli_Transport_01_F"]] -- Array, can contain multiple assets ["vehiclesHelisLightAttack", ["3AS_MAF_Gunship_F"]] call _fnc_saveToTemplate; -["vehiclesHelisAttack", ["3AS_HMP_Gunship"]] call _fnc_saveToTemplate; +["vehiclesHelisAttack", ["3AS_HMP_Gunship"]] call _fnc_saveToTemplate; ["vehiclesArtillery", ["3AS_Hailfire_Rocket"]] call _fnc_saveToTemplate; ["magazines", createHashMapFromArray [ @@ -58,14 +60,14 @@ ["uavsPortable", ["3as_CIS_ScavDroid"]] call _fnc_saveToTemplate; //Config special vehicles - militia vehicles are mostly used in the early game, police cars are being used by troops around cities -- Example: -["vehiclesMilitiaLightArmed", ["lsd_car_ast"]] call _fnc_saveToTemplate; -["vehiclesMilitiaTrucks", ["442_argon_covered_cis", "442_argon_transport_cis"]] call _fnc_saveToTemplate; +["vehiclesMilitiaLightArmed", ["3AS_ISP"]] call _fnc_saveToTemplate; +["vehiclesMilitiaTrucks", ["442_argon_transport_cis"]] call _fnc_saveToTemplate; ["vehiclesMilitiaCars", ["3AS_ISP_Transport"]] call _fnc_saveToTemplate; -["vehiclesMilitiaAPCs", ["3as_SAC_Trade"]] call _fnc_saveToTemplate; +["vehiclesMilitiaAPCs", ["3AS_SAC_F"]] call _fnc_saveToTemplate; ["vehiclesPolice", ["3AS_ISP_Transport"]] call _fnc_saveToTemplate; -["staticMGs", ["3AS_HeavyRepeater_Unarmoured"]] call _fnc_saveToTemplate; +["staticMGs", ["3AS_J10s_F"]] call _fnc_saveToTemplate; ["staticAT", ["3as_ParticleCannon"]] call _fnc_saveToTemplate; ["staticAA", ["AA_Turret"]] call _fnc_saveToTemplate; ["staticMortars", ["3AS_CIS_Mortar"]] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/CW/CW_AI_REP.sqf b/A3A/addons/core/Templates/Templates/CW/CW_AI_REP.sqf index ef2ff5eb58..93f0db98f7 100644 --- a/A3A/addons/core/Templates/Templates/CW/CW_AI_REP.sqf +++ b/A3A/addons/core/Templates/Templates/CW/CW_AI_REP.sqf @@ -39,7 +39,9 @@ ["vehiclesAmphibious", []] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["3AS_BTLB_Bomber"]] call _fnc_saveToTemplate; -["vehiclesPlanesAA", ["3AS_Z95_Republic","3as_Vwing_base"]] call _fnc_saveToTemplate; +["vehiclesPlanesLargeCAS", ["3AS_ARC_170_Red"]] call _fnc_saveToTemplate; +["vehiclesPlanesAA", ["3AS_Z95_Republic","3as_Vwing_base", "3AS_Delta7_F"]] call _fnc_saveToTemplate; +["vehiclesPlanesLargeAA", ["3AS_ARC_170_Red","3as_V19_base"]] call _fnc_saveToTemplate; ["vehiclesPlanesTransport", ["3AS_Republic_Transport_01"]] call _fnc_saveToTemplate; ["vehiclesPlanesGunship", ["3AS_LAAT_Mk1","lsd_heli_laati"]] call _fnc_saveToTemplate; @@ -73,7 +75,7 @@ ["staticHowitzers", []] call _fnc_saveToTemplate; ["vehicleRadar", "lsd_cis_radarDish"] call _fnc_saveToTemplate; -["vehicleSam", "3as_XX9"] call _fnc_saveToTemplate; +["vehicleSam", "3AS_Keeradak_F"] call _fnc_saveToTemplate; ["howitzerMagazineHE", ""] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/CW/CW_AI_REP_WBK.sqf b/A3A/addons/core/Templates/Templates/CW/CW_AI_REP_WBK.sqf index 244b0b2192..4287fa8842 100644 --- a/A3A/addons/core/Templates/Templates/CW/CW_AI_REP_WBK.sqf +++ b/A3A/addons/core/Templates/Templates/CW/CW_AI_REP_WBK.sqf @@ -39,7 +39,9 @@ ["vehiclesAmphibious", []] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["3AS_BTLB_Bomber"]] call _fnc_saveToTemplate; -["vehiclesPlanesAA", ["3AS_Z95_Republic","3as_Vwing_base"]] call _fnc_saveToTemplate; +["vehiclesPlanesLargeCAS", ["3AS_ARC_170_Red"]] call _fnc_saveToTemplate; +["vehiclesPlanesAA", ["3AS_Z95_Republic","3as_Vwing_base", "3AS_Delta7_F"]] call _fnc_saveToTemplate; +["vehiclesPlanesLargeAA", ["3AS_ARC_170_Red","3as_V19_base"]] call _fnc_saveToTemplate; ["vehiclesPlanesTransport", ["3AS_Republic_Transport_01"]] call _fnc_saveToTemplate; ["vehiclesPlanesGunship", ["3AS_LAAT_Mk1","lsd_heli_laati"]] call _fnc_saveToTemplate; @@ -73,7 +75,7 @@ ["staticHowitzers", []] call _fnc_saveToTemplate; ["vehicleRadar", "lsd_cis_radarDish"] call _fnc_saveToTemplate; -["vehicleSam", "3as_XX9"] call _fnc_saveToTemplate; +["vehicleSam", "3AS_Keeradak_F"] call _fnc_saveToTemplate; ["howitzerMagazineHE", ""] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/CW/WM_AI_EMP.sqf b/A3A/addons/core/Templates/Templates/CW/WM_AI_EMP.sqf index 29a9d4b03b..df1277fdd7 100644 --- a/A3A/addons/core/Templates/Templates/CW/WM_AI_EMP.sqf +++ b/A3A/addons/core/Templates/Templates/CW/WM_AI_EMP.sqf @@ -41,7 +41,9 @@ ["vehiclesAmphibious", []] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["WM_TieBomber_Cluster"]] call _fnc_saveToTemplate; +["vehiclesPlanesLargeCAS", ["WM_TieDefender"]] call _fnc_saveToTemplate; ["vehiclesPlanesAA", ["WM_TieInterceptor","WM_TieInterceptor","3AS_VWing_Imperial","3AS_VWing_Imperial","WM_TieAdvanced"]] call _fnc_saveToTemplate; +["vehiclesPlanesLargeAA", ["WM_Tiefighter","WM_Tiefighter","WM_Tiefighter","WM_Tiefighter","WM_Tiefighter"]] call _fnc_saveToTemplate; ["vehiclesPlanesTransport", ["3AS_Imperial_Transport_01"]] call _fnc_saveToTemplate; ["vehiclesPlanesGunship", ["3AS_LAAT_Mk1_Imperial"]] call _fnc_saveToTemplate; @@ -75,7 +77,7 @@ ["staticHowitzers", []] call _fnc_saveToTemplate; ["vehicleRadar", "lsd_cis_radarDish"] call _fnc_saveToTemplate; -["vehicleSam", "3as_XX9"] call _fnc_saveToTemplate; +["vehicleSam", "3AS_Keeradak_Imperial"] call _fnc_saveToTemplate; ["howitzerMagazineHE", ""] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/CW/WM_AI_EMP_Arctic.sqf b/A3A/addons/core/Templates/Templates/CW/WM_AI_EMP_Arctic.sqf index 3f752ccc7b..bb9fb74168 100644 --- a/A3A/addons/core/Templates/Templates/CW/WM_AI_EMP_Arctic.sqf +++ b/A3A/addons/core/Templates/Templates/CW/WM_AI_EMP_Arctic.sqf @@ -41,7 +41,9 @@ ["vehiclesAmphibious", []] call _fnc_saveToTemplate; ["vehiclesPlanesCAS", ["WM_TieBomber_Cluster"]] call _fnc_saveToTemplate; +["vehiclesPlanesLargeCAS", ["WM_TieDefender"]] call _fnc_saveToTemplate; ["vehiclesPlanesAA", ["WM_TieInterceptor","WM_TieInterceptor","3AS_VWing_Imperial","3AS_VWing_Imperial","WM_TieAdvanced"]] call _fnc_saveToTemplate; +["vehiclesPlanesLargeAA", ["WM_Tiefighter","WM_Tiefighter","WM_Tiefighter","WM_Tiefighter","WM_Tiefighter"]] call _fnc_saveToTemplate; ["vehiclesPlanesTransport", ["3AS_Imperial_Transport_01"]] call _fnc_saveToTemplate; ["vehiclesPlanesGunship", ["3AS_LAAT_Mk1_Imperial"]] call _fnc_saveToTemplate; @@ -75,7 +77,7 @@ ["staticHowitzers", []] call _fnc_saveToTemplate; ["vehicleRadar", "lsd_cis_radarDish"] call _fnc_saveToTemplate; -["vehicleSam", "3as_XX9"] call _fnc_saveToTemplate; +["vehicleSam", "3AS_Keeradak_Imperial"] call _fnc_saveToTemplate; ["howitzerMagazineHE", ""] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/Templates/Templates/FactionDefaults/EnemyDefaults.sqf b/A3A/addons/core/Templates/Templates/FactionDefaults/EnemyDefaults.sqf index a6bef62851..40b11eb2ec 100644 --- a/A3A/addons/core/Templates/Templates/FactionDefaults/EnemyDefaults.sqf +++ b/A3A/addons/core/Templates/Templates/FactionDefaults/EnemyDefaults.sqf @@ -21,6 +21,9 @@ ["animations", []] call _fnc_saveToTemplate; ["variants", []] call _fnc_saveToTemplate; +["vehiclesPlanesLargeCAS", []] call _fnc_saveToTemplate; +["vehiclesPlanesLargeAA", []] call _fnc_saveToTemplate; + ["flares", ["F_40mm_white", "F_40mm_Red", "F_40mm_Yellow", "F_40mm_Green"]] call _fnc_saveToTemplate; ["smallBunker", "Land_BagBunker_Small_F"] call _fnc_saveToTemplate; diff --git a/A3A/addons/core/functions/Base/fn_sellVehicle.sqf b/A3A/addons/core/functions/Base/fn_sellVehicle.sqf index e3dfeced05..aa6dc1665c 100644 --- a/A3A/addons/core/functions/Base/fn_sellVehicle.sqf +++ b/A3A/addons/core/functions/Base/fn_sellVehicle.sqf @@ -118,7 +118,7 @@ private _costs = call { or (_typeX in FactionGet(all,"vehiclesAA")) or (_typeX in FactionGet(all,"vehiclesArtillery")) ) exitWith {6500}; - if (_typeX in (FactionGet(all,"vehiclesPlanesCAS") + FactionGet(all,"vehiclesPlanesAA"))) exitWith {7500}; + if (_typeX in (FactionGet(all,"vehiclesPlanesCAS") + FactionGet(all,"vehiclesPlanesAA") + FactionGet(all,"vehiclesPlanesLargeAA") + FactionGet(all,"vehiclesPlanesLargeCAS"))) exitWith {7500}; if (_typeX in (FactionGet(all,"vehiclesPlanesGunship"))) exitWith {10000}; 0; }; diff --git a/A3A/addons/core/functions/Base/fn_setPlaneLoadout.sqf b/A3A/addons/core/functions/Base/fn_setPlaneLoadout.sqf index 369575c519..6a634602e8 100644 --- a/A3A/addons/core/functions/Base/fn_setPlaneLoadout.sqf +++ b/A3A/addons/core/functions/Base/fn_setPlaneLoadout.sqf @@ -477,7 +477,8 @@ if (_type == "CASDIVE") then _plane setVariable ["diveParams", [1200, 350, 110, 55, 15, [3, 0]]]; // start (m), end (m), diveSpeed (m/s), dive start angle (deg), turnRate (deg/s), bombOffset (m) }; // Clone Wars Planes (3AS) - case "3AS_ARC_170_Yellow"; + case "3AS_ARC_170_Red"; + case "3AS_ARC_170_Yellow"; case "3AS_ARC_170_Orange"; case "3AS_ARC_170_Green"; case "3AS_ARC_170_Blue": @@ -1093,7 +1094,8 @@ if (_type == "CAS") then _plane setVariable ["diveParams", [1200, 350, 110, 55, 15, [3, 0]]]; // start (m), end (m), diveSpeed (m/s), dive start angle (deg), turnRate (deg/s), bombOffset (m) }; // Clone Wars Planes (3AS) - case "3AS_ARC_170_Yellow"; + case "3AS_ARC_170_Red"; + case "3AS_ARC_170_Yellow"; case "3AS_ARC_170_Orange"; case "3AS_ARC_170_Green"; case "3AS_ARC_170_Blue": @@ -1159,7 +1161,6 @@ if (_type == "CAS") then case "3AS_Delta7_TANO"; case "3AS_Delta7_ANI"; case "3AS_Delta7_Blue"; - case "3AS_Delta7_F"; case "3AS_Delta7_Orange"; case "3AS_Delta7_PLO"; case "3AS_Delta7_Purple"; @@ -1618,7 +1619,8 @@ if (_type == "AA") then _loadout = ["LIB_1Rnd_SC250"]; }; // Clone Wars Planes (3AS) - case "3AS_ARC_170_Yellow"; + case "3AS_ARC_170_Red"; + case "3AS_ARC_170_Yellow"; case "3AS_ARC_170_Orange"; case "3AS_ARC_170_Green"; case "3AS_ARC_170_Blue": @@ -1675,7 +1677,6 @@ if (_type == "AA") then case "3AS_Delta7_TANO"; case "3AS_Delta7_ANI"; case "3AS_Delta7_Blue"; - case "3AS_Delta7_F"; case "3AS_Delta7_Orange"; case "3AS_Delta7_PLO"; case "3AS_Delta7_Purple"; diff --git a/A3A/addons/core/functions/CREATE/fn_createAIAirplane.sqf b/A3A/addons/core/functions/CREATE/fn_createAIAirplane.sqf index 3a3a79e2ad..1e50360ae9 100644 --- a/A3A/addons/core/functions/CREATE/fn_createAIAirplane.sqf +++ b/A3A/addons/core/functions/CREATE/fn_createAIAirplane.sqf @@ -318,6 +318,8 @@ if (!_busy) then { + (_faction get "vehiclesHelisTransport") + (_faction get "vehiclesPlanesCAS") + (_faction get "vehiclesPlanesAA") + + (_faction get "vehiclesPlanesLargeCAS") + + (_faction get "vehiclesPlanesLargeAA") + (_faction get "vehiclesPlanesTransport"); + (_faction getOrDefault ["vehiclesPlanesGunship", []]); + (_faction getOrDefault ["uavsAttack", []]); diff --git a/A3A/addons/core/functions/Garrison/fn_checkVehicleType.sqf b/A3A/addons/core/functions/Garrison/fn_checkVehicleType.sqf index a6971367d3..25f0499488 100644 --- a/A3A/addons/core/functions/Garrison/fn_checkVehicleType.sqf +++ b/A3A/addons/core/functions/Garrison/fn_checkVehicleType.sqf @@ -50,6 +50,10 @@ params ["_vehicle", "_preference"]; || {_vehicle in FactionGet(inv,"vehiclesPlanesCAS")} \ || {_vehicle in FactionGet(inv,"vehiclesPlanesAA")} \ || {_vehicle in FactionGet(occ,"vehiclesPlanesGunship")} \ + || {_vehicle in FactionGet(occ,"vehiclesPlanesLargeCAS")} \ + || {_vehicle in FactionGet(inv,"vehiclesPlanesLargeAA")} \ + || {_vehicle in FactionGet(occ,"vehiclesPlanesLargeAA")} \ + || {_vehicle in FactionGet(inv,"vehiclesPlanesLargeCAS")} \ || {_vehicle in FactionGet(inv,"vehiclesPlanesGunship")} //TODO this does not work properly (maybe even throws errors) as the template files arent diff --git a/A3A/addons/core/functions/REINF/fn_addBombRun.sqf b/A3A/addons/core/functions/REINF/fn_addBombRun.sqf index b7059e2953..76aa1ce372 100644 --- a/A3A/addons/core/functions/REINF/fn_addBombRun.sqf +++ b/A3A/addons/core/functions/REINF/fn_addBombRun.sqf @@ -60,7 +60,7 @@ if (_exit) exitWith { private _pointsX = 1; if (_typeX in FactionGet(all,"vehiclesHelisAttack")) then {_pointsX = 5}; -if (_typeX in (OccAndInv("vehiclesPlanesCAS") + OccAndInv("vehiclesPlanesAA") + OccAndInv("vehiclesPlanesGunship"))) then {_pointsX = 10}; +if (_typeX in (OccAndInv("vehiclesPlanesCAS") + OccAndInv("vehiclesPlanesAA") + OccAndInv("vehiclesPlanesLargeAA") + OccAndInv("vehiclesPlanesLargeCAS") + OccAndInv("vehiclesPlanesGunship"))) then {_pointsX = 10}; deleteVehicle _veh; diff --git a/A3A/addons/core/functions/Supports/fn_SUP_ASF.sqf b/A3A/addons/core/functions/Supports/fn_SUP_ASF.sqf index 8cc392005f..4161fc2357 100644 --- a/A3A/addons/core/functions/Supports/fn_SUP_ASF.sqf +++ b/A3A/addons/core/functions/Supports/fn_SUP_ASF.sqf @@ -25,7 +25,7 @@ private _airport = [_side, _targPos] call A3A_fnc_availableBasesAir; if (isNil "_airport") exitWith { Debug_1("No airport found for %1 support", _supportName); -1; }; private _faction = Faction(_side); -private _vehType = selectRandom (_faction get "vehiclesPlanesAA"); +private _vehType = selectRandom ((_faction get "vehiclesPlanesAA") + (_faction get "vehiclesPlanesLargeAA")); private _aggro = if(_side == Occupants) then {aggressionOccupants} else {aggressionInvaders}; if (_delay < 0) then { _delay = (0.5 + random 1) * (600 - 15*tierWar - 1*_aggro) }; diff --git a/A3A/addons/core/functions/Supports/fn_SUP_CAS.sqf b/A3A/addons/core/functions/Supports/fn_SUP_CAS.sqf index 709a615e4e..d3a45aa8b4 100644 --- a/A3A/addons/core/functions/Supports/fn_SUP_CAS.sqf +++ b/A3A/addons/core/functions/Supports/fn_SUP_CAS.sqf @@ -25,7 +25,7 @@ private _airport = [_side, _targPos] call A3A_fnc_availableBasesAir; if (isNil "_airport") exitWith { Debug_1("No airport found for %1 support", _supportName); -1; }; private _faction = Faction(_side); -private _vehType = selectRandom (_faction get "vehiclesPlanesCAS"); +private _vehType = selectRandom ((_faction get "vehiclesPlanesCAS") + (_faction get "vehiclesPlanesLargeCAS")); private _aggro = if(_side == Occupants) then {aggressionOccupants} else {aggressionInvaders}; if (_delay < 0) then { _delay = (0.5 + random 1) * (450 - 15*tierWar - 1*_aggro) }; diff --git a/A3A/addons/core/functions/Supports/fn_SUP_CASDive.sqf b/A3A/addons/core/functions/Supports/fn_SUP_CASDive.sqf index a1eb5295c6..d10f8593a6 100644 --- a/A3A/addons/core/functions/Supports/fn_SUP_CASDive.sqf +++ b/A3A/addons/core/functions/Supports/fn_SUP_CASDive.sqf @@ -22,7 +22,7 @@ private _airport = [_side, _targPos] call A3A_fnc_availableBasesAir; if (isNil "_airport") exitWith { Debug_1("No airport found for %1 support", _supportName); -1; }; private _faction = Faction(_side); -private _vehType = selectRandom (_faction get "vehiclesPlanesCAS"); +private _vehType = selectRandom ((_faction get "vehiclesPlanesCAS") + (_faction get "vehiclesPlanesLargeCAS")); private _aggro = if(_side == Occupants) then {aggressionOccupants} else {aggressionInvaders}; if (_delay < 0) then { _delay = (0.5 + random 1) * (450 - 15*tierWar - 1*_aggro) }; diff --git a/A3A/addons/core/functions/Supports/fn_SUP_QRFAirAvailable.sqf b/A3A/addons/core/functions/Supports/fn_SUP_QRFAirAvailable.sqf index e90aca3dd7..c92a16c2b1 100644 --- a/A3A/addons/core/functions/Supports/fn_SUP_QRFAirAvailable.sqf +++ b/A3A/addons/core/functions/Supports/fn_SUP_QRFAirAvailable.sqf @@ -22,7 +22,7 @@ params ["_target", "_side", "_maxSpend", "_availTypes"]; // - static AA // - AA tanks/trucks // TODO: Rework vehicle type system to handle this shit better -private _allAA = (A3A_faction_all get "vehiclesPlanesAA") + (A3A_faction_all get "vehiclesAA") + (A3A_faction_all get "staticAA"); +private _allAA = (A3A_faction_all get "vehiclesPlanesAA") + (A3A_faction_all get "vehiclesPlanesLargeAA") + (A3A_faction_all get "vehiclesAA") + (A3A_faction_all get "staticAA"); if (typeOf _target in _allAA) exitWith { 0 }; // Otherwise fine? diff --git a/A3A/addons/core/functions/Templates/fn_compileMissionAssets.sqf b/A3A/addons/core/functions/Templates/fn_compileMissionAssets.sqf index 52fe1bc934..8bcf0ebcd4 100644 --- a/A3A/addons/core/functions/Templates/fn_compileMissionAssets.sqf +++ b/A3A/addons/core/functions/Templates/fn_compileMissionAssets.sqf @@ -112,6 +112,8 @@ setVar("vehiclesHelisAttack", OccAndInv("vehiclesHelisAttack") ); setVar("vehiclesHelisTransport", OccAndInv("vehiclesHelisTransport") ); setVar("vehiclesPlanesAA", OccAndInv("vehiclesPlanesAA") ); setVar("vehiclesPlanesCAS", OccAndInv("vehiclesPlanesCAS") ); +setVar("vehiclesPlanesLargeAA", OccAndInv("vehiclesPlanesLargeAA") ); +setVar("vehiclesPlanesLargeCAS", OccAndInv("vehiclesPlanesLargeCAS") ); setVar("vehiclesPlanesTransport", OccAndInv("vehiclesPlanesTransport")); setVar("staticMortars", OccAndInv("staticMortars") + Riv("staticMortars") + Reb("staticMortars") + ("STATICMORTAR" call _fnc_extractMarketClasses)); setVar("staticAA", OccAndInv("staticAA") + Reb("staticAA") + ("STATICAA" call _fnc_extractMarketClasses)); @@ -178,6 +180,8 @@ setVar("vehiclesHelis", _vehHelis); private _vehFixedWing = OccAndInv("vehiclesPlanesCAS") + OccAndInv("vehiclesPlanesAA") ++ OccAndInv("vehiclesPlanesLargeAA") ++ OccAndInv("vehiclesPlanesLargeCAS") + OccAndInv("vehiclesPlanesTransport") + Reb("vehiclesPlane") + Reb("vehiclesCivPlane") diff --git a/A3A/addons/core/functions/init/fn_initVarServer.sqf b/A3A/addons/core/functions/init/fn_initVarServer.sqf index ca4ad5c450..78cf47f416 100644 --- a/A3A/addons/core/functions/init/fn_initVarServer.sqf +++ b/A3A/addons/core/functions/init/fn_initVarServer.sqf @@ -541,7 +541,7 @@ private _vehicleResourceCosts = createHashMap; { _vehicleResourceCosts set [_x, 150] } forEach FactionGet(all, "vehiclesDropPod"); { _vehicleResourceCosts set [_x, 250] } forEach FactionGet(all, "vehiclesPlanesCAS") + FactionGet(all, "vehiclesPlanesAA"); { _vehicleResourceCosts set [_x, 250] } forEach FactionGet(all, "vehiclesHelisAttack"); -{ _vehicleResourceCosts set [_x, 250] } forEach FactionGet(all, "vehiclesPlanesCAS") + FactionGet(all, "vehiclesPlanesAA") + FactionGet(all, "vehiclesPlanesGunship"); +{ _vehicleResourceCosts set [_x, 250] } forEach FactionGet(all, "vehiclesPlanesLargeCAS") + FactionGet(all, "vehiclesPlanesLargeAA") + FactionGet(all, "vehiclesPlanesGunship"); // Threat table diff --git a/A3A/addons/ultimate/config/plane/cfgPlaneLoadouts.hpp b/A3A/addons/ultimate/config/plane/cfgPlaneLoadouts.hpp index ecc8d7133d..4788d5016e 100644 --- a/A3A/addons/ultimate/config/plane/cfgPlaneLoadouts.hpp +++ b/A3A/addons/ultimate/config/plane/cfgPlaneLoadouts.hpp @@ -164,7 +164,7 @@ class planeLoadouts class WM_TieBomber { mainGun = "LS1_Cannon"; - missileLauncher[] = {"TS5_ProtonLauncher"}; + rocketLauncher[] = {"TS5_ProtonLauncher"}; bombRacks[] = {"VL61ProtonBomb"}; diveParams[] = {1000, 300, 100, 55, 15, {0,0}}; }; @@ -172,7 +172,7 @@ class planeLoadouts { loadout[] = {"PylonMissile_1Rnd_BombCluster_01_F", "PylonRack_2Rnd_BombCluster_01_F"}; mainGun = "LS1_Cannon"; - missileLauncher[] = {"TS5_ProtonLauncher"}; + rocketLauncher[] = {"TS5_ProtonLauncher"}; bombRacks[] = {"BombCluster_01_F"}; diveParams[] = {1000, 300, 100, 55, 15, {0,0}}; }; @@ -332,10 +332,16 @@ class planeLoadouts missileLauncher[] = {"missiles_SCALPEL", "Rocket_04_HE_Plane_CAS_01_F", "Missile_AGM_02_Plane_CAS_01_F"}; diveParams[] = {1000, 600, 180, 55, 15, {0,0}}; }; + class 3AS_CIS_Vulture_CAS_F + { + loadout[] = {"3AS_PylonRack_Vulture_12Rnd_Rocket_HEAP","3AS_PylonRack_Vulture_12Rnd_Rocket_HEAP","3AS_PylonRack_Vulture_12Rnd_Rocket_HEAP","3AS_PylonRack_Vulture_12Rnd_Rocket_HEAP","3AS_PylonRack_Vulture_12Rnd_Rocket_HEAP","3AS_PylonRack_Vulture_12Rnd_Rocket_HEAP"}; + mainGun = "3AS_Vulture_Cannon"; + rocketLauncher[] = {"3AS_Vulture_Rocket_HEAP_F"}; + }; class WM_TieBomber { mainGun = "LS1_Cannon"; - missileLauncher[] = {"TS5_ProtonLauncher"}; + rocketLauncher[] = {"TS5_ProtonLauncher"}; bombRacks[] = {"VL61ProtonBomb"}; diveParams[] = {1000, 300, 100, 55, 15, {0,0}}; }; @@ -343,10 +349,16 @@ class planeLoadouts { loadout[] = {"PylonMissile_1Rnd_BombCluster_01_F", "PylonRack_2Rnd_BombCluster_01_F"}; mainGun = "LS1_Cannon"; - missileLauncher[] = {"TS5_ProtonLauncher"}; + rocketLauncher[] = {"TS5_ProtonLauncher"}; bombRacks[] = {"BombCluster_01_F"}; diveParams[] = {1000, 300, 100, 55, 15, {0,0}}; }; + class WM_TieDefender + { + loadout[] = {"PylonWeapon_LS1_Magazine"}; + mainGun = "LS93_Cannon"; + rocketLauncher[] = {"TS5_ProtonLauncher","TS5A_ProtonLauncher"}; + }; }; class AA @@ -471,12 +483,23 @@ class planeLoadouts mainGun = "Twin_Cannon_20mm_gunpod"; missileLauncher[] = {"Missile_AA_04_Plane_CAS_01_F", "missiles_Zephyr"}; }; + class 3AS_CIS_Vulture_AA_F + { + loadout[] = {"3AS_PylonRack_Vulture_1Rnd_Missile_AA","3AS_PylonRack_Vulture_1Rnd_Missile_AA","3AS_PylonRack_Vulture_1Rnd_Missile_AA","3AS_PylonRack_Vulture_1Rnd_Missile_AA","3AS_PylonRack_Vulture_1Rnd_Missile_AA","3AS_PylonRack_Vulture_1Rnd_Missile_AA"}; + mainGun = "3AS_Vulture_Cannon"; + missileLauncher[] = {"3AS_Vulture_Missile_AA_F"}; + }; class WM_TieInterceptor { mainGun = "LS93_Cannon"; - missileLauncher[] = {"TS5A_ProtonLauncher"}; + rocketLauncher[] = {"TS5A_ProtonLauncher"}; }; class WM_TieAdvanced : WM_TieInterceptor {}; + class WM_Tiefighter + { + mainGun = "LS1_Cannon"; + rocketLauncher[] = {"TS5A_ProtonLauncher"}; + }; class cwr3_b_f4e { loadout[] = {"CUP_PylonPod_1Rnd_AIM_120_AMRAAM_M","CUP_PylonPod_1Rnd_AIM_120_AMRAAM_M","CUP_PylonPod_1Rnd_AIM_9L_LAU_Sidewinder_M","CUP_PylonPod_1Rnd_AIM_120_AMRAAM_M","CUP_PylonPod_1Rnd_AIM_9L_LAU_Sidewinder_M","CUP_PylonPod_1Rnd_AIM_120_AMRAAM_M","CUP_PylonPod_1Rnd_AIM_120_AMRAAM_M"}; diff --git a/A3A/addons/ultimate/config/trader/vehicles/vehicles_cw.hpp b/A3A/addons/ultimate/config/trader/vehicles/vehicles_cw.hpp index 972816bf18..34b84067b7 100644 --- a/A3A/addons/ultimate/config/trader/vehicles/vehicles_cw.hpp +++ b/A3A/addons/ultimate/config/trader/vehicles/vehicles_cw.hpp @@ -44,13 +44,17 @@ class vehicles_cw : vehicles_base ITEM(3as_ARC_170_Red, 80500, "PLANE", VEHICLE_CONDITION_PLANE); ITEM(3as_CIS_Vulture_F, 76500, "PLANE", VEHICLE_CONDITION_PLANE); ITEM(3as_Tri_Fighter_DynamicLoadout, 76500, "PLANE", VEHICLE_CONDITION_PLANE); - ITEM(AA_Turret, 5000, "STATICAA", VEHICLE_CONDITION_STATICAA); + ITEM(3AS_Keeradak_F, 8000, "STATICAA", VEHICLE_CONDITION_STATICAA); + ITEM(3as_FlakCannon, 8000, "STATICAA", VEHICLE_CONDITION_STATICAA); + ITEM(AA_Turret, 5000, "STATICAA", VEHICLE_CONDITION_STATICAA); ITEM(3AS_DF9_AA, 5000, "STATICAA", VEHICLE_CONDITION_STATICAA); ITEM(3AS_DF9_Rocket, 7500, "STATICAA", VEHICLE_CONDITION_STATICAA); ITEM(3AS_Venator_Cannon_Small, 8000, "STATICAT", VEHICLE_CONDITION_STATICAT); ITEM(3as_ParticleCannon, 8000, "STATICAT", VEHICLE_CONDITION_STATICAT); + ITEM(3AS_J1_Proton_Cannon, 8000, "STATICAT", VEHICLE_CONDITION_STATICAT); ITEM(3AS_DF9_AT, 9000, "STATICAT", VEHICLE_CONDITION_STATICAT); - ITEM(3AS_HeavyRepeater_Unarmoured, 4500, "STATICMG", VEHICLE_CONDITION_STATICMG); + ITEM(3AS_J10s_F, 4500, "STATICMG", VEHICLE_CONDITION_STATICMG); + ITEM(3AS_HeavyRepeater_Unarmoured, 4500, "STATICMG", VEHICLE_CONDITION_STATICMG); ITEM(3AS_HeavyRepeater_Armoured, 4500, "STATICMG", VEHICLE_CONDITION_STATICMG); ITEM(3AS_StationaryTurret, 4500, "STATICMG", VEHICLE_CONDITION_STATICMG); ITEM(ls_turret_gar_ewebLight, 3600, "STATICMG", VEHICLE_CONDITION_STATICMG); @@ -78,4 +82,5 @@ class vehicles_cw : vehicles_base ITEM(CW_Ifrit_CIS, 1080, "UNARMEDCAR", VEHICLE_CONDITION_UNARMEDCAR); ITEM(CW_Ifrit_Mando, 1080, "UNARMEDCAR", VEHICLE_CONDITION_UNARMEDCAR); ITEM(3AS_ISP_Transport, 1300, "UNARMEDCAR", VEHICLE_CONDITION_UNARMEDCAR); + ITEM(3AS_Fliknot_F, 500, "UNARMEDCAR", VEHICLE_CONDITION_UNARMEDCAR); };