mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2026-02-14 04:02:56 +03:00
Cleanup duplicate and unused strings
Cargo count is shown at the top of the gear menu now
This commit is contained in:
@@ -39,7 +39,7 @@ _hasItems = true;
|
||||
_missingQty = (_countIn - _qty);
|
||||
_hasItems = false;
|
||||
_textMissing = getText(configFile >> "CfgMagazines" >> _missing >> "displayName");
|
||||
cutText [format[(localize "STR_EPOCH_ACTIONS_12"), _missingQty, _textMissing], "PLAIN DOWN"];
|
||||
cutText [format[(localize "STR_EPOCH_ACTIONS_6"), _missingQty, _textMissing], "PLAIN DOWN"];
|
||||
};
|
||||
} forEach _items;
|
||||
_hasItems
|
||||
|
||||
@@ -20,7 +20,7 @@ _hasTools = true;
|
||||
if (!(_x in _items)) exitWith {
|
||||
_hasTools = false;
|
||||
_missing = getText (configFile >> "cfgWeapons" >> _x >> "displayName");
|
||||
cutText [format[(localize "STR_EPOCH_ACTIONS_13"), _missing] , "PLAIN DOWN"];
|
||||
cutText [format[(localize "STR_EPOCH_PLAYER_137"), _missing] , "PLAIN DOWN"];
|
||||
};
|
||||
} count _tools;
|
||||
_hasTools
|
||||
|
||||
@@ -50,5 +50,5 @@ _tobe_removed_total = 0;
|
||||
if (_tobe_removed_total == _removed_total) exitWith { true };
|
||||
// missing parts
|
||||
{ player addMagazine _x; } count _temp_removed_array;
|
||||
cutText [format[(localize "STR_EPOCH_ACTIONS_5"), _removed_total, _tobe_removed_total], "PLAIN DOWN"];
|
||||
cutText [format[(localize "STR_EPOCH_PLAYER_145"), _removed_total, _tobe_removed_total], "PLAIN DOWN"];
|
||||
false
|
||||
|
||||
@@ -706,22 +706,11 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
|
||||
{player removeAction _x} count s_player_lockunlock;s_player_lockunlock = [];
|
||||
s_player_lockUnlock_crtl = -1;
|
||||
};
|
||||
|
||||
if (DZE_AllowCargoCheck) then {
|
||||
if ((_isVehicle || _istypeTent || (_typeOfCursorTarget in DZE_isNewStorage)) && _isAlive && !_isMan && !locked _cursorTarget) then {
|
||||
if (s_player_checkGear < 0) then {
|
||||
s_player_checkGear = player addAction [localize "STR_EPOCH_PLAYER_CARGO", "\z\addons\dayz_code\actions\cargocheck.sqf",_cursorTarget, 1, true, true];
|
||||
};
|
||||
} else {
|
||||
player removeAction s_player_checkGear;
|
||||
s_player_checkGear = -1;
|
||||
};
|
||||
};
|
||||
|
||||
// gear access on surrendered player
|
||||
if (_isMan && {_isAlive} && {!_isZombie} && {!_isAnimal} && {_cursorTarget getVariable ["DZE_Surrendered",false]}) then {
|
||||
if (s_player_SurrenderedGear < 0) then {
|
||||
s_player_SurrenderedGear = player addAction [localize "STR_EPOCH_ACTIONS_GEAR", "\z\addons\dayz_code\actions\surrender_gear.sqf",_cursorTarget, 1, true, true];
|
||||
s_player_SurrenderedGear = player addAction [localize "STR_UI_GEAR", "\z\addons\dayz_code\actions\surrender_gear.sqf",_cursorTarget, 1, true, true];
|
||||
};
|
||||
} else {
|
||||
player removeAction s_player_SurrenderedGear;
|
||||
@@ -1069,8 +1058,6 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
|
||||
s_player_parts_crtl = -1;
|
||||
{player removeAction _x} count s_player_lockunlock;s_player_lockunlock = [];
|
||||
s_player_lockUnlock_crtl = -1;
|
||||
player removeAction s_player_checkGear;
|
||||
s_player_checkGear = -1;
|
||||
player removeAction s_player_SurrenderedGear;
|
||||
s_player_SurrenderedGear = -1;
|
||||
player removeAction s_player_maintain_area;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
[_obj] call player_packTent;
|
||||
*/
|
||||
if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_13","PLAIN DOWN"];};
|
||||
if (DZE_ActionInProgress) exitWith {cutText [localize "str_player_beingpacked","PLAIN DOWN"];};
|
||||
DZE_ActionInProgress = true;
|
||||
_obj = _this;
|
||||
_ownerID = _obj getVariable["CharacterID","0"];
|
||||
|
||||
@@ -140,7 +140,7 @@ if (_IsNearVehicle >= 1) then {
|
||||
}
|
||||
else {
|
||||
_textMissing = getText(configFile >> "CfgMagazines" >> _missing >> "displayName");
|
||||
cutText [format[(localize "str_epoch_player_146"),_missingQty, _textMissing], "PLAIN DOWN"];
|
||||
cutText [format[(localize "STR_EPOCH_ACTIONS_6"),_missingQty, _textMissing], "PLAIN DOWN"];
|
||||
};
|
||||
}
|
||||
else {
|
||||
|
||||
Reference in New Issue
Block a user