Merge pull request #1567 from acemod/rangecardMenu

Reordered the rangecard menu entries:
This commit is contained in:
ulteq 2015-06-10 22:57:16 +02:00
commit eb7a38e137
3 changed files with 20 additions and 11 deletions

View File

@ -22,15 +22,24 @@ class CfgVehicles {
priority = 0.1;
icon = QUOTE(PATHTOF(UI\RangeCard_Icon.paa));
exceptions[] = {"notOnMap"};
};
class GVAR(openCopy) {
displayName = CSTRING(OpenRangeCardCopy);
condition = QUOTE(call FUNC(canShowCopy) && !GVAR(RangeCardOpened));
statement = QUOTE(true call FUNC(openRangeCard));
showDisabled = 0;
priority = 0.1;
icon = QUOTE(PATHTOF(UI\RangeCard_Icon.paa));
exceptions[] = {"notOnMap"};
class GVAR(openCopy) {
displayName = CSTRING(OpenRangeCardCopy);
condition = QUOTE(call FUNC(canShowCopy) && !GVAR(RangeCardOpened));
statement = QUOTE(true call FUNC(openRangeCard));
showDisabled = 0;
priority = 0.1;
icon = QUOTE(PATHTOF(UI\RangeCard_Icon.paa));
exceptions[] = {"notOnMap"};
};
class GVAR(makeCopy) {
displayName = CSTRING(CopyRangeCard);
condition = QUOTE(call FUNC(canShow) && !GVAR(RangeCardOpened));
statement = QUOTE(GVAR(ammoClassCopy) = GVAR(ammoClass); GVAR(magazineClassCopy) = GVAR(magazineClass); GVAR(weaponClassCopy) = GVAR(ammoClass););
showDisabled = 0;
priority = 0.1;
icon = QUOTE(PATHTOF(UI\RangeCard_Icon.paa));
exceptions[] = {"notOnMap"};
};
};
};
};

View File

@ -15,4 +15,4 @@
*/
#include "script_component.hpp"
(GVAR(ammoClass) != "" && GVAR(magazineClass) != "" && GVAR(weaponClass) != "" && !GVAR(RangeCardOpened) && !(underwater ACE_player) && ("ACE_RangeCard" in (uniformItems ACE_player)) || ("ACE_RangeCard" in (vestItems ACE_player)))
(GVAR(ammoClass) != "" && GVAR(magazineClass) != "" && GVAR(weaponClass) != "" && !GVAR(RangeCardOpened) && ("ACE_RangeCard" in (uniformItems ACE_player)) || ("ACE_RangeCard" in (vestItems ACE_player)))

View File

@ -15,4 +15,4 @@
*/
#include "script_component.hpp"
(GVAR(ammoClassCopy) != "" && GVAR(magazineClassCopy) != "" && GVAR(weaponClassCopy) != "" && !GVAR(RangeCardOpened) && !(underwater ACE_player) && ("ACE_RangeCard" in (uniformItems ACE_player)) || ("ACE_RangeCard" in (vestItems ACE_player)))
(GVAR(ammoClassCopy) != "" && GVAR(magazineClassCopy) != "" && GVAR(weaponClassCopy) != "" && !GVAR(RangeCardOpened) && ("ACE_RangeCard" in (uniformItems ACE_player)) || ("ACE_RangeCard" in (vestItems ACE_player)))