mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2026-04-18 10:16:39 +03:00
Use waterHoleProxy in drink water and fill water #1835
The slow searches are needed on other maps until waterHoleProxy objects are added for them. They need to be added at every pond and non-"Land_pumpa" well. Right now Chernarus is the only map that has them placed. Fixes #1835 Fixes #1841
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
private ["_bb","_dir","_nearWaterHole","_w2m"];
|
||||
private ["_bb","_dir","_nearWaterHole","_pond","_well","_w2m"];
|
||||
|
||||
_nearWaterHole = false;
|
||||
_nearWaterHole = [false,false];
|
||||
|
||||
{
|
||||
{
|
||||
@@ -12,13 +12,15 @@ _nearWaterHole = false;
|
||||
_dir = _dir - 360;
|
||||
};
|
||||
|
||||
if ((abs _dir < 45 && {_x distance player < 2.22}) // wells, kasna, pumpa
|
||||
or {("" == typeOf _x && (_w2m select 2 < 0.05)) && {(abs(_w2m select 0) < (_bb select 0)) && (abs(_w2m select 1) < (_bb select 1))}}) exitWith { // ponds
|
||||
_nearWaterHole = true;
|
||||
_well = (abs _dir < 45 && {_x distance player < 2.22}); // wells, kasna, pumpa
|
||||
_pond = (("" == typeOf _x && (_w2m select 2 < 0.05)) && {(abs(_w2m select 0) < (_bb select 0)) && (abs(_w2m select 1) < (_bb select 1))});
|
||||
|
||||
if (_well or _pond) exitWith {
|
||||
_nearWaterHole = [true,_pond];
|
||||
};
|
||||
} count (nearestObjects [_x, [], 1]);
|
||||
|
||||
if (_nearWaterHole) exitWith {};
|
||||
if (_nearWaterHole select 0) exitWith {};
|
||||
} forEach (nearestObjects [player, ["waterHoleProxy"], 50]);
|
||||
|
||||
_nearWaterHole
|
||||
Reference in New Issue
Block a user