Merge remote-tracking branch 'refs/remotes/origin/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 {};
@@ -125,6 +128,7 @@ class CfgFunctions
 			class refuelHandler {};
 			class respawnHandler {};
 			class keyHandler {};
+			class taggedHandler {};
 		};
 
 		class UI
@@ -153,6 +157,8 @@ class CfgFunctions
 			class mainMenu {};
 			class buyDialog {};
 			class sellDialog {};
+			class buyDialogVehicle {};
+			class sellDialogVehicle {};
 			class workshopDialog {};
 			class policeDialog {};
 			class warehouseDialog {};
@@ -229,6 +235,7 @@ class CfgFunctions
 			class transferLegit {};
 			class takeLegit {};
 			class warehouseTake {};
+			class recover {};
 
 			/* Port */
 			class exportAll {};
@@ -320,6 +327,7 @@ class CfgFunctions
 			class getBuildId {};
 			class weatherSystem {};
 			class getRandomRoadPosition {};
+			class isRadarInRange {};
 		};
 
 		/*
@@ -366,7 +374,7 @@ class CfgFunctions
 			class initEconomy {};
 			class initEconomyLoad {};
 			class setupTownEconomy {};
-			class standing {};
+			class support {};
 			class getPrice {};
 			class getSellPrice {};
 			class getDrugPrice {};
@@ -379,6 +387,7 @@ class CfgFunctions
 			class incomeSystem {};
 			class propagandaSystem {};
 			class stability {};
+			class getControlledPopulation {};
 		};
 
 		/*
@@ -443,6 +452,7 @@ class CfgFunctions
 			class squadAssignVehicle {};
 			class squadGetIn {};
 			class squadGetOut {};
+			class squadGetInMyVehicle {};
 			class orderStopAndFace {};
 		};
 
@@ -458,6 +468,7 @@ class CfgFunctions
 			class initCivilian {};
 			class initCivilianGroup {};
 			class initCriminal {};
+			class initCriminalGroup {};
 			class initCrimLeader {};
 			class initGendarm {};
 			class initGendarmPatrol {};
@@ -502,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 {};
@@ -517,6 +533,7 @@ class CfgFunctions
 			class NATOSetExplosives {};
 			class NATOupgradeFOB {};
 			class NATOsendGendarmerie {};
+			class NATOreportThreat {};
 		};
 
 		class NATOAI
@@ -529,14 +546,19 @@ class CfgFunctions
 		class CRIM
 		{
 			file = "\overthrow_main\functions\factions\CRIM";
+			class CRIMLoop {};
 			class formOrJoinGang {};
+			class formGang {};
+			class addToGang {};
 		};
 
 		class GUER
 		{
 			file = "\overthrow_main\functions\factions\GUER";
 			class jobSystem {};
 			class assignJob {};
+			class jobLoop {};
+			class GUERLoop {};
 		};
 
 		class Buildings
@@ -548,6 +570,7 @@ class CfgFunctions
 			class initWorkshop {};
 			class initTrainingCamp {};
 			class initWarehouse {};
+			class initRadar {};
 		};
 
         class Util
@@ -570,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

@@ -23,6 +23,17 @@
 class CfgVehicles {
 	class Item_Base_F;
 	class ThingX;
+
+	//Overthrow Vehicles
+	class I_Truck_02_box_F;
+	class OT_I_Truck_recovery : I_Truck_02_box_F {
+		displayName = "KamAZ Recovery";
+		class Library {
+			libTextDesc = "The Field Assistance and Recovery Truck (FART) is a specialized heavy truck used for field repairs and gear recovery after a battle. It can recover all items and bodies within a 150m radius into it's cargohold.";
+		};
+	};
+
+	//ACE actions
 	class Land_MapBoard_F : ThingX {
 		class ACE_Actions {
 			class ACE_MainActions {
@@ -76,7 +87,7 @@ class CfgVehicles {
         class ACE_Actions {
             class ACE_MainActions {
                 class OT_InteractionActions {
-                    condition = "(alive _target) && (!isplayer _target) && !(side _target isEqualTo west)";
+                    condition = "(alive _target) && (!isplayer _target) && !(side _target isEqualTo west) && (!(_player getVariable ['ot_tute',true]) || !(_player getVariable ['OT_tute_inProgress', false]))";
                     selection = "pelvis";
                     distance = 4;
                     displayName = "Talk";

addons/overthrow_main/CfgVehicles.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

@@ -9,12 +9,6 @@
 	["Land_BagBunker_Small_F",[-8.99989,10.5555,0],180,1,0,[],"","",true,false],
 	["B_GMG_01_A_F",[4,-13,-0.0749998],220,1,0,[],"","",true,false],
 	["B_GMG_01_A_F",[-4,13,-0.0749998],40,1,0,[],"","",true,false],
-	["Land_Razorwire_F",[15.1629,-4.71896,-2.38419e-006],130,1,0,[],"","",true,false],
-	["Land_Razorwire_F",[-12.8371,7.28104,-2.38419e-006],130,1,0,[],"","",true,false],
-	["Land_Razorwire_F",[-15.0596,-7.13234,-2.38419e-006],50,1,0,[],"","",true,false],
-	["Land_Razorwire_F",[12.9404,9.86766,-2.38419e-006],50,1,0,[],"","",true,false],
-	["Land_Razorwire_F",[16.5674,3.22882,-2.38419e-006],90,1,0,[],"","",true,false],
-	["Land_Razorwire_F",[-16.4326,0.228816,-2.38419e-006],90,1,0,[],"","",true,false],
 	["Site_Minefield",[-50,0,0],0,1,0,[],"","",true,false],
 	["Site_Minefield",[50,0,0],0,1,0,[],"","",true,false]
 ]

addons/overthrow_main/campaign/missions/OverthrowMpAltis.Altis/data/templates/NATOcheckpoint.sqf

@@ -5,7 +5,7 @@ briefingName = "Overthrow: Altis";
 OnLoadName = "Overthrow: Altis";
 loadScreen = "\overthrow_main\campaign\missions\pic.jpg";
 
-overviewText = "@todo";
+overviewText = "Altis, the main island of the Republic of Altis and Stratis, is located in the Mediterranean Sea to the east of Malta. As of 2040, Altis is currently under occupation by NATO forces following a brutal civil war a half decade prior, and the nation is still recovering. NATO originally occupied the country under the promise of a complete withdrawal of forces and return to local democratic rule; despite this, NATO soldiers still occupy the island's military installations. The economy continues to stagnate and citizens are becoming increasingly angry at the lack of local autonomy.";
 
 class CfgRemoteExec
 {

addons/overthrow_main/campaign/missions/OverthrowMpAltis.Altis/description.ext

@@ -2,15 +2,15 @@
 OT_nation = "Altis";
 OT_saveName = "Overthrow.altis.001";
 
-OT_tutorial_backstoryText = "Welcome to Altis, the jewel of the Mediterranean. The year is 2040, it has been five years since NATO pushed the AAF forces out of the nation and no efforts have been made to re-establish local leadership and restore the once great economy of Altis. A protest in the capital city Pyrgos turned sour last night when the leader of the 'Free Altis' movement was gunned down by an unknown assailant.";
+OT_tutorial_backstoryText = "Altis, the main island of the Republic of Altis and Stratis, is located in the Mediterranean Sea to the east of Malta. As of 2040, Altis is currently under occupation by NATO forces following a brutal civil war a half decade prior, and the nation is still recovering. NATO originally occupied the country under the promise of a complete withdrawal of forces and return to local democratic rule; despite this, NATO soldiers still occupy the island's military installations. The economy continues to stagnate and citizens are becoming increasingly angry at the lack of local autonomy.";
 OT_startDate = [2040,7,14,8,00];
 
 OT_startCameraPos = [11646.6,6406.52,2];
 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";
@@ -85,56 +85,72 @@ OT_clothes_mob = "U_I_C_Soldier_Camo_F";
 //NATO stuff
 OT_NATO_HMG = "B_HMG_01_high_F";
 OT_NATO_Vehicles_AirGarrison = [
-	["B_T_VTOL_01_vehicle_F",1],
-	["B_T_VTOL_01_infantry_F",1],
+	["B_VTOL_01_vehicle_F",1],
+	["B_VTOL_01_infantry_F",1],
 	["B_Heli_Light_01_armed_F",1],
 	["B_Heli_Transport_03_unarmed_F",2],
 	["B_Heli_Light_01_F",3],
 	["B_Heli_Attack_01_F",1],
-	["B_Heli_Transport_01_F",2],
+	["B_Heli_Transport_01_F",2]
+];
+
+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_AirGarrison pushback ["B_Plane_Fighter_01_F",1];
-	OT_NATO_Vehicles_AirGarrison pushback ["B_Plane_Fighter_01_Stealth_F",1];
+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"];
-OT_NATO_StaticGarrison_LevelTwo = ["B_HMG_01_high_F","B_HMG_01_high_F","B_GMG_01_high_F","B_T_MRAP_01_hmg_F"];
-OT_NATO_StaticGarrison_LevelThree = ["B_T_Static_AT_F","B_T_Static_AA_F","B_HMG_01_high_F","B_HMG_01_high_F","B_GMG_01_high_F","B_T_MRAP_01_hmg_F","B_T_MRAP_01_gmg_F"];
+OT_NATO_StaticGarrison_LevelTwo = ["B_HMG_01_high_F","B_HMG_01_high_F","B_GMG_01_high_F","B_MRAP_01_hmg_F"];
+OT_NATO_StaticGarrison_LevelThree = ["B_Static_AT_F","B_Static_AA_F","B_HMG_01_high_F","B_HMG_01_high_F","B_GMG_01_high_F","B_MRAP_01_hmg_F","B_MRAP_01_gmg_F"];
 
 OT_NATO_CommTowers = ["Land_TTowerBig_1_F","Land_TTowerBig_2_F"];
 
+OT_NATO_Unit_Sniper = "B_Sniper_F";
+OT_NATO_Unit_Spotter = "B_Spotter_F";
+OT_NATO_Unit_AA_spec = "B_Soldier_AA_F";
+OT_NATO_Unit_AA_ass = "B_Soldier_AAA_F";
+OT_NATO_Unit_HVT = "B_Officer_F";
+OT_NATO_Unit_TeamLeader = "B_Soldier_TL_F";
+OT_NATO_Unit_SquadLeader = "B_Soldier_SL_F";
+
 OT_NATO_Unit_PoliceCommander = "B_Gen_Commander_F";
 OT_NATO_Unit_Police = "B_Gen_Soldier_F";
 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 = ["B_Truck_01_transport_F","B_Truck_01_covered_F"];
 OT_NATO_Vehicle_Transport_Light = "B_CTRG_LSV_01_light_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_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";
 OT_NATO_Vehicles_AirSupport = ["B_Heli_Attack_01_F"];
 OT_NATO_Vehicles_AirSupport_Small = ["B_Heli_Light_01_armed_F"];
-OT_NATO_Vehicles_GroundSupport = ["B_T_MRAP_01_gmg_F","B_T_MRAP_01_hmg_F","B_T_LSV_01_armed_F"];
+OT_NATO_Vehicles_GroundSupport = ["B_MRAP_01_gmg_F","B_MRAP_01_hmg_F","B_LSV_01_armed_F"];
 OT_NATO_Vehicles_TankSupport = ["B_MBT_01_TUSK_F","B_MBT_01_cannon_F"];
-OT_NATO_Vehicles_Convoy = ["B_UGV_01_rcws_F","B_T_MRAP_01_hmg_F","B_T_LSV_01_armed_F","B_T_LSV_01_armed_F","B_T_LSV_01_armed_F"];
+OT_NATO_Vehicles_Convoy = ["B_UGV_01_rcws_F","B_MRAP_01_hmg_F","B_LSV_01_armed_F","B_LSV_01_armed_F","B_LSV_01_armed_F"];
 OT_NATO_Vehicles_AirWingedSupport = ["B_Plane_CAS_01_F"];
 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";
 OT_NATO_Barrier_Large = "Land_HBarrier_01_wall_6_green_F";
 
-OT_NATO_Mortar = "B_T_Mortar_01_F";
+OT_NATO_Mortar = "B_Mortar_01_F";
 
 OT_NATO_Vehicle_HVT = "B_MRAP_01_F";
 
@@ -154,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";
@@ -164,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";