Skip to content

Commit 89f9343

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/dev'
2 parents ac4da3c + 3f4a7e9 commit 89f9343

209 files changed

Lines changed: 7307 additions & 2524 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

addons/overthrow_main.pbo

315 KB
Binary file not shown.

addons/overthrow_main/CfgFunctions.hpp

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ class CfgFunctions
77
file = "\overthrow_main\functions";
88
class initVar {};
99
class initOverthrow {};
10+
class initBaseVar {};
1011
};
1112

1213
class Cleanup
@@ -31,6 +32,7 @@ class CfgFunctions
3132
class unitSeenAny {};
3233
class revealToNATO {};
3334
class revealToCRIM {};
35+
class revealToResistance {};
3436
};
3537

3638
/* Persistent Save */
@@ -86,6 +88,7 @@ class CfgFunctions
8688
class playerIsGeneral {};
8789
class playerIsAtWarehouse {};
8890
class playerIsAtHardwareStore {};
91+
class playerIsAtStore {};
8992
class tutorial {};
9093
class influence {};
9194
class influenceSilent {};
@@ -125,6 +128,7 @@ class CfgFunctions
125128
class refuelHandler {};
126129
class respawnHandler {};
127130
class keyHandler {};
131+
class taggedHandler {};
128132
};
129133

130134
class UI
@@ -153,6 +157,8 @@ class CfgFunctions
153157
class mainMenu {};
154158
class buyDialog {};
155159
class sellDialog {};
160+
class buyDialogVehicle {};
161+
class sellDialogVehicle {};
156162
class workshopDialog {};
157163
class policeDialog {};
158164
class warehouseDialog {};
@@ -229,6 +235,7 @@ class CfgFunctions
229235
class transferLegit {};
230236
class takeLegit {};
231237
class warehouseTake {};
238+
class recover {};
232239

233240
/* Port */
234241
class exportAll {};
@@ -320,6 +327,7 @@ class CfgFunctions
320327
class getBuildId {};
321328
class weatherSystem {};
322329
class getRandomRoadPosition {};
330+
class isRadarInRange {};
323331
};
324332

325333
/*
@@ -366,7 +374,7 @@ class CfgFunctions
366374
class initEconomy {};
367375
class initEconomyLoad {};
368376
class setupTownEconomy {};
369-
class standing {};
377+
class support {};
370378
class getPrice {};
371379
class getSellPrice {};
372380
class getDrugPrice {};
@@ -379,6 +387,7 @@ class CfgFunctions
379387
class incomeSystem {};
380388
class propagandaSystem {};
381389
class stability {};
390+
class getControlledPopulation {};
382391
};
383392

384393
/*
@@ -443,6 +452,7 @@ class CfgFunctions
443452
class squadAssignVehicle {};
444453
class squadGetIn {};
445454
class squadGetOut {};
455+
class squadGetInMyVehicle {};
446456
class orderStopAndFace {};
447457
};
448458

@@ -458,6 +468,7 @@ class CfgFunctions
458468
class initCivilian {};
459469
class initCivilianGroup {};
460470
class initCriminal {};
471+
class initCriminalGroup {};
461472
class initCrimLeader {};
462473
class initGendarm {};
463474
class initGendarmPatrol {};
@@ -502,6 +513,11 @@ class CfgFunctions
502513
class NATOGroundSupport {};
503514
class NATOTankSupport {};
504515
class NATOSeaSupport {};
516+
class NATOScrambleJet {};
517+
class NATOAPCInsertion {};
518+
class NATOScrambleHelicopter {};
519+
class NATOGroundPatrol {};
520+
class NATOAirPatrol {};
505521

506522
class NATOResponseObjective {};
507523
class NATOResponseTown {};
@@ -517,6 +533,7 @@ class CfgFunctions
517533
class NATOSetExplosives {};
518534
class NATOupgradeFOB {};
519535
class NATOsendGendarmerie {};
536+
class NATOreportThreat {};
520537
};
521538

522539
class NATOAI
@@ -529,14 +546,19 @@ class CfgFunctions
529546
class CRIM
530547
{
531548
file = "\overthrow_main\functions\factions\CRIM";
549+
class CRIMLoop {};
532550
class formOrJoinGang {};
551+
class formGang {};
552+
class addToGang {};
533553
};
534554

535555
class GUER
536556
{
537557
file = "\overthrow_main\functions\factions\GUER";
538558
class jobSystem {};
539559
class assignJob {};
560+
class jobLoop {};
561+
class GUERLoop {};
540562
};
541563

542564
class Buildings
@@ -548,6 +570,7 @@ class CfgFunctions
548570
class initWorkshop {};
549571
class initTrainingCamp {};
550572
class initWarehouse {};
573+
class initRadar {};
551574
};
552575

553576
class Util
@@ -570,7 +593,6 @@ class CfgFunctions
570593
class Integration
571594
{
572595
file = "\overthrow_main\functions\integration";
573-
class initTFAR {};
574596
class advancedTowingInit {};
575597
class detectItems {};
576598
};

addons/overthrow_main/CfgMarkers.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,13 @@ class CfgMarkers
7272
shadow = true;
7373
scope = 1;
7474
};
75+
class ot_HQ
76+
{
77+
name = "HQ";
78+
icon = "\overthrow_main\ui\markers\hq.paa";
79+
color[] = {1, 1, 1, 1};
80+
size = 32;
81+
shadow = true;
82+
scope = 1;
83+
};
7584
};

addons/overthrow_main/CfgVehicles.hpp

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,17 @@
2323
class CfgVehicles {
2424
class Item_Base_F;
2525
class ThingX;
26+
27+
//Overthrow Vehicles
28+
class I_Truck_02_box_F;
29+
class OT_I_Truck_recovery : I_Truck_02_box_F {
30+
displayName = "KamAZ Recovery";
31+
class Library {
32+
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.";
33+
};
34+
};
35+
36+
//ACE actions
2637
class Land_MapBoard_F : ThingX {
2738
class ACE_Actions {
2839
class ACE_MainActions {
@@ -76,7 +87,7 @@ class CfgVehicles {
7687
class ACE_Actions {
7788
class ACE_MainActions {
7889
class OT_InteractionActions {
79-
condition = "(alive _target) && (!isplayer _target) && !(side _target isEqualTo west)";
90+
condition = "(alive _target) && (!isplayer _target) && !(side _target isEqualTo west) && (!(_player getVariable ['ot_tute',true]) || !(_player getVariable ['OT_tute_inProgress', false]))";
8091
selection = "pelvis";
8192
distance = 4;
8293
displayName = "Talk";

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

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,23 @@ OT_objectiveData = [
66
[[21034.5,19287.1,0],"Research Base",250],
77
[[12805.9,16672.5,0],"Lakka Base",300],
88
[[16611.6,19009.5,0],"Zeloran Base",250],
9-
[[16650.9,12307.9,0],"Pyrgos Naval Base",400],
9+
[[16650.9,12307.9,0],"Pyrgos Base",400],
1010
[[19322,16545.2,0],"Chemical Plant",600],
1111
[[12285.5,8891.48,0],"Vikos Base",250],
1212
[[17407.2,13204,0],"Pyrgos Base",500],
13-
[[9967.93,19355.9,0],"Galati Base",250]
13+
[[9967.93,19355.9,0],"Galati Base",250],
14+
[[8746.56,17465.5,0],"Syrta Base",250],
15+
[[20068.2,6707.49,0],"Selakano Base",600],
16+
[[14273.5,13007.8,0],"Katalaki Naval Base",600],
17+
[[23028.6,7245.26,0],"Feres Base",600]
1418
];
1519
OT_NATO_HQ = "Selakano Airfield";
16-
OT_NATO_priority = ["Selakano Airfield","Gravia Airport","Comms Alpha","Pyrgos","Kavala","Neochori"];
17-
OT_NATO_Navy_HQ = "Pyrgos Naval Base";
20+
OT_NATO_priority = ["Selakano Airfield","Gravia Airport","Comms Alpha","Pyrgos","Kavala","Neochori","Selakano Base"];
21+
OT_NATO_Navy_HQ = "Katalaki Naval Base";
22+
23+
OT_NATO_JetPos = [20892.6,7268.2,0.800297]; //Where to spawn jets
24+
OT_NATO_JetDir = 122; //Direction to face jet on spawn
25+
OT_NATO_JetLandPos = [19991.5,2479.9,106.43]; //Waypoint before landing a jet
26+
27+
OT_NATO_HQ_garrisonPos = [20896.4,7297.95,0];
28+
OT_NATO_HQ_garrisonDir = 325;

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@
99
["Land_BagBunker_Small_F",[-8.99989,10.5555,0],180,1,0,[],"","",true,false],
1010
["B_GMG_01_A_F",[4,-13,-0.0749998],220,1,0,[],"","",true,false],
1111
["B_GMG_01_A_F",[-4,13,-0.0749998],40,1,0,[],"","",true,false],
12-
["Land_Razorwire_F",[15.1629,-4.71896,-2.38419e-006],130,1,0,[],"","",true,false],
13-
["Land_Razorwire_F",[-12.8371,7.28104,-2.38419e-006],130,1,0,[],"","",true,false],
14-
["Land_Razorwire_F",[-15.0596,-7.13234,-2.38419e-006],50,1,0,[],"","",true,false],
15-
["Land_Razorwire_F",[12.9404,9.86766,-2.38419e-006],50,1,0,[],"","",true,false],
16-
["Land_Razorwire_F",[16.5674,3.22882,-2.38419e-006],90,1,0,[],"","",true,false],
17-
["Land_Razorwire_F",[-16.4326,0.228816,-2.38419e-006],90,1,0,[],"","",true,false],
1812
["Site_Minefield",[-50,0,0],0,1,0,[],"","",true,false],
1913
["Site_Minefield",[50,0,0],0,1,0,[],"","",true,false]
2014
]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ briefingName = "Overthrow: Altis";
55
OnLoadName = "Overthrow: Altis";
66
loadScreen = "\overthrow_main\campaign\missions\pic.jpg";
77

8-
overviewText = "@todo";
8+
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.";
99

1010
class CfgRemoteExec
1111
{

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

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
OT_nation = "Altis";
33
OT_saveName = "Overthrow.altis.001";
44

5-
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.";
5+
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.";
66
OT_startDate = [2040,7,14,8,00];
77

88
OT_startCameraPos = [11646.6,6406.52,2];
99
OT_startCameraTarget = [13808.2,6387.16,0];
1010

1111
//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)
1212
OT_economyVersion = 2;
13-
OT_NATOversion = 1;
13+
OT_NATOversion = 2;
1414
OT_CRIMversion = 1;
1515

1616
OT_faction_NATO = "BLU_F";
@@ -85,56 +85,72 @@ OT_clothes_mob = "U_I_C_Soldier_Camo_F";
8585
//NATO stuff
8686
OT_NATO_HMG = "B_HMG_01_high_F";
8787
OT_NATO_Vehicles_AirGarrison = [
88-
["B_T_VTOL_01_vehicle_F",1],
89-
["B_T_VTOL_01_infantry_F",1],
88+
["B_VTOL_01_vehicle_F",1],
89+
["B_VTOL_01_infantry_F",1],
9090
["B_Heli_Light_01_armed_F",1],
9191
["B_Heli_Transport_03_unarmed_F",2],
9292
["B_Heli_Light_01_F",3],
9393
["B_Heli_Attack_01_F",1],
94-
["B_Heli_Transport_01_F",2],
94+
["B_Heli_Transport_01_F",2]
95+
];
96+
97+
OT_NATO_Vehicles_JetGarrison = [
9598
["B_Plane_CAS_01_F",1]
9699
];
97100

98-
//Check for jets dlc
99-
OT_hasJetsDLC = false;
100-
if("B_Plane_Fighter_01_F" isKindOf "Air") then {
101-
OT_hasJetsDLC = true;
102-
OT_NATO_Vehicles_AirGarrison pushback ["B_Plane_Fighter_01_F",1];
103-
OT_NATO_Vehicles_AirGarrison pushback ["B_Plane_Fighter_01_Stealth_F",1];
101+
OT_NATO_Vehicles_StaticAAGarrison = [
102+
"B_static_AA_F",
103+
"B_static_AA_F"
104+
]; //Added to every airfield
105+
106+
if(OT_hasJetsDLC) then {
107+
OT_NATO_Vehicles_JetGarrison pushback ["B_Plane_Fighter_01_F",1];
108+
OT_NATO_Vehicles_JetGarrison pushback ["B_Plane_Fighter_01_Stealth_F",1];
109+
OT_NATO_Vehicles_StaticAAGarrison pushback "B_Radar_System_01_F";
110+
OT_NATO_Vehicles_StaticAAGarrison pushback "B_SAM_System_03_F";
104111
};
105112

106113
OT_NATO_StaticGarrison_LevelOne = ["B_HMG_01_high_F"];
107-
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"];
108-
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"];
114+
OT_NATO_StaticGarrison_LevelTwo = ["B_HMG_01_high_F","B_HMG_01_high_F","B_GMG_01_high_F","B_MRAP_01_hmg_F"];
115+
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"];
109116

110117
OT_NATO_CommTowers = ["Land_TTowerBig_1_F","Land_TTowerBig_2_F"];
111118

119+
OT_NATO_Unit_Sniper = "B_Sniper_F";
120+
OT_NATO_Unit_Spotter = "B_Spotter_F";
121+
OT_NATO_Unit_AA_spec = "B_Soldier_AA_F";
122+
OT_NATO_Unit_AA_ass = "B_Soldier_AAA_F";
123+
OT_NATO_Unit_HVT = "B_Officer_F";
124+
OT_NATO_Unit_TeamLeader = "B_Soldier_TL_F";
125+
OT_NATO_Unit_SquadLeader = "B_Soldier_SL_F";
126+
112127
OT_NATO_Unit_PoliceCommander = "B_Gen_Commander_F";
113128
OT_NATO_Unit_Police = "B_Gen_Soldier_F";
114129
OT_NATO_Vehicle_PoliceHeli = "B_Heli_Light_01_F";
115130
OT_NATO_Vehicle_Quad = "B_Quadbike_01_F";
116131
OT_NATO_Vehicle_Police = "B_GEN_Offroad_01_gen_F";
117-
OT_NATO_Vehicle_Transport = ["B_T_Truck_01_transport_F","B_T_Truck_01_covered_F"];
132+
OT_NATO_Vehicle_Transport = ["B_Truck_01_transport_F","B_Truck_01_covered_F"];
118133
OT_NATO_Vehicle_Transport_Light = "B_CTRG_LSV_01_light_F";
119-
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"];
134+
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"];
120135
OT_NATO_Vehicles_ReconDrone = "B_UAV_01_F";
121136
OT_NATO_Vehicles_CASDrone = "B_UAV_02_CAS_F";
122137
OT_NATO_Vehicles_AirSupport = ["B_Heli_Attack_01_F"];
123138
OT_NATO_Vehicles_AirSupport_Small = ["B_Heli_Light_01_armed_F"];
124-
OT_NATO_Vehicles_GroundSupport = ["B_T_MRAP_01_gmg_F","B_T_MRAP_01_hmg_F","B_T_LSV_01_armed_F"];
139+
OT_NATO_Vehicles_GroundSupport = ["B_MRAP_01_gmg_F","B_MRAP_01_hmg_F","B_LSV_01_armed_F"];
125140
OT_NATO_Vehicles_TankSupport = ["B_MBT_01_TUSK_F","B_MBT_01_cannon_F"];
126-
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"];
141+
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"];
127142
OT_NATO_Vehicles_AirWingedSupport = ["B_Plane_CAS_01_F"];
128143
OT_NATO_Vehicle_AirTransport_Small = "B_Heli_Transport_01_camo_F";
129144
OT_NATO_Vehicle_AirTransport = ["B_Heli_Transport_03_F","B_Heli_Transport_01_F","B_Heli_Transport_01_F"];
130145
OT_NATO_Vehicle_AirTransport_Large = "B_Heli_Transport_03_F";
131146
OT_NATO_Vehicle_Boat_Small = "B_Boat_Armed_01_minigun_F";
147+
OT_NATO_Vehicles_APC = ["B_APC_Wheeled_01_cannon_F"];
132148

133149
OT_NATO_Sandbag_Curved = "Land_BagFence_01_round_green_F";
134150
OT_NATO_Barrier_Small = "Land_HBarrier_01_line_5_green_F";
135151
OT_NATO_Barrier_Large = "Land_HBarrier_01_wall_6_green_F";
136152

137-
OT_NATO_Mortar = "B_T_Mortar_01_F";
153+
OT_NATO_Mortar = "B_Mortar_01_F";
138154

139155
OT_NATO_Vehicle_HVT = "B_MRAP_01_F";
140156

@@ -154,7 +170,7 @@ OT_CRIM_Launchers = ["launch_RPG32_F","launch_RPG7_F","launch_RPG7_F","launch_RP
154170
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
155171
OT_offices = ["Land_MultistoryBuilding_01_F","Land_MultistoryBuilding_04_F"];
156172
OT_portBuildings = ["Land_Warehouse_01_F","Land_Warehouse_02_F","Land_ContainerLine_01_F","Land_ContainerLine_02_F","Land_ContainerLine_03_F"];
157-
OT_airportTerminals = ["Land_Airport_01_terminal_F","Land_Airport_02_terminal_F","Land_Hangar_F"];
173+
OT_airportTerminals = ["Land_Airport_01_terminal_F","Land_Airport_02_terminal_F","Land_Hangar_F","Land_TentHangar_V1_F"];
158174
OT_portBuilding = "Land_WarehouseShelter_01_F";
159175
OT_policeStation = "Land_Cargo_House_V3_F";
160176
OT_warehouse = "Land_Warehouse_03_F";
@@ -164,3 +180,4 @@ OT_workshopBuilding = "Land_Cargo_House_V4_F";
164180
OT_refugeeCamp = "Land_Medevac_house_V1_F";
165181
OT_trainingCamp = "Land_IRMaskingCover_02_F";
166182
OT_hardwareStore = "Land_dp_smallFactory_F";
183+
OT_radarBuilding = "Land_Radar_Small_F";

0 commit comments

Comments
 (0)