From 97e277d7103901b83f648c44e8620b1b03591b3e Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 10 Apr 2015 12:55:42 -0500 Subject: [PATCH 1/4] #448 - Adjust Nightvision in vehicles --- addons/nightvision/XEH_postInitClient.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/nightvision/XEH_postInitClient.sqf b/addons/nightvision/XEH_postInitClient.sqf index 9d64baecb3..376059ce1b 100644 --- a/addons/nightvision/XEH_postInitClient.sqf +++ b/addons/nightvision/XEH_postInitClient.sqf @@ -40,7 +40,7 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0; ["ACE3", QGVAR(IncreaseNVGBrightness), localize "STR_ACE_NightVision_IncreaseNVGBrightness", { // Conditions: canInteract - if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; + if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; // Conditions: specific if ((currentVisionMode _player != 1)) exitWith {false}; @@ -54,7 +54,7 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0; ["ACE3", QGVAR(DecreaseNVGBrightness), localize "STR_ACE_NightVision_DecreaseNVGBrightness", { // Conditions: canInteract - if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; + if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; // Conditions: specific if ((currentVisionMode _player != 1)) exitWith {false}; From 1ae92f9387770f4684942c31f1ea863a881b75a9 Mon Sep 17 00:00:00 2001 From: commy2 Date: Fri, 10 Apr 2015 19:56:56 +0200 Subject: [PATCH 2/4] add documentation to eventhandler system --- .../development/ace3-events-system.md | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/documentation/development/ace3-events-system.md b/documentation/development/ace3-events-system.md index 9075347f71..6b708b01dd 100644 --- a/documentation/development/ace3-events-system.md +++ b/documentation/development/ace3-events-system.md @@ -40,6 +40,7 @@ PREP(onTapShoulder); Event Key Description Source(s) + Passed Parameter(s) (_this) Locality @@ -48,6 +49,7 @@ PREP(onTapShoulder); "playerChanged" `player` changed (zeus/respawn) common + [_newPlayer, _oldPlayer] local @@ -55,6 +57,7 @@ PREP(onTapShoulder); "playerInventoryChanged" Inventory changed common + getAllGear-Array local @@ -62,13 +65,23 @@ PREP(onTapShoulder); "playerVisionModeChanged" Vision mode changed (e.g. NVG on) common + [_unit, _newVisionMode] local + + + "inventoryDisplayChanged" + Inventory display opened/closed + common + [_unit, _isOpen] + local + "zeusDisplayChanged" Zeus display opened/closed common + [_unit, _isOpen] local @@ -76,72 +89,91 @@ PREP(onTapShoulder); "cameraViewChanged" Camera view changed common + [_unit, _newCameraView] local "playerVehicleChanged" Player vehicle changed common + [_unit, _newVehicle] local "playerTurretChanged" Player turret changed common + [_unit, _newTurretIndexArray] local "infoDisplayChanged" On info box change (e.g. entering and leaving a vehicle) common + [_display, _type] local "inventoryDisplayLoaded" On opening the inventory display common + [_display] + local + + + "mapDisplayLoaded" + On loading the map (briefing and mission start) + common + [_display, _mapType] local "interactionMenuOpened" Interaction Menu Opened interaction + local "killedByFriendly" On TK/Civilian Killed respawn + local "drawing_requestMarkers" Request Drawing Markers map + target "drawing_sendbackMarkers" Send Drawing Markers map + target "drawing_addLineMarker" Line Drawn map + global "drawing_removeLineMarker" Line Deleted map + global "flashbangExplosion" Flashbang Goes Bang grenades + target From 33570c94e4fa7da08bec91697296756837913fea Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 10 Apr 2015 13:05:14 -0500 Subject: [PATCH 3/4] #428 - Only work on locked vehicles. --- addons/vehiclelock/functions/fnc_lockpick.sqf | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/vehiclelock/functions/fnc_lockpick.sqf b/addons/vehiclelock/functions/fnc_lockpick.sqf index 4fee354824..d268646b8b 100644 --- a/addons/vehiclelock/functions/fnc_lockpick.sqf +++ b/addons/vehiclelock/functions/fnc_lockpick.sqf @@ -27,6 +27,7 @@ PARAMS_3(_unit,_veh,_funcType); if (isNull _unit) exitWith {ERROR("null unit"); false}; if (isNull _veh) exitWith {ERROR("null vehicle"); false}; + //need lockpick item if (!("ACE_key_lockpick" in (items _unit))) exitWith {false}; From db5861da52633891b963ac2e011ba04219e40e30 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Fri, 10 Apr 2015 13:05:34 -0500 Subject: [PATCH 4/4] #428 - GJ Git --- addons/vehiclelock/functions/fnc_lockpick.sqf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/vehiclelock/functions/fnc_lockpick.sqf b/addons/vehiclelock/functions/fnc_lockpick.sqf index d268646b8b..fc7fecc693 100644 --- a/addons/vehiclelock/functions/fnc_lockpick.sqf +++ b/addons/vehiclelock/functions/fnc_lockpick.sqf @@ -27,6 +27,8 @@ PARAMS_3(_unit,_veh,_funcType); if (isNull _unit) exitWith {ERROR("null unit"); false}; if (isNull _veh) exitWith {ERROR("null vehicle"); false}; +//Exit if vehicle unlocked: +if ((locked _veh) == 0) exitWith {false}; //need lockpick item if (!("ACE_key_lockpick" in (items _unit))) exitWith {false};