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

Fix issue with tag friendlies #1807

Browse Source
This commit is contained in:
ebaydayz
2016-12-06 12:12:38 -05:00
parent c3af66b23a
commit dd721ec572
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,8 +70,8 @@ _targetType = if(typeOf _target in DZE_DoorsLocked) then { "DOOR"; } else { "GEN
// and check if player is owner of target object // and check if player is owner of target object
_playerUID = getPlayerUID _player; _playerUID = getPlayerUID _player;
_characterID = dayz_characterID; _characterID = dayz_characterID;
if(DZE_permanentPlot) then { if (DZE_permanentPlot) then {
_targetOwnerUID = _target getVariable ["ownerPUID","0"]; _targetOwnerUID = if (isPlayer _target) then { getPlayerUID _target } else { _target getVariable ["ownerPUID","0"] };
_isOwner = (_playerUID == _targetOwnerUID); _isOwner = (_playerUID == _targetOwnerUID);
} else { } else {
_targetOwnerUID = _target getVariable ["characterID","0"]; _targetOwnerUID = _target getVariable ["characterID","0"];

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

@@ -1,4 +1,4 @@
private ["_exit","_nearestObjects","_friendlies","_rID","_display","_cTarget","_dis"]; private ["_exit","_nearestObjects","_rID","_display","_cTarget","_dis","_friendlyTo","_lastSave","_startTime"];
// players inside vehicle can always access its gear // players inside vehicle can always access its gear
if ((vehicle player) == player) then { if ((vehicle player) == player) then {
@@ -29,9 +29,9 @@ if ((vehicle player) == player) then {
}; };
}; };
if (DZE_BackpackAntiTheft) then { if (DZE_BackpackAntiTheft) then {
_friendlies = player getVariable ["friendlies",[]]; _friendlyTo = player getvariable ["friendlyTo",[]];
_rID = if (DZE_permanentPlot) then { getPlayerUID _cTarget } else { _cTarget getVariable ["CharacterID","0"] }; _rID = if (DZE_permanentPlot) then { getPlayerUID _cTarget } else { _cTarget getVariable ["CharacterID","0"] };
if ((!canbuild or isInTraderCity) && {alive _cTarget} && {isPlayer _cTarget} && {!(_rID in _friendlies)} && {(player distance _cTarget) < 12}) then { if ((!canbuild or isInTraderCity) && {alive _cTarget} && {isPlayer _cTarget} && {!(_rID in _friendlyTo) && !(_cTarget in (units group player))} && {(player distance _cTarget) < 12}) then {
localize "STR_EPOCH_PLAYER_316" call dayz_rollingMessages; localize "STR_EPOCH_PLAYER_316" call dayz_rollingMessages;
_display closeDisplay 2; _display closeDisplay 2;
}; };
@@ -59,4 +59,4 @@ if ((vehicle player) == player) then {
} else { } else {
DZE_GearCheckBypass = false; //exit will always be false the when the above code opens a new gear menu, this will reset the variable DZE_GearCheckBypass = false; //exit will always be false the when the above code opens a new gear menu, this will reset the variable
}; };
}; };

4
SQF/dayz_code/stringtable.xml
View File

@@ -13092,8 +13092,8 @@
<Czech>%1 je omezeno.</Czech> <Czech>%1 je omezeno.</Czech>
</Key> </Key>
<Key ID="STR_EPOCH_PLAYER_316"> <Key ID="STR_EPOCH_PLAYER_316">
<English>You may only access friends' gear in this area.</English> <English>You may only access friends or group members gear in this area.</English>
<German>Du kannst hier nur auf das Inventar von Freunden zugreifen.</German> <German>Du kannst hier nur auf das Inventar von Freunden oder Gruppenmitgliedern zugreifen.</German>
<Russian>Вы можете открывать рюкзаки только друзей в этой области.</Russian> <Russian>Вы можете открывать рюкзаки только друзей в этой области.</Russian>
<Spanish>Sólo se puede acceder engranaje amigos en esta área.</Spanish> <Spanish>Sólo se puede acceder engranaje amigos en esta área.</Spanish>
<Dutch>U mag alleen toegang tot versnelling vrienden 'op dit gebied.</Dutch> <Dutch>U mag alleen toegang tot versnelling vrienden 'op dit gebied.</Dutch>