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

Fixed #1132 mistake

Browse Source 
Thanks Skaronator
This commit is contained in:
Florian Kinder
2014-02-17 00:15:14 +01:00
parent c3cdd80c4d
commit 72dee3c644
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGE LOG 1.0.5.txt
View File

@@ -5,6 +5,7 @@
[CHANGED] PBOPREFIX to $PBOPREFIX$ @Fank [CHANGED] PBOPREFIX to $PBOPREFIX$ @Fank
[CHANGED] Consum Eat/Drink in vehicle will add empty food/drink cans into vehicle inventory. @SilvDev [CHANGED] Consum Eat/Drink in vehicle will add empty food/drink cans into vehicle inventory. @SilvDev
[CHANGED] Lootsystem based on DayZ 1.8
[INFO] Models/textures by Paul Tomany. @Sequisha. [INFO] Models/textures by Paul Tomany. @Sequisha.
[INFO] Special thanks to http://verthosting.com for hosting our development server. [INFO] Special thanks to http://verthosting.com for hosting our development server.

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

@@ -46,20 +46,15 @@ if (["ItemSoda",_itemorignal] call fnc_inString) then {
_dis=10; _dis=10;
[player,_sfx,0,false,_dis] call dayz_zombieSpeak; [player,_sfx,0,false,_dis] call dayz_zombieSpeak;
[player,_dis,true,(getPosATL player)] spawn player_alertZombies; [player,_dis,true,(getPosATL player)] spawn player_alertZombies;
}; };
if (_hasoutput) then { if (_hasoutput && !_invehicle) 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 {
_iPos = getPosATL player; _iPos = getPosATL player;
_radius = 0.0; _radius = 0.0;
_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"]; _item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
@@ -70,11 +65,12 @@ if (_hasoutput) then {
_item addMagazineCargoGlobal [_itemtodrop,1]; _item addMagazineCargoGlobal [_itemtodrop,1];
}; };
if (_invehicle) then {
sleep 2;
(vehicle player) addMagazineCargoGlobal [_itemtodrop,1];
};
//add infection chance for "ItemWaterbottle",
//add infection chance for "ItemWaterbottle",
if ((random 15 < 1) and (_itemorignal == "ItemWaterbottle")) then { if ((random 15 < 1) and (_itemorignal == "ItemWaterbottle")) then {
r_player_infected = true; r_player_infected = true;
player setVariable["USEC_infected",true,true]; player setVariable["USEC_infected",true,true];

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

@@ -42,24 +42,19 @@ _sfx = "eat";
[player,_sfx,0,false,_dis] call dayz_zombieSpeak; [player,_sfx,0,false,_dis] call dayz_zombieSpeak;
[player,_dis,true,(getPosATL player)] spawn player_alertZombies; [player,_dis,true,(getPosATL player)] spawn player_alertZombies;
if (dayz_lastMeal < 3600) then { if (dayz_lastMeal < 3600) then {
if (_itemorignal == "FoodSteakCooked") then { if (_itemorignal == "FoodSteakCooked") then {
//_regen = _regen * (10 - (10 max ((time - _Cookedtime) / 3600))); //_regen = _regen * (10 - (10 max ((time - _Cookedtime) / 3600)));
}; };
}; };
if (_hasoutput) then { if (_hasoutput && !_invehicle) 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 {
_iPos = getPosATL player; _iPos = getPosATL player;
_radius = 0.0; _radius = 0.0;
_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"]; _item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
@@ -70,6 +65,11 @@ if (_hasoutput) then {
_item addMagazineCargoGlobal [_itemtodrop,1]; _item addMagazineCargoGlobal [_itemtodrop,1];
}; };
if (_invehicle) then {
sleep 2;
(vehicle player) addMagazineCargoGlobal [_itemtodrop,1];
};
if (_rawfood and !_rawexceptions and (random 15 < 1)) then { if (_rawfood and !_rawexceptions and (random 15 < 1)) then {
r_player_infected = true; r_player_infected = true;
player setVariable["USEC_infected",true,true]; player setVariable["USEC_infected",true,true];