mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-14 04:02:37 +03:00
915cf72df3
This commit adds the waterbottles from DayZ Mod. The icons were made by @DeVloek. The waterbottles are fully functional with all actions. To boil a plastic waterbottle you need an empty trash can. Dogs could not be watered with other waterbottle than the ItemWaterbottle itself. This is fixed now. Also fix missing reset action from hide body.
52 lines
1.8 KiB
Plaintext
52 lines
1.8 KiB
Plaintext
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
|
|
dayz_actionInProgress = true;
|
|
|
|
private ["_array","_handle","_type","_onLadder","_removed","_itemIn","_countIn","_bottles"];
|
|
|
|
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
|
|
if (_onLadder) exitWith {dayz_actionInProgress = false;localize "str_player_21" call dayz_rollingMessages;};
|
|
|
|
_array = _this select 3;
|
|
_handle = _array select 0;
|
|
_type = _array select 1;
|
|
|
|
player playActionNow "PutDown";
|
|
|
|
switch (_type) do {
|
|
case 0: {
|
|
// expanded to allow all meats as input
|
|
_removed = 0;
|
|
_itemIn = "FoodRaw";
|
|
_countIn = 1;
|
|
{
|
|
if( (_removed < _countIn) && ((_x == _itemIn) || configName(inheritsFrom(configFile >> "cfgMagazines" >> _x)) == _itemIn)) then {
|
|
_removed = _removed + ([player,_x] call BIS_fnc_invRemove);
|
|
};
|
|
} count magazines player;
|
|
if(_removed == _countIn) then {
|
|
_handle setFSMVariable ["_hunger",0];
|
|
player removeAction s_player_feeddog;
|
|
s_player_feeddog = -1;
|
|
};
|
|
|
|
};
|
|
case 1: {
|
|
_bottles = ["ItemWaterBottle","ItemWaterBottleInfected","ItemWaterBottleSafe","ItemWaterBottleBoiled","ItemPlasticWaterBottle","ItemPlasticWaterBottleInfected","ItemPlasticWaterBottleSafe","ItemPlasticWaterBottleBoiled"];
|
|
{
|
|
if (_x in _bottles) exitwith {
|
|
if (_x in ["ItemWaterBottle","ItemWaterBottleInfected","ItemWaterBottleSafe","ItemWaterBottleBoiled"]) then {
|
|
player addMagazine "ItemWaterbottleUnfilled";
|
|
} else {
|
|
player addMagazine "ItemPlasticWaterbottleUnfilled";
|
|
};
|
|
player removeMagazine _x;
|
|
};
|
|
} count magazines player;
|
|
_handle setFSMVariable ["_thirst",0];
|
|
player removeAction s_player_waterdog;
|
|
s_player_waterdog = -1;
|
|
};
|
|
};
|
|
|
|
dayz_actionInProgress = false;
|