Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
armazac committed May 27, 2019
2 parents 2b0b2db + 2d82f94 commit f972174
Show file tree
Hide file tree
Showing 114 changed files with 20,487 additions and 435 deletions.
Binary file modified addons/overthrow_main.pbo
Binary file not shown.
8 changes: 8 additions & 0 deletions addons/overthrow_main/CfgFunctions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ class CfgFunctions
class respawnHandler {};
class keyHandler {};
class taggedHandler {};
class EnemyDamagedHandler {};
};

class UI
Expand Down Expand Up @@ -184,6 +185,7 @@ class CfgFunctions
class jobsDialog {};
class craftDialog {};
class uploadData {};
class logisticsDialog {};
};

class Display
Expand All @@ -197,6 +199,7 @@ class CfgFunctions
class displayJobDetails {};
class displayCraftItem {};
class factoryRefresh {};
class displayLogisticDetails {};
};

/*
Expand Down Expand Up @@ -236,6 +239,7 @@ class CfgFunctions
class takeLegit {};
class warehouseTake {};
class recover {};
class storeAll {};

/* Port */
class exportAll {};
Expand Down Expand Up @@ -265,6 +269,7 @@ class CfgFunctions
class transferFunds {};
class hireEmployee {};
class fireEmployee {};
class setVehicleWaypoint {};

/* Jobs */
class setJobWaypoint {};
Expand Down Expand Up @@ -296,6 +301,8 @@ class CfgFunctions
class playSound {};
class canPlace {};
class vehicleCanMove {};
class unflipVehicle {};
class triggerBattle {};

};

Expand Down Expand Up @@ -466,6 +473,7 @@ class CfgFunctions
class squadGetOut {};
class squadGetInMyVehicle {};
class orderStopAndFace {};
class landAndCleanupHelicopter {};
};

/*
Expand Down
7 changes: 6 additions & 1 deletion addons/overthrow_main/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"; \
}; \
}; \
};

Expand Down Expand Up @@ -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";
Expand Down
10 changes: 10 additions & 0 deletions addons/overthrow_main/campaign/description.ext
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,15 @@ class Campaign
{
template = "OverthrowSpAltis.Altis";
};

class Malden: MissionDefault
{
template = "OverthrowSpMalden.Malden";
};

class Livonia: MissionDefault
{
template = "OverthrowSpLivonia.Enoch";
};
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Loading

0 comments on commit f972174

Please sign in to comment.