3AS Update

SilenceIsFatto · Aug 27, 2024 · 46b0e8b · 46b0e8b
1 parent 3f7dd2c
commit 46b0e8b
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 23 deletions.
diff --git 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,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;
@@ -60,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
@@ -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;
@@ -49,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 [
@@ -60,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
@@ -75,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
@@ -75,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
@@ -77,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
@@ -77,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/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);
 };