W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1132 from SilvDev/master

Browse Source 
Fix + Features
This commit is contained in:
Florian Kinder
2014-02-16 21:32:11 +01:00
parent 1872e7f278 5d55a4eade
commit d09e0ec7f6
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/actions/cargocheck.sqf
View File

@@ -30,4 +30,4 @@ _weaponsCount = (_weaponsCount_raw select 1) call vehicle_gear_count;
// Count and show weapons available space // Count and show weapons available space
_backpackCount = (_backpackCount_raw select 1) call vehicle_gear_count; _backpackCount = (_backpackCount_raw select 1) call vehicle_gear_count;
TitleText [format[(localize "str_epoch_player_1"),_magazineCount,_maxMagazines,_weaponsCount,_maxWeapons,_backpackCount,_maxBackpacks], "PLAIN DOWN"]; cutText [format[(localize "str_epoch_player_1"),_magazineCount,_maxMagazines,_weaponsCount,_maxWeapons,_backpackCount,_maxBackpacks], "PLAIN DOWN"];

9
SQF/dayz_code/actions/player_drink.sqf
View File

@@ -48,10 +48,15 @@ if (["ItemSoda",_itemorignal] call fnc_inString) then {
[player,_dis,true,(getPosATL player)] spawn player_alertZombies; [player,_dis,true,(getPosATL player)] spawn player_alertZombies;
}; };
if (_hasoutput and !_invehicle) then { if (_hasoutput) then {
// Selecting output // Selecting output
_itemtodrop = drink_output select (drink_with_output find _itemorignal); _itemtodrop = drink_output select (drink_with_output find _itemorignal);
if (_invehicle) exitWith {
sleep 2;
(vehicle player) addMagazineCargoGlobal [_itemtodrop,1];
};
sleep 3; sleep 3;
_nearByPile= nearestObjects [(getPosATL player), ["WeaponHolder","WeaponHolderBase"],2]; _nearByPile= nearestObjects [(getPosATL player), ["WeaponHolder","WeaponHolderBase"],2];
if (count _nearByPile ==0) then { if (count _nearByPile ==0) then {
@@ -84,4 +89,4 @@ dayz_thirst = 0;
_display = uiNamespace getVariable 'DAYZ_GUI_display'; _display = uiNamespace getVariable 'DAYZ_GUI_display';
(_display displayCtrl 1302) ctrlShow true; (_display displayCtrl 1302) ctrlShow true;
cutText [format[(localize "str_player_consumed"),_text], "PLAIN DOWN"]; cutText [format[(localize "str_player_consumed"),_text], "PLAIN DOWN"];

9
SQF/dayz_code/actions/player_eat.sqf
View File

@@ -48,10 +48,15 @@ if (dayz_lastMeal < 3600) then {
}; };
}; };
if (_hasoutput and !_invehicle) then { if (_hasoutput) then {
// Selecting output // Selecting output
_itemtodrop = food_output select (food_with_output find _itemorignal); _itemtodrop = food_output select (food_with_output find _itemorignal);
if (_invehicle) exitWith {
sleep 2;
(vehicle player) addMagazineCargoGlobal [_itemtodrop,1];
};
sleep 3; sleep 3;
_nearByPile= nearestObjects [(getposATL player), ["WeaponHolder","WeaponHolderBase"],2]; _nearByPile= nearestObjects [(getposATL player), ["WeaponHolder","WeaponHolderBase"],2];
if (count _nearByPile ==0) then { if (count _nearByPile ==0) then {
@@ -98,4 +103,4 @@ _display = uiNamespace getVariable 'DAYZ_GUI_display';
if (r_player_blood / r_player_bloodTotal >= 0.2) then { if (r_player_blood / r_player_bloodTotal >= 0.2) then {
(_display displayCtrl 1300) ctrlShow true; (_display displayCtrl 1300) ctrlShow true;
}; };
cutText [format[(localize "str_player_consumed"),_text], "PLAIN DOWN"]; cutText [format[(localize "str_player_consumed"),_text], "PLAIN DOWN"];