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

Author: armazac

addons/overthrow_main.pbo

@@ -130,6 +130,8 @@ class CfgFunctions
 			class keyHandler {};
 			class taggedHandler {};
 			class EnemyDamagedHandler {};
+			class QRFStartHandler {};
+			class QRFEndHandler {};
 		};
 
 		class UI
@@ -138,6 +140,7 @@ class CfgFunctions
 			class notifyMinor {};
 			class notifyBig {};
 			class notifyGood {};
+			class notifySilent {};
 			class notifyVehicle {};
 			class playerDecision {};
 			class choiceMade {};
@@ -456,6 +459,8 @@ class CfgFunctions
 			class createSquad {};
 			class experience {};
 			class dangerCaused {};
+			class randomizeLoadout {};
+			class getRandomLoadout {};
 		};
 
 		/*
@@ -528,6 +533,7 @@ class CfgFunctions
 
 			class NATOQRF {};
 			class NATOGroundForces {};
+			class NATOGroundReinforcements {};
 			class CTRGSupport {};
 			class NATOAirSupport {};
 			class NATOGroundSupport {};
@@ -554,6 +560,7 @@ class CfgFunctions
 			class NATOupgradeFOB {};
 			class NATOsendGendarmerie {};
 			class NATOreportThreat {};
+			class NATOGetAttackVectors {};
 		};
 
 		class NATOAI

addons/overthrow_main/CfgFunctions.hpp

@@ -130,7 +130,7 @@ OT_NATO_Vehicle_PoliceHeli = "B_Heli_Light_01_F";
 OT_NATO_Vehicle_Quad = "B_Quadbike_01_F";
 OT_NATO_Vehicle_Police = "B_GEN_Offroad_01_gen_F";
 OT_NATO_Vehicle_Transport = ["B_Truck_01_transport_F","B_Truck_01_covered_F"];
-OT_NATO_Vehicle_Transport_Light = "B_CTRG_LSV_01_light_F";
+OT_NATO_Vehicle_Transport_Light = "B_LSV_01_unarmed_F";
 OT_NATO_Vehicles_PoliceSupport = ["B_MRAP_01_hmg_F","B_MRAP_01_gmg_F","B_LSV_01_armed_F","B_Heli_Light_01_armed_F"];
 OT_NATO_Vehicles_ReconDrone = "B_UAV_01_F";
 OT_NATO_Vehicles_CASDrone = "B_UAV_02_CAS_F";

addons/overthrow_main/campaign/missions/OverthrowMpAltis.Altis/initVar.sqf

@@ -175,7 +175,7 @@ OT_NATO_Vehicle_PoliceHeli = "B_Heli_Light_01_F";
 OT_NATO_Vehicle_Quad = "B_Quadbike_01_F";
 OT_NATO_Vehicle_Police = "B_GEN_Offroad_01_gen_F";
 OT_NATO_Vehicle_Transport = ["B_T_Truck_01_transport_F","B_T_Truck_01_covered_F"];
-OT_NATO_Vehicle_Transport_Light = "B_CTRG_LSV_01_light_F";
+OT_NATO_Vehicle_Transport_Light = "B_LSV_01_unarmed_F";
 OT_NATO_Vehicles_PoliceSupport = ["B_T_MRAP_01_hmg_F","B_T_MRAP_01_gmg_F","B_T_LSV_01_armed_F","B_Heli_Light_01_armed_F"];
 OT_NATO_Vehicles_ReconDrone = "B_UAV_01_F";
 OT_NATO_Vehicles_CASDrone = "B_UAV_02_CAS_F";

addons/overthrow_main/campaign/missions/OverthrowMpLivonia.Enoch/initVar.sqf

@@ -130,7 +130,7 @@ OT_NATO_Vehicle_PoliceHeli = "B_Heli_Light_01_F";
 OT_NATO_Vehicle_Quad = "B_Quadbike_01_F";
 OT_NATO_Vehicle_Police = "B_GEN_Offroad_01_gen_F";
 OT_NATO_Vehicle_Transport = ["B_Truck_01_transport_F","B_Truck_01_covered_F"];
-OT_NATO_Vehicle_Transport_Light = "B_CTRG_LSV_01_light_F";
+OT_NATO_Vehicle_Transport_Light = "B_LSV_01_unarmed_F";
 OT_NATO_Vehicles_PoliceSupport = ["B_MRAP_01_hmg_F","B_MRAP_01_gmg_F","B_LSV_01_armed_F","B_Heli_Light_01_armed_F"];
 OT_NATO_Vehicles_ReconDrone = "B_UAV_01_F";
 OT_NATO_Vehicles_CASDrone = "B_UAV_02_CAS_F";

addons/overthrow_main/campaign/missions/OverthrowMpMalden.Malden/initVar.sqf

@@ -7,11 +7,11 @@ OT_objectiveData = [
     [[3939.27,13915,0],"The Camp Remnants",250],
     [[3166.18,11038.8,0],"Belfort Naval Base",500],
     [[5216.9,3656.3,0],"Chemical Plant",600],
-    [[11581,7342.56,0],"Kotomo Base",200],
+    [[11570.3,7345.21,0],"Kotomo Base",200],
     [[4501.34,8430.07,0],"Regina Base",200]
 ];
 OT_NATO_HQ = "Tuvanaka Airbase";
-OT_NATO_priority = ["Tuvanaka Airbase","Comms Alpha","96FM Georgetown","Comms Whiskey","Lijnhaven","Blue Pearl industrial port","Nani","Belfort","Tuvanaka","Georgetown","Katkoula","Harcourt"];
+OT_NATO_priority = ["Tuvanaka Airbase","Comms Alpha","Comms Whiskey","Lijnhaven","Blue Pearl industrial port","Nani","Belfort","Tuvanaka","Georgetown","Katkoula","Harcourt"];
 OT_NATO_Navy_HQ = "Belfort Naval Base";
 
 OT_NATO_JetPos = [2078.23,13254.2,1.54746]; //Where to spawn jets

addons/overthrow_main/campaign/missions/OverthrowMpTanoa.Tanoa/data/objectives.sqf

@@ -61,6 +61,6 @@ OT_townData = [
     [[12317.8,13929.5,0],"Ipota"]
 ];
 
-OT_spawnTowns = ["Savaka","Namuvaka","Cerebu","Tavu","Muaceba","Leqa","La Foa","Tobakoro","Lösi","Lailai"];
+OT_spawnTowns = ["Savaka","Namuvaka","Tavu","Muaceba","Leqa","Balavu","Rautake"];
 OT_capitals = ["Georgetown","Lijnhaven","Katkoula","Balavu","Tuvanaka"]; //region capitals
 OT_sprawling = ["Blue Pearl industrial port"];

addons/overthrow_main/campaign/missions/OverthrowMpTanoa.Tanoa/data/towns.sqf

@@ -132,7 +132,7 @@ OT_NATO_Vehicle_PoliceHeli = "B_Heli_Light_01_F";
 OT_NATO_Vehicle_Quad = "B_Quadbike_01_F";
 OT_NATO_Vehicle_Police = "B_GEN_Offroad_01_gen_F";
 OT_NATO_Vehicle_Transport = ["B_T_Truck_01_transport_F","B_T_Truck_01_covered_F"];
-OT_NATO_Vehicle_Transport_Light = "B_CTRG_LSV_01_light_F";
+OT_NATO_Vehicle_Transport_Light = "B_T_LSV_01_unarmed_F";
 OT_NATO_Vehicles_PoliceSupport = ["B_T_MRAP_01_hmg_F","B_T_MRAP_01_gmg_F","B_T_LSV_01_armed_F","B_Heli_Light_01_armed_F"];
 OT_NATO_Vehicles_ReconDrone = "B_UAV_01_F";
 OT_NATO_Vehicles_CASDrone = "B_UAV_02_CAS_F";

addons/overthrow_main/campaign/missions/OverthrowMpTanoa.Tanoa/initVar.sqf

@@ -130,7 +130,7 @@ OT_NATO_Vehicle_PoliceHeli = "B_Heli_Light_01_F";
 OT_NATO_Vehicle_Quad = "B_Quadbike_01_F";
 OT_NATO_Vehicle_Police = "B_GEN_Offroad_01_gen_F";
 OT_NATO_Vehicle_Transport = ["B_Truck_01_transport_F","B_Truck_01_covered_F"];
-OT_NATO_Vehicle_Transport_Light = "B_CTRG_LSV_01_light_F";
+OT_NATO_Vehicle_Transport_Light = "B_LSV_01_unarmed_F";
 OT_NATO_Vehicles_PoliceSupport = ["B_MRAP_01_hmg_F","B_MRAP_01_gmg_F","B_LSV_01_armed_F","B_Heli_Light_01_armed_F"];
 OT_NATO_Vehicles_ReconDrone = "B_UAV_01_F";
 OT_NATO_Vehicles_CASDrone = "B_UAV_02_CAS_F";

addons/overthrow_main/campaign/missions/OverthrowSpAltis.Altis/initVar.sqf

@@ -130,7 +130,7 @@ OT_NATO_Vehicle_PoliceHeli = "B_Heli_Light_01_F";
 OT_NATO_Vehicle_Quad = "B_Quadbike_01_F";
 OT_NATO_Vehicle_Police = "B_GEN_Offroad_01_gen_F";
 OT_NATO_Vehicle_Transport = ["B_Truck_01_transport_F","B_Truck_01_covered_F"];
-OT_NATO_Vehicle_Transport_Light = "B_CTRG_LSV_01_light_F";
+OT_NATO_Vehicle_Transport_Light = "B_LSV_01_unarmed_F";
 OT_NATO_Vehicles_PoliceSupport = ["B_MRAP_01_hmg_F","B_MRAP_01_gmg_F","B_LSV_01_armed_F","B_Heli_Light_01_armed_F"];
 OT_NATO_Vehicles_ReconDrone = "B_UAV_01_F";
 OT_NATO_Vehicles_CASDrone = "B_UAV_02_CAS_F";