From d80535f81763e66d9d07938eab1a4cf9a9f086b9 Mon Sep 17 00:00:00 2001 From: He-Man Date: Mon, 10 Aug 2020 22:26:49 +0200 Subject: [PATCH] Check for near Vehicles on Vehicle purchase --- .../EPOCH_server_makeNPCTrade.sqf | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/Sources/epoch_server/compile/epoch_trading/EPOCH_server_makeNPCTrade.sqf b/Sources/epoch_server/compile/epoch_trading/EPOCH_server_makeNPCTrade.sqf index cac5bf81..83f14c05 100644 --- a/Sources/epoch_server/compile/epoch_trading/EPOCH_server_makeNPCTrade.sqf +++ b/Sources/epoch_server/compile/epoch_trading/EPOCH_server_makeNPCTrade.sqf @@ -211,6 +211,14 @@ if (_slot != -1) then { } } forEach _helipad; }; + _blacklistpositions = []; + { + _blacklistpositions pushback [getposatl _x, 5]; + } foreach (nearestobjects [_player,["Landvehicle","SHIP","AIR"],50]); + { + _x params ["_blacklistpos","_blacklistradius"]; + _helipads = _helipads select {_x distance _blacklistpos > _blacklistradius}; + } foreach _blacklistpositions; if !(_helipads isEqualTo[]) then { _foundSmoke = false; { @@ -237,12 +245,15 @@ if (_slot != -1) then { } else { _tmpposition = []; - if (_item isKindOf "Ship") then { - _tmpposition = [_position, 20, 150, 5, 0, 1000, 1] call BIS_fnc_findSafePos; - _tmpposition = [_tmpposition, 0, 60, 10, 2, 1000, 0] call BIS_fnc_findSafePos; - } - else { - _tmpposition = [_position, 20, 120, 5, 0, 2000, 0] call BIS_fnc_findSafePos; + for "_i" from 1 to 5 do { + if (_item isKindOf "Ship") then { + _tmpposition = [_position, 20, 150, 5, 0, 1000, 1] call BIS_fnc_findSafePos; + _tmpposition = [_tmpposition, 0, 60, 10, 2, 1000, 0, _blacklistpositions] call BIS_fnc_findSafePos; + } + else { + _tmpposition = [_position, 20, 120, 5, 0, 2000, 0, _blacklistpositions] call BIS_fnc_findSafePos; + }; + if ((count _tmpposition) == 2) exitwith {}; }; if ((count _tmpposition) == 2) then { _tmpposition set [2, 0];