mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-13 19:52:38 +03:00
More #1288
This commit is contained in:
@@ -74,7 +74,7 @@ _cookedmeat = meatcooked;
|
|||||||
cutText [format[(localize "str_epoch_player_130"),_textraw], "PLAIN DOWN"];
|
cutText [format[(localize "str_epoch_player_130"),_textraw], "PLAIN DOWN"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
} count _rawmeat;
|
} forEach _rawmeat;
|
||||||
|
|
||||||
s_player_cook = -1;
|
s_player_cook = -1;
|
||||||
DZE_ActionInProgress = false;
|
DZE_ActionInProgress = false;
|
||||||
@@ -91,8 +91,8 @@ switch _option do {
|
|||||||
_temp_removed_array set [count _temp_removed_array,_x];
|
_temp_removed_array set [count _temp_removed_array,_x];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
} count magazines player;
|
} forEach magazines player;
|
||||||
} count _requirements;
|
} forEach _requirements;
|
||||||
|
|
||||||
// all required items removed from player gear
|
// all required items removed from player gear
|
||||||
if (_tobe_removed_total == _removed_total) then {
|
if (_tobe_removed_total == _removed_total) then {
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ _needNear = getArray (configFile >> "CfgMagazines" >> _item >> "ItemActions" >>
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
} count _needNear;
|
} forEach _needNear;
|
||||||
|
|
||||||
|
|
||||||
if(_abort) exitWith {
|
if(_abort) exitWith {
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ _proceed = true;
|
|||||||
_countIn = _x select 1;
|
_countIn = _x select 1;
|
||||||
_qty = { (_x == _itemIn) || (configName(inheritsFrom(configFile >> "cfgMagazines" >> _x)) == _itemIn) } count magazines player;
|
_qty = { (_x == _itemIn) || (configName(inheritsFrom(configFile >> "cfgMagazines" >> _x)) == _itemIn) } count magazines player;
|
||||||
if(_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
|
if(_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
|
||||||
} count _requirements;
|
} forEach _requirements;
|
||||||
|
|
||||||
if (_proceed) then {
|
if (_proceed) then {
|
||||||
[1,1] call dayz_HungerThirst;
|
[1,1] call dayz_HungerThirst;
|
||||||
@@ -73,9 +73,9 @@ if (_proceed) then {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
} count magazines player;
|
} forEach magazines player;
|
||||||
|
|
||||||
} count _requirements;
|
} forEach _requirements;
|
||||||
|
|
||||||
// all parts removed proceed
|
// all parts removed proceed
|
||||||
if (_tobe_removed_total == _removed_total) then {
|
if (_tobe_removed_total == _removed_total) then {
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ if (_canDo) then {
|
|||||||
|
|
||||||
if(_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
|
if(_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
|
||||||
|
|
||||||
} count _selectedRecipeInput;
|
} forEach _selectedRecipeInput;
|
||||||
};
|
};
|
||||||
|
|
||||||
// If all parts proceed
|
// If all parts proceed
|
||||||
@@ -194,9 +194,9 @@ if (_canDo) then {
|
|||||||
_temp_removed_array set [count _temp_removed_array,_x];
|
_temp_removed_array set [count _temp_removed_array,_x];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
} count magazines player;
|
} forEach magazines player;
|
||||||
|
|
||||||
} count _selectedRecipeInput;
|
} forEach _selectedRecipeInput;
|
||||||
|
|
||||||
//diag_log format["removed: %1 of: %2", _removed, _tobe_removed_total];
|
//diag_log format["removed: %1 of: %2", _removed, _tobe_removed_total];
|
||||||
|
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ if ((count _upgrade) > 0) then {
|
|||||||
_countIn = _x select 1;
|
_countIn = _x select 1;
|
||||||
_qty = { (_x == _itemIn) || (configName(inheritsFrom(configFile >> "cfgMagazines" >> _x)) == _itemIn) } count magazines player;
|
_qty = { (_x == _itemIn) || (configName(inheritsFrom(configFile >> "cfgMagazines" >> _x)) == _itemIn) } count magazines player;
|
||||||
if(_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
|
if(_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
|
||||||
} count _requirements;
|
} forEach _requirements;
|
||||||
|
|
||||||
if (_proceed) then {
|
if (_proceed) then {
|
||||||
[1,1] call dayz_HungerThirst;
|
[1,1] call dayz_HungerThirst;
|
||||||
@@ -123,9 +123,9 @@ if ((count _upgrade) > 0) then {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
} count magazines player;
|
} forEach magazines player;
|
||||||
|
|
||||||
} count _requirements;
|
} forEach _requirements;
|
||||||
|
|
||||||
// all parts removed proceed
|
// all parts removed proceed
|
||||||
if (_tobe_removed_total == _removed_total) then {
|
if (_tobe_removed_total == _removed_total) then {
|
||||||
|
|||||||
@@ -43,9 +43,9 @@ _tobe_removed_total = 0;
|
|||||||
_temp_removed_array set [count _temp_removed_array, _x];
|
_temp_removed_array set [count _temp_removed_array, _x];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
} count _inventory;
|
} forEach _inventory;
|
||||||
};
|
};
|
||||||
} count _items;
|
} forEach _items;
|
||||||
// all parts removed
|
// all parts removed
|
||||||
if (_tobe_removed_total == _removed_total) exitWith { true };
|
if (_tobe_removed_total == _removed_total) exitWith { true };
|
||||||
// missing parts
|
// missing parts
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ while {(alive _projectile) && !(isNull _projectile) && _callCount < 85;} do {
|
|||||||
_x setVariable["startcombattimer", 1];
|
_x setVariable["startcombattimer", 1];
|
||||||
diag_log("Now in Combat (Crew): " + name _x);
|
diag_log("Now in Combat (Crew): " + name _x);
|
||||||
};
|
};
|
||||||
} count (crew _nearVehicle);
|
} forEach (crew _nearVehicle);
|
||||||
};
|
};
|
||||||
|
|
||||||
} count _listNear;
|
} forEach _listNear;
|
||||||
|
|||||||
@@ -50,13 +50,13 @@ if (_IsNearVehicle >= 1) then {
|
|||||||
_countIn = _x select 1;
|
_countIn = _x select 1;
|
||||||
_qty = { (_x == _itemIn) || (configName(inheritsFrom(configFile >> "cfgMagazines" >> _x)) == _itemIn) } count magazines player;
|
_qty = { (_x == _itemIn) || (configName(inheritsFrom(configFile >> "cfgMagazines" >> _x)) == _itemIn) } count magazines player;
|
||||||
if(_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
|
if(_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
|
||||||
} count _requirementsMagazine;
|
} forEach _requirementsMagazine;
|
||||||
{
|
{
|
||||||
_itemIn = _x select 0;
|
_itemIn = _x select 0;
|
||||||
_countIn = _x select 1;
|
_countIn = _x select 1;
|
||||||
_qty = { (_x == _itemIn) || (configName(inheritsFrom(configFile >> "cfgWeapons" >> _x)) == _itemIn) } count weapons player;
|
_qty = { (_x == _itemIn) || (configName(inheritsFrom(configFile >> "cfgWeapons" >> _x)) == _itemIn) } count weapons player;
|
||||||
if(_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
|
if(_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
|
||||||
} count _requirementsWeapon;
|
} forEach _requirementsWeapon;
|
||||||
|
|
||||||
if (_proceed) then {
|
if (_proceed) then {
|
||||||
|
|
||||||
@@ -84,8 +84,8 @@ if (_IsNearVehicle >= 1) then {
|
|||||||
_temp_removed_array_mag set [count _temp_removed_array_mag,_x];
|
_temp_removed_array_mag set [count _temp_removed_array_mag,_x];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
} count magazines player;
|
} forEach magazines player;
|
||||||
} count _requirementsMagazine;
|
} forEach _requirementsMagazine;
|
||||||
|
|
||||||
{
|
{
|
||||||
_removed = 0;
|
_removed = 0;
|
||||||
@@ -103,8 +103,8 @@ if (_IsNearVehicle >= 1) then {
|
|||||||
_temp_removed_array_wep set [count _temp_removed_array_wep,_x];
|
_temp_removed_array_wep set [count _temp_removed_array_wep,_x];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
} count weapons player;
|
} forEach weapons player;
|
||||||
} count _requirementsWeapon;
|
} forEach _requirementsWeapon;
|
||||||
|
|
||||||
// all parts removed proceed
|
// all parts removed proceed
|
||||||
if (_tobe_removed_total == _removed_total) then {
|
if (_tobe_removed_total == _removed_total) then {
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ _newObjects = [];
|
|||||||
};
|
};
|
||||||
_newObjects set [count _newObjects,_type];
|
_newObjects set [count _newObjects,_type];
|
||||||
};
|
};
|
||||||
} count _currentObjects;
|
} forEach _currentObjects;
|
||||||
|
|
||||||
//Compare current loadout with old loadout
|
//Compare current loadout with old loadout
|
||||||
_newObjects = [];
|
_newObjects = [];
|
||||||
@@ -31,6 +31,6 @@ _newObjects = [];
|
|||||||
};
|
};
|
||||||
_newObjects set [count _newObjects,_type];
|
_newObjects set [count _newObjects,_type];
|
||||||
};
|
};
|
||||||
} count _checkObjects;
|
} forEach _checkObjects;
|
||||||
|
|
||||||
_change;
|
_change;
|
||||||
Reference in New Issue
Block a user