From cff5d385743e91cc906f0cbe0e9735de32501e94 Mon Sep 17 00:00:00 2001 From: AirwavesMan Date: Sat, 12 Sep 2020 01:09:25 +0200 Subject: [PATCH] Move old files --- SQF/dayz_code/actions/player_fixTools.sqf | 47 --------- SQF/dayz_code/actions/player_makefire.sqf | 97 ------------------- .../player_Constructionitem.sqf | 0 SQF/dayz_code/old/player_fixTools.sqf | 14 +-- 4 files changed, 7 insertions(+), 151 deletions(-) delete mode 100644 SQF/dayz_code/actions/player_fixTools.sqf delete mode 100644 SQF/dayz_code/actions/player_makefire.sqf rename SQF/dayz_code/{actions => old}/player_Constructionitem.sqf (100%) diff --git a/SQF/dayz_code/actions/player_fixTools.sqf b/SQF/dayz_code/actions/player_fixTools.sqf deleted file mode 100644 index b750b7ac8..000000000 --- a/SQF/dayz_code/actions/player_fixTools.sqf +++ /dev/null @@ -1,47 +0,0 @@ -//fixHatchet old file -private ["_tool","_tape","_fixedItem","_config","_dName","_handle","_finished"]; - -_tool = _this; -_config = configFile >> "CfgWeapons" >> _tool; -_fixedItem = getText(_config >> "fixedTool"); - -_dName = getText(configFile >> "CfgWeapons" >> _fixedItem >> "displayName"); - -//Used for Grip -_tape = "equip_duct_tape"; -//Handle -_handle = "equip_lever"; - -if (dayz_actionInProgress) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; }; -dayz_actionInProgress = true; - -call gear_ui_init; -closeDialog 0; - -// Check if the player has the tape -if ((_tape in magazines player) && (_handle in magazines player) && (_tool in items player)) then { - [player,"bandage",0,false] call dayz_zombieSpeak; - _finished = ["Medic",1] call fn_loopAction; - if (!_finished) exitWith {}; - - // Check again to make sure player didn't drop item - if ((_tape in magazines player) && (_handle in magazines player) && (_tool in items player)) then { - player removeWeapon _tool; - player removeMagazine _tape; - player removeMagazine _handle; - player addWeapon _fixedItem; - format[localize "str_fixToolSuccess", _dName] call dayz_rollingMessages; - }; -} else { //If the player doesn't have the mats. - if (!(_tape in magazines player)) then { - if (!(_handle in magazines player)) then { - localize "str_fixToolFail" call dayz_rollingMessages; - } else { - localize "str_fixtoolMissingTape" call dayz_rollingMessages; - }; - } else { - localize "str_fixtoolMissingHandle" call dayz_rollingMessages; - }; -}; - -dayz_actionInProgress = false; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_makefire.sqf b/SQF/dayz_code/actions/player_makefire.sqf deleted file mode 100644 index 4fea9ee1f..000000000 --- a/SQF/dayz_code/actions/player_makefire.sqf +++ /dev/null @@ -1,97 +0,0 @@ -private ["_item","_config","_exit","_text","_booleans","_worldspace","_dir","_location","_fire","_tool","_itemPile","_posASL","_testSea","_finished"]; - -_tool = _this; -call gear_ui_init; -closeDialog 0; - -if (dayz_actionInProgress) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; }; -dayz_actionInProgress = true; - -_item = "ItemLog"; -_itemPile = "PartWoodPile"; -_config = configFile >> "CfgMagazines" >> _item; -_text = getText (_config >> "displayName"); -_exit = false; - -if (_tool == "PartWoodPile") then { - _exit = true; - {if (_x in DayZ_Ignitors) exitWith {_exit = false};} forEach (items player); -}; -if (_exit) exitWith { - localize "str_fireplace_noMatches" call dayz_rollingMessages; - dayz_actionInProgress = false; -}; - -// item is missing or tools are missing -if (!(_item in magazines player) && !(_itemPile in magazines player)) exitWith { - localize "str_player_22" call dayz_rollingMessages; - dayz_actionInProgress = false; -}; - -_booleans = []; //testonLadder, testSea, testPond, testBuilding, testSlope, testDistance -_worldspace = ["Land_Fire_DZ", player, _booleans] call fn_niceSpot; - -// player on ladder or in a vehicle -if (_booleans select 0) exitWith { - localize "str_player_21" call dayz_rollingMessages; - dayz_actionInProgress = false; -}; - -_testSea = true; -_posASL = getPosASL player; -if ((_booleans select 1) && _posASL select 2 > 2) then { - //Allow building on raised platform 2m+ ASL (like docks) - _testSea = false; - _worldspace = [0,_posASL]; -}; - -// object would be in the water (pool or sea) -if ((_booleans select 1 && _testSea) OR (_booleans select 2)) exitWith { - localize "str_player_26" call dayz_rollingMessages; - dayz_actionInProgress = false; -}; - -if ((count _worldspace) == 2) then { - [player,20,true,(getPosATL player)] call player_alertZombies; - - _finished = ["Medic",1] call fn_loopAction; - if (!_finished or (!(_item in magazines player) && !(_itemPile in magazines player))) exitWith {}; - - if (_item in magazines player) then { - player removeMagazine _item; - } else { - player removeMagazine _itemPile; - }; - _dir = _worldspace select 0; - _location = _worldspace select 1; - - // fireplace location may not be in front of player (but in 99% time it should) - player setDir _dir; - player setPosATL (getPosATL player); - - // Added Nutrition-Factor for work - ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; - - _fire = createVehicle ["Land_Fire_DZ", [0,0,0], [], 0, "CAN_COLLIDE"]; - _fire setDir _dir; - if (_testSea) then { - _fire setPos _location; // follow terrain slope - } else { - _fire setPosASL _location; - }; - player reveal _fire; - [_fire,true] call dayz_inflame; - _fire spawn player_fireMonitor; - - /*if (dayz_playerAchievements select 14 < 1) then { - // Firestarter - dayz_playerAchievements set [14,1]; - achievement = [14, player, dayz_characterID]; - publicVariableServer "achievement"; - };*/ - localize "str_fireplace_01" call dayz_rollingMessages; -} else { - localize "str_fireplace_02" call dayz_rollingMessages; -}; - -dayz_actionInProgress = false; \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_Constructionitem.sqf b/SQF/dayz_code/old/player_Constructionitem.sqf similarity index 100% rename from SQF/dayz_code/actions/player_Constructionitem.sqf rename to SQF/dayz_code/old/player_Constructionitem.sqf diff --git a/SQF/dayz_code/old/player_fixTools.sqf b/SQF/dayz_code/old/player_fixTools.sqf index b750b7ac8..1512de93e 100644 --- a/SQF/dayz_code/old/player_fixTools.sqf +++ b/SQF/dayz_code/old/player_fixTools.sqf @@ -1,4 +1,6 @@ -//fixHatchet old file +if (dayz_actionInProgress) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; }; +dayz_actionInProgress = true; + private ["_tool","_tape","_fixedItem","_config","_dName","_handle","_finished"]; _tool = _this; @@ -12,18 +14,16 @@ _tape = "equip_duct_tape"; //Handle _handle = "equip_lever"; -if (dayz_actionInProgress) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; }; -dayz_actionInProgress = true; - call gear_ui_init; closeDialog 0; // Check if the player has the tape if ((_tape in magazines player) && (_handle in magazines player) && (_tool in items player)) then { - [player,"bandage",0,false] call dayz_zombieSpeak; + [player,(getPosATL player),20,"bandage"] spawn fnc_alertZombies; + _finished = ["Medic",1] call fn_loopAction; if (!_finished) exitWith {}; - + // Check again to make sure player didn't drop item if ((_tape in magazines player) && (_handle in magazines player) && (_tool in items player)) then { player removeWeapon _tool; @@ -44,4 +44,4 @@ if ((_tape in magazines player) && (_handle in magazines player) && (_tool in it }; }; -dayz_actionInProgress = false; \ No newline at end of file +dayz_actionInProgress = false;