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:
ebaydayz
2017-01-01 16:55:00 -05:00
parent 30f1827509
commit e4aeee37fd
10 changed files with 102 additions and 146 deletions

View File

@@ -1,19 +0,0 @@
class Land_pumpa: House
{
class UserActions
{
class Drink
{
displayName = $STR_ACTIONS_DRINK2;
displayNameDefault = $STR_ACTIONS_DRINK2;
priority = 3;
radius = 3;
position = "";
showWindow = 1;
onlyForPlayer = 1;
shortcut = "";
condition = "(['Drink',this] call userActionConditions)";
statement = "'hands' spawn player_drinkWater;";
};
};
};

View File

@@ -0,0 +1,39 @@
class Land_pumpa: House
{
class UserActions
{
class Drink
{
displayName = $STR_ACTIONS_DRINK2;
displayNameDefault = $STR_ACTIONS_DRINK2;
priority = 3;
radius = 3;
position = "";
showWindow = 1;
onlyForPlayer = 1;
shortcut = "";
condition = "(['Drink',this] call userActionConditions)";
statement = "'Land_pumpa' spawn player_drinkWater;";
};
};
};
class Land_Barrel_water: Thing
{
class UserActions
{
class Drink
{
displayName = $STR_ACTIONS_DRINK2;
displayNameDefault = $STR_ACTIONS_DRINK2;
priority = 3;
radius = 3;
position = "";
showWindow = 1;
onlyForPlayer = 1;
shortcut = "";
condition = "(['Drink',this] call userActionConditions)";
statement = "'Land_Barrel_water' spawn player_drinkWater;";
};
};
};