W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-17 17:20:26 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch

Browse Source
This commit is contained in:
oiad
2016-10-28 21:25:55 +13:00
parent a9b4a79a77 98be67b59c
commit baeedec061
73 changed files with 1195 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/init/compiles.sqf
View File

@@ -4,6 +4,7 @@ if (isServer) then {
pvs_processSetAccessCode = compile preprocessFile "\z\addons\dayz_code\eventHandlers\processSetAccessCode.sqf";
pvs_processAccessCode = compile preprocessFile "\z\addons\dayz_code\eventHandlers\processAccessCode.sqf";
server_spawnTraders = compile preprocessFile "\z\addons\dayz_server\compile\server_spawnTraders.sqf";
server_updateGroup = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\server_updateGroup.sqf";
};
if (!isDedicated) then {
@@ -689,6 +690,7 @@ local_spawnObjects = compile preprocessFileLineNumbers "\z\addons\dayz_code\comp
FNC_GetSetPos = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fnc_getSetPos.sqf";
FNC_GetPos = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fnc_getPos.sqf";
dayz_EjectPlayer = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\dze_ejectPlayer.sqf";
dayz_groupInvite = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\groupInvite.sqf";
DZE_FilterCheats = {
#define DIK_SUBTRACT 0x4A

6
SQF/dayz_code/init/publicEH.sqf
View File

@@ -17,6 +17,9 @@
"PVDZE_plr_GutBodyZ" addPublicVariableEventHandler {(_this select 1) spawn local_gutObjectZ};
"PVDZE_veh_Init" addPublicVariableEventHandler {(_this select 1) call fnc_veh_ResetEH};
"PVDZE_obj_Remove" addPublicVariableEventHandler {_pos = (_this select 1); _obj = nearestObjects [_pos, DZE_isWreckBuilding, 5]; if (count _obj > 0) then {deleteVehicle (_obj select 0);};};
if (dayz_groupSystem) then {
"PVDZ_groupInvite" addPublicVariableEventHandler {(_this select 1) call dayz_groupInvite};
};
if (toLower worldName == "chernarus") then { //need to add building coordinates for other maps
{
@@ -99,6 +102,9 @@ if (isServer) then {
"PVDZE_plr_DeathB" addPublicVariableEventHandler {(_this select 1) spawn server_deaths};
"PVDZE_handleSafeGear" addPublicVariableEventHandler {(_this select 1) spawn server_handleSafeGear};
"PVDZE_fullobj_Publish" addPublicVariableEventHandler {(_this select 1) call server_publishFullObject}; // PlotForLife take base ownership
if (dayz_groupSystem) then {
"PVDZ_Server_UpdateGroup" addPublicVariableEventHandler {(_this select 1) call server_updateGroup};
};
//Added as part of the maintenance system to allow the server to replace the damaged model with a normal model.
"PVDZ_object_replace" addPublicVariableEventHandler {

2
SQF/dayz_code/init/variables.sqf
View File

@@ -510,6 +510,7 @@ switch (toLower worldName) do {
keypadCancel = false; //Brute force fix
keyPadReset = {uiSleep 2; keypadCancel = false;};
canbuild = true;
dayz_activeInvites = [];
dayz_combination = "";
dayz_disallowedVault = ["TentStorage","BuiltItems","ModularItems","DZE_Base_Object","Generator_DZ"];
// These work with just a running generator
@@ -709,4 +710,5 @@ if (!isDedicated) then {
DZE_Quarantine = false;
DZE_InRadiationZone = false;
DZE_myVehicle = objNull;
dayz_groupNameTags = false;
};