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

Sync closeDisplay exit codes for easier scripts.txt filtering

Browse Source
This commit is contained in:
ebaydayz
2016-11-11 14:48:28 -05:00
parent 489e0bbc77
commit 88870a6b2a
23 changed files with 41 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/compile/BIS_fnc/fn_halo.sqf
View File

@@ -314,7 +314,7 @@ if (typename _this == typename []) then {
//--- Crash
_velZ = velocity _para select 2;
if ((_velZ - bis_fnc_halo_para_velZ) > 7 && (getposatl _para select 2) < 100) then {player setdamage 1;debuglog ["Log::::::::::::::",(_velZ - bis_fnc_halo_para_velZ)];};
//if ((_velZ - bis_fnc_halo_para_velZ) > 7 && (getposatl _para select 2) < 100) then {player setdamage 1;debuglog ["Log::::::::::::::",(_velZ - bis_fnc_halo_para_velZ)];};
bis_fnc_halo_para_velZ = _velZ;
//--- Pos

4
SQF/dayz_code/compile/fn_gearMenuChecks.sqf
View File

@@ -33,7 +33,7 @@ if ((vehicle player) == player) then {
_rID = if (DZE_permanentPlot) then { getPlayerUID _cTarget } else { _cTarget getVariable ["CharacterID","0"] };
if ((!canbuild or isInTraderCity) && {_cTarget isKindOf "Man"} && {alive _cTarget} && {isPlayer _cTarget} && {!(_rID in _friendlies)} && {(player distance _cTarget) < 12}) then {
localize "STR_EPOCH_PLAYER_316" call dayz_rollingMessages;
_display closeDisplay 1;
_display closeDisplay 2;
};
};
};
@@ -42,7 +42,7 @@ if ((vehicle player) == player) then {
_lastSave = dayz_lastSave;
_startTime = diag_tickTime;
localize "str_epoch_player_7" call dayz_rollingMessages;
_display closeDisplay 1;
_display closeDisplay 2;
_ctType = typeOf _cTarget;
//direct gear to cursorTarget
[_lastSave, _startTime, _ctType, _cTarget] spawn {

4
SQF/dayz_code/compile/player_spawnCheck.sqf
View File

@@ -55,7 +55,7 @@ if (_inVehicle) then {
if (_doNothing) exitwith {};
if ("ItemMap_Debug" in items player) then {
/*if ("ItemMap_Debug" in items player) then {
deleteMarkerLocal "MaxZeds";
deleteMarkerLocal "Counter";
deleteMarkerLocal "Loot30";
@@ -98,7 +98,7 @@ if ("ItemMap_Debug" in items player) then {
diag_log (format["%1 Local.Agents: %2/%3, NearBy.Agents: %8/%9, Global.Agents: %6/%7, W.holders: %10/%11, (radius:%4m %5fps).","SpawnCheck",
_maxlocalspawned, _maxControlledZombies, _radius, round diag_fpsmin,dayz_currentGlobalZombies,
dayz_maxGlobalZeds, dayz_CurrentNearByZombies, dayz_maxNearByZombies, _currentWeaponHolders,_maxWeaponHolders]);
};
};*/
_nearby = nearestObjects [_position, _spawnableObjects,_radius];
_maxlocalspawned = _maxlocalspawned max floor(_maxControlledZombies*.8);

10
SQF/dayz_code/compile/player_unlockDoor.sqf
View File

@@ -30,7 +30,7 @@ if (!isNull dayz_selectedDoor) then {
if (_notNearestPlayer) then {
// close display since another player is closer
_display closeDisplay 3000;
_display closeDisplay 2;
localize "STR_EPOCH_ACTIONS_16" call dayz_rollingMessages;
} else {
// get object combination
@@ -58,7 +58,7 @@ if (!isNull dayz_selectedDoor) then {
[player,"combo_unlock",0,false] call dayz_zombieSpeak;
// close display
_display closeDisplay 3000;
_display closeDisplay 2;
// unlock if locked
if (_obj animationPhase "Open_hinge" == 0) then {
@@ -86,17 +86,17 @@ if (!isNull dayz_selectedDoor) then {
if (KeyCodeTry >= ((round(random 4)) + 4)) then {
if (isNil 'KeyCodeTryTimer') then {KeyCodeTryTimer = diag_tickTime+10;};
localize "str_epoch_player_19" call dayz_rollingMessages;
_display closeDisplay 3000;
_display closeDisplay 2;
};
if(_doorMethod == "Eye") then {
localize "STR_EPOCH_DOORACCESS_FAILURE" call dayz_rollingMessages;
_display closeDisplay 3000;
_display closeDisplay 2;
};
};
};
} else {
// close display since no target
_display closeDisplay 3000;
_display closeDisplay 2;
};
DZE_DYN_UnlockDoorInprogress = nil;