Merge remote-tracking branch 'refs/remotes/origin/livonia' into dev

Author: armazac

addons/overthrow_main.pbo

@@ -129,6 +129,7 @@ class CfgFunctions
 			class respawnHandler {};
 			class keyHandler {};
 			class taggedHandler {};
+			class EnemyDamagedHandler {};
 		};
 
 		class UI
@@ -184,6 +185,7 @@ class CfgFunctions
 			class jobsDialog {};
 			class craftDialog {};
 			class uploadData {};
+			class logisticsDialog {};
 		};
 
 		class Display
@@ -197,6 +199,7 @@ class CfgFunctions
 			class displayJobDetails {};
 			class displayCraftItem {};
 			class factoryRefresh {};
+			class displayLogisticDetails {};
 		};
 
 		/*
@@ -236,6 +239,7 @@ class CfgFunctions
 			class takeLegit {};
 			class warehouseTake {};
 			class recover {};
+			class storeAll {};
 
 			/* Port */
 			class exportAll {};
@@ -265,6 +269,7 @@ class CfgFunctions
 			class transferFunds {};
 			class hireEmployee {};
 			class fireEmployee {};
+			class setVehicleWaypoint {};
 
 			/* Jobs */
 			class setJobWaypoint {};
@@ -296,6 +301,8 @@ class CfgFunctions
 			class playSound {};
             class canPlace {};
 			class vehicleCanMove {};
+			class unflipVehicle {};
+			class triggerBattle {};
 
 		};
 
@@ -466,6 +473,7 @@ class CfgFunctions
 			class squadGetOut {};
 			class squadGetInMyVehicle {};
 			class orderStopAndFace {};
+			class landAndCleanupHelicopter {};
 		};
 
 		/*

addons/overthrow_main/CfgFunctions.hpp

@@ -16,6 +16,11 @@
 				displayName = "Salvage"; \
 				statement = "_target spawn OT_fnc_salvageWreck"; \
 			}; \
+			class OT_Unflip { \
+				condition = "!(canMove _target) && (alive _target) && ((vehicle player) isEqualTo player)"; \
+				displayName = "Unflip"; \
+				statement = "_target call OT_fnc_unflipVehicle"; \
+			}; \
 		}; \
 	};
 
@@ -110,7 +115,7 @@ class CfgVehicles {
         class ACE_Actions {
             class ACE_MainActions {
                 class OT_InteractionActions {
-                    condition = "(alive _target) && (!isplayer _target) && !(side _target isEqualTo west) && (!(_player getVariable ['ot_tute',true]) || !(_player getVariable ['OT_tute_inProgress', false]))";
+                    condition = "(alive _target) && (!isplayer _target) && !(side _target isEqualTo west)";
                     selection = "pelvis";
                     distance = 4;
                     displayName = "Talk";

addons/overthrow_main/CfgVehicles.hpp

@@ -47,5 +47,15 @@ class Campaign
 		{
 			template = "OverthrowSpAltis.Altis";
 		};
+
+		class Malden: MissionDefault
+		{
+			template = "OverthrowSpMalden.Malden";
+		};
+
+		class Livonia: MissionDefault
+		{
+			template = "OverthrowSpLivonia.Enoch";
+		};
 	};
 };

addons/overthrow_main/campaign/description.ext

@@ -68,7 +68,7 @@ OT_vehTypes_civignore = ["C_Hatchback_01_F","C_Hatchback_01_sport_F",OT_vehType_
 OT_illegalHeadgear = ["H_MilCap_gen_F","H_Beret_gen_F","H_HelmetB_TI_tna_F"];
 OT_illegalVests = ["V_TacVest_gen_F"];
 
-OT_clothes_locals = ["U_C_Man_casual_5_F","U_C_Poloshirt_burgundy","U_I_C_Soldier_Bandit_1_F"];
+OT_clothes_locals = ["U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_C_Poor_1","U_C_Poor_2","U_C_Poor_shorts_1","U_C_Poor_shorts_2","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_stripped"];
 OT_clothes_expats = ["U_I_C_Soldier_Bandit_5_F","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_salmon","U_C_Poloshirt_stripped","U_C_Man_casual_6_F","U_C_Man_casual_4_F","U_C_Man_casual_5_F"];
 OT_clothes_tourists = [];
 OT_clothes_priest = "U_C_Man_casual_2_F";