Add toggle flashlight and NVG zeus modules #4556

alganthe · 2016-10-16T19:35:17Z

When merged this pull request will:

Add a module to toggle flashlights on or off for a group or a side.
Add a module to toggle NVGs on or off for a group or a side.

Both of those are added if they're not already present on the unit's weapon or head, it uses whatever the unit is supposed to have.
It works with headgear that has built in night vision / thermal.
If the units don't have flashlights on their weapons it checks if they have a compatible attachment that is a flashlight and give it to them (if none are available then so be it)

jonpas

Didn't do full review, just quick skim and that caught my attention.

jonpas · 2016-10-16T19:44:59Z

addons/zeus/functions/fnc_moduleToggleNvg.sqf

+private _units = [];
+
+if (_target == 4) then {
+    _units =  units (attachedTo _logic);


Excessive space.

jonpas · 2016-10-16T19:45:03Z

addons/zeus/functions/fnc_moduleToggleNvg.sqf

+if (_target == 4) then {
+    _units =  units (attachedTo _logic);
+} else {
+    _units =  allUnits select {alive _x && {side _x == ([blufor, opfor, independent, civilian] select _target)}},


Excessive space.

Solved, but not fully reviewed yet.

bux · 2016-10-17T04:51:01Z

addons/zeus/functions/fnc_moduleToggleNvg.sqf

+                };
+
+            } else {
+                _x linkitem "NVGoggles";


thojkooi · 2016-10-17T09:00:36Z

addons/zeus/functions/fnc_ui_ToggleNvg.sqf

+private _unit = effectiveCommander (attachedTo _logic);
+
+scopeName "Main";
+private _fnc_errorAndClose = {


this and the switch a few lines below is used in at least two places. Maybe make it a separate function?

Can't do that due to scopeName being used, I could do that but other people writing curator modules would have to know that they have to define the scopeName before calling the function.

thojkooi · 2016-10-17T09:01:00Z

addons/zeus/functions/fnc_ui_toggleFlashlight.sqf

+    private _logic = GETMVAR(BIS_fnc_initCuratorAttributes_target,objnull);
+    if (isNull _logic) exitWith {};
+
+        private _combo1 = _display displayCtrl 56218;


indentation

thojkooi · 2016-10-17T09:01:54Z

addons/zeus/functions/fnc_ui_toggleFlashlight.sqf

+
+_control ctrlRemoveAllEventHandlers "setFocus";
+
+// Handles errors


Not meant for the code on line 32 right?

thojkooi · 2016-10-17T09:02:09Z

addons/zeus/functions/fnc_ui_ToggleNvg.sqf

+    private _logic = GETMVAR(BIS_fnc_initCuratorAttributes_target,objnull);
+    if (isNull _logic) exitWith {};
+
+        private _combo1 = _display displayCtrl 92855;


indentation

alganthe · 2016-10-17T14:26:51Z

Made the changes required by the review above.

Phyma

Please fix header things :)

Phyma · 2017-06-12T21:40:50Z

addons/zeus/functions/fnc_moduleToggleNvg.sqf

+ *
+ * Return Value:
+ * Nothing
+ *


Add a example.

And return value is None

Phyma · 2017-06-12T21:41:11Z

addons/zeus/functions/fnc_moduleToggleFlashlight.sqf

+ *
+ * Return Value:
+ * Nothing
+ *


Add a example.

And return value is None

Phyma · 2017-06-12T21:41:43Z

addons/zeus/functions/fnc_ui_ToggleNvg.sqf

+ * 0: Nvg toggle controls group <CONTROL>
+ *
+ * Return Value:
+ * Nothing


Return Value: None

Phyma · 2017-06-12T21:41:58Z

addons/zeus/functions/fnc_ui_toggleFlashlight.sqf

+ * 0: Flashlight toggle controls group <CONTROL>
+ *
+ * Return Value:
+ * Nothing


Return Value: None

Phyma · 2017-06-12T21:55:27Z

addons/zeus/functions/fnc_moduleToggleFlashlight.sqf

+            private _pointer = (_x weaponAccessories (currentWeapon _x)) select 1;
+
+            if (!(_pointer isEqualTo "") && {isNull (configfile >> "CfgWeapons" >> _pointer >> "ItemInfo" >> "Pointer")}) then {
+                _x enableGunLights "ForceOn";


In https://community.bistudio.com/wiki/enableGunLights uses"forceOn" But I guess this is tested so it might still work :)

Probably isn't case-sensitive.

jonpas · 2017-06-22T15:16:25Z

@alganthe Plan to work on that further, headers need some fixing. Aditionally, I think we should rather provide the option to give units gear, for cases when you want to enable NVGs/lights on a group but only certain units have them and you want only those enabled, not that every other unit gets them as well.

…odules

alganthe · 2017-09-08T09:22:49Z

@jonpas that would only apply to flashlights, as NVGs are just put on by AI whenever they feel like it,.

jonpas · 2017-09-08T14:25:27Z

Could use addPrimaryWeaponItem.

alganthe · 2017-09-08T14:42:17Z

addWeaponItem also works with sidearms, where addPrimaryWeaponItem only works with the main slot.

PabstMirror · 2017-09-19T22:04:25Z

enableGunLights requires a local unit acording to the biki
in testing on a dedicated on non-local units it sometimes worked and sometimes didn't,
probably want to use targetEvent for this

PabstMirror · 2017-09-19T22:05:30Z

addons/zeus/functions/fnc_ui_toggleFlashlight.sqf

+};
+
+//Specific on-load stuff:
+private _comboBox = _display displayCtrl 56218;


Small usability improvement, should set the default to toggle their current state

private _enabledDefault = false; if (!isNull _unit) then { _enabledDefault = !isFlashlightOn (leader _unit); }; _comboBox lbSetCurSel [0,1] select _enabledDefault;

Why leader _unit?
Don't you mean currentWeapon _unit?

alganthe · 2017-09-19T23:03:25Z

there we go, indeed I didn't notice enableGunLights was AL.

jonpas · 2017-09-19T23:15:57Z

addons/zeus/functions/fnc_moduleToggleFlashlight.sqf

+                if (local _x) then {
+                    _x enableGunLights "forceOn";
+                } else {
+                    [QGVAR(enableFlashlight), [_x, "forceOn"], _x] call CBA_fnc_targetEvent;


Target event handles locality on its own, so you don't need duplicate code. Probably minor performance difference, shouldn't matter here at all.

jonpas · 2017-09-19T23:16:11Z

addons/zeus/functions/fnc_moduleToggleFlashlight.sqf

@@ -48,12 +52,11 @@ if (_toggle) then {

                    if (local _x) then {
                        _x addWeaponItem [(currentWeapon _x), _flashlight];
+                        _x enableGunLights "ForceOn";


jonpas · 2017-09-19T23:16:18Z

addons/zeus/functions/fnc_moduleToggleFlashlight.sqf

@@ -62,7 +65,11 @@ if (_toggle) then {
 } else {
    {
        if !(isPlayer _x || {(currentWeapon _x) isEqualTo ""}) then {
-            _x enableGunLights "ForceOff";
+            if (local _x) then {
+                _x enableGunLights "ForceOff";


bux · 2017-09-20T06:49:44Z

Nice, this will be a welcomed addition.

jonpas · 2017-09-21T16:37:54Z

addons/zeus/CfgVehicles.hpp

@@ -214,6 +214,18 @@ class CfgVehicles {
        function = QFUNC(moduleUnconscious);
        icon = QPATHTOF(UI\Icon_Module_Zeus_Unconscious_ca.paa);
    };
+    class GVAR(moduleToggleNvg): GVAR(moduleBase) {
+        curatorCanAttach = 1;
+        category = QGVAR(Utility);


Shouldn't this rather be category AI? It specifically shouldn't work on players anyways (flashlight already doesn't).

didn't really know where to put it, good point.

jonpas · 2017-09-21T16:39:39Z

addons/zeus/functions/fnc_moduleToggleNvg.sqf

+
+if (_toggle) then {
+    {
+        if (hmd _x isEqualTo "") then {


Ignore if player?

kymckay · 2017-09-21T21:13:44Z

👍 Thanks for handling review @jonpas, good to see this finally in 😄

Add toggle flashlight and NVG modules

a75fc11

alganthe changed the title ~~Add toggle flashlight and NVG modules~~ Add toggle flashlight and NVG zeus modules Oct 16, 2016

jonpas requested changes Oct 16, 2016

View reviewed changes

jonpas added the kind/feature Release Notes: **ADDED:** label Oct 16, 2016

jonpas added this to the 3.9.0 milestone Oct 16, 2016

Remove excessive spaces in moduleToggleNvg

5eacc2b

jonpas previously approved these changes Oct 16, 2016

View reviewed changes

bux reviewed Oct 17, 2016

View reviewed changes

addons/zeus/functions/fnc_moduleToggleNvg.sqf Outdated

};

} else {

_x linkitem "NVGoggles";

Copy link

Member

bux Oct 17, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

linkItem

thojkooi reviewed Oct 17, 2016

View reviewed changes

Fix indentation and typos to fit review

ce27038

654wak654 mentioned this pull request Nov 12, 2016

Add Zeus utility modules #4661

Merged

kymckay self-assigned this Nov 15, 2016

Merge branch 'master' into toggle_modules

85f4a8a

PabstMirror modified the milestones: 3.9.0, 3.10.0 Feb 11, 2017

PabstMirror modified the milestones: 3.11.0, 3.10.0 Jun 2, 2017

Phyma suggested changes Jun 12, 2017

View reviewed changes

Phyma reviewed Jun 12, 2017

View reviewed changes

Merge branch 'master' into toggle_modules

d400ca8

PabstMirror added the status/needs-testing label Sep 7, 2017

PabstMirror modified the milestones: Ongoing, 3.11.0 Sep 7, 2017

Merge branch 'master' of https://github.com/acemod/ACE3 into toggle_m…

3aad69d

…odules

alganthe added 2 commits September 8, 2017 12:44

Add an option to add gear, fix headers

11055d1

Change category to utility

00ebcdc

jonpas modified the milestones: 3.11.0, Ongoing Sep 8, 2017

jonpas requested a review from kymckay September 17, 2017 22:29

PabstMirror reviewed Sep 19, 2017

View reviewed changes

alganthe added 2 commits September 20, 2017 00:47

Add QOL improvement suggested by pabst

3628a58

Fix locality issues

33fc6a5

jonpas reviewed Sep 19, 2017

View reviewed changes

alganthe added 2 commits September 20, 2017 01:33

Remove locality check before enableFlashlight targetEvent

7246af0

Remove locality check before addWeaponItem targetEvent

8b3b528

jonpas requested changes Sep 21, 2017

View reviewed changes

Add a player check in moduleToggleNVG, change modules category

e367f43

jonpas approved these changes Sep 21, 2017

View reviewed changes

Add the same QOL in toggleNVG than in toggleFlashlight

5328eac

jonpas merged commit 1ba330e into acemod:master Sep 21, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add toggle flashlight and NVG zeus modules #4556

Add toggle flashlight and NVG zeus modules #4556

alganthe commented Oct 16, 2016

jonpas left a comment

jonpas Oct 16, 2016

jonpas Oct 16, 2016

bux Oct 17, 2016

thojkooi Oct 17, 2016

alganthe Oct 17, 2016

thojkooi Oct 17, 2016

thojkooi Oct 17, 2016

thojkooi Oct 17, 2016

alganthe commented Oct 17, 2016

Phyma left a comment

Phyma Jun 12, 2017

Phyma Jun 12, 2017

Phyma Jun 12, 2017

Phyma Jun 12, 2017

Phyma Jun 12, 2017

jonpas Jun 22, 2017

jonpas commented Jun 22, 2017

alganthe commented Sep 8, 2017

jonpas commented Sep 8, 2017

alganthe commented Sep 8, 2017

PabstMirror commented Sep 19, 2017

PabstMirror Sep 19, 2017 •

edited

Loading

alganthe Sep 19, 2017

alganthe commented Sep 19, 2017

jonpas Sep 19, 2017

jonpas Sep 19, 2017

jonpas Sep 19, 2017

bux commented Sep 20, 2017

jonpas Sep 21, 2017

alganthe Sep 21, 2017

jonpas Sep 21, 2017

kymckay commented Sep 21, 2017


		_control ctrlRemoveAllEventHandlers "setFocus";

		// Handles errors

Add toggle flashlight and NVG zeus modules #4556

Add toggle flashlight and NVG zeus modules #4556

Conversation

alganthe commented Oct 16, 2016

jonpas left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alganthe commented Oct 17, 2016

Phyma left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jonpas commented Jun 22, 2017

alganthe commented Sep 8, 2017

jonpas commented Sep 8, 2017

alganthe commented Sep 8, 2017

PabstMirror commented Sep 19, 2017

PabstMirror Sep 19, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alganthe commented Sep 19, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bux commented Sep 20, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kymckay commented Sep 21, 2017

PabstMirror Sep 19, 2017 •

edited

Loading