W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-24 00:50:50 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed #790

Browse Source
This commit is contained in:
[VB]AWOL
2013-12-02 14:14:20 -06:00
parent 08517b98c2
commit a3ce0481db
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/Configs/safegui.hpp
View File

@@ -648,7 +648,7 @@ class KeypadUI
y = 0.121749; y = 0.121749;
w = 0.126596; w = 0.126596;
h = 0.153191; h = 0.153191;
onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak;((ctrlParent (_this select 0)) closeDisplay 3000); if(!isNull dayz_selectedVault and (typeOf dayz_selectedVault) in DZE_LockedStorage) then {dayz_selectedVault spawn player_unlockVault;};"; onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak;((ctrlParent (_this select 0)) closeDisplay 3000); if(!isNull dayz_selectedVault) then {dayz_selectedVault spawn player_unlockVault;};";
}; };
}; };
}; };

9
SQF/dayz_code/actions/vault_combination_1.sqf
View File

@@ -1,10 +1,11 @@
private ["_ok"]; private ["_ok"];
if(DZE_ActionInProgress) exitWith { cutText [(localize "STR_EPOCH_PLAYER_21") , "PLAIN DOWN"]; };
DZE_ActionInProgress = true;
dayz_selectedVault = _this select 3; dayz_selectedVault = _this select 3;
dayz_combination = ""; dayz_combination = "";
{player removeAction _x} forEach s_player_combi;s_player_combi = [];
s_player_unlockvault = 1;
if(!isNull dayz_selectedVault) then { if(!isNull dayz_selectedVault) then {
if ((typeOf dayz_selectedVault) == "VaultStorageLocked" or (typeOf dayz_selectedVault) == "VaultStorage") then { if ((typeOf dayz_selectedVault) == "VaultStorageLocked" or (typeOf dayz_selectedVault) == "VaultStorage") then {
@@ -14,4 +15,4 @@ if(!isNull dayz_selectedVault) then {
}; };
}; };
s_player_unlockvault = -1; DZE_ActionInProgress = false;

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

@@ -466,10 +466,11 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
if(_typeOfCursorTarget in DZE_LockedStorage) then { if(_typeOfCursorTarget in DZE_LockedStorage) then {
if(_ownerID == dayz_combination or _ownerID == dayz_playerUID) then { if(_ownerID == dayz_combination or _ownerID == dayz_playerUID) then {
_combi = player addAction [format["Open %1",_text], "\z\addons\dayz_code\actions\vault_unlock.sqf",_cursorTarget, 0, false, true, "",""]; _combi = player addAction [format["Open %1",_text], "\z\addons\dayz_code\actions\vault_unlock.sqf",_cursorTarget, 0, false, true, "",""];
s_player_combi set [count s_player_combi,_combi];
} else { } else {
_combi = player addAction [format["Unlock %1",_text], "\z\addons\dayz_code\actions\vault_combination_1.sqf",_cursorTarget, 0, false, true, "",""]; _combi = player addAction [format["Unlock %1",_text], "\z\addons\dayz_code\actions\vault_combination_1.sqf",_cursorTarget, 0, false, true, "",""];
s_player_combi set [count s_player_combi,_combi];
}; };
s_player_combi set [count s_player_combi,_combi];
s_player_unlockvault = 1; s_player_unlockvault = 1;
} else { } else {
if(_ownerID != dayz_combination and _ownerID != dayz_playerUID) then { if(_ownerID != dayz_combination and _ownerID != dayz_playerUID) then {

5
SQF/dayz_code/compile/player_unlockVault.sqf
View File

@@ -14,6 +14,11 @@ s_player_unlockvault = 1;
_obj = _this; _obj = _this;
_objType = typeOf _obj; _objType = typeOf _obj;
if (!(_objType in DZE_LockedStorage)) exitWith {
s_player_unlockvault = -1;
DZE_ActionInProgress = false;
};
_playerNear = _obj call dze_isnearest_player; _playerNear = _obj call dze_isnearest_player;
if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_20") , "PLAIN DOWN"]; }; if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_20") , "PLAIN DOWN"]; };