From 8b3648cf8d42cdbe9b9ef1a16c71138889e1353a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Badano?= Date: Tue, 24 Mar 2015 15:43:49 -0300 Subject: [PATCH] Configure exceptions for self actions inside vehicles --- addons/fcs/CfgVehicles.hpp | 2 - addons/hearing/CfgVehicles.hpp | 4 +- addons/interaction/CfgVehicles.hpp | 26 ++--- addons/magazinerepack/CfgVehicles.hpp | 2 +- addons/maptools/CfgVehicles.hpp | 24 ++--- .../functions/fnc_handleMouseZChanged.sqf | 1 + addons/medical/CfgVehicles.hpp | 95 +++++++++++++------ addons/overheating/CfgVehicles.hpp | 1 + 8 files changed, 87 insertions(+), 68 deletions(-) diff --git a/addons/fcs/CfgVehicles.hpp b/addons/fcs/CfgVehicles.hpp index 45f07ddbda..97628b58ea 100644 --- a/addons/fcs/CfgVehicles.hpp +++ b/addons/fcs/CfgVehicles.hpp @@ -26,7 +26,6 @@ class CfgVehicles { class ACE_SelfActions { class ResetFCS { displayName = $STR_ACE_FCS_ResetFCS; - enableInside = 1; condition = QUOTE(call FUNC(canResetFCS)); statement = QUOTE([ARR_2(vehicle _player,[_player] call DEFUNC(common,getTurretIndex))] call DFUNC(reset);); showDisabled = 0; @@ -40,7 +39,6 @@ class CfgVehicles { class ACE_SelfActions { class ResetFCS { displayName = $STR_ACE_FCS_ResetFCS; - enableInside = 1; condition = QUOTE(call FUNC(canResetFCS)); statement = QUOTE([ARR_2(vehicle _player,[_player] call DEFUNC(common,getTurretIndex))] call DFUNC(reset);); showDisabled = 0; diff --git a/addons/hearing/CfgVehicles.hpp b/addons/hearing/CfgVehicles.hpp index c4ea1f2349..f8589c5e6d 100644 --- a/addons/hearing/CfgVehicles.hpp +++ b/addons/hearing/CfgVehicles.hpp @@ -6,22 +6,22 @@ class CfgVehicles { class ACE_PutInEarplugs { displayName = "$STR_ACE_Hearing_EarPlugs_On"; condition = QUOTE( !([_player] call FUNC(hasEarPlugsIn)) && {'ACE_EarPlugs' in items _player} ); + exceptions[] = {"isNotInside"}; statement = QUOTE( [_player] call FUNC(putInEarPlugs) ); showDisabled = 0; priority = 2.5; icon = PATHTOF(UI\ACE_earplugs_x_ca.paa); hotkey = "E"; - enableInside = 1; }; class ACE_RemoveEarplugs { displayName = "$STR_ACE_Hearing_EarPlugs_Off"; condition = QUOTE( [_player] call FUNC(hasEarPlugsIn) ); + exceptions[] = {"isNotInside"}; statement = QUOTE( [_player] call FUNC(removeEarPlugs) ); showDisabled = 0; priority = 2.5; icon = PATHTOF(UI\ACE_earplugs_x_ca.paa); hotkey = "E"; - enableInside = 1; }; }; }; diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp index 51bdd6013d..c56ce12d4d 100644 --- a/addons/interaction/CfgVehicles.hpp +++ b/addons/interaction/CfgVehicles.hpp @@ -42,7 +42,6 @@ class CfgVehicles { priority = 3.2; icon = PATHTOF(UI\team\team_management_ca.paa); hotkey = "M"; - enableInside = 1; class ACE_JoinTeamRed { displayName = "$STR_ACE_Interaction_JoinTeamRed"; @@ -53,7 +52,6 @@ class CfgVehicles { icon = PATHTOF(UI\team\team_red_ca.paa); priority = 2.4; hotkey = "R"; - enableInside = 1; }; class ACE_JoinTeamGreen { displayName = "$STR_ACE_Interaction_JoinTeamGreen"; @@ -64,7 +62,6 @@ class CfgVehicles { icon = PATHTOF(UI\team\team_green_ca.paa); priority = 2.3; hotkey = "G"; - enableInside = 1; }; class ACE_JoinTeamBlue { displayName = "$STR_ACE_Interaction_JoinTeamBlue"; @@ -75,7 +72,6 @@ class CfgVehicles { icon = PATHTOF(UI\team\team_blue_ca.paa); priority = 2.2; hotkey = "B"; - enableInside = 1; }; class ACE_JoinTeamYellow { displayName = "$STR_ACE_Interaction_JoinTeamYellow"; @@ -86,7 +82,6 @@ class CfgVehicles { icon = PATHTOF(UI\team\team_yellow_ca.paa); priority = 2.1; hotkey = "Y"; - enableInside = 1; }; class ACE_LeaveTeam { @@ -98,7 +93,6 @@ class CfgVehicles { icon = PATHTOF(UI\team\team_white_ca.paa); priority = 2.5; hotkey = "N"; - enableInside = 1; }; }; @@ -111,7 +105,6 @@ class CfgVehicles { priority = 2.6; icon = PATHTOF(UI\team\team_management_ca.paa); hotkey = "J"; - enableInside = 1; }; class ACE_GetDown { @@ -137,7 +130,6 @@ class CfgVehicles { statement = QUOTE([ARR_3(_target,'{_this addRating -rating _this}',_target)] call DEFUNC(common,execRemoteFnc)); showDisabled = 0; priority = 2.5; - enableInside = 1; }; }; class ACE_Torso { @@ -210,83 +202,83 @@ class CfgVehicles { class ACE_TeamManagement { displayName = "$STR_ACE_Interaction_TeamManagement"; condition = QUOTE(GVAR(EnableTeamManagement)); + exceptions[] = {"isNotInside"}; statement = ""; showDisabled = 1; priority = 3.2; icon = PATHTOF(UI\team\team_management_ca.paa); - enableInside = 1; hotkey = "M"; class ACE_JoinTeamRed { displayName = "$STR_ACE_Interaction_JoinTeamRed"; condition = QUOTE(true); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_2(_player,'RED')] call DFUNC(joinTeam)); showDisabled = 1; priority = 2.4; icon = PATHTOF(UI\team\team_red_ca.paa); - enableInside = 1; hotkey = "R"; }; class ACE_JoinTeamGreen { displayName = "$STR_ACE_Interaction_JoinTeamGreen"; condition = QUOTE(true); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_2(_player,'GREEN')] call DFUNC(joinTeam)); showDisabled = 1; priority = 2.3; icon = PATHTOF(UI\team\team_green_ca.paa); - enableInside = 1; hotkey = "G"; }; class ACE_JoinTeamBlue { displayName = "$STR_ACE_Interaction_JoinTeamBlue"; condition = QUOTE(true); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_2(_player,'BLUE')] call FUNC(joinTeam)); showDisabled = 1; priority = 2.2; icon = PATHTOF(UI\team\team_blue_ca.paa); - enableInside = 1; hotkey = "B"; }; class ACE_JoinTeamYellow { displayName = "$STR_ACE_Interaction_JoinTeamYellow"; condition = QUOTE(true); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_2(_player,'YELLOW')] call FUNC(joinTeam)); showDisabled = 1; priority = 2.1; icon = PATHTOF(UI\team\team_yellow_ca.paa); - enableInside = 1; hotkey = "Y"; }; class ACE_LeaveTeam { displayName = "$STR_ACE_Interaction_LeaveTeam"; condition = QUOTE(assignedTeam _player != 'MAIN'); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_2(_player,'MAIN')] call FUNC(joinTeam)); showDisabled = 1; priority = 2.5; icon = PATHTOF(UI\team\team_white_ca.paa); - enableInside = 1; hotkey = "N"; }; class ACE_BecomeLeader { displayName = "$STR_ACE_Interaction_BecomeLeader"; condition = QUOTE(count (units group _player) > 1 && {leader group _player != _player}); + exceptions[] = {"isNotInside"}; statement = QUOTE(_newGroup = createGroup side group _player; (units group _player) joinSilent _newGroup; _newGroup selectLeader _player;); showDisabled = 1; priority = 1.0; icon = PATHTOF(UI\team\team_white_ca.paa); - enableInside = 1; hotkey = "L"; }; class ACE_LeaveGroup { displayName = "$STR_ACE_Interaction_LeaveGroup"; condition = QUOTE(count (units group _player) > 1); + exceptions[] = {"isNotInside"}; statement = QUOTE(_oldGroup = units group _player; _newGroup = createGroup side _player; [_player] joinSilent _newGroup; {_player reveal _x} forEach _oldGroup;); showDisabled = 1; priority = 1.2; icon = PATHTOF(UI\team\team_management_ca.paa); - enableInside = 1; hotkey = "M"; }; }; @@ -399,11 +391,11 @@ class CfgVehicles { class ACE_Equipment { displayName = "$STR_ACE_Interaction_Equipment"; condition = QUOTE(true); + exceptions[] = {"isNotInside"}; statement = ""; showDisabled = 1; priority = 4.5; icon = ""; // @todo - enableInside = 1; hotkey = "E"; }; }; diff --git a/addons/magazinerepack/CfgVehicles.hpp b/addons/magazinerepack/CfgVehicles.hpp index acd1c76c3d..eba2edac68 100644 --- a/addons/magazinerepack/CfgVehicles.hpp +++ b/addons/magazinerepack/CfgVehicles.hpp @@ -5,12 +5,12 @@ class CfgVehicles { class ACE_RepackMagazines { displayName = "$STR_ACE_MagazineRepack_RepackMagazines"; condition = QUOTE(true); + exceptions[] = {"isNotInside"}; statement = QUOTE([_player] call FUNC(openSelectMagazineUI)); showDisabled = 0; priority = -2; icon = QUOTE(PATHTOF(UI\repack_ca.paa)); hotkey = "R"; - enableInside = 1; }; }; }; diff --git a/addons/maptools/CfgVehicles.hpp b/addons/maptools/CfgVehicles.hpp index 7d81ae7e08..d9eb295871 100644 --- a/addons/maptools/CfgVehicles.hpp +++ b/addons/maptools/CfgVehicles.hpp @@ -7,73 +7,65 @@ class CfgVehicles { displayName = "$STR_ACE_MapTools_MapTools_Menu"; condition = QUOTE((call FUNC(canUseMapTools) || {call FUNC(canUseMapGPS)})); statement = ""; - exceptions[] = {"isNotDragging", "notOnMap"}; + exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"}; showDisabled = 0; priority = 100; - enableInside = 1; class ACE_MapToolsHide { displayName = "$STR_ACE_MapTools_MapToolsHide"; condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 0})); statement = QUOTE(GVAR(mapTool_Shown) = 0; [] call FUNC(updateMapToolMarkers)); - exceptions[] = {"isNotDragging", "notOnMap"}; + exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"}; showDisabled = 1; priority = 5; - enableInside = 1; }; class ACE_MapToolsShowNormal { displayName = "$STR_ACE_MapTools_MapToolsShowNormal"; condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 1})); statement = QUOTE(GVAR(mapTool_Shown) = 1; [] call FUNC(updateMapToolMarkers)); - exceptions[] = {"isNotDragging", "notOnMap"}; + exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"}; showDisabled = 1; priority = 4; - enableInside = 1; }; class ACE_MapToolsShowSmall { displayName = "$STR_ACE_MapTools_MapToolsShowSmall"; condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 2})); statement = QUOTE(GVAR(mapTool_Shown) = 2; [] call FUNC(updateMapToolMarkers)); - exceptions[] = {"isNotDragging", "notOnMap"}; + exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"}; showDisabled = 1; priority = 3; - enableInside = 1; }; class ACE_MapToolsAlignNorth { displayName = "$STR_ACE_MapTools_MapToolsAlignNorth"; condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 0})); statement = QUOTE(GVAR(mapTool_angle) = 0; [] call FUNC(updateMapToolMarkers)); - exceptions[] = {"isNotDragging", "notOnMap"}; + exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"}; showDisabled = 1; priority = 2; - enableInside = 1; }; class ACE_MapToolsAlignCompass { displayName = "$STR_ACE_MapTools_MapToolsAlignCompass"; condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 0} && {('ItemCompass' in assigneditems ACE_player) || {'ItemCompass' in assigneditems ACE_player}})); statement = QUOTE(GVAR(mapTool_angle) = getDir ACE_player; [] call FUNC(updateMapToolMarkers)); - exceptions[] = {"isNotDragging", "notOnMap"}; + exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"}; showDisabled = 1; priority = 1; - enableInside = 1; }; class ACE_MapGpsShow { displayName = "$STR_ACE_MapTools_MapGpsShow"; condition = QUOTE((call FUNC(canUseMapGPS) && {!GVAR(mapGpsShow)})); statement = QUOTE(GVAR(mapGpsShow) = true; [GVAR(mapGpsShow)] call FUNC(openMapGps)); - exceptions[] = {"isNotDragging", "notOnMap"}; + exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"}; showDisabled = 0; priority = 0; - enableInside = 1; }; class ACE_MapGpsHide { displayName = "$STR_ACE_MapTools_MapGpsHide"; condition = QUOTE((call FUNC(canUseMapGPS) && {GVAR(mapGpsShow)})); statement = QUOTE(GVAR(mapGpsShow) = false; [GVAR(mapGpsShow)] call FUNC(openMapGps)); - exceptions[] = {"isNotDragging", "notOnMap"}; + exceptions[] = {"isNotDragging", "notOnMap", "isNotInside"}; showDisabled = 0; priority = 0; - enableInside = 1; }; }; }; diff --git a/addons/maptools/functions/fnc_handleMouseZChanged.sqf b/addons/maptools/functions/fnc_handleMouseZChanged.sqf index a2faf1b3aa..483efc56b7 100644 --- a/addons/maptools/functions/fnc_handleMouseZChanged.sqf +++ b/addons/maptools/functions/fnc_handleMouseZChanged.sqf @@ -21,6 +21,7 @@ diag_log "Scroll"; diag_log _this; _handled = false; +_handled = true; // If drawing, change line color diff --git a/addons/medical/CfgVehicles.hpp b/addons/medical/CfgVehicles.hpp index 10028e2ab0..0e6c66e35f 100644 --- a/addons/medical/CfgVehicles.hpp +++ b/addons/medical/CfgVehicles.hpp @@ -350,12 +350,14 @@ class CfgVehicles { displayName = "$STR_ACE_MEDICAL_ACTIONS_Medical"; runOnHover = 1; hotkey = "M"; + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_3(_target, true, 0)] call DFUNC(displayPatientInformation)); icon = PATHTOF(UI\icons\medical_cross.paa); class ACE_Head { displayName = "$STR_ACE_Interaction_Head"; icon = PATHTOF(UI\icons\medical_cross.paa); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_3(_target, true, 0)] call DFUNC(displayPatientInformation)); runOnHover = 1; @@ -363,11 +365,11 @@ class CfgVehicles { displayName = "$STR_ACE_Medical_Bandage_HitHead"; distance = 2.0; condition = QUOTE([ARR_4(_player, _target, 'head', 'Bandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'head', 'Bandage')] call DFUNC(treatment)); showDisabled = 1; priority = 2; hotkey = "B"; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; // Advanced medical @@ -375,40 +377,45 @@ class CfgVehicles { displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'head', 'FieldDressing')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'head', 'FieldDressing')] call DFUNC(treatment)); showDisabled = 0; priority = 2; hotkey = ""; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'head', 'PackingBandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'head', 'PackingBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'head', 'ElasticBandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'head', 'ElasticBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\bandage.paa); }; class QuikClot: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'head', 'QuikClot')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'head', 'QuikClot')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\bandage.paa); }; class CheckPulse: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse"; condition = QUOTE([ARR_4(_player, _target, 'head', 'CheckPulse')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'head', 'CheckPulse')] call DFUNC(treatment)); icon = ""; }; class CheckBloodPressure: CheckPulse { displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure"; condition = QUOTE([ARR_4(_player, _target, 'head', 'CheckBloodPressure')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'head', 'CheckBloodPressure')] call DFUNC(treatment)); }; }; @@ -416,23 +423,24 @@ class CfgVehicles { displayName = "$STR_ACE_Interaction_Torso"; distance = 5.0; condition = "true"; + exceptions[] = {"isNotInside"}; runOnHover = 1; + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_3(_target, true, 1)] call DFUNC(displayPatientInformation)); showDisabled = 1; priority = 2; hotkey = ""; - enableInside = 1; icon = PATHTOF(UI\icons\medical_cross.paa); class Bandage { displayName = "$STR_ACE_Medical_Bandage_HitBody"; distance = 2.0; condition = QUOTE([ARR_4(_player, _target, 'body', 'Bandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'body', 'Bandage')] call DFUNC(treatment)); showDisabled = 1; priority = 2; hotkey = "B"; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; @@ -440,11 +448,11 @@ class CfgVehicles { displayName = "$STR_ACE_MEDICAL_ACTIONS_TriageCard"; distance = 2.0; condition = "true"; + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_2(_target, true)] call DFUNC(displayTriageCard)); showDisabled = 1; priority = 2; hotkey = ""; - enableInside = 1; icon = PATHTOF(UI\icons\triageCard.paa); }; @@ -453,28 +461,31 @@ class CfgVehicles { displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'body', 'FieldDressing')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'body', 'FieldDressing')] call DFUNC(treatment)); showDisabled = 0; priority = 2; hotkey = ""; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'body', 'PackingBandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'body', 'PackingBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'body', 'ElasticBandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'body', 'ElasticBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\bandage.paa); }; class QuikClot: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'body', 'QuikClot')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'body', 'QuikClot')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\bandage.paa); }; @@ -482,6 +493,7 @@ class CfgVehicles { class ACE_ArmLeft { displayName = "$STR_ACE_Interaction_ArmLeft"; runOnHover = 1; + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_3(_target, true, 2)] call DFUNC(displayPatientInformation)); icon = PATHTOF(UI\icons\medical_cross.paa); @@ -489,11 +501,11 @@ class CfgVehicles { displayName = "$STR_ACE_Medical_Bandage_HitLeftArm"; distance = 2.0; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Bandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Bandage')] call DFUNC(treatment)); showDisabled = 1; priority = 2; hotkey = "B"; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; @@ -502,75 +514,86 @@ class CfgVehicles { displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'FieldDressing')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'FieldDressing')] call DFUNC(treatment)); showDisabled = 0; priority = 2; hotkey = ""; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'PackingBandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'PackingBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'ElasticBandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'ElasticBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\bandage.paa); }; class QuikClot: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'QuikClot')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'QuikClot')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\bandage.paa); }; class Tourniquet: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Tourniquet')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Tourniquet')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\tourniquet.paa); }; class Morphine: fieldDressing { displayName = "$STR_ACE_Medical_Inject_Morphine"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Morphine')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Morphine')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\autoInjector.paa); }; class Atropine: Morphine { displayName = "$STR_ACE_Medical_Inject_Atropine"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Atropine')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Atropine')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\autoInjector.paa); }; class Epinephrine: Morphine { displayName = "$STR_ACE_Medical_Inject_Epinephrine"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'Epinephrine')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'Epinephrine')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\autoInjector.paa); }; class CheckPulse: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckPulse')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckPulse')] call DFUNC(treatment)); icon = ""; }; class CheckBloodPressure: CheckPulse { displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckBloodPressure')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'CheckBloodPressure')] call DFUNC(treatment)); }; class RemoveTourniquet: Tourniquet { displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet"; condition = QUOTE([ARR_4(_player, _target, 'hand_l', 'RemoveTourniquet')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_l', 'RemoveTourniquet')] call DFUNC(treatment)); }; }; class ACE_ArmRight { displayName = "$STR_ACE_Interaction_ArmRight"; runOnHover = 1; + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_3(_target, true, 3)] call DFUNC(displayPatientInformation)); icon = PATHTOF(UI\icons\medical_cross.paa); @@ -578,11 +601,11 @@ class CfgVehicles { displayName = "$STR_ACE_Medical_Bandage_HitRightArm"; distance = 2.0; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Bandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Bandage')] call DFUNC(treatment)); showDisabled = 1; priority = 2; hotkey = "B"; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; @@ -591,71 +614,82 @@ class CfgVehicles { displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'FieldDressing')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'FieldDressing')] call DFUNC(treatment)); showDisabled = 0; priority = 2; hotkey = ""; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'PackingBandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'PackingBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'ElasticBandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'ElasticBandage')] call DFUNC(treatment)); }; class QuikClot: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'QuikClot')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'QuikClot')] call DFUNC(treatment)); }; class Tourniquet: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Tourniquet')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Tourniquet')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\tourniquet.paa); }; class Morphine: fieldDressing { displayName = "$STR_ACE_Medical_Inject_Morphine"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Morphine')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Morphine')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\autoInjector.paa); }; class Atropine: Morphine { displayName = "$STR_ACE_Medical_Inject_Atropine"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Atropine')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Atropine')] call DFUNC(treatment)); }; class Epinephrine: Morphine { displayName = "$STR_ACE_Medical_Inject_Epinephrine"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'Epinephrine')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'Epinephrine')] call DFUNC(treatment)); }; class CheckPulse: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckPulse"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckPulse')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckPulse')] call DFUNC(treatment)); icon = ""; }; class CheckBloodPressure: CheckPulse { displayName = "$STR_ACE_MEDICAL_ACTIONS_CheckBloodPressure"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckBloodPressure')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'CheckBloodPressure')] call DFUNC(treatment)); }; class RemoveTourniquet: Tourniquet { displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet"; condition = QUOTE([ARR_4(_player, _target, 'hand_r', 'RemoveTourniquet')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'hand_r', 'RemoveTourniquet')] call DFUNC(treatment)); }; }; class ACE_LegLeft { displayName = "$STR_ACE_Interaction_LegLeft"; runOnHover = 1; + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_3(_target, true, 4)] call DFUNC(displayPatientInformation)); icon = PATHTOF(UI\icons\medical_cross.paa); @@ -663,11 +697,11 @@ class CfgVehicles { displayName = "$STR_ACE_Medical_Bandage_HitLeftLeg"; distance = 2.0; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Bandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Bandage')] call DFUNC(treatment)); showDisabled = 1; priority = 2; hotkey = "B"; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; @@ -677,60 +711,69 @@ class CfgVehicles { displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'FieldDressing')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'FieldDressing')] call DFUNC(treatment)); showDisabled = 0; priority = 2; hotkey = ""; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'PackingBandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'PackingBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'ElasticBandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'ElasticBandage')] call DFUNC(treatment)); }; class QuikClot: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'QuikClot')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'QuikClot')] call DFUNC(treatment)); }; class Tourniquet: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Tourniquet')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Tourniquet')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\tourniquet.paa); }; class Morphine: fieldDressing { displayName = "$STR_ACE_Medical_Inject_Morphine"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Morphine')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Morphine')] call DFUNC(treatment)); }; class Atropine: Morphine { displayName = "$STR_ACE_Medical_Inject_Atropine"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Atropine')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Atropine')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\autoInjector.paa); }; class Epinephrine: Morphine { displayName = "$STR_ACE_Medical_Inject_Epinephrine"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'Epinephrine')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'Epinephrine')] call DFUNC(treatment)); }; class RemoveTourniquet: Tourniquet { displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet"; condition = QUOTE([ARR_4(_player, _target, 'leg_l', 'RemoveTourniquet')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_l', 'RemoveTourniquet')] call DFUNC(treatment)); }; }; class ACE_LegRight { displayName = "$STR_ACE_Interaction_LegRight"; runOnHover = 1; + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_3(_target, true, 5)] call DFUNC(displayPatientInformation)); icon = PATHTOF(UI\icons\medical_cross.paa); @@ -738,11 +781,11 @@ class CfgVehicles { displayName = "$STR_ACE_Medical_Bandage_HitRightLeg"; distance = 2.0; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Bandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Bandage')] call DFUNC(treatment)); showDisabled = 1; priority = 2; hotkey = "B"; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; @@ -752,54 +795,62 @@ class CfgVehicles { displayName = "$STR_ACE_MEDICAL_ACTIONS_FieldDressing"; distance = 5.0; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'FieldDressing')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'FieldDressing')] call DFUNC(treatment)); showDisabled = 0; priority = 2; hotkey = ""; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_PackingBandage"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'PackingBandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'PackingBandage')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\packingBandage.paa); }; class ElasticBandage: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_ElasticBandage"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'ElasticBandage')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'ElasticBandage')] call DFUNC(treatment)); }; class QuikClot: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_QuikClot"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'QuikClot')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'QuikClot')] call DFUNC(treatment)); }; class Tourniquet: fieldDressing { displayName = "$STR_ACE_MEDICAL_ACTIONS_Tourniquet"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Tourniquet')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Tourniquet')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\tourniquet.paa); }; class Morphine: fieldDressing { displayName = "$STR_ACE_Medical_Inject_Morphine"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Morphine')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Morphine')] call DFUNC(treatment)); icon = PATHTOF(UI\icons\autoInjector.paa); }; class Atropine: Morphine { displayName = "$STR_ACE_Medical_Inject_Atropine"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Atropine')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Atropine')] call DFUNC(treatment)); }; class Epinephrine: Morphine { displayName = "$STR_ACE_Medical_Inject_Epinephrine"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'Epinephrine')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'Epinephrine')] call DFUNC(treatment)); }; class RemoveTourniquet: Tourniquet { displayName = "$STR_ACE_MEDICAL_ACTIONS_RemoveTourniquet"; condition = QUOTE([ARR_4(_player, _target, 'leg_r', 'RemoveTourniquet')] call DFUNC(canTreatCached)); + exceptions[] = {"isNotInside"}; statement = QUOTE([ARR_4(_player, _target, 'leg_r', 'RemoveTourniquet')] call DFUNC(treatment)); }; }; @@ -820,7 +871,6 @@ class CfgVehicles { showDisabled = 1; priority = 2; hotkey = "B"; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; // Advanced medical @@ -832,7 +882,6 @@ class CfgVehicles { showDisabled = 0; priority = 2; hotkey = ""; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { @@ -880,7 +929,6 @@ class CfgVehicles { showDisabled = 1; priority = 2; hotkey = "M"; - enableInside = 1; icon = PATHTOF(UI\icons\medical_cross.paa); class Bandage { @@ -891,7 +939,6 @@ class CfgVehicles { showDisabled = 1; priority = 2; hotkey = "B"; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; class Carry { @@ -902,7 +949,6 @@ class CfgVehicles { showDisabled = 1; priority = 2; hotkey = ""; - enableInside = 1; //icon = PATHTOF(UI\icons\bandage.paa); }; class Drag { @@ -913,7 +959,6 @@ class CfgVehicles { showDisabled = 1; priority = 2; hotkey = ""; - enableInside = 1; //icon = PATHTOF(UI\icons\bandage.paa); }; @@ -925,7 +970,6 @@ class CfgVehicles { showDisabled = 1; priority = 2; hotkey = ""; - enableInside = 1; icon = PATHTOF(UI\icons\triageCard.paa); }; @@ -938,7 +982,6 @@ class CfgVehicles { showDisabled = 0; priority = 2; hotkey = ""; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { @@ -992,7 +1035,6 @@ class CfgVehicles { showDisabled = 1; priority = 2; hotkey = "B"; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; @@ -1005,7 +1047,6 @@ class CfgVehicles { showDisabled = 0; priority = 2; hotkey = ""; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { @@ -1126,7 +1167,6 @@ class CfgVehicles { showDisabled = 1; priority = 2; hotkey = "B"; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; @@ -1139,7 +1179,6 @@ class CfgVehicles { showDisabled = 0; priority = 2; hotkey = ""; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { @@ -1257,7 +1296,6 @@ class CfgVehicles { showDisabled = 1; priority = 2; hotkey = "B"; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; @@ -1271,7 +1309,6 @@ class CfgVehicles { showDisabled = 0; priority = 2; hotkey = ""; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { @@ -1377,7 +1414,6 @@ class CfgVehicles { showDisabled = 1; priority = 2; hotkey = "B"; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; @@ -1391,7 +1427,6 @@ class CfgVehicles { showDisabled = 0; priority = 2; hotkey = ""; - enableInside = 1; icon = PATHTOF(UI\icons\bandage.paa); }; class PackingBandage: fieldDressing { diff --git a/addons/overheating/CfgVehicles.hpp b/addons/overheating/CfgVehicles.hpp index 411e0a702d..aa01c66ec7 100644 --- a/addons/overheating/CfgVehicles.hpp +++ b/addons/overheating/CfgVehicles.hpp @@ -17,6 +17,7 @@ class CfgVehicles { class ACE_CheckTemperature { displayName = "$STR_ACE_Overheating_CheckTemperatureShort"; condition = QUOTE( currentWeapon _player in [ARR_3(primaryWeapon _player, secondaryWeapon _player, handgunWeapon _player)] ); + exceptions[] = {"isNotInside"}; statement = QUOTE( [ARR_2(_player, currentWeapon _player)] call FUNC(CheckTemperature); ); showDisabled = 0; priority = 3.1;