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

Author: armazac

addons/overthrow_main.pbo

@@ -7,6 +7,7 @@ class CfgFunctions
 			file = "\overthrow_main\functions";
 			class initVar {};
 			class initOverthrow {};
+			class initBaseVar {};
 		};
 
         class Cleanup
@@ -31,6 +32,7 @@ class CfgFunctions
 			class unitSeenAny {};
 			class revealToNATO {};
 			class revealToCRIM {};
+			class revealToResistance {};
 		};
 
 		/* Persistent Save */
@@ -86,6 +88,7 @@ class CfgFunctions
 			class playerIsGeneral {};
 			class playerIsAtWarehouse {};
 			class playerIsAtHardwareStore {};
+			class playerIsAtStore {};
 			class tutorial {};
 			class influence {};
 			class influenceSilent {};
@@ -154,6 +157,8 @@ class CfgFunctions
 			class mainMenu {};
 			class buyDialog {};
 			class sellDialog {};
+			class buyDialogVehicle {};
+			class sellDialogVehicle {};
 			class workshopDialog {};
 			class policeDialog {};
 			class warehouseDialog {};
@@ -322,6 +327,7 @@ class CfgFunctions
 			class getBuildId {};
 			class weatherSystem {};
 			class getRandomRoadPosition {};
+			class isRadarInRange {};
 		};
 
 		/*
@@ -381,6 +387,7 @@ class CfgFunctions
 			class incomeSystem {};
 			class propagandaSystem {};
 			class stability {};
+			class getControlledPopulation {};
 		};
 
 		/*
@@ -445,6 +452,7 @@ class CfgFunctions
 			class squadAssignVehicle {};
 			class squadGetIn {};
 			class squadGetOut {};
+			class squadGetInMyVehicle {};
 			class orderStopAndFace {};
 		};
 
@@ -505,6 +513,11 @@ class CfgFunctions
 			class NATOGroundSupport {};
 			class NATOTankSupport {};
 			class NATOSeaSupport {};
+			class NATOScrambleJet {};
+			class NATOAPCInsertion {};
+			class NATOScrambleHelicopter {};
+			class NATOGroundPatrol {};
+			class NATOAirPatrol {};
 
 			class NATOResponseObjective {};
 			class NATOResponseTown {};
@@ -520,6 +533,7 @@ class CfgFunctions
 			class NATOSetExplosives {};
 			class NATOupgradeFOB {};
 			class NATOsendGendarmerie {};
+			class NATOreportThreat {};
 		};
 
 		class NATOAI
@@ -556,6 +570,7 @@ class CfgFunctions
 			class initWorkshop {};
 			class initTrainingCamp {};
 			class initWarehouse {};
+			class initRadar {};
 		};
 
         class Util
@@ -578,7 +593,6 @@ class CfgFunctions
 		class Integration
 		{
 			file = "\overthrow_main\functions\integration";
-			class initTFAR {};
 			class advancedTowingInit {};
 			class detectItems {};
 		};

addons/overthrow_main/CfgFunctions.hpp

@@ -72,4 +72,13 @@ class CfgMarkers
 		shadow = true;
 		scope = 1;
 	};
+	class ot_HQ
+	{
+		name = "HQ";
+		icon = "\overthrow_main\ui\markers\hq.paa";
+		color[] = {1, 1, 1, 1};
+		size = 32;
+		shadow = true;
+		scope = 1;
+	};
 };

addons/overthrow_main/CfgMarkers.hpp

@@ -6,12 +6,23 @@ OT_objectiveData = [
     [[21034.5,19287.1,0],"Research Base",250],
     [[12805.9,16672.5,0],"Lakka Base",300],
     [[16611.6,19009.5,0],"Zeloran Base",250],
-    [[16650.9,12307.9,0],"Pyrgos Naval Base",400],
+    [[16650.9,12307.9,0],"Pyrgos Base",400],
     [[19322,16545.2,0],"Chemical Plant",600],
     [[12285.5,8891.48,0],"Vikos Base",250],
     [[17407.2,13204,0],"Pyrgos Base",500],
-    [[9967.93,19355.9,0],"Galati Base",250]
+    [[9967.93,19355.9,0],"Galati Base",250],
+    [[8746.56,17465.5,0],"Syrta Base",250],
+    [[20068.2,6707.49,0],"Selakano Base",600],
+    [[14273.5,13007.8,0],"Katalaki Naval Base",600],
+    [[23028.6,7245.26,0],"Feres Base",600]
 ];
 OT_NATO_HQ = "Selakano Airfield";
-OT_NATO_priority = ["Selakano Airfield","Gravia Airport","Comms Alpha","Pyrgos","Kavala","Neochori"];
-OT_NATO_Navy_HQ = "Pyrgos Naval Base";
+OT_NATO_priority = ["Selakano Airfield","Gravia Airport","Comms Alpha","Pyrgos","Kavala","Neochori","Selakano Base"];
+OT_NATO_Navy_HQ = "Katalaki Naval Base";
+
+OT_NATO_JetPos = [20892.6,7268.2,0.800297]; //Where to spawn jets
+OT_NATO_JetDir = 122; //Direction to face jet on spawn
+OT_NATO_JetLandPos = [19991.5,2479.9,106.43]; //Waypoint before landing a jet
+
+OT_NATO_HQ_garrisonPos = [20896.4,7297.95,0];
+OT_NATO_HQ_garrisonDir = 325;

addons/overthrow_main/campaign/missions/OverthrowMpAltis.Altis/data/objectives.sqf

@@ -10,7 +10,7 @@ OT_startCameraTarget = [13808.2,6387.16,0];
 
 //Used to control updates and persistent save compatability. When these numbers go up, that section will be reinitialized on load if required. (ie leave them alone)
 OT_economyVersion = 2;
-OT_NATOversion = 1;
+OT_NATOversion = 2;
 OT_CRIMversion = 1;
 
 OT_faction_NATO = "BLU_F";
@@ -98,12 +98,16 @@ OT_NATO_Vehicles_JetGarrison = [
 	["B_Plane_CAS_01_F",1]
 ];
 
-//Check for jets dlc
-OT_hasJetsDLC = false;
-if("B_Plane_Fighter_01_F" isKindOf "Air") then {
-	OT_hasJetsDLC = true;
+OT_NATO_Vehicles_StaticAAGarrison = [
+	"B_static_AA_F",
+	"B_static_AA_F"
+]; //Added to every airfield
+
+if(OT_hasJetsDLC) then {
 	OT_NATO_Vehicles_JetGarrison pushback ["B_Plane_Fighter_01_F",1];
 	OT_NATO_Vehicles_JetGarrison pushback ["B_Plane_Fighter_01_Stealth_F",1];
+	OT_NATO_Vehicles_StaticAAGarrison pushback "B_Radar_System_01_F";
+	OT_NATO_Vehicles_StaticAAGarrison pushback "B_SAM_System_03_F";
 };
 
 OT_NATO_StaticGarrison_LevelOne = ["B_HMG_01_high_F"];
@@ -140,6 +144,7 @@ OT_NATO_Vehicle_AirTransport_Small = "B_Heli_Transport_01_camo_F";
 OT_NATO_Vehicle_AirTransport = ["B_Heli_Transport_03_F","B_Heli_Transport_01_F","B_Heli_Transport_01_F"];
 OT_NATO_Vehicle_AirTransport_Large = "B_Heli_Transport_03_F";
 OT_NATO_Vehicle_Boat_Small = "B_Boat_Armed_01_minigun_F";
+OT_NATO_Vehicles_APC = ["B_APC_Wheeled_01_cannon_F"];
 
 OT_NATO_Sandbag_Curved = "Land_BagFence_01_round_green_F";
 OT_NATO_Barrier_Small = "Land_HBarrier_01_line_5_green_F";
@@ -165,7 +170,7 @@ OT_CRIM_Launchers = ["launch_RPG32_F","launch_RPG7_F","launch_RPG7_F","launch_RP
 OT_piers = ["Land_PierConcrete_01_4m_ladders_F","Land_PierWooden_01_platform_F","Land_PierWooden_01_hut_F","Land_PierWooden_02_hut_F"]; //spawns dudes that sell boats n stuff
 OT_offices = ["Land_MultistoryBuilding_01_F","Land_MultistoryBuilding_04_F"];
 OT_portBuildings = ["Land_Warehouse_01_F","Land_Warehouse_02_F","Land_ContainerLine_01_F","Land_ContainerLine_02_F","Land_ContainerLine_03_F"];
-OT_airportTerminals = ["Land_Airport_01_terminal_F","Land_Airport_02_terminal_F","Land_Hangar_F"];
+OT_airportTerminals = ["Land_Airport_01_terminal_F","Land_Airport_02_terminal_F","Land_Hangar_F","Land_TentHangar_V1_F"];
 OT_portBuilding = "Land_WarehouseShelter_01_F";
 OT_policeStation = "Land_Cargo_House_V3_F";
 OT_warehouse = "Land_Warehouse_03_F";
@@ -175,3 +180,4 @@ OT_workshopBuilding = "Land_Cargo_House_V4_F";
 OT_refugeeCamp = "Land_Medevac_house_V1_F";
 OT_trainingCamp = "Land_IRMaskingCover_02_F";
 OT_hardwareStore = "Land_dp_smallFactory_F";
+OT_radarBuilding = "Land_Radar_Small_F";