Merge branch 'TestingBranch' into unstable

A3A/addons/core/CfgFunctions.hpp

@@ -41,6 +41,7 @@ class CfgFunctions
             class interrogate {};
             class isBuildingPosition {};
             class landThreatEval {};
+            class liberateDeserter {};
             class liberaterefugee {};
             class liberatePOW {};
             class liberateFlee {};
@@ -140,6 +141,7 @@ class CfgFunctions
             class vehicleBoxRestore {};
             class initPetros {};
             class isFrontline {};
+            class isFrontlineNoFIA {};
             class arePositionsConnected {};
             class joinMultipleGroups {};
             class localizar {};
@@ -396,6 +398,7 @@ class CfgFunctions
             class AS_Zombies {};
             class CON_Outpost_Zombies {};
             class CON_Outpost {};
+            class CON_Outpost_Compet {};
             class CON_MilAdmin {};
             class convoy {};
             class DES_Antenna {};
@@ -412,6 +415,7 @@ class CfgFunctions
             class LOG_Helicrash {};;
             class missionRequest {};
             class REP_Antenna {};
+            class RES_Deserters {};
             class RES_Prisoners {};
             class RES_Refugees {};
             class RES_Informer {};
@@ -420,6 +424,7 @@ class CfgFunctions
             class RIV_ENC_Rivals {};
             class RIV_ATT_Cell {};
             class RIV_ATT_Hideout {};
+            class RIV_ATT_Transfer {};
             class RIV_AS_Traitor {};
             class RIV_SUPP_Salvage {};
             class RIV_RES_Prisoners {};
@@ -526,6 +531,8 @@ class CfgFunctions
             class garrisonDialog {};
             class postmortem {};
             class reDress {};
+            class reDressInv {};
+            class reDressOcc {};
             class reinfPlayer {};
             class spawnHCGroup {};
             class vehiclePrice {};
@@ -654,6 +661,9 @@ class CfgFunctions
             class SUP_SAM {};
             class SUP_SAMAvailable {};
             class SUP_SAMRoutine {};
+            class SUP_tank {};
+            class SUP_tankAvailable {};
+            class SUP_tankRoutine {};
             class SUP_UAV {};
             class SUP_UAVRoutine {};
             class SUP_QRFVehAirdrop {};

A3A/addons/core/CfgVehicles.hpp

@@ -6,4 +6,45 @@ class CfgVehicles
     {
         armor = 2000;
     };
+
+    class NATO_Box_Base;
+
+	class A3AU_Build_Box_base: NATO_Box_Base
+	{
+		author = AUTHOR;
+		hiddenSelections[] = 
+		{
+			"Camo_Signs",
+			"Camo"
+		};
+		hiddenSelectionsTextures[] = 
+		{
+			QPATHTOFOLDER(Pictures\items\AmmoBox_signs_CA.paa),
+			QPATHTOFOLDER(Pictures\items\AmmoBox_black_CO.paa)
+		};
+	};
+
+	class A3AU_Build_Box_Large_1: A3AU_Build_Box_base
+	{
+		mapSize = 2.3399999;
+		class SimpleObject
+		{
+			eden = 1;
+			animate[] = {};
+			hide[] = {};
+			verticalOffset = 0.15000001;
+			verticalOffsetWorld = 0;
+			init = "''";
+		};
+		editorPreview = QPATHTOFOLDER(Pictures\items\A3AU_Build_Box_Large_1.jpg);
+		_generalMacro = "Box_NATO_WpsLaunch_F";
+		scope = 2;
+		displayName = "Build Box (Large)";
+		model = "\A3\weapons_F\AmmoBoxes\WpnsBox_long_F";
+		icon = "iconCrateLong";
+		class TransportMagazines{};
+		class TransportWeapons{};
+		class TransportItems{};
+		class TransportBackpacks{};
+	};
 };

A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AAF.sqf

@@ -19,6 +19,8 @@ private _hasContact = "enoch" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["I_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "I_supplyCrate_F"] call _fnc_saveToTemplate;     
 ["surrenderCrate", "Box_IND_Wps_F"] call _fnc_saveToTemplate; 
 ["equipmentBox", "Box_AAF_Equip_F"] call _fnc_saveToTemplate; 

A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AFRF_Arid.sqf

@@ -21,6 +21,8 @@ private _hasLawsOfWar = "orange" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["O_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "O_R_supplyCrate_F"] call _fnc_saveToTemplate;     
 ["surrenderCrate", "Box_RUS_Wps_F"] call _fnc_saveToTemplate; 
 ["equipmentBox", "Box_RUS_Equip_F"] call _fnc_saveToTemplate; 

A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AFRF_Temperate.sqf

@@ -21,6 +21,8 @@ private _hasLawsOfWar = "orange" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["O_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "O_R_supplyCrate_F"] call _fnc_saveToTemplate;     
 ["surrenderCrate", "Box_RUS_Wps_F"] call _fnc_saveToTemplate; 
 ["equipmentBox", "Box_RUS_Equip_F"] call _fnc_saveToTemplate; 

A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AUKUS_Arid.sqf

@@ -21,6 +21,8 @@ private _hasContact = "enoch" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["B_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;     
 ["surrenderCrate", "Box_NATO_Wps_F"] call _fnc_saveToTemplate; 
 ["equipmentBox", "Box_NATO_Equip_F"] call _fnc_saveToTemplate; 

A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AUKUS_Temperate.sqf

@@ -21,6 +21,8 @@ private _hasContact = "enoch" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["B_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;     
 ["surrenderCrate", "Box_NATO_Wps_F"] call _fnc_saveToTemplate; 
 ["equipmentBox", "Box_NATO_Equip_F"] call _fnc_saveToTemplate; 

A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_AUKUS_Tropical.sqf

@@ -21,6 +21,8 @@ private _hasContact = "enoch" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["B_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;     
 ["surrenderCrate", "Box_NATO_Wps_F"] call _fnc_saveToTemplate; 
 ["equipmentBox", "Box_NATO_Equip_F"] call _fnc_saveToTemplate; 

A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_CSAT_Arid.sqf

@@ -21,6 +21,8 @@ private _hasContact = "enoch" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["O_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;     
 ["surrenderCrate", "Box_East_Wps_F"] call _fnc_saveToTemplate; 
 ["equipmentBox", "Box_CSAT_Equip_F"] call _fnc_saveToTemplate; 

A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_CSAT_Temperate.sqf

@@ -21,6 +21,8 @@ private _hasContact = "enoch" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["O_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "O_T_supplyCrate_F"] call _fnc_saveToTemplate;     
 ["surrenderCrate", "Box_T_East_Wps_F"] call _fnc_saveToTemplate; 
 ["equipmentBox", "Box_T_CSAT_Equip_F"] call _fnc_saveToTemplate; 

A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_NATO_Arid.sqf

@@ -21,6 +21,8 @@ private _hasContact = "enoch" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["B_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;     
 ["surrenderCrate", "Box_NATO_Wps_F"] call _fnc_saveToTemplate; 
 ["equipmentBox", "Box_NATO_Equip_F"] call _fnc_saveToTemplate; 

A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_NATO_Temperate.sqf

@@ -21,6 +21,8 @@ private _hasContact = "enoch" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["B_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;     
 ["surrenderCrate", "Box_NATO_Wps_F"] call _fnc_saveToTemplate; 
 ["equipmentBox", "Box_NATO_Equip_F"] call _fnc_saveToTemplate; 

A3A/addons/core/Templates/Templates/Aegis/Aegis_AI_NATO_Tropical.sqf

@@ -21,6 +21,8 @@ private _hasContact = "enoch" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["B_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;     
 ["surrenderCrate", "Box_NATO_Wps_F"] call _fnc_saveToTemplate; 
 ["equipmentBox", "Box_NATO_Equip_F"] call _fnc_saveToTemplate; 

A3A/addons/core/Templates/Templates/STALKER/STALKER_AI_ClearSky.sqf

@@ -15,6 +15,7 @@
 //       Vehicles       //
 //////////////////////////
 
+["attributeMoreTrucks", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 ["attributeLowAir", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;

A3A/addons/core/Templates/Templates/STALKER/STALKER_AI_ClearSky_RHS.sqf

@@ -15,6 +15,7 @@
 //       Vehicles       //
 //////////////////////////
 
+["attributeMoreTrucks", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 ["attributeLowAir", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;

A3A/addons/core/Templates/Templates/STALKER/STALKER_AI_Freedom.sqf

@@ -15,6 +15,7 @@
 //       Vehicles       //
 //////////////////////////
 
+["attributeMoreTrucks", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 ["attributeLowAir", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;

A3A/addons/core/Templates/Templates/STALKER/STALKER_AI_Freedom_RHS.sqf

@@ -15,6 +15,7 @@
 //       Vehicles       //
 //////////////////////////
 
+["attributeMoreTrucks", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 ["attributeLowAir", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;

A3A/addons/core/Templates/Templates/STALKER/STALKER_AI_Military.sqf

@@ -15,6 +15,7 @@
 //       Vehicles       //
 //////////////////////////
 
+["attributeMoreTrucks", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 ["attributeLowAir", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;

A3A/addons/core/Templates/Templates/STALKER/STALKER_AI_Military_RHS.sqf

@@ -15,6 +15,7 @@
 //       Vehicles       //
 //////////////////////////
 
+["attributeMoreTrucks", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 ["attributeLowAir", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;

A3A/addons/core/Templates/Templates/STALKER/STALKER_AI_Monolith.sqf

@@ -15,6 +15,7 @@
 //       Vehicles       //
 //////////////////////////
 
+["attributeMoreTrucks", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 ["attributeLowAir", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;

A3A/addons/core/Templates/Templates/STALKER/STALKER_AI_Monolith_RHS.sqf

@@ -15,6 +15,7 @@
 //       Vehicles       //
 //////////////////////////
 
+["attributeMoreTrucks", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 ["attributeLowAir", true] call _fnc_saveToTemplate; // due to emissions in "the zone" and such, you don't want helis and planes flying around all the time
 
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;

A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_AAF.sqf

@@ -26,6 +26,8 @@ private _hasRF = "rf" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["I_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "I_supplyCrate_F"] call _fnc_saveToTemplate;     //Don't touch or you die a sad and lonely death!
 ["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_AAF_Equip_F"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type

A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Arid.sqf

@@ -26,8 +26,10 @@ private _hasRF = "rf" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["O_SDV_01_F"]] call _fnc_saveToTemplate;
 ["vehiclesDropPod", ["Land_Pod_Heli_Transport_04_covered_F"]] call _fnc_saveToTemplate; 
 
+
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;     //Don't touch or you die a sad and lonely death!
 ["surrenderCrate", "Box_East_Wps_F"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type
 ["equipmentBox", "Box_CSAT_Equip_F"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type

A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_CSAT_Temperate.sqf

@@ -26,6 +26,8 @@ private _hasRF = "rf" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["O_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;     //Don't touch or you die a sad and lonely death!
 ["surrenderCrate", "Box_East_Wps_F"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type
 ["equipmentBox", "Box_CSAT_Equip_F"] call _fnc_saveToTemplate; //Changeing this from default will require you to define logistics attachement offset for the box type

A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_LDF.sqf

@@ -26,6 +26,8 @@ private _hasRF = "rf" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["B_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;
 ["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

A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Arid.sqf

@@ -26,6 +26,7 @@ private _hasRF = "rf" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["B_SDV_01_F"]] call _fnc_saveToTemplate;
 ["vehiclesDropPod", ["SpaceshipCapsule_01_F"]] call _fnc_saveToTemplate; 
 
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;     //Don't touch or you die a sad and lonely death!

A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Temperate.sqf

@@ -26,6 +26,8 @@ private _hasRF = "rf" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["B_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;     //Don't touch or you die a sad and lonely death!
 ["surrenderCrate", "Box_NATO_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

A3A/addons/core/Templates/Templates/Vanilla/Vanilla_AI_NATO_Tropical.sqf

@@ -26,6 +26,8 @@ private _hasRF = "rf" in A3A_enabledDLC;
 //       Vehicles       //
 //////////////////////////
 
+["vehiclesSDV", ["B_SDV_01_F"]] call _fnc_saveToTemplate;
+
 ["ammobox", "B_supplyCrate_F"] call _fnc_saveToTemplate;     //Don't touch or you die a sad and lonely death!
 ["surrenderCrate", "Box_NATO_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

A3A/addons/core/functions/AI/fn_liberatedeserter.sqf

@@ -0,0 +1,24 @@
+params ["_unit", "_playerX"];
+
+if (!alive _unit) exitWith {
+    [_unit,"remove"] remoteExec ["A3A_fnc_flagaction",[teamPlayer,civilian],_unit];
+};
+
+[_unit,"remove"] remoteExec ["A3A_fnc_flagaction",[teamPlayer,civilian],_unit];
+
+if (captive _playerX) then { _playerX setCaptive false };
+
+_playerX globalChat (localize "STR_chats_loot_flee_player");
+sleep 3;
+
+[_unit] join group _playerX;
+private _timeout = 10;
+waituntil {sleep 1; _timeout = _timeout-1; _timeout < 0 or (local _unit and group _unit == group _playerX)};
+if (_timeout < 0) exitWith {};
+
+_unit globalChat (localize "STR_chats_loot_flee_response");
+_unit enableAI "MOVE";
+_unit enableAI "AUTOTARGET";
+_unit enableAI "TARGET";
+_unit enableAI "ANIM";
+if (captive _unit) then { _unit setCaptive false };

A3A/addons/core/functions/Base/fn_destroyCity.sqf

@@ -2,15 +2,17 @@ params ["_markerX"];
 
 private _positionX = getMarkerPos _markerX;
 private _size = [_markerX] call A3A_fnc_sizeMarker;
-private _buildings = _positionX nearobjects ["house",_size];
+
+private _buildings = _positionX nearObjects ["house",_size];
 
 {
-	if (random 100 < 70) then {
-		for "_i" from 1 to 7 do {
-			_x setHit [format ["dam%1",_i],1];
-			_x setHit [format ["dam %1",_i],1];
-		};
-	};
+    private _hitpoints = getAllHitPointsDamage _x;
+    if (_hitpoints isEqualTo []) then { continue };
+    if (random 100 < 30) then { continue };
+    private _building = _x;
+    {
+        _building setHit [_x, 1];
+    } forEach (_hitpoints # 1 select { _x find "dam" == 0 });
 } forEach _buildings;
 
 [_markerX,false] spawn A3A_fnc_blackout;

A3A/addons/core/functions/Base/fn_flagaction.sqf

@@ -169,6 +169,13 @@ switch _typeX do
             localize "STR_antistasi_actions_free_prisoner"
         ], A3A_fnc_liberaterefugee,nil,6,true,true,"","(isPlayer _this) && (_this == _this getVariable ['owner',objNull]) && alive _target",4];
     };
+    case "deserter":
+    {
+        _flag addAction [format [
+            "<img image='\a3\ui_f\data\IGUI\Cfg\holdactions\holdAction_unbind_ca.paa' size='1.6' shadow=2 /> <t>%1</t>", 
+            localize "STR_antistasi_actions_free_prisoner"
+        ], A3A_fnc_liberateDeserter,nil,6,true,true,"","(isPlayer _this) && (_this == _this getVariable ['owner',objNull]) && alive _target",4];
+    };
     case "prisonerX":
     {
         _flag addAction [format [