mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2026-02-11 10:42:58 +03:00
more fixes
+ [ADDED] Raw tuna now does not have infection chance when eaten. + [ADDED] Empty 55 gallon barrel icon added + [FIXED] 1oz Silver Bar icon was incorrect, now have correct one.
This commit is contained in:
@@ -67,7 +67,6 @@ if (_finished) then {
|
||||
|
||||
_vehicle setVariable ["GeneratorSound", _soundSource,true];
|
||||
|
||||
// TODO: Add running sounds to generator
|
||||
cutText ["Generator has been started.", "PLAIN DOWN"];
|
||||
};
|
||||
} else {
|
||||
|
||||
@@ -22,7 +22,7 @@ if(_isNear == 0) exitWith {TradeInprogress = false; cutText ["Key crafting needs
|
||||
call gear_ui_init;
|
||||
|
||||
// require one tin bar per key
|
||||
_hasTinBar = "ItemTinBar" in _magazinesPlayer;
|
||||
_hasTinBar = "ItemTinBar" in magazines player;
|
||||
if(!_hasTinBar) exitWith {TradeInprogress = false; cutText ["Key crafting requires a 1oz Tin Bar." , "PLAIN DOWN"]};
|
||||
|
||||
player playActionNow "Medic";
|
||||
@@ -53,16 +53,24 @@ while {r_doLoop} do {
|
||||
};
|
||||
r_doLoop = false;
|
||||
|
||||
_num_removed = ([player,"ItemTinBar"] call BIS_fnc_invRemove);
|
||||
if(_finished) then {
|
||||
|
||||
if(_finished and _num_removed == 1) then {
|
||||
// output key to backpack if space
|
||||
_create = _item;
|
||||
_qty = 1;
|
||||
_box = unitBackpack player;
|
||||
_box addWeaponCargoGlobal [_create,_qty];
|
||||
cutText ["Copied key has been added to your backpack." , "PLAIN DOWN"];
|
||||
_num_removed = ([player,"ItemTinBar"] call BIS_fnc_invRemove);
|
||||
|
||||
if(_num_removed == 1) then {
|
||||
// output key to backpack if space
|
||||
_create = _item;
|
||||
_qty = 1;
|
||||
_box = unitBackpack player;
|
||||
_box addWeaponCargoGlobal [_create,_qty];
|
||||
cutText ["Copied key has been added to your backpack." , "PLAIN DOWN"];
|
||||
} else {
|
||||
cutText ["Canceled Key Crafting." , "PLAIN DOWN"];
|
||||
};
|
||||
} else {
|
||||
r_interrupt = false;
|
||||
[objNull, player, rSwitchMove,""] call RE;
|
||||
player playActionNow "stop";
|
||||
cutText ["Canceled Key Crafting." , "PLAIN DOWN"];
|
||||
};
|
||||
TradeInprogress = false;
|
||||
|
||||
@@ -13,6 +13,7 @@ _itemorignal = _this;
|
||||
_hasfooditem = _itemorignal in magazines player;
|
||||
|
||||
_rawfood = _itemorignal in meatraw;
|
||||
_rawexceptions = _itemorignal in exceptionsraw;
|
||||
_cookedfood = _itemorignal in meatcooked;
|
||||
_hasoutput = _itemorignal in food_with_output;
|
||||
|
||||
@@ -53,12 +54,12 @@ if (_hasoutput) then{
|
||||
_item addMagazineCargoGlobal [_itemtodrop,1];
|
||||
};
|
||||
|
||||
if ( _rawfood and (random 15 < 1)) then {
|
||||
if (_rawfood and !_rawexceptions and (random 15 < 1)) then {
|
||||
r_player_infected = true;
|
||||
player setVariable["USEC_infected",true,true];
|
||||
};
|
||||
|
||||
if ( _badfood and (random 2 < 1)) then {
|
||||
if (_badfood and (random 2 < 1)) then {
|
||||
r_player_infected = true;
|
||||
player setVariable["USEC_infected",true,true];
|
||||
};
|
||||
|
||||
@@ -56,7 +56,6 @@ if (_finished) then {
|
||||
// Stop generator
|
||||
_vehicle setVariable ["GeneratorRunning", false,true];
|
||||
|
||||
// TODO: Add running sounds to generator
|
||||
cutText ["Generator has been stopped.", "PLAIN DOWN"];
|
||||
|
||||
};
|
||||
|
||||
@@ -30,6 +30,7 @@ meatraw = [
|
||||
"ItemSeaBass",
|
||||
"ItemTuna"
|
||||
];
|
||||
exceptionsraw = ["ItemTuna"];
|
||||
meatcooked = [
|
||||
"FoodSteakCooked",
|
||||
"FoodmeatCooked",
|
||||
|
||||
Reference in New Issue
Block a user