W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-12 03:02:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use waterHoleProxy in drink water and fill water #1835

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

19
SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_pumpa.hpp
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;";
};
};
};

39
SQF/dayz_code/Configs/CfgVehicles/Buildings/WaterSources.hpp Normal file
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;";
};
};
};

3
SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp
View File

@@ -457,6 +457,7 @@ class CfgVehicles {
class SpawnableWreck : House {};
class Strategic;
class NonStrategic;
class Thing;
// class Land_Fire;
class BuiltItems;
class Building;
@@ -578,7 +579,7 @@ class CfgVehicles {
#include "Buildings\Land_telek1.hpp"
#include "Buildings\Land_VASICore.hpp"
#include "Buildings\Land_Vysilac_FM.hpp"
#include "Buildings\Land_pumpa.hpp"
#include "Buildings\WaterSources.hpp"
//Duplicates of Epoch items in DZE\Prop_Defs.hpp
//#include "CamoNetting.hpp"