Merge pull request #814 from Sparker95/development

Version 0.57

configs/minorVersion.hpp

@@ -1 +1 @@
-56
+57

src/AI/Commander/AICommander.sqf

@@ -2241,6 +2241,10 @@ http://patorjk.com/software/taag/#p=display&f=Univers&t=CMDR%20AI
 		private _srcGarrisons = CALLM0(_worldNow, "getAliveGarrisons") select { 
 			// Must be on our side and not involved in another action
 			GETV(_x, "side") == _side and 
+			{
+				// General garrison (not anti-air or air)
+				CALLM0(_x, "getType") == GARRISON_TYPE_GENERAL
+			} and
 			{ !CALLM0(_x, "isBusy") } and
 			{
 				// Must have at least a minimum strength of twice min efficiency
@@ -2253,6 +2257,10 @@ http://patorjk.com/software/taag/#p=display&f=Univers&t=CMDR%20AI
 		private _tgtGarrisons = CALLM0(_worldFuture, "getAliveGarrisons") select { 
 			// Must be on our side
 			GETV(_x, "side") == _side and 
+			{
+				// General garrison (not anti-air or air)
+				CALLM0(_x, "getType") == GARRISON_TYPE_GENERAL
+			} and
 			{
 				// Not involved in another reinforce action
 				private _action = CALLM0(_x, "getAction");

src/AI/Garrison/initDatabase.sqf

@@ -11,10 +11,10 @@ private _s = WSP_GAR_COUNT;
 // ---------------- Goal relevance values and effects
 // The actual relevance returned by goal can be different from the one which is set below
 ["GoalGarrisonSurrender",					60	] call AI_misc_fnc_setGoalIntrinsicRelevance; // Only runs when not in combat
-["GoalGarrisonRepairAllVehicles",			50	] call AI_misc_fnc_setGoalIntrinsicRelevance; // Only runs when not in combat
 ["GoalGarrisonAttackAssignedTargets", 		36	] call AI_misc_fnc_setGoalIntrinsicRelevance; // Gets activated when garrison can see any of the assigned targets
 ["GoalGarrisonRebalanceVehicleGroups",		35	] call AI_misc_fnc_setGoalIntrinsicRelevance; // Needs to be higher than defend actions
 ["GoalGarrisonDefendActive",				34	] call AI_misc_fnc_setGoalIntrinsicRelevance;
+["GoalGarrisonRepairAllVehicles",			33	] call AI_misc_fnc_setGoalIntrinsicRelevance; // Only runs when not in combat
 ["GoalGarrisonClearArea",					32	] call AI_misc_fnc_setGoalIntrinsicRelevance;
 ["GoalGarrisonJoinLocation",				12	] call AI_misc_fnc_setGoalIntrinsicRelevance;
 ["GoalGarrisonMove",						11	] call AI_misc_fnc_setGoalIntrinsicRelevance;

src/AI/Unit/ActionUnitRepairVehicle.sqf

@@ -14,6 +14,7 @@ CLASS("ActionUnitRepairVehicle", "ActionUnit")
 
 	VARIABLE("hVeh");
 	VARIABLE("timeActivated");
+	VARIABLE("timeRepairAnimation");
 
 	public override METHOD(getPossibleParameters)
 		[
@@ -38,6 +39,7 @@ CLASS("ActionUnitRepairVehicle", "ActionUnit")
 		pr _hVeh = T_GETV("hVeh");
 
 		_hO action ["repairVehicle", _hVeh];
+		T_SETV("timeRepairAnimation", GAME_TIME);
 
 		pr _ai = T_GETV("ai");
 		SETV(_ai, "interactionObject", _hVeh);
@@ -63,10 +65,18 @@ CLASS("ActionUnitRepairVehicle", "ActionUnit")
 		pr _state = T_CALLM0("activateIfInactive");
 
 		if (_state == ACTION_STATE_ACTIVE) then {
-			// Makethe actual repair affects lag behind the animation
-			if (GAME_TIME - T_GETV("timeActivated") > 10) then {
-				pr _hO = T_GETV("hO");
-				pr _hveh = T_GETV("hVeh");
+
+			pr _hO = T_GETV("hO");
+			pr _hveh = T_GETV("hVeh");
+
+			// Repeat the repair animation periodically
+			if (GAME_TIME - T_GETV("timeRepairAnimation") > 7) then	{
+				_hO action ["repairVehicle", _hVeh];
+				T_SETV("timeRepairAnimation", GAME_TIME);
+			};
+
+			// Make the actual repair affects lag behind the animation
+			if (GAME_TIME - T_GETV("timeActivated") > 45) then {
 				// Check if the unit is not an actual engineer
 				// Doesn't matter much actually
 				// Sometimes engineers can be without toolkit and thus unable to repair vehicle in arma-native way

src/Garrison/updateSpawnState.sqf

@@ -37,8 +37,8 @@ pr _minDistToAi = 0;
 
 if (_type == GARRISON_TYPE_ANTIAIR) then {
 	// Anti-air garrison is very special
-	_minDistToPlayer = 10000;	// These are hardcoded for now
-	_minDistToAi = 4000;
+	_minDistToPlayer = 5000;	// Hardcoded for now
+	_minDistToAi = vin_spawnDist_garrisonToAI;
 } else {
 	_minDistToPlayer = vin_spawnDist_garrisonToPlayer;
 	_minDistToAi = vin_spawnDist_garrisonToAI;

src/JeroenArsenal/JNA/fn_arsenal_container.sqf

@@ -306,6 +306,7 @@ switch _mode do {
 	///////////////////////////////////////////////////////////////////////////////////////////
 	case "ColorTabs":{
 		params["_display"];
+/*		
 		{
 			_ctrlTab = _display displayctrl (IDC_RSCDISPLAYARSENAL_TAB + _forEachIndex);
 
@@ -320,8 +321,10 @@ switch _mode do {
 			_ctrlTab ctrlSetBackgroundColor _color;
 			_ctrlTab ctrlSetForegroundColor _color;
 		} forEach jnva_loadout;
+*/
 	};
 
+
 	///////////////////////////////////////////////////////////////////////////////////////////
 	case "TabSelect": {
 		params["_display","_index"];

src/Templates/Factions/3CB_TNA_B.sqf

@@ -31,7 +31,7 @@ _inf set [T_INF_marksman, ["UK3CB_TKA_B_MK"]];
 _inf set [T_INF_sniper, ["UK3CB_TKA_B_SF_SNI"]];
 _inf set [T_INF_spotter, ["UK3CB_TKA_B_SF_SPOT"]];
 _inf set [T_INF_exp, ["UK3CB_TKA_B_DEM"]];
-_inf set [T_INF_ammo, ["UK3CB_TKA_B_STATIC_TRI_AGS30", "UK3CB_TKA_B_STATIC_TRI_DSHKM_HIGH", "UK3CB_TKA_B_STATIC_TRI_DSHKM_LOW", "UK3CB_TKA_B_STATIC_TRI_KORD", "UK3CB_TKA_B_STATIC_TRI_KORNET", "UK3CB_TKA_B_STATIC_TRI_METIS", "UK3CB_TKA_B_STATIC_TRI_NSV", "UK3CB_TKA_B_STATIC_TRI_PODNOS", "UK3CB_TKA_B_STATIC_TRI_SPG9", "UK3CB_TKA_B_AA_ASST", "UK3CB_TKA_B_AT_ASST"]];
+_inf set [T_INF_ammo, ["UK3CB_TKA_B_AA_ASST", "UK3CB_TKA_B_AT_ASST"]];
 _inf set [T_INF_LAT, ["UK3CB_TKA_B_LAT"]];
 _inf set [T_INF_AT, ["UK3CB_TKA_B_AT"]];
 _inf set [T_INF_AA, ["UK3CB_TKA_B_AA"]];

src/Templates/Factions/3CB_TNA_O.sqf

@@ -31,7 +31,7 @@ _inf set [T_INF_marksman, ["UK3CB_TKA_O_MK"]];
 _inf set [T_INF_sniper, ["UK3CB_TKA_O_SF_SNI"]];
 _inf set [T_INF_spotter, ["UK3CB_TKA_O_SF_SPOT"]];
 _inf set [T_INF_exp, ["UK3CB_TKA_O_DEM"]];
-_inf set [T_INF_ammo, ["UK3CB_TKA_O_STATIC_TRI_AGS30", "UK3CB_TKA_O_STATIC_TRI_DSHKM_HIGH", "UK3CB_TKA_O_STATIC_TRI_DSHKM_LOW", "UK3CB_TKA_O_STATIC_TRI_KORD", "UK3CB_TKA_O_STATIC_TRI_KORNET", "UK3CB_TKA_O_STATIC_TRI_METIS", "UK3CB_TKA_O_STATIC_TRI_NSV", "UK3CB_TKA_O_STATIC_TRI_PODNOS", "UK3CB_TKA_O_STATIC_TRI_SPG9", "UK3CB_TKA_O_AA_ASST", "UK3CB_TKA_O_AT_ASST"]];
+_inf set [T_INF_ammo, ["UK3CB_TKA_O_AA_ASST", "UK3CB_TKA_O_AT_ASST"]];
 _inf set [T_INF_LAT, ["UK3CB_TKA_O_LAT"]];
 _inf set [T_INF_AT, ["UK3CB_TKA_O_AT"]];
 _inf set [T_INF_AA, ["UK3CB_TKA_O_AA"]];

src/Templates/Factions/VN_ARVN.sqf

@@ -1,133 +1,121 @@
-/*
-AAF templates for ARMA III
-*/
-
 _array = [];
 
 _array set [T_SIZE-1, nil];									//Make an array having the size equal to the number of categories first
 
 // Name, description, faction, addons, etc
-_array set [T_NAME, "tAAF"];
-_array set [T_DESCRIPTION, "Standard Altis Armed Forces from base game."];
-_array set [T_DISPLAY_NAME, "Arma 3 AAF"];
+_array set [T_NAME, "tVN_ARVN"];
+_array set [T_DESCRIPTION, "Vietman war ARVN."];
+_array set [T_DISPLAY_NAME, "VN DLC - ARVN"];
 _array set [T_FACTION, T_FACTION_Military];
-_array set [T_REQUIRED_ADDONS, ["A3_Characters_F"]];
+_array set [T_REQUIRED_ADDONS, [
+		"A3_Characters_F", 
+		"vn_weapons", 
+		"vn_data_f"
+		]];
 
 //==== Infantry ====
 _inf = [];
 _inf resize T_INF_SIZE;
-_inf set [T_INF_default,  ["I_soldier_F"]];							//Default infantry if nothing is found
-
-_inf set [T_INF_SL, ["I_Soldier_SL_F"]];
-_inf set [T_INF_TL, ["I_Soldier_TL_F"]];
-_inf set [T_INF_officer, ["I_officer_F"]];
-_inf set [T_INF_GL, ["I_Soldier_GL_F"]];
-_inf set [T_INF_rifleman, ["I_soldier_F", 3, "I_Soldier_lite_F", 1]];
-_inf set [T_INF_marksman, ["I_Soldier_M_F"]];
-_inf set [T_INF_sniper, ["Arma3_AAF_sniper"]];
-_inf set [T_INF_spotter, ["Arma3_AAF_spotter"]];
-_inf set [T_INF_exp, ["I_Soldier_exp_F", "I_soldier_mine_F"]];
-_inf set [T_INF_ammo, ["I_Soldier_A_F"]];
-_inf set [T_INF_LAT, ["I_Soldier_LAT2_F"]];
-_inf set [T_INF_AT, ["I_Soldier_LAT_F", 5, "I_Soldier_AT_F", 1]];
-_inf set [T_INF_AA, ["I_Soldier_AA_F"]];
-_inf set [T_INF_LMG, ["I_Soldier_AR_F"]];
-_inf set [T_INF_HMG, ["Arma3_AAF_HMG"]];
-_inf set [T_INF_medic, ["I_medic_F"]];
-_inf set [T_INF_engineer, ["I_engineer_F", "I_Soldier_repair_F"]];
-_inf set [T_INF_crew, ["I_crew_F"]];
-_inf set [T_INF_crew_heli, ["I_helicrew_F"]];
-_inf set [T_INF_pilot, ["I_pilot_F"]];
-_inf set [T_INF_pilot_heli, ["I_helipilot_F"]];
-_inf set [T_INF_survivor, ["I_Survivor_F"]];
-_inf set [T_INF_unarmed, ["I_Soldier_unarmed_F"]];
+_inf set [T_INF_default,  ["vn_i_men_army_15"]];							//Default infantry if nothing is found
+
+_inf set [T_INF_SL, ["vn_i_men_army_02"]];
+_inf set [T_INF_TL, ["vn_i_men_army_08"]];
+_inf set [T_INF_officer, ["vn_i_men_army_01"]];
+_inf set [T_INF_GL, ["vn_i_men_army_07", "vn_i_men_army_17"]];
+_inf set [T_INF_rifleman, ["vn_i_men_army_15", "vn_i_men_army_16", "vn_i_men_army_18", "vn_i_men_army_19", "vn_i_men_army_20", "vn_i_men_army_21"]];
+_inf set [T_INF_marksman, ["vn_i_men_army_10"]];
+_inf set [T_INF_sniper, ["vn_i_men_army_11"]];
+_inf set [T_INF_spotter, ["vn_i_men_army_09"]];
+_inf set [T_INF_exp, ["vn_i_men_army_05"]];
+_inf set [T_INF_ammo, ["vn_i_men_army_15", "vn_i_men_army_16", "vn_i_men_army_18", "vn_i_men_army_19", "vn_i_men_army_20", "vn_i_men_army_21"]];
+_inf set [T_INF_LAT, ["vn_i_men_army_12"]];
+_inf set [T_INF_AT, ["vn_i_men_army_12"]];
+_inf set [T_INF_AA, ["vn_i_men_army_12"]];
+_inf set [T_INF_LMG, ["vn_i_men_army_06"]];
+_inf set [T_INF_HMG, ["vn_i_men_army_06"]];
+_inf set [T_INF_medic, ["vn_i_men_army_03"]];
+_inf set [T_INF_engineer, ["vn_i_men_army_04"]];
+_inf set [T_INF_crew, ["vn_i_men_army_13", "vn_i_men_army_14"]];
+_inf set [T_INF_crew_heli, ["vn_i_men_aircrew_01"]];
+_inf set [T_INF_pilot, ["vn_i_men_aircrew_01"]];
+_inf set [T_INF_pilot_heli, ["vn_i_men_aircrew_01"]];
+_inf set [T_INF_survivor, ["vn_i_men_army_15", "vn_i_men_army_16", "vn_i_men_army_18", "vn_i_men_army_19", "vn_i_men_army_20", "vn_i_men_army_21"]];
+_inf set [T_INF_unarmed, ["vn_i_men_army_15", "vn_i_men_army_16", "vn_i_men_army_18", "vn_i_men_army_19", "vn_i_men_army_20", "vn_i_men_army_21"]];
 
 //==== Recon ====
-_inf set [T_INF_recon_TL, ["Arma3_AAF_recon_TL"]];
-_inf set [T_INF_recon_rifleman, ["Arma3_AAF_recon_rifleman", 3, "Arma3_AAF_recon_autorifleman", 1]];
-_inf set [T_INF_recon_medic, ["Arma3_AAF_recon_medic"]];
-_inf set [T_INF_recon_exp, ["Arma3_AAF_recon_explosives"]];
-_inf set [T_INF_recon_LAT, ["Arma3_AAF_recon_LAT"]];
+_inf set [T_INF_recon_TL, ["vn_i_men_sf_01"]];
+_inf set [T_INF_recon_rifleman, ["vn_i_men_ranger_15", "vn_i_men_ranger_16", "vn_i_men_ranger_18", "vn_i_men_ranger_19", "vn_i_men_ranger_20", "vn_i_men_ranger_21", "vn_i_men_sf_09"]];
+_inf set [T_INF_recon_medic, ["vn_i_men_ranger_03", "vn_i_men_sf_03"]];
+_inf set [T_INF_recon_exp, ["vn_i_men_sf_04", "vn_i_men_sf_05"]];
+_inf set [T_INF_recon_LAT, ["vn_i_men_sf_12", "vn_i_men_ranger_12"]];
 //_inf set [T_INF_recon_LMG, ["Arma3_AAF_recon_autorifleman"]]; // There is no T_INF_recon_LMG right now
-_inf set [T_INF_recon_marksman, ["Arma3_AAF_recon_marksman"]];
-_inf set [T_INF_recon_JTAC, ["Arma3_AAF_recon_JTAC"]];
+_inf set [T_INF_recon_marksman, ["vn_i_men_ranger_10", "vn_i_men_sf_10"]];
+_inf set [T_INF_recon_JTAC, ["vn_i_men_sf_08", "vn_i_men_ranger_08"]];
 
 
 //==== Drivers ====
-_inf set [T_INF_diver_TL, ["I_diver_TL_F"]];
-_inf set [T_INF_diver_rifleman, ["I_diver_F"]];
-_inf set [T_INF_diver_exp, ["I_diver_exp_F"]];
+/*_inf set [T_INF_diver_TL, [""]];
+_inf set [T_INF_diver_rifleman, [""]];
+_inf set [T_INF_diver_exp, [""]];*/
 
 
 //==== Vehicles ====
 _veh = []; _veh resize T_VEH_SIZE;
 _veh set [T_VEH_SIZE-1, nil];
-_veh set [T_VEH_DEFAULT, ["I_G_Offroad_01_F"]];
-
-_veh set [T_VEH_car_unarmed, ["A3_AAF_offroad_unarmed"]];
-_veh set [T_VEH_car_armed, ["I_G_Offroad_01_armed_F_1"]];
-
-_veh set [T_VEH_MRAP_unarmed, ["I_MRAP_03_F"]];
-_veh set [T_VEH_MRAP_HMG, ["I_MRAP_03_hmg_F"]];
-_veh set [T_VEH_MRAP_GMG, ["I_MRAP_03_gmg_F"]];
-
-_veh set [T_VEH_IFV, ["I_APC_tracked_03_cannon_F_1", "I_APC_tracked_03_cannon_F_2", "I_APC_tracked_03_cannon_F_3", "I_APC_tracked_03_cannon_F_4"]];
-_veh set [T_VEH_APC, ["I_APC_Wheeled_03_cannon_F_1"]];
-_veh set [T_VEH_MBT, ["I_MBT_03_cannon_F_1", "I_MBT_03_cannon_F_2", "I_MBT_03_cannon_F_3", "I_MBT_03_cannon_F_4"]];
-_veh set [T_VEH_MRLS, ["I_Truck_02_MRL_F"]];
-_veh set [T_VEH_SPA, ["I_Truck_02_MRL_F"]];
-_veh set [T_VEH_SPAA, ["I_LT_01_AA_F"]];
-
-_veh set [T_VEH_stat_HMG_high, ["I_E_HMG_01_high_F", 1,"I_HMG_02_high_F", 4]];
-_veh set [T_VEH_stat_GMG_high, ["I_GMG_01_high_F"]];
-_veh set [T_VEH_stat_HMG_low, ["I_HMG_02_F"]];
-_veh set [T_VEH_stat_GMG_low, ["I_GMG_01_F"]];
-_veh set [T_VEH_stat_AA, ["I_static_AA_F"]];
-_veh set [T_VEH_stat_AT, ["I_static_AT_F"]];
-_veh set [T_VEH_stat_mortar_light, ["I_Mortar_01_F"]];
-//_veh set [T_VEH_stat_mortar_heavy, ["I_Mortar_01_F"]];
-
-_veh set [T_VEH_heli_light, ["I_Heli_light_03_unarmed_F"]];
-_veh set [T_VEH_heli_heavy, ["I_Heli_Transport_02_F"]];
-_veh set [T_VEH_heli_cargo, ["I_Heli_Transport_02_F"]];
-_veh set [T_VEH_heli_attack, ["I_Heli_light_03_dynamicLoadout_F"]];
-
-_veh set [T_VEH_plane_attack, ["I_Plane_Fighter_03_dynamicLoadout_F"]];
-_veh set [T_VEH_plane_fighter , ["I_Plane_Fighter_04_F"]];
+_veh set [T_VEH_DEFAULT, ["vn_i_wheeled_m151_01"]];
+
+_veh set [T_VEH_car_unarmed, ["vn_i_wheeled_m151_01", "vn_i_wheeled_m151_02"]];
+_veh set [T_VEH_car_armed, ["vn_i_wheeled_m151_mg_01", "vn_b_wheeled_m151_mg_02", "vn_b_wheeled_m151_mg_04", "vn_b_wheeled_m151_mg_03", "vn_b_wheeled_m151_mg_05"]];
+
+//_veh set [T_VEH_MRAP_unarmed, [""]];
+_veh set [T_VEH_MRAP_HMG, ["vn_b_wheeled_m54_mg_01", "vn_b_wheeled_m54_mg_03"]];
+//_veh set [T_VEH_MRAP_GMG, [""]];
+
+//_veh set [T_VEH_IFV, [""]];
+//_veh set [T_VEH_APC, [""]];
+_veh set [T_VEH_MBT, ["vn_i_armor_m41_01", "vn_i_armor_type63_01"]];
+//_veh set [T_VEH_MRLS, [""]];
+//_veh set [T_VEH_SPA, [""]];
+_veh set [T_VEH_SPAA, ["vn_b_wheeled_m54_mg_02"]];
+
+_veh set [T_VEH_stat_HMG_high, ["vn_b_army_static_m1919a4_high", "vn_b_sf_static_m2_high", "vn_b_army_static_m60_high"]];
+//_veh set [T_VEH_stat_GMG_high, [""]];
+_veh set [T_VEH_stat_HMG_low, ["vn_b_army_static_m1919a4_low", "vn_b_army_static_m2_low", "vn_b_army_static_m60_low"]];
+//_veh set [T_VEH_stat_GMG_low, [""]];
+_veh set [T_VEH_stat_AA, ["vn_i_static_m45"]];
+_veh set [T_VEH_stat_AT, ["vn_i_static_tow"]];
+_veh set [T_VEH_stat_mortar_light, ["vn_i_static_mortar_m2", "vn_i_static_mortar_m29"]];
+_veh set [T_VEH_stat_mortar_heavy, ["vn_i_static_m101_02"]];
+
+//_veh set [T_VEH_heli_light, [""]];
+//_veh set [T_VEH_heli_heavy, [""]];
+//_veh set [T_VEH_heli_cargo, [""]];
+_veh set [T_VEH_heli_attack, ["vn_i_air_uh1d_02_01", "vn_i_air_uh1d_01_01", "vn_i_air_uh1c_01_01", "vn_i_air_uh1c_02_01", "vn_i_air_uh1c_07_01", "vn_i_air_ch34_02_02"]];
+
+//_veh set [T_VEH_plane_attack, [""]];
+//_veh set [T_VEH_plane_fighter , [""]];
 //_veh set [T_VEH_plane_cargo, [""]];
 //_veh set [T_VEH_plane_unarmed , [""]];
 //_veh set [T_VEH_plane_VTOL, [""]];
 
-_veh set [T_VEH_boat_unarmed, ["I_Boat_Transport_01_F"]];
-_veh set [T_VEH_boat_armed, ["I_Boat_Armed_01_minigun_F"]];
+//_veh set [T_VEH_boat_unarmed, [""]];
+//_veh set [T_VEH_boat_armed, [""]];
 
-_veh set [T_VEH_personal, ["I_Quadbike_01_F"]];
+_veh set [T_VEH_personal, ["vn_i_wheeled_m151_01"]];
 
-_veh set [T_VEH_truck_inf, ["I_Truck_02_covered_F", "I_Truck_02_transport_F"]];
-_veh set [T_VEH_truck_cargo, ["I_Truck_02_transport_F"]];
-_veh set [T_VEH_truck_ammo, ["I_Truck_02_ammo_F"]];
-_veh set [T_VEH_truck_repair, ["I_Truck_02_box_F"]];
-_veh set [T_VEH_truck_medical , ["I_Truck_02_medical_F"]];
-_veh set [T_VEH_truck_fuel, ["I_Truck_02_fuel_F"]];
+_veh set [T_VEH_truck_inf, ["vn_i_wheeled_m54_01", "vn_i_wheeled_m54_02"]];
+_veh set [T_VEH_truck_cargo, ["vn_i_wheeled_m54_01", "vn_i_wheeled_m54_02"]];
+_veh set [T_VEH_truck_ammo, ["vn_i_wheeled_m54_ammo"]];
+_veh set [T_VEH_truck_repair, ["vn_i_wheeled_m54_repair"]];
+_veh set [T_VEH_truck_medical , ["vn_i_wheeled_m54_03"]];
+_veh set [T_VEH_truck_fuel, ["vn_i_wheeled_m54_fuel"]];
 
-_veh set [T_VEH_submarine, ["I_SDV_01_F"]];
+//_veh set [T_VEH_submarine, [""]];
 
 
 //==== Drones ====
-_drone = []; _drone resize T_DRONE_SIZE;
+_drone = +(tDefault select T_DRONE);
 _drone set [T_DRONE_SIZE-1, nil];
-_drone set [T_DRONE_DEFAULT, ["I_UGV_01_F"]];
-
-_drone set [T_DRONE_UGV_unarmed, ["I_UGV_01_F"]];
-_drone set [T_DRONE_UGV_armed, ["I_UGV_01_rcws_F"]];
-_drone set [T_DRONE_plane_attack, ["I_UAV_02_dynamicLoadout_F"]];
-//_drone set [T_DRONE_plane_unarmed, ["I_UAV_02_dynamicLoadout_F"]];
-//_drone set [T_DRONE_heli_attack, ["I_UAV_02_dynamicLoadout_F"]];
-_drone set [T_DRONE_quadcopter, ["I_UAV_01_F"]];
-//_drone set [T_DRONE_designator, ["I_UAV_02_dynamicLoadout_F"]];
-_drone set [T_DRONE_stat_HMG_low, ["I_HMG_01_A_F"]];
-_drone set [T_DRONE_stat_GMG_low, ["I_GMG_01_A_F"]];
-//_drone set [T_DRONE_stat_AA, ["I_UAV_02_dynamicLoadout_F"]];
 
 //==== Cargo ====
 _cargo = +(tDefault select T_CARGO);