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

Update change log

Browse Source 
Minor improvement to b791dee and 6248add
This commit is contained in:
ebayShopper
2018-01-11 15:41:13 -05:00
parent 048caa56f4
commit 6caba339c9
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGE LOG 1.0.6.3.txt
View File

@@ -1,7 +1,8 @@
[FIXED] Some more occurrences of zero_building interiors misaligned or at the wrong terrain height (eaaedf2)
[FIXED] Player could switch into gunner's seat of ArmoredSUV while the hatch was being closed #2009 @TheFirstNoob
[FIXED] POI fires were still spawning when POI was off and town generator was on
[FIXED] Some more occurrences of zero_building interiors misaligned or at the wrong terrain height (eaaedf2, 048caa5)
[FIXED] Player could switch into gunner's seat of ArmoredSUV while the hatch was being closed (e89eebc) #2009 @TheFirstNoob
[FIXED] POI fires were still spawning when POI was off and town generator was on (2855997)
[FIXED] Combo locks could be duplicated by two players removing them at the same time (564e3da)
[UPDATED] Spawning of Zombies and Loot in Safe Zones can now be toggled, disabled by default, see configVariables.sqf/DZE_SafeZoneZombieLoot @oiad @_Lance_
[UPDATED] Spawning of Zombies and Loot in Safe Zones can now be toggled, disabled by default, see configVariables.sqf/DZE_SafeZoneZombieLoot (6248add, 141b25e) @oiad @_Lance_
[INFO] Synced with DayZMod upstream up to commit d6bf213

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

@@ -13,7 +13,7 @@ private ["_canPickLight","_text","_unlock","_lock","_totalKeys","_temp_keys","_t
"_isModular","_isModularDoor","_isHouse","_isGateOperational","_isGateLockable","_isFence","_isLockableGate","_isUnlocked","_isOpen","_isClosed","_ownerArray","_ownerBuildLock",
"_ownerPID","_speed","_dog","_vehicle","_inVehicle","_cursorTarget","_primaryWeapon","_currentWeapon","_magazinesPlayer","_onLadder","_canDo",
"_nearLight","_vehicleOwnerID","_hasHotwireKit","_isPZombie","_dogHandle","_allowedDistance","_id","_upgrade","_weaponsPlayer","_hasCrowbar",
"_allowed","_hasAccess","_uid","_myCharID","_isLocked","_isDistance"];
"_allowed","_hasAccess","_uid","_myCharID","_isLocked","_isClose"];
_vehicle = vehicle player;
_inVehicle = (_vehicle != player);
@@ -30,7 +30,7 @@ _myCharID = player getVariable ["CharacterID","0"];
_vehicleOwnerID = _vehicle getVariable ["CharacterID","0"];
_hasHotwireKit = "ItemHotwireKit" in _magazinesPlayer;
_isPZombie = player isKindOf "PZombie_VB";
_isDistance = (player distance _cursorTarget < 3);
_isClose = (player distance _cursorTarget < 3);
_dogHandle = player getVariable ["dogID",0];
if (!isNull _nearLight) then {
@@ -199,7 +199,7 @@ if (_isPZombie) then {
if (s_player_pzombiesvision < 0) then {
s_player_pzombiesvision = player addAction [localize "STR_EPOCH_ACTIONS_NIGHTVIS", "\z\addons\dayz_code\actions\pzombie\pz_vision.sqf", [], 4, false, true, "nightVision", "_this == _target"];
};
if (!isNull _cursorTarget && _isDistance) then {
if (!isNull _cursorTarget && _isClose) then {
_isZombie = _cursorTarget isKindOf "zZombie_base";
_isHarvested = _cursorTarget getVariable["meatHarvested",false];
_isMan = _cursorTarget isKindOf "Man"; //includes animals and zombies
@@ -735,7 +735,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
};
//Allow owner to unlock vault
if ((_typeOfCursorTarget in DZE_LockableStorage) && {_characterID != "0"} && {_isDistance} && {!keypadCancel}) then {
if ((_typeOfCursorTarget in DZE_LockableStorage) && {_characterID != "0"} && {_isClose} && {!keypadCancel}) then {
if (s_player_unlockvault < 0) then {
if (_typeOfCursorTarget in DZE_LockedStorage) then {
if (_characterID == dayz_combination || _ownerID == _uid) then {
@@ -760,7 +760,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
};
//Allow owner to pack vault
if ((_typeOfCursorTarget in DZE_UnLockedStorage) && {_characterID != "0"} && {_isDistance} && {!keypadCancel}) then {
if ((_typeOfCursorTarget in DZE_UnLockedStorage) && {_characterID != "0"} && {_isClose} && {!keypadCancel}) then {
if (s_player_lockvault < 0) then {
if (_characterID == dayz_combination || _ownerID == _uid) then {
s_player_lockvault = player addAction [format[localize "STR_EPOCH_ACTIONS_LOCK",_text], "\z\addons\dayz_code\actions\vault_lock.sqf",_cursorTarget, 0, false, true];

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

@@ -849,13 +849,14 @@ dayz_engineSwitch = {
};
DZE_SafeZonePosCheck = {
private ["_position","_skipPos"];
private ["_customRadius","_position","_skipPos"];
_position = _this select 0;
_customRadius = count _this > 1;
_skipPos = false;
if (!DZE_SafeZoneZombieLoot || count _this > 1) then {
if (!DZE_SafeZoneZombieLoot or _customRadius) then {
{
if ((_position distance (_x select 0)) < (if (count _this > 1) then {_this select 1} else {_x select 1})) exitWith {_skipPos = true;};
if ((_position distance (_x select 0)) < (if (_customRadius) then {_this select 1} else {_x select 1})) exitWith {_skipPos = true;};
} forEach DZE_SafeZonePosArray;
};
_skipPos;