Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove requirements for usable items to be in backpack (#7545)

Browse Source
This commit is contained in:
jonpas 2020-02-23 02:11:20 +01:00 committed by GitHub
parent f7a880e81b
commit 3145a31d00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/atragmx/functions/fnc_can_show.sqf
View File

@ -15,4 +15,5 @@
* Public: No * Public: No
*/ */
(("ACE_ATragMX" in (uniformItems ACE_player)) || ("ACE_ATragMX" in (vestItems ACE_player))) && !(underwater ACE_player); !underwater ACE_player &&
{"ACE_ATragMX" in ([ACE_player] call EFUNC(common,uniqueItems))}

4
addons/atragmx/functions/fnc_create_dialog.sqf
View File

@ -28,9 +28,7 @@ if (!GVAR(initialised)) then {
TRACE_1("",GVAR(initialised)); TRACE_1("",GVAR(initialised));
}; };
if (GVAR(active)) exitWith { false }; if (GVAR(active) || {!(call FUNC(can_show))}) exitWith {false};
if (underwater ACE_player) exitWith { false };
if (!("ACE_ATragMX" in (uniformItems ACE_player)) && !("ACE_ATragMX" in (vestItems ACE_player))) exitWith { false };
createDialog 'ATragMX_Display'; createDialog 'ATragMX_Display';

2
addons/kestrel4500/functions/fnc_canShow.sqf
View File

@ -15,4 +15,4 @@
* Public: No * Public: No
*/ */
("ACE_Kestrel4500" in (uniformItems ACE_player)) || ("ACE_Kestrel4500" in (vestItems ACE_player)) "ACE_Kestrel4500" in ([ACE_player] call EFUNC(common,uniqueItems))

4
addons/kestrel4500/functions/fnc_createKestrelDialog.sqf
View File

@ -15,9 +15,7 @@
* Public: No * Public: No
*/ */
if (GVAR(Kestrel4500)) exitWith { false }; if (GVAR(Kestrel4500) || {underwater ACE_player} || {!(call FUNC(canShow))}) exitWith {false};
if (underwater ACE_player) exitWith { false };
if (!("ACE_Kestrel4500" in (uniformItems ACE_player)) && !("ACE_Kestrel4500" in (vestItems ACE_player))) exitWith { false };
GVAR(Overlay) = false; GVAR(Overlay) = false;
QGVAR(Layer) cutText ["", "PLAIN"]; QGVAR(Layer) cutText ["", "PLAIN"];

5
addons/kestrel4500/functions/fnc_displayKestrel.sqf
View File

@ -41,8 +41,7 @@ if (GVAR(Overlay)) exitWith {
QGVAR(Layer) cutText ["", "PLAIN"]; QGVAR(Layer) cutText ["", "PLAIN"];
true true
}; };
if (underwater ACE_player) exitWith { true }; if (underwater ACE_player || {!(call FUNC(canShow))}) exitWith {true};
if (!("ACE_Kestrel4500" in (uniformItems ACE_player)) && !("ACE_Kestrel4500" in (vestItems ACE_player))) exitWith { true };
if (GVAR(Kestrel4500) && dialog) then { if (GVAR(Kestrel4500) && dialog) then {
GVAR(Kestrel4500) = false; GVAR(Kestrel4500) = false;
@ -53,7 +52,7 @@ GVAR(Overlay) = true;
[{ [{
// abort condition // abort condition
if (!GVAR(Overlay) || {!(("ACE_Kestrel4500" in (uniformItems ACE_player)) || ("ACE_Kestrel4500" in (vestItems ACE_player)))}) exitWith { if (!GVAR(Overlay) || {!(call FUNC(canShow))}) exitWith {
GVAR(Overlay) = false; GVAR(Overlay) = false;
QGVAR(Layer) cutText ["", "PLAIN"]; QGVAR(Layer) cutText ["", "PLAIN"];
[_this select 1] call CBA_fnc_removePerFrameHandler; [_this select 1] call CBA_fnc_removePerFrameHandler;

6
addons/rangecard/functions/fnc_canShow.sqf
View File

@ -15,4 +15,8 @@
* Public: No * Public: No
*/ */
(GVAR(ammoClass) != "" && GVAR(magazineClass) != "" && GVAR(weaponClass) != "" && !GVAR(RangeCardOpened) && ("ACE_RangeCard" in (uniformItems ACE_player)) || ("ACE_RangeCard" in (vestItems ACE_player))) GVAR(ammoClass) != "" &&
GVAR(magazineClass) != "" &&
GVAR(weaponClass) != "" &&
!GVAR(RangeCardOpened) &&
"ACE_RangeCard" in ([ACE_player] call EFUNC(common,uniqueItems))

6
addons/rangecard/functions/fnc_canShowCopy.sqf
View File

@ -15,4 +15,8 @@
* Public: No * Public: No
*/ */
(GVAR(ammoClassCopy) != "" && GVAR(magazineClassCopy) != "" && GVAR(weaponClassCopy) != "" && !GVAR(RangeCardOpened) && ("ACE_RangeCard" in (uniformItems ACE_player)) || ("ACE_RangeCard" in (vestItems ACE_player))) GVAR(ammoClassCopy) != "" &&
GVAR(magazineClassCopy) != "" &&
GVAR(weaponClassCopy) != "" &&
!GVAR(RangeCardOpened) &&
"ACE_RangeCard" in ([ACE_player] call EFUNC(common,uniqueItems))