diff --git a/addons/atragmx/CfgVehicles.hpp b/addons/atragmx/CfgVehicles.hpp index 6e8a136a03..ae37e7bb00 100644 --- a/addons/atragmx/CfgVehicles.hpp +++ b/addons/atragmx/CfgVehicles.hpp @@ -8,7 +8,6 @@ class CfgVehicles { condition = QUOTE(call FUNC(can_show)); statement = QUOTE(call FUNC(create_dialog)); showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\ATRAG_Icon.paa); exceptions[] = {"notOnMap", "isNotInside", "isNotSitting"}; }; diff --git a/addons/attach/CfgVehicles.hpp b/addons/attach/CfgVehicles.hpp index 84ca6ee290..9ae9dae7a2 100644 --- a/addons/attach/CfgVehicles.hpp +++ b/addons/attach/CfgVehicles.hpp @@ -8,7 +8,6 @@ insertChildren = QUOTE(_this call FUNC(getChildrenAttachActions)); \ exceptions[] = {"isNotSwimming"}; \ showDisabled = 0; \ - priority = 0; \ icon = QPATHTOF(UI\attach_ca.paa); \ }; \ class GVAR(DetachVehicle) { \ @@ -17,7 +16,6 @@ statement = QUOTE(_this call FUNC(detach) ); \ exceptions[] = {"isNotSwimming"}; \ showDisabled = 0; \ - priority = 0.1; \ icon = QPATHTOF(UI\detach_ca.paa); \ }; \ }; \ @@ -57,7 +55,6 @@ class CfgVehicles { insertChildren = QUOTE(_this call FUNC(getChildrenAttachActions)); exceptions[] = {"isNotDragging", "isNotSwimming"}; showDisabled = 0; - priority = 5; icon = QPATHTOF(UI\attach_ca.paa); }; class GVAR(Detach) { @@ -66,7 +63,6 @@ class CfgVehicles { statement = QUOTE(_this call FUNC(detach)); exceptions[] = {"isNotDragging", "isNotSwimming"}; showDisabled = 0; - priority = 5; icon = QPATHTOF(UI\detach_ca.paa); }; }; diff --git a/addons/captives/CfgVehicles.hpp b/addons/captives/CfgVehicles.hpp index 8fdb45396e..d000ad6083 100644 --- a/addons/captives/CfgVehicles.hpp +++ b/addons/captives/CfgVehicles.hpp @@ -30,7 +30,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming"}; showDisabled = 0; icon = QPATHTOF(UI\captive_ca.paa); - priority = 2.3; }; class ACE_StopEscorting { displayName = CSTRING(StopEscorting); @@ -40,7 +39,6 @@ class CfgVehicles { exceptions[] = {"isNotEscorting", "isNotSwimming"}; showDisabled = 0; icon = QPATHTOF(UI\captive_ca.paa); - priority = 2.3; }; class ACE_LoadCaptive { displayName = CSTRING(LoadCaptive); @@ -50,7 +48,6 @@ class CfgVehicles { exceptions[] = {"isNotEscorting", "isNotSwimming"}; showDisabled = 0; icon = QPATHTOF(UI\captive_ca.paa); - priority = 2.2; insertChildren = QUOTE(call DFUNC(addLoadCaptiveActions)); }; class GVAR(UnloadCaptive) { @@ -59,7 +56,6 @@ class CfgVehicles { condition = QUOTE([ARR_2(_player, _target)] call FUNC(canUnloadCaptive)); statement = QUOTE([ARR_2(_player, _target)] call FUNC(doUnloadCaptive)); exceptions[] = {"isNotSwimming"}; - priority = 1.2; }; }; }; @@ -71,7 +67,6 @@ class CfgVehicles { statement = QUOTE([ARR_3(_player,objNull, false)] call FUNC(doEscortCaptive)); exceptions[] = {"isNotEscorting", "isNotSwimming"}; showDisabled = 0; - priority = 2.3; }; class ACE_StartSurrenderingSelf { displayName = CSTRING(StartSurrendering); @@ -79,7 +74,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_player, true)] call FUNC(setSurrendered)); exceptions[] = {"isNotSwimming"}; showDisabled = 0; - priority = 0; icon = QPATHTOF(UI\Surrender_ca.paa); }; class ACE_StopSurrenderingSelf { @@ -88,7 +82,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_player, false)] call FUNC(setSurrendered)); exceptions[] = {"isNotSurrendering", "isNotSwimming"}; showDisabled = 0; - priority = 0; icon = QPATHTOF(UI\Surrender_ca.paa); }; }; @@ -103,7 +96,6 @@ class CfgVehicles { condition = QUOTE([ARR_3(_player, objNull, _target)] call FUNC(canLoadCaptive)); \ statement = QUOTE([ARR_3(_player, objNull, _target)] call FUNC(doLoadCaptive)); \ exceptions[] = {"isNotEscorting", "isNotSwimming"}; \ - priority = 1.2; \ }; \ }; \ }; diff --git a/addons/chemlights/CfgVehicles.hpp b/addons/chemlights/CfgVehicles.hpp index 8e5fe8789e..9fd05d84b9 100644 --- a/addons/chemlights/CfgVehicles.hpp +++ b/addons/chemlights/CfgVehicles.hpp @@ -2,7 +2,6 @@ class CBA_Extended_EventHandlers; class CfgVehicles { - class Man; class CAManBase: Man { class ACE_SelfActions { @@ -15,7 +14,6 @@ class CfgVehicles { exceptions[] = {"isNotDragging", "isNotSwimming", "notOnMap", "isNotInside", "isNotSitting"}; insertChildren = QUOTE(_this call DFUNC(compileChemlightMenu)); showDisabled = 0; - priority = 99; }; }; }; diff --git a/addons/concertina_wire/CfgVehicles.hpp b/addons/concertina_wire/CfgVehicles.hpp index d7f5d0d82a..0bc5a31e59 100644 --- a/addons/concertina_wire/CfgVehicles.hpp +++ b/addons/concertina_wire/CfgVehicles.hpp @@ -90,7 +90,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_target,_player)] call FUNC(dismount)); showDisabled = 0; exceptions[] = {}; - priority = 5; icon = QPATHTOF(UI\icon_sandbag_ca.paa); }; }; @@ -137,7 +136,6 @@ class CfgVehicles { statement = QUOTE([ARR_2({_this call FUNC(deploy)}, [ARR_2(_target,_player)])] call CBA_fnc_execNextFrame); showDisabled = 0; exceptions[] = {}; - priority = 5; icon = QPATHTOF(UI\icon_sandbag_ca.paa); }; }; diff --git a/addons/dagr/CfgVehicles.hpp b/addons/dagr/CfgVehicles.hpp index 89bfd8af4e..6b0188a178 100644 --- a/addons/dagr/CfgVehicles.hpp +++ b/addons/dagr/CfgVehicles.hpp @@ -8,7 +8,6 @@ class CfgVehicles { condition = QUOTE([ARR_2(_player,'ACE_DAGR')] call EFUNC(common,hasItem)); statement = QUOTE(call FUNC(menuInit)); showDisabled = 0; - priority = 0.1; icon = QPATHTOF(UI\DAGR_Icon.paa); exceptions[] = {"isNotInside", "isNotSitting"}; class GVAR(toggle) { @@ -16,7 +15,6 @@ class CfgVehicles { condition = QUOTE([ARR_2(_player,'ACE_DAGR')] call EFUNC(common,hasItem)); statement = QUOTE(call FUNC(toggleOverlay)); showDisabled = 0; - priority = 0.2; icon = QPATHTOF(UI\DAGR_Icon.paa); exceptions[] = {"notOnMap", "isNotInside", "isNotSitting"}; }; diff --git a/addons/dogtags/CfgVehicles.hpp b/addons/dogtags/CfgVehicles.hpp index 170f1fb074..af8cfb1442 100644 --- a/addons/dogtags/CfgVehicles.hpp +++ b/addons/dogtags/CfgVehicles.hpp @@ -17,7 +17,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_player,_target)] call FUNC(checkDogtag)); exceptions[] = {"isNotSwimming", "isNotInside"}; showDisabled = 0; - priority = 3; icon = QPATHTOF(data\dogtag_icon_ca.paa); }; class ACE_TakeDogtag { @@ -26,7 +25,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_player,_target)] call FUNC(takeDogtag)); exceptions[] = {"isNotSwimming", "isNotInside"}; showDisabled = 0; - priority = 3; icon = QPATHTOF(data\dogtag_icon_ca.paa); }; }; diff --git a/addons/explosives/CfgVehicles.hpp b/addons/explosives/CfgVehicles.hpp index 8d03856e50..c183720386 100644 --- a/addons/explosives/CfgVehicles.hpp +++ b/addons/explosives/CfgVehicles.hpp @@ -11,10 +11,8 @@ class CfgVehicles { statement = ""; exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"}; showDisabled = 1; - priority = 4; icon = QPATHTOF(UI\Explosives_Menu_ca.paa); insertChildren = QUOTE([_player] call FUNC(addTransmitterActions);); - //Sub-menu items class ACE_Place { displayName = CSTRING(Place); condition = QUOTE((vehicle _player == _player) and {[_player] call FUNC(hasExplosives)}); @@ -23,7 +21,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming"}; showDisabled = 1; icon = QPATHTOF(UI\Place_Explosive_ca.paa); - priority = 1; }; class ACE_Cellphone { displayName = CSTRING(cellphone_displayName); @@ -32,7 +29,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"}; showDisabled = 0; icon = QPATHTOF(Data\UI\Cellphone_UI.paa); - priority = 0.8; }; }; }; @@ -95,7 +91,6 @@ class CfgVehicles { insertChildren = QUOTE([ARR_3(_target getVariable QUOTE(QGVAR(class)),_target,_player)] call FUNC(addTriggerActions);); showDisabled = 0; exceptions[] = {"isNotSwimming"}; - priority = 5; icon = QPATHTOF(UI\Explosives_Menu_ca.paa); }; class ACE_PickUp { @@ -105,7 +100,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_player,_target getVariable QUOTE(QGVAR(class)))] call EFUNC(common,addToInventory);deleteVehicle _target;); showDisabled = 0; exceptions[] = {"isNotSwimming"}; - priority = 5; icon = "\A3\ui_f\data\IGUI\Cfg\Actions\Obsolete\ui_action_takemine_ca.paa"; }; }; diff --git a/addons/fastroping/CfgVehicles.hpp b/addons/fastroping/CfgVehicles.hpp index 94992669d9..e5894be6d0 100644 --- a/addons/fastroping/CfgVehicles.hpp +++ b/addons/fastroping/CfgVehicles.hpp @@ -43,35 +43,30 @@ class CfgVehicles { condition = QUOTE([vehicle _player] call FUNC(canPrepareFRIES)); statement = QUOTE([vehicle _player] call FUNC(prepareFRIES)); showDisabled = 0; - priority = 1; }; class ACE_stowFRIES { displayName = CSTRING(Interaction_stowFRIES); condition = QUOTE([vehicle _player] call FUNC(canStowFRIES)); statement = QUOTE([vehicle _player] call FUNC(stowFRIES)); showDisabled = 0; - priority = 1; }; class ACE_deployRopes { displayName = CSTRING(Interaction_deployRopes); condition = QUOTE([ARR_2(_player, vehicle _player)] call FUNC(canDeployRopes)); statement = QUOTE([ARR_2(QUOTE(QGVAR(deployRopes)), [vehicle _player])] call CBA_fnc_serverEvent); showDisabled = 0; - priority = 1; }; class ACE_cutRopes { displayName = CSTRING(Interaction_cutRopes); condition = [vehicle _player] call FUNC(canCutRopes); statement = [vehicle _player] call FUNC(cutRopes); showDisabled = 0; - priority = 1; }; class ACE_fastRope { displayName = CSTRING(Interaction_fastRope); condition = [_player, vehicle _player] call FUNC(canFastRope); statement = [_player, vehicle _player] call FUNC(fastRope); showDisabled = 0; - priority = 1; }; }; }; diff --git a/addons/fcs/CfgVehicles.hpp b/addons/fcs/CfgVehicles.hpp index e357613a80..8461fcc05a 100644 --- a/addons/fcs/CfgVehicles.hpp +++ b/addons/fcs/CfgVehicles.hpp @@ -29,7 +29,6 @@ class CfgVehicles { condition = QUOTE(_player call FUNC(canResetFCS)); statement = QUOTE([ARR_2(vehicle _player,[_player] call DEFUNC(common,getTurretIndex))] call DFUNC(reset);); showDisabled = 0; - priority = 1; icon = ""; }; }; @@ -42,7 +41,6 @@ class CfgVehicles { condition = QUOTE(_player call FUNC(canResetFCS)); statement = QUOTE([ARR_2(vehicle _player,[_player] call DEFUNC(common,getTurretIndex))] call DFUNC(reset);); showDisabled = 0; - priority = 1; icon = ""; }; }; diff --git a/addons/gestures/CfgVehicles.hpp b/addons/gestures/CfgVehicles.hpp index 1d94e5ecc4..bc9c36d6ef 100644 --- a/addons/gestures/CfgVehicles.hpp +++ b/addons/gestures/CfgVehicles.hpp @@ -8,16 +8,13 @@ class CfgVehicles { statement = ""; exceptions[] = {"isNotSwimming"}; showDisabled = 1; - priority = 3.5; icon = QPATHTOF(UI\gestures_ca.paa); - class GVAR(Advance) { displayName = CSTRING(Advance); condition = QUOTE(true); statement = QUOTE([ARR_2(_target,'gestureAdvance')] call EFUNC(common,doGesture)); //exceptions[] = {"isNotSwimming"}; // Does not work underwaterexceptions[] = {"isNotSwimming"}; showDisabled = 1; - priority = 1.9; }; class GVAR(Go) { displayName = CSTRING(Go); @@ -25,7 +22,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_target,selectRandom [ARR_2('gestureGo','gestureGoB')])] call EFUNC(common,doGesture)); //exceptions[] = {"isNotSwimming"}; // Does not work underwater showDisabled = 1; - priority = 1.8; }; class GVAR(Follow) { displayName = CSTRING(Follow); @@ -33,7 +29,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_target,'gestureFollow')] call EFUNC(common,doGesture)); //exceptions[] = {"isNotSwimming"}; // Does not work underwater showDisabled = 1; - priority = 1.7; }; class GVAR(Up) { displayName = CSTRING(Up); @@ -41,7 +36,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_target,'gestureUp')] call EFUNC(common,doGesture)); //exceptions[] = {"isNotSwimming"}; // Does not work underwater showDisabled = 1; - priority = 1.5; }; class GVAR(CeaseFire) { displayName = CSTRING(CeaseFire); @@ -49,7 +43,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_target,'gestureCeaseFire')] call EFUNC(common,doGesture)); //exceptions[] = {"isNotSwimming"}; // Does not work underwater showDisabled = 1; - priority = 1.3; }; class GVAR(Stop) { displayName = CSTRING(Stop); @@ -57,7 +50,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_target,'gestureFreeze')] call EFUNC(common,doGesture)); // BI animation - is actually "stop" in all stances but prone //exceptions[] = {"isNotSwimming"}; // Does not work underwater showDisabled = 1; - priority = 1.2; }; class GVAR(Forward) { displayName = CSTRING(Forward); @@ -65,7 +57,6 @@ class CfgVehicles { statement = QUOTE(QUOTE(QGVAR(forward)) call FUNC(playSignal)); exceptions[] = {"isNotSwimming"}; showDisabled = 1; - priority = 1.9; }; class GVAR(Regroup) { displayName = CSTRING(Regroup); @@ -73,7 +64,6 @@ class CfgVehicles { statement = QUOTE(QUOTE(QGVAR(regroup)) call FUNC(playSignal)); exceptions[] = {"isNotSwimming"}; showDisabled = 1; - priority = 1.8; }; class GVAR(Freeze) { displayName = CSTRING(Freeze); @@ -81,7 +71,6 @@ class CfgVehicles { statement = QUOTE(QUOTE(QGVAR(freeze)) call FUNC(playSignal)); exceptions[] = {"isNotSwimming"}; showDisabled = 1; - priority = 1.7; }; class GVAR(Cover) { displayName = CSTRING(Cover); @@ -89,7 +78,6 @@ class CfgVehicles { statement = QUOTE(QUOTE(QGVAR(cover)) call FUNC(playSignal)); exceptions[] = {"isNotSwimming"}; showDisabled = 1; - priority = 1.6; }; class GVAR(Point) { displayName = CSTRING(Point); @@ -97,7 +85,6 @@ class CfgVehicles { statement = QUOTE(QUOTE(QGVAR(point)) call FUNC(playSignal)); exceptions[] = {"isNotSwimming"}; showDisabled = 1; - priority = 1.5; }; class GVAR(Engage) { displayName = CSTRING(Engage); @@ -105,7 +92,6 @@ class CfgVehicles { statement = QUOTE(QUOTE(QGVAR(engage)) call FUNC(playSignal)); exceptions[] = {"isNotSwimming"}; showDisabled = 1; - priority = 1.4; }; class GVAR(Hold) { displayName = CSTRING(Hold); @@ -113,7 +99,6 @@ class CfgVehicles { statement = QUOTE(QUOTE(QGVAR(hold)) call FUNC(playSignal)); exceptions[] = {"isNotSwimming"}; showDisabled = 1; - priority = 1.3; }; class GVAR(Warning) { displayName = CSTRING(Warning); @@ -121,7 +106,6 @@ class CfgVehicles { statement = QUOTE(QUOTE(QGVAR(warning)) call FUNC(playSignal)); exceptions[] = {"isNotSwimming"}; showDisabled = 1; - priority = 1.2; }; }; }; diff --git a/addons/gunbag/CfgVehicles.hpp b/addons/gunbag/CfgVehicles.hpp index 1377a8f84d..e23966cfa2 100644 --- a/addons/gunbag/CfgVehicles.hpp +++ b/addons/gunbag/CfgVehicles.hpp @@ -8,7 +8,6 @@ class CfgVehicles { condition = QUOTE(([_target] call FUNC(hasGunbag)) && {[ARR_2(_player,_target)] call FUNC(canInteract) == 0}); statement = QUOTE([ARR_2(_player,_target)] call FUNC(toGunbag)); showDisabled = 0; - priority = 1; icon = QPATHTOF(ui\gunbag_icon_ca.paa); }; class GVAR(weaponOff) { @@ -16,7 +15,6 @@ class CfgVehicles { condition = QUOTE(([_target] call FUNC(hasGunbag)) && {[ARR_2(_player,_target)] call FUNC(canInteract) == 1}); statement = QUOTE([ARR_2(_player,_target)] call FUNC(offGunbag)); showDisabled = 0; - priority = 1; icon = QPATHTOF(ui\gunbag_icon_ca.paa); }; class GVAR(status) { @@ -24,7 +22,6 @@ class CfgVehicles { condition = QUOTE([_target] call FUNC(hasGunbag)); statement = QUOTE([_target] call FUNC(status)); showDisabled = 0; - priority = 2; icon = QPATHTOF(ui\gunbag_icon_ca.paa); }; }; @@ -36,15 +33,12 @@ class CfgVehicles { displayName = CSTRING(Displayname); condition = QUOTE([_player] call FUNC(hasGunbag)); showDisabled = 0; - priority = 0.1; icon = QPATHTOF(ui\gunbag_icon_ca.paa); - class GVAR(weaponTo) { displayName = CSTRING(ToGunbag); condition = QUOTE([ARR_2(_player,_player)] call FUNC(canInteract) == 0); statement = QUOTE([ARR_2(_player,_player)] call FUNC(toGunbag)); showDisabled = 0; - priority = 1; icon = QPATHTOF(ui\gunbag_icon_ca.paa); }; class GVAR(weaponOff) { @@ -52,7 +46,6 @@ class CfgVehicles { condition = QUOTE([ARR_2(_player,_player)] call FUNC(canInteract) == 1); statement = QUOTE([ARR_2(_player,_player)] call FUNC(offGunbag)); showDisabled = 0; - priority = 1; icon = QPATHTOF(ui\gunbag_icon_ca.paa); }; class GVAR(status) { @@ -60,7 +53,6 @@ class CfgVehicles { condition = QUOTE([_player] call FUNC(hasGunbag)); statement = QUOTE([_player] call FUNC(status)); showDisabled = 0; - priority = 2; icon = QPATHTOF(ui\gunbag_icon_ca.paa); }; }; diff --git a/addons/hearing/CfgVehicles.hpp b/addons/hearing/CfgVehicles.hpp index 51e064d16b..48fb79277e 100644 --- a/addons/hearing/CfgVehicles.hpp +++ b/addons/hearing/CfgVehicles.hpp @@ -9,7 +9,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"}; statement = QUOTE( [_player] call FUNC(putInEarPlugs) ); showDisabled = 0; - priority = 2.5; icon = QPATHTOF(UI\ACE_earplugs_x_ca.paa); }; class ACE_RemoveEarplugs { @@ -18,7 +17,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"}; statement = QUOTE( [_player] call FUNC(removeEarPlugs) ); showDisabled = 0; - priority = 2.5; icon = QPATHTOF(UI\ACE_earplugs_x_ca.paa); }; }; diff --git a/addons/huntir/CfgVehicles.hpp b/addons/huntir/CfgVehicles.hpp index 99ca6f69a3..cf6c98904a 100644 --- a/addons/huntir/CfgVehicles.hpp +++ b/addons/huntir/CfgVehicles.hpp @@ -9,7 +9,6 @@ class CfgVehicles { condition = QUOTE([ARR_2(ACE_player,'ACE_HuntIR_monitor')] call EFUNC(common,hasItem)); statement = QUOTE([FUNC(huntir)] call CBA_fnc_execNextFrame;); showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\w_huntir_monitor_ca.paa); exceptions[] = {}; }; diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp index c438eb2104..06cf266b78 100644 --- a/addons/interaction/CfgVehicles.hpp +++ b/addons/interaction/CfgVehicles.hpp @@ -48,7 +48,6 @@ class CfgVehicles { statement = ""; exceptions[] = {"isNotSwimming"}; showDisabled = 0; - priority = 3.3; icon = "\a3\ui_f\data\gui\Rsc\RscDisplayArsenal\cargomag_ca.paa"; class ACE_PassMagazinePrimary { @@ -57,7 +56,6 @@ class CfgVehicles { statement = QUOTE([ARR_3(_player,_target,primaryWeapon _target)] call FUNC(passMagazine)); exceptions[] = {"isNotSwimming"}; showDisabled = 0; - priority = 3; icon = "\a3\ui_f\data\gui\Rsc\RscDisplayArsenal\primaryweapon_ca.paa"; }; class ACE_PassMagazineHandgun { @@ -66,7 +64,6 @@ class CfgVehicles { statement = QUOTE([ARR_3(_player,_target,handgunWeapon _target)] call FUNC(passMagazine)); exceptions[] = {"isNotSwimming"}; showDisabled = 0; - priority = 1; icon = "\a3\ui_f\data\gui\Rsc\RscDisplayArsenal\handgun_ca.paa"; }; }; @@ -77,7 +74,6 @@ class CfgVehicles { statement = ""; exceptions[] = {"isNotSwimming"}; showDisabled = 0; - priority = 3.2; icon = QPATHTOF(UI\team\team_management_ca.paa); class ACE_AssignTeamRed { @@ -87,7 +83,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming"}; showDisabled = 1; icon = QPATHTOF(UI\team\team_red_ca.paa); - priority = 2.4; }; class ACE_AssignTeamGreen { displayName = CSTRING(AssignTeamGreen); @@ -96,7 +91,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming"}; showDisabled = 1; icon = QPATHTOF(UI\team\team_green_ca.paa); - priority = 2.3; }; class ACE_AssignTeamBlue { displayName = CSTRING(AssignTeamBlue); @@ -105,7 +99,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming"}; showDisabled = 1; icon = QPATHTOF(UI\team\team_blue_ca.paa); - priority = 2.2; }; class ACE_AssignTeamYellow { displayName = CSTRING(AssignTeamYellow); @@ -114,7 +107,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming"}; showDisabled = 1; icon = QPATHTOF(UI\team\team_yellow_ca.paa); - priority = 2.1; }; class ACE_UnassignTeam { displayName = CSTRING(LeaveTeam); @@ -123,7 +115,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming"}; showDisabled = 1; icon = QPATHTOF(UI\team\team_white_ca.paa); - priority = 2.5; }; }; @@ -134,7 +125,6 @@ class CfgVehicles { modifierFunction = QUOTE(call FUNC(modifyJoinGroupAction)); exceptions[] = {"isNotSwimming"}; showDisabled = 0; - priority = 2.6; icon = QPATHTOF(UI\team\team_management_ca.paa); }; class ACE_GetDown { @@ -142,7 +132,6 @@ class CfgVehicles { condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canInteractWithCivilian)); statement = QUOTE([ARR_2(_player,_target)] call DFUNC(getDown)); showDisabled = 0; - priority = 2.2; }; class ACE_SendAway { displayName = CSTRING(SendAway); @@ -150,7 +139,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_player,_target)] call DFUNC(sendAway)); exceptions[] = {"isNotSwimming"}; showDisabled = 0; - priority = 2.0; }; class ACE_Pardon { displayName = CSTRING(Pardon); @@ -158,7 +146,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_player,_target)] call DFUNC(pardon)); exceptions[] = {"isNotSwimming"}; showDisabled = 0; - priority = 2.5; }; class ACE_GetOut { displayName = CSTRING(GetOut); @@ -166,7 +153,6 @@ class CfgVehicles { statement = QUOTE([_target] call EFUNC(common,unloadPerson)); exceptions[] = {"isNotSwimming"}; showDisabled = 0; - priority = 2.6; }; class GVAR(PullOutBody) { @@ -259,7 +245,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting", "isNotOnLadder", "isNotRefueling"}; statement = ""; showDisabled = 1; - priority = 3.2; icon = QPATHTOF(UI\team\team_management_ca.paa); class ACE_JoinTeamRed { @@ -268,7 +253,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting", "isNotOnLadder", "isNotRefueling"}; statement = QUOTE([ARR_2(_player,'RED')] call DFUNC(joinTeam)); showDisabled = 1; - priority = 2.4; icon = QPATHTOF(UI\team\team_red_ca.paa); }; class ACE_JoinTeamGreen { @@ -277,7 +261,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting", "isNotOnLadder", "isNotRefueling"}; statement = QUOTE([ARR_2(_player,'GREEN')] call DFUNC(joinTeam)); showDisabled = 1; - priority = 2.3; icon = QPATHTOF(UI\team\team_green_ca.paa); }; class ACE_JoinTeamBlue { @@ -286,7 +269,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting", "isNotOnLadder", "isNotRefueling"}; statement = QUOTE([ARR_2(_player,'BLUE')] call DFUNC(joinTeam)); showDisabled = 1; - priority = 2.2; icon = QPATHTOF(UI\team\team_blue_ca.paa); }; class ACE_JoinTeamYellow { @@ -295,7 +277,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting", "isNotOnLadder", "isNotRefueling"}; statement = QUOTE([ARR_2(_player,'YELLOW')] call DFUNC(joinTeam)); showDisabled = 1; - priority = 2.1; icon = QPATHTOF(UI\team\team_yellow_ca.paa); }; class ACE_LeaveTeam { @@ -304,7 +285,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting", "isNotOnLadder", "isNotRefueling"}; statement = QUOTE([ARR_2(_player,'MAIN')] call DFUNC(joinTeam)); showDisabled = 1; - priority = 2.5; icon = QPATHTOF(UI\team\team_white_ca.paa); }; class ACE_BecomeLeader { @@ -313,7 +293,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting", "isNotOnLadder", "isNotRefueling"}; statement = QUOTE(_this call DFUNC(doBecomeLeader)); showDisabled = 1; - priority = 1.0; icon = QPATHTOF(UI\team\team_white_ca.paa); }; class ACE_LeaveGroup { @@ -322,7 +301,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting", "isNotOnLadder", "isNotRefueling"}; statement = QUOTE(_oldGroup = units group _player; _newGroup = createGroup side _player; [_player] joinSilent _newGroup; {_player reveal _x} forEach _oldGroup;); showDisabled = 1; - priority = 1.2; icon = QPATHTOF(UI\team\team_management_ca.paa); }; }; @@ -333,7 +311,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; statement = ""; showDisabled = 1; - priority = 4.5; icon = ""; // @todo }; }; @@ -543,7 +520,6 @@ class CfgVehicles { statement = QUOTE(_this call FUNC(push)); exceptions[] = {"isNotSwimming"}; showDisabled = 0; - priority = -1; }; class ACE_Passengers { displayName = CSTRING(Passengers); @@ -637,17 +613,14 @@ class CfgVehicles { selection = ""; distance = 2; condition = "true"; - class ACE_OpenBox { displayName = CSTRING(OpenBox); condition = QUOTE((alive _target) && {(getNumber (configFile >> 'CfgVehicles' >> (typeOf _target) >> 'disableInventory')) == 0}); statement = QUOTE(_player action [ARR_2(QUOTE(QUOTE(Gear)), _target)]); showDisabled = 0; - priority = -1; }; }; }; - class ACE_SelfActions {}; }; class Slingload_base_F: ReammoBox_F {}; diff --git a/addons/kestrel4500/CfgVehicles.hpp b/addons/kestrel4500/CfgVehicles.hpp index ccc4fa3bd2..9cdd077066 100644 --- a/addons/kestrel4500/CfgVehicles.hpp +++ b/addons/kestrel4500/CfgVehicles.hpp @@ -8,7 +8,6 @@ class CfgVehicles { condition = QUOTE(call FUNC(canShow) && !GVAR(Kestrel4500)); statement = QUOTE(call FUNC(createKestrelDialog)); showDisabled = 0; - priority = 0.1; icon = QPATHTOF(UI\Kestrel4500_Icon.paa); exceptions[] = {"notOnMap", "isNotInside", "isNotSitting"}; class GVAR(show) { @@ -16,7 +15,6 @@ class CfgVehicles { condition = QUOTE(call FUNC(canShow) && !GVAR(Overlay)); statement = QUOTE(call FUNC(displayKestrel)); showDisabled = 0; - priority = 0.2; icon = QPATHTOF(UI\Kestrel4500_Icon.paa); exceptions[] = {"notOnMap", "isNotInside", "isNotSitting"}; }; @@ -25,7 +23,6 @@ class CfgVehicles { condition = QUOTE(GVAR(Overlay)); statement = QUOTE(call FUNC(displayKestrel)); showDisabled = 0; - priority = 0.3; icon = QPATHTOF(UI\Kestrel4500_Icon.paa); exceptions[] = {"notOnMap", "isNotInside", "isNotSitting"}; }; diff --git a/addons/magazinerepack/CfgVehicles.hpp b/addons/magazinerepack/CfgVehicles.hpp index 2c8ef81608..7d1d328647 100644 --- a/addons/magazinerepack/CfgVehicles.hpp +++ b/addons/magazinerepack/CfgVehicles.hpp @@ -7,7 +7,6 @@ class CfgVehicles { condition = QUOTE(true); exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"}; insertChildren = QUOTE(_this call FUNC(getMagazineChildren)); - priority = -2; icon = QPATHTOEF(common,UI\repack_ca.paa); }; }; diff --git a/addons/map/CfgVehicles.hpp b/addons/map/CfgVehicles.hpp index 3a28fe4c3e..16c03bd225 100644 --- a/addons/map/CfgVehicles.hpp +++ b/addons/map/CfgVehicles.hpp @@ -10,7 +10,6 @@ class CfgVehicles { exceptions[] = {"isNotDragging", "notOnMap", "isNotInside", "isNotSitting"}; insertChildren = QUOTE(_this call DFUNC(compileFlashlightMenu)); showDisabled = 0; - priority = 99; }; }; }; diff --git a/addons/maptools/CfgVehicles.hpp b/addons/maptools/CfgVehicles.hpp index 6c9bdc74d9..2e5663e251 100644 --- a/addons/maptools/CfgVehicles.hpp +++ b/addons/maptools/CfgVehicles.hpp @@ -2,14 +2,12 @@ class CfgVehicles { class Man; class CAManBase: Man { class ACE_SelfActions { - class ACE_MapGpsShow { displayName = CSTRING(MapGpsShow); condition = QUOTE((!GVAR(mapGpsShow)) && {call FUNC(canUseMapGPS)}); statement = QUOTE(GVAR(mapGpsShow) = true; [GVAR(mapGpsShow)] call FUNC(openMapGps)); exceptions[] = {"isNotDragging", "notOnMap", "isNotInside", "isNotSitting"}; showDisabled = 0; - priority = 0; }; class ACE_MapGpsHide { displayName = CSTRING(MapGpsHide); @@ -17,24 +15,19 @@ class CfgVehicles { statement = QUOTE(GVAR(mapGpsShow) = false; [GVAR(mapGpsShow)] call FUNC(openMapGps)); exceptions[] = {"isNotDragging", "notOnMap", "isNotInside", "isNotSitting"}; showDisabled = 0; - priority = 0; }; - class ACE_MapTools { displayName = CSTRING(MapTools_Menu); condition = QUOTE(call FUNC(canUseMapTools)); statement = ""; exceptions[] = {"isNotDragging", "notOnMap", "isNotInside", "isNotSitting"}; showDisabled = 0; - priority = 100; - class ACE_MapToolsHide { displayName = CSTRING(MapToolsHide); condition = QUOTE(GVAR(mapTool_Shown) != 0); statement = QUOTE(GVAR(mapTool_Shown) = 0;); exceptions[] = {"isNotDragging", "notOnMap", "isNotInside", "isNotSitting"}; showDisabled = 1; - priority = 5; }; class ACE_MapToolsShowNormal { displayName = CSTRING(MapToolsShowNormal); @@ -42,7 +35,6 @@ class CfgVehicles { statement = QUOTE(GVAR(mapTool_Shown) = 1;); exceptions[] = {"isNotDragging", "notOnMap", "isNotInside", "isNotSitting"}; showDisabled = 1; - priority = 4; }; class ACE_MapToolsShowSmall { displayName = CSTRING(MapToolsShowSmall); @@ -50,7 +42,6 @@ class CfgVehicles { statement = QUOTE(GVAR(mapTool_Shown) = 2;); exceptions[] = {"isNotDragging", "notOnMap", "isNotInside", "isNotSitting"}; showDisabled = 1; - priority = 3; }; class ACE_MapToolsAlignNorth { displayName = CSTRING(MapToolsAlignNorth); @@ -58,7 +49,6 @@ class CfgVehicles { statement = QUOTE(GVAR(mapTool_angle) = 0;); exceptions[] = {"isNotDragging", "notOnMap", "isNotInside", "isNotSitting"}; showDisabled = 1; - priority = 2; }; class ACE_MapToolsAlignCompass { displayName = CSTRING(MapToolsAlignCompass); @@ -66,7 +56,6 @@ class CfgVehicles { statement = QUOTE(GVAR(mapTool_angle) = getDir ACE_player;); exceptions[] = {"isNotDragging", "notOnMap", "isNotInside", "isNotSitting"}; showDisabled = 1; - priority = 1; }; }; }; diff --git a/addons/medical/ACE_Medical_Actions.hpp b/addons/medical/ACE_Medical_Actions.hpp index 900e6cb26c..678976a347 100644 --- a/addons/medical/ACE_Medical_Actions.hpp +++ b/addons/medical/ACE_Medical_Actions.hpp @@ -15,7 +15,6 @@ class ACE_Head { statement = QUOTE([ARR_4(_player, _target, 'head', 'Bandage')] call DFUNC(treatment)); EXCEPTIONS showDisabled = 1; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; // Advanced medical @@ -26,7 +25,6 @@ class ACE_Head { statement = QUOTE([ARR_4(_player, _target, 'head', 'FieldDressing')] call DFUNC(treatment)); EXCEPTIONS showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { @@ -92,7 +90,6 @@ class ACE_Torso { statement = QUOTE([ARR_4(_player, _target, 'body', 'Bandage')] call DFUNC(treatment)); EXCEPTIONS showDisabled = 1; - priority = 2; enableInside = 1; icon = QPATHTOF(UI\icons\bandage.paa); }; @@ -103,7 +100,6 @@ class ACE_Torso { statement = QUOTE([ARR_4(_player, _target, 'body', 'BodyBag')] call DFUNC(treatment)); EXCEPTIONS showDisabled = 1; - priority = 2; enableInside = 1; }; class TriageCard { @@ -113,7 +109,6 @@ class ACE_Torso { statement = QUOTE([ARR_2(_target, true)] call DFUNC(displayTriageCard)); EXCEPTIONS showDisabled = 1; - priority = 2; enableInside = 1; icon = QPATHTOF(UI\icons\triageCard.paa); }; @@ -124,7 +119,6 @@ class ACE_Torso { statement = QUOTE([ARR_4(_player, _target, 'body', 'Diagnose')] call DFUNC(treatment)); EXCEPTIONS showDisabled = 0; - priority = 2; icon = ""; }; @@ -136,7 +130,6 @@ class ACE_Torso { statement = QUOTE([ARR_4(_player, _target, 'body', 'FieldDressing')] call DFUNC(treatment)); EXCEPTIONS showDisabled = 0; - priority = 2; enableInside = 1; icon = QPATHTOF(UI\icons\bandage.paa); }; @@ -200,7 +193,6 @@ class ACE_ArmLeft { statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Bandage')] call DFUNC(treatment)); EXCEPTIONS showDisabled = 1; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; @@ -212,7 +204,6 @@ class ACE_ArmLeft { statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'FieldDressing')] call DFUNC(treatment)); EXCEPTIONS showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { @@ -363,7 +354,6 @@ class ACE_ArmRight { statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Bandage')] call DFUNC(treatment)); EXCEPTIONS showDisabled = 1; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; @@ -375,7 +365,6 @@ class ACE_ArmRight { statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'FieldDressing')] call DFUNC(treatment)); EXCEPTIONS showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { @@ -524,7 +513,6 @@ class ACE_LegLeft { statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Bandage')] call DFUNC(treatment)); EXCEPTIONS showDisabled = 1; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; @@ -537,7 +525,6 @@ class ACE_LegLeft { statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'FieldDressing')] call DFUNC(treatment)); EXCEPTIONS showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { @@ -672,7 +659,6 @@ class ACE_LegRight { statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Bandage')] call DFUNC(treatment)); EXCEPTIONS showDisabled = 1; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; @@ -685,7 +671,6 @@ class ACE_LegRight { statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'FieldDressing')] call DFUNC(treatment)); EXCEPTIONS showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { diff --git a/addons/medical/ACE_Medical_SelfActions.hpp b/addons/medical/ACE_Medical_SelfActions.hpp index bf3fbe775f..e5be36cd63 100644 --- a/addons/medical/ACE_Medical_SelfActions.hpp +++ b/addons/medical/ACE_Medical_SelfActions.hpp @@ -22,7 +22,6 @@ class Medical { exceptions[] = {"isNotInside", "isNotSwimming"}; statement = QUOTE([ARR_4(_player, _target, 'head', 'Bandage')] call DFUNC(treatment)); showDisabled = 1; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; // Advanced medical @@ -33,7 +32,6 @@ class Medical { exceptions[] = {"isNotInside", "isNotSwimming"}; statement = QUOTE([ARR_4(_player, _target, 'head', 'FieldDressing')] call DFUNC(treatment)); showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { @@ -80,7 +78,6 @@ class Medical { statement = QUOTE([ARR_3(_target, true, 1)] call DFUNC(displayPatientInformation)); modifierFunction = QUOTE([ARR_4(_target,_player,1,_this select 3)] call FUNC(modifyMedicalAction)); showDisabled = 1; - priority = 2; icon = QPATHTOF(UI\icons\medical_cross.paa); class Bandage { @@ -90,7 +87,6 @@ class Medical { exceptions[] = {"isNotInside", "isNotSwimming"}; statement = QUOTE([ARR_4(_player, _target, 'body', 'Bandage')] call DFUNC(treatment)); showDisabled = 1; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; @@ -101,7 +97,6 @@ class Medical { exceptions[] = {"isNotInside", "isNotSwimming"}; statement = QUOTE([ARR_2(_target, true)] call DFUNC(displayTriageCard)); showDisabled = 1; - priority = 2; icon = QPATHTOF(UI\icons\triageCard.paa); }; @@ -113,7 +108,6 @@ class Medical { exceptions[] = {"isNotInside", "isNotSwimming"}; statement = QUOTE([ARR_4(_player, _target, 'body', 'FieldDressing')] call DFUNC(treatment)); showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { @@ -154,7 +148,6 @@ class Medical { exceptions[] = {"isNotInside", "isNotSwimming"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Bandage')] call DFUNC(treatment)); showDisabled = 1; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; @@ -166,7 +159,6 @@ class Medical { exceptions[] = {"isNotInside", "isNotSwimming"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'FieldDressing')] call DFUNC(treatment)); showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { @@ -261,7 +253,6 @@ class Medical { exceptions[] = {"isNotInside", "isNotSwimming"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Bandage')] call DFUNC(treatment)); showDisabled = 1; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; @@ -273,7 +264,6 @@ class Medical { exceptions[] = {"isNotInside", "isNotSwimming"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'FieldDressing')] call DFUNC(treatment)); showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { @@ -364,7 +354,6 @@ class Medical { exceptions[] = {"isNotInside", "isNotSwimming"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Bandage')] call DFUNC(treatment)); showDisabled = 1; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; @@ -377,7 +366,6 @@ class Medical { exceptions[] = {"isNotInside", "isNotSwimming"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'FieldDressing')] call DFUNC(treatment)); showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { @@ -456,7 +444,6 @@ class Medical { exceptions[] = {"isNotInside", "isNotSwimming"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Bandage')] call DFUNC(treatment)); showDisabled = 1; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; @@ -469,7 +456,6 @@ class Medical { exceptions[] = {"isNotInside", "isNotSwimming"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'FieldDressing')] call DFUNC(treatment)); showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 34bba3c95e..5db82ce1e5 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -548,7 +548,6 @@ class CfgVehicles { condition = QUOTE(_target getVariable [ARR_2(QUOTE(QUOTE(ACE_isUnconscious)), false)] && {alive _target} && {vehicle _target == _target}); statement = QUOTE([ARR_2(_player, _target)] call DFUNC(actionLoadUnit)); showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\icons\medical_cross.paa); exceptions[] = {"isNotDragging", "isNotCarrying", "isNotSwimming"}; insertChildren = QUOTE(call DFUNC(addLoadPatientActions)); @@ -559,7 +558,6 @@ class CfgVehicles { condition = QUOTE(_target getVariable [ARR_2(QUOTE(QUOTE(ACE_isUnconscious)), false)] && {alive _target} && {vehicle _target != _target} && {vehicle _player == _player}); statement = QUOTE([ARR_2(_player, _target)] call DFUNC(actionUnloadUnit)); showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\icons\medical_cross.paa); exceptions[] = {"isNotDragging", "isNotCarrying", "isNotInside", "isNotSwimming"}; }; @@ -914,20 +912,17 @@ class CfgVehicles { class ACE_Actions: ACE_Actions { class ACE_MainActions: ACE_MainActions { selection = "cover_action"; - class ACE_OpenLid { displayName = CSTRING(openLid); condition = QUOTE(alive _target && {_target animationPhase 'Cover' < 0.5}); statement = QUOTE(_target animate ARR_2(['Cover',1])); showDisabled = 0; - priority = -1; }; class ACE_CloseLid { displayName = CSTRING(closeLid); condition = QUOTE(alive _target && {_target animationPhase 'Cover' >= 0.5}); statement = QUOTE(_target animate ARR_2(['Cover',0])); showDisabled = 0; - priority = -1; }; }; }; diff --git a/addons/mk6mortar/CfgVehicles.hpp b/addons/mk6mortar/CfgVehicles.hpp index 36315772d4..4a5d420f5c 100644 --- a/addons/mk6mortar/CfgVehicles.hpp +++ b/addons/mk6mortar/CfgVehicles.hpp @@ -7,7 +7,6 @@ class CfgVehicles { displayName = CSTRING(rangetable_action); condition = QUOTE(_this call FUNC(rangeTableCanUse)); statement = QUOTE(_this call FUNC(rangeTableOpen)); - priority = 0; icon = QPATHTOF(UI\icon_rangeTable.paa); exceptions[] = {"notOnMap", "isNotInside", "isNotSitting"}; }; diff --git a/addons/overheating/CfgVehicles.hpp b/addons/overheating/CfgVehicles.hpp index aa9d4e8535..e142b71a89 100644 --- a/addons/overheating/CfgVehicles.hpp +++ b/addons/overheating/CfgVehicles.hpp @@ -10,7 +10,6 @@ class CfgVehicles { exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"}; statement = QUOTE( [ARR_2(_player, currentMuzzle _player)] call FUNC(clearJam); ); showDisabled = 0; - priority = 4; icon = QPATHTOEF(common,UI\repack_ca.paa); }; class GVAR(SwapBarrel) { @@ -19,7 +18,6 @@ class CfgVehicles { exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"}; statement = QUOTE( [ARR_3(_player, _player, currentWeapon _player)] call FUNC(swapBarrel); ); showDisabled = 0; - priority = 3; icon = QPATHTOF(UI\spare_barrel_ca.paa); }; class GVAR(CheckTemperature) { @@ -28,7 +26,6 @@ class CfgVehicles { exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"}; statement = QUOTE( [ARR_3(_player, _player, currentWeapon _player)] call FUNC(checkTemperature); ); showDisabled = 0; - priority = 2.9; icon = QPATHTOF(UI\temp_ca.paa); }; class GVAR(CheckTemperatureSpareBarrels) { @@ -37,7 +34,6 @@ class CfgVehicles { exceptions[] = {"isNotInside", "isNotSwimming", "isNotSitting"}; statement = QUOTE( [_player] call FUNC(checkSpareBarrelsTemperatures); ); showDisabled = 0; - priority = 2.8; icon = QUOTE(PATHTOF(UI\temp_ca.paa)); }; }; diff --git a/addons/parachute/CfgVehicles.hpp b/addons/parachute/CfgVehicles.hpp index 402ff9497e..5f1b750377 100644 --- a/addons/parachute/CfgVehicles.hpp +++ b/addons/parachute/CfgVehicles.hpp @@ -17,7 +17,6 @@ class CfgVehicles { condition = QUOTE(_target getVariable [ARR_2(QQGVAR(canCut),false)]); statement = QUOTE([ARR_2(_player,_target)] call FUNC(cutParachute)); showDisabled = 0; - priority = 2.9; icon = QPATHTOF(UI\cut_ca.paa); }; }; diff --git a/addons/rangecard/CfgVehicles.hpp b/addons/rangecard/CfgVehicles.hpp index 7abc8d979b..5974e62e69 100644 --- a/addons/rangecard/CfgVehicles.hpp +++ b/addons/rangecard/CfgVehicles.hpp @@ -19,7 +19,6 @@ class CfgVehicles { condition = QUOTE(call FUNC(canShow) && !GVAR(RangeCardOpened)); statement = QUOTE(false call FUNC(openRangeCard)); showDisabled = 0; - priority = 0.1; icon = QPATHTOF(UI\RangeCard_Icon.paa); exceptions[] = {"notOnMap"}; class GVAR(openCopy) { @@ -27,7 +26,6 @@ class CfgVehicles { condition = QUOTE(call FUNC(canShowCopy) && !GVAR(RangeCardOpened)); statement = QUOTE(true call FUNC(openRangeCard)); showDisabled = 0; - priority = 0.1; icon = QPATHTOF(UI\RangeCard_Icon.paa); exceptions[] = {"notOnMap"}; }; @@ -36,7 +34,6 @@ class CfgVehicles { condition = QUOTE(call FUNC(canShow) && !GVAR(RangeCardOpened)); statement = QUOTE(GVAR(zeroRangeCopy)=GVAR(zeroRange); GVAR(boreHeightCopy)=GVAR(boreHeight); GVAR(ammoClassCopy)=GVAR(ammoClass); GVAR(magazineClassCopy)=GVAR(magazineClass); GVAR(weaponClassCopy)=GVAR(weaponClass);); showDisabled = 0; - priority = 0.1; icon = QPATHTOF(UI\RangeCard_Icon.paa); exceptions[] = {"notOnMap"}; }; diff --git a/addons/rearm/CfgVehicles.hpp b/addons/rearm/CfgVehicles.hpp index acf7b4d291..c12ee16066 100644 --- a/addons/rearm/CfgVehicles.hpp +++ b/addons/rearm/CfgVehicles.hpp @@ -179,7 +179,6 @@ class CfgVehicles { statement = QUOTE(_this call FUNC(grabAmmo)); exceptions[] = {"isNotInside"}; showDisabled = 0; - priority = 2; icon = QPATHTOF(ui\icon_rearm_interact.paa); }; }; diff --git a/addons/refuel/CfgVehicles.hpp b/addons/refuel/CfgVehicles.hpp index cf4d590df8..efcd1aa3a2 100644 --- a/addons/refuel/CfgVehicles.hpp +++ b/addons/refuel/CfgVehicles.hpp @@ -8,7 +8,6 @@ statement = ""; \ exceptions[] = {INTERACT_EXCEPTIONS}; \ showDisabled = 0; \ - priority = 2; \ icon = QPATHTOF(ui\icon_refuel_interact.paa); \ class GVAR(PickUpNozzle) { \ displayName = CSTRING(TakeNozzle); \ diff --git a/addons/repair/CfgVehicles.hpp b/addons/repair/CfgVehicles.hpp index 74733cb7a0..7f0255d2a5 100644 --- a/addons/repair/CfgVehicles.hpp +++ b/addons/repair/CfgVehicles.hpp @@ -7,7 +7,6 @@ statement = ""; \ runOnHover = 1; \ showDisabled = 0; \ - priority = 2; \ icon = "\A3\ui_f\data\igui\cfg\actions\repair_ca.paa"; \ distance = 4; \ exceptions[] = {"isNotSwimming", "isNotOnLadder"}; \ @@ -408,12 +407,12 @@ class CfgVehicles { class ReammoBox_F; class Land_RepairDepot_01_base_F: ReammoBox_F { // TanksDLC - Repair Depo Thing GVAR(canRepair) = 1; - transportRepair = 0; + transportRepair = 0; }; class Van_02_base_F; class Van_02_service_base_F: Van_02_base_F { // OrangeDLC GVAR(canRepair) = 1; - transportRepair = 0; + transportRepair = 0; }; class Slingload_01_Base_F; diff --git a/addons/respawn/CfgVehicles.hpp b/addons/respawn/CfgVehicles.hpp index 847b32fe84..c5e30a3028 100644 --- a/addons/respawn/CfgVehicles.hpp +++ b/addons/respawn/CfgVehicles.hpp @@ -72,7 +72,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_player, side group _player)] call FUNC(moveRallypoint)); exceptions[] = {"isNotSwimming"}; showDisabled = 0; - priority = -0.5; }; }; }; @@ -113,7 +112,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming"}; position = "[-0.05,-0.35,-2.6]"; showDisabled = 1; - priority = 1; }; }; }; @@ -136,7 +134,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming"}; position = "[-0.05,-0.35,-2.6]"; showDisabled = 1; - priority = 1; }; }; }; @@ -159,7 +156,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming"}; position = "[-0.05,-0.35,-2.6]"; showDisabled = 1; - priority = 1; }; }; }; @@ -183,7 +179,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming"}; position = "[-0.05,-0.35,-2.6]"; showDisabled = 1; - priority = 1; }; }; }; @@ -206,7 +201,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming"}; position = "[-0.05,-0.35,-2.6]"; showDisabled = 1; - priority = 1; }; }; }; @@ -229,7 +223,6 @@ class CfgVehicles { exceptions[] = {"isNotSwimming"}; position = "[-0.05,-0.35,-2.6]"; showDisabled = 1; - priority = 1; }; }; }; diff --git a/addons/sandbag/CfgVehicles.hpp b/addons/sandbag/CfgVehicles.hpp index aebbef5be7..8f4dd85336 100644 --- a/addons/sandbag/CfgVehicles.hpp +++ b/addons/sandbag/CfgVehicles.hpp @@ -12,7 +12,6 @@ class CfgVehicles { statement = QUOTE([ARR_2({_this call FUNC(deploy)},_this)] call CBA_fnc_execNextFrame); exceptions[] = {"isNotSwimming"}; showDisabled = 0; - priority = 4; icon = QPATHTOF(UI\icon_sandbag_ca.paa); }; }; @@ -92,7 +91,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_player,_target)] call FUNC(pickup)); showDisabled = 0; exceptions[] = {}; - priority = 5; icon = QPATHTOF(UI\icon_sandbag_ca.paa); }; }; diff --git a/addons/scopes/CfgVehicles.hpp b/addons/scopes/CfgVehicles.hpp index b1e76d4401..f3d7126b06 100644 --- a/addons/scopes/CfgVehicles.hpp +++ b/addons/scopes/CfgVehicles.hpp @@ -9,7 +9,6 @@ class CfgVehicles { condition = QUOTE([ACE_player] call FUNC(canAdjustZero)); statement = QUOTE([ACE_player] call FUNC(adjustZero)); showDisabled = 0; - priority = 0.2; //icon = QPATHTOF(UI\...); // TODO exceptions[] = {"notOnMap", "isNotInside", "isNotSwimming", "isNotSitting"}; }; @@ -19,7 +18,6 @@ class CfgVehicles { condition = QUOTE([ACE_player] call FUNC(canResetZero)); statement = QUOTE([ACE_player] call FUNC(resetZero)); showDisabled = 0; - priority = 0.2; //icon = QPATHTOF(UI\...); // TODO exceptions[] = {"notOnMap", "isNotInside", "isNotSwimming", "isNotSitting"}; }; diff --git a/addons/spottingscope/CfgVehicles.hpp b/addons/spottingscope/CfgVehicles.hpp index f360be45c9..d961f0d36b 100644 --- a/addons/spottingscope/CfgVehicles.hpp +++ b/addons/spottingscope/CfgVehicles.hpp @@ -11,7 +11,6 @@ class CfgVehicles { condition = QUOTE([ARR_2(_player,'ACE_SpottingScope')] call EFUNC(common,hasItem)); statement = QUOTE([ARR_2(_player,'ACE_SpottingScope')] call FUNC(place)); showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\w_spottingscope_ca.paa); }; }; @@ -60,7 +59,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_target,_player)] call FUNC(pickup)); showDisabled = 0; exceptions[] = {}; - priority = 5; icon = QPATHTOF(UI\w_spottingscope_ca.paa); }; }; diff --git a/addons/tacticalladder/CfgVehicles.hpp b/addons/tacticalladder/CfgVehicles.hpp index 591f2c86af..d6cf8324b3 100644 --- a/addons/tacticalladder/CfgVehicles.hpp +++ b/addons/tacticalladder/CfgVehicles.hpp @@ -12,7 +12,6 @@ class CfgVehicles { statement = QUOTE([_player] call FUNC(deployTL)); exceptions[] = {}; showDisabled = 1; - priority = 4; }; }; }; @@ -86,7 +85,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_player,_target)] call FUNC(pickupTL)); showDisabled = 0; exceptions[] = {}; - priority = 5; }; class ACE_Position { @@ -98,7 +96,6 @@ class CfgVehicles { statement = QUOTE([ARR_2({_this call FUNC(positionTL)},[ARR_2(_player,_target)])] call CBA_fnc_execNextFrame); showDisabled = 0; exceptions[] = {}; - priority = 5; }; }; }; diff --git a/addons/trenches/CfgVehicles.hpp b/addons/trenches/CfgVehicles.hpp index 9c93e555ac..3b13be21a8 100644 --- a/addons/trenches/CfgVehicles.hpp +++ b/addons/trenches/CfgVehicles.hpp @@ -10,13 +10,11 @@ class CBA_Extended_EventHandlers; displayName = CSTRING(ContinueDiggingTrench); \ condition = QUOTE([ARR_2(_target,_player)] call FUNC(canContinueDiggingTrench)); \ statement = QUOTE([ARR_2(_target,_player)] call FUNC(continueDiggingTrench);); \ - priority = -1; \ }; \ class ACE_RemoveTrench { \ displayName = CSTRING(RemoveEnvelope); \ condition = QUOTE([ARR_2(_target,_player)] call FUNC(canRemoveTrench)); \ statement = QUOTE([ARR_2(_target,_player)] call FUNC(removeTrench);); \ - priority = -1; \ }; \ }; \ } @@ -33,7 +31,6 @@ class CfgVehicles { statement = QUOTE([ARR_2({_this call FUNC(placeTrench)},[ARR_2(_this select 0,'ACE_envelope_small')])] call CBA_fnc_execNextFrame); exceptions[] = {}; showDisabled = 0; - priority = 4; //icon = QPATHTOF(UI\icon_sandbag_ca.paa); }; class GVAR(digEnvelopeBig) { @@ -43,7 +40,6 @@ class CfgVehicles { statement = QUOTE([ARR_2({_this call FUNC(placeTrench)},[ARR_2(_this select 0,'ACE_envelope_big')])] call CBA_fnc_execNextFrame); exceptions[] = {}; showDisabled = 0; - priority = 4; //icon = QPATHTOF(UI\icon_sandbag_ca.paa); }; }; diff --git a/addons/tripod/CfgVehicles.hpp b/addons/tripod/CfgVehicles.hpp index 78d1f69fa7..31888ab5dd 100644 --- a/addons/tripod/CfgVehicles.hpp +++ b/addons/tripod/CfgVehicles.hpp @@ -11,7 +11,6 @@ class CfgVehicles { condition = QUOTE([ARR_2(_player,'ACE_Tripod')] call EFUNC(common,hasItem)); statement = QUOTE([ARR_2(_player,'ACE_Tripod')] call FUNC(place)); showDisabled = 0; - priority = 2; icon = QPATHTOF(UI\w_sniper_tripod_ca.paa); }; }; @@ -78,7 +77,6 @@ class CfgVehicles { statement = QUOTE([ARR_2(_player,_target)] call FUNC(pickup)); showDisabled = 0; exceptions[] = {}; - priority = 5; icon = QPATHTOF(UI\w_sniper_tripod_ca.paa); }; @@ -91,7 +89,6 @@ class CfgVehicles { statement = QUOTE([ARR_2({_this call FUNC(adjust)}, [ARR_2(_player,_target)])] call CBA_fnc_execNextFrame); showDisabled = 0; exceptions[] = {}; - priority = 5; icon = QPATHTOF(UI\w_sniper_tripod_ca.paa); }; }; diff --git a/addons/vehiclelock/CfgVehicles.hpp b/addons/vehiclelock/CfgVehicles.hpp index 3038e3f99c..1115928057 100644 --- a/addons/vehiclelock/CfgVehicles.hpp +++ b/addons/vehiclelock/CfgVehicles.hpp @@ -4,21 +4,18 @@ displayName = CSTRING(Action_UnLock); \ condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(2,3)]}); \ statement = QUOTE([ARR_3(QUOTE(QGVAR(setVehicleLock)), [ARR_2(_target,false)], [_target])] call CBA_fnc_targetEvent); \ - priority = 0.3; \ icon = QPATHTOF(UI\key_menuIcon_ca.paa); \ }; \ class ACE_lockVehicle { \ displayName = CSTRING(Action_Lock); \ condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(0,1)]}); \ statement = QUOTE([ARR_3(QUOTE(QGVAR(setVehicleLock)), [ARR_2(_target,true)], [_target])] call CBA_fnc_targetEvent); \ - priority = 0.2; \ icon = QPATHTOF(UI\key_menuIcon_ca.paa); \ }; \ class ACE_lockpickVehicle { \ displayName = CSTRING(Action_Lockpick); \ condition = QUOTE([ARR_3(_player, _target, 'canLockpick')] call FUNC(lockpick)); \ statement = QUOTE([ARR_3(_player, _target, 'startLockpick')] call FUNC(lockpick)); \ - priority = 0.1; \ }; \ }; \ class ACE_Actions { \ @@ -29,7 +26,6 @@ condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(2,3)]}); \ statement = QUOTE([ARR_3(QUOTE(QGVAR(setVehicleLock)), [ARR_2(_target,false)], [_target])] call CBA_fnc_targetEvent); \ exceptions[] = {"isNotSwimming"}; \ - priority = 0.3; \ icon = QPATHTOF(UI\key_menuIcon_ca.paa); \ }; \ class ACE_lockVehicle { \ @@ -38,7 +34,6 @@ condition = QUOTE(([ARR_2(_player, _target)] call FUNC(hasKeyForVehicle)) && {(locked _target) in [ARR_2(0,1)]}); \ statement = QUOTE([ARR_3(QUOTE(QGVAR(setVehicleLock)), [ARR_2(_target,true)], [_target])] call CBA_fnc_targetEvent); \ exceptions[] = {"isNotSwimming"}; \ - priority = 0.2; \ icon = QPATHTOF(UI\key_menuIcon_ca.paa); \ }; \ class ACE_lockpickVehicle { \ @@ -47,7 +42,6 @@ condition = QUOTE([ARR_3(_player, _target, 'canLockpick')] call FUNC(lockpick)); \ statement = QUOTE([ARR_3(_player, _target, 'startLockpick')] call FUNC(lockpick)); \ exceptions[] = {"isNotSwimming"}; \ - priority = 0.1; \ }; \ }; \ };