From eb756bf3253f2b4efbe1363b95721205fc5b99be Mon Sep 17 00:00:00 2001 From: ebayShopper Date: Wed, 17 Jan 2018 16:50:30 -0500 Subject: [PATCH] Update vanilla object disassembly Vanilla commit: https://github.com/DayZMod/DayZ/commit/11e360732eccb7efcfaf895633dae4a84ca57735 --- SQF/dayz_code/actions/object_disassembly.sqf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SQF/dayz_code/actions/object_disassembly.sqf b/SQF/dayz_code/actions/object_disassembly.sqf index 7d9ef44a1..90d3000f4 100644 --- a/SQF/dayz_code/actions/object_disassembly.sqf +++ b/SQF/dayz_code/actions/object_disassembly.sqf @@ -1,5 +1,5 @@ private ["_cursorTarget","_onLadder","_isWater","_alreadyRemoving","_characterID","_objectID","_objectUID","_ownerArray","_dir", - "_realObjectStillThere","_upgrade","_entry","_parent","_requiredParts","_requiredTools","_model","_toolsOK","_displayname", + "_realObjectStillThere","_upgrade","_entry","_parent","_requiredParts","_requiredTools","_model","_needTool","_displayname", "_whpos","_wh","_object","_vector","_dis","_puid","_variables"]; @@ -51,12 +51,12 @@ for "_i" from 1 to 20 do { diag_log format["%1 - %2 - %3 - %4 - %5",_parent,_requiredParts,_requiredTools,_model,_displayname]; // check the tools needed - _toolsOK = true; + _needTool = ""; { - if (!(_x IN items player)) exitWith { _toolsOK = false; }; + if !(_x in items player) exitWith { _needTool = getText(configFile >> "CfgWeapons" >> _x >> "displayName"); }; } count _requiredTools; - if (!_toolsOK) exitWith { format [localize "str_disassembleMissingTool",getText (configFile >> "CfgWeapons" >> _x >> "displayName"),_displayname] call dayz_rollingMessages; }; + if (_needTool != "") exitWith { format[localize "str_disassembleMissingTool",_needTool] call dayz_rollingMessages; }; if (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "disableWeapons") == 0) then { player playActionNow "Medic";