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

Revert distance checks, fix pack vault

Browse Source 
I broke pack vault :(
This commit is contained in:
oiad
2020-06-19 07:59:46 +12:00
parent 3ff6f3b3c5
commit 5b150a58c7
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,9 +19,6 @@ _text = getText (configFile >> "CfgVehicles" >> _objType >> "displayName");
if (isNull _obj) exitWith {dayz_actionInProgress = false;}; if (isNull _obj) exitWith {dayz_actionInProgress = false;};
_playerNear = {isPlayer _x} count (([_obj] call FNC_GetPos) nearEntities ["CAManBase", 12]) > 1;
if (_playerNear) exitWith {dayz_actionInProgress = false; localize "str_pickup_limit_5" call dayz_rollingMessages;};
_ownerID = _obj getVariable["CharacterID","0"]; _ownerID = _obj getVariable["CharacterID","0"];
_ComboMatch = (_ownerID == dayz_combination); _ComboMatch = (_ownerID == dayz_combination);
if (DZE_permanentPlot) then {_ownerID = _obj getVariable["ownerPUID","0"];}; if (DZE_permanentPlot) then {_ownerID = _obj getVariable["ownerPUID","0"];};

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

@@ -14,7 +14,7 @@ _text = getText (configFile >> "CfgVehicles" >> _typeOf >> "displayName");
if (isNull _obj || !(alive _obj)) exitWith {dayz_actionInProgress = false;}; if (isNull _obj || !(alive _obj)) exitWith {dayz_actionInProgress = false;};
_playerNear = {isPlayer _x} count (([_obj] call FNC_GetPos) nearEntities ["CAManBase", 12]) > 1; _playerNear = {isPlayer _x} count (([_obj] call FNC_GetPos) nearEntities ["CAManBase", 10]) > 1;
if (_playerNear) exitWith {dayz_actionInProgress = false; localize "str_pickup_limit_5" call dayz_rollingMessages;}; if (_playerNear) exitWith {dayz_actionInProgress = false; localize "str_pickup_limit_5" call dayz_rollingMessages;};
_ownerID = _obj getVariable["CharacterID","0"]; _ownerID = _obj getVariable["CharacterID","0"];
@@ -30,9 +30,7 @@ if (_objectID == "0" && _objectUID == "0") exitWith {dayz_actionInProgress = fal
if (!_ComboMatch && (_ownerID != dayz_playerUID)) exitWith {dayz_actionInProgress = false; s_player_packvault = -1; format[localize "str_epoch_player_119",_text] call dayz_rollingMessages;}; if (!_ComboMatch && (_ownerID != dayz_playerUID)) exitWith {dayz_actionInProgress = false; s_player_packvault = -1; format[localize "str_epoch_player_119",_text] call dayz_rollingMessages;};
format[localize "str_epoch_player_121",_text] call dayz_rollingMessages; if (isNull _obj && {!alive _obj}) exitWith {s_player_packvault = -1;dayz_actionInProgress = false;};
if (!isNull _obj && {alive _obj}) exitWith {s_player_packvault = -1;dayz_actionInProgress = false;};
[player,"tentpack",0,false] call dayz_zombieSpeak; [player,"tentpack",0,false] call dayz_zombieSpeak;
format[localize "str_epoch_player_121",_text] call dayz_rollingMessages; format[localize "str_epoch_player_121",_text] call dayz_rollingMessages;
@@ -42,7 +40,7 @@ if (isNull _obj || !_finished) exitWith {s_player_packvault = -1;dayz_actionInPr
(findDisplay 106) closeDisplay 0; // Close gear (findDisplay 106) closeDisplay 0; // Close gear
_playerNear = {isPlayer _x} count (([_obj] call FNC_GetPos) nearEntities ["CAManBase", 12]) > 1; _playerNear = {isPlayer _x} count (([_obj] call FNC_GetPos) nearEntities ["CAManBase", 10]) > 1;
if (_playerNear) exitWith {dayz_actionInProgress = false; localize "str_pickup_limit_5" call dayz_rollingMessages;}; if (_playerNear) exitWith {dayz_actionInProgress = false; localize "str_pickup_limit_5" call dayz_rollingMessages;};
["Working",0,[3,2,4,0]] call dayz_NutritionSystem; ["Working",0,[3,2,4,0]] call dayz_NutritionSystem;

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

@@ -15,15 +15,9 @@ s_player_unlockvault = 1;
_obj = _this; _obj = _this;
_objType = typeOf _obj; _objType = typeOf _obj;
if !(_objType in DZE_LockedStorage) exitWith { if !(_objType in DZE_LockedStorage) exitWith {s_player_unlockvault = -1;dayz_actionInProgress = false;};
s_player_unlockvault = -1;
dayz_actionInProgress = false;
};
_playerNear = {isPlayer _x} count (([_obj] call FNC_GetPos) nearEntities ["CAManBase", 12]) > 1; if (isNull _obj || !(alive _obj)) exitWith {dayz_actionInProgress = false;};
if (_playerNear) exitWith {dayz_actionInProgress = false; localize "str_pickup_limit_5" call dayz_rollingMessages;};
if (isNull _obj || !(alive _obj)) exitWith { dayz_actionInProgress = false; };
_unlockedClass = getText (configFile >> "CfgVehicles" >> _objType >> "unlockedClass"); _unlockedClass = getText (configFile >> "CfgVehicles" >> _objType >> "unlockedClass");
_text = getText (configFile >> "CfgVehicles" >> _objType >> "displayName"); _text = getText (configFile >> "CfgVehicles" >> _objType >> "displayName");
@@ -61,6 +55,7 @@ if (_ComboMatch || (_ownerID == dayz_playerUID)) then {
[player,"repair",0,false] call dayz_zombieSpeak; [player,"repair",0,false] call dayz_zombieSpeak;
[player,25,true,(getPosATL player)] spawn player_alertZombies; [player,25,true,(getPosATL player)] spawn player_alertZombies;
if (DZE_lockablesHarderPenalty) then { if (DZE_lockablesHarderPenalty) then {
dayz_lastCodeFail = (diag_tickTime + dayz_UnlockTime); dayz_lastCodeFail = (diag_tickTime + dayz_UnlockTime);
dayz_UnlockTime = dayz_UnlockTime * 2; dayz_UnlockTime = dayz_UnlockTime * 2;