Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add option to remove NVG when adding flashlights #517

Merged
merged 13 commits into from
Feb 7, 2021
Merged

Add option to remove NVG when adding flashlights #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c58884b
Add option to remove NVG with flashlight module
neilzar Jan 18, 2021
cb2a547
Fix missing ;
neilzar Jan 18, 2021
408a26a
forgot stringtable
neilzar Jan 18, 2021
ed900c5
Typo
neilzar Jan 18, 2021
dfbf015
Correctly get NVG
neilzar Jan 19, 2021
454fde3
Update addons/modules/stringtable.xml
neilzar Jan 22, 2021
e95ee26
Add Tooltip
neilzar Jan 22, 2021
0c329d9
Better tooltip
neilzar Jan 22, 2021
8dfcbaf
merge into if
neilzar Jan 22, 2021
54d1899
Merge remote-tracking branch 'origin/master' into flashlight-module-nvg
neilzar Feb 2, 2021
0d5fb19
I can finally sort of think straight
neilzar Feb 2, 2021
041545c
Remove unlinkitem event
neilzar Feb 3, 2021
f9a6575
Dumdum, use _nvg
neilzar Feb 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions addons/modules/functions/fnc_moduleToggleFlashlights.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,11 @@ if (!_isAttached) then {
[LSTRING(ModuleToggleFlashlights), [
["COMBO", [LSTRING(ToggleTarget), LSTRING(ToggleTarget_Tooltip)], _targets],
["TOOLBOX:ENABLED", LSTRING(ModuleToggleFlashlights_Flashlights), false],
["TOOLBOX:YESNO", LSTRING(AddGear), false]
["TOOLBOX:YESNO", LSTRING(AddGear), false],
["TOOLBOX:YESNO", [LSTRING(RemoveNVG), LSTRING(RemoveNVG_Tooltip)], false]
], {
params ["_values", "_group"];
_values params ["_target", "_enabled", "_addGear"];
_values params ["_target", "_enabled", "_addGear", "_removeNVG"];

// Get units based on target selection
private _units = if (_target isEqualType west) then {
Expand Down Expand Up @@ -83,6 +84,14 @@ if (!_isAttached) then {
[QEGVAR(common,addWeaponItem), [_x, _weapon, selectRandom _flashlights], _x] call CBA_fnc_targetEvent;
};

if (_removeNVG) then {
private _nvg = hmd _x;

if (_nvg != "") then {
_unit unlinkItem _nvg;
};
};

[QEGVAR(common,enableGunLights), [_x, "ForceOn"], _x] call CBA_fnc_targetEvent;
} forEach _units;
} else {
Expand Down
6 changes: 6 additions & 0 deletions addons/modules/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1724,6 +1724,12 @@
<Polish>Dodaj wyposażenie</Polish>
<Russian>Добавить снаряжение</Russian>
</Key>
<Key ID="STR_ZEN_Modules_RemoveNVG">
<English>Remove NVGs</English>
</Key>
<Key ID="STR_ZEN_Modules_RemoveNVG_Tooltip">
<English>Remove any currently equipped Night Vision Goggles.</English>
</Key>
<Key ID="STR_ZEN_Modules_ModuleToggleFlashlights">
<English>Toggle Flashlights</English>
<German>Ändere Taschenlampen</German>
Expand Down