close #54 filter scopes for nightvision

gruppe-adler · Oct 15, 2019 · 2bdd25b · 2bdd25b
1 parent 70eaa74
commit 2bdd25b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/functions/selectWeapons/cfgFunctions.hpp b/functions/selectWeapons/cfgFunctions.hpp
@@ -1,6 +1,7 @@
 class gungame_selectWeapons {
     class selectWeapons {
         class blacklistUtility {};
+        class filterNvScopes {};
         class getAllAvailableWeapons {};
         class hasDamagingDefaultMag {};
         class isSniper {};

diff --git a/functions/selectWeapons/fn_filterNvScopes.sqf b/functions/selectWeapons/fn_filterNvScopes.sqf
@@ -0,0 +1,17 @@
+#include "component.hpp"
+
+params [["_scopes",[]]];
+
+private _scopesNoNV = [];
+
+{
+    _allOpticsModes = "true" configClasses (configfile >> "CfgWeapons" >> _x >> "ItemInfo" >> "OpticsModes");
+    _firstNvModeID = _allOpticsModes findIf {
+        _allVisionModes = ([_x,"visionMode",[]] call BIS_fnc_returnConfigEntry) apply {toLower _x};
+        "nvg" in _allVisionModes
+    };
+
+    if (_firstNvModeID < 0) then {_scopesNoNV pushBack _x};
+} forEach _scopes;
+
+_scopesNoNV
diff --git a/functions/selectWeapons/fn_selectWeapons.sqf b/functions/selectWeapons/fn_selectWeapons.sqf
@@ -76,6 +76,8 @@ private _fnc_selectWeapons = {
                 _compatibleScopes = getArray (configFile >> "CfgWeapons" >> _weapon >> "WeaponSlotsInfo" >> "CowsSlot" >> "compatibleItems");
             };
 
+            _compatibleScopes = [_compatibleScopes] call FUNC(filterNvScopes);
+
             if (count _compatibleScopes > 0) then {
                 GVAR(scopes) pushBack selectRandom _compatibleScopes;
             } else {