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

Remove more ObjectIDs and ObjectUIDs from certain scripts

Browse Source
This commit is contained in:
A Man
2022-03-24 21:14:23 +01:00
parent 3ffa072c8e
commit 2168d504bb
17 changed files with 50 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,17 +26,9 @@ if (_playerNear) exitWith {
};
local _ownerID = _obj getVariable["CharacterID","0"];
local _objectID = _obj getVariable["ObjectID","0"];
local _objectUID = _obj getVariable["ObjectUID","0"];
local _ComboMatch = (_ownerID == dayz_combination);
_ownerID = _obj getVariable["ownerPUID","0"];
if (_objectID == "0" && _objectUID == "0") exitWith {
dayz_actionInProgress = false;
// s_player_packvault = -1;
format[localize "str_epoch_player_118", _text] call dayz_rollingMessages; // %1 not setup yet.
};
if (!_ComboMatch && (_ownerID != dayz_playerUID)) exitWith {
dayz_actionInProgress = false;
// s_player_packvault = -1;

12
SQF/dayz_code/compile/player_upgradeVehicle.sqf
View File

@@ -5,7 +5,7 @@
if (dayz_actionInProgress) exitWith {localize "STR_EPOCH_PLAYER_52" call dayz_rollingMessages;};
dayz_actionInProgress = true;
private ["_text","_requirementsTools","_upgradeName","_displayname","_vehicle","_proceed","_itemIn","_countIn","_missing","_missingQty","_qty","_removed","_tobe_removed_total","_textMissing","_num_removed","_removed_total","_objectID","_objectUID","_location","_dir","_objectCharacterID","_classname","_newclassname","_upgrade","_vehicle","_finished","_temp_removed_array_mag","_temp_removed_array_wep","_notNearestPlayer","_requirementsWeapon","_requirementsMagazine"];
private ["_text","_requirementsTools","_upgradeName","_displayname","_vehicle","_proceed","_itemIn","_countIn","_missing","_missingQty","_qty","_removed","_tobe_removed_total","_textMissing","_num_removed","_removed_total","_location","_dir","_objectCharacterID","_classname","_newclassname","_upgrade","_vehicle","_finished","_temp_removed_array_mag","_temp_removed_array_wep","_notNearestPlayer","_requirementsWeapon","_requirementsMagazine"];
_upgrade = _this;
_vehicle = cursorTarget;
@@ -111,10 +111,10 @@ if (count (crew _vehicle) == 0) then {
// all parts removed proceed
if (_tobe_removed_total == _removed_total) then {
call player_forceSave;
_objectID = _vehicle getVariable ["ObjectID","0"];
_objectUID = _vehicle getVariable ["ObjectUID","0"];
// Current charID
_objectCharacterID = _vehicle getVariable ["CharacterID","0"];
if (_objectID == "0" && {_objectUID == "0"}) then {
if (_objectCharacterID == "-1") then {
localize "str_epoch_player_50" call dayz_rollingMessages;
} else {
// Get position
@@ -122,9 +122,7 @@ if (count (crew _vehicle) == 0) then {
// Get direction
_dir = getDir _vehicle;
// Current charID
_objectCharacterID = _vehicle getVariable ["CharacterID","0"];
localize "STR_EPOCH_VEHUP_IN_PROGRESS" call dayz_rollingMessages;
[_newclassname,objNull] call fn_waitForObject;
dze_waiting = nil;